@capillarytech/creatives-library 7.17.193-alpha.0 → 7.17.193-alpha.2

package/package.json

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

package/v2Containers/MobilePush/Edit/index.js

@@ -105,25 +105,14 @@ 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();
     }
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 112', selectedWeChatAccount);
-      } else {
-        selectedWeChatAccount = nextProps.Templates.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> else 115', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-        selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> else if 119', selectedWeChatAccount);
-    }
-
-    // const selectedWeChatAccount = (!_.isEmpty(this.props.Templates.selectedWeChatAccount) ? this.props.Templates.selectedWeChatAccount :
-    // (!_.isEmpty(this.props.Edit.selectedWeChatAccount) ? this.props.Edit.selectedWeChatAccount : nextProps.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, get(this.props, "templateData.definition.accountId"));
     }
+    if (!_.isEqual(this.props.Edit.selectedWeChatAccount?.id, this.props.Edit.templateDetails?.definition?.accountId)) {
+      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 = {
         name: '',
@@ -228,17 +217,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   onLinkTypeChange = (eventTriggered, formData, field, currentTab, inputSchema) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 235', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 239', selectedWeChatAccount);
-    }
-    //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 : this.props.Edit.selectedWeChatAccount);
     const schema = inputSchema ? _.cloneDeep(inputSchema) : _.cloneDeep(this.state.schema);
     const tabIndex = currentTab || this.state.currentTab;
     const inputFields = get(schema, `containers[0].panes[${tabIndex - 1}].sections[0].childSections[0].childSections[0].inputFields`);
@@ -355,17 +334,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   getTransformedData = (formData) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 362', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 366', selectedWeChatAccount);
-    }
-    //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 : this.props.Edit.selectedWeChatAccount);
     const obj = _.cloneDeep(this.state.editData);
     obj.versions = {
       base: {},
@@ -595,17 +564,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   getLinkName = (link) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 602', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 606', selectedWeChatAccount);
-    }
-    // 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 : this.props.Edit.selectedWeChatAccount);
     const ck = selectedWeChatAccount.configs ? !!selectedWeChatAccount.configs.deeplink : false;
     const deepLinkOptions = _.filter(JSON.parse(ck ? selectedWeChatAccount.configs.deeplink : '[]'), (l) => l.link === link);
     if (deepLinkOptions[0]) {
@@ -1004,17 +963,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   showSelectedIosCta = (inputSchema, field, tab, selectedConfig) => {
     const currentTab = tab || this.state.currentTab;
     const schema = inputSchema ? _.cloneDeep(inputSchema) : _.cloneDeep(this.state.schema);
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 1011', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 1015', selectedWeChatAccount);
-    }
-    // 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 : this.props.Edit.selectedWeChatAccount);
     const ck = selectedWeChatAccount.configs ? !!selectedWeChatAccount.configs.deeplink : false;
     const deepLinkOptions = _.map(JSON.parse(ck ? selectedWeChatAccount.configs.deeplink : '[]'), (link) => ({label: link.name, value: link.link, title: link.link }) );
 
@@ -1142,17 +1091,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   deletePrimaryCTA = (event) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 1149', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 1153', selectedWeChatAccount);
-    }
-    // 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 : this.props.Edit.selectedWeChatAccount);
     const id = event.currentTarget.id;
     const schema = _.cloneDeep(this.state.schema);
     // const eventsMap = _.cloneDeep(this.state.eventsMap);
@@ -1252,17 +1191,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   deleteSecondaryCTA = (event) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 1259', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 1263', selectedWeChatAccount);
-    }
-    //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 : this.props.Edit.selectedWeChatAccount);
     const id = event.currentTarget.id;
     if (id === "secondary-cta-0-delete") {
       const secCta2 = document.getElementById("secondary-cta-1-delete");
@@ -1635,17 +1564,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   showCtaKeys = (eventTriggered, formData, field, tabIndex, schemaInput) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 1642', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 1646', selectedWeChatAccount);
-    }
-    // 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 : this.props.Edit.selectedWeChatAccount);
     const currentTab = tabIndex || this.state.currentTab;
     const schema = _.cloneDeep(schemaInput || this.state.schema);
     const eventsMap = _.cloneDeep(this.state.eventsMap);
@@ -1700,17 +1619,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     return schema;
   };
   addPrimaryCta = (flag, formData, field, inputSchema, currentTab) => {
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 1707', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 1711', selectedWeChatAccount);
-    }
-    // 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 : this.props.Edit.selectedWeChatAccount);
     const id = field.id;
     const schema = inputSchema ? _.cloneDeep(inputSchema) : _.cloneDeep(this.state.schema);
     const ck = selectedWeChatAccount.configs ? !!selectedWeChatAccount.configs.deeplink : false;
@@ -1743,17 +1652,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     const tabIndex = currentTab || this.state.currentTab;
     const formDataCopy = cloneDeep(formData);
     const schema = inputSchema ? _.cloneDeep(inputSchema) : _.cloneDeep(this.state.schema);
-    let selectedWeChatAccount = {};
-    if(this.props.location.pathname === '/mobilepush/edit') {
-      if(!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-        selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
-        console.log('selectedWeChatAccount---> if 1746', selectedWeChatAccount);
-      }
-    }else if(!_.isEmpty(this.props.Templates.selectedWeChatAccount)){
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
-      console.log('selectedWeChatAccount---> else 1754', selectedWeChatAccount);
-    }
-   //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 : this.props.Edit.selectedWeChatAccount);
     const ck = selectedWeChatAccount.configs ? !!selectedWeChatAccount.configs.deeplink : false;
     const deepLinkOptions = selectedWeChatAccount ? _.map(JSON.parse(ck ? selectedWeChatAccount.configs.deeplink : '[]'), (link) => ({label: link.name, value: link.link, title: link.link }) ) : [];
     const inputFields = get(schema, `containers[0].panes[${tabIndex - 1}].sections[0].childSections[0].childSections[0].inputFields`);