@capillarytech/creatives-library 7.17.199 → 7.17.200

package/package.json

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

package/utils/commonUtils.js

@@ -24,5 +24,5 @@ export const addBaseToTemplate = (template) => {
   return template;
 };
 
-export const isEmbeddedEditOrPreview = (queryType, creativesMode) => queryType === EMBEDDED.toLowerCase() &&
-         (creativesMode === EDIT.toLowerCase() || creativesMode === PREVIEW.toLowerCase());
+export const isEmbeddedEditOrPreview = (queryType, creativesMode) => queryType === EMBEDDED &&
+  [EDIT, PREVIEW].include(creativesMode);

package/v2Containers/MobilePush/Edit/index.js

@@ -230,18 +230,22 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   };
 
   getWeChatAccount = () => {
+    const { location, creativesMode, Edit: EditProps, Templates } = this.props || {};
+    const { query } = location || {};
+    const { selectedWeChatAccount: editSelectedWeChatAccount } = EditProps || {};
+    const { selectedWeChatAccount: templateSelectedWeChatAccount } = Templates || {};
+    const queryType = String(get(query, 'type', '')).toLowerCase();
+    const mode = String(creativesMode).toLowerCase();
     let selectedWeChatAccount = {};
-    const queryType = String(get(this.props, 'location.query.type', ''))?.toLowerCase();
-    const creativesMode = String(get(this.props, 'creativesMode', ''))?.toLowerCase();
-    if (isEmbeddedEditOrPreview(queryType, creativesMode)) {
-      selectedWeChatAccount = !_.isEmpty(this.props.Edit.selectedWeChatAccount)
-        ? this.props.Edit.selectedWeChatAccount
-        : this.props.Templates.selectedWeChatAccount;
-    } else if (!_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
-      selectedWeChatAccount = this.props.Templates.selectedWeChatAccount;
+    if (isEmbeddedEditOrPreview(queryType, mode)) {
+      selectedWeChatAccount = !_.isEmpty(editSelectedWeChatAccount)
+        ? editSelectedWeChatAccount
+        : templateSelectedWeChatAccount;
+    } else if (!_.isEmpty(templateSelectedWeChatAccount)) {
+      selectedWeChatAccount = templateSelectedWeChatAccount;
     }
     return selectedWeChatAccount;
-  }
+  };
 
   onLinkTypeChange = (eventTriggered, formData, field, currentTab, inputSchema) => {
     const selectedWeChatAccount = this.getWeChatAccount();
@@ -1520,12 +1524,16 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           temp.options = this.state.templateOptions ? this.state.accountsOptions : [];
         }
         if (temp.id === "mobile-push-preview") {
-          const queryType = String(get(this.props, 'location.query.type', ''))?.toLowerCase();
-          const creativesMode = String(get(this.props, 'creativesMode', ''))?.toLowerCase();
-          if (isEmbeddedEditOrPreview(queryType, creativesMode) && this.props.Edit.selectedWeChatAccount && !_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
-            temp.content.appName = this.props.Edit.selectedWeChatAccount.name;
-          } else if (this.props.Templates.selectedWeChatAccount && !_.isEmpty(this.props.Templates.selectedWeChatAccount)) {
-            temp.content.appName = this.props.Templates.selectedWeChatAccount.name;
+          const { location, creativesMode, Edit: EditProps, Templates } = this.props || {};
+          const { query } = location || {};
+          const { selectedWeChatAccount: editSelectedWeChatAccount } = EditProps || {};
+          const { selectedWeChatAccount: templateSelectedWeChatAccount } = Templates || {}; 
+          const queryType = String(get(query, 'type', ''))?.toLowerCase();
+          const mode = String(creativesMode).toLowerCase();
+          if (isEmbeddedEditOrPreview(queryType, mode) && !_.isEmpty(editSelectedWeChatAccount)) {
+            temp.content.appName = editSelectedWeChatAccount?.name;
+          } else if (!_.isEmpty(templateSelectedWeChatAccount)) {
+            temp.content.appName = templateSelectedWeChatAccount?.name;
           }
         }
         _.forEach(col.supportedEvents, (event) => {