@capillarytech/creatives-library 3.0.5 → 3.0.6

package/v2Containers/Email/index.js

@@ -285,14 +285,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       if (!_.isEmpty(this.state.schema)) {
         const schema = _.cloneDeep(this.state.schema);
 
-        const formData = _.cloneDeep(this.state.formData);
-        const container = schema.containers[0];
         // const baseLanguage = this.props.currentOrgDetails.basic_details.base_language;
-        if (baseLanguage === formData[0].activeTab) {
-          container.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: "none"};
-        } else {
-          container.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: ""};
-        }
+
         this.setState({schema, loadingStatus: this.state.loadingStatus + 1});
       }
 
@@ -338,7 +332,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         }
       }
 
-      if (!_.isEmpty(nextProps.Email.CmsSettings) && !_.isEqual(this.props.Email.CmsSettings, nextProps.Email.CmsSettings)) {
+      if (!_.isEmpty(nextProps.Email.CmsSettings) && !_.isEqual(this.props.Email.CmsSettings, nextProps.Email.CmsSettings) && !_.isEmpty(this.state.schema)) {
         const apiLangId = nextProps.Email.CmsSettings.langId;
         const langId = nextProps.Email.CmsSettings.langId !== "undefined" ? nextProps.Email.CmsSettings.langId : nextProps.currentOrgDetails.basic_details.base_language;
 
@@ -348,11 +342,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         const langIndex = formData[this.state.currentTab - 1].selectedLanguages.indexOf(langId);
 
         const temp = schema.containers[this.state.currentTab - 1];
-        if (baseLanguage === langId && (apiLangId === "undefined" || apiLangId === formData[this.state.currentTab - 1].activeTab)) {
-          temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: "none"};
-        } else if (apiLangId === "undefined" || apiLangId === formData[this.state.currentTab - 1].activeTab) {
-          temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: ""};
-        }
+
 
         if (nextProps.Email.CmsSettings.isDragDrop) {
           formData[`${this.state.currentTab - 1}`][langId][`edmeditor${this.state.currentTab > 1 ? this.state.currentTab : ''}src`] = nextProps.Email.CmsSettings.url;
@@ -409,8 +399,9 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         });
       }
       if (nextProps.Email.createTemplateError && !_.isEqual(nextProps.Email.createTemplateError, this.props.Email.createTemplateError)) {
-        const message = getMessageObject('error', (nextProps.Email.createTemplateErrorMessage && nextProps.Email.createTemplateErrorMessage !== '') ? nextProps.Email.createTemplateErrorMessage : this.props.intl.formatMessage(messages.somethingWentWrong), true);
-        this.props.globalActions.addMessageToQueue(message);
+        const message = (nextProps.Email.createTemplateErrorMessage && nextProps.Email.createTemplateErrorMessage !== '') ? nextProps.Email.createTemplateErrorMessage : this.props.intl.formatMessage(messages.somethingWentWrong);
+        CapNotification.error({key: 'createTemplateError', message});
+        this.stopValidation();
       }
       if (!nextProps.Email.fetchingCmsData && !_.isEqual(nextProps.Email.cmsData, this.props.Email.cmsData) && !_.isEmpty(nextProps.Email.cmsData)) {
         const formData = _.cloneDeep(this.state.formData);
@@ -493,8 +484,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       }
 
       if ( !_.isEqual(nextProps.Email.assetUploading, this.props.Email.assetUploading) && !nextProps.Email.assetUploading && !nextProps.Email.uploadAssetSuccess) {
-        const message = getMessageObject('error', this.props.intl.formatMessage(messages.assetUploadFailed), true);
-        this.props.globalActions.addMessageToQueue(message);
+        const message = this.props.intl.formatMessage(messages.assetUploadFailed);
+        CapNotification.error({key: 'uploadAssesIssue', message});
       }
 
       if (!_.isEqual(nextProps.currentOrgDetails.basic_details.supported_languages, this.props.currentOrgDetails.basic_details.supported_languages)) {
@@ -634,11 +625,11 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       // this.resetSchema();
       let message;
       if (this.state.isEdit) {
-        message = getMessageObject('success', this.props.intl.formatMessage(messages.emailEditSuccess), true);
+        message = this.props.intl.formatMessage(messages.emailEditSuccess);
       } else {
-        message = getMessageObject('success', this.props.intl.formatMessage(messages.emailCreateSuccess), true);
+        message = this.props.intl.formatMessage(messages.emailCreateSuccess);
       }
-      CapNotification.success({message});
+      CapNotification.success({message, key: 'create-template-succes'});
       const module = this.props.location.query.module ? this.props.location.query.module : 'default';
       const type = this.props.location.query.type;
       const isLanguageSupport = this.props.location.query.isLanguageSupport || false;
@@ -660,7 +651,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     let supportedLanguages = [];
     if (!_.isEmpty(currentOrgDetails)) {
       const {basic_details} = currentOrgDetails;
-      supportedLanguages = basic_details.supported_languages || [];
+      const baseLanguage = basic_details.base_language || 'en';
+      supportedLanguages = _.isEmpty(basic_details.supported_languages) ? [{iso_code: baseLanguage || 'en', lang_id: -1, language: baseLanguage || "English"}] : basic_details.supported_languages;
     }
     return supportedLanguages;
   }
