@capillarytech/creatives-library 8.0.26 → 8.0.27

package/v2Containers/Line/Container/tests/index.test.js

@@ -1,16 +1,17 @@
 import React from 'react';
-// import { browserHistory } from 'react-router';
+import { browserHistory } from 'react-router';
 import { Provider } from 'react-redux';
 import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils';
-import history from '../../../../utils/history';
+import { createBrowserHistory } from 'history';
 import { initialReducer } from '../../../../initialReducer';
 import { mountWithIntl } from '../../../../helpers/intl-enzym-test-helpers';
 import { LineContainer } from '../index';
 import { mockData } from './mockData';
 
 let store;
+let browserHistory = createBrowserHistory();
 beforeAll(() => {
-  store = configureStore({}, initialReducer, history);
+  store = configureStore({}, initialReducer, browserHistory);
 });
 
 jest.mock('../Wrapper', () => ({

package/v2Containers/MobilePush/Edit/index.js

@@ -122,11 +122,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     const { id: selectedWeChatAccountId } = editSelectedWeChatAccount || {};
     const { definition } = templateDetails || {};
     const { accountId: templateAccountId } = definition || {};
-    const { Edit: nextEdit } = nextProps || {};
+    const { Templates: nextTemplates, Edit: nextEdit } = nextProps || {};
     if (isEmbeddedEditOrPreview(queryType, creativesMode)) {
       selectedWeChatAccount = !_.isEmpty(editSelectedWeChatAccount)
         ? editSelectedWeChatAccount
-        : nextEdit?.selectedWeChatAccount;
+        : nextTemplates?.selectedWeChatAccount;
     } else if (!_.isEmpty(Templates?.selectedWeChatAccount)) {
       selectedWeChatAccount = Templates?.selectedWeChatAccount;
     }
@@ -159,11 +159,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     ) {
       this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, templateAccountId);
     }
-    if (!_.isEmpty(nextEdit?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
+    if (!_.isEmpty(nextTemplates?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
       const params = {
         name: '',
         sortBy: 'Most Recent',
-        accountId: nextEdit?.selectedWeChatAccount?.id,
+        accountId: nextTemplates?.selectedWeChatAccount?.id,
       };
       this.props.actions.getMobilepushTemplatesList('mobilepush', params);
     }
@@ -174,8 +174,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         if (nextProps.location.query.module !== 'loyalty' && templateId && templateId !== 'temp') {
           this.props.actions.getTemplateDetails(templateId);
         }
-        const type = this.props.location.query.type;
-        if (type === 'embedded' && templateId === 'temp' && _.isEmpty(this.state.formData)) { // when his.props.params.id is temp that means mobile push template content will be passed from post message from parent with startTemplateCreation action
+        if (queryType === EMBEDDED && templateId === 'temp' && _.isEmpty(this.state.formData)) { // when his.props.params.id is temp that means mobile push template content will be passed from post message from parent with startTemplateCreation action
           const response = {
             action: 'startTemplateCreation',
           };
@@ -183,12 +182,12 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           this.getTags();
         }
       });
-      if (this.props.location.query.type === 'embedded') {
+      if (queryType === EMBEDDED) {
         this.showNext();
       }
     }
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && nextProps.Edit.mobilepushTemplates && !_.isEqual(nextProps.Edit.mobilepushTemplates, this.props.Edit.mobilepushTemplates)) { //used inloyalty
-      if (nextProps.location.query.type === 'embedded' && nextProps.location.query.module === 'loyalty') {
+      if (nextProps.location.query.type === EMBEDDED && nextProps.location.query.module === 'loyalty') {
         this.setTemplateOptions(nextProps.Edit.mobilepushTemplates);
       }
     }