@capillarytech/creatives-library 7.6.13 → 7.7.0

package/v2Containers/Facebook/Advertisement/index.js

@@ -3,8 +3,6 @@ import React, { useState, useEffect, useCallback} from "react";
 import { injectIntl, FormattedMessage, intlShape } from 'react-intl';
 import { isUrl } from '../../Line/Container/Wrapper/utils';
 import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-
 import {
   CapInput,
   CapRadioCard,
@@ -84,12 +82,10 @@ export const Advertisement = (props) => {
     actions,
     fbADData = {},
     onCreateComplete,
-    templateData = {},
+    templateData,
     params,
     getFormSubscriptionData,
     facebookTemplateData,
-    selectedMarketingObjective,
-    orgUnitId,
   } = props;
   const {
     formatMessage,
@@ -132,7 +128,7 @@ export const Advertisement = (props) => {
         orgUnitFacebookPageSettingsMap = {},
         employeeAccessToken: accessToken = "",
         accountId = "",
-       } = selectedFacebookAccount || {};
+       } = selectedFacebookAccount;
       const { pageAccessToken, pageId: pId } = orgUnitFacebookPageSettingsMap[pageId] || {};
       videoData = {
         accessToken,
@@ -162,7 +158,7 @@ export const Advertisement = (props) => {
   }, [paramObj.id]);
 
   useEffect(() => {
-    if (params?.id || templateData?.edit) {
+    if ((params && params.id) || (templateData || {}).edit) {
       const { FacebookAd = [], pageOrgUnitId: editPageId} = get(templateData, `versions.base.content`) || get(fbADData, `templateDetails.versions.base.content`) || {};
       const editMessageTitle = (templateData || {}).name || get(fbADData, 'templateDetails.name');
       const editFBContent = Object.values(FacebookAd);
@@ -221,7 +217,6 @@ export const Advertisement = (props) => {
     }
   }, [fbADData[`templateDetails`] || templateData]);
 
-
   const CustomToolTip = useCallback((msg) => <CapTooltipWithInfo
     infoIconProps={{svgProps: {width: 12, height: 12}, style: {marginLeft: 5}}}
     title={msg}
@@ -354,7 +349,8 @@ export const Advertisement = (props) => {
       }
       messageData.push(data);
     });
-    let finalResponse = {
+
+    return {
       versions: {
         base: {
           content: {
@@ -366,17 +362,12 @@ export const Advertisement = (props) => {
       type: "FACEBOOK",
       name: messageTitle,
     };
-    if (!isFullMode) {
-      finalResponse = {...finalResponse, selectedMarketingObjective, accountId};
-    }
-    return finalResponse;
   }, [carouselData,
     pageId,
     messageTitle,
     primaryText,
     callToAction,
-    displayLink,
-    selectedMarketingObjective]);
+    displayLink]);
 
   const onCreateFacebookAd = useCallback( () => {
     actions.createTemplate(
@@ -452,7 +443,6 @@ export const Advertisement = (props) => {
     updateMessageTitle(val);
   }, [messageTitle]);
 
-
   const isDisableDone = useCallback((isPreview) => {
     let flag = false;
     if (primaryText === "" ) {
@@ -502,7 +492,8 @@ export const Advertisement = (props) => {
     selectedAd,
   ]
 );
-  const isDisableContinue = () => isFullMode ? (messageTitle.trim() === "" || selectedAd === "") : ( selectedAd === "");
+
+  const isDisableContinue = () => messageTitle.trim() === "" || selectedAd === "";
 
   const onClickContinue = useCallback(() => { updateStep('createFacebookAd'); }, [step]);
 
@@ -811,8 +802,8 @@ export const Advertisement = (props) => {
     setPageId(value);
   }, [pageId]);
 
-  const selectedFacebookAccount = templateData?.edit ? templateData?.selectedFacebookAccount : facebookTemplateData?.selectedFacebookAccount;
-  const {orgUnitFacebookPageSettingsMap = {}, employeeAccessToken: accessToken = "", accountId = "" } = selectedFacebookAccount || {};
+  const selectedFacebookAccount = get(facebookTemplateData, 'selectedFacebookAccount', {});
+  const {orgUnitFacebookPageSettingsMap = {}, employeeAccessToken: accessToken = "", accountId = "" } = selectedFacebookAccount;
 
   const getPageAccessOrgs = useCallback(() => {
     const {status, data } = fbADData.orgOuData || {};
@@ -822,32 +813,14 @@ export const Advertisement = (props) => {
     const orgName = (
       proxyOrgList.find(({ orgID }) => orgID === Number(orgId)) || {}
     ).orgName;
-    if (!status) {
-      // !status is the case of library
-      //if org id is the parent org
-      if (orgUnitFacebookPageSettingsMap[-1] && !pageId) {
-        setPageId(-1);
-      }
-      if (orgUnitFacebookPageSettingsMap[-1]) {
-        pageAccessOrgsOptions.push({label: orgName, value: -1});
-      }
-      // if we are coming from default startegy and calling templates from facebook/index.js
-      if (!pageId && orgUnitId && orgUnitFacebookPageSettingsMap[orgUnitId]) {
-        setPageId(orgUnitId);
-      }
-    } else if (status === 'SUCCESS') {
+    if (status === 'SUCCESS') {
       Object.keys(data).forEach((obj) => {
         if ((orgUnitFacebookPageSettingsMap[data[obj]] || {}).pageAccessToken) {
-          pageAccessOrgsOptions.push({label: obj, value: data[obj]});
+          pageAccessOrgsOptions.push({label: data[obj] === -1 ? orgName : obj, value: data[obj]});
         }
       });
-      if (orgUnitFacebookPageSettingsMap[-1]) {
-        pageAccessOrgsOptions.push({label: orgName, value: -1});
-      }
-      if (!pageId && !isEmpty(data)) {
+      if (!pageId) {
         setPageId((pageAccessOrgsOptions[0] || {} ).value);
-      } else if (orgUnitFacebookPageSettingsMap[-1] && !pageId) {
-        setPageId(-1);
       }
     }
     return pageAccessOrgsOptions;
@@ -856,7 +829,7 @@ export const Advertisement = (props) => {
   const options = getPageAccessOrgs() || [];
   const { data = {} } = fbADData.orgOuData || {};
   const selectedPageName = Object.keys(data).find((key) => data[key] === pageId);
-  return ( (step === 'modeSelection' && (isEmpty(templateData) || templateData?.mode === "create")) ?
+  return ( (step === 'modeSelection') ?
        ( <CapSpin spinning={adSpinLoader} className="add-facebook-ad-section">
          <div style={{ position: 'fixed', top: '25px', zIndex: 1}}>
            <CapHeader
@@ -865,27 +838,25 @@ export const Advertisement = (props) => {
              className={"cap-header-facebook-ad"}
             />
          </div>
-         {isFullMode && <>
-           <CapInput
-             id={`fbAd_input`}
-             onChange={onTextTitleChange}
-             className="text-template-title"
-             defaultValue={messageTitle || ''}
-             value={messageTitle || ''}
-             style={{marginBottom: 27, width: '762px'}}
-             size="default"
-             label={formatMessage(messages.creativeName)}
-              />
-           <CapSelect
-             label={formatMessage(messages.facebookPage)}
-             key={"select-facebook-page"}
-             onChange={onChangeFacebookPage}
-             options={options}
-             defaultValue={(options[0] || {} ).value}
-             value={pageId || (options[0] || {} ).value}
-             style={{marginBottom: 27, width: '372px'}}
-          ></CapSelect>
-        </>}
+         <CapInput
+           id={`fbAd_input`}
+           onChange={onTextTitleChange}
+           className="text-template-title"
+           defaultValue={messageTitle || ''}
+           value={messageTitle || ''}
+           style={{marginBottom: 27, width: '762px'}}
+           size="default"
+           label={formatMessage(messages.creativeName)}
+            />
+         {isFullMode && <CapSelect
+           label={formatMessage(messages.facebookPage)}
+           key={"select-facebook-page"}
+           onChange={onChangeFacebookPage}
+           options={options}
+           defaultValue={(options[0] || {} ).value}
+           value={pageId || (options[0] || {} ).value}
+           style={{marginBottom: 27, width: '372px'}}
+        ></CapSelect>}
          <CapHeading
            type="h4"
            style={{marginBottom: 11}}
@@ -909,15 +880,8 @@ export const Advertisement = (props) => {
          </FbAdFooter>
        </CapSpin> ) : (
          <CapSpin spinning={spinLoader}>
-           {!isFullMode && isEmpty(templateData) && <div style={{ position: 'fixed', top: '25px', zIndex: 1}}>
-             <CapHeader
-               inline
-               title={formatMessage(messages.newFacebookCreatives)}
-               className={"cap-header-facebook-ad"}
-            />
-           </div>}
            <CapRow className="add-facebook-ad-section" >
-             {isFullMode && <div className="cap-header-facebook-ad">
+             <div className="cap-header-facebook-ad">
                <CapHeading
                  type="h2"
                  className="truncate-text"
@@ -935,7 +899,7 @@ export const Advertisement = (props) => {
                  title={<FormattedMessage {...messages.creativesTemplatesEditName}/>}
                  onClick={onClickEditName}
                   />}
-             </div>}
+             </div>
              <CapColumn span={12}>
                {isFullMode && <><CapHeading
                  type="h4"
@@ -1010,8 +974,8 @@ Advertisement.propTypes = {
   facebookTemplateData: PropTypes.object,
   templateData: PropTypes.object,
   params: PropTypes.object,
-  selectedMarketingObjective: PropTypes.any,
 
 };
 
 export default injectIntl(Advertisement);
+

package/v2Containers/Facebook/Advertisement/index.scss

@@ -30,7 +30,7 @@ $classPrefix: add-facebook-ad-section;
 
     .cap-header-facebook-ad{
         position: fixed;
-        top: 58px;
+        top: 27px;
         z-index: 1000;
         .title-desc-container{
             padding-left: 10px;

package/v2Containers/Facebook/Facebook.style.js

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

package/v2Containers/Facebook/constants.js

@@ -47,7 +47,3 @@ 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, useCallback } from "react";
+import React, { useState, useEffect } from "react";
 import { injectIntl, FormattedMessage, intlShape } from "react-intl";
 import {
   CapHeading,
@@ -15,10 +15,7 @@ import {
   CapDrawer,
   CapCustomCard,
   CapIcon,
-  CapRadioGroup,
-  CapTooltip,
 } from '@capillarytech/cap-ui-library';
-import Templates from '../Templates';
 import { createStructuredSelector } from 'reselect';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
@@ -41,8 +38,6 @@ import {
   VALUE_REACH,
   VALUE_VIDEO_VIEWS,
   VALUE_LINK_CLICKS,
-  AD_MANAGER,
-  CREATIVE,
 } from './constants';
 
 const StyledCampaignDetailCapColumn = withStyles(CapColumn, CampaignDetailCapColumn);
@@ -188,25 +183,12 @@ const Facebook = (props) => {
     onCreateComplete,
     params,
     facebookTemplateData,
-    messageStrategy,
-    router,
-    handlePeviewTemplate,
-    renderNewCardGrid,
-    onSelectTemplate,
-    createNew,
-    fbAdManager,
-    getFormSubscriptionData,
-    showDisabledFBInfo,
-    orgUnitId,
   } = 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) {
@@ -243,188 +225,131 @@ const Facebook = (props) => {
 
   const onMarketingObjectiveSelect = (value) => setMarketingObjective(value);
 
-  const radioOptions = [{
-    label: showDisabledFBInfo ? <CapTooltip title={intl.formatMessage(messages.facebookDisableinfo)}>{intl.formatMessage(messages.capFbAdManager)}</CapTooltip> : intl.formatMessage(messages.capFbAdManager), value: CREATIVE, disabled: showDisabledFBInfo,
-  }, {
-    label: intl.formatMessage(messages.fbAdManager), value: AD_MANAGER,
-  }];
-
-  const onChangeAdManager = useCallback(({ target: { value } }) => {
-    setAdManager(value);
-  }, [setAdManager]);
-
-  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}
-      fbAdManager={CREATIVE}
-    />
-  ) :
-    (!isFullMode && fbAdManager !== CREATIVE && messageStrategy === "DEFAULT" ) ?
-      (<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="account-section-container">
-              <CapHeading type="h3">
-                <FormattedMessage {...messages.fbAdCampaignSetDetailsTitle} />
-              </CapHeading>
-              <CapLabel type="label1">
-                <FormattedMessage
-                  {...messages.fbAdCampaignSetDetailsDescription}
-                />
-              </CapLabel>
-            </div>
+  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>
 
-            <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>
+         <div className="account-section-container">
+           <CapHeading type="h3">
+             <FormattedMessage {...messages.fbAdCampaignSetDetailsTitle} />
+           </CapHeading>
+           <CapLabel type="label1">
+             <FormattedMessage
+               {...messages.fbAdCampaignSetDetailsDescription}
+              />
+           </CapLabel>
+         </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`}
+         <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)}
           />
-            {adManager === AD_MANAGER ? <>
-              <div className="account-section-container">
-                <CapLabel type="label1">
-                  <FormattedMessage {...messages.fbAdsDescription} />
-                </CapLabel>
-              </div>
+       </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>
 
-              <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}
-          getFormSubscriptionData={getFormSubscriptionData}
-          selectedMarketingObjective={selectedMarketingObjective}
-          fbAdManager={fbAdManager}
-          orgUnitId={orgUnitId}
-        />
-      </div>
+         <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>
+         </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>
   );
 };
 
@@ -442,12 +367,11 @@ Facebook.propTypes = {
   fbADData: PropTypes.object,
   onCreateComplete: PropTypes.func,
   facebookTemplateData: PropTypes.object,
-  messageStrategy: PropTypes.string,
-  getFormSubscriptionData: PropTypes.func,
 };
 
 Facebook.defaultProps = {
   marketingObjectiveList: [""],
+
 };
 
 const mapStateToProps = createStructuredSelector({