@capillarytech/creatives-library 7.10.32 → 7.10.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.10.32",
+  "version": "7.10.34",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/CreativesContainer/index.js

@@ -420,8 +420,8 @@ class Creatives extends React.Component {
         if (get(template, "value.versions.base")) {
           const mobilpushTemplate = template.value;
           templateData.accountId = get(mobilpushTemplate, 'definition.accountId');
-          const pathName = get(this.props,"location.pathname");
-          if(`${pathName}`.includes(LOYALTY)){
+          const type = (get(this.props,"messageDetails.type") || '').toLowerCase();
+          if(type === LOYALTY){
             templateData.licenseCode = get(mobilpushTemplate, 'definition.licenseCode');
           }
           const androidContent = get(mobilpushTemplate, 'versions.base.ANDROID');

package/v2Containers/MobilePush/Edit/index.js

@@ -60,7 +60,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.getLinkTypeFields = getLinkTypeFields.bind(this);
   }
   componentWillMount() {
-    
+
     this.props.actions.getWeCrmAccounts("mobilepush");
     if (!this.props.Templates.selectedWeChatAccount && this.props.location.query.type !== 'embedded') {
       const type = this.props.location.query.type;
@@ -76,7 +76,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         version: "v2",
       };
       this.props.globalActions.fetchSchemaForEntity(query);
-      
+
     }
   }
   componentDidMount() {
@@ -106,10 +106,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
       this.startValidation();
     }
-    const selectedWeChatAccount = (!_.isEmpty(this.props.Templates.selectedWeChatAccount) ? this.props.Templates.selectedWeChatAccount : this.props.Edit.selectedWeChatAccount);
+    const selectedWeChatAccount = (!_.isEmpty(this.props.Templates.selectedWeChatAccount) ? this.props.Templates.selectedWeChatAccount : 
+    (!_.isEmpty(this.props.Edit.selectedWeChatAccount) ? this.props.Edit.selectedWeChatAccount : nextProps.Edit.selectedWeChatAccount));
     if (this.props.location.query.type === 'embedded' && !nextProps.Edit.fetchingWeCrmAccounts && !_.isEqual(this.props.Edit.weCrmAccounts, nextProps.Edit.weCrmAccounts) && (!selectedWeChatAccount || _.isEmpty(selectedWeChatAccount))) {
-      
-      this.setMobilePushAccountOptions(nextProps.Edit.weCrmAccounts);
+
+      this.setMobilePushAccountOptions(nextProps.Edit.weCrmAccounts, get(this.props, "templateData.definition.accountId"));
     }
     if (!_.isEmpty(nextProps.Edit.selectedWeChatAccount) && !_.isEqual(this.props.Edit.selectedWeChatAccount, nextProps.Edit.selectedWeChatAccount) && (this.props.location.query.type === 'embedded') && this.props.location.query.module === "loyalty") {
       const params = {
@@ -121,6 +122,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     }
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && _.isEmpty(this.state.fullSchema)) {
       this.setState({fullSchema: nextProps.metaEntities.layouts[0].definition, schema: (nextProps.location.query.module === 'loyalty') ? nextProps.metaEntities.layouts[0].definition.textSchema : {}}, () => {
+        this.handleEditSchemaOnPropsChange(nextProps, selectedWeChatAccount);
         const templateId = get(this, "props.params.id");
         if (nextProps.location.query.module !== 'loyalty' && templateId && templateId !== 'temp') {
           this.props.actions.getTemplateDetails(templateId);
@@ -143,27 +145,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         this.setTemplateOptions(nextProps.Edit.mobilepushTemplates);
       }
     }
-    if (!_.isEmpty(nextProps.templateDetails) && _.isEmpty(this.state.editData) && !_.isEmpty(this.state.fullSchema) && selectedWeChatAccount && (this.props.location.query.type !== 'embedded' || this.props.isFullMode === false)) {
-      this.props = nextProps;
-      const mode = nextProps.templateDetails.definition ? nextProps.templateDetails.definition.mode : nextProps.templateDetails.mode;
-      const schema = mode === "text" ? this.state.fullSchema.textSchema : this.state.fullSchema.imageSchema;
-      const isAndroidSupported = get(this, "props.Templates.selectedWeChatAccount.configs.android") === '1';
-      const isIosSupported = get(this, "props.Templates.selectedWeChatAccount.configs.ios") === '1';
-      if (!isAndroidSupported) {
-        const androidField = get(schema, "containers[0].panes[0]");
-        androidField.isSupported = false;
-        this.setState({currentTab: 2});
-        set(schema, "containers[0].panes[0]", androidField);
-      }
-      if (!isIosSupported) {
-        const iosField = get(schema, "containers[0].panes[1]");
-        iosField.isSupported = false;
 
-        set(schema, "containers[0].panes[1]", iosField);
-      }
-      this.setEditState(nextProps.templateDetails, schema);
-      this.getTags();
-    }
+    this.handleEditSchemaOnPropsChange(nextProps, selectedWeChatAccount);
     if (nextProps.Edit.uploadedAssetData) {
       const formData = _.cloneDeep(this.state.formData);
       formData[this.state.currentTab - 1].image = nextProps.Edit.uploadedAssetData.metaInfo.public_url;
@@ -1783,10 +1766,34 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     });
   }
 
+  handleEditSchemaOnPropsChange = (nextProps, selectedWeChatAccount) => {
+    if (!_.isEmpty(nextProps.templateDetails) && _.isEmpty(this.state.editData) && !_.isEmpty(this.state.fullSchema) && selectedWeChatAccount && (this.props.location.query.type !== 'embedded' || this.props.isFullMode === false)) {
+      this.props = nextProps;
+      const mode = nextProps.templateDetails.definition ? nextProps.templateDetails.definition.mode : nextProps.templateDetails.mode;
+      const schema = mode === "text" ? this.state.fullSchema.textSchema : this.state.fullSchema.imageSchema;
+      const isAndroidSupported = get(this, "props.Templates.selectedWeChatAccount.configs.android") === '1';
+      const isIosSupported = get(this, "props.Templates.selectedWeChatAccount.configs.ios") === '1';
+      if (!isAndroidSupported) {
+        const androidField = get(schema, "containers[0].panes[0]");
+        androidField.isSupported = false;
+        this.setState({currentTab: 2});
+        set(schema, "containers[0].panes[0]", androidField);
+      }
+      if (!isIosSupported) {
+        const iosField = get(schema, "containers[0].panes[1]");
+        iosField.isSupported = false;
+
+        set(schema, "containers[0].panes[1]", iosField);
+      }
+      this.setEditState(nextProps.templateDetails, schema);
+      this.getTags();
+    }
+  }
+
   render() {
     const schema = this.state.schema;
     const loadingContentEdit = this.state.loadingContentEdit || (this.props.location.query.module === 'dvs' && _.isEmpty(this.state.schema));
-    const spinning = this.props.isLoadingMetaEntities || loadingContentEdit || this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
+    const spinning = get(this.props, "Edit.fetchingWeCrmAccounts") || this.props.isLoadingMetaEntities || loadingContentEdit || this.props.Edit.fetchingDefaultTemplates || this.props.Edit.assetUploading || this.state.loading || (this.props.Edit && (("getTemplateDetailsInProgress" in this.props.Edit && this.props.Edit.getTemplateDetailsInProgress) || ("editTemplateInProgress" in this.props.Edit && this.props.Edit.editTemplateInProgress)));
     let tags = this.props.metaEntities && this.props.metaEntities.tags ? this.props.metaEntities.tags.standard : [];
     if (this.props.supportedTags) {
       tags = this.props.supportedTags;
@@ -1837,9 +1844,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                     <PrefixWrapper>
                       <CapIcons.backIcon onClick={this.handleClose} />
                     </PrefixWrapper>
-                      }
+                  }
 
-                    />}
+                />}
                 content={<CapTable
                   rowSelection={{
                     type: 'radio',
@@ -1878,7 +1885,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                         <div>
                           {record.ctaTemplateDetails[1] ? record.ctaTemplateDetails[1].buttonText : ''}
                         </div>
-                    ),
+                      ),
                     },
                   ]}
                 />}