@@ -734,7 +726,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   }
 
   setFormValidity = (isFormValid) => {
-    this.setState({isFormValid, startValidation: false});
+    this.setState({isFormValid});
   }
 
   setEditData(editData) {
@@ -1140,8 +1132,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     const file = files[0];
     const fileSize = (file.size / ( 1024 * 1024 ));
     if (fileSize > 5) {
-      const message = getMessageObject('error', this.props.intl.formatMessage(messages.uploadSizeError), true);
-      this.props.globalActions.addMessageToQueue(message);
+      const message = this.props.intl.formatMessage(messages.uploadSizeError);
+      CapNotification.error({key: 'uploadImageIssue', message});
       document.getElementById("fileName").value = "";
       return;
     }
@@ -1226,7 +1218,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       const baseData = {};
       const baseLanguage = props.currentOrgDetails.basic_details.base_language;
       this.supportedLanguages = this.getSupportedLanguages(props);
-      const languageObject = this.supportedLanguages[_.findIndex(this.supportedLanguages, {iso_code: baseLanguage})] || {iso_code: 'en', lang_id: 1, language: "English"};
+      const languageObject = this.supportedLanguages[_.findIndex(this.supportedLanguages, {iso_code: baseLanguage})] || {iso_code: baseLanguage || 'en', lang_id: -1, language: baseLanguage || "English"};
       baseData.activeTab = baseLanguage;
       baseData[languageObject.iso_code] = {};
       baseData[languageObject.iso_code].is_drag_drop = false;
@@ -1383,7 +1375,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
 
             temp.panes[langTab].sections[0].inputFields[0].cols[0].colStyle = {display: ""};
             temp.panes[langTab].sections[0].inputFields[0].cols[1].colStyle = {display: "none"};
-            temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[3].cols[0].style = {display: "none"};
+            temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].colStyle.display = "none";
           }
         });
         schema = this.showInsertImageButton(schema);
@@ -1429,10 +1421,11 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
             newContainerInputFieldCol.style.display = isDragDrop ? "none" : '';
           }
           if (containerInputFieldCol.id === 'tab-options-popover') {
+            containerInputFieldCol.colStyle.display = isDragDrop ? "flex" : "none";
             _.forEach(containerInputFieldCol.content.sections[0].inputFields, (tabPopoverSection) => {
               if (tabPopoverSection.cols[0].id === 'switch-editor-label') {
                 const newTabPopoverSection = tabPopoverSection;
-                newTabPopoverSection.cols[0].style.display = isDragDrop ? "" : 'none';
+                newTabPopoverSection.cols[0].style.display = isDragDrop ? "" : "none";
               }
             });
           }
@@ -1457,6 +1450,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     });
 
     this.setState({schema, isSchemaChanged: true});
