@capillarytech/creatives-library 7.6.3 → 7.6.4

package/package.json

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

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -137,6 +137,8 @@ function SlideBoxContent(props) {
       handleClose,
       onFTPSubmit,
       campaignSettings,
+      messageStrategy,
+      fbAdManger,
     } = props;
   const type = (messageDetails.type || '').toLowerCase(); // type is context in get tags values : outbound | dvs | referral | loyalty | coupons
   const query = { type: !isFullMode && 'embedded', module: isFullMode ? 'default' : 'library', isEditFromCampaigns: (templateData || {}).isEditFromCampaigns};
@@ -334,6 +336,7 @@ function SlideBoxContent(props) {
         slidBoxContent={slidBoxContent}
         FTPMode="create"
         selectedOfferDetails={selectedOfferDetails}
+        messageStrategy={messageStrategy}
         />
       )}
       {isPreview && (
@@ -558,7 +561,8 @@ function SlideBoxContent(props) {
             isFullMode={isFullMode}
             createNew
             getFormSubscriptionData={getFormData}
-
+            messageStrategy={messageStrategy}
+            fbAdManger={fbAdManger}
           />
         )
       }
@@ -687,5 +691,7 @@ SlideBoxContent.propTypes = {
   saveMessage: PropTypes.func,
   selectedAccount: PropTypes.object,
   onFTPSubmit: PropTypes.func,
+  messageStrategy: PropTypes.string,
+
 };
 export default SlideBoxContent;

package/v2Containers/CreativesContainer/index.js

@@ -51,7 +51,6 @@ class Creatives extends React.Component {
       currentChannel: this.props.channel || 'sms',
       weChatTemplateType: '',
       weChatMaptemplateStep: 0,
-
     };
     this.creativesTemplateSteps = {
       1: 'modeSelection',
@@ -87,8 +86,12 @@ class Creatives extends React.Component {
   onEditTemplate = () => {
     this.setState({ slidBoxContent: 'editTemplate', showSlideBox: true });
   };
-  onCreateNew = () => {
-    this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true });
+  onCreateNew = (fbAdManger) => {
+    if (fbAdManger) {
+      this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true, fbAdManger });
+    } else {
+      this.setState({ slidBoxContent: 'createTemplate', showSlideBox: true });
+    }
   };
 
   onShowTemplates = () => {
@@ -637,6 +640,7 @@ class Creatives extends React.Component {
               onEnterTemplateName={this.onEnterTemplateName}
               onRemoveTemplateName={this.onRemoveTemplateName}
               onResetStep={this.resetStep}
+              fbAdManger={this.state.fbAdManger}
               cap={cap}
               setIsLoadingContent={this.setIsLoadingContent}
               onMobilepushModeChange={this.onMobilepushModeChange}
@@ -661,6 +665,7 @@ class Creatives extends React.Component {
               handleClose={this.handleCloseSlideBox}
               onFTPSubmit={getCreativesData}
               editor={editor}
+              messageStrategy={this.props.strategy}
           />
           }
           footer={this.shouldShowFooter() &&
@@ -713,6 +718,8 @@ Creatives.propTypes = {
   selectedWeChatAccount: PropTypes.object,
   Templates: PropTypes.object,
   selectedAccount: PropTypes.object,
+  strategy: PropTypes.string,
+
 };
 const mapStatesToProps = () => createStructuredSelector({
   isLoading: isLoadingSelector(),

package/v2Containers/Facebook/Advertisement/index.js

@@ -978,4 +978,3 @@ Advertisement.propTypes = {
 };
 
 export default injectIntl(Advertisement);
-

package/v2Containers/Facebook/Facebook.style.js

@@ -50,7 +50,7 @@ export default css`
 
     .parameter-list-item {
       list-style: none;
-      margin-bottom: ${CAP_SPACE_28};
+      margin-bottom: 60px;
   
       .parameter-index {
         float: left;

package/v2Containers/Facebook/constants.js

@@ -47,3 +47,7 @@ export const VALUE_REACH = 'VALUE_REACH';
 export const VALUE_VIDEO_VIEWS = 'VALUE_VIDEO_VIEWS';
 export const VALUE_LINK_CLICKS = 'VALUE_LINK_CLICKS';
 export const VALUE_POST_ENGAGEMENT = 'VALUE_POST_ENGAGEMENT';
+
+
+export const AD_MANAGER = "AD_MANAGER";
+export const CREATIVE = "CREATIVE";

package/v2Containers/Facebook/index.js

@@ -4,7 +4,7 @@
  *
  */
 import PropTypes from "prop-types";
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useCallback } from "react";
 import { injectIntl, FormattedMessage, intlShape } from "react-intl";
 import {
   CapHeading,
@@ -15,7 +15,9 @@ import {
   CapDrawer,
   CapCustomCard,
   CapIcon,
+  CapRadioGroup,
 } from '@capillarytech/cap-ui-library';
+import Templates from '../Templates';
 import { createStructuredSelector } from 'reselect';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -38,6 +40,8 @@ import {
   VALUE_REACH,
   VALUE_VIDEO_VIEWS,
   VALUE_LINK_CLICKS,
+  AD_MANAGER,
+  CREATIVE,
 } from './constants';
 
 const StyledCampaignDetailCapColumn = withStyles(CapColumn, CampaignDetailCapColumn);
@@ -183,12 +187,22 @@ const Facebook = (props) => {
     onCreateComplete,
     params,
     facebookTemplateData,
+    messageStrategy,
+    router,
+    handlePeviewTemplate,
+    renderNewCardGrid,
+    onSelectTemplate,
+    createNew,
+    fbAdManger,
   } = props;
   const {
     selectedMarketingObjective: fbMarketingObjectiveValue = VALUE_REACH,
   } = templateData || {};
   const [isDrawerVisible, setDrawerVisibility] = useState(false);
   const [selectedMarketingObjective, setMarketingObjective] = useState(socialObjective || fbMarketingObjectiveValue);
+  const [adManager, setAdManager] = useState(AD_MANAGER);
+  const [showTemplateList, setTemplateList] = useState(false);
+
 
   useEffect(() => {
     if (!isFullMode) {
@@ -225,131 +239,184 @@ const Facebook = (props) => {
 
   const onMarketingObjectiveSelect = (value) => setMarketingObjective(value);
 
-  return (
-   !isFullMode ? (<div className={className}>
-     <div className="is-scrollable-section" >
-       <div className="account-details-wrapper">
-         <div className="account-name-section">
-           <CapHeading type="h4">
-             <FormattedMessage {...messages.fbAccount} />
-           </CapHeading>
-           <CapHeading type="h3">{accountName}</CapHeading>
-         </div>
+  const radioOptions = [{
+    label: intl.formatMessage(messages.capFbAdManager), value: CREATIVE,
+  }, {
+    label: intl.formatMessage(messages.fbAdManager), value: AD_MANAGER,
+  }];
 
-         <div className="account-section-container">
-           <CapHeading type="h3">
-             <FormattedMessage {...messages.fbAdCampaignSetDetailsTitle} />
-           </CapHeading>
-           <CapLabel type="label1">
-             <FormattedMessage
-               {...messages.fbAdCampaignSetDetailsDescription}
-              />
-           </CapLabel>
-         </div>
+  const onChangeAdManager = useCallback(({ target: { value } }) => {
+    setAdManager(value);
+  }, [setAdManager]);
 
-         <CapRow span={12} type="flex">
-           {campaignDataList.map(({ label, value, onChange }, index) => (
-             <StyledCampaignDetailCapColumn
-               span={index % 2 === 0 ? 6 : 14}
-               key={label}
-              >
-               <CapRow>
-                 <CapLabel type="label2">
-                   <FormattedMessage {...messages[label]} />
-                 </CapLabel>
-                 <CapHeading type="h4">
-                   {value}
-                   {!socialRemoteCampaignId && onChange && (
-                   <CapButton
-                     type="flat"
-                     className="marketingObjective-change-button facebook-marketing-objective-change"
-                     onClick={onChange}
-                      >
-                     <FormattedMessage {...messages.fbChange} />
-                   </CapButton>
-                    )}
-                 </CapHeading>
-               </CapRow>
-             </StyledCampaignDetailCapColumn>
-            ))}
-         </CapRow>
-         <CapDrawer
-           content={
-             <MarketingObjective
-               selectedMarketingObjective={selectedMarketingObjective}
-               onMarketingObjectiveSelect={onMarketingObjectiveSelect}
-               defaultmarketingObjective={socialObjective || fbMarketingObjectiveValue}
-               onSubmit={setDrawerVisibility}
-               marketingObjectiveList={categorizedMarketingObjectiveList}
-              />
-            }
-           visible={isDrawerVisible}
-           width={380}
-           onClose={() => setDrawerVisibility(false)}
-          />
-       </div>
+  const onFacebookAdManagerContinue = useCallback(() => {
+    if (adManager === AD_MANAGER) {
+      onFacebookSubmit({ channel: "FACEBOOK", selectedMarketingObjective, accountId });
+    } else {
+      setTemplateList(true);
+    }
+  }, [
+    selectedMarketingObjective,
+    accountId,
+    adManager,
+    setAdManager,
+    setTemplateList,
+    showTemplateList,
+  ]);
+  const query = {type: 'embedded', module: 'library'};
+  const location = {pathname: `/FACEBOOK`, search: '', query};
+  return (showTemplateList ? (
+    <Templates
+      key={"FACEBOOK"}
+      location={location}
+      route={{name: "FACEBOOK"}}
+      router={router}
+      isFullMode={isFullMode}
+      createNew={createNew}
+      onSelectTemplate={onSelectTemplate}
+      renderNewCardGrid={renderNewCardGrid}
+      handlePeviewTemplate={handlePeviewTemplate}
+      fbAdManger={CREATIVE}
+    />
+  ) :
+    (!isFullMode && messageStrategy !== "X_ENGAGE" && fbAdManger !== CREATIVE) ?
+      (<div className={className}>
+
+        <div className="is-scrollable-section" >
+          <div className="account-details-wrapper">
+            <div className="account-name-section">
+              <CapHeading type="h4">
+                <FormattedMessage {...messages.fbAccount} />
+              </CapHeading>
+              <CapHeading type="h3">{accountName}</CapHeading>
+            </div>
 
-       <div className="ad-section">
-         <div className="account-section-container">
-           <CapHeading type="h3">
-             <FormattedMessage {...messages.fbAdsTitle} />
-           </CapHeading>
-           <CapLabel type="label1">
-             <FormattedMessage {...messages.fbAdsDescription} />
-           </CapLabel>
-         </div>
+            <div className="account-section-container">
+              <CapHeading type="h3">
+                <FormattedMessage {...messages.fbAdCampaignSetDetailsTitle} />
+              </CapHeading>
+              <CapLabel type="label1">
+                <FormattedMessage
+                  {...messages.fbAdCampaignSetDetailsDescription}
+                />
+              </CapLabel>
+            </div>
 
-         <div>
-           <CapRow span={12} type="flex">
-             <CapColumn span={6}>
-               <CapCustomCard
-                 type="Facebook"
-                 FBDynamicComponent={() => (
-                   <CapIcon
-                     size="l"
-                     type="scenery"
-                     className="facebook-dynamic-content"
-                    />
-                  )}
+            <CapRow span={12} type="flex">
+              {campaignDataList.map(({ label, value, onChange }, index) => (
+                <StyledCampaignDetailCapColumn
+                  span={index % 2 === 0 ? 6 : 14}
+                  key={label}
+                >
+                  <CapRow>
+                    <CapLabel type="label2">
+                      <FormattedMessage {...messages[label]} />
+                    </CapLabel>
+                    <CapHeading type="h4">
+                      {value}
+                      {!socialRemoteCampaignId && onChange && (
+                      <CapButton
+                        type="flat"
+                        className="marketingObjective-change-button facebook-marketing-objective-change"
+                        onClick={onChange}
+                        >
+                        <FormattedMessage {...messages.fbChange} />
+                      </CapButton>
+                      )}
+                    </CapHeading>
+                  </CapRow>
+                </StyledCampaignDetailCapColumn>
+              ))}
+            </CapRow>
+            <CapDrawer
+              content={
+                <MarketingObjective
+                  selectedMarketingObjective={selectedMarketingObjective}
+                  onMarketingObjectiveSelect={onMarketingObjectiveSelect}
+                  defaultmarketingObjective={socialObjective || fbMarketingObjectiveValue}
+                  onSubmit={setDrawerVisibility}
+                  marketingObjectiveList={categorizedMarketingObjectiveList}
                 />
-             </CapColumn>
-             <CapColumn span={16}>
-               <ul className="parameter-list">
-                 {adSetParameters.map((parameter, index) => (
-                   <li key={parameter} className="parameter-list-item">
-                     <CapLabel type="label2" className="parameter-index">
-                       {index + 1}
-                     </CapLabel>
-                     <CapHeading type="h5">
-                       <FormattedMessage {...messages[parameter]} />
-                     </CapHeading>
-                   </li>
-                  ))}
-               </ul>
-             </CapColumn>
-           </CapRow>
-         </div>
-       </div>
-     </div>
-     <CapButton
-       className="facebook-confirm-button"
-       type="primary"
-       onClick={() =>
-          onFacebookSubmit({ channel: "FACEBOOK", selectedMarketingObjective, accountId })
-        }
-      >
-       <FormattedMessage {...messages.fbConfirm} />
-     </CapButton>
-   </div>) : <div style={{height: '1200px'}}>
-     <Advertisement
-       isFullMode={isFullMode}
-       actions={facebookActions}
-       fbADData={fbADData}
-       onCreateComplete={onCreateComplete}
-       templateData={templateData}
-       params={params}
-       facebookTemplateData={facebookTemplateData}
-     /></div>
+              }
+              visible={isDrawerVisible}
+              width={380}
+              onClose={() => setDrawerVisibility(false)}
+            />
+          </div>
+
+          <div className="ad-section">
+            <CapHeading type="h4" style={{marginBottom: 17}}>
+              <FormattedMessage
+              {...messages.adManagerHeading}
+            />
+            </CapHeading>
+            <CapRadioGroup
+              style={{paddingBottom: '18px'}}
+              options={radioOptions}
+              onChange={onChangeAdManager}
+              value={adManager}
+              key={`fb-ad-creatives`}
+          />
+            {adManager === AD_MANAGER ? <>
+              <div className="account-section-container">
+              <CapLabel type="label1">
+                <FormattedMessage {...messages.fbAdsDescription} />
+              </CapLabel>
+            </div>
+
+
+              <CapRow span={12} type="flex">
+              <CapColumn span={6}>
+                  <CapCustomCard
+                    type="Facebook"
+                    FBDynamicComponent={() => (
+                      <CapIcon
+                        size="l"
+                        type="scenery"
+                        className="facebook-dynamic-content"
+                      />
+                    )}
+                  />
+                </CapColumn>
+              <CapColumn span={16}>
+                  <ul className="parameter-list">
+                    {adSetParameters.map((parameter, index) => (
+                      <li key={parameter} className="parameter-list-item">
+                        <CapLabel type="label2" className="parameter-index">
+                          {index + 1}
+                        </CapLabel>
+                        <CapHeading type="h5">
+                          <FormattedMessage {...messages[parameter]} />
+                        </CapHeading>
+                      </li>
+                    ))}
+                  </ul>
+                </CapColumn>
+            </CapRow></> : <CapLabel type="label1"><FormattedMessage {...messages.capAdManagerHeading}/></CapLabel>}
+
+          </div>
+        </div>
+        <CapButton
+          className="facebook-confirm-button"
+          type="primary"
+          onClick={onFacebookAdManagerContinue}
+        >
+          <FormattedMessage {...messages.fbContinue} />
+        </CapButton>
+      </div>
+      ) :
+      <div style={{height: '1200px'}}>
+          <Advertisement
+          isFullMode={isFullMode}
+          actions={facebookActions}
+          fbADData={fbADData}
+          onCreateComplete={onCreateComplete}
+          templateData={templateData}
+          params={params}
+          facebookTemplateData={facebookTemplateData}
+          messageStrategy={messageStrategy}
+        />
+        </div>
   );
 };
 
@@ -367,6 +434,7 @@ Facebook.propTypes = {
   fbADData: PropTypes.object,
   onCreateComplete: PropTypes.func,
   facebookTemplateData: PropTypes.object,
+  messageStrategy: PropTypes.string,
 };
 
 Facebook.defaultProps = {

package/v2Containers/Facebook/messages.js

@@ -42,7 +42,7 @@ export default defineMessages({
   },
   fbAdsDescription: {
     id: `${messagePrefix}.fbAdsDescription`,
-    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+.',
+    defaultMessage: 'Proceed with empty content block & you can create ads in Facebook Ad Manager under the  mentioned ad set.',
   },
   fbAdsDetailOne: {
     id: `${messagePrefix}.fbAdsDetailOne`,
@@ -56,9 +56,9 @@ export default defineMessages({
     id: `${messagePrefix}.fbAdsDetailThree`,
     defaultMessage: 'You can create ads later in Facebook ad manager.',
   },
-  fbConfirm: {
-    id: `${messagePrefix}.fbConfirm`,
-    defaultMessage: 'Confirm',
+  fbContinue: {
+    id: `${messagePrefix}.fbContinue`,
+    defaultMessage: 'Continue',
   },
   fbChange: {
     id: `${messagePrefix}.fbChange`,
@@ -164,4 +164,20 @@ 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."
+  }
 });

package/v2Containers/Templates/index.js

@@ -1141,7 +1141,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     let routeParams = {};
     timeTracker.startTimer(CHANNEL_CREATE_TRACK_MAPPING[channel]);
     if (this.isEnabledInLibraryModule("callCreateFromProps")) {
-      this.props.createNew();
+      if (this.props.fbAdManger === "CREATIVE") {
+        this.props.createNew(this.props.fbAdManger);
+      } else{
+        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()}`,

package/v2Containers/TemplatesV2/index.js

@@ -148,13 +148,14 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   );
 
   getFacebookComponent = () => {
-    const { messageDetails, cap, onFacebookSubmit, isFullMode } = this.props;
+    const { messageDetails, cap, onFacebookSubmit, messageStrategy } = this.props;
     return (
       <Facebook
         {...this.props}
         messageDetails={messageDetails}
         cap={cap}
         onFacebookSubmit={onFacebookSubmit}
+        messageStrategy={messageStrategy}
       />
     );
   }
@@ -178,19 +179,21 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   getTemplatesComponent(channel) {
     // const templates = this.props.Templates[`${channel}Templates`];
     let query = {};
-    if (!this.props.isFullMode) {
+    const {isFullMode, messageStrategy} = this.props;
+    if (!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':
@@ -208,6 +211,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
           onSelectTemplate={(id) => this.props.onSelectTemplate(this.selectTemplate(id))}
           renderNewCardGrid={this.getTemplateDataForGrid}
           handlePeviewTemplate={this.props.handlePeviewTemplate}
+          messageStrategy={this.props.messageStrategy}
     />);
     }
   }
@@ -287,6 +291,7 @@ TemplatesV2.propTypes = {
   cap: PropTypes.object,
   authData: PropTypes.object,
   FTPMode: PropTypes.string,
+  messageStrategy: PropTypes.string,
 };
 
 TemplatesV2.defaultProps = {