@capillarytech/creatives-library 2.0.70 → 2.0.72

package/containers/Templates/messages.js

@@ -4,270 +4,238 @@
  * This contains all the text for the Templates component.
  */
 import { defineMessages } from 'react-intl';
-const scope = `app.containers.Templates`;
+
 export default defineMessages({
   "header": {
-    id: `${scope}.header`,
-    defaultMessage: `This is Templates container !`,
+    id: 'app.containers.Templates.header',
+    defaultMessage: 'This is Templates container !',
   },
   "uploadedAt": {
-    id: `${scope}.uploadedAt`,
-    defaultMessage: `Modified`,
+    id: 'app.containers.Templates.uploadedAt',
+    defaultMessage: 'Modified',
   },
   "uploadedBy": {
-    id: `${scope}.uploadedBy`,
-    defaultMessage: `Uploaded By`,
+    id: 'app.containers.Templates.uploadedBy',
+    defaultMessage: 'Uploaded By',
   },
   "mapTemplate": {
-    id: `${scope}.mapTemplate`,
-    defaultMessage: `Map Template`,
+    id: 'app.containers.Templates.mapTemplate',
+    defaultMessage: 'Map Template',
   },
   "weChatRichmediaTemplate": {
-    id: `${scope}.weChatRichmediaTemplate`,
+    id: 'app.containers.Templates.weChatRichmediaTemplate',
     defaultMessage: 'Richmedia Template',
   },
   "somethingWentWrong": {
-    id: `${scope}.somethingWentWrong`,
-    defaultMessage: `Something Went Wrong!!`,
+    id: 'app.containers.Templates.somethingWentWrong',
+    defaultMessage: 'Something Went Wrong!!',
   },
   "wechatHeader": {
-    id: `${scope}.wechatHeader`,
-    defaultMessage: `WECHAT`,
+    id: 'app.containers.Templates.wechatHeader',
+    defaultMessage: 'WECHAT',
   },
   "smsHeader": {
-    id: `${scope}.smsHeader`,
-    defaultMessage: `SMS`,
+    id: 'app.containers.Templates.smsHeader',
+    defaultMessage: 'SMS',
   },
   "emailHeader": {
-    id: `${scope}.emailHeader`,
-    defaultMessage: `Email`,
+    id: 'app.containers.Templates.emailHeader',
+    defaultMessage: 'Email',
   },
   "mobilepushHeader": {
-    id: `${scope}.mobilepushHeader`,
-    defaultMessage: `Mobile Push`,
+    id: 'app.containers.Templates.mobilepushHeader',
+    defaultMessage: 'Mobile Push',
   },
   "ebillHeader": {
-    id: `${scope}.ebillHeader`,
-    defaultMessage: `Ebill`,
+    id: 'app.containers.Templates.ebillHeader',
+    defaultMessage: 'Ebill',
   },
   "lineHeader": {
-    id: `${scope}.lineHeader`,
-    defaultMessage: `Line`,
+    id: 'app.containers.Templates.lineHeader',
+    defaultMessage: 'Line',
   },
   "selectWechatHeader": {
-    id: `${scope}.selectWechatHeader`,
-    defaultMessage: `Select WECHAT Template`,
+    id: 'app.containers.Templates.selectWechatHeader',
+    defaultMessage: 'Select WECHAT Template',
   },
   "selectSmsHeader": {
-    id: `${scope}.selectSmsHeader`,
-    defaultMessage: `Select SMS Template`,
+    id: 'app.containers.Templates.selectSmsHeader',
+    defaultMessage: 'Select SMS Template',
   },
   "selectAccount": {
-    id: `${scope}.selectAccount`,
+    id: 'app.containers.Templates.selectAccount',
     defaultMessage: "Select Account",
   },
   "gettingAllTemplates": {
-    id: `${scope}.gettingAllTemplates`,
+    id: 'app.containers.Templates.gettingAllTemplates',
     defaultMessage: "Getting all templates...",
   },
   "smsChannelTemplatesHeader": {
-    id: `${scope}.smsChannelTemplatesHeader`,
+    id: 'app.containers.Templates.smsChannelTemplatesHeader',
     defaultMessage: "SMS Templates",
   },
   "wechatChannelTemplatesHeader": {
-    id: `${scope}.wechatChannelTemplatesHeader`,
+    id: 'app.containers.Templates.wechatChannelTemplatesHeader',
     defaultMessage: "WECHAT Templates",
   },
   "blankTemplate": {
-    id: `${scope}.blankTemplate`,
+    id: 'app.containers.Templates.blankTemplate',
     defaultMessage: "Blank Template",
   },
   "selectButton": {
-    id: `${scope}.selectButton`,
+    id: 'app.containers.Templates.selectButton',
     defaultMessage: "Select",
   },
   "previewButton": {
-    id: `${scope}.previewButton`,
+    id: 'app.containers.Templates.previewButton',
     defaultMessage: "Preview",
   },
   "editButton": {
-    id: `${scope}.editButton`,
+    id: 'app.containers.Templates.editButton',
     defaultMessage: "Edit",
   },
   "duplicateButton": {
-    id: `${scope}.duplicateButton`,
+    id: 'app.containers.Templates.duplicateButton',
     defaultMessage: "Duplicate",
   },
   "deleteButton": {
-    id: `${scope}.deleteButton`,
+    id: 'app.containers.Templates.deleteButton',
     defaultMessage: "Delete",
   },
   "mostRecentOption": {
-    id: `${scope}.mostRecentOption`,
+    id: 'app.containers.Templates.mostRecentOption',
     defaultMessage: "Most Recent",
   },
   "alphabeticallyOption": {
-    id: `${scope}.alphabeticallyOption`,
+    id: 'app.containers.Templates.alphabeticallyOption',
     defaultMessage: "Alphabetically",
   },
   "searchText": {
-    id: `${scope}.searchText`,
+    id: 'app.containers.Templates.searchText',
     defaultMessage: "Search",
   },
   "noAccountMessage": {
-    id: `${scope}.noAccountMessage`,
+    id: 'app.containers.Templates.noAccountMessage',
     defaultMessage: "Please select an account to proceed",
   },
   "noTemplatesMessage": {
-    id: `${scope}.noTemplatesMessage`,
+    id: 'app.containers.Templates.noTemplatesMessage',
     defaultMessage: "No Templates Available",
   },
   "createSmsActionButton": {
-    id: `${scope}.createSmsActionButton`,
+    id: 'app.containers.Templates.createSmsActionButton',
     defaultMessage: "Create SMS",
   },
   "createEmailActionButton": {
-    id: `${scope}.createEmailActionButton`,
+    id: 'app.containers.Templates.createEmailActionButton',
     defaultMessage: "Create Email",
   },
   "sortBy": {
-    id: `${scope}.sortBy`,
+    id: 'app.containers.Templates.sortBy',
     defaultMessage: "Sort by",
   },
   "unMapButton": {
-    id: `${scope}.unMapButton`,
+    id: 'app.containers.Templates.unMapButton',
     defaultMessage: "Unmap",
   },
   "templateDuplicateSuccess": {
-    id: `${scope}.templateDuplicateSuccess`,
+    id: 'app.containers.Templates.templateDuplicateSuccess',
     defaultMessage: "Template Duplicated Successfully",
   },
   "templateDeleteSuccess": {
-    id: `${scope}.templateDeleteSuccess`,
+    id: 'app.containers.Templates.templateDeleteSuccess',
     defaultMessage: "SMS Template Deleted Successfully",
   },
   "uploadFile": {
-    id: `${scope}.uploadFile`,
+    id: 'app.containers.Templates.uploadFile',
     defaultMessage: "Upload File",
   },
   "useEditor": {
-    id: `${scope}.useEditor`,
+    id: 'app.containers.Templates.useEditor',
     defaultMessage: "Use Editor",
   },
   "newTemplate": {
-    id: `${scope}.newTemplate`,
+    id: 'app.containers.Templates.newTemplate',
     defaultMessage: "New Template",
   },
   "uploadingFile": {
-    id: `${scope}.uploadingFile`,
+    id: 'app.containers.Templates.uploadingFile',
     defaultMessage: "Uploading File",
   },
   "zipUploadFailed": {
-    id: `${scope}.zipUploadFailed`,
-    defaultMessage: `Failed to Upload zip file`,
+    id: 'app.containers.Templates.zipUploadFailed',
+    defaultMessage: 'Failed to Upload zip file',
   },
   "campaigns": {
-    id: `${scope}.campaigns`,
-    defaultMessage: `Campaigns`,
+    id: 'app.containers.Templates.campaigns',
+    defaultMessage: 'Campaigns',
   },
   "creatives": {
-    id: `${scope}.creatives`,
-    defaultMessage: `Creatives`,
+    id: 'app.containers.Templates.creatives',
+    defaultMessage: 'Creatives',
   },
   "ebillPreview": {
-    id: `${scope}.ebillPreview`,
-    defaultMessage: `Ebill Preview`,
+    id: 'app.containers.Templates.ebillPreview',
+    defaultMessage: 'Ebill Preview',
   },
   "emailPreview": {
-    id: `${scope}.emailPreview`,
-    defaultMessage: `Email Preview`,
+    id: 'app.containers.Templates.emailPreview',
+    defaultMessage: 'Email Preview',
   },
   "Template deleted successfully": {
-    id: `${scope}.deletedSuccssfully`,
-    defaultMessage: `Template deleted successfully`,
+    id: 'app.containers.Templates.deletedSuccssfully',
+    defaultMessage: 'Template deleted successfully',
   },
   "Template deletion failed": {
-    id: `${scope}.deletionFailed`,
-    defaultMessage: `Template deletion failed`,
+    id: 'app.containers.Templates.deletionFailed',
+    defaultMessage: 'Template deletion failed',
   },
   "preview": {
-    id: `${scope}.preview`,
-    defaultMessage: `Preview`,
+    id: 'app.containers.Templates.preview',
+    defaultMessage: 'Preview',
   },
   "invalidUploadFileError": {
-    id: `${scope}.invalidUploadFileError`,
-    defaultMessage: `File cannot be uploaded. Please select another file with valid file format.`,
+    id: 'app.containers.Templates.invalidUploadFileError',
+    defaultMessage: 'File cannot be uploaded. Please select another file with valid file format.',
   },
   "templateDeleteConfirm": {
-    id: `${scope}.templateDeleteConfirm`,
-    defaultMessage: `Are you sure you want to delete this Template?`,
+    id: 'app.containers.Templates.templateDeleteConfirm',
+    defaultMessage: 'Are you sure you want to delete this Template?',
   },
   "cancelText": {
-    id: `${scope}.cancelText`,
-    defaultMessage: `Cancel`,
+    id: 'app.containers.Templates.cancelText',
+    defaultMessage: 'Cancel',
   },
   "yesText": {
-    id: `${scope}.yesText`,
-    defaultMessage: `Yes`,
+    id: 'app.containers.Templates.yesText',
+    defaultMessage: 'Yes',
   },
   "templateSelection": {
-    id: `${scope}.templateSelection`,
-    defaultMessage: `Template Selection`,
+    id: 'app.containers.Templates.templateSelection',
+    defaultMessage: 'Template Selection',
   },
   "layoutSelection": {
-    id: `${scope}.layoutSelection`,
-    defaultMessage: `Select Layout`,
+    id: 'app.containers.Templates.layoutSelection',
+    defaultMessage: 'Select Layout',
   },
   "textTemplate": {
-    id: `${scope}.textTemplate`,
-    defaultMessage: `Text`,
+    id: 'app.containers.Templates.textTemplate',
+    defaultMessage: 'Text',
   },
   "imageTemplate": {
-    id: `${scope}.imageTemplate`,
-    defaultMessage: `Image`,
+    id: 'app.containers.Templates.imageTemplate',
+    defaultMessage: 'Image',
   },
   "selectDefaultButton": {
-    id: `${scope}.selectDefaultButton`,
-    defaultMessage: `Select`,
+    id: 'app.containers.Templates.selectDefaultButton',
+    defaultMessage: 'Select',
   },
   "previewGenerateText": {
-    id: `${scope}.previewGenerateText`,
-    defaultMessage: `Preview is being generated...`,
-  },
-  "createNewActionButton": {
-    id: `${scope}.createNewActionButton`,
-    defaultMessage: `Create new`,
-  },
-  "creativeTemplates": {
-    id: `${scope}.creativeTemplates`,
-    defaultMessage: `Creative templates`,
-  },
-  "editMessageContent": {
-    id: `${scope}.editMessageContent`,
-    defaultMessage: `Edit message Content`,
-  },
-  "createMessageContent": {
-    id: `${scope}.editMessageContent`,
-    defaultMessage: `New message`,
-  },
-  "creativeTemplatesDesc": {
-    id: `${scope}.creativeTemplatesDesc`,
-    defaultMessage: `(Select only one creative)`,
-  },
-  "creativesTemplatesSave": {
-    id: `${scope}.creativesTemplatesSave`,
-    defaultMessage: `Done`,
-  },
-  "creativesTemplatesEdit": {
-    id: `${scope}.creativesTemplatesSave`,
-    defaultMessage: `Edit`,
-  },
-  "continue": {
-    id: `${scope}.continue`,
-    defaultMessage: `Continue`,
+    id: 'app.containers.Templates.previewGenerateText',
+    defaultMessage: 'Preview is being generated...',
   },
   "wechatAccountNotConfigured": {
-    id: `${scope}.wechatAccountNotConfigured`,
+    id: 'app.containers.Templates.wechatAccountNotConfigured',
     defaultMessage: 'Selected wechat account is not configured to create wechat templates',
   },
 });

package/containers/Templates/reducer.js

@@ -78,7 +78,7 @@ function templatesReducer(state = initialState, action) {
       return state
         .set('weCRMtemplates', fromJS([]))
         .set('weChatDefaultTemplate', fromJS([]))
-        .set('templates', []);
+        .set('templates', fromJS([]));
     case types.SET_SELECTED_LAYOUT:
       return state
         .set('selectedEmailLayout', fromJS(action.selectedTemplate))
@@ -106,7 +106,7 @@ function templatesReducer(state = initialState, action) {
       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) : []);
+        .set('cmsTemplates', action.data ? fromJS(action.data.templates) : fromJS([]));
     case types.GET_EDM_DEAFULT_TEMPLATES_FAILURE:
       return state.set('getCmsTemplatesInProgress', false);
     case types.SET_EDM_TEMPLATE:
@@ -132,7 +132,7 @@ function templatesReducer(state = initialState, action) {
         .set('templateDetails', fromJS({}));
     case types.CLEAR_TEMPLATE_STORE_DATA:
       return state
-        .set('templates', [])
+        .set('templates', fromJS({}))
         .set('weCRMtemplates', fromJS({}));
     default:
       return state;

package/containers/Templates/sagas.js

@@ -74,15 +74,13 @@ export function* fetchWeCrmAccounts(action) {
   }
 }
 
-export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
+export function* sendZippedFile({selectedFile}) {
   let errorMessage = "";
   try {
     const result = yield call(Api.sendZippedFile, selectedFile);
     if (result.status.isError) {
       errorMessage = result.message;
-      yield errorHandler(errorMessage);
     }
-
     console.log("Got Result ", result);
     console.log("Got decoded result", decodeURIComponent(result.response.metaEntity.htmlContent));
     yield [
@@ -91,9 +89,7 @@ export function* sendZippedFile({selectedFile, errorHandler, successHandler}) {
         selectedTemplate: decodeURIComponent(result.response.metaEntity.htmlContent),
       }),
     ];
-    yield successHandler();
   } catch (error) {
-    yield errorHandler();
     yield [
       put({
         type: types.SEND_ZIPPED_FILE_FAILURE,

package/containers/Templates/selectors.js

@@ -1,5 +1,4 @@
 import { createSelector } from 'reselect';
-import isEmpty from 'lodash/isEmpty';
 
 /**
  * Direct selector to the templates state domain
@@ -20,49 +19,10 @@ const makeSelectTemplates = () => createSelector(
   (substate) => substate.toJS()
 );
 
-const templateUserList = () => createSelector(
-  makeSelectTemplates(),
-  (substate) => substate.userList || [],
-);
-
 const makeSelectTemplatesResponse = () => createSelector(
   selectTemplatesDomain(), (templatesState) => templatesState.get('templates')
 );
-const selectTemplateContent = () => createSelector(
-  makeSelectTemplates(), (templates) => {
-    const {templateDetails} = templates;
-    if (!isEmpty(templateDetails)) {
-      const templateBase = templateDetails.versions.base;
-      const selectedLanguage = templateBase.selectedLanguages[0];
-      return templateBase[selectedLanguage]['template-content'];
-    }
-    return null;
-  }
-);
-
-const selectEmailLayout = () => createSelector(makeSelectTemplates(), (templates) => {
-  const {selectedEmailLayout, sendingFile} = templates;
-  if (!sendingFile) {
-    return selectedEmailLayout;
-  }
-  return null;
-});
-const uploadSelector = () => createSelector(makeSelectTemplates(), (templates) => templates.sendingFile ? templates.sendingFile : false );
-
-const selectCmsTemplates = () => createSelector(makeSelectTemplates(), (templates) => {
-  const {getCmsTemplatesInProgress, cmsTemplates} = templates;
-  if (!getCmsTemplatesInProgress) {
-    return cmsTemplates;
-  }
-  return null;
-});
 
-const selectEdmEditor = () => createSelector(makeSelectTemplates(), (templates) => {
-  const {edmTemplate} = templates;
-  return edmTemplate || null;
-});
 export {
-  uploadSelector,
-  templateUserList,
-  makeSelectTemplates, makeSelectTemplatesResponse, selectTemplateContent, selectEmailLayout, selectCmsTemplates, selectEdmEditor,
+  makeSelectTemplates, makeSelectTemplatesResponse,
 };

package/containers/WeChat/MapTemplates/index.js

@@ -12,6 +12,7 @@ import { bindActionCreators } from 'redux';
 import Helmet from 'react-helmet';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
+// import { CapButton, CapSelect } from '@capillarytech/cap-react-ui-library';
 import { Row, Col, Spin } from 'antd';
 import _ from 'lodash';
 import { makeSelectTemplates } from '../../Templates/selectors';
@@ -27,9 +28,6 @@ import * as templateActions from '../../Templates/actions';
 // import SlideBox from '../../components/SlideBox';
 // import PageHeader from '../../components/PageHeader';
 import './_mapTemplates.scss';
-
-import callNativeEvent from '../../../utils/callNativeEvent';
-
 // const Option = Select.Option;
 
 export class MapTemplates extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -1039,7 +1037,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       myField.value += myValue;
     }
     const event = new Event('input', { bubbles: true });
-    callNativeEvent({field, value: myField.value, event});
+    myField.dispatchEvent(event);
   }
 
   internalUrlChecked() {
@@ -1317,6 +1315,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
         <Helmet
           title="WeChat"
         />
+        {/* <CapSelect options={options} /> */}
         <Row className="wechat-container">
           <Col>
             <FormBuilder

package/containers/WeChat/RichmediaTemplates/Create/index.js

@@ -4,7 +4,9 @@
  *
  */
 
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React from 'react';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
 import { bindActionCreators } from 'redux';
@@ -603,17 +605,28 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({currentContentId: id});
   }
   deleteContent = (e, id) => {
+    const modalContent = {
+      title: this.props.intl.formatMessage(messages.modalTitle),
+      body: this.props.intl.formatMessage(messages.deleteContent),
+      type: 'confirm',
+      id: 'template-delete-confirm-modal',
+      show: true,
+      contentId: id,
+    };
+    this.setState({showModal: true, modalContent});
+  }
+  handleDelete = (modalContent) => {
     const templateData = _.cloneDeep(this.state.templateData);
     let totalContentBlocks = this.state.totalContentBlocks;
     let currentContentId = this.state.currentContentId;
     let index = 0;
-    for (index = id; index <= (totalContentBlocks - 2); index += 1) {
+    for (index = modalContent.contentId; index <= (totalContentBlocks - 2); index += 1) {
       templateData[index] = templateData[index + 1];
     }
     delete templateData[index];
-    currentContentId = (totalContentBlocks - 1) === id ? id - 1 : id;
+    currentContentId = (totalContentBlocks - 1) === modalContent.contentId ? modalContent.contentId - 1 : modalContent.contentId;
     totalContentBlocks -= 1;
-    this.setState({templateData, totalContentBlocks, currentContentId});
+    this.setState({templateData, totalContentBlocks, currentContentId, showModal: false});
   }
   moveContentDownward = (e, id) => {
     const templateData = _.cloneDeep(this.state.templateData);
@@ -993,6 +1006,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                     showModal={this.state.showModal}
                     handleCancelModal={this.handleCancelModal}
                     iframeParent={parent}
+                    handleDelete={this.handleDelete}
                   />
                 </CapColumn>
               </CapRow>

package/containers/WeChat/RichmediaTemplates/Create/messages.js

@@ -34,6 +34,10 @@ export default defineMessages({
     id: 'app.containers.Create.modalBody',
     defaultMessage: 'Do you really want to go back? All your temporary changes will be lost!',
   },
+  "deleteContent": {
+    id: 'app.containers.Create.deleteContent',
+    defaultMessage: 'Do you really want to delete? All your temporary changes will be lost!',
+  },
   "emptyTemplateName": {
     id: 'app.containers.Create.emptyTemplateName',
     defaultMessage: 'Cannot leave template name empty',

package/containers/WeChat/RichmediaTemplates/Edit/index.js

@@ -4,7 +4,9 @@
  *
  */
 
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import _ from 'lodash';

package/containers/WeChat/RichmediaTemplates/View/index.js

@@ -4,7 +4,9 @@
  *
  */
 
-import React, { PropTypes } from 'react';
+import PropTypes from 'prop-types';
+
+import React from 'react';
 import { connect } from 'react-redux';
 import Helmet from 'react-helmet';
 import { FormattedMessage } from 'react-intl';