@capillarytech/creatives-library 7.7.3 → 7.7.5

package/package.json

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

package/v2Containers/Cap/index.js

@@ -182,13 +182,14 @@ export class Cap extends React.Component { // eslint-disable-line react/prefer-s
           USERNAME : userName,
           EMAIL : userEmail
         } = {},
-        proxyOrgList,
+        proxyOrgList =[],
         isCapUser,
-        refID
+        refID,
+        orgName: userOrgName,
       } = userData;
-      const {
-        orgName
-      } = _.find(proxyOrgList, {orgID});
+      const { orgName } = _.find(proxyOrgList, { orgID: orgID }) || {
+        orgName: userOrgName,
+      };
       const gtmData = {
         isCapUser: isCapUser,
         orgId: orgID,

package/v2Containers/CapFacebookPreview/index.js

@@ -46,6 +46,7 @@ export const CapFacebookPreview = (props) => {
     accessToken,
     accountId,
     defaultGeneratePreview,
+    hideInfoText = false,
   } = props;
   const {
     formatMessage,
@@ -199,6 +200,7 @@ export const CapFacebookPreview = (props) => {
         ad_format: adPreviewFormat,
       },
     };
+    const { webSiteLink= "" } = (previewData || [] )[0] || {};
     if (selectedAd !== CAROUSEL) {
       const {
          imageData = {},
@@ -273,6 +275,7 @@ export const CapFacebookPreview = (props) => {
           message: primaryText,
           child_attachments: childData,
           multi_share_end_card: false,
+          "link":webSiteLink,
         },
       };
       facebookPreviewActions.getPreview(data);
@@ -293,8 +296,8 @@ export const CapFacebookPreview = (props) => {
         src={src}
         key={random}
         style={{border: "none"}}
-        width={"800px"}
-        scrolling="yes"
+        width={"600px"}
+        scrolling="no"
         height={"1000px"}
         className="cap-facebook-ad-iframe"
       />
@@ -349,12 +352,12 @@ export const CapFacebookPreview = (props) => {
         >
         </CapSelect>
       </div>
-      <CapLabel
+      {!hideInfoText && <CapLabel
         type="label1"
         style={{paddingBottom: 16, textAlign: 'left', width: 392}}
                 >
         {formatMessage(messages.previewAdDesc)}
-      </CapLabel>
+      </CapLabel>}
       <div style={{marginBottom: 16}}>
         {(disablePreviewButton || disableAfterPreviewGenerate) ?
           <CapTooltip title={formatMessage(messages.generatePreviewDisableToolTip)}>
@@ -420,6 +423,7 @@ CapFacebookPreview.propTypes = {
   orgUnitFacebookPageSettingsMap: PropTypes.object,
   accessToken: PropTypes.string,
   accountId: PropTypes.string,
+  hideInfoText:PropTypes.any,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Containers/CapFacebookPreview/index.scss

@@ -1,15 +1,4 @@
 .cap-facebook-ad-iframe{
-    -moz-transform: scale(0.75, 0.75); 
-    -webkit-transform: scale(0.75, 0.75); 
-    -o-transform: scale(0.75, 0.75);
-    -ms-transform: scale(0.75, 0.75);
     transform: scale(0.75, 0.75); 
-    -moz-transform-origin: top left;
-    -webkit-transform-origin: top left;
-    -o-transform-origin: top left;
-    -ms-transform-origin: top left;
     transform-origin: top left;
-    #facebook{
-        position: absolute;
-    }
 }

package/v2Containers/CapFacebookPreview/messages.js

@@ -73,7 +73,7 @@ export default defineMessages({
   },
   instagramStandard: {
     id: `${messagePrefix}.instagramStandard`,
-    defaultMessage: 'instagram_standard',
+    defaultMessage: 'Instagram standard',
   },
   instagramStory: {
     id: `${messagePrefix}.instagramStory`,
@@ -81,7 +81,7 @@ export default defineMessages({
   },
   instagramExploreContextual: {
     id: `${messagePrefix}.instagramExploreContextual`,
-    defaultMessage: 'instagram_explore_contextual',
+    defaultMessage: 'Instagram explore contextual',
   },
   instagramExploreImmersive: {
     id: `${messagePrefix}.instagramExploreImmersive`,

package/v2Containers/CreativesContainer/index.js

@@ -235,6 +235,7 @@ class Creatives extends React.Component {
               creativeType = "",
               selectedFacebookAccount = {},
               facebookCreativeList: fbCreativeList = [],
+              fbContentType,
             } = templateData || {};
             const fBContent = fbCreativeList;
             const facebookCreativeList = [];
@@ -277,6 +278,7 @@ class Creatives extends React.Component {
               type: constants.FACEBOOK,
               edit: true,
               selectedFacebookAccount,
+              fbContentType
             };
           } else {
             creativesTemplateData = {

package/v2Containers/Facebook/Advertisement/index.js

@@ -837,7 +837,7 @@ export const Advertisement = (props) => {
       }
     } else if (status === 'SUCCESS') {
       Object.keys(data).forEach((obj) => {
-        if ((orgUnitFacebookPageSettingsMap[data[obj]] || {}).pageAccessToken) {
+        if ((orgUnitFacebookPageSettingsMap[data[obj]] || {}).pageAccessToken && data[obj]!== -1) {
           pageAccessOrgsOptions.push({label: obj, value: data[obj]});
         }
       });
@@ -865,7 +865,7 @@ export const Advertisement = (props) => {
              className={"cap-header-facebook-ad"}
             />
          </div>
-         {isFullMode && <>
+         {isFullMode &&  <>
            <CapInput
              id={`fbAd_input`}
              onChange={onTextTitleChange}
@@ -916,8 +916,10 @@ export const Advertisement = (props) => {
                className={"cap-header-facebook-ad"}
             />
            </div>}
-           <CapRow className="add-facebook-ad-section" >
-             {isFullMode && <div className="cap-header-facebook-ad">
+           <div className="add-facebook-ad-section">
+           <CapRow  >
+             <CapColumn span={12}>
+             {isFullMode && <>
                <CapHeading
                  type="h2"
                  className="truncate-text"
@@ -935,8 +937,7 @@ export const Advertisement = (props) => {
                  title={<FormattedMessage {...messages.creativesTemplatesEditName}/>}
                  onClick={onClickEditName}
                   />}
-             </div>}
-             <CapColumn span={12}>
+             </>}
                {isFullMode && <><CapHeading
                  type="h4"
                  style={{marginBottom: 4}}
@@ -987,6 +988,7 @@ export const Advertisement = (props) => {
                   />
              </CapColumn>
            </CapRow>
+           </div>
            <FbAdFooter>
              <CapButton
                onClick={onDoneCallback()}

package/v2Containers/Facebook/Advertisement/index.scss

@@ -17,7 +17,7 @@ $classPrefix: add-facebook-ad-section;
         text-overflow: ellipsis;
         white-space: nowrap;
         min-width: 112px;
-        max-width: 920px;
+        max-width: 320px;
         display: inline-block;
     }
     .cap-input-edit-name{
@@ -48,7 +48,7 @@ $classPrefix: add-facebook-ad-section;
     .cap-custom-image-upload{
         .dragger-button.re-upload{
             margin-top: 50px;    
-            top: 0px;
+            top: 35px;
             position: absolute;
             right: 60px;
             color: $FONT_COLOR_05;

package/v2Containers/Facebook/messages.js

@@ -182,6 +182,6 @@ export default defineMessages({
   },
   facebookDisableinfo: {
     id: `${messagePrefix}.facebookDisableinfo`,
-    defaultMessage: 'Please integrate Facebook Ad page ID & username to enable this option.',
+    defaultMessage: 'Please integrate Facebook page ID & page name to enable this option.',
   },
 });

package/v2Containers/Templates/index.js

@@ -1956,8 +1956,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     const { activeMode, channel, wechatFilter, lineFilter } = this.state;
     let showFbAds = false;
     if (channel.toLowerCase() === FACEBOOK_CHANNEL) {
-      const campaignSettings = this.props.Templates.campaignSettings;
-      if (campaignSettings && isEmpty(campaignSettings?.accountSettings)) {
+      const {campaignSettings, fetchedOrgLevelCampaignSettings} = this?.props?.Templates || {};
+      if (campaignSettings && isEmpty(campaignSettings?.accountSettings) && fetchedOrgLevelCampaignSettings) {
         showFbAds = true;
       } else if (!isEmpty(campaignSettings?.accountSettings)) {
         const fbSetting = get(this.props.Templates, 'campaignSettings.accountSettings.socialAccountSettings.facebookAccountSettings', []);

package/v2Containers/Templates/reducer.js

@@ -9,7 +9,7 @@ import * as types from './constants';
 
 const initialState = fromJS({
   getAllTemplatesInProgress: false,
-  fetchingOrgLevelCampaignSettings: false,
+  fetchedOrgLevelCampaignSettings: true,
   templates: [],
   deleteResponse: {},
   deleteTemplateInProgress: false,
@@ -160,9 +160,9 @@ function templatesReducer(state = initialState, action) {
         .set('templates', [])
         .set('weCRMtemplates', fromJS({}));
     case types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_REQUEST:
-      return state.set('fetchingOrgLevelCampaignSettings', true);
+      return state.set('fetchedOrgLevelCampaignSettings', false);
     case types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_SUCCESS:
-      return state.set('fetchingOrgLevelCampaignSettings', false).set(
+      return state.set('fetchedOrgLevelCampaignSettings', true).set(
           'campaignSettings',
           fromJS({
             ...state.get('campaignSettings'),
@@ -170,7 +170,7 @@ function templatesReducer(state = initialState, action) {
           }),
         );
     case types.GET_ORG_LEVEL_CAMPAIGN_SETTINGS_FAILURE:
-      return state.set('fetchingOrgLevelCampaignSettings', false);
+      return state.set('fetchedOrgLevelCampaignSettings', false);
     default:
       return state;
   }

package/v2Containers/TemplatesV2/messages.js

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