@capillarytech/creatives-library 7.6.11 → 7.6.13

package/v2Containers/Templates/index.js

@@ -62,6 +62,8 @@ import {
 } from '../App/constants';
 import { MOBILE_PUSH, WECHAT, SMS, EMAIL, EBILL, LINE, VIBER, FACEBOOK } from '../CreativesContainer/constants';
 
+import {CREATIVE} from '../Facebook/constants';
+
 import emailIllustration from '../Assets/images/emailIllustration.svg';
 import smsIllustration from '../Assets/images/smsIllustration.svg';
 import pushIllustration from '../Assets/images/pushIllustration.svg';
@@ -321,7 +323,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
       const fbSetting = get(nextProps.Templates, 'campaignSettings.accountSettings.socialAccountSettings.facebookAccountSettings', []);
       const { accountName = "",
-         orgUnitFacebookPageSettingsMap = {},
+          orgUnitFacebookPageSettingsMap = {},
         } = fbSetting[0] || {};
       let pageAccessToken = false;
       if (!isEmpty(orgUnitFacebookPageSettingsMap)) {
@@ -454,7 +456,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       this.setState({previewTemplate: nextProps.Templates.templateDetails});
     }
 
-    if (nextProps.Templates.weCrmAccounts !== undefined && nextProps.Templates.weCrmAccounts.length === 1 && this.state.defaultAccount && (['wechat', 'mobilepush'].indexOf(this.state.channel.toLowerCase()) > -1)) {
+    if (nextProps.Templates.weCrmAccounts !== undefined && nextProps.Templates.weCrmAccounts.length === 1 && this.state.defaultAccount && (['wechat'].indexOf(this.state.channel.toLowerCase()) > -1)) {
       const paramsDefault = {
         name: this.state.searchText,
         sortBy: this.state.sortBy,
@@ -464,9 +466,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         paramsDefault.wecrmToken = nextProps.Templates.weCrmAccounts[0].configs.wecrm_token;
         paramsDefault.originalId = nextProps.Templates.weCrmAccounts[0].sourceAccountIdentifier;
         nextProps.actions.setWeChatAccount(nextProps.Templates.weCrmAccounts[0]);
-      } else if (this.state.channel.toLowerCase() === 'mobilepush') {
-        nextProps.actions.setWeChatAccount(nextProps.Templates.weCrmAccounts[0]);
-        paramsDefault.accountId = nextProps.Templates.weCrmAccounts[0].id;
       }
       this.setState({defaultAccount: false, activeMode: TEMPLATES_MODE, selectedAccount: nextProps.Templates.weCrmAccounts[0].name });
       this.getAllTemplates({params: paramsDefault}, true);
@@ -1139,11 +1138,14 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const channel = this.state.channel.toLowerCase();
     //const keyType = ev.key && ev.key.toLowerCase() !== undefined ? ev.state.toLowerCase() : '';
     let routeParams = {};
-    const {fbAdManger} = this.props;
-    timeTracker.startTimer(CHANNEL_CREATE_TRACK_MAPPING[channel]);
-    if (this.isEnabledInLibraryModule("callCreateFromProps")) {
-      if (this.props.fbAdManger === "CREATIVE") {
-        this.props.createNew(fbAdManger);
+    const {fbAdManager} = this.props;
+    const isLibraryMode = this.isEnabledInLibraryModule("callCreateFromProps");
+    if (!isLibraryMode) {
+      timeTracker.startTimer(CHANNEL_CREATE_TRACK_MAPPING[channel]);
+    }
+    if (isLibraryMode) {
+      if (this.props.fbAdManager === CREATIVE) {
+        this.props.createNew(fbAdManager);
       } else {
         this.props.createNew();
       }
@@ -1364,7 +1366,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   };
 
   handleEditClick(e, template, modeType, path, options) {
-    timeTracker.startTimer(CHANNEL_EDIT_TRACK_MAPPING[this.state.channel.toLowerCase()]);
     if (modeType && modeType !== undefined) {
       this.setState({modeType});
     }
@@ -1417,8 +1418,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     }
     if (this.isEnabledInLibraryModule("callSelectFromProps")) {
-      this.props.onSelectTemplate(this.selectTemplate(id), this.props.fbAdManger);
+      this.props.onSelectTemplate(this.selectTemplate(id), this.props.fbAdManager);
     } else {
+      timeTracker.startTimer(CHANNEL_EDIT_TRACK_MAPPING[this.state.channel.toLowerCase()]);
       if (this.state.channel.toLowerCase() === 'ebill') {
         pathName = `/ebill/edit/${id}`;
       }
@@ -1952,11 +1954,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   render() {
     const isFullMode = this.isFullMode();
     const { activeMode, channel, wechatFilter, lineFilter } = this.state;
-    let showForFacebook = false;
+    let showFbAds = false;
     if (channel.toLowerCase() === FACEBOOK_CHANNEL) {
       const campaignSettings = this.props.Templates.campaignSettings;
       if (campaignSettings && isEmpty(campaignSettings?.accountSettings)) {
-        showForFacebook = true;
+        showFbAds = true;
       } else if (!isEmpty(campaignSettings?.accountSettings)) {
         const fbSetting = get(this.props.Templates, 'campaignSettings.accountSettings.socialAccountSettings.facebookAccountSettings', []);
         const { orgUnitFacebookPageSettingsMap = {} } = fbSetting[0] || {};
@@ -1968,17 +1970,17 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
             }
           });
           if (!pageAccessToken) {
-            showForFacebook = true;
+            showFbAds = true;
           }
         } else {
-          showForFacebook = true;
+          showFbAds = true;
         }
       }
     }
 
     const showForViber = (![VIBER_CHANNEL, FACEBOOK_CHANNEL].includes(channel.toLowerCase()) ||
       (channel.toLowerCase() === VIBER_CHANNEL && !this.props.isFullMode && isEmpty(get(this.props, 'Templates.selectedViberAccount', {}))) ||
-      (channel.toLowerCase() === FACEBOOK_CHANNEL && showForFacebook)
+      (channel.toLowerCase() === FACEBOOK_CHANNEL && showFbAds)
     );
 
 

package/v2Containers/TemplatesV2/index.js

@@ -45,7 +45,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       channelsToDisable = [],
       isFullMode,
       onChannelChange,
-      showDisableInfoForFacebook,
+      showDisabledFBInfo,
     } = props;
 
     const defaultPanes = {
@@ -81,7 +81,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       if (channelsToDisable.includes(pane.key)) {
         // eslint-disable-next-line no-param-reassign
         pane.disabled = true;
-        if (pane.key === 'facebook' && showDisableInfoForFacebook) {
+        if (pane.key === 'facebook' && showDisabledFBInfo) {
           pane.tab = (<CapTooltip
             title={
             intl.formatMessage(messages.facebookDisableinfo)
@@ -158,7 +158,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   );
 
   getFacebookComponent = () => {
-    const { messageDetails, cap, onFacebookSubmit, messageStrategy, showDisableInfoForFacebook, orgUnitId } = this.props;
+    const { messageDetails, cap, onFacebookSubmit, messageStrategy, showDisabledFBInfo, orgUnitId } = this.props;
     return (
       <Facebook
         {...this.props}
@@ -166,7 +166,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         cap={cap}
         onFacebookSubmit={onFacebookSubmit}
         messageStrategy={messageStrategy}
-        showDisableInfoForFacebook={showDisableInfoForFacebook}
+        showDisabledFBInfo={showDisabledFBInfo}
         orgUnitId={orgUnitId}
       />
     );

package/v2Containers/Viber/index.js

@@ -49,6 +49,10 @@ import {
   VIBER_IMG_SIZE,
   charLimit,
 } from './constants';
+import { GA } from '@capillarytech/cap-ui-utils';
+import { CREATE, EDIT, TRACK_CREATE_VIBER, TRACK_EDIT_VIBER } from '../App/constants';
+import { gtmPush } from '../../utils/gtmTrackers';
+import { VIBER } from '../CreativesContainer/constants';
 const { CapHeadingSpan } = CapHeading;
 const { TextArea } = CapInput;
 
@@ -562,7 +566,7 @@ const Viber = (props) => {
     };
   };
 
-  const createCallback = (errorMessage, isEdit) => {
+  const createCallback = ({errorMessage, resp}, isEdit) => {
     if (!errorMessage) {
       CapNotification.success({
         message: isEdit ? formatMessage(messages.viberEditNotification) : formatMessage(messages.viberCreateNotification),
@@ -572,6 +576,18 @@ const Viber = (props) => {
       } else {
         actions.clearCreateResponse();
       }
+      const timeTaken = GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_VIBER : TRACK_CREATE_VIBER, {
+        category: 'Creatives',
+        action: isEdit ? TRACK_EDIT_VIBER : TRACK_CREATE_VIBER,
+      });
+      gtmPush('creativeDetails', {
+        id: resp.templateId._id || resp.templateId,
+        name: messageTitle,
+        channel: VIBER,
+        timeTaken,
+        content: messageContent,
+        mode: isEdit ? EDIT : CREATE
+      });
     } else {
       CapNotification.error({
         message: errorMessage,
@@ -583,7 +599,7 @@ const Viber = (props) => {
     actions.createTemplate(
         formatSubmitPayload(),
         (resp, errorMessage) => {
-          createCallback(errorMessage);
+          createCallback({resp, errorMessage});
           onCreateComplete();
         }
     );
@@ -596,7 +612,7 @@ const Viber = (props) => {
         _id: params.id,
       },
         (resp, errorMessage) => {
-          createCallback(errorMessage, true);
+          createCallback({resp, errorMessage}, true);
           onCreateComplete();
         });
   };

package/v2Containers/WeChat/MapTemplates/index.js

@@ -30,7 +30,9 @@ import * as templateActions from '../../Templates/actions';
 import './_mapTemplates.scss';
 import withCreatives from '../../../hoc/withCreatives';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { TRACK_CREATE_WECHAT, TRACK_EDIT_WECHAT } from '../../App/constants';
+import { CREATE, EDIT, TRACK_CREATE_WECHAT, TRACK_EDIT_WECHAT } from '../../App/constants';
+import { gtmPush } from '../../../utils/gtmTrackers';
+import { WECHAT } from '../../CreativesContainer/constants';
 
 const SELECT_TEMPLATE_MODE = "selectTemplate";
 const MAP_TEMPLATE_MODE = "mapTemplateMode";
@@ -1172,12 +1174,19 @@ export class MapTemplates extends React.Component { // eslint-disable-line react
             getFormData(this.getFormData(obj));
           }, 0);
         }
-        GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_WECHAT : TRACK_CREATE_WECHAT, {
+        const timeTaken = GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_WECHAT : TRACK_CREATE_WECHAT, {
           category: 'Creatives',
           action: isEdit ? TRACK_EDIT_WECHAT : TRACK_CREATE_WECHAT,
           label : 'MapTemplates',
         });
-        
+        gtmPush('creativeDetails', {
+          id: response.templateId._id || response.templateId,
+          name: obj?.versions?.base?.Title,
+          channel: `${WECHAT} Maptemplate`,
+          timeTaken,
+          content: this.state.formData?.base?.['sms-editor'],
+          mode: isEdit ? EDIT : CREATE
+        });
       });
     }
     

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

@@ -29,7 +29,9 @@ import noImage from '../../../../assets/noImage.png';
 import Pagination from '../../../../v2Components/Pagination';
 import { CAP_SPACE_08, CAP_SPACE_12, CAP_SPACE_16 } from '@capillarytech/cap-ui-library/styled/variables';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { TRACK_CREATE_WECHAT, TRACK_EDIT_WECHAT } from '../../../App/constants';
+import { CREATE, EDIT, TRACK_CREATE_WECHAT, TRACK_EDIT_WECHAT } from '../../../App/constants';
+import { gtmPush } from '../../../../utils/gtmTrackers';
+import { WECHAT } from '../../../CreativesContainer/constants';
 export class Create extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -556,11 +558,18 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
         // CapNotification.success({
         //   message: this.props.intl.formatMessage(messages.saveSuccess),
         // });
-        GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_WECHAT : TRACK_CREATE_WECHAT, {
+        const timeTaken = GA.timeTracker.stopTimer(isEdit ? TRACK_EDIT_WECHAT : TRACK_CREATE_WECHAT, {
           category: 'Creatives',
           action: isEdit ? TRACK_EDIT_WECHAT : TRACK_CREATE_WECHAT,
           label: 'RichMedia',
         });
+        gtmPush('creativeDetails', {
+          id: response.templateId._id || response.templateId,
+          name: saveObj?.name,
+          channel: `${WECHAT} Richmedia`,
+          timeTaken,
+          mode: isEdit ? EDIT : CREATE
+        });
         if (getFormData) {
           getFormData(this.getFormData({
             mediaId: response.mediaId,