@capillarytech/creatives-library 7.7.13 → 7.7.15

package/package.json

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

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -578,6 +578,7 @@ function SlideBoxContent(props) {
             templateData={templateData}
             messageDetails={messageDetails}
             cap={cap}
+            createNew={onCreateNew}
             onFacebookSubmit={onFacebookSubmit}
             onCreateComplete={onCreateComplete}
             isFullMode={isFullMode}
@@ -586,6 +587,7 @@ function SlideBoxContent(props) {
             }}
             getFormSubscriptionData={getFormData}
             fbAdManager={fbAdManager}
+            onSelectTemplate={onSelectTemplate}
           />
         )
       }

package/v2Containers/Facebook/Advertisement/index.js

@@ -474,9 +474,9 @@ export const Advertisement = (props) => {
       if (webSiteLink === "" || errorMsg.websiteLinkErrorMsg ) {
         flag = true;
       }
-      if (Object.keys(imageData).length === 0 && subType === IMAGE) {
+      if (!imageData?.imageSrc && subType === IMAGE) {
         flag = true;
-      } else if (Object.keys(videoData).length === 0 && subType === VIDEO) {
+      } else if (!videoData?.videoSrc && subType === VIDEO) {
         flag = true;
       }
       subTypes.push(subType);

package/v2Containers/Facebook/Advertisement/index.scss

@@ -21,7 +21,7 @@ $classPrefix: add-facebook-ad-section;
         display: inline-block;
     }
     .cap-input-edit-name{
-        width: 500px;
+        width: 319px;
     }
     .cap-link-edit-name{
         display: inline-block;

package/v2Containers/Facebook/index.js

@@ -269,7 +269,11 @@ const Facebook = (props) => {
   ]);
   const query = {type: 'embedded', module: 'library'};
   const location = {pathname: `/FACEBOOK`, search: '', query};
-  return (showTemplateList ? (
+   
+  // fbAdManager ==cretaives only the case for default startegy and user selected "capillary ad manager"
+  // below condition (fbAdManager !==CREATIVE) is for edit fb ad manager from campaign
+  //-> select capillary ad manager-> select template
+  return ((showTemplateList && fbAdManager !==CREATIVE) ? (
     <Templates
       key={"FACEBOOK"}
       location={location}
@@ -280,11 +284,18 @@ const Facebook = (props) => {
       onSelectTemplate={onSelectTemplate}
       renderNewCardGrid={renderNewCardGrid}
       handlePeviewTemplate={handlePeviewTemplate}
-      fbAdManager={CREATIVE}
+      fbAdManager={CREATIVE} // it means we are selecting capillary ad manager from campaign
     />
   ) :
-    (!isFullMode && (fbAdManager !== CREATIVE && messageStrategy === "DEFAULT" || (templateData?.edit && templateData?.fbContentType !==CREATIVE)) ) ?
-      (<div className={className}>
+    (!isFullMode && ((fbAdManager !== CREATIVE && messageStrategy === "DEFAULT") 
+    || (templateData?.edit && templateData?.fbContentType !==CREATIVE && fbAdManager !== CREATIVE )) ) ?
+
+    // not fullmode + 
+    // default strtaegy and not selected "capillary ad manager" from campaign message + 
+    //edit template && not coming from campaign message where user selected "capillary ad manager" (means  edit "fb ad manager" from campaign) &&
+    // & also we are not selecting capillary ad manager from campaign
+
+    (<div className={className}>
 
         <div className="is-scrollable-section" >
           <div className="account-details-wrapper">

package/v2Containers/Templates/_templates.scss

@@ -32,8 +32,7 @@
         padding: $CAP_SPACE_16 $CAP_SPACE_12;
     
         .ant-card-meta-description {
-          height: 250px;
-          word-wrap: break-word;
+          height: 222px;
         }
       }
 
@@ -41,6 +40,9 @@
         .ant-card-body {
           padding: $CAP_SPACE_24 0;
         }
+        .ant-card-meta-description {
+          height: 250px;
+        }
         .ant-card-meta {
           padding: 0;
         }

package/v2Containers/Templates/index.js

@@ -1418,7 +1418,11 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       }
     }
     if (this.isEnabledInLibraryModule("callSelectFromProps")) {
-      this.props.onSelectTemplate(this.selectTemplate(id), this.props.fbAdManager);
+      let data =id;
+      if(this.props.fbAdManager){
+        data = this.selectTemplate(id) 
+      }
+      this.props.onSelectTemplate(data, this.props.fbAdManager);
     } else {
       timeTracker.startTimer(CHANNEL_EDIT_TRACK_MAPPING[this.state.channel.toLowerCase()]);
       if (this.state.channel.toLowerCase() === 'ebill') {
@@ -1433,7 +1437,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);

package/v2Containers/TemplatesV2/index.js

@@ -158,7 +158,11 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
   );
 
   getFacebookComponent = () => {
-    const { messageDetails, cap, onFacebookSubmit, messageStrategy, showDisabledFBInfo, orgUnitId } = this.props;
+    const { messageDetails, cap, onFacebookSubmit, 
+      messageStrategy,
+      showDisabledFBInfo, 
+      orgUnitId,
+      onSelectTemplate } = this.props;
     return (
       <Facebook
         {...this.props}
@@ -168,6 +172,7 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
         messageStrategy={messageStrategy}
         showDisabledFBInfo={showDisabledFBInfo}
         orgUnitId={orgUnitId}
+        onSelectTemplate={onSelectTemplate}
       />
     );
   }
@@ -220,7 +225,7 @@ 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}