@capillarytech/creatives-library 2.0.78 → 2.0.80

package/v2Containers/MobilePush/initialSchema.js

@@ -274,9 +274,30 @@ export const response = {
                                   ],
                                 },
                                 {
-                                  rowClassName: "mobile-push-row",
+                                  rowClassName: "mobile-push-row tag-container",
                                   cols: [
-
+                                    {
+                                      width: 22,
+                                      id: "title-tagList",
+                                      target: "message-title",
+                                      label: "Add labels",
+                                      type: "tag-list",
+                                      metaType: "List",
+                                      datatype: "select",
+                                      required: true,
+                                      fluid: true,
+                                      onlyDisplay: true,
+                                      styling: "semantic",
+                                      order: 1,
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
+                                      customComponent: true,
+                                      supportedEvents: [
+                                        "onTagSelect",
+                                      ],
+                                    },
                                     {
                                       id: "message-title",
                                       label: "Title",
@@ -293,30 +314,34 @@ export const response = {
                                       supportedEvents: [],
                                       errorMessage: "Template message has unsupported/missing tags!",
                                     },
+                                  ],
+                                },
+                                {
+                                  rowClassName: "mobile-push-row tag-container",
+                                  cols: [
+
                                     {
-                                      offset: 20,
-                                      id: "title-tagList",
-                                      target: "message-title",
+                                      width: 22,
+                                      id: "message-tagList",
+                                      target: "message-editor",
                                       label: "Add labels",
                                       type: "tag-list",
                                       metaType: "List",
                                       datatype: "select",
                                       required: true,
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
                                       fluid: true,
                                       onlyDisplay: true,
                                       styling: "semantic",
-                                      order: 1,
+                                      order: 2,
                                       customComponent: true,
                                       supportedEvents: [
                                         "onTagSelect",
                                       ],
                                     },
-                                  ],
-                                },
-                                {
-                                  rowClassName: "mobile-push-row",
-                                  cols: [
-
                                     {
                                       id: "message-editor",
                                       label: "Message",
@@ -341,27 +366,6 @@ export const response = {
                                       ],
                                       errorMessage: "Template message has unsupported/missing tags!",
                                     },
-                                    {
-                                      offset: 20,
-                                      id: "message-tagList",
-                                      target: "message-editor",
-                                      label: "Add labels",
-                                      type: "tag-list",
-                                      metaType: "List",
-                                      datatype: "select",
-                                      required: true,
-                                      style: {
-                                        marginTop: "55px",
-                                      },
-                                      fluid: true,
-                                      onlyDisplay: true,
-                                      styling: "semantic",
-                                      order: 2,
-                                      customComponent: true,
-                                      supportedEvents: [
-                                        "onTagSelect",
-                                      ],
-                                    },
                                   ],
                                 },
                                 {
@@ -605,9 +609,30 @@ export const response = {
                                   ],
                                 },
                                 {
-                                  rowClassName: "mobile-push-row",
+                                  rowClassName: "mobile-push-row tag-container",
                                   cols: [
-
+                                    {
+                                      width: 22,
+                                      id: "title-tagList2",
+                                      target: "message-title2",
+                                      label: "Add labels",
+                                      type: "tag-list",
+                                      metaType: "List",
+                                      datatype: "select",
+                                      required: true,
+                                      fluid: true,
+                                      onlyDisplay: true,
+                                      styling: "semantic",
+                                      order: 1,
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
+                                      customComponent: true,
+                                      supportedEvents: [
+                                        "onTagSelect",
+                                      ],
+                                    },
                                     {
                                       id: "message-title2",
                                       label: "Title",
@@ -624,30 +649,33 @@ export const response = {
                                       supportedEvents: [],
                                       errorMessage: "Template title has unsupported/missing tags.",
                                     },
+                                  ],
+                                },
+                                {
+                                  rowClassName: "mobile-push-row tag-container",
+                                  cols: [
                                     {
-                                      offset: 20,
-                                      id: "title-tagList2",
-                                      target: "message-title2",
+                                      width: 22,
+                                      id: "message-tagList2",
                                       label: "Add labels",
+                                      target: "message-editor2",
                                       type: "tag-list",
                                       metaType: "List",
                                       datatype: "select",
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
                                       required: true,
                                       fluid: true,
                                       onlyDisplay: true,
                                       styling: "semantic",
-                                      order: 1,
+                                      order: 2,
                                       customComponent: true,
                                       supportedEvents: [
                                         "onTagSelect",
                                       ],
                                     },
-                                  ],
-                                },
-                                {
-                                  rowClassName: "mobile-push-row",
-                                  cols: [
-
                                     {
                                       id: "message-editor2",
                                       label: "Message",
@@ -672,27 +700,6 @@ export const response = {
                                       ],
                                       errorMessage: "Template message has unsupported/missing tags!",
                                     },
-                                    {
-                                      offset: 20,
-                                      id: "message-tagList2",
-                                      label: "add labels",
-                                      target: "message-editor2",
-                                      type: "tag-list",
-                                      metaType: "List",
-                                      datatype: "select",
-                                      style: {
-                                        marginTop: "55px",
-                                      },
-                                      required: true,
-                                      fluid: true,
-                                      onlyDisplay: true,
-                                      styling: "semantic",
-                                      order: 2,
-                                      customComponent: true,
-                                      supportedEvents: [
-                                        "onTagSelect",
-                                      ],
-                                    },
                                   ],
                                 },
                                 {
@@ -1105,9 +1112,30 @@ export const response = {
                                   ],
                                 },
                                 {
-                                  rowClassName: "mobile-push-row",
+                                  rowClassName: "mobile-push-row tag-container",
                                   cols: [
-
+                                    {
+                                      width: 22,
+                                      id: "title-tagList",
+                                      target: "message-title",
+                                      label: "Add labels",
+                                      type: "tag-list",
+                                      metaType: "List",
+                                      datatype: "select",
+                                      required: true,
+                                      fluid: true,
+                                      onlyDisplay: true,
+                                      styling: "semantic",
+                                      order: 1,
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
+                                      customComponent: true,
+                                      supportedEvents: [
+                                        "onTagSelect",
+                                      ],
+                                    },
                                     {
                                       id: "message-title",
                                       label: "Title",
@@ -1124,30 +1152,33 @@ export const response = {
                                       supportedEvents: [],
                                       errorMessage: "Message title has unsupported/missing tags!",
                                     },
+                                  ],
+                                },
+                                {
+                                  rowClassName: "mobile-push-row tag-container",
+                                  cols: [
                                     {
-                                      offset: 20,
-                                      id: "title-tagList",
-                                      target: "message-title",
+                                      width: 22,
+                                      id: "message-tagList",
+                                      target: "message-editor",
                                       label: "Add labels",
                                       type: "tag-list",
                                       metaType: "List",
                                       datatype: "select",
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
                                       required: true,
                                       fluid: true,
                                       onlyDisplay: true,
                                       styling: "semantic",
-                                      order: 1,
+                                      order: 2,
                                       customComponent: true,
                                       supportedEvents: [
                                         "onTagSelect",
                                       ],
                                     },
-                                  ],
-                                },
-                                {
-                                  rowClassName: "mobile-push-row",
-                                  cols: [
-
                                     {
                                       id: "message-editor",
                                       label: "Message",
@@ -1172,27 +1203,6 @@ export const response = {
                                         "onChange",
                                       ],
                                     },
-                                    {
-                                      offset: 20,
-                                      id: "message-tagList",
-                                      target: "message-editor",
-                                      label: "Add labels",
-                                      type: "tag-list",
-                                      metaType: "List",
-                                      datatype: "select",
-                                      style: {
-                                        marginTop: "55px",
-                                      },
-                                      required: true,
-                                      fluid: true,
-                                      onlyDisplay: true,
-                                      styling: "semantic",
-                                      order: 2,
-                                      customComponent: true,
-                                      supportedEvents: [
-                                        "onTagSelect",
-                                      ],
-                                    },
                                   ],
                                 },
                                 {
@@ -1481,8 +1491,30 @@ export const response = {
                                   ],
                                 },
                                 {
-                                  rowClassName: "mobile-push-row",
+                                  rowClassName: "mobile-push-row tag-container",
                                   cols: [
+                                    {
+                                      width: 22,
+                                      id: "title-tagList",
+                                      label: "Add labels",
+                                      target: "message-title2",
+                                      type: "tag-list",
+                                      metaType: "List",
+                                      datatype: "select",
+                                      required: true,
+                                      fluid: true,
+                                      onlyDisplay: true,
+                                      styling: "semantic",
+                                      order: 1,
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
+                                      customComponent: true,
+                                      supportedEvents: [
+                                        "onTagSelect",
+                                      ],
+                                    },
                                     {
                                       id: "message-title2",
                                       label: "Title",
@@ -1499,30 +1531,33 @@ export const response = {
                                       supportedEvents: [],
                                       errorMessage: "Message title has unsupported/missing tags!",
                                     },
+                                  ],
+                                },
+                                {
+                                  rowClassName: "mobile-push-row tag-container",
+                                  cols: [
                                     {
-                                      offset: 20,
-                                      id: "title-tagList",
-                                      label: "Add Labels",
-                                      target: "message-title2",
+                                      width: 22,
+                                      id: "message-tagList",
+                                      label: "Add labels",
+                                      target: "message-editor2",
                                       type: "tag-list",
                                       metaType: "List",
+                                      style: {
+                                        marginBottom: "unset",
+                                        height: "24px",
+                                      },
                                       datatype: "select",
                                       required: true,
                                       fluid: true,
                                       onlyDisplay: true,
                                       styling: "semantic",
-                                      order: 1,
+                                      order: 2,
                                       customComponent: true,
                                       supportedEvents: [
                                         "onTagSelect",
                                       ],
                                     },
-                                  ],
-                                },
-                                {
-                                  rowClassName: "mobile-push-row",
-                                  cols: [
-
                                     {
                                       id: "message-editor2",
                                       label: "Message",
@@ -1547,27 +1582,6 @@ export const response = {
                                         "onChange",
                                       ],
                                     },
-                                    {
-                                      id: "message-tagList",
-                                      label: "Add labels",
-                                      offset: 20,
-                                      target: "message-editor2",
-                                      type: "tag-list",
-                                      metaType: "List",
-                                      style: {
-                                        marginTop: "55px",
-                                      },
-                                      datatype: "select",
-                                      required: true,
-                                      fluid: true,
-                                      onlyDisplay: true,
-                                      styling: "semantic",
-                                      order: 2,
-                                      customComponent: true,
-                                      supportedEvents: [
-                                        "onTagSelect",
-                                      ],
-                                    },
                                   ],
                                 },
                                 {

package/v2Containers/Templates/index.js

@@ -1325,7 +1325,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       isDisabled = isDisabled || _.isEmpty(this.props.Templates.selectedWeChatAccount);
     }
     if (channel === MOBILE_PUSH) {
-      isDisabled = isDisabled || this.state.selectedAccountError;
+      isDisabled = this.checkSearchDisabled();
     }
     return isDisabled;
   }
@@ -1346,6 +1346,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       (lineLoader !== undefined ? lineLoader : false);
     return isLoading;
   }
+  checkSearchDisabled = () => (this.props.route.name === "mobilepush" && !(this.props.Templates.selectedWeChatAccount && this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier && this.props.Templates.selectedWeChatAccount.configs && (this.props.Templates.selectedWeChatAccount.configs.ios === '1' || this.props.Templates.selectedWeChatAccount.configs.android === '1')))
   renderEmailPreviewModal() {
     const slideboxContent = (
       <div style={{height: "75vh", width: '55vw'}}>
@@ -1563,6 +1564,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           placeholder={this.props.intl.formatMessage(messages.searchText)}
           value={this.state.searchText}
           onChange={(e) => this.searchTemplate(e.target.value)}
+          disabled={this.checkSearchDisabled()}
         />
         <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
           {(this.props.location.query.type === 'embedded' ) ? pageHeaderDvs : pageHeader}

package/v2Containers/WeChat/MapTemplates/index.js

@@ -20,15 +20,15 @@ import makeSelectWeChat from './selectors';
 import messages from './messages';
 import * as actions from './actions';
 import FormBuilder from '../../../components/FormBuilder';
-import { UserIsAuthenticated } from '../../../../utils/authWrapper';
+import { UserIsAuthenticated } from '../../../utils/authWrapper';
 import * as globalActions from '../../../containers/Cap/actions';
-import {getMessageObject} from '../../../../utils/messageUtils';
+import {getMessageObject} from '../../../utils/messageUtils';
 import * as templateActions from '../../Templates/actions';
 // import SlideBox from '../../components/SlideBox';
 // import PageHeader from '../../components/PageHeader';
 import './_mapTemplates.scss';
 
-import callNativeEvent from '../../../../utils/callNativeEvent';
+import callNativeEvent from '../../../utils/callNativeEvent';
 
 // const Option = Select.Option;
 
@@ -1141,14 +1141,14 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       return false;
     }
     const temp = schema;
-    let newSchema = _.cloneDeep(schema);
     temp.standalone.sections = this.injectSections(temp.standalone.sections);
     _.forEach(temp.containers, (container) => {
       let tempContainer = container;
       tempContainer = this.injectContainer(tempContainer);
       return tempContainer;
     });
-    newSchema = this.hideSchemaElementsByModule(schema);
+    let newSchema = _.cloneDeep(schema);
+    newSchema = this.hideSchemaElementsByModule(newSchema);
     this.setState({schema: newSchema});
     return schema;
   }