@capillarytech/creatives-library 3.1.2 → 3.1.4

package/v2Containers/Sms/Edit/messages.js

@@ -7,83 +7,99 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "saveTemplateLoader": {
-    id: 'app.containers.Edit.saveTemplateLoader',
+    id: 'creatives.containersV2.Edit.saveTemplateLoader',
     defaultMessage: 'Saving template...',
   },
   "getTemplateDetailsLoader": {
-    id: 'app.containers.Edit.getTemplateDetailsLoader',
+    id: 'creatives.containersV2.Edit.getTemplateDetailsLoader',
     defaultMessage: 'Getting template details...',
   },
   "Message": {
-    id: 'app.containers.Edit.messageLabel',
+    id: 'creatives.containersV2.Edit.messageLabel',
     defaultMessage: 'Message',
   },
   "Template name cannot be empty.": {
-    id: 'app.containers.Edit.emptyTemplateErrorMessage',
+    id: 'creatives.containersV2.Edit.emptyTemplateErrorMessage',
     defaultMessage: "Please provide a template name",
   },
   "Enter template name": {
-    id: 'app.containers.Edit.templateNamePlaceHolder',
+    id: 'creatives.containersV2.Edit.templateNamePlaceHolder',
     defaultMessage: "Enter template name",
   },
   "Discard changes": {
-    id: 'app.containers.Edit.discardChangesButton',
+    id: 'creatives.containersV2.Edit.discardChangesButton',
     defaultMessage: "Discard changes",
   },
   "Cancel": {
-    id: 'app.containers.Edit.cancelButton',
+    id: 'creatives.containersV2.Edit.cancelButton',
     defaultMessage: "Cancel",
   },
   "Save": {
-    id: 'app.containers.Edit.saveButton',
+    id: 'creatives.containersV2.Edit.saveButton',
     defaultMessage: "Save",
   },
   "Version": {
-    id: 'app.containers.Edit.versionLabel',
+    id: 'creatives.containersV2.Edit.versionLabel',
     defaultMessage: "Version",
   },
   "Mark as Final": {
-    id: 'app.containers.Edit.markFinalVersionLabel',
+    id: 'creatives.containersV2.Edit.markFinalVersionLabel',
     defaultMessage: "Mark as final",
   },
   "Duplicate": {
-    id: 'app.containers.Edit.duplicateLabel',
+    id: 'creatives.containersV2.Edit.duplicateLabel',
     defaultMessage: "Duplicate",
   },
   "Rename": {
-    id: 'app.containers.Edit.renameLabel',
+    id: 'creatives.containersV2.Edit.renameLabel',
     defaultMessage: "Rename",
   },
   "Delete": {
-    id: 'app.containers.Edit.deleteLabel',
+    id: 'creatives.containersV2.Edit.deleteLabel',
     defaultMessage: "Delete",
   },
   "Please check if you intend to use unicode characters.": {
-    id: 'app.containers.Edit.unicodeErrorMessage',
+    id: 'creatives.containersV2.Edit.unicodeErrorMessage',
     defaultMessage: "Please check this if you want to use unicode characters",
   },
   "Allow Unicode characters": {
-    id: 'app.containers.Edit.unicodeLabel',
+    id: 'creatives.containersV2.Edit.unicodeLabel',
     defaultMessage: "Allow unicode characters",
   },
   "Tags": {
-    id: 'app.containers.Edit.tagsLabel',
+    id: 'creatives.containersV2.Edit.tagsLabel',
     defaultMessage: "Tags",
   },
   "New Version": {
-    id: 'app.containers.Edit.newVersionLabel',
+    id: 'creatives.containersV2.Edit.newVersionLabel',
     defaultMessage: "New version",
   },
   "Template content has unsupported/missing tags!": {
-    id: 'app.containers.Edit.tagsErrorMessage',
+    id: 'creatives.containersV2.Edit.tagsErrorMessage',
     defaultMessage: "Please check the message content for unsupported/missing tags",
   },
   "Please input sms template content.": {
-    id: 'app.containers.Edit.smsEditorPlaceholder',
+    id: 'creatives.containersV2.Edit.smsEditorPlaceholder',
     defaultMessage: "Please enter the message content",
   },
   "somethingWentWrong": {
-    id: 'app.containers.Edit.somethingWentWrong',
+    id: 'creatives.containersV2.Edit.somethingWentWrong',
     defaultMessage: "Something went wrong!!",
   },
