@capillarytech/creatives-library 7.6.6 → 7.6.8

package/index.js

@@ -76,8 +76,8 @@ import viberSaga from './v2Containers/Viber/sagas';
 import TemplatesV2 from './v2Containers/TemplatesV2/index';
 
 import FacebookPreview from './v2Containers/CapFacebookPreview';
-import FacebookPreviewReducer from './v2Containers/CapFacebookPreview/reducer';
-import FacebookPreviewSaga from './v2Containers/CapFacebookPreview/sagas';
+import facebookPreviewReducer from './v2Containers/CapFacebookPreview/reducer';
+import facebookPreviewSaga from './v2Containers/CapFacebookPreview/sagas';
 
 import CreativesContainer from './v2Containers/CreativesContainer';
 import CreativesContainerReducer from './v2Containers/CreativesContainer/reducer';
@@ -105,7 +105,7 @@ const LineCreateContainer = {LineCreate, lineCreateReducer, lineCreateSaga};
 const TemplatesV2Container = {TemplatesV2, templateReducer, templateSaga};
 const FacebookContainer = {Facebook, facebookReducer, facebookSaga};
 const ViberContainer = {Viber, viberReducer, viberSaga};
-const FacebookPreviewContainer = { FacebookPreview, FacebookPreviewReducer, FacebookPreviewSaga };
+const FacebookPreviewContainer = { FacebookPreview, facebookPreviewReducer, facebookPreviewSaga };
 
 const GalleryContainer = {Gallery, galleryReducer, gallerySagas};
 const FTPContainer = {FTP, FTPReducer, FTPSagas};

package/package.json

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

package/v2Containers/CapFacebookPreview/index.js

