@capillarytech/creatives-library 7.17.95 → 7.17.96

package/containers/Ebill/index.js

@@ -956,7 +956,6 @@ export class Ebill extends React.Component { // eslint-disable-line react/prefer
         }
         temp.injectedEvents = {};
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         

package/containers/MobilePush/Edit/index.js

@@ -1779,7 +1779,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           temp.content.appName = this.props.Templates.selectedWeChatAccount.name;
         }
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         return true;

package/package.json

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

package/v2Components/FormBuilder/index.js

@@ -214,9 +214,10 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           this.setState({usingTabContainer: true});
         }
       }
-      // if (nextProps.currentTab) {
-      //   this.setState({currentTab: nextProps.currentTab});
-      // }
+      //In Context of MPUSH currentTab represents whether its Android or IOS tab , 1 for Android and 2 for IOS
+      if (nextProps.currentTab && _.get(this.props, 'schema.channel') === MOBILE_PUSH) {
+        this.setState({currentTab: nextProps.currentTab});
+      }
     } else if (!_.isEmpty(nextProps.formData) &&
       ( !this.state.usingTabContainer || (this.state.usingTabContainer && nextProps.tabKey !== ''))
       && !_.isEqual(nextProps.formData, this.state.formData) &&

package/v2Containers/InApp/index.js

@@ -67,10 +67,7 @@ export const InApp = (props) => {
   const { formatMessage } = intl;
   const [titleAndroid, setTitleAndroid] = useState("");
   const [titleIos, setTitleIos] = useState("");
-  const [templateMediaTypeAndroid, setTemplateMediaTypeAndroid] = useState(
-    INAPP_MEDIA_TYPES.TEXT
-  );
-  const [templateMediaTypeIos, setTemplateMediaTypeIos] = useState(
+  const [templateMediaType, setTemplateMediaType] = useState(
     INAPP_MEDIA_TYPES.TEXT
   );
   const [templateName, setTemplateName] = useState("");
@@ -106,7 +103,8 @@ export const InApp = (props) => {
     INAPP_BUTTON_TYPES.NONE
   );
   const [buttonTypeIos, setButtonTypeIos] = useState(INAPP_BUTTON_TYPES.NONE);
-  const isBtnTypeCta = buttonTypeAndroid === INAPP_BUTTON_TYPES.CTA;
+  const isBtnTypeCtaAndroid = buttonTypeAndroid === INAPP_BUTTON_TYPES.CTA;
+  const isBtnTypeCTaIos = buttonTypeIos === INAPP_BUTTON_TYPES.CTA;
 
   //gets account details
   useEffect(() => {
@@ -165,7 +163,7 @@ export const InApp = (props) => {
       } = androidContent;
       setTitleAndroid(androidTitle);
       setTemplateMessageAndroid(androidMessage);
-      setTemplateMediaTypeAndroid(
+      setTemplateMediaType(
         androidExpandableDetails?.style === BIG_TEXT
           ? INAPP_MEDIA_TYPES.TEXT
           : INAPP_MEDIA_TYPES.IMAGE
@@ -200,7 +198,7 @@ export const InApp = (props) => {
       } = iosContent;
       setTitleIos(iosTitle);
       setTemplateMessageIos(iosMessage);
-      setTemplateMediaTypeIos(iosExpandableDetails?.style === BIG_TEXT ? INAPP_MEDIA_TYPES.TEXT : INAPP_MEDIA_TYPES.IMAGE);
+      setTemplateMediaType(iosExpandableDetails?.style === BIG_TEXT ? INAPP_MEDIA_TYPES.TEXT : INAPP_MEDIA_TYPES.IMAGE);
       setInAppImageSrcIos(iosExpandableDetails?.image);
       setButtonTypeIos(iosExpandableDetails?.ctas?.length ? INAPP_BUTTON_TYPES.CTA : INAPP_BUTTON_TYPES.NONE);
       setAddActionLinkIos(!isEmpty(iosCta) && true);
@@ -312,7 +310,6 @@ export const InApp = (props) => {
       }
     }
   };
-
   // tag Code end
 
   const onTemplateNameChange = ({ target: { value } }) => {
@@ -333,7 +330,6 @@ export const InApp = (props) => {
     }
   };
 
-
   const PANES = [
     {
       content: (
@@ -355,8 +351,8 @@ export const InApp = (props) => {
           setButtonType={setButtonTypeAndroid}
           accountId={accountId}
           accessToken={accessToken}
-          templateMediaType={templateMediaTypeAndroid}
-          setTemplateMediaType={setTemplateMediaTypeAndroid}
+          templateMediaType={templateMediaType}
+          setTemplateMediaType={setTemplateMediaType}
           title={titleAndroid}
           setTitle={setTitleAndroid}
           templateMessageError={templateMessageErrorAndroid}
@@ -398,8 +394,8 @@ export const InApp = (props) => {
           setButtonType={setButtonTypeIos}
           accountId={accountId}
           accessToken={accessToken}
-          templateMediaType={templateMediaTypeIos}
-          setTemplateMediaType={setTemplateMediaTypeIos}
+          templateMediaType={templateMediaType}
+          setTemplateMediaType={setTemplateMediaType}
           title={titleIos}
           setTitle={setTitleIos}
           templateMessageError={templateMessageErrorIos}
@@ -466,7 +462,7 @@ export const InApp = (props) => {
     let ctaData = {};
     if (panes === ANDROID) {
       ctaData = ctaDataAndroid;
-      switch (templateMediaTypeAndroid) {
+      switch (templateMediaType) {
         case INAPP_MEDIA_TYPES.IMAGE:
           mediaPreview.inAppImageSrcAndroid = inAppImageSrcAndroid;
           break;
@@ -475,7 +471,7 @@ export const InApp = (props) => {
       }
     } else {
       ctaData = ctaDataIos;
-      switch (templateMediaTypeIos) {
+      switch (templateMediaType) {
         case INAPP_MEDIA_TYPES.IMAGE:
           mediaPreview.inAppImageSrcIos = inAppImageSrcIos;
           break;
@@ -491,7 +487,7 @@ export const InApp = (props) => {
             mediaPreview,
             templateTitle,
             templateMsg,
-            ...(isBtnTypeCta && {
+            ...((isBtnTypeCtaAndroid || isBtnTypeCTaIos) && {
               ctaData,
             }),
           },
@@ -517,20 +513,24 @@ export const InApp = (props) => {
       return true;
     }//for ios
     //if media type is image and the mediaType file is not uploaded
-    if (panes === ANDROID && !(templateMediaTypeAndroid === INAPP_MEDIA_TYPES.TEXT) && inAppImageSrcAndroid === '') {
+    if (panes === ANDROID && !(templateMediaType === INAPP_MEDIA_TYPES.TEXT) && inAppImageSrcAndroid === '') {
       return true;
     }
-    if (panes === IOS && !(templateMediaTypeIos === INAPP_MEDIA_TYPES.TEXT) && inAppImageSrcIos === '') {
+    if (panes === IOS && !(templateMediaType === INAPP_MEDIA_TYPES.TEXT) && inAppImageSrcIos === '') {
       return true;
     }
     //cta
-    if (isBtnTypeCta) {
-      if (panes === ANDROID && ctaDataAndroid[0]?.isSaved) {
+    if (isBtnTypeCtaAndroid) {
+      if (ctaDataAndroid[0]?.isSaved) {
         //if button type is cta and 1st button is saved
         return false;
       }
-      if (panes === IOS && ctaDataIos[0]?.isSaved) {
-         //if button type is cta and 1st button is saved
+      //if button type is cta and there are no buttons saved
+      return true;
+    }
+    if (isBtnTypeCTaIos) {
+      if (ctaDataIos[0]?.isSaved) {
+        //if button type is cta and 1st button is saved
         return false;
       }
       //if button type is cta and there are no buttons saved
@@ -557,18 +557,12 @@ export const InApp = (props) => {
       cuid: "{{cuid}}",
       communicationId: "{{communicationId}}",
     };
-    switch (templateMediaTypeAndroid) {
+    switch (templateMediaType) {
       case INAPP_MEDIA_TYPES.IMAGE:
         androidMediaParams = {
           image: getCdnUrl({url: inAppImageSrcAndroid, channelName: INAPP }),
           style: BIG_PICTURE,
         };
-        break;
-      default:
-        break;
-    }
-    switch (templateMediaTypeIos) {
-      case INAPP_MEDIA_TYPES.IMAGE:
         iosMediaParams = {
           image: getCdnUrl({url: inAppImageSrcIos, channelName: INAPP }),
           style: BIG_PICTURE,
@@ -596,7 +590,7 @@ export const InApp = (props) => {
                 style: BIG_TEXT,
                 message: templateMessageAndroid,
                 ...androidMediaParams,
-                ...(isBtnTypeCta && {
+                ...(isBtnTypeCtaAndroid && {
                   ctas: getCtaPayload(ANDROID),
                 }),
               },
@@ -612,7 +606,7 @@ export const InApp = (props) => {
                 style: BIG_TEXT,
                 message: templateMessageIos,
                 ...iosMediaParams,
-                ...(isBtnTypeCta && {
+                ...(isBtnTypeCTaIos && {
                   ctas: getCtaPayload(IOS),
                 }),
               },
@@ -626,7 +620,7 @@ export const InApp = (props) => {
       definition: {
         accountId: id,
         licenseCode: sourceAccountIdentifier,
-        mode: "CREATE",
+        mode: templateMediaType,
       },
     };
     return data;
@@ -679,7 +673,6 @@ export const InApp = (props) => {
     );
   };
 
-
   const onDoneCallback = () => {
     if (isFullMode) {
       if (isEditFlow) {

package/v2Containers/MobilePush/Edit/index.js

@@ -768,10 +768,9 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     formData[0].base = true;
     // formData[0].tabKey = '1';
     // formData[1].tabKey = '2';
-
     this.setState({templateCta}, () => {
       this.getSchemaForFormData(formData, schema);
-      this.setState({tabCount, formData, editData: data, currentTab: 1}, () => {
+      this.setState({tabCount, formData, editData: data}, () => {
         this.props.showTemplateName({formData, onFormDataChange: this.onFormDataChange});
       });
     });
@@ -1469,7 +1468,6 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           temp.content.appName = this.props.Templates.selectedWeChatAccount.name;
         }
         _.forEach(col.supportedEvents, (event) => {
-          console.log('injected event for ', col, event, this.getMappedEvent(col.id, event));
           temp.injectedEvents[event] = this.getMappedEvent(col.id, event);
         });
         return true;

package/v2Containers/Templates/_templates.scss

@@ -11,6 +11,7 @@
   .creatives-templates-list.full-mode{
     .pagination-container {
       .cap-custom-card-list-row {
+        padding-bottom: 10rem;
         .cap-custom-card-list-col{
           &:nth-child(3n+3) { //every 4th child
             margin-right: unset;
@@ -25,6 +26,7 @@
   .creatives-templates-list.full-mode{
     .pagination-container {
       .cap-custom-card-list-row {
+        padding-bottom: 10rem;
         .cap-custom-card-list-col{
           &:nth-child(4n+4) { //every 4th child
             margin-right: unset;
@@ -56,6 +58,9 @@
   }
 
   .pagination-container {
+    .cap-custom-card-list-row {
+      padding-bottom: 10rem;
+    }
     .FACEBOOK {
       .ant-card-body {
         background-color: $CAP_G09;
@@ -523,6 +528,7 @@
 .message-container{
   border-bottom: solid 0.5px #D6D6D6;
 }
+
 .main-content{
   overflow: hidden;
 }