@capillarytech/creatives-library 6.3.2 → 6.3.4

package/containers/App/constants.js

@@ -1,3 +1,5 @@
 export const GET_SIDEBAR_REQUEST = 'app/App/GET_SIDEBAR_REQUEST';
 export const GET_SIDEBAR_SUCCESS = 'app/App/GET_SIDEBAR_SUCCESS';
 export const GET_SIDEBAR_FAILURE = 'app/App/GET_SIDEBAR_FAILURE';
+
+export const STORE2DOOR_PLUS_ENABLED = 'STORE2DOOR_PLUS_ENABLED';

package/containers/WeChat/MapTemplates/index.js

@@ -459,9 +459,6 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       template_id: this.state.editTemplateData.versions.base.template_id,
       Title: this.state.editTemplateData.versions.base.Title,
       Tag: [],
-      url: this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'],
-      userName: this.state.formData['template-mini-program-id'] ? this.state.formData['template-mini-program-id'] : '',
-      path: this.state.formData['template-mini-program-page-path'] ? this.state.formData['template-mini-program-page-path'] : '',
       TopColor: "#000000",
       data: {},
       preview: '',
@@ -472,6 +469,15 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       creative_template_id: this.state.editTemplateData._id,
       touser: "{{wechat_open_id}}",
     };
+    if (this.state.formData['template-redirect-options-radio'] === MINI_PROGRAM) {
+      const miniprogram = {};
+      miniprogram.appid = this.state.formData['template-mini-program-id'] || '';
+      miniprogram.pagepath = this.state.formData['template-mini-program-page-path'] || '';
+      data.miniprogram = miniprogram;
+      data.url = "notset";
+    } else if (this.state.formData['template-redirect-options-radio'] === URL) {
+      data.url = this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'];
+    }
     _.forEach(this.state.selectedTemplateTags, (templateTag) => {
       const tagName = templateTag.substr(0, templateTag.indexOf('.'));
       let newTagname = tagName;
@@ -801,7 +807,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
         }
         formData[`template-${tagName}`] = this.state.editTemplateData.versions.base.data[tag].value;
       });