@@ -212,6 +212,7 @@ export const CapFacebookPreview = (props) => {
           ...data.params.creative.object_story_spec,
           link_data: {
             description: linkDesc,
+            message: primaryText,
             link: webSiteLink,
             name: linkHeadLine,
             picture: imageData.imageSrc,

package/v2Containers/CreativesContainer/index.js

@@ -227,11 +227,57 @@ class Creatives extends React.Component {
           break;
         }
         case constants.FACEBOOK: {
-          creativesTemplateData = {
-            selectedMarketingObjective: templateData.selectedMarketingObjective,
-            edit: true,
-            type: channel,
-          };
+          if (templateData.fbContentType === "CREATIVE") {
+            const { creativeType, selectedFacebookAccount } = templateData || {};
+            const fBContent = templateData.facebookCreativeList;
+            const facebookCreativeList = [];
+            fBContent.forEach((obj) => {
+              const data = cloneDeep(obj);
+              const {subType, linkDescription, imageLink, websiteLink, videoId} = obj;
+              delete data.linkDescription;
+              delete data.websiteLink;
+              data.linkDesc = linkDescription;
+              data.webSiteLink = websiteLink;
+              data.type = creativeType;
+              switch (subType) {
+                case "IMAGE":
+                  data.imgSrc = imageLink;
+                  delete data.imageLink;
+                  break;
+                case "VIDEO":
+                  data.video = {
+                    previewImageUrl: imageLink,
+                    videoId,
+                    videoSrc: "",
+                    videoName: "",
+                  };
+                  delete data.imageLink;
+                  break;
+                default:
+                  break;
+              }
+              facebookCreativeList.push(data);
+            });
+            creativesTemplateData = {
+              versions: {
+                base: {
+                  content: {
+                    FacebookAd: {...facebookCreativeList},
+                    pageOrgUnitId: this.props.orgUnitId,
+                  },
+                },
+              },
+              type: "FACEBOOK",
+              edit: true,
+              selectedFacebookAccount,
+            };
+          } else {
+            creativesTemplateData = {
+              selectedMarketingObjective: templateData.selectedMarketingObjective,
+              edit: true,
+              type: channel,
+            };
+          }
           break;
         }
         case constants.LINE: {
@@ -387,12 +433,12 @@ class Creatives extends React.Component {
         if (template.value) {
           const FacebookAd = template.value.versions.base.content.FacebookAd;
           const type = FacebookAd[0].type;
-          const {accountId, orgUnitFacebookPageSettingsMap = {}} = this.props.Templates.selectedFacebookAccount;
+          const {accountId} = this.props.Templates.selectedFacebookAccount || template.value || {};
           const facebookCreativeList = [];
           const fBContent = Object.values(FacebookAd);
           fBContent.forEach((obj) => {
             const data = cloneDeep(obj);
-            const {subType, linkDesc, imgSrc, webSiteLink} = obj;
+            const {subType, linkDesc, imgSrc, webSiteLink, video} = obj;
             delete data.type;
             delete data.linkDesc;
             delete data.webSiteLink;
@@ -405,8 +451,9 @@ class Creatives extends React.Component {
                 delete data.imgSrc;
                 break;
               case "VIDEO":
-                data.imageLink = "www.kuch_bhi_link.com";
-                data.videoId = "123";
+                data.imageLink = video.previewImageUrl;
+                data.videoId = video.videoId;
+                delete data.video;
                 break;
               case "CAROUSEL":
                 break;

package/v2Containers/Facebook/Advertisement/index.js

@@ -84,11 +84,12 @@ export const Advertisement = (props) => {
     actions,
     fbADData = {},
     onCreateComplete,
-    templateData,
+    templateData = {},
     params,
     getFormSubscriptionData,
     facebookTemplateData,
     selectedMarketingObjective,
+    fbAdManger,
   } = props;
   const {
     formatMessage,
@@ -131,7 +132,7 @@ export const Advertisement = (props) => {
         orgUnitFacebookPageSettingsMap = {},
         employeeAccessToken: accessToken = "",
         accountId = "",
-       } = selectedFacebookAccount;
+       } = selectedFacebookAccount || {};
       const { pageAccessToken, pageId: pId } = orgUnitFacebookPageSettingsMap[pageId] || {};
       videoData = {
         accessToken,
@@ -161,7 +162,7 @@ export const Advertisement = (props) => {
   }, [paramObj.id]);
 
   useEffect(() => {
-    if ((params && 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);
@@ -365,7 +366,7 @@ export const Advertisement = (props) => {
       name: messageTitle,
     };
     if (!isFullMode) {
-      finalResponse = {...finalResponse, selectedMarketingObjective};
+      finalResponse = {...finalResponse, selectedMarketingObjective, accountId};
     }
     return finalResponse;
   }, [carouselData,
@@ -500,7 +501,7 @@ export const Advertisement = (props) => {
   ]
 );
 
-  const isDisableContinue = () => messageTitle.trim() === "" || selectedAd === "";
+  const isDisableContinue = () => isFullMode ? (messageTitle.trim() === "" || selectedAd === "") : ( selectedAd === "");
 
   const onClickContinue = useCallback(() => { updateStep('createFacebookAd'); }, [step]);
 
@@ -809,7 +810,7 @@ export const Advertisement = (props) => {
     setPageId(value);
   }, [pageId]);
 
-  const selectedFacebookAccount = get(facebookTemplateData, 'selectedFacebookAccount', {});
+  const selectedFacebookAccount = templateData?.edit ? templateData?.selectedFacebookAccount : facebookTemplateData?.selectedFacebookAccount;
   const {orgUnitFacebookPageSettingsMap = {}, employeeAccessToken: accessToken = "", accountId = "" } = selectedFacebookAccount;
 
   const getPageAccessOrgs = useCallback(() => {
@@ -836,7 +837,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)) ?
+  return ( (step === 'modeSelection' && (isEmpty(templateData) || templateData?.mode === "create")) ?
        ( <CapSpin spinning={adSpinLoader} className="add-facebook-ad-section">
          <div style={{ position: 'fixed', top: '25px', zIndex: 1}}>
            <CapHeader
@@ -845,25 +846,27 @@ export const Advertisement = (props) => {
              className={"cap-header-facebook-ad"}
             />
          </div>
-         <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>}
+         {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>
+        </>}
          <CapHeading
            type="h4"
            style={{marginBottom: 11}}
@@ -887,8 +890,15 @@ 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" >
-             <div className="cap-header-facebook-ad">
+             {isFullMode && <div className="cap-header-facebook-ad">
                <CapHeading
                  type="h2"
                  className="truncate-text"
@@ -906,7 +916,7 @@ export const Advertisement = (props) => {
                  title={<FormattedMessage {...messages.creativesTemplatesEditName}/>}
                  onClick={onClickEditName}
                   />}
-             </div>
+             </div>}
              <CapColumn span={12}>
                {isFullMode && <><CapHeading
                  type="h4"

package/v2Containers/Facebook/index.js

@@ -280,7 +280,7 @@ const Facebook = (props) => {
       fbAdManger={CREATIVE}
     />
   ) :
-    (!isFullMode && messageStrategy !== "X_ENGAGE" && fbAdManger !== CREATIVE) ?
+    (!isFullMode && fbAdManger !== CREATIVE && messageStrategy === "DEFAULT" ) ?
       (<div className={className}>
 
         <div className="is-scrollable-section" >
@@ -418,6 +418,7 @@ const Facebook = (props) => {
           messageStrategy={messageStrategy}
           getFormSubscriptionData={getFormSubscriptionData}
           selectedMarketingObjective={selectedMarketingObjective}
+          fbAdManger={fbAdManger}
         />
       </div>
   );

package/v2Containers/Templates/index.js

@@ -1808,9 +1808,10 @@ 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)) {
+    if ((isWechatChannel || isMobilePushChannel || isLineChannel) && !isEmpty(weCrmAccounts) && !isFacebookChannel ) {
       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'))) {
@@ -1950,25 +1951,30 @@ 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 = true;
+    let showForFacebook = false;
     if (channel.toLowerCase() === FACEBOOK_CHANNEL) {
-      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;
+      const campaignSettings = this.props.Templates.campaignSettings 
+      if (campaignSettings && isEmpty(campaignSettings?.accountSettings)) {
+        showForFacebook = 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) {
+            showForFacebook = true;
           }
-        });
-        if (!pageAccessToken) {
-          showForFacebook = false;
+        } else {
+          showForFacebook = 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)

package/v2Containers/Templates/reducer.js

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