@capillarytech/creatives-library 7.7.14 → 7.7.16

package/package.json

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

package/services/api.js

@@ -32,6 +32,14 @@ function parseJSON(response) {
   return response.json();
 }
 
+function getUrlWithQueryParams({url, queryParams}) {
+  let updatedUrl = url;
+  Object.entries(queryParams).forEach(([key, value]) => {
+    updatedUrl += `${key}=${key === 'name' ? encodeURIComponent(value) : value}&`;
+  });
+  return updatedUrl;
+};
+
 // const loginUrl = (process.env.NODE_ENV === 'production') ?
 //   config.production.login_url : config.development.login_url;
 
@@ -250,20 +258,25 @@ export const getTemplateDetails = ({id, channel}) => {
   return request(url, getAPICallObject('GET'));
 };
 
-export const getAllTemplates = ({channel, queryParams}) => {
-  const url = `${API_ENDPOINT}/templates/${channel}?query=${encodeURIComponent(JSON.stringify(queryParams))}`;
+export const getAllTemplates = ({channel, queryParams = {}}) => {
+  const url = getUrlWithQueryParams({
+    url: `${API_ENDPOINT}/templates/${channel}?`,
+    queryParams,
+  });
   return request(url, getAPICallObject('GET'));
 };
 
 export const deleteTemplate = ({channel, id}) => {
-  
   const url = `${API_ENDPOINT}/templates/${id}/${channel}`;
   return request(url, getAPICallObject('DELETE'));
   //return API.deleteResource(url);
 };
 
-export const getAllAssets = ({assetType, queryParams}) => {
-  const url = `${API_ENDPOINT}/assets/${assetType}?query=${JSON.stringify(queryParams)}`;
+export const getAllAssets = ({assetType, queryParams = {}}) => {
+  const url = getUrlWithQueryParams({
+    url: `${API_ENDPOINT}/assets/${assetType}?`,
+    queryParams,
+  });
   // const url = `https://nightly.capillary.in/arya/api/v1/creatives/assets/${assetType}?query=${JSON.stringify(queryParams)}`;
   return API.get(url);
 }

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/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/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}
       />
     );
   }