+    return schema;
   }
 
   showSubject = () => {
@@ -1923,14 +1917,14 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
             const baseLanguage = this.props.currentOrgDetails && this.props.currentOrgDetails.basic_details && this.props.currentOrgDetails.basic_details.base_language && this.props.currentOrgDetails.basic_details.base_language !== "" ? this.props.currentOrgDetails.basic_details.base_language : 'en';
             const supportedLanguages = this.getSupportedLanguages(this.props);
             if (!supportedLanguages) {
-              tempEl.value = 'English';
+              tempEl.value = baseLanguage || 'English';
               return;
             }
             const langObject = supportedLanguages.find( (lang) => lang.iso_code === baseLanguage);
             if (langObject) {
               tempEl.value = langObject.language;
             } else {
-              tempEl.value = 'English';
+              tempEl.value = baseLanguage || 'English';
             }
           }
         });
@@ -1966,13 +1960,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         });
       }
     });
-    _.forEach(temp.standalone.sections[1].inputFields[0].cols, (inputField) => {
-      if (inputField.id === "template-version") {
-        const iF = inputField;
-        iF.colStyle = {};
-        iF.colStyle.display = "none";
-      }
-    });
     //}
     temp = type === 'embedded' ? this.removeStandAlone(temp) : temp;
     this.setState({schema: temp, isSchemaChanged: true, loadingStatus: this.state.loadingStatus + 1}, () => {
@@ -2033,7 +2020,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           _.forEach(section.inputFields, (inputFields) => {
             if (section.type === "multicols") {
               _.forEach(inputFields.cols, (col) => {
-                if ((col.id === "tab-options-popover" || col.id === "add-language-button") && this.props.location.query.type === 'embedded' && (this.props.location.query.module === "library")) {
+                if ((col.id === "tab-options-popover" || col.id === "add-language-button") && !this.props.isFullMode) {
                   const colStyle = col.colStyle;
                   colStyle.display = "none";
                 }
@@ -2324,7 +2311,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   saveFormData = (passedData) => {
     //saveFormData gets called only when validation result is true
 
-
     if (this.state.gettingFormData && !this.props.isFullMode) {
       const response = {
         action: "getFormData",
@@ -2430,7 +2416,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     document.getElementById("fileName").click();
   }
   // eslint-disable-next-line react/sort-comp
-  getTemplateDataForGrid = ({templates, handlers, filterContent, isLoading, loadingTip}) => {
+  getTemplateDataForGrid = ({templates, handlers, isLoading, loadingTip}) => {
     const currentChannel = 'gallery';
     const cardDataList = templates.length ? _.map(templates, (template) => {
       const templateData =
@@ -2444,7 +2430,6 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       return templateData;
     }) : [];
     return (<div>
-      {filterContent}
       <CapSpin spinning={isLoading} tip={loadingTip}>
         {!_.isEmpty(templates) && <div className="pagination-container">
           <CapCustomCardList key={`${currentChannel}-card-list`} cardList={cardDataList} type={'Email'} />
@@ -2546,6 +2531,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   );
   getImagePreviewContent = () => (
     <div key="creatives-email-add-image-container">
+      {this.getFilterContent()}
       <Pagination onPageChange={() => { this.fetchAllAssets({getNextPage: true}); }} paginationSelector="pagination-container">
         {/* <CardGrid
           listItem={this.prepareImageData()}
@@ -2561,9 +2547,8 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
           loadingTip: <FormattedMessage {...messages.loadingImages}/>,
           channel: this.state.channel,
           templates: this.props.Email.assetList,
-          filterContent: this.getFilterContent(),
           handlers: {onItemClick: this.handleOnItemClick}})
-         : ''}
+         : <FormattedMessage {...messages.noImgInGallery}/>}
 
       </Pagination>
     </div>

package/v2Containers/Email/initialSchema.js

@@ -357,7 +357,7 @@ export const response = {
                           colStyle: {
                             textAlign: "right",
                             flex: 0,
-                            display: "flex",
+                            display: "none",
                             alignItems: "center",
                           },
                           type: "popover",
@@ -375,62 +375,6 @@ export const response = {
                               {
                                 type: "multicols",
                                 inputFields: [
-                                  {
-                                    cols: [
-                                      {
-                                        id: "duplicate-version-label",
-                                        metaType: "label",
-                                        type: "div",
-                                        primitive: true,
-                                        value: "Duplicate Version",
-                                        onlyDisplay: true,
-                                        customComponent: false,
-                                        order: 3,
-                                        fluid: false,
-                                        colStyle: { display: "" },
-                                        className: "version-popover",
-                                        submitAction: "duplicateVersion",
-                                        supportedEvents: ["duplicateVersion"],
-                                      },
-                                    ],
-                                  },
-                                  {
-                                    cols: [
-                                      {
-                                        id: "delete-version-label",
-                                        metaType: "label",
-                                        type: "div",
-                                        primitive: true,
-                                        value: "Delete Version",
-                                        onlyDisplay: true,
-                                        customComponent: false,
-                                        order: 3,
-                                        fluid: false,
-                                        colStyle: { display: "" },
-                                        className: "version-popover",
-                                        submitAction: "deleteVersion",
-                                        supportedEvents: ["deleteVersion"],
-                                      },
-                                    ],
-                                  },
-                                  {
-                                    cols: [
-                                      {
-                                        id: "delete-language-label",
-                                        metaType: "label",
-                                        type: "div",
-                                        primitive: true,
-                                        value: "Delete Language",
-                                        onlyDisplay: true,
-                                        customComponent: false,
-                                        order: 3,
-                                        fluid: false,
-                                        className: "version-popover",
-                                        submitAction: "deleteLanguage",
-                                        supportedEvents: ["deleteLanguage"],
-                                      },
-                                    ],
-                                  },
                                   {
                                     cols: [
                                       {
@@ -446,7 +390,7 @@ export const response = {
                                         className: "version-popover",
                                         submitAction: "switchEditor",
                                         supportedEvents: ["switchEditor"],
-                                        style: { display: "none" },
+                                        style: { display: 'none'},
                                       },
                                     ],
                                   },

package/v2Containers/Email/messages.js

@@ -234,4 +234,8 @@ export default defineMessages({
     id: 'app.containers.Email.assetUploadFailed',
     defaultMessage: 'Image uploaded failed',
   },
+  "noImgInGallery": {
+    id: 'app.containers.Email.noImgInGallery',
+    defaultMessage: 'No images in the gallery. Please upload images in gallery.',
+  },
 });

package/v2Containers/Email/sagas.js

@@ -1,6 +1,5 @@
 import { take, cancel, call, put, takeLatest, takeEvery } from 'redux-saga/effects';
 import { LOCATION_CHANGE } from 'react-router-redux';
-import {CapNotification} from '@capillarytech/cap-ui-library';
 import * as Api from '../../services/api';
 import * as types from './constants';
 
@@ -10,7 +9,6 @@ export function* createTemplate(template) {
     const result = yield call(Api.createEmailTemplate, template);
     if (result.status.code === 500) {
       errorMsg = result.message;
-      CapNotification.error({message: errorMsg, key: 'create-email-template-error'});
       yield put({ type: types.CREATE_TEMPLATE_FAILURE, errorMsg });
     } else {
       yield put({ type: types.CREATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });

package/v2Containers/MobilePush/Create/actions.js

@@ -6,10 +6,10 @@
 
 import * as types from './constants';
 
-export function createTemplate(template) {
+export function createTemplate(template, callback) {
   console.log('action trigereed createtemplate');
   return {
-    type: types.CREATE_TEMPLATE_REQUEST, template,
+    type: types.CREATE_TEMPLATE_REQUEST, template, callback,
   };
 }
 

package/v2Containers/MobilePush/Create/index.js

@@ -81,7 +81,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   componentWillReceiveProps = (nextProps) => {
     if (nextProps.isGetFormData && !this.props.isFullMode) {
       nextProps.getFormLibraryData(this.getFormData());
-    } else if (nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
+    } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
       this.startValidation();
     }
     if (nextProps.Create.uploadedAssetData) {
@@ -90,18 +90,6 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       this.setState({formData});
       this.props.actions.clearAsset();
     }
-    if (nextProps.createResponse && nextProps.createResponse.templateId) {
-      this.discardValues();
-      const message = getMessageObject('success', this.props.intl.formatMessage(messages["Mobile Push Template Created Successfully"]), true);
-      this.props.globalActions.addMessageToQueue(message);
-      this.props.actions.clearCreateResponse();
-      const type = this.props.location.query.type;
-      const module = this.props.location.query.module ? this.props.location.query.module : 'default';
-      this.props.router.push({
-        pathname: `/mobilepush/`,
-        query: type === 'embedded' ? {type: 'embedded', module} : {module},
-      });
-    }
     if (nextProps.params.mode) {
       this.setState({mode: nextProps.params.mode});
     }
@@ -633,7 +621,10 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
   }
   stopValidation = () => {
-    this.setState({startValidation: false});
+    this.setState({startValidation: false}, () => {
+      this.showError();
+      this.props.onValidationFail();
+    });
   }
   startValidation = () => {
     this.setState({startValidation: true});
@@ -648,7 +639,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   }
 
   handleCancelModal = () => {
-    this.setState({showModal: false});
+    this.setState({showModal: false}, this.stopValidation);
   };
 
   moveToTemplates = () => {
@@ -1410,8 +1401,15 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.injectEvents(schema);
   };
   saveFormData = (formData) => {
+    //this function gets called from form bulder only when the form data is valid
     const obj = this.getTransformedData(formData);
-    this.props.actions.createTemplate(obj);
+    this.props.actions.createTemplate(obj, () => {
+      this.discardValues();
+      const message = this.props.intl.formatMessage(messages.messageCreateSuccess);
+      CapNotification.success({message, key: 'createMpushSuccess'});
+      this.props.actions.clearCreateResponse();
+      this.props.getFormLibraryData({validity: true});
+    });
   };
   deleteSecondaryCtaIos = (callback) => {
     const schema = cloneDeep(this.state.schema);
@@ -1794,6 +1792,9 @@ Create.propTypes = {
   injectedTags: PropTypes.object,
   defaultData: PropTypes.object,
   showTemplateName: PropTypes.func,
+  isGetFormData: PropTypes.bool,
+  onValidationFail: PropTypes.func,
+  getFormLibraryData: PropTypes.func,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/MobilePush/Create/messages.js

@@ -134,7 +134,7 @@ export default defineMessages({
     id: 'app.containers.MobilePush.Create.uploadImage',
     defaultMessage: 'Upload image',
   },
-  "Mobile Push Template Created Successfully": {
+  "messageCreateSuccess": {
     id: 'app.containers.MobilePush.Create.templateCreatedSuccessfully',
     defaultMessage: 'Mobile push template created successfully',
   },

package/v2Containers/MobilePush/Create/sagas.js

@@ -14,6 +14,9 @@ export function* createTemplate(template) {
     if (result.message || result.status.code === 500) {
       errorMsg = result.message;
     }
+    if (template.callback) {
+      yield call(template.callback, result.response);
+    }
     yield put({ type: types.CREATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
   } catch (error) {
     yield put({ type: types.CREATE_TEMPLATE_FAILURE, error, errorMsg });

package/v2Containers/MobilePush/Edit/index.js

@@ -100,7 +100,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   componentWillReceiveProps(nextProps) {
     if (nextProps.isGetFormData && !this.props.isFullMode) {
       nextProps.getFormLibraryData(this.getFormData());
-    } else if (nextProps.isGetFormData && this.props.isFullMode && !this.props.Edit.editTemplateInProgress) {
+    } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && this.props.isFullMode && !this.props.Create.createTemplateInProgress) {
       this.startValidation();
     }
     const selectedWeChatAccount = (!_.isEmpty(this.props.Templates.selectedWeChatAccount) ? this.props.Templates.selectedWeChatAccount : this.props.Edit.selectedWeChatAccount);
@@ -279,11 +279,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       currentTab: 1,
       editData: {},
     });
-    const message = getMessageObject('success', this.props.intl.formatMessage(messages['MOBILEPUSH Template Edited Successfully']), true);
-    this.props.globalActions.addMessageToQueue(message);
+    const message = this.props.intl.formatMessage(messages['MOBILEPUSH Template Edited Successfully']);
+    CapNotification.success({message, key: 'editMpushSuccess'});
     this.props.actions.clearEditResponse();
     if (this.props.isFullMode) {
-      this.props.getFormLibraryData(this.getFormData());
+      this.props.getFormLibraryData({validity: true});
     } else {
       const module = this.props.location.query.module ? this.props.location.query.module : 'default';
       const type = this.props.location.query.type;
@@ -879,7 +879,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
   }
 
   handleCancelModal = () => {
-    this.setState({showModal: false});
+    this.setState({showModal: false}, this.stopValidation);
   };
 
   insertAtCursor = (field, myValue, currentTab) => {
@@ -1748,7 +1748,10 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.setState({startValidation: true});
   }
   stopValidation = () => {
-    this.setState({startValidation: false});
+    this.setState({startValidation: false}, () => {
+      this.showError();
+      this.props.onValidationFail();
+    });
   }
 
   render() {
@@ -1760,7 +1763,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       tags = this.props.supportedTags;
     }
     return (
-      <div className="creatives-mobilepush-edit">
+      <div className="creatives-mobilepush-edit mobilepush-wrapper">
         <CapSpin spinning={spinning}>
           <CapRow>
             <CapColumn>
@@ -1879,6 +1882,9 @@ Edit.propTypes = {
   defaultData: PropTypes.object,
   showTemplateName: PropTypes.func,
   getFormLibraryData: PropTypes.func,
+  isGetFormData: PropTypes.bool,
+  Create: PropTypes.object,
+  onValidationFail: PropTypes.bool,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/MobilePush/initialSchema.js

@@ -1613,6 +1613,9 @@ export const response = {
                                       required: true,
                                       fluid: true,
                                       styling: "semantic",
+                                      style: {
+                                        display: 'flex',
+                                      },
                                       order: 1,
                                       customComponent: true,
                                       submitAction: "onUpload",

package/v2Containers/MobilepushWrapper/index.js

@@ -69,7 +69,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
     }
   }
   render() {
-    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type} = this.props;
+    const {mobilePushCreateMode, step, getFormData, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail} = this.props;
     const {templateName} = this.state;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
@@ -111,6 +111,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
               showTemplateName={showTemplateName}
               route={{ name: 'mobilepush' }}
               getDefaultTags={type}
+              onValidationFail={onValidationFail}
           />
 
 
@@ -135,6 +136,7 @@ MobilepushWrapper.propTypes = {
   isFullMode: PropTypes.bool,
   showTemplateName: PropTypes.func,
   type: PropTypes.string,
+  onValidationFail: PropTypes.func,
 };
 
 

package/v2Containers/Templates/index.js

@@ -255,13 +255,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     }
     if (this.state.channel.toLowerCase() === "mobilepush" && nextProps.CreateMobilePush && nextProps.CreateMobilePush.response && nextProps.CreateMobilePush.response.templateId && nextProps.CreateMobilePush.response.templateId !== '') {
-      if (this.state.channel.toLowerCase() === "mobilepush" && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
-        params.accountId = nextProps.Templates.selectedWeChatAccount.id;
-      }
-      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 !== '') {
@@ -391,8 +385,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     });
   }
   onPaginationChange = () => { this.getAllTemplates({getNextPage: true}); }
-  onCreateComplete = () => {
-    this.setState({routeParams: null, previewOpen: false});
+  onCreateComplete = (isReloadTemplates) => {
+    this.setState({routeParams: null, previewOpen: false}, () => {
+      if (this.isFullMode() && isReloadTemplates) {
+        this.getAllTemplates({params: {}}, true);
+      }
+    });
   }
   getCurrentWindow(e) {
     const response = {
@@ -976,7 +974,12 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       });
     } else if (this.state.channel.toLowerCase() === "mobilepush") {
       duplicateObj.definition.accountId = this.props.Templates.selectedWeChatAccount.id;
-      this.props.mobilepushActions.createTemplate(duplicateObj);
+      this.props.mobilepushActions.createTemplate(duplicateObj, () => {
+        const message = `${this.state.channel} ${this.props.intl.formatMessage(messages.templateDuplicateSuccess)}`;
+        CapNotification.success({key: 'duplicateSuccess', message});
+        this.getAllTemplates({params: {}}, true);
+        this.props.mobilepushActions.clearCreateResponse();
+      });
     } else if (this.state.channel.toLowerCase() === "ebill") {
       this.props.ebillActions.createTemplate(duplicateObj);
     } else if (this.state.channel.toLowerCase() === "email") {
@@ -1634,7 +1637,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             messages={messages}
             isFullMode={isFullMode}
             templateData={creativesParams}
-            getCreativesData={this.onCreateComplete}
+            getCreativesData={() => { this.onCreateComplete(true); }}
             channel={route.name.toUpperCase()}
             handleCloseCreatives={this.onCreateComplete}/>
           }