-      if (this.state.editTemplateData.versions.base.url) {
+      if (this.state.editTemplateData.versions.base.url && this.state.editTemplateData.versions.base.url !== "notset") {
         formData['template-redirect-options-radio'] = URL;
         formData[`template-link`] = this.state.editTemplateData.versions.base.isInternalUrl ? this.unMaskTemplateUrl(this.state.editTemplateData.versions.base.url) : this.state.editTemplateData.versions.base.url;
         schema.standalone.sections[0].childSections[1].childSections[0].childSections.push(this.getURLSchema());
@@ -809,10 +815,10 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       if (this.state.editTemplateData.versions.base.isInternalUrl) {
         formData['is-internal-url'] = this.state.editTemplateData.versions.base.isInternalUrl;
       }
-      if (this.state.editTemplateData.versions.base.userName && this.state.editTemplateData.versions.base.path) {
+      if (this.state.editTemplateData.versions.base.miniprogram && this.state.editTemplateData.versions.base.miniprogram.appid && this.state.editTemplateData.versions.base.miniprogram.pagepath) {
         formData['template-redirect-options-radio'] = MINI_PROGRAM;
-        formData['template-mini-program-id'] = this.state.editTemplateData.versions.base.userName;
-        formData['template-mini-program-page-path'] = this.state.editTemplateData.versions.base.path;
+        formData['template-mini-program-id'] = this.state.editTemplateData.versions.base.miniprogram.appid;
+        formData['template-mini-program-page-path'] = this.state.editTemplateData.versions.base.miniprogram.pagepath;
         schema.standalone.sections[0].childSections[1].childSections[0].childSections.push(this.getMiniProgramSchema());
       }
       // schema.standalone.sections[0].childSections[1].childSections[1].inputFields[0].cols[0].content = weChatData.content;
@@ -1264,9 +1270,6 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       "template_id": selectedWechatData.template_id,
       "Title": selectedWechatData.title,
       Tag: [],
-      url: this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'],
-      userName: this.state.formData['template-mini-program-id'] ? this.state.formData['template-mini-program-id'] : '',
-        path: this.state.formData['template-mini-program-page-path'] ? this.state.formData['template-mini-program-page-path'] : '',
       TopColor: "#000000",
       data: {},
       preview: '',
@@ -1275,6 +1278,15 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       content: selectedWechatData.content,
       isInternalUrl: this.state.formData['is-internal-url'],
     }
+    if (this.state.formData['template-redirect-options-radio'] === MINI_PROGRAM) {
+      const miniprogram = {};
+      miniprogram['appid'] = this.state.formData['template-mini-program-id'] || '';
+      miniprogram['pagepath'] = this.state.formData['template-mini-program-page-path'] || '';
+      obj.versions.base['miniprogram'] = miniprogram;
+      obj.versions.base['url'] = "notset";
+    } else if (this.state.formData['template-redirect-options-radio'] === URL) {
+      obj.versions.base['url'] = this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'];
+    }
     _.forEach(this.state.selectedTemplateTags, (templateTag) => {
       const tagName = templateTag.substr(0, templateTag.indexOf('.'));
       let newTagname = tagName;

package/containers/WeChat/MapTemplates/messages.js

@@ -152,6 +152,6 @@ export default defineMessages({
   },
   "pagePathInductive": {
     id: 'creatives.containers.WeChat.pagePathInductive',
-    defaultMessage: 'Provide the path within the Mini-Program user will taken to',
+    defaultMessage: 'User will be redirected to the Mini-Program path provided here',
   },
 });

package/package.json

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

package/utils/common.js

@@ -1,4 +1,6 @@
 import _ from 'lodash';
+import { Auth } from '@capillarytech/cap-ui-utils';
+import { STORE2DOOR_PLUS_ENABLED } from '../containers/App/constants';
 
 export function getUserNameById(userId, allUserList) {
   let userName = "";
@@ -30,3 +32,8 @@ export function removeLinksFromHtmlContent(content) {
   doc.remove();
   return copyContent;
 }
+
+export const hasStore2DoorFeature = Auth.hasFeatureAccess.bind(
+  null,
+  STORE2DOOR_PLUS_ENABLED,
+);

package/v2Components/NewCallTask/index.js

@@ -15,6 +15,7 @@ import TagList from '../../v2Containers/TagList';
 import CallTaskPreview from '../CallTaskPreview';
 import messages from './messages';
 import './_newCallTask.scss';
+import { hasStore2DoorFeature } from '../../utils/common';
 
 const CALL = 'CALL';
 const STOREMAX_WHATSAPP = 'STOREMAX_WHATSAPP';
@@ -102,6 +103,7 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
     const { formatMessage } = intl;
     const { subject, messageBody, description, callTaskActionType } = this.state;
     const tags = metaEntities && metaEntities.tags ? metaEntities.tags.standard : [];
+    const isStore2DoorEnabled = hasStore2DoorFeature();
     return (
       <CapSpin spinning={isLoading}>
         <CapRow gutter={16}>
@@ -138,13 +140,13 @@ class NewCallTask extends React.Component { // eslint-disable-line react/prefer-
                 value={description}
                 isRequired
                 />
-              <CapCheckbox
+              {isStore2DoorEnabled && <CapCheckbox
                 onChange={this.onS2DCheckChange}
                 checked={callTaskActionType === STOREMAX_WHATSAPP}
                 style={{marginTop: FONT_SIZE_S}}
               >
                 <FormattedMessage {...messages.useInS2D}/>
-              </CapCheckbox>
+              </CapCheckbox>}
             </div>
             <CapButton
               disabled={!subject || !messageBody || !description}

package/v2Containers/WeChat/MapTemplates/index.js

@@ -443,9 +443,6 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       template_id: editTemplateData.versions.base.template_id,
       Title: editTemplateData.versions.base.Title,
       Tag: [],
-      url: this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'],
-      userName: this.state.formData['template-mini-program-id'] ? this.state.formData['template-mini-program-id'] : '',
-      path: this.state.formData['template-mini-program-page-path'] ? this.state.formData['template-mini-program-page-path'] : '',
       TopColor: "#000000",
       data: {},
       BrandId: (selectedWeChatAccount.configs.brand_id ? selectedWeChatAccount.configs.brand_id : ''),
@@ -455,6 +452,15 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
       creative_template_id: editTemplateData._id,
       touser: "{{wechat_open_id}}",
     };
+    if (this.state.formData['template-redirect-options-radio'] === MINI_PROGRAM) {
+      const miniprogram = {};
+      miniprogram.appid = this.state.formData['template-mini-program-id'] || '';
+      miniprogram.pagepath = this.state.formData['template-mini-program-page-path'] || '';
+      data.miniprogram = miniprogram;
+      data.url = "notset";
+    } else if (this.state.formData['template-redirect-options-radio'] === URL) {
+      data.url = this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'];
+    }
     forEach(this.state.selectedTemplateTags, (templateTag) => {
       const tagName = templateTag.substr(0, templateTag.indexOf('.'));
       let newTagname = tagName;
@@ -691,7 +697,7 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
           }
           formData[`template-${tagName}`] = this.state.editTemplateData.versions.base.data[tag].value;
         });
-        if (this.state.editTemplateData.versions.base.url) {
+        if (this.state.editTemplateData.versions.base.url && this.state.editTemplateData.versions.base.url !== "notset") {
           formData['template-redirect-options-radio'] = URL;
           formData[`template-link`] = this.state.editTemplateData.versions.base.isInternalUrl ? this.unMaskTemplateUrl(this.state.editTemplateData.versions.base.url) : this.state.editTemplateData.versions.base.url;
           schema.standalone.sections[0].childSections[1].childSections[0].childSections.push(this.getURLSchema());
@@ -699,10 +705,10 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
         if (this.state.editTemplateData.versions.base.isInternalUrl) {
           formData['is-internal-url'] = this.state.editTemplateData.versions.base.isInternalUrl;
         }
-        if (this.state.editTemplateData.versions.base.userName && this.state.editTemplateData.versions.base.path) {
+        if (this.state.editTemplateData.versions.base.miniprogram && this.state.editTemplateData.versions.base.miniprogram.appid && this.state.editTemplateData.versions.base.miniprogram.pagepath) {
           formData['template-redirect-options-radio'] = MINI_PROGRAM;
-          formData['template-mini-program-id'] = this.state.editTemplateData.versions.base.userName;
-          formData['template-mini-program-page-path'] = this.state.editTemplateData.versions.base.path;
+          formData['template-mini-program-id'] = this.state.editTemplateData.versions.base.miniprogram.appid;
+          formData['template-mini-program-page-path'] = this.state.editTemplateData.versions.base.miniprogram.pagepath;
           schema.standalone.sections[0].childSections[1].childSections[0].childSections.push(this.getMiniProgramSchema());
         }
         // schema.standalone.sections[0].childSections[1].childSections[1].inputFields[0].cols[0].content = weChatData.content;
@@ -1125,9 +1131,6 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
         "template_id": selectedWechatData.template_id,
         "Title": selectedWechatData.title,
         Tag: [],
-        userName: this.state.formData['template-mini-program-id'] ? this.state.formData['template-mini-program-id'] : '',
-        path: this.state.formData['template-mini-program-page-path'] ? this.state.formData['template-mini-program-page-path'] : '',
-        url: this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'],
         TopColor: "#000000",
         data: {},
         preview: '',
@@ -1136,6 +1139,15 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
         content: selectedWechatData.content,
         isInternalUrl: this.state.formData['is-internal-url'],
       }
+      if (this.state.formData['template-redirect-options-radio'] === MINI_PROGRAM) {
+        const miniprogram = {};
+        miniprogram['appid'] = this.state.formData['template-mini-program-id'] || '';
+        miniprogram['pagepath'] = this.state.formData['template-mini-program-page-path'] || '';
+        obj.versions.base['miniprogram'] = miniprogram;
+        obj.versions.base['url'] = "notset";
+      } else if (this.state.formData['template-redirect-options-radio'] === URL) {
+        obj.versions.base['url'] = this.state.formData['is-internal-url'] ? this.maskTemplateUrl(this.state.formData['template-link']) : this.state.formData['template-link'];
+      }
       forEach(this.state.selectedTemplateTags, (templateTag) => {
         const tagName = templateTag.substr(0, templateTag.indexOf('.'));
         let newTagname = tagName;

package/v2Containers/WeChat/MapTemplates/messages.js

@@ -144,7 +144,7 @@ export default defineMessages({
   },
   "pagePathInductive": {
     id: 'creatives.containersV2.WeChat.pagePathInductive',
-    defaultMessage: 'Provide the path within the Mini-Program user will taken to',
+    defaultMessage: 'User will be redirected to the Mini-Program path provided here',
   },
   "pagePathLabel": {
     id: 'creatives.containersV2.WeChat.pagePathLabel',