@capillarytech/creatives-library 2.0.90 → 2.0.91

package/v2Containers/Templates/index.js

@@ -15,7 +15,7 @@ import moment from "moment";
 import _ from 'lodash';
 import { bindActionCreators } from 'redux';
 import { Modal} from 'antd';
-import {CapMenu, CapDropdown, CapButton, CapInput, CapIcon, CapSelect, CapPopover, CapSpin, CapCustomCard, CapRow, CapSlideBox, CapLink, CapHeading} from '@capillarytech/cap-ui-library';
+import {CapMenu, CapDropdown, CapButton, CapInput, CapIcon, CapSelect, CapPopover, CapSpin, CapCustomCard, CapRow, CapSlideBox, CapLink, CapHeading, CapNotification} from '@capillarytech/cap-ui-library';
 import { makeSelectTemplates, makeSelectTemplatesResponse } from './selectors';
 import { makeSelectCreate as makeSelectCreateSms} from '../Sms/Create/selectors';
 import { makeSelectCreate as makeSelectCreateMobilePush } from '../MobilePush/Create/selectors';
@@ -38,7 +38,6 @@ import config from '../../config/app';
 import './_templates.scss';
 import * as globalActions from '../Cap/actions';
 import { makeSelectAuthenticated } from '../Cap/selectors';
-import {getMessageObject} from '../../utils/messageUtils';
 import * as commonUtil from '../../utils/common';
 import Pagination from '../../v2Components/Pagination';
 import EmailPreview from '../../v2Components/EmailPreview';
@@ -259,36 +258,36 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       if (this.state.channel.toLowerCase() === "mobilepush" && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
         params.accountId = nextProps.Templates.selectedWeChatAccount.id;
       }
-      const message = getMessageObject('success', `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`, true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`;
+      CapNotification.success({key: 'duplicateSuccess', message});
       this.getAllTemplates({params});
       this.props.mobilepushActions.clearCreateResponse();
     }
 
     if (this.state.channel.toLowerCase() === "ebill" && nextProps.CreateEbill && nextProps.CreateEbill.createResponse && nextProps.CreateEbill.createResponse.templateId && nextProps.CreateEbill.createResponse.templateId !== '') {
-      const message = getMessageObject('success', `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`, true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`;
+      CapNotification.success({key: 'duplicateSucess', message});
       this.getAllTemplates({params, resetPage: true});
       this.props.ebillActions.clearStoreValues();
     }
 
     if (this.state.channel.toLowerCase() === "email" && nextProps.EmailCreate && nextProps.EmailCreate.duplicateResponse && nextProps.EmailCreate.duplicateResponse.templateId && nextProps.EmailCreate.duplicateResponse.templateId !== '') {
-      const message = getMessageObject('success', `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`, true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`;
+      CapNotification.success({key: 'duplicateSucess', message});
       this.getAllTemplates({params, resetPage: true});
       this.props.emailActions.clearStoreValues();
     }
 
     if (this.state.channel.toLowerCase() === "line" && nextProps.Line && nextProps.Line.response && nextProps.Line.response.templateId && nextProps.Line.response.templateId !== '') {
-      const message = getMessageObject('success', `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`, true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`;
+      CapNotification.success({key: 'duplicateSuccess', message});
       this.getAllTemplates({params, resetPage: true});
       this.props.lineActions.clearCreateResponse();
     }
 
     if (nextProps.Create && this.props.Create && nextProps.Create.createTemplateError && !_.isEqual(nextProps.Create.createTemplateError, this.props.Create.createTemplateError)) {
-      const message = getMessageObject('error', this.props.intl.formatMessage(messages.somethingWentWrong), true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = this.props.intl.formatMessage(messages.somethingWentWrong);
+      CapNotification.error({key: 'somethingWrong', message});
       if (this.state.channel.toLowerCase() === "sms") {
         this.props.smsActions.clearCreateResponse();
       } else if (this.state.channel.toLowerCase() === "mobilepush") {
@@ -305,8 +304,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     }
     if (!nextProps.Templates.deleteTemplateInProgress && !_.isEqual(nextProps.Templates.deleteTemplateInProgress, this.props.Templates.deleteTemplateInProgress) &&
     nextProps.Templates.deleteResponse) {
-      const message = getMessageObject('success', `${this.state.channel.toUpperCase()} ${this.props.intl.formatMessage(messages['Template deleted successfully'])}`, true);
-      nextProps.globalActions.addMessageToQueue(message);
+      const message = `${this.state.channel.toUpperCase()} ${this.props.intl.formatMessage(messages['Template deleted successfully'])}`;
+      CapNotification.success({key: 'deleteSucess', message});
       this.getAllTemplates({params, resetPage: true});
     }
 
@@ -330,8 +329,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       if (nextProps.Templates.errorMessage && nextProps.Templates.errorMessage !== "") {
         errorMessage = nextProps.Templates.errorMessage;
       }
-      const message = getMessageObject('error', errorMessage, true);
-      nextProps.globalActions.addMessageToQueue(message);
+      CapNotification.error({key: 'uploadError', message: errorMessage});
     }
 
     if (!_.isEmpty(nextProps.Templates.templateDetails) && !_.isEqual(nextProps.Templates.templateDetails, this.props.Templates.templateDetails)) {
@@ -661,8 +659,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       };
       reader.readAsText(files[0]);
     } else {
-      const message = getMessageObject('error', this.props.intl.formatMessage(messages.invalidUploadFileError), true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = this.props.intl.formatMessage(messages.invalidUploadFileError);
+      CapNotification.error({key: 'uploadError', message});
     }
   };
 
@@ -867,8 +865,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           type = this.props.location.query.type;
           if (this.props.Templates && this.props.Templates.selectedWeChatAccount && this.props.Templates.selectedWeChatAccount.configs && (_.isEmpty(this.props.Templates.selectedWeChatAccount.configs.wechat_app_id) || _.isEmpty(this.props.Templates.selectedWeChatAccount.configs.wechat_app_secret))) {
             const errorMessage = this.props.intl.formatMessage(messages.wechatAccountNotConfigured);
-            const message = getMessageObject('error', errorMessage, true);
-            this.props.globalActions.addMessageToQueue(message);
+            CapNotification.error({key: 'wechatError', message: errorMessage});
           } else {
             this.props.router.push({
               pathname: `/wechat/richmedia/create`,
@@ -967,8 +964,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.state.channel.toLowerCase() === "sms") {
       this.props.smsActions.createTemplate(duplicateObj, (response) => {
         if (response && response.templateId) {
-          const message = getMessageObject('success', `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`, true);
-          this.props.globalActions.addMessageToQueue(message);
+          const message = `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`;
+          CapNotification.success({key: 'duplicateSucess', message});
+
           this.getAllTemplates({params, resetPage: true});
           this.props.smsActions.clearCreateResponse();
         }
@@ -1570,6 +1568,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
           value={this.state.searchText}
           onChange={(e) => this.searchTemplate(e.target.value)}
           disabled={this.checkSearchDisabled()}
+          onClear={() => this.searchTemplate('')}
         />
         <div style={{display: "flex", justifyContent: "space-between", alignItems: 'center'}}>
           {(this.props.location.query.type === 'embedded' ) ? pageHeaderDvs : pageHeader}