@capillarytech/creatives-library 6.3.3 → 6.3.5

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "6.3.3",
+  "version": "6.3.5",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",
@@ -13,7 +13,7 @@
   "license": "LicenseRef-LICENSE",
   "dependencies": {
     "@babel/polyfill": "7.4.3",
-    "@capillarytech/cap-ui-utils": "1.2.3",
+    "@capillarytech/cap-ui-utils": "1.2.4",
     "babel-cli": "^6.26.0",
     "chalk": "1.1.3",
     "jquery": "^3.3.1",

package/services/api.js

@@ -22,7 +22,7 @@ if (process.env.NODE_ENV === 'production') {
 }
 let requestCallerName = '';
 const isProd = process.env.NODE_ENV === 'production';
-
+const { getCallerName, tracker } = GA;
 function parseJSON(response) {
   return response.json();
 }
@@ -62,7 +62,7 @@ function clearLocalStorage() {
 function checkStatus(response) {
   const { status, statusText } = response || {};
   if (status < 200 || status > 300) {
-    GA.tracker.trackException({
+    tracker.trackException({
       description: `API Error ${requestCallerName} returned ${status}`,
       fatal: true,
     });
@@ -89,31 +89,7 @@ function request(url, options) {
     .then(checkStatus)
     .then(parseJSON);
 }
-const getCallerName = () => {
-  let nameTrace;
-  try {
-    throw new Error();
-  } catch (e) {
-    // Error.prototype.stack Manually throw an error and catch the function name by tracing the stack
-    //As per MDN, the use of Error.prototype.stack is discouraged because of it's non-standard behaviour and it's behaviour might change on different browsers
-    //once we find better solution we will make the changes
-    const stackLines = e.stack.split('\n');
-    let callerIndex = 0;
-    for (const i in stackLines) {
-      if (stackLines.hasOwnProperty(i)) {
-        if (!stackLines[i].match(/http[s]?:\/\//)) continue;
-        callerIndex = Number(i) + 2;
-        break;
-      }
-    }
-    nameTrace = stackLines[callerIndex].match(/([^(]+)@|at ([^(]+) \(/);
-    if (nameTrace === null) {
-      callerIndex -= 2;
-      nameTrace = stackLines[callerIndex].match(/([^(]+)@|at ([^(]+) \(/);
-    }
-  }
-  return nameTrace !== null ? nameTrace[1] || nameTrace[2] : '';
-};
+
 function getAPICallObject(method, body, isFileUpload = false, loadCampaignHeaders = false) {
   const token = loadItem('token');
   const orgID = loadItem('orgID');

package/translations/en.json

@@ -26,12 +26,15 @@
   "creatives.components.Footer.header": "This is the Footer component !",
   "creatives.components.FormBuilder.cancel": "Cancel",
   "creatives.components.FormBuilder.contentNotValidLanguage": "Content is not valid for language:",
+  "creatives.components.FormBuilder.genericTagsValidationError": "Please check the message content for unsupported/missing tags",
   "creatives.components.FormBuilder.header": "This is the FormBuilder component !",
   "creatives.components.FormBuilder.layoutSelection": "Layout Selection",
   "creatives.components.FormBuilder.loadingEDMTemplates": "Loading EDM Templates",
   "creatives.components.FormBuilder.missingTags": "Missing tags are:",
+  "creatives.components.FormBuilder.missingTagsValidationError": "Missing tags: {missingTags}. Please add them to this message.",
   "creatives.components.FormBuilder.ok": "Ok",
   "creatives.components.FormBuilder.unsupportedTags": "Unsupported tags are:",
+  "creatives.components.FormBuilder.unsupportedTagsValidationError": "Unsupported tags: {unsupportedTags}. Please remove them from this message.",
   "creatives.components.FormBuilder.yes": "Yes",
   "creatives.components.Header.cancel": "Cancel",
   "creatives.components.Header.enterTemplateName": "Enter template name*",
@@ -156,6 +159,7 @@
   "creatives.componentsV2.NewCallTask.done": "Done",
   "creatives.componentsV2.NewCallTask.messageHeader": "Message",
   "creatives.componentsV2.NewCallTask.personalisationTags": "Add Labels",
+  "creatives.componentsV2.NewCallTask.useInS2D": "Use in Store2Door",
   "creatives.componentsV2.PreviewSideBar.duplicate": "Duplicate",
   "creatives.componentsV2.PreviewSideBar.edit": "Edit",
   "creatives.componentsV2.PreviewSideBar.header": "This is the PreviewSideBar component !",
@@ -721,6 +725,18 @@
   "creatives.containers.WeChat.loadingEDMTemplates": "loading EDM Templates",
   "creatives.containers.WeChat.mapTemplateFooter": "Footer",
   "creatives.containers.WeChat.mapTemplateHeader": "Header",
+  "creatives.containers.WeChat.miniWeChatPlaceholder": "E.g. ab4892njkl4l2op",
+  "creatives.containers.WeChat.miniWechatIdError": "Mini-Program ID cannot be empty",
+  "creatives.containers.WeChat.miniWechatIdInductive": "Unique alpha numeric code for this specific app",
+  "creatives.containers.WeChat.miniWechatIdLabel": "Mini-Program ID",
+  "creatives.containers.WeChat.pagePathError": "Page path cannot be empty.",
+  "creatives.containers.WeChat.pagePathInductive": "User will be redirected to the Mini-Program path provided here",
+  "creatives.containers.WeChat.pagePathLabel": "Page path",
+  "creatives.containers.WeChat.pagePathPlaceholder": "E.g. pages/user/profile",
+  "creatives.containers.WeChat.redirectOptionMiniProgram": "Mini-Program",
+  "creatives.containers.WeChat.redirectOptionURL": "URL",
+  "creatives.containers.WeChat.redirectOptionsHeadingValue": "URL or Mini-Program",
+  "creatives.containers.WeChat.redirectionOptionError": "Please select a redirect option",
   "creatives.containers.WeChat.save": "Save",
   "creatives.containers.WeChat.selectWechatAccount": "Select wechat account",
   "creatives.containers.WeChat.selectWechatTemplate": "Select wechat template",
@@ -1420,11 +1436,24 @@
   "creatives.containersV2.WeChat.hasInvalidContent": "has invalid content.",
   "creatives.containersV2.WeChat.hasValidContent": "has valid content.",
   "creatives.containersV2.WeChat.header": "WeChat",
+  "creatives.containersV2.WeChat.internalUrlLabel": "Is this internal url",
   "creatives.containersV2.WeChat.isInternalUrl": "Is this internal url",
   "creatives.containersV2.WeChat.link": "Link",
   "creatives.containersV2.WeChat.linkCantEmpty": "has valid content.",
   "creatives.containersV2.WeChat.linkErrorMessage": "Link cannot be empty.",
+  "creatives.containersV2.WeChat.miniWeChatPlaceholder": "E.g. ab4892njkl4l2op",
+  "creatives.containersV2.WeChat.miniWechatIdError": "Mini-Program ID cannot be empty",
+  "creatives.containersV2.WeChat.miniWechatIdInductive": "Unique alpha numeric code for this specific app",
+  "creatives.containersV2.WeChat.miniWechatIdLabel": "Mini-Program ID",
   "creatives.containersV2.WeChat.newWechat": "New wechat",
+  "creatives.containersV2.WeChat.pagePathError": "Page path cannot be empty.",
+  "creatives.containersV2.WeChat.pagePathInductive": "User will be redirected to the Mini-Program path provided here",
+  "creatives.containersV2.WeChat.pagePathLabel": "Page path",
+  "creatives.containersV2.WeChat.pagePathPlaceholder": "E.g. pages/user/profile",
+  "creatives.containersV2.WeChat.redirectOptionMiniProgram": "Mini-Program",
+  "creatives.containersV2.WeChat.redirectOptionURL": "URL",
+  "creatives.containersV2.WeChat.redirectOptionsHeadingValue": "URL or Mini-Program",
+  "creatives.containersV2.WeChat.redirectionOptionError": "Please select a redirect option",
   "creatives.containersV2.WeChat.save": "Save",
   "creatives.containersV2.WeChat.select": "Select",
   "creatives.containersV2.WeChat.selectWechatAccount": "Select wechat account",
@@ -1432,6 +1461,8 @@
   "creatives.containersV2.WeChat.somethingWentWrong": "Something went wrong!!",
   "creatives.containersV2.WeChat.tagsLabel": "Tags",
   "creatives.containersV2.WeChat.template": "Template",
+  "creatives.containersV2.WeChat.templateLinkError": "Link cannot be empty.",
+  "creatives.containersV2.WeChat.templateLinkLabel": "Link",
   "creatives.containersV2.WeChat.templateMapping": "Template mapping",
   "creatives.containersV2.WeChat.templateName": "Template Name",
   "creatives.containersV2.WeChat.wechatCreateSuccess": "WeChat template mapped successfully",

package/translations/zh.json

@@ -26,12 +26,15 @@
   "creatives.components.Footer.header": "",
   "creatives.components.FormBuilder.cancel": "",
   "creatives.components.FormBuilder.contentNotValidLanguage": "",
+  "creatives.components.FormBuilder.genericTagsValidationError": "",
   "creatives.components.FormBuilder.header": "",
   "creatives.components.FormBuilder.layoutSelection": "",
   "creatives.components.FormBuilder.loadingEDMTemplates": "",
   "creatives.components.FormBuilder.missingTags": "",
+  "creatives.components.FormBuilder.missingTagsValidationError": "",
   "creatives.components.FormBuilder.ok": "",
   "creatives.components.FormBuilder.unsupportedTags": "",
+  "creatives.components.FormBuilder.unsupportedTagsValidationError": "",
   "creatives.components.FormBuilder.yes": "",
   "creatives.components.Header.cancel": "",
   "creatives.components.Header.enterTemplateName": "",
@@ -156,6 +159,7 @@
   "creatives.componentsV2.NewCallTask.done": "",
   "creatives.componentsV2.NewCallTask.messageHeader": "",
   "creatives.componentsV2.NewCallTask.personalisationTags": "",
+  "creatives.componentsV2.NewCallTask.useInS2D": "",
   "creatives.componentsV2.PreviewSideBar.duplicate": "",
   "creatives.componentsV2.PreviewSideBar.edit": "",
   "creatives.componentsV2.PreviewSideBar.header": "",
@@ -721,6 +725,18 @@
   "creatives.containers.WeChat.loadingEDMTemplates": "",
   "creatives.containers.WeChat.mapTemplateFooter": "",
   "creatives.containers.WeChat.mapTemplateHeader": "",
+  "creatives.containers.WeChat.miniWeChatPlaceholder": "",
+  "creatives.containers.WeChat.miniWechatIdError": "",
+  "creatives.containers.WeChat.miniWechatIdInductive": "",
+  "creatives.containers.WeChat.miniWechatIdLabel": "",
+  "creatives.containers.WeChat.pagePathError": "",
+  "creatives.containers.WeChat.pagePathInductive": "",
+  "creatives.containers.WeChat.pagePathLabel": "",
+  "creatives.containers.WeChat.pagePathPlaceholder": "",
+  "creatives.containers.WeChat.redirectOptionMiniProgram": "",
+  "creatives.containers.WeChat.redirectOptionURL": "",
+  "creatives.containers.WeChat.redirectOptionsHeadingValue": "",
+  "creatives.containers.WeChat.redirectionOptionError": "",
   "creatives.containers.WeChat.save": "",
   "creatives.containers.WeChat.selectWechatAccount": "",
   "creatives.containers.WeChat.selectWechatTemplate": "",
@@ -1420,11 +1436,24 @@
   "creatives.containersV2.WeChat.hasInvalidContent": "",
   "creatives.containersV2.WeChat.hasValidContent": "",
   "creatives.containersV2.WeChat.header": "",
+  "creatives.containersV2.WeChat.internalUrlLabel": "",
   "creatives.containersV2.WeChat.isInternalUrl": "",
   "creatives.containersV2.WeChat.link": "",
   "creatives.containersV2.WeChat.linkCantEmpty": "",
   "creatives.containersV2.WeChat.linkErrorMessage": "",
+  "creatives.containersV2.WeChat.miniWeChatPlaceholder": "",
+  "creatives.containersV2.WeChat.miniWechatIdError": "",
+  "creatives.containersV2.WeChat.miniWechatIdInductive": "",
+  "creatives.containersV2.WeChat.miniWechatIdLabel": "",
   "creatives.containersV2.WeChat.newWechat": "",
+  "creatives.containersV2.WeChat.pagePathError": "",
+  "creatives.containersV2.WeChat.pagePathInductive": "",
+  "creatives.containersV2.WeChat.pagePathLabel": "",
+  "creatives.containersV2.WeChat.pagePathPlaceholder": "",
+  "creatives.containersV2.WeChat.redirectOptionMiniProgram": "",
+  "creatives.containersV2.WeChat.redirectOptionURL": "",
+  "creatives.containersV2.WeChat.redirectOptionsHeadingValue": "",
+  "creatives.containersV2.WeChat.redirectionOptionError": "",
   "creatives.containersV2.WeChat.save": "",
   "creatives.containersV2.WeChat.select": "",
   "creatives.containersV2.WeChat.selectWechatAccount": "",
@@ -1432,6 +1461,8 @@
   "creatives.containersV2.WeChat.somethingWentWrong": "",
   "creatives.containersV2.WeChat.tagsLabel": "",
   "creatives.containersV2.WeChat.template": "",
+  "creatives.containersV2.WeChat.templateLinkError": "",
+  "creatives.containersV2.WeChat.templateLinkLabel": "",
   "creatives.containersV2.WeChat.templateMapping": "",
   "creatives.containersV2.WeChat.templateName": "",
   "creatives.containersV2.WeChat.wechatCreateSuccess": "",

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/App/constants.js

@@ -18,6 +18,7 @@ export const TRACK_CREATE_EMAIL = 'createEmail';
 export const TRACK_CREATE_MPUSH = 'createMpush';
 export const TRACK_CREATE_WECHAT = 'createWeChat';
 export const TRACK_CREATE_IMAGE = 'createImage';
+export const TRACK_CREATE_LINE = 'createLine';
 
 
 export const TRACK_EDIT_SMS = 'editSms';
@@ -25,6 +26,7 @@ export const TRACK_EDIT_EMAIL = 'editEmail';
 export const TRACK_EDIT_MPUSH = 'editMpush';
 export const TRACK_EDIT_WECHAT = 'editWeChat';
 export const TRACK_EDIT_IMAGE = 'editImage';
+export const TRACK_EDIT_LINE = 'editLine';
 
 export const CHANNEL_CREATE_TRACK_MAPPING = {
   sms: TRACK_CREATE_SMS,
@@ -32,6 +34,7 @@ export const CHANNEL_CREATE_TRACK_MAPPING = {
   mobilepush: TRACK_CREATE_MPUSH,
   wechat: TRACK_CREATE_WECHAT,
   gallery: TRACK_CREATE_IMAGE,
+  line: TRACK_CREATE_LINE,
 };
 
 export const CHANNEL_EDIT_TRACK_MAPPING = {
@@ -40,5 +43,6 @@ export const CHANNEL_EDIT_TRACK_MAPPING = {
   mobilepush: TRACK_EDIT_MPUSH,
   wechat: TRACK_EDIT_WECHAT,
   gallery: TRACK_EDIT_IMAGE,
+  line: TRACK_EDIT_LINE,
 };
 export const GTM_TRACKING_ID = 'UA-110024621-2';

package/v2Containers/Cap/index.js

@@ -35,7 +35,7 @@ const CapWrapper = styled.div`
   padding: 0;
   flex-direction: column;
 `;
-GA.initialize({ accessKey: GTM_TRACKING_ID, trackUIError: true });
+GA.initialize({ accessKey: GTM_TRACKING_ID, trackUIError: true, trackLoadPerformance: 'creatives' });
 
 
 export class Cap extends React.Component { // eslint-disable-line react/prefer-stateless-function

package/v2Containers/Email/index.js

@@ -624,11 +624,17 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     });
   }
   onUpdateTemplateComplete = (createResponse) => {
-    const isEdit = this.state.isEdit;
+    const {isEdit, formData = {} } = this.state || {};
+    const base = formData.base || {};
+    const isDragDrop = _.get(base[base.activeTab], 'is_drag_drop', false);
+    let editorType = 'ckEditor';
+    if ( isDragDrop ) {
+      editorType = 'edmEditor';
+    }
     GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_EMAIL : TRACK_CREATE_EMAIL, {
       category: 'Creatives',
       action: isEdit ? TRACK_EDIT_EMAIL : TRACK_CREATE_EMAIL,
-      label: 'using editor',
+      label: `using ${editorType}`,
     });
     if (createResponse && createResponse.templateId) {
       // this.resetSchema();

package/v2Containers/Line/Create/index.js

@@ -7,6 +7,7 @@ import { intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import _ from 'lodash';
 import { CapSpin, CapHeading, CapRow, CapColumn, CapNotification } from '@capillarytech/cap-ui-library';
+import { GA } from '@capillarytech/cap-ui-utils';
 import messages from './messages';
 import * as actions from './actions';
 import Gallery from '../../Assets/Gallery';
@@ -23,6 +24,7 @@ import {
   LINE_IMG_WIDTH,
   LINE_IMG_SIZE,
 } from './constants';
+import { TRACK_CREATE_LINE, TRACK_EDIT_LINE } from '../../App/constants';
 
 export class Line extends Component {
   constructor(props) {
@@ -521,18 +523,36 @@ export class Line extends Component {
       } = this.props;
       const { text, originalContentUrl, image } = get(obj, "versions.base.content.messages[0]", {});
       const { name } = obj || {};
+      const {stopTimer} = GA.timeTracker;
+      const modeType = obj.definition.mode;
+      const type = this.state.isEdit ? TRACK_EDIT_LINE : TRACK_CREATE_LINE;
       if ((text || originalContentUrl || image) && (isFullMode ? name : true)) {
         if (!isFullMode) {
           saveMessage();
         } else if (this.state.isEdit) {
           actions.editTemplate(obj, () => {
+            // stop timer for edit line
+            stopTimer(type, {
+              category: 'Creatives',
+              action: type,
+              label: modeType,
+            });
             this.setEditSuccessMessage();
             onCreateComplete();
           });
         } else {
           actions.createTemplate(
             obj,
-            onCreateComplete
+            () => {
+              // stop timer for create line
+              stopTimer(type, {
+                category: 'Creatives',
+                action: type,
+                label: modeType,
+              });
+              this.setEditSuccessMessage();
+              onCreateComplete();
+            }
           );
         }
       }

package/v2Containers/Templates/index.js

@@ -971,7 +971,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         break;
     }
   };
- 
+  
   createTemplate(ev) {
     const type = this.props.location.query.type;
     const module = this.props.location.query.module ? this.props.location.query.module : 'default';