@capillarytech/creatives-library 7.17.194 → 7.17.195

package/package.json

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

package/v2Containers/MobilePush/Edit/constants.js

@@ -35,3 +35,6 @@ export const GET_MOBILEPUSH_TEMPLATES_LIST_SUCCESS = 'app/v2Containers/WeChat/GE
 export const GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE = 'app/v2Containers/WeChat/GET_MOBILEPUSH_TEMPLATES_LIST_FAILURE';
 
 export const MAPP_SDK = 'MAPP_SDK';
+export const EMBEDDED = 'EMBEDDED';
+export const EDIT = 'EDIT';
+export const PREVIEW = 'PREVIEW';

package/v2Containers/MobilePush/Edit/index.js

@@ -34,7 +34,7 @@ import { GA } from '@capillarytech/cap-ui-utils';
 import { EDIT, TRACK_EDIT_MPUSH } from '../../App/constants';
 import { MOBILE_PUSH } from '../../CreativesContainer/constants';
 import { getCdnUrl } from '../../../utils/cdnTransformation';
-import { MAPP_SDK } from './constants';
+import { EMBEDDED, MAPP_SDK, PREVIEW } from './constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -107,7 +107,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.startValidation();
     }
     let selectedWeChatAccount = {};
-    if (this.props.location.query.type === 'embedded' && (this.props.creativesMode === 'edit' || this.props.creativesMode === 'preview')) {
+    if (this.props.location.query.type === EMBEDDED.toLowerCase() && (this.props.creativesMode === EDIT.toLowerCase() || this.props.creativesMode === PREVIEW.toLowerCase())) {
       if (!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
         selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
       } else {
@@ -120,7 +120,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     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 (this.props.location.query.type === 'embedded' && (this.props.creativesMode === 'edit' || this.props.creativesMode === 'preview') && !_.isEqual(this.props.Edit.selectedWeChatAccount?.id, this.props.Edit.templateDetails?.definition?.accountId)) {
+    // Check if the query type is 'embedded' and the creatives mode is either 'edit' or 'preview'. Also, ensure that the selected WeChat account ID is not equal to the account ID in the template details.
+   // If all conditions are met, set the mobile push account options using the provided weCrmAccounts and the account ID from templateData.
+    if (this.props.location.query.type === EMBEDDED.toLowerCase() && (this.props.creativesMode === EDIT.toLowerCase() || this.props.creativesMode === PREVIEW.toLowerCase()) && !_.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") {
@@ -228,10 +230,10 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   getWeChatAccount = () => {
     let selectedWeChatAccount = {};
-    const {type = ''} = this.props.location.query;
+    const {type = ''} = this.props.location?.query;
     const {creativesMode = ''} = this.props;
 
-    if (type === 'embedded' && (creativesMode === 'edit' || creativesMode === 'preview')) {
+    if (type === EMBEDDED.toLowerCase() && (creativesMode === EDIT.toLowerCase() || creativesMode === PREVIEW.toLowerCase())) {
       if (!_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
         selectedWeChatAccount = this.props.Edit.selectedWeChatAccount;
       } else {
@@ -368,8 +370,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     };
     obj.type = 'MOBILEPUSH';
     obj.name = formData['template-name'];
-    if (this.props.location.query.type === 'embedded' && (this.props.creativesMode === 'edit' || this.props.creativesMode === 'preview')) {
-      if (this.props.Edit.selectedWeChatAccount?.sourceTypeName === MAPP_SDK) {
+    if (this.props.location.query.type === EMBEDDED.toLowerCase() && (this.props.creativesMode === EDIT.toLowerCase() || this.props.creativesMode === PREVIEW.toLowerCase())) {
+      if (get(this.props, 'Edit.selectedWeChatAccount.sourceTypeName') === MAPP_SDK) {
         obj.definition = {
           accountId: selectedWeChatAccount.id,
           licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
@@ -384,7 +386,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           sourceType: selectedWeChatAccount.sourceTypeName,
         };
       }
-    } else if (this.props.Templates.selectedWeChatAccount?.sourceTypeName === MAPP_SDK) {
+    } else if (get(this.props, 'Templates.selectedWeChatAccount.sourceTypeName') === MAPP_SDK) {
       obj.definition = {
         accountId: selectedWeChatAccount.id,
         licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
@@ -1522,7 +1524,7 @@ 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") {
-          if (this.props.location.query.type === 'embedded' && (this.props.creativesMode === 'edit' || this.props.creativesMode === 'preview') && this.props.Edit.selectedWeChatAccount && !_.isEmpty(this.props.Edit.selectedWeChatAccount)) {
+          if (this.props.location.query.type === EMBEDDED.toLowerCase() && (this.props.creativesMode === EDIT.toLowerCase() || this.props.creativesMode === PREVIEW.toLowerCase()) && 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;
@@ -1748,7 +1750,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         if (!_.isEmpty(actionText)) {
           this.deleteSecondaryCtaIos();
         }
-        if ((this.props.location.query.type === 'embedded' && (this.props.creativesMode === 'edit' || this.props.creativesMode === 'preview'))) {
+        if ((this.props.location.query.type === EMBEDDED.toLowerCase() && (this.props.creativesMode === EDIT.toLowerCase() || this.props.creativesMode === PREVIEW.toLowerCase()))) {
           this.props.actions.getIosCtas(this.props.Edit.selectedWeChatAccount.sourceAccountIdentifier);
         } else {
           this.props.actions.getIosCtas(this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier);