@capillarytech/creatives-library 8.0.25 → 8.0.27

package/package.json

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

package/v2Containers/Cap/index.js

@@ -46,7 +46,6 @@ import { v2SmsCreateSagas } from '../Sms/Create/sagas';
 import { v2EbillSagas } from '../Ebill/sagas';
 import { v2EmailDuplicateTemplateSaga } from '../Email/sagas';
 import { v2LineContainerSagas } from '../Line/Container/sagas'
-import { v2ZaloSagas } from '../Zalo/saga'; 
 import { v2MobilePushCreateSagas } from '../MobilePush/Create/sagas';
 import { v2WechatMapTemplatesSagas } from '../WeChat/MapTemplates/sagas';
 import { v2RcsSagas } from '../Rcs/sagas';
@@ -616,7 +615,6 @@ const withEmailSaga = injectSaga({ key: 'email', saga: v2EmailDuplicateTemplateS
 const withLineContainerSaga = injectSaga({ key: 'lineCreate', saga: v2LineContainerSagas });
 const withMobilePushCreateSaga = injectSaga({ key: 'mobileCreate', saga: v2MobilePushCreateSagas });
 const withWechatMapTemplatesSaga = injectSaga({ key: 'weChatMapTemplate', saga: v2WechatMapTemplatesSagas });
-const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 const withRcsSaga = injectSaga({ key: 'rcs', saga: v2RcsSagas });
 const withInAppSaga = injectSaga({ key: 'inapp', saga: v2InAppSagas });
 const withViberSaga = injectSaga({ key: 'viber', saga: v2ViberSagas });
@@ -630,7 +628,6 @@ export default compose(
   withMobilePushCreateSaga,
   withWechatMapTemplatesSaga,
   withRcsSaga,
-  withZaloSaga,
   withInAppSaga,
   withViberSaga,
   withFacebookSaga,

package/v2Containers/CreativesContainer/index.js

@@ -448,7 +448,7 @@ export class Creatives extends React.Component {
             } = {},
           } = templateData;
           const mediaParams = {};
-          const { url = '', previewUrl = '', docParams = {}, footer = '', headerVarMapped = {}, headerTemplate = ''} = whatsappMedia;
+          const { url = '', previewUrl = '', docParams = {}, footer = '', headerVarMapped = {}, headerTemplate = ''} = whatsappMedia || {};
           switch (mediaType) {
             case (WHATSAPP_MEDIA_TYPES.IMAGE):
               mediaParams.imageUrl = url;

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);
       }
     }

package/v2Containers/Zalo/index.js

@@ -52,6 +52,7 @@ import injectSaga from '../../utils/injectSaga';
 import injectReducer from '../../utils/injectReducer';
 import * as globalActions from '../Cap/actions';
 import v2ZaloReducer from './reducer';
+import { v2ZaloSagas } from './saga';
 
 export const Zalo = (props) => {
   const {
@@ -505,6 +506,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 
 const withReducer = injectReducer({ key: 'zalo', reducer: v2ZaloReducer });
+const withZaloSaga = injectSaga({ key: 'zalo', saga: v2ZaloSagas });
 
 export default withCreatives({
   WrappedComponent: Zalo,
@@ -512,4 +514,5 @@ export default withCreatives({
   mapDispatchToProps,
   userAuth: true,
   reducers: [withReducer],
+  sagas: [withZaloSaga],
 });