@capillarytech/creatives-library 2.0.63 → 2.0.65

package/components/FormBuilder/index.js

@@ -3074,7 +3074,8 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             const currentLang = this.state.formData[this.state.currentTab - 1].selectedLanguages[index];
             paneTabKey = this.state.formData[this.state.currentTab - 1] && this.state.formData[this.state.currentTab - 1][currentLang] && this.state.formData[this.state.currentTab - 1][currentLang].tabKey;
           }
-          if (pane.isSupported) {
+          const isPaneSupported = typeof pane.isSupported === "boolean" ? pane.isSupported : true; // pane.isSupported field exists only in mpush schema, in other channels it is not
+          if (isPaneSupported) {
             renderedPanes.push(
               <TabPane
                 forceRender

package/containers/MobilePush/Create/index.js

@@ -177,7 +177,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
   onFormDataChange = (formData, tabCount) => {
     const newFormData = cloneDeep(formData);
     const {templateCta} = this.state;
-    if (templateCta) {
+    if (!isEmpty(templateCta)) {
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-label`] = templateCta.name;
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-action`] = templateCta.ctaTemplateDetails[0].buttonText;
       delete newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-action2`];
@@ -420,6 +420,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           return undefined;
         }).filter((custom) => custom),
       };
+      obj.name = isEmpty(obj.name) ? android['message-title'] : obj.name;
     }
     if (android['cta-deeplink'] && android['cta-deeplink'] !== "") {
       obj.versions.base.ANDROID.cta = {
@@ -452,6 +453,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           return undefined;
         }).filter((custom) => custom),
       };
+      obj.name = isEmpty(obj.name) ? ios['message-title2'] : obj.name;
     }
     if (ios['cta-deeplink2'] && ios['cta-deeplink2'] !== "") {
       obj.versions.base.IOS.cta = {
@@ -560,6 +562,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
       }
       if (secondaryCtaIos) {
         obj.versions.base.IOS.expandableDetails.ctas = [];
+        const templateCtaId = get(this.state, "templateCta.ctaTemplateDetails[0].id");
         const cta = {
           actionText: ios['secondary-cta-1-label'],
           actionLabel: ios['secondary-cta-1-action'],
@@ -567,7 +570,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
           type: ios['cta-deeplink-secondary-cta-1'] && (ios['cta-deeplink-secondary-cta-1'].toLowerCase() === "deeplink" ? "DEEP_LINK" : "EXTERNAL_URL"),
           actionLink: ios['cta-deeplink-secondary-cta-1'] && (ios['cta-deeplink-secondary-cta-1'].toLowerCase() === "deeplink" ? (ios['cta-deeplink-secondary-cta-1-select2'] || ios['cta-deeplink-secondary-cta-1-select']) : ios['cta-deeplink-secondary-cta-1-text']),
           ioscdeepLinkName: this.getLinkName(ios['cta-deeplink-secondary-cta-1-select']),
-          templateCtaId: get(this.state, "templateCta.ctaTemplateDetails[0].id"),
+          templateCtaId,
         };
         if (this.props.location.query.type === 'embedded') {
           delete cta.ioscdeepLinkName;

package/containers/MobilePush/Edit/index.js

@@ -227,7 +227,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     console.log('Form data changed is ', formData, tabCount, currentTab);
     const newFormData = _.cloneDeep(formData);
     const {templateCta} = this.state;
-    if (templateCta) {
+    if (!_.isEmpty(templateCta)) {
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-label`] = templateCta.name;
       newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-action`] = templateCta.ctaTemplateDetails[0].buttonText;
       delete newFormData[this.state.currentTab - 1][`secondary-cta-${this.state.currentTab - 1}-action2`];
@@ -547,6 +547,8 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
     if (secondaryCtaIos) {
       obj.versions.base.IOS.expandableDetails.ctas = [];
+      const templateCtaId = get(this.state, "templateCta.ctaTemplateDetails[0].id");
+
       const cta = {
         actionText: ios['secondary-cta-1-label'],
         actionLabel: ios['secondary-cta-1-action'],
@@ -554,7 +556,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         type: ios['cta-deeplink-secondary-cta-1'] && (ios['cta-deeplink-secondary-cta-1'].toLowerCase() === "deeplink" ? "DEEP_LINK" : "EXTERNAL_URL"),
         actionLink: ios['cta-deeplink-secondary-cta-1'] && (ios['cta-deeplink-secondary-cta-1'].toLowerCase() === "deeplink" ? ios['cta-deeplink-secondary-cta-1-select2'] : ios['cta-deeplink-secondary-cta-1-text2']),
         ioscdeepLinkName: this.getLinkName(ios['cta-deeplink-secondary-cta-1-select']),
-        templateCtaId: get(this.state, "templateCta.ctaTemplateDetails[0].id"),
+        templateCtaId,
       };
       if (this.props.location.query.type === 'embedded') {
         delete cta.ioscdeepLinkName;
@@ -770,7 +772,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
 
   getSchemaForFormData = (formdata, inputSchema) => {
     let schema = inputSchema;
-    const formData = _.cloneDeep(formData);
+    const formData = _.cloneDeep(formdata);
     if (!_.isEmpty(formData[0])) {
       if (formData[0]['cta-deeplink']) {
         formData[0]['add-pri-cta'] = true;

package/containers/Templates/index.js

@@ -470,6 +470,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
         templateData.content = template.versions.base['sms-editor'];
       } else if (currentChannel === "EMAIL") {
         templateData.url = template.versions.base.preview_http_url;
+      } else if (currentChannel === "MOBILEPUSH" && template.type === "MOBILEPUSH") {
+        templateData.content = template;
       }
       return templateData;
     });

package/package.json

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