@capillarytech/creatives-library 6.5.1 → 6.6.1

package/index.html

@@ -10,10 +10,7 @@
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
     <meta http-equiv="Pragma" content="no-cache" />
     <meta http-equiv="Expires" content="0" />
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <script src="https://use.typekit.net/ifw1ntv.js"></script>
-    <!-- Roboto Font -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,500" rel="stylesheet">
     <!-- Google Tag Manager -->
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
         new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
@@ -43,5 +40,8 @@
       </div>
     </div>
     <!-- A lot of magic happens in this file. HtmlWebpackPlugin automatically includes all assets (e.g. bundle.js, main.css) with the correct HTML tags, which is why they are missing in this HTML file. Don't add any assets here! (Check out webpackconfig.js if you want to know more) -->
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons&display=swap" rel="stylesheet">
+    <!-- Roboto Font -->
+    <link href="https://fonts.googleapis.com/css?family=Roboto:400,500&display=swap" rel="stylesheet">
   </body>
 </html>

package/package.json

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

package/v2Containers/CreativesContainer/constants.js

@@ -15,3 +15,5 @@ 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/MobilePush/Create/index.js

@@ -27,6 +27,7 @@ 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;
@@ -103,8 +104,10 @@ 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 isAndroidSupported = get(this, "props.Templates.selectedWeChatAccount.configs.android") === '1';
-      const isIosSupported = get(this, "props.Templates.selectedWeChatAccount.configs.ios") === '1';
+      const account = this.props.Templates.selectedWeChatAccount;
+      const { commChannels = [] } = account;
+      const isAndroidSupported = commChannels.includes(ANDROID);
+      const isIosSupported = commChannels.includes(IOS);
       if (!isAndroidSupported) {
         const androidField = get(schema, "containers[0].panes[0]");
         androidField.isSupported = false;

package/v2Containers/MobilePush/Edit/index.js

@@ -31,6 +31,7 @@ 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;
@@ -145,8 +146,10 @@ 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 isAndroidSupported = get(this, "props.Templates.selectedWeChatAccount.configs.android") === '1';
-      const isIosSupported = get(this, "props.Templates.selectedWeChatAccount.configs.ios") === '1';
+      const account = this.props.Templates.selectedWeChatAccount;
+      const { commChannels = [] } = account;
+      const isAndroidSupported = commChannels.includes(ANDROID);
+      const isIosSupported = commChannels.includes(IOS);
       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 } from '../CreativesContainer/constants';
+import { MOBILE_PUSH, WECHAT, SMS, EMAIL, EBILL, LINE, ANDROID, IOS } 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,11 +193,8 @@ 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;
-        const isAndroidSupported = get(account, "configs.android") === '1';
-        const isIosSupported = get(account, "configs.ios") === '1';
-        if (!(isAndroidSupported || isIosSupported)) {
+        if (!this.isAndroidOrIosSuppoerted()) {
           this.props.actions.resetAccount();
           return;
         }
@@ -422,8 +419,9 @@ 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 isAndroidSupported = get(account, "configs.android") === '1';
-        const isIosSupported = get(account, "configs.ios") === '1';
+        const { commChannels = [] } = account;
+        const isAndroidSupported = commChannels.includes(ANDROID);
+        const isIosSupported = commChannels.includes(IOS);
         if (!(isAndroidSupported || isIosSupported)) {
           this.setState({selectedAccountError: true});
           this.props.actions.resetTemplate();
@@ -692,6 +690,13 @@ 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) {
@@ -1554,7 +1559,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.props.Templates.selectedWeChatAccount.configs && (this.props.Templates.selectedWeChatAccount.configs.ios === '1' || this.props.Templates.selectedWeChatAccount.configs.android === '1')))
+  checkSearchDisabled = () => (this.props.route.name === "mobilepush" && !(this.props.Templates.selectedWeChatAccount && this.props.Templates.selectedWeChatAccount.sourceAccountIdentifier && this.isAndroidOrIosSuppoerted()))
   renderEmailPreviewModal() {
     const slideboxContent = (
       <div style={{height: "75vh", width: '55vw'}}>