+  "templateEditedSuccessfully": {
+    id: 'creatives.containersV2.Edit.templateEditedSuccessfully',
+    defaultMessage: "SMS Template Edited Successfully",
+  },
+  "alertMessage": {
+    id: 'creatives.containersV2.Edit.alertMessage',
+    defaultMessage: "Alert",
+  },
+  "goBackTemporaryChangesLost": {
+    id: 'creatives.containersV2.Edit.goBackTemporaryChangesLost',
+    defaultMessage: "Do you really want to go back? All your temporary changes will be lost!",
+  },
+  "templateMarkedSuccessfully": {
+    id: 'creatives.containersV2.Edit.templateMarkedSuccessfully',
+    defaultMessage: "Template Marked as Final Successfully",
+  },
 });

package/v2Containers/TagList/messages.js

@@ -7,7 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'app.containers.TagList.header',
+    id: 'creatives.containersV2.TagList.header',
     defaultMessage: 'This is TagList container !',
   },
 });

package/v2Containers/Templates/index.js

@@ -378,7 +378,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     window.removeEventListener("message", this.handleFrameTasks);
     this.props.actions.resetTemplateStoreData();
     this.props.globalActions.clearMetaEntities();
-    // this.props.actions.resetAccount();
+    this.props.actions.resetAccount();
     // this.setState({defaultAccount: false});
   }
 
@@ -477,6 +477,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   getAllTemplates = ({params, getNextPage, resetPage}, resetTemplates) => {
     let queryParams = params;
     let page = this.state.page;
+    const { activeMode } = this.state;
+    if (activeMode === ACCOUNT_SELECTION_MODE) {
+      this.setTemplatesMode();
+    }
     if (resetTemplates) {
       queryParams.name = this.state.searchText;
       queryParams.sortBy = this.state.sortBy;
@@ -1593,6 +1597,10 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     this.setState({activeMode: ACCOUNT_SELECTION_MODE});
   }
 
+  setTemplatesMode = () => {
+    this.setState({activeMode: TEMPLATES_MODE});
+  }
+
   showAccountName = () => {
     const { selectedAccount, channel } = this.state;
     const { Templates: templates = {}} = this.props;

package/v2Containers/Templates/messages.js

@@ -4,7 +4,7 @@
  * This contains all the text for the Templates component.
  */
 import { defineMessages } from 'react-intl';
-const scope = `app.containers.Templates`;
+const scope = `creatives.containersV2.Templates`;
 export default defineMessages({
   "header": {
     id: `${scope}.header`,

package/v2Containers/TemplatesV2/messages.js

@@ -7,47 +7,47 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'app.containers.TemplatesV2.header',
+    id: 'creatives.containersV2.TemplatesV2.header',
     defaultMessage: 'This is TemplatesV2 container !',
   },
   select: {
-    id: 'app.containers.TemplatesV2.select',
+    id: 'creatives.containersV2.TemplatesV2.select',
     defaultMessage: 'Select',
   },
   edit: {
-    id: 'app.containers.TemplatesV2.edit',
+    id: 'creatives.containersV2.TemplatesV2.edit',
     defaultMessage: 'Edit',
   },
   creatives: {
-    id: 'app.containers.TemplatesV2.creatives',
+    id: 'creatives.containersV2.TemplatesV2.creatives',
     defaultMessage: 'Creatives',
   },
   creativesDesc: {
-    id: 'app.containers.TemplatesV2.creativesDesc',
+    id: 'creatives.containersV2.TemplatesV2.creativesDesc',
     defaultMessage: 'These are pre-built templates which you could use to customize your message content.',
   },
   sms: {
-    id: 'app.containersv2.TemplatesV2.sms',
+    id: 'creatives.containersV2.TemplatesV2.sms',
     defaultMessage: 'SMS',
   },
   email: {
-    id: 'app.containersv2.TemplatesV2.email',
+    id: 'creatives.containersV2.TemplatesV2.email',
     defaultMessage: 'Email',
   },
   pushNotification: {
-    id: 'app.containersv2.TemplatesV2.pushNotification',
+    id: 'creatives.containersV2.TemplatesV2.pushNotification',
     defaultMessage: 'Push notification',
   },
   callTask: {
-    id: 'app.containersv2.TemplatesV2.callTask',
+    id: 'creatives.containersV2.TemplatesV2.callTask',
     defaultMessage: 'Call Task',
   },
   gallery: {
-    id: 'app.containersv2.TemplatesV2.gallery',
+    id: 'creatives.containersV2.TemplatesV2.gallery',
     defaultMessage: 'Gallery',
   },
   wechat: {
-    id: 'app.containersv2.TemplatesV2.wechat',
+    id: 'creatives.containersV2.TemplatesV2.wechat',
     defaultMessage: 'Wechat',
   },
 });

package/v2Containers/TestPage/messages.js

@@ -7,7 +7,7 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'app.components.TestPage.header',
+    id: 'creatives.containersV2.TestPage.header',
     defaultMessage: 'Looks like youas are lost!',
   },
 });

