@capillarytech/creatives-library 7.6.13 → 7.7.0

package/v2Containers/Facebook/messages.js

@@ -42,7 +42,7 @@ export default defineMessages({
   },
   fbAdsDescription: {
     id: `${messagePrefix}.fbAdsDescription`,
-    defaultMessage: 'Proceed with empty content block & you can create ads in Facebook Ad Manager under the  mentioned ad set.',
+    defaultMessage: 'You may create ads in Facebook Ad Manager under the below mentioned ad set. The performance of these ads will be reported here in Engage+.',
   },
   fbAdsDetailOne: {
     id: `${messagePrefix}.fbAdsDetailOne`,
@@ -56,9 +56,9 @@ export default defineMessages({
     id: `${messagePrefix}.fbAdsDetailThree`,
     defaultMessage: 'You can create ads later in Facebook ad manager.',
   },
-  fbContinue: {
-    id: `${messagePrefix}.fbContinue`,
-    defaultMessage: 'Continue',
+  fbConfirm: {
+    id: `${messagePrefix}.fbConfirm`,
+    defaultMessage: 'Confirm',
   },
   fbChange: {
     id: `${messagePrefix}.fbChange`,
@@ -164,24 +164,4 @@ export default defineMessages({
     id: `${messagePrefix}.fbMarketingObjectiveStoreTrafficDescription`,
     defaultMessage: 'Drive visits to your physical stores by showing ads to people who are nearby.',
   },
-  capFbAdManager: {
-    id: `${messagePrefix}.capFbAdManager`,
-    defaultMessage: 'Capillary Facebook ad manager',
-  },
-  fbAdManager: {
-    id: `${messagePrefix}.fbAdManager`,
-    defaultMessage: 'Facebook ad manager',
-  },
-  adManagerHeading: {
-    id: `${messagePrefix}.adManagerHeading`,
-    defaultMessage: "Where do you want to create your Facebook ad creative?",
-  },
-  capAdManagerHeading: {
-    id: `${messagePrefix}.capAdManagerHeading`,
-    defaultMessage: "You can create Facebook ads creative in Engage+ Facebook ad Manager.",
-  },
-  facebookDisableinfo: {
-    id: `${messagePrefix}.facebookDisableinfo`,
-    defaultMessage: 'Please integrate Facebook Ad page ID & username to enable this option.',
-  },
 });

package/v2Containers/Line/Container/index.js

@@ -18,11 +18,11 @@ import CapIcon from '@capillarytech/cap-ui-library/CapIcon';
 import CapHeader from '@capillarytech/cap-ui-library/CapHeader';
 // GA
 import { GA } from '@capillarytech/cap-ui-utils';
-import { CREATE, EDIT, TRACK_CREATE_LINE, TRACK_EDIT_LINE } from '../../App/constants';
+import { TRACK_CREATE_LINE, TRACK_EDIT_LINE } from '../../App/constants';
 
 import LineWrapper from './Wrapper';
 import messages from './messages';
-import { TEXT, IMAGE, IMAGE_MAP, IMAGE_CAROUSEL, MAX_LINE_WRAPPER_LIMIT, MAX_LINE_WRAPPER_LIMIT_FULL_MODE, DEFAULT_VIDEO_URI, VIDEO, TEMPLATE  } from './constants';
+import { TEXT, IMAGE, IMAGE_MAP, IMAGE_CAROUSEL, MAX_LINE_WRAPPER_LIMIT, MAX_LINE_WRAPPER_LIMIT_FULL_MODE, DEFAULT_VIDEO_URI  } from './constants';
 import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 
 import { makeSelectMetaEntities, setInjectedTags } from '../../Cap/selectors';
@@ -32,8 +32,6 @@ import {makeSelectCreateLine, makeSelectLine } from './selectors';
 import * as compActions from './actions';
 import * as templateActionsConfig from '../../Templates/actions';
 import withCreatives from '../../../hoc/withCreatives';
-import { gtmPush } from '../../../utils/gtmTrackers';
-import { LINE } from '../../CreativesContainer/constants';
 
 const { stopTimer } = GA.timeTracker;
 
@@ -350,19 +348,6 @@ export const LineContainer = ({
         }
     }
 
-    const formatFSPayload = (lineWrapperContents) => {
-        const [ {
-            messageTitle,
-            messageContent: content,
-            type,
-        } = {}] = lineWrapperContents;
-        return {
-            name: messageTitle,
-            content,
-            imageAdded: [IMAGE, IMAGE_MAP, IMAGE_CAROUSEL, TEMPLATE].includes(type),
-            videoAdded: type === VIDEO
-        }
-    }
     const formatSubmitPayload = (lineWrapperContents) => {
         const [ {
             messageTitle,
@@ -576,17 +561,11 @@ export const LineContainer = ({
               createCallback(errorMessage);
               if (!errorMessage) {
                 // stop timer for create line
-                const timeTaken = stopTimer(TRACK_CREATE_LINE, {
+                stopTimer(TRACK_CREATE_LINE, {
                     category: 'Creatives',
                     action: TRACK_CREATE_LINE,
                     label: getLineType(lineWrapperContents),
                 });
-                gtmPush('creativeDetails', Object.assign({
-                    id: resp.templateId,
-                    channel: LINE,
-                    mode: CREATE,
-                    timeTaken,
-                }, formatFSPayload(lineWrapperContents)));
                 onCreateComplete();
               }
             }
@@ -625,18 +604,11 @@ export const LineContainer = ({
                 editCallback(errorMessage);
                 if (!errorMessage) {
                     // stop timer for edit line
-                    const timeTaken = stopTimer(TRACK_EDIT_LINE, {
+                    stopTimer(TRACK_EDIT_LINE, {
                         category: 'Creatives',
                         action: TRACK_EDIT_LINE,
                         label: getLineType(lineWrapperContents),
                     });
-                    gtmPush('creativeDetails', Object.assign({
-                        id: resp.templateId._id,
-                        channel: LINE,
-                        mode: EDIT,
-                        timeTaken,
-                    }, formatFSPayload(lineWrapperContents)));
-                   
                     onCreateComplete();
                 }
           });

package/v2Containers/MobilePush/Create/index.js

@@ -4,7 +4,7 @@
  *
  */
 
-import PropTypes, { object } from 'prop-types';
+import PropTypes from 'prop-types';
 
 import React from 'react';
 import { bindActionCreators } from 'redux';
@@ -22,15 +22,11 @@ import * as actions from './actions';
 import withCreatives from '../../../hoc/withCreatives';
 
 import {getMessageObject} from '../../../utils/messageUtils';
-import { gtmPush } from '../../../utils/gtmTrackers';
-
 import { makeSelectTemplates } from '../../Templates/selectors';
 import messages from './messages';
 import getEventsMap from '../eventsMap';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { CREATE, TRACK_CREATE_MPUSH } from '../../App/constants';
-import { MOBILE_PUSH } from '../../CreativesContainer/constants';
-import { getContent } from '../commonMethods';
+import { TRACK_CREATE_MPUSH } from '../../App/constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -1405,33 +1401,16 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({schema, initialState: this.state.initialState ? this.state.initialState : this.state.schema, eventsMap, isSchemaChanged: true});
     this.injectEvents(schema);
   };
-
   saveFormData = (formData) => {
     //this function gets called from form bulder only when the form data is valid
     const obj = this.getTransformedData(formData);
-    const content = getContent(obj);
-    const  { 
-      definition: {
-        mode: definitionMode
-      } 
-    } = obj || {};
     const label = this.props.location.pathname.indexOf('image') >= 0 ? 'image' : 'text';
-    this.props.actions.createTemplate(obj, (response) => {
-      const timeTaken = GA.timeTracker.stopTimer(TRACK_CREATE_MPUSH, {
+    this.props.actions.createTemplate(obj, () => {
+      GA.timeTracker.stopTimer(TRACK_CREATE_MPUSH, {
         category: 'Creatives',
         action: TRACK_CREATE_MPUSH,
         label,
       });
-      gtmPush('creativeDetails', {
-        id: response.templateId,
-        name: obj.name,
-        channel: MOBILE_PUSH,
-        timeTaken,
-        content,
-        mode: CREATE,
-        imageAdded: definitionMode === 'image'
-      });
-      
       this.discardValues();
       const message = this.props.intl.formatMessage(messages.messageCreateSuccess);
       CapNotification.success({message, key: 'createMpushSuccess'});

package/v2Containers/MobilePush/Edit/index.js

@@ -26,13 +26,11 @@ import messages from './messages';
 import './_mobilePushCreate.scss';
 import {makeSelectCreate} from "../Create/selectors";
 import withCreatives from '../../../hoc/withCreatives';
-import { gtmPush } from '../../../utils/gtmTrackers';
 
 import getEventsMap from '../eventsMap';
-import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getContent} from '../commonMethods';
+import {getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields} from '../commonMethods';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { EDIT, TRACK_EDIT_MPUSH } from '../../App/constants';
-import { MOBILE_PUSH } from '../../CreativesContainer/constants';
+import { TRACK_EDIT_MPUSH } from '../../App/constants';
 
 const PrefixWrapper = styled.div`
   margin-right: 16px;
@@ -273,34 +271,14 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
       this.setState({modalContent: {...this.state.modalContent, show: false}});
     }
   };
-  onUpdateTemplateComplete = (response) => {
-    const obj = this.getTransformedData(this.state.formData);
-    const content = getContent(obj);
-    const  { 
-      definition: {
-        mode: definitionMode
-      } 
-    } = obj || {};
+  onUpdateTemplateComplete = () => {
+    
     const label = this.props.location.pathname.indexOf('image') >= 0 ? 'image' : 'text';
-    const timeTaken = GA.timeTracker.stopTimer(TRACK_EDIT_MPUSH, {
+    GA.timeTracker.stopTimer(TRACK_EDIT_MPUSH, {
       category: 'Creatives',
       action: TRACK_EDIT_MPUSH,
       label,
     });
-    try {
-      gtmPush('creativeDetails', {
-        id: response.templateId,
-        name: obj.name,
-        channel: MOBILE_PUSH,
-        timeTaken,
-        content,
-        mode: EDIT,
-        imageAdded: definitionMode === 'image'
-      })
-    } catch(e) {
-      console.log(e);
-    }
-    
     this.resetSchema();
     this.setState({
       formData: {},

package/v2Containers/MobilePush/Edit/sagas.js

@@ -15,7 +15,7 @@ export function* editTemplate(template) {
       errorMsg = result.message;
     }
     yield put({ type: types.EDIT_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
-    yield call(template.callback, {templateId: result?.response?.templateId._id});
+    yield call(template.callback);
   } catch (error) {
     yield put({ type: types.EDIT_TEMPLATE_FAILURE, error, errorMsg });
   }

package/v2Containers/MobilePush/commonMethods.js

@@ -246,24 +246,6 @@ function getLinkTypeFields({inputFieldsArgs, fieldIndex, deepLinkOptions, formDa
   }
   return inputFields;
 }
-
-function getContent(obj) {
-  const {
-    versions : {
-      base: {
-        ANDROID: {
-          title : androidTitle,
-          message : androidMessage
-        } = {},
-        IOS: {
-          title: iosTitle,
-          message: iosMessage
-        } = {}
-      } = {}
-    } = {}
-  } = obj;
-  return `${androidTitle} ${androidMessage} ${iosTitle} ${iosMessage}`;
-}
 export {
-  getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields, getContent
+  getPrimaryCtaFields, getSecondaryCtaFields, getLinkTypeFields,
 };

package/v2Containers/Sms/Create/index.js

@@ -21,14 +21,13 @@ import messages from './messages';
 import * as charCount from '../../../utils/smsCharCount';
 import {checkUnicode, updateCharCount} from '../../../utils/smsCharCountV2';
 import {getMessageObject} from '../../../utils/messageUtils';
-import { gtmPush } from '../../../utils/gtmTrackers';
 import * as creativesContainerActions from '../../CreativesContainer/actions';
 import {SMS} from '../../CreativesContainer/constants';
 // import callNativeEvent from '../../../utils/callNativeEvent';
 import {showError} from '../commonMethods';
 import withCreatives from '../../../hoc/withCreatives';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { CREATE, TRACK_CREATE_SMS } from '../../App/constants';
+import { TRACK_CREATE_SMS } from '../../App/constants';
 export class Create extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -204,22 +203,11 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
     this.setState({currentTab: data});
   }
   onCreateTemplateComplete = (editResponse) => {
-    const timeTaken = GA.timeTracker.stopTimer(TRACK_CREATE_SMS, {
+    GA.timeTracker.stopTimer(TRACK_CREATE_SMS, {
       category: 'Creatives',
       action: TRACK_CREATE_SMS,
     });
-    const {
-      formData
-    } = this.state;
     if (editResponse.templateId) {
-      gtmPush('creativeDetails', {
-        id: editResponse.templateId,
-        name: formData?.['template-name'],
-        channel: SMS,
-        timeTaken,
-        content: formData?.base?.['sms-editor'],
-        mode: CREATE
-      });
       this.resetSchema();
       this.setState({
         formData: {},

package/v2Containers/Sms/Edit/index.js

@@ -21,14 +21,12 @@ import {checkUnicode, updateCharCount} from '../../../utils/smsCharCountV2';
 import '../Create/_smsCreate.scss';
 import messages from './messages';
 import {getMessageObject} from '../../../utils/messageUtils';
-import { gtmPush } from '../../../utils/gtmTrackers';
 import * as creativesContainerActions from '../../CreativesContainer/actions';
 // import callNativeEvent from '../../../utils/callNativeEvent';
 import {showError} from '../commonMethods';
 import withCreatives from '../../../hoc/withCreatives';
-import { EDIT, TRACK_EDIT_SMS } from '../../App/constants';
+import { TRACK_EDIT_SMS } from '../../App/constants';
 import { GA } from '@capillarytech/cap-ui-utils';
-import { SMS } from '../../CreativesContainer/constants';
 export class Edit extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
@@ -222,22 +220,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     this.setState({currentTab: data});
   }
   onUpdateTemplateComplete = (editResponse) => {
-    const timeTaken = GA.timeTracker.stopTimer(TRACK_EDIT_SMS, {
+    GA.timeTracker.stopTimer(TRACK_EDIT_SMS, {
       category: 'Creatives',
       action: TRACK_EDIT_SMS,
     });
-    const {
-      formData
-    } = this.state;
     if (editResponse.templateId) {
-      gtmPush('creativeDetails', {
-        id: editResponse.templateId,
-        name: formData?.['template-name'],
-        channel: SMS,
-        timeTaken,
-        content: formData?.base?.['sms-editor'],
-        mode: EDIT
-      })
       this.resetSchema();
       this.setState({
         formData: {},

package/v2Containers/Templates/index.js

@@ -62,8 +62,6 @@ 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';
@@ -323,7 +321,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)) {
@@ -456,7 +454,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'].indexOf(this.state.channel.toLowerCase()) > -1)) {
+    if (nextProps.Templates.weCrmAccounts !== undefined && nextProps.Templates.weCrmAccounts.length === 1 && this.state.defaultAccount && (['wechat', 'mobilepush'].indexOf(this.state.channel.toLowerCase()) > -1)) {
       const paramsDefault = {
         name: this.state.searchText,
         sortBy: this.state.sortBy,
@@ -466,6 +464,9 @@ 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);
@@ -510,7 +511,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
 
       this.setState({activeMode: TEMPLATES_MODE});
-
+      
       this.getAllTemplates({params, resetPage: true});
     });
   }
@@ -1138,17 +1139,9 @@ 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 {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();
-      }
+    timeTracker.startTimer(CHANNEL_CREATE_TRACK_MAPPING[channel]);
+    if (this.isEnabledInLibraryModule("callCreateFromProps")) {
+      this.props.createNew();
     } else if (ev.key && (ev.key.toLowerCase() === "text" || ev.key.toLowerCase() === "image")) {
       routeParams = {
         pathname: `/${channel === 'line' ? 'line' : 'mobilepush'}/create/${ev.key.toLowerCase()}`,
@@ -1366,6 +1359,7 @@ 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});
     }
@@ -1418,9 +1412,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     }
     if (this.isEnabledInLibraryModule("callSelectFromProps")) {
-      this.props.onSelectTemplate(this.selectTemplate(id), this.props.fbAdManager);
+      this.props.onSelectTemplate(id);
     } else {
-      timeTracker.startTimer(CHANNEL_EDIT_TRACK_MAPPING[this.state.channel.toLowerCase()]);
       if (this.state.channel.toLowerCase() === 'ebill') {
         pathName = `/ebill/edit/${id}`;
       }
@@ -1431,9 +1424,6 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     }
   }
 
-  selectTemplate = (id) => find(this.props.TemplatesList, {_id: id})
-
-
   handlePreviewClick(template, modeType) {
     this.togglePreview();
     const templateInfo = cloneDeep(template);
@@ -1811,10 +1801,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const isWechatChannel = channel === WECHAT;
     const isMobilePushChannel = channel === MOBILE_PUSH;
     const isLineChannel = channel === LINE;
-    const isFacebookChannel = channel === FACEBOOK;
 
 
-    if ((isWechatChannel || isMobilePushChannel || isLineChannel) && !isEmpty(weCrmAccounts) && !isFacebookChannel ) {
+    if ((isWechatChannel || isMobilePushChannel || isLineChannel) && !isEmpty(weCrmAccounts)) {
       forEach(weCrmAccounts, (account) => {
         if ((isWechatChannel && account.configs && account.configs.is_wecrm_enabled) || isMobilePushChannel || isLineChannel) {
           if (query.type === 'embedded' && (!query.module || (query.module && query.module !== 'library'))) {
@@ -1954,33 +1943,28 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
   render() {
     const isFullMode = this.isFullMode();
     const { activeMode, channel, wechatFilter, lineFilter } = this.state;
-    let showFbAds = false;
+    let showForFacebook = true;
     if (channel.toLowerCase() === FACEBOOK_CHANNEL) {
-      const campaignSettings = this.props.Templates.campaignSettings;
-      if (campaignSettings && isEmpty(campaignSettings?.accountSettings)) {
-        showFbAds = true;
-      } else if (!isEmpty(campaignSettings?.accountSettings)) {
-        const fbSetting = get(this.props.Templates, 'campaignSettings.accountSettings.socialAccountSettings.facebookAccountSettings', []);
-        const { orgUnitFacebookPageSettingsMap = {} } = fbSetting[0] || {};
-        let pageAccessToken = false;
-        if (!isEmpty(orgUnitFacebookPageSettingsMap)) {
-          Object.values(orgUnitFacebookPageSettingsMap).forEach((obj) => {
-            if (obj.pageAccessToken) {
-              pageAccessToken = true;
-            }
-          });
-          if (!pageAccessToken) {
-            showFbAds = true;
+      if (isEmpty(this.props.Templates.campaignSettings)) {
+        showForFacebook = false;
+      }
+      const fbSetting = get(this.props.Templates, 'campaignSettings.accountSettings.socialAccountSettings.facebookAccountSettings', []);
+      const { orgUnitFacebookPageSettingsMap = {} } = fbSetting[0] || {};
+      let pageAccessToken = false;
+      if (!isEmpty(orgUnitFacebookPageSettingsMap)) {
+        Object.values(orgUnitFacebookPageSettingsMap).forEach((obj) => {
+          if (obj.pageAccessToken) {
+            pageAccessToken = true;
           }
-        } else {
-          showFbAds = true;
+        });
+        if (!pageAccessToken) {
+          showForFacebook = false;
         }
       }
     }
-
     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 && showFbAds)
+      (channel.toLowerCase() === FACEBOOK_CHANNEL && showForFacebook)
     );
 
 

package/v2Containers/Templates/reducer.js

@@ -9,7 +9,7 @@ import * as types from './constants';
 
 const initialState = fromJS({
   getAllTemplatesInProgress: false,
-  fetchingOrgLevelCampaignSettings: false,
+  fetchingOrgLevelCampaignSettings: true,
   templates: [],
   deleteResponse: {},
   deleteTemplateInProgress: false,

package/v2Containers/TemplatesV2/index.js

@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 import { injectIntl, intlShape, FormattedMessage } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { bindActionCreators } from 'redux';
-import { CapTab, CapCustomCard, CapButton, CapHeader, CapSpin, CapIcon, CapTooltip } from '@capillarytech/cap-ui-library';
+import { CapTab, CapCustomCard, CapButton, CapHeader, CapSpin, CapIcon } from '@capillarytech/cap-ui-library';
 import { find, get } from 'lodash';
 import isEmpty from 'lodash/isEmpty';
 import Helmet from 'react-helmet';
@@ -45,7 +45,6 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
       channelsToDisable = [],
       isFullMode,
       onChannelChange,
-      showDisabledFBInfo,
     } = props;
 
     const defaultPanes = {
@@ -81,15 +80,6 @@ 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' && showDisabledFBInfo) {
-          pane.tab = (<CapTooltip
-            title={
-            intl.formatMessage(messages.facebookDisableinfo)
-          }
-        >
-            {intl.formatMessage(messages.facebook)}
-          </CapTooltip>);
-        }
       }
       return pane;
     });
@@ -158,16 +148,13 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   );
 
   getFacebookComponent = () => {
-    const { messageDetails, cap, onFacebookSubmit, messageStrategy, showDisabledFBInfo, orgUnitId } = this.props;
+    const { messageDetails, cap, onFacebookSubmit, isFullMode } = this.props;
     return (
       <Facebook
         {...this.props}
         messageDetails={messageDetails}
         cap={cap}
         onFacebookSubmit={onFacebookSubmit}
-        messageStrategy={messageStrategy}
-        showDisabledFBInfo={showDisabledFBInfo}
-        orgUnitId={orgUnitId}
       />
     );
   }
@@ -191,21 +178,19 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   getTemplatesComponent(channel) {
     // const templates = this.props.Templates[`${channel}Templates`];
     let query = {};
-    const {isFullMode, messageStrategy} = this.props;
-    if (!isFullMode) {
+    if (!this.props.isFullMode) {
       query = {type: 'embedded', module: 'library'};
       switch (channel) {
         case 'line':
           return this.getLineComponent();
         case 'ftp':
           return this.getFTPComponent();
+        case 'facebook':
+          return this.getFacebookComponent();
         default:
           break;
       }
     }
-    if (messageStrategy !== "X_ENGAGE" && channel === 'facebook' && !isFullMode) {
-      return this.getFacebookComponent();
-    }
     const location = {pathname: `/${channel}`, search: '', query};
     switch (channel) {
       case 'call_task':
@@ -220,10 +205,9 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
           router={this.props.router}
           isFullMode={this.props.isFullMode}
           createNew={this.props.createNew}
-          onSelectTemplate={this.props.onSelectTemplate}
+          onSelectTemplate={(id) => this.props.onSelectTemplate(this.selectTemplate(id))}
           renderNewCardGrid={this.getTemplateDataForGrid}
           handlePeviewTemplate={this.props.handlePeviewTemplate}
-          messageStrategy={this.props.messageStrategy}
     />);
     }
   }
@@ -303,7 +287,6 @@ TemplatesV2.propTypes = {
   cap: PropTypes.object,
   authData: PropTypes.object,
   FTPMode: PropTypes.string,
-  messageStrategy: PropTypes.string,
 };
 
 TemplatesV2.defaultProps = {

package/v2Containers/TemplatesV2/messages.js

@@ -66,8 +66,4 @@ export default defineMessages({
     id: 'creatives.containersV2.TemplatesV2.line',
     defaultMessage: 'Line',
   },
-  facebookDisableinfo: {
-    id: `creatives.containersV2.TemplatesV2.facebookDisableinfo`,
-    defaultMessage: 'Please integrate Facebook Ad page ID & username to enable this option.',
-  },
 });