@capillarytech/creatives-library 6.6.1 → 6.7.0

package/containers/MobilePush/Edit/index.js

@@ -577,7 +577,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       licenseCode: selectedWeChatAccount.sourceAccountIdentifier,
     };
     if (this.props.location.query && this.props.location.query.module !== 'dvs') {
-      obj.definition.mode = this.props.Edit.templateDetails.mode;
+      obj.definition.mode = _.get(this, 'props.Edit.templateDetails.mode', '');
     }
     const android = {};
     Object.keys(formData[0]).forEach((data) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "6.6.1",
+  "version": "6.7.0",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/v2Containers/CreativesContainer/constants.js

@@ -15,5 +15,3 @@ export const WECHAT = "WECHAT";
 export const FACEBOOK = "FACEBOOK";
 export const SHOW_CONTANER_LOADER = "app/CreativesContainer/SHOW_CONTANER_LOADER";
 export const HIDE_CONTAINER_LOADER = "app/CreativesContainer/HIDE_CONTAINER_LOADER";
-export const ANDROID = "android";
-export const IOS = "ios";

package/v2Containers/Email/index.js

@@ -2578,8 +2578,13 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   );
 
   showTestAndPreviewIcons = (action) => {
-    const previewContent = this.state.formData[0][this.state.formData[0].selectedLanguages[0]]['template-content'];
-    const previewSubject = this.state.formData['template-subject'];
+    const { formData = [] } = this.state;
+    const { selectedLanguages = [] } = formData && formData[0];
+    const previewContent = formData[0] &&
+      selectedLanguages &&
+      formData[0][selectedLanguages[0]] &&
+      formData[0][selectedLanguages[0]]['template-content'];
+    const previewSubject = formData['template-subject'];
     const testOrPreviewProps = {channel: EMAIL, content: previewContent, subject: previewSubject};
     const { onPreviewContentClicked, onTestContentClicked } = this.props;
     return (

package/v2Containers/MobilePush/Create/index.js

@@ -27,7 +27,6 @@ import messages from './messages';
 import getEventsMap from '../eventsMap';
 import { GA } from '@capillarytech/cap-ui-utils';
 import { TRACK_CREATE_MPUSH } from '../../App/constants';
-import { ANDROID, IOS } from '../../CreativesContainer/constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -104,10 +103,8 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     }
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && isEmpty(this.state.schema)) {
       const schema = this.props.params.mode === "text" ? nextProps.metaEntities.layouts[0].definition.textSchema : nextProps.metaEntities.layouts[0].definition.imageSchema;
-      const account = this.props.Templates.selectedWeChatAccount;
-      const { commChannels = [] } = account;
-      const isAndroidSupported = commChannels.includes(ANDROID);
-      const isIosSupported = commChannels.includes(IOS);
+      const isAndroidSupported = get(this, "props.Templates.selectedWeChatAccount.configs.android") === '1';
+      const isIosSupported = get(this, "props.Templates.selectedWeChatAccount.configs.ios") === '1';
       if (!isAndroidSupported) {
         const androidField = get(schema, "containers[0].panes[0]");
         androidField.isSupported = false;

package/v2Containers/MobilePush/Edit/index.js

@@ -31,7 +31,6 @@ import getEventsMap from '../eventsMap';
 import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields} from '../commonMethods';
 import { GA } from '@capillarytech/cap-ui-utils';
 import { TRACK_EDIT_MPUSH } from '../../App/constants';
-import { ANDROID, IOS } from '../../CreativesContainer/constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -146,10 +145,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.props = nextProps;
       const mode = nextProps.templateDetails.definition ? nextProps.templateDetails.definition.mode : nextProps.templateDetails.mode;
       const schema = mode === "text" ? this.state.fullSchema.textSchema : this.state.fullSchema.imageSchema;
-      const account = this.props.Templates.selectedWeChatAccount;
-      const { commChannels = [] } = account;
-      const isAndroidSupported = commChannels.includes(ANDROID);
-      const isIosSupported = commChannels.includes(IOS);
+      const isAndroidSupported = get(this, "props.Templates.selectedWeChatAccount.configs.android") === '1';
+      const isIosSupported = get(this, "props.Templates.selectedWeChatAccount.configs.ios") === '1';
       if (!isAndroidSupported) {
         const androidField = get(schema, "containers[0].panes[0]");
         androidField.isSupported = false;

package/v2Containers/Templates/index.js

@@ -51,7 +51,7 @@ import EmailPreview from '../../v2Components/EmailPreview';
 import CreativesContainer from '../CreativesContainer';
 import WechatRichmediaTemplatePreview from '../../v2Components/TemplatePreview/WechatRichmediaTemplatePreview';
 import { CHANNEL_CREATE_TRACK_MAPPING, CHANNEL_EDIT_TRACK_MAPPING } from '../App/constants';
-import { MOBILE_PUSH, WECHAT, SMS, EMAIL, EBILL, LINE, ANDROID, IOS } from '../CreativesContainer/constants';
+import { MOBILE_PUSH, WECHAT, SMS, EMAIL, EBILL, LINE } from '../CreativesContainer/constants';
 import emailIllustration from '../Assets/images/emailIllustration.svg';
 import smsIllustration from '../Assets/images/smsIllustration.svg';
 import pushIllustration from '../Assets/images/pushIllustration.svg';
@@ -193,8 +193,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         queryParams.originalId = this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier;
       }
       if (this.state.channel.toLowerCase() === "mobilepush" && !isEmpty(this.props.Templates.selectedWeChatAccount)) {
+        const account = this.props.Templates.selectedWeChatAccount;
         queryParams.accountId = account.id;
-        if (!this.isAndroidOrIosSuppoerted()) {
+        const isAndroidSupported = get(account, "configs.android") === '1';
+        const isIosSupported = get(account, "configs.ios") === '1';
+        if (!(isAndroidSupported || isIosSupported)) {
           this.props.actions.resetAccount();
           return;
         }
@@ -419,9 +422,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         this.props.actions.setWeChatAccount(this.props.Templates.weCrmAccounts[findIndex(this.props.Templates.weCrmAccounts, { name: value})]);
         const account = this.props.Templates.weCrmAccounts[findIndex(this.props.Templates.weCrmAccounts, { name: value})];
         params.accountId = account.id;
-        const { commChannels = [] } = account;
-        const isAndroidSupported = commChannels.includes(ANDROID);
-        const isIosSupported = commChannels.includes(IOS);
+        const isAndroidSupported = get(account, "configs.android") === '1';
+        const isIosSupported = get(account, "configs.ios") === '1';
         if (!(isAndroidSupported || isIosSupported)) {
           this.setState({selectedAccountError: true});
           this.props.actions.resetTemplate();
@@ -690,13 +692,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
     </div>);
   }
-  isAndroidOrIosSuppoerted = () => {
-    const account = this.props.Templates.selectedWeChatAccount || {};
-    const { commChannels = [] } = account;
-    const isAndroidSupported = commChannels.includes(ANDROID);
-    const isIosSupported = commChannels.includes(IOS);
-    return isAndroidSupported || isIosSupported;
-  }
   filterLineTemplates = (templates) => {
     const { lineFilter } = this.state;
     if (LINE_FILTERS.ALL === lineFilter) {
@@ -1559,7 +1554,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         return {};
     }
   }
-  checkSearchDisabled = () => (this.props.route.name === "mobilepush" && !(this.props.Templates.selectedWeChatAccount && this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier && this.isAndroidOrIosSuppoerted()))
+  checkSearchDisabled = () => (this.props.route.name === "mobilepush" && !(this.props.Templates.selectedWeChatAccount && this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier && this.props.Templates.selectedWeChatAccount.configs && (this.props.Templates.selectedWeChatAccount.configs.ios === '1' || this.props.Templates.selectedWeChatAccount.configs.android === '1')))
   renderEmailPreviewModal() {
     const slideboxContent = (
       <div style={{height: "75vh", width: '55vw'}}>