package/v2Containers/Testv2/index.js

@@ -19,9 +19,9 @@ export class Testv2 extends React.Component { // eslint-disable-line react/prefe
     return (
       <div>
         <Helmet
-          title="Testv2"
+          title={<FormattedMessage {...messages.testv2} />}
           meta={[
-            { name: 'description', content: 'Description of Testv2' },
+            { name: 'description', content: <FormattedMessage {...messages.descriptionTestv2} /> },
           ]}
         />
         <FormattedMessage {...messages.header} />

package/v2Containers/Testv2/messages.js

@@ -7,7 +7,15 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   header: {
-    id: 'app.containers.Testv2.header',
+    id: 'creatives.containersV2.Testv2.header',
     defaultMessage: 'This is Testv2 container !',
   },
+  testv2: {
+    id: 'creatives.containersV2.Testv2.testv2',
+    defaultMessage: 'Testv2',
+  },
+  descriptionTestv2: {
+    id: 'creatives.containersV2.Testv2.descriptionTestv2',
+    defaultMessage: 'Description of Testv2',
+  },
 });

package/v2Containers/WeChat/MapTemplates/index.js

@@ -76,8 +76,8 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       isLoading: true,
       showModal: false,
       modalContent: {
-        title: "Alert",
-        body: "Do you really want to go back? All your temporary changes will be lost!",
+        title: this.props.intl.formatMessage(messages.alertMessage),
+        body: this.props.intl.formatMessage(messages.goBackTemporaryChangesLost),
         type: 'confirm',
         id: 'template-back-confirm-modal',
       },

package/v2Containers/WeChat/MapTemplates/messages.js

