@capillarytech/creatives-library 6.9.9 → 6.10.1

package/v2Containers/Templates/index.js

@@ -208,6 +208,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       queryParams.perPage = this.state.perPageLimit;
       const channel = this.state.channel;
       this.props.actions.getAllTemplates(channel, queryParams);
+      //this.getAllTemplates({});
+      // if (this.state.channel.toLowerCase() === "email") {
+      //   this.props.actions.getEdmDefaultTemplates();
+      // }
     }
 
     window.addEventListener("message", this.handleFrameTasks);
@@ -232,6 +236,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         nextProps.actions.getWeCrmAccounts();
       } else if (nextProps.route.name.toLowerCase() === 'email') {
         channel = 'Email';
+        // this.props.actions.getEdmDefaultTemplates();
       } else if (nextProps.route.name.toLowerCase() === "mobilepush") {
         this.setState({defaultAccount: true});
         channel = "mobilepush";
@@ -649,7 +654,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                 {
                   carouselContent.map(({
                     imageUrl,
-                    actionLabel,
+                    actionLabel
                   }) => (
                     <img
                       width={208}
@@ -996,7 +1001,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         break;
     }
   };
-
+  
   createTemplate(ev) {
     const type = this.props.location.query.type;
     const module = this.props.location.query.module ? this.props.location.query.module : 'default';
@@ -1115,7 +1120,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   toggleEdmEmailTemplateSelection = () => {
     this.setState( (prevState) => ({
       showEdmEmailTemplates: !prevState.showEdmEmailTemplates}), () => {
-      this.props.actions.getDefaultBeeTemplates();
+      this.props.actions.getEdmDefaultTemplates();
     });
   };
 
@@ -1410,7 +1415,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         //content = template.versions.base.messages[0].Text;
         const lineContent = template.versions.base.content;
         content = {
-          bodyText: lineContent && lineContent.messages[0].text ? lineContent.messages[0].text : '',
+          bodyText:lineContent && lineContent.messages[0].text ? lineContent.messages[0].text : '',
           bodyImage: lineContent && lineContent.messages[0].originalContentUrl ? lineContent.messages[0].originalContentUrl : '',
         };
         const modeType = lineContent && lineContent.messages[0].type;
@@ -1533,23 +1538,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
 
   isLoading = () => {
-    const { EmailCreate, Templates } = this.props;
-    const {
-      getAllTemplatesInProgress,
-      deleteTemplateInProgress,
-      fetchingWeCrmAccounts,
-      sendingFile,
-    } = Templates;
-    const lineLoader = (getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'line');
-    const smsLoader = (getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'sms');
-    const wechatLoader = (((this.state.selectedAccount !== '' && getAllTemplatesInProgress) || (fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'wechat');
-    const mobilePushLoader = (((getAllTemplatesInProgress) || (fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'mobilepush');
-    const emailLoader = (
-      (getAllTemplatesInProgress ||
-      sendingFile ||
-      deleteTemplateInProgress ||
-      EmailCreate.duplicateTemplateInProgress) && this.state.channel.toLowerCase() === 'email');
-    const ebillLoader = ((getAllTemplatesInProgress || sendingFile) && this.state.channel.toLowerCase() === 'ebill');
+    const lineLoader = (this.props.Templates.getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'line');
+    const smsLoader = (this.props.Templates.getAllTemplatesInProgress && this.state.channel.toLowerCase() === 'sms');
+    const wechatLoader = (((this.state.selectedAccount !== '' && this.props.Templates.getAllTemplatesInProgress) || (this.props.Templates.fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'wechat');
+    const mobilePushLoader = (((this.props.Templates.getAllTemplatesInProgress) || (this.props.Templates.fetchingWeCrmAccounts)) && this.state.channel.toLowerCase() === 'mobilepush');
+    const emailLoader = ((this.props.Templates.getAllTemplatesInProgress || this.props.Templates.sendingFile) && this.state.channel.toLowerCase() === 'email');
+    const ebillLoader = ((this.props.Templates.getAllTemplatesInProgress || this.props.Templates.sendingFile) && this.state.channel.toLowerCase() === 'ebill');
     const isLoading = ((wechatLoader !== undefined) ? wechatLoader : false) ||
       (smsLoader !== undefined ? smsLoader : false) ||
       (emailLoader !== undefined ? emailLoader : false) ||
@@ -1807,7 +1801,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         </CapRadio.CapRadioGroup>
       }
       {
-        channel.toUpperCase() === LINE &&
+        channel.toUpperCase() === LINE && 
           isFullMode
           ? (
             <CapRadio.CapRadioGroup className="line-filters" defaultValue={lineFilter} onChange={this.setLineFilter}>
@@ -1837,7 +1831,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
               }
             </CapRadio.CapRadioGroup>
           )
-          : () => null
+          : () => {
+            return null;
+          }
       }
       <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
         {isfilterContentVisisble && !isWechatEmbedded && <CapButton
@@ -1862,19 +1858,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const creativesParams = this.getCreativesParams();
     const templates = this.props.TemplatesList || [];
     const {route} = this.props;
-    const loadingTipMap = {
-      sendingFile: 'uploadingFile',
-      deleteTemplateInProgress: 'deletingTemplate',
-      duplicateTemplateInProgress: 'duplicatingTemplate',
-    };
-    const { sendingFile, deleteTemplateInProgress } = this.props.Templates;
-    const loadingTipIntl =
-        ((['email', 'ebill'].includes(this.state.channel.toLowerCase() === 'email')) && sendingFile && 'sendingFile') ||
-        (deleteTemplateInProgress && 'deletingTemplate') ||
-        (this.props.EmailCreate.duplicateTemplateInProgress && 'duplicatingTemplate');
-
-    const loadingTip = messages[loadingTipIntl] ? this.props.intl.formatMessage(messages[loadingTipIntl]) : this.props.intl.formatMessage(messages.gettingAllTemplates);
-
+    const loadingTip = (this.props.Templates.sendingFile && (this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill')) ? this.props.intl.formatMessage(messages.uploadingFile) : this.props.intl.formatMessage(messages.gettingAllTemplates);
     return (
       <>
         {activeMode === ACCOUNT_CHANGE_MODE && this.renderAccountSelection()}

package/v2Containers/Templates/messages.js

@@ -354,12 +354,4 @@ export default defineMessages({
     id: `${scope}.richMediaTemplates`,
     defaultMessage: 'Rich media templates',
   },
-  deletingTemplate: {
-    id: `${scope}.deletingTemplate`,
-    defaultMessage: 'Deleting template...',
-  },
-  duplicatingTemplate: {
-    id: `${scope}.duplicatingTemplate`,
-    defaultMessage: 'Duplicating template...'
-  },
 });

package/v2Containers/Templates/reducer.js

@@ -1,153 +1,145 @@
-/*
- *
- * Create reducer
- *
- */
-
-import { fromJS } from 'immutable';
-import * as types from './constants';
-
-const initialState = fromJS({
-  getAllTemplatesInProgress: false,
-  templates: [],
-  deleteResponse: {},
-  deleteTemplateInProgress: false,
-  templateError: {},
-});
-
-function templatesReducer(state = initialState, action) {
-  switch (action.type) {
-    case types.DEFAULT_ACTION:
-      return state;
-    case types.GET_ALL_TEMPLATES_REQUEST:
-      return state.set('getAllTemplatesInProgress', true).set('templateError', {});
-    case types.GET_ALL_TEMPLATES_SUCCESS:
-      if (action.isReset) {
-        return state.set('getAllTemplatesInProgress', false)
-          .set('templates', action.data ? action.data.templates : [])
-          .set('isSearch', action.data ? action.data.search : false)
-          .set('weCRMtemplates', action.weCRMTemplate ? action.weCRMTemplate : []).set('templateError', {});
-      }
-      return state.set('getAllTemplatesInProgress', false)
-        .set('templates', action.data ? state.get('templates').concat(action.data.templates) : [])
-        .set('isSearch', action.data ? action.data.search : false)
-        .set('weCRMtemplates', action.weCRMTemplate ? state.get('weCRMtemplates').concat(action.weCRMTemplate) : []);
-    case types.GET_ALL_TEMPLATES_FAILURE:
-      return state.set('getAllTemplatesInProgress', false).set('templateError', action.error);
-    case types.DELETE_TEMPLATE_REQUEST:
-      return state.set('deleteTemplateInProgress', true);
-    case types.DELETE_TEMPLATE_SUCCESS:
-      return state.set('deleteTemplateInProgress', false)
-        .set('deleteResponse', action.data);
-    case types.DELETE_TEMPLATE_FAILURE:
-      return state.set('deleteTemplateInProgress', false);
-    case types.GET_USER_LIST_REQUEST:
-      return state
-        .set('fetchingUserList', true)
-        .set('userList', fromJS({}))
-        .set('userListFetchError', false);
-    case types.GET_USER_LIST_SUCCESS:
-      return state
-        .set('fetchingUserList', false)
-        .set('userList', fromJS(action.data))
-        .set('userListFetchError', false);
-    case types.GET_USER_LIST_FAILURE:
-      return state
-        .set('fetchingUserList', false)
-        .set('userList', fromJS({}))
-        .set('userListFetchError', true);
-    case types.GET_WECRM_ACCOUNTS_REQUEST:
-      return state
-        .set('fetchingWeCrmAccounts', true)
-        .set('weCrmAccountFetchingError', false);
-    case types.GET_WECRM_ACCOUNTS_SUCCESS:
-      return state
-        .set('fetchingWeCrmAccounts', false)
-        .set('weCrmAccounts', fromJS(action.data));
-    case types.GET_WECRM_ACCOUNTS_FAILURE:
-      return state
-        .set('fetchingWeCrmAccounts', false)
-        .set('weCrmAccountFetchingError', true);
-    case types.SET_WECHAT_ACCOUNT:
-      return state
-        .set('selectedWeChatAccount', fromJS(action.weChatAccount));
-    case types.SET_LINE_ACCOUNT:
-      return state.set('selectedLineAccount', fromJS(action.lineAccount));
-    case types.RESET_ACCOUNT:
-      return state
-        .remove('selectedWeChatAccount')
-        .remove('weCrmAccounts');
-    case types.RESET_TEMPLATE:
-      return state
-        .set('weCRMtemplates', fromJS([]))
-        .set('weChatDefaultTemplate', fromJS([]))
-        .set('templates', []);
-    case types.SET_SELECTED_LAYOUT:
-      return state
-        .set('selectedEmailLayout', fromJS(action.selectedTemplate))
-        .set('edmTemplate', fromJS({}))
-        .set('BEETemplate', fromJS({}));
-    case types.RESET_UPLOAD_DATA:
-      return state
-        .set('selectedEmailLayout', "");
-    case types.SEND_ZIPPED_FILE_REQUEST:
-      return state
-        .set('sendingFile', true)
-        .set('errorSendingFile', false)
-        .set('selectedEmailLayout', "");
-    case types.SEND_ZIPPED_FILE_SUCCESS:
-      return state
-        .set('sendingFile', false)
-        .set('selectedEmailLayout', fromJS(action.selectedTemplate))
-        .set('edmTemplate', fromJS({}))
-        .set('BEETemplate', fromJS({}));
-    case types.SEND_ZIPPED_FILE_FAILURE:
-      return state
-        .set('sendingFile', false)
-        .set('errorSendingFile', true)
-        .set('errorMessage', action.data)
-        .set('selectedEmailLayout', "");
-    case types.GET_DEAFULT_BEE_TEMPLATES_REQUEST:
-      return state.set('getCmsTemplatesInProgress', true);
-    case types.GET_DEAFULT_BEE_TEMPLATES_SUCCESS:
-      return state.set('getCmsTemplatesInProgress', false)
-        .set('cmsTemplates', action.data ? fromJS(action.data.templates) : []);
-    case types.GET_DEAFULT_BEE_TEMPLATES_FAILURE:
-      return state.set('getCmsTemplatesInProgress', false);
-    case types.SET_EDM_TEMPLATE:
-      return state
-        .set('edmTemplate', fromJS(action.template))
-        .set('BEETemplate', fromJS(action.template))
-        .set('selectedEmailLayout', "");
-    case types.SET_BEE_TEMPLATE:
-      return state
-        .set('BEETemplate', fromJS(action.template))
-        .set('selectedEmailLayout', "");
-    case types.RESET_TEMPLATE_DATA:
-      return state
-        .set('edmTemplate', fromJS({}))
-        .set('BEETemplate', fromJS({}))
-        .set('selectedEmailLayout', "")
-        .set('templateDetails', fromJS({}));
-    case types.GET_TEMPLATE_DETAILS_REQUEST:
-      return state
-        .set('getTemplateDetailsInProgress', true)
-        .set('templateDetails', fromJS({}));
-    case types.GET_TEMPLATE_DETAILS_SUCCESS:
-      return state
-        .set('getTemplateDetailsInProgress', false)
-        .set('templateDetails', fromJS(action.data));
-    case types.GET_TEMPLATE_DETAILS_FAILURE:
-      return state
-        .set('getTemplateDetailsInProgress', false)
-        .set('templateDetails', fromJS({}));
-    case types.CLEAR_TEMPLATE_STORE_DATA:
-      return state
-        .set('templates', [])
-        .set('weCRMtemplates', fromJS({}));
-    default:
-      return state;
-  }
-}
-
-export default templatesReducer;
+/*
+ *
+ * Create reducer
+ *
+ */
+
+import { fromJS } from 'immutable';
+import * as types from './constants';
+
+const initialState = fromJS({
+  getAllTemplatesInProgress: false,
+  templates: [],
+  deleteResponse: {},
+  deleteTemplateInProgress: false,
+  templateError: {},
+});
+
+function templatesReducer(state = initialState, action) {
+  switch (action.type) {
+    case types.DEFAULT_ACTION:
+      return state;
+    case types.GET_ALL_TEMPLATES_REQUEST:
+      return state.set('getAllTemplatesInProgress', true).set('templateError', {});
+    case types.GET_ALL_TEMPLATES_SUCCESS:
+      if (action.isReset) {
+        return state.set('getAllTemplatesInProgress', false)
+          .set('templates', action.data ? action.data.templates : [])
+          .set('isSearch', action.data ? action.data.search : false)
+          .set('weCRMtemplates', action.weCRMTemplate ? action.weCRMTemplate : []).set('templateError', {});
+      }
+      return state.set('getAllTemplatesInProgress', false)
+        .set('templates', action.data ? state.get('templates').concat(action.data.templates) : [])
+        .set('isSearch', action.data ? action.data.search : false)
+        .set('weCRMtemplates', action.weCRMTemplate ? state.get('weCRMtemplates').concat(action.weCRMTemplate) : []);
+    case types.GET_ALL_TEMPLATES_FAILURE:
+      return state.set('getAllTemplatesInProgress', false).set('templateError', action.error);
+    case types.DELETE_TEMPLATE_REQUEST:
+      return state.set('deleteTemplateInProgress', true);
+    case types.DELETE_TEMPLATE_SUCCESS:
+      return state.set('deleteTemplateInProgress', false)
+        .set('deleteResponse', action.data);
+    case types.DELETE_TEMPLATE_FAILURE:
+      return state.set('deleteTemplateInProgress', false);
+    case types.GET_USER_LIST_REQUEST:
+      return state
+        .set('fetchingUserList', true)
+        .set('userList', fromJS({}))
+        .set('userListFetchError', false);
+    case types.GET_USER_LIST_SUCCESS:
+      return state
+        .set('fetchingUserList', false)
+        .set('userList', fromJS(action.data))
+        .set('userListFetchError', false);
+    case types.GET_USER_LIST_FAILURE:
+      return state
+        .set('fetchingUserList', false)
+        .set('userList', fromJS({}))
+        .set('userListFetchError', true);
+    case types.GET_WECRM_ACCOUNTS_REQUEST:
+      return state
+        .set('fetchingWeCrmAccounts', true)
+        .set('weCrmAccountFetchingError', false);
+    case types.GET_WECRM_ACCOUNTS_SUCCESS:
+      return state
+        .set('fetchingWeCrmAccounts', false)
+        .set('weCrmAccounts', fromJS(action.data));
+    case types.GET_WECRM_ACCOUNTS_FAILURE:
+      return state
+        .set('fetchingWeCrmAccounts', false)
+        .set('weCrmAccountFetchingError', true);
+    case types.SET_WECHAT_ACCOUNT:
+      return state
+        .set('selectedWeChatAccount', fromJS(action.weChatAccount));
+    case types.SET_LINE_ACCOUNT:
+      return state.set('selectedLineAccount', fromJS(action.lineAccount));
+    case types.RESET_ACCOUNT:
+      return state
+        .remove('selectedWeChatAccount')
+        .remove('weCrmAccounts');
+    case types.RESET_TEMPLATE:
+      return state
+        .set('weCRMtemplates', fromJS([]))
+        .set('weChatDefaultTemplate', fromJS([]))
+        .set('templates', []);
+    case types.SET_SELECTED_LAYOUT:
+      return state
+        .set('selectedEmailLayout', fromJS(action.selectedTemplate))
+        .set('edmTemplate', fromJS({}));
+    case types.RESET_UPLOAD_DATA:
+      return state
+        .set('selectedEmailLayout', "");
+    case types.SEND_ZIPPED_FILE_REQUEST:
+      return state
+        .set('sendingFile', true)
+        .set('errorSendingFile', false)
+        .set('selectedEmailLayout', "");
+    case types.SEND_ZIPPED_FILE_SUCCESS:
+      return state
+        .set('sendingFile', false)
+        .set('selectedEmailLayout', fromJS(action.selectedTemplate))
+        .set('edmTemplate', fromJS({}));
+    case types.SEND_ZIPPED_FILE_FAILURE:
+      return state
+        .set('sendingFile', false)
+        .set('errorSendingFile', true)
+        .set('errorMessage', action.data)
+        .set('selectedEmailLayout', "");
+    case types.GET_EDM_DEAFULT_TEMPLATES_REQUEST:
+      return state.set('getCmsTemplatesInProgress', true);
+    case types.GET_EDM_DEAFULT_TEMPLATES_SUCCESS:
+      return state.set('getCmsTemplatesInProgress', false)
+        .set('cmsTemplates', action.data ? fromJS(action.data.templates) : []);
+    case types.GET_EDM_DEAFULT_TEMPLATES_FAILURE:
+      return state.set('getCmsTemplatesInProgress', false);
+    case types.SET_EDM_TEMPLATE:
+      return state
+        .set('edmTemplate', fromJS(action.template))
+        .set('selectedEmailLayout', "");
+    case types.RESET_TEMPLATE_DATA:
+      return state
+        .set('edmTemplate', fromJS({}))
+        .set('selectedEmailLayout', "")
+        .set('templateDetails', fromJS({}));
+    case types.GET_TEMPLATE_DETAILS_REQUEST:
+      return state
+        .set('getTemplateDetailsInProgress', true)
+        .set('templateDetails', fromJS({}));
+    case types.GET_TEMPLATE_DETAILS_SUCCESS:
+      return state
+        .set('getTemplateDetailsInProgress', false)
+        .set('templateDetails', fromJS(action.data));
+    case types.GET_TEMPLATE_DETAILS_FAILURE:
+      return state
+        .set('getTemplateDetailsInProgress', false)
+        .set('templateDetails', fromJS({}));
+    case types.CLEAR_TEMPLATE_STORE_DATA:
+      return state
+        .set('templates', [])
+        .set('weCRMtemplates', fromJS({}));
+    default:
+      return state;
+  }
+}
+
+export default templatesReducer;