@@ -7,99 +7,99 @@ import { defineMessages } from 'react-intl';
 
 export default defineMessages({
   "header": {
-    id: 'app.containers.WeChat.header',
+    id: 'creatives.containersV2.WeChat.header',
     defaultMessage: 'WeChat',
   },
   'Template mapping': {
-    id: 'app.containers.WeChat.templateMapping',
+    id: 'creatives.containersV2.WeChat.templateMapping',
     defaultMessage: 'Template mapping',
   },
   'Discard': {
-    id: 'app.containers.WeChat.discard',
+    id: 'creatives.containersV2.WeChat.discard',
     defaultMessage: 'Discard',
   },
   'Cancel': {
-    id: 'app.containers.WeChat.cancel',
+    id: 'creatives.containersV2.WeChat.cancel',
     defaultMessage: 'Cancel',
   },
   'Save': {
-    id: 'app.containers.WeChat.save',
+    id: 'creatives.containersV2.WeChat.save',
     defaultMessage: 'Save',
   },
   'Account Id': {
-    id: 'app.containers.WeChat.accountId',
+    id: 'creatives.containersV2.WeChat.accountId',
     defaultMessage: 'Account id',
   },
   'Select Wechat Account': {
-    id: 'app.containers.WeChat.selectWechatAccount',
+    id: 'creatives.containersV2.WeChat.selectWechatAccount',
     defaultMessage: 'Select wechat account',
   },
   'Template': {
-    id: 'app.containers.WeChat.template',
+    id: 'creatives.containersV2.WeChat.template',
     defaultMessage: 'Template',
   },
   'Select Wechat Template': {
-    id: 'app.containers.WeChat.selectWechatTemplate',
+    id: 'creatives.containersV2.WeChat.selectWechatTemplate',
     defaultMessage: 'Select wechat template',
   },
   'Link': {
-    id: 'app.containers.WeChat.link',
+    id: 'creatives.containersV2.WeChat.link',
     defaultMessage: 'Link',
   },
-  'Is this internal url': {
-    id: 'app.containers.WeChat.isInternalUrl',
+  'isInternalUrl': {
+    id: 'creatives.containersV2.WeChat.isInternalUrl',
     defaultMessage: 'Is this internal url',
   },
   "Tags": {
-    id: 'app.containers.WeChat.tagsLabel',
+    id: 'creatives.containersV2.WeChat.tagsLabel',
     defaultMessage: "Tags",
   },
   "gettingTemplateData": {
-    id: 'app.containers.WeChat.gettingTemplateData',
+    id: 'creatives.containersV2.WeChat.gettingTemplateData',
     defaultMessage: "Getting template data..",
   },
   "wechatEditSuccess": {
-    id: 'app.containers.WeChat.wechatEditSuccess',
+    id: 'creatives.containersV2.WeChat.wechatEditSuccess',
     defaultMessage: "WeChat template unmapped successfully",
   },
   "wechatCreateSuccess": {
-    id: 'app.containers.WeChat.wechatCreateSuccess',
+    id: 'creatives.containersV2.WeChat.wechatCreateSuccess',
     defaultMessage: "WeChat template mapped successfully",
   },
   "somethingWentWrong": {
-    id: 'app.containers.WeChat.somethingWentWrong',
+    id: 'creatives.containersV2.WeChat.somethingWentWrong',
     defaultMessage: "Something went wrong!!",
   },
   "alertMessage": {
-    id: 'app.containersv2.WeChat.alertMessage',
+    id: 'creatives.containersV2.WeChat.alertMessage',
     defaultMessage: "Alert",
   },
   "goBackTemporaryChangesLost": {
-    id: 'app.containersv2.WeChat.goBackTemporaryChangesLost',
+    id: 'creatives.containersV2.WeChat.goBackTemporaryChangesLost',
     defaultMessage: "Do you really want to go back? All your temporary changes will be lost!",
   },
   "hasValidContent": {
-    id: 'app.containersv2.WeChat.hasValidContent',
+    id: 'creatives.containersV2.WeChat.hasValidContent',
     defaultMessage: "has valid content.",
   },
   "linkCantEmpty": {
-    id: 'app.containersv2.WeChat.linkCantEmpty',
+    id: 'creatives.containersV2.WeChat.linkCantEmpty',
     defaultMessage: "has valid content.",
   },
   "select": {
-    id: 'app.containers.WeChat.select',
+    id: 'creatives.containers.WeChat.select',
     defaultMessage: 'Select',
   },
   "newWechat": {
-    id: 'app.containers.WeChat.newWechat',
+    id: 'creatives.containers.WeChat.newWechat',
     defaultMessage: 'New wechat',
   },
   "linkErrorMessage": {
-    id: 'app.containers.WeChat.linkErrorMessage',
+    id: 'creatives.containers.WeChat.linkErrorMessage',
     defaultMessage: 'Link cannot be empty.',
   },
   "hasInvalidContent": {
-    id: 'app.containers.WeChat.hasInvalidContent',
+    id: 'creatives.containers.WeChat.hasInvalidContent',
     defaultMessage: 'has invalid content.',
   },
 });

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

@@ -42,7 +42,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     let templateId = "";
     let templateName = "";
     let isIframe = false;
-    if (props.location.query.type === "embedded" && props.location.query.module === "library") {
+    if (props.location.query.type === "embedded" && props.location.query.module === "library" && props.mode === 'EDIT' && !props.location.query.isEditFromCampaigns) {
       isIframe = true;
     }
     if (props.mode === 'EDIT') {
@@ -136,25 +136,15 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.prepareWeChatRichmediaPreviewData = this.prepareWeChatRichmediaPreviewData.bind(this);
     this.injectMessages = this.injectMessages.bind(this);
   }
-  componentWillMount = () => {
-    if (isEmpty(this.props.Templates.selectedWeChatAccount)) {
-      const module = this.props.location.query.module ? this.props.location.query.module : 'default';
-      const type = this.props.location.query.type;
-      this.props.router.push({
-        pathname: `/wechat`,
-        query: type === 'embedded' ? {type: 'embedded', module} : {module},
-      });
-    }
-  }
   componentDidMount = () => {
     if (!this.state.isEdit) {
       this.updateTotalContentBlocks();
     }
   }
   componentWillReceiveProps = (nextProps) => {
-    if (nextProps.isGetFormData && !this.props.isFullMode && this.state.isEdit) {
+    if (nextProps.isGetFormData && !this.props.isFullMode && this.state.isEdit && !this.props.location.query.isEditFromCampaigns) {
       nextProps.getFormData(this.getFormData());
-    } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && (this.props.isFullMode || !this.state.isEdit)) {
+    } else if (nextProps.isGetFormData && this.props.isGetFormData !== nextProps.isGetFormData && (this.props.isFullMode || !this.state.isEdit || this.props.location.query.isEditFromCampaigns)) {
       this.saveHandler();
     }
     if (nextProps.Create.saveTemplateRes && !isEmpty(nextProps.Create.saveTemplateRes) && nextProps.Create.saveTemplateSuccess && !isEqual(nextProps.Create.saveTemplateRes, this.props.Create.saveTemplateRes)) {
@@ -246,7 +236,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       },
     };
     const data = {
-      content: message,
+      data: message,
       accountId: get(templates, 'selectedWeChatAccount.id'),
       template_id: templateIdFromProp || templateId,
       Title: templateNameFromProp || templateName,