@capillarytech/creatives-library 6.10.6 → 6.11.0

package/components/FormBuilder/index.js

@@ -2912,7 +2912,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 langIndex = parseInt(val.id.replace('template-content', ''), 10) - 1;
               }
 
-              const currentLang = (!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage;
+              const currentLang = ((!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage) || 'en';
               const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] ? this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] : '');
 
               if (this.state.formData[`${this.state.currentTab - 1}`][currentLang].is_drag_drop) {
@@ -2942,14 +2942,14 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 langTab = val.id.charAt(9);
               }
             }
-            const supportedLanguages = this.state.formData[this.state.currentTab - 1].selectedLanguages;
+            const supportedLanguages = (this.state.formData[this.state.currentTab - 1] || {}).selectedLanguages;
             // let langIndex = 0;
             // if (val.id.indexOf('edmeditor') > -1 && val.id !== 'edmeditorsrc') {
             //   const test = val.id.replace('src', '');
             //   langIndex = parseInt(test.replace('edmeditor', ''), 10) - 1;
             // }
             // const currentLang = (!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage;
-            const currentLang = supportedLanguages[langTab - 1];
+            const currentLang = supportedLanguages && supportedLanguages[langTab - 1];
             const edmSrc = this.state.formData[`${this.state.currentTab - 1}`][currentLang] && this.state.formData[`${this.state.currentTab - 1}`][currentLang][`edmeditor${this.state.currentTab > 1 ? this.state.currentTab : ''}src`];
 
 

package/containers/Email/index.js

@@ -871,7 +871,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         const schema = _.cloneDeep(this.state.schema);
         const langIndex = formData[this.state.currentTab - 1].selectedLanguages.indexOf(langId);
         console.log('edm trying to set data', langIndex, langId, formData[this.state.currentTab - 1].activeTab, apiLangId);
-        const temp = schema.containers[this.state.currentTab - 1];
+        const temp = (schema.containers || {})[this.state.currentTab - 1];
         if (baseLanguage === langId && (apiLangId === "undefined" || apiLangId === formData[this.state.currentTab - 1].activeTab)) {
           temp.tabBarExtraContent.sections[0].inputFields[0].cols[4].content.sections[0].inputFields[2].cols[0].style = {display: "none"};
         } else if (apiLangId === "undefined" || apiLangId === formData[this.state.currentTab - 1].activeTab) {

package/containers/Templates/index.js

@@ -191,8 +191,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       this.setState({ channel }, () => {
         if (this.state.channel.toLowerCase() === 'line' || this.state.channel.toLowerCase() === 'sms' || this.state.channel.toLowerCase() === 'email' || this.state.channel.toLowerCase() === 'ebill' || (this.state.channel.toLowerCase() === 'wechat' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount))) {
           if (this.state.channel.toLowerCase() === 'wechat' && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
-            params.wecrmId = nextProps.Templates.selectedWeChatAccount.configs.wecrm_app_id;
-            params.wecrmToken = nextProps.Templates.selectedWeChatAccount.configs.wecrm_token;
+            params.wecrmId = (nextProps.Templates.selectedWeChatAccount.configs || {}).wecrm_app_id;
+            params.wecrmToken = (nextProps.Templates.selectedWeChatAccount.configs || {}).wecrm_token;
             params.originalId = nextProps.Templates.selectedWeChatAccount.sourceAccountIdentifier;
           }
           if (this.state.channel.toLowerCase() === "mobilepush" && !_.isEmpty(nextProps.Templates.selectedWeChatAccount)) {
@@ -203,8 +203,8 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       });
     }
     if (this.state.channel.toLowerCase() === 'wechat' && nextProps.Templates.selectedWeChatAccount) {
-      params.wecrmId = nextProps.Templates.selectedWeChatAccount.configs.wecrm_app_id;
-      params.wecrmToken = nextProps.Templates.selectedWeChatAccount.configs.wecrm_token;
+      params.wecrmId = (nextProps.Templates.selectedWeChatAccount.configs || {}).wecrm_app_id;
+      params.wecrmToken = (nextProps.Templates.selectedWeChatAccount.configs || {}).wecrm_token;
       params.originalId = nextProps.Templates.selectedWeChatAccount.sourceAccountIdentifier;
     }
     if (this.state.channel.toLowerCase() === "mobilepush" && nextProps.Templates.selectedWeChatAccount) {
@@ -1536,7 +1536,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
     if (this.state.channel.toLowerCase() === 'ebill') {
       htmlPreviewContent = this.state.previewTemplate && this.state.previewTemplate.versions && this.state.previewTemplate.versions.base && this.state.previewTemplate.versions.base['ebill-editor'];
     } else if (this.state.channel.toLowerCase() === 'email') {
-      htmlPreviewContent = this.state.previewTemplate && this.state.previewTemplate.versions && this.state.previewTemplate.versions.base && this.state.previewTemplate.versions.base[this.props.Global.currentOrgDetails.basic_details.base_language ? this.props.Global.currentOrgDetails.basic_details.base_language : 'en']['template-content'];
+      htmlPreviewContent = this.state.previewTemplate && this.state.previewTemplate.versions && this.state.previewTemplate.versions.base && (this.state.previewTemplate.versions.base[this.props.Global.currentOrgDetails.basic_details.base_language ? this.props.Global.currentOrgDetails.basic_details.base_language : 'en'] || {})['template-content'];
     }
 
     const templateList = this.populateTemplatesList(this.props.TemplatesList, true);

package/package.json

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

package/v2Components/EmailPreview/_emailPreview.scss

@@ -1,9 +1,6 @@
 .modal-emailPreivew-wrapper {
   width: 100vw;
   height: 100vh;
-  position: fixed;
-  top: 0;
-  left: 0;
   background: rgba(0,0,0,0.56);
   z-index: 10002;
 

package/v2Components/FormBuilder/index.js

@@ -3178,7 +3178,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 langIndex = parseInt(val.id.replace('template-content', ''), 10) - 1;
               }
               console.log('CKEditor Data 2', this.state.formData, this.state.formData[`${this.state.currentTab - 1}`], val, this.state.currentTab, this.state.currentLangTab, langIndex);
-              const currentLang = (!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage;
+              const currentLang = ((!_.isEmpty(this.state.formData) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`]) && !_.isEmpty(this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages) && this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex]) ? this.state.formData[`${this.state.currentTab - 1}`].selectedLanguages[langIndex] : this.props.baseLanguage) || 'en';
               const content = (!_.isEmpty(this.state.formData) && this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] ? this.state.formData[`${this.state.currentTab - 1}`][currentLang]['template-content'] : '');
               console.log('ckeditor current lang', currentLang, content);
               if (this.state.formData[`${this.state.currentTab - 1}`][currentLang].is_drag_drop) {

package/v2Components/TemplatePreview/WechatRichmediaTemplatePreview/_wechatRichmediaTemplatePrev.scss

@@ -1,152 +1,152 @@
-@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
-
-.shell-lock-screen-android .main-screen-preview .wechatMsgContainer{
-  position: absolute;
-  left: 53.5%;
-  top:28%;
-  background: white;
-  width: 19.5%;
-  text-align: left;
-  height: fit-content;
-  border-radius: 0.285rem;
-}
-
-.shell-lock-screen-android .lock-screen-preview{
-  .wechat-android-sender-id{
-    position: absolute;
-    top: 46%;
-    font-size: 10px;
-    left: 28%;
-  }
-  .wechat-android-title{
-    position: absolute;
-    top: 49%;
-    font-size: 10px;
-    left: 28%;
-    color: #5e6c84;
-  }
-  .wechat-android-action-buttons{
-    position: absolute;
-    left: 28%;
-    top: 53%;
-    font-size: 10px;
-    color: #3861ca;
-    font-weight: 500;
-  }
-  .wechat-ios-sender-id{
-    position: absolute;
-    top: 44%;
-    font-size: 10px;
-    left: 28.5%;
-  }
-  .wechat-ios-title{
-    position: absolute;
-    top: 47%;
-    font-size: 10px;
-    left: 28.5%;
-    color: #5e6c84;
-  }
-  .wechat-ios-action-reply{
-    position: absolute;
-    left: 35%;
-    top: 59%;
-    font-size: 12px;
-    color: #3861ca;
-    font-weight: 500;
-  }
-  .wechat-ios-action-cancel{
-    position: absolute;
-    left: 34.5%;
-    top: 66%;
-    font-size: 12px;
-    color: #3861ca;
-    font-weight: 500;
-  }
-}
-
-.wechatMsgContainer{
-    position: absolute;
-    left: 30%;
-    top: 20%;
-    background: white;
-    width: 40%;
-    text-align: left;
-    height: fit-content;
-    border-radius: $CAP_SPACE_04;
-    .richmedia-template {
-        .richmedia-image-container {
-          width: 100%;
-          height: 102px;
-          position: relative;
-          img {
-            border-top-left-radius: 4px;
-            border-top-right-radius: 4px;
-          }
-        }
-        .name-container-with-abstract {
-          padding: $CAP_SPACE_12;
-          height: 68px;
-        }
-        .name-container {
-          position: absolute;
-          bottom: 0px;
-          height: 44px;
-          padding-top: 16px;
-          padding-left: 12px;
-          color: $CAP_WHITE;
-          opacity: 0.7;
-          width: 100%;
-          background-image: linear-gradient(to top,black 0% ,transparent 100%);
-        }
-        .additional-richmedia-container {
-          display: flex;
-          justify-content: space-between;
-          margin: 8px;
-          padding-bottom: 8px;
-          img {
-            border-radius: 4px;
-          }
-        }
-        .additional-richmedia-container:not(:last-child) {
-            border-bottom: 1px solid #dfe2e7;
-          }
-        div {
-          text-overflow: ellipsis;
-          overflow: hidden;
-          white-space: nowrap;
-        }
-      }
-}
-.wechatMsgContainerOutbound{
-    position: absolute;
-    left: 35%;
-    top: 20%;
-    background: white;
-    width: 30%;
-    text-align: left;
-}
-.wechatMsgContainerCardLayout {
-    position: absolute;
-    left: 20%;
-    top: 20%;
-    background: white;
-    width: 60%;
-    text-align: left;
-}
-.overflow-handle-preview {
-    overflow-y: auto;
-}
-.overflow-handle-preview-outbound {
-    height: 330px;
-    overflow-y: auto;
-}
-.preview-overflow-wrap-fields {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    overflow-wrap: break-word;
-    display: -webkit-box !important;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-    text-align: left;
-    width: 200px;
+@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
+
+.shell-lock-screen-android .main-screen-preview .wechatMsgContainer{
+  position: absolute;
+  left: 53.5%;
+  top:28%;
+  background: white;
+  width: 19.5%;
+  text-align: left;
+  height: fit-content;
+  border-radius: 0.285rem;
+}
+
+.shell-lock-screen-android .lock-screen-preview{
+  .wechat-android-sender-id{
+    position: absolute;
+    top: 46%;
+    font-size: 10px;
+    left: 28%;
+  }
+  .wechat-android-title{
+    position: absolute;
+    top: 49%;
+    font-size: 10px;
+    left: 28%;
+    color: #5e6c84;
+  }
+  .wechat-android-action-buttons{
+    position: absolute;
+    left: 28%;
+    top: 53%;
+    font-size: 10px;
+    color: #3861ca;
+    font-weight: 500;
+  }
+  .wechat-ios-sender-id{
+    position: absolute;
+    top: 44%;
+    font-size: 10px;
+    left: 28.5%;
+  }
+  .wechat-ios-title{
+    position: absolute;
+    top: 47%;
+    font-size: 10px;
+    left: 28.5%;
+    color: #5e6c84;
+  }
+  .wechat-ios-action-reply{
+    position: absolute;
+    left: 35%;
+    top: 59%;
+    font-size: 12px;
+    color: #3861ca;
+    font-weight: 500;
+  }
+  .wechat-ios-action-cancel{
+    position: absolute;
+    left: 34.5%;
+    top: 66%;
+    font-size: 12px;
+    color: #3861ca;
+    font-weight: 500;
+  }
+}
+
+.wechatMsgContainer{
+    position: absolute;
+    left: 30%;
+    top: 20%;
+    background: white;
+    width: 40%;
+    text-align: left;
+    height: fit-content;
+    border-radius: $CAP_SPACE_04;
+    .richmedia-template {
+        .richmedia-image-container {
+          width: 100%;
+          height: 102px;
+          position: relative;
+          img {
+            border-top-left-radius: 4px;
+            border-top-right-radius: 4px;
+          }
+        }
+        .name-container-with-abstract {
+          padding: $CAP_SPACE_12;
+          height: 68px;
+        }
+        .name-container {
+          position: absolute;
+          bottom: 0px;
+          height: 44px;
+          padding-top: 16px;
+          padding-left: 12px;
+          color: $CAP_WHITE;
+          opacity: 0.7;
+          width: 100%;
+          background-image: linear-gradient(to top,black 0% ,transparent 100%);
+        }
+        .additional-richmedia-container {
+          display: flex;
+          justify-content: space-between;
+          margin: 8px;
+          padding-bottom: 8px;
+          img {
+            border-radius: 4px;
+          }
+        }
+        .additional-richmedia-container:not(:last-child) {
+            border-bottom: 1px solid #dfe2e7;
+          }
+        div {
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+        }
+      }
+}
+.wechatMsgContainerOutbound{
+    position: absolute;
+    left: 35%;
+    top: 20%;
+    background: white;
+    width: 30%;
+    text-align: left;
+}
+.wechatMsgContainerCardLayout {
+    position: absolute;
+    left: 20%;
+    top: 20%;
+    background: white;
+    width: 60%;
+    text-align: left;
+}
+.overflow-handle-preview {
+    overflow-y: auto;
+}
+.overflow-handle-preview-outbound {
+    height: 330px;
+    overflow-y: auto;
+}
+.preview-overflow-wrap-fields {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    overflow-wrap: break-word;
+    display: -webkit-box !important;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    text-align: left;
+    width: 200px;
   }

package/v2Components/TemplatePreview/WechatRichmediaTemplatePreview/messages.js

@@ -1,33 +1,33 @@
-/*
- * WechatRichmediaTemplatePreview Messages
- *
- * This contains all the text for the WechatRichmediaTemplatePreview component.
- */
-import { defineMessages } from 'react-intl';
-
-export default defineMessages({
-  header: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.header',
-    defaultMessage: 'This is the WechatRichmediaTemplatePreview component !',
-  },
-  select: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.select',
-    defaultMessage: 'Select',
-  },
-  edit: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.edit',
-    defaultMessage: 'Edit',
-  },
-  MarkAsRead: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.MarkAsRead',
-    defaultMessage: 'Mark as read',
-  },
-  reply: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.reply',
-    defaultMessage: 'Reply',
-  },
-  cancel: {
-    id: 'creatives.components.WechatRichmediaTemplatePreview.cancel',
-    defaultMessage: 'Cancel',
-  },
-});
+/*
+ * WechatRichmediaTemplatePreview Messages
+ *
+ * This contains all the text for the WechatRichmediaTemplatePreview component.
+ */
+import { defineMessages } from 'react-intl';
+
+export default defineMessages({
+  header: {
+    id: 'creatives.components.WechatRichmediaTemplatePreview.header',
+    defaultMessage: 'This is the WechatRichmediaTemplatePreview component !',
+  },
+  select: {
+    id: 'creatives.components.WechatRichmediaTemplatePreview.select',
+    defaultMessage: 'Select',
+  },
+  edit: {
+    id: 'creatives.components.WechatRichmediaTemplatePreview.edit',
+    defaultMessage: 'Edit',
+  },
+  MarkAsRead: {
+    id: 'creatives.components.WechatRichmediaTemplatePreview.MarkAsRead',
+    defaultMessage: 'Mark as read',
+  },
+  reply: {
+    id: 'creatives.components.WechatRichmediaTemplatePreview.reply',
+    defaultMessage: 'Reply',
+  },
+  cancel: {
+    id: 'creatives.components.WechatRichmediaTemplatePreview.cancel',
+    defaultMessage: 'Cancel',
+  },
+});

package/v2Components/TemplatePreview/WechatRichmediaTemplatePreview/tests/index.test.js

@@ -1,10 +1,10 @@
-// import React from 'react';
-// import { shallow } from 'enzyme';
-
-// import WechatRichmediaTemplatePreview from '../index';
-
-describe('<WechatRichmediaTemplatePreview />', () => {
-  it('Expect to have unit tests specified', () => {
-    expect(true).toEqual(false);
-  });
-});
+// import React from 'react';
+// import { shallow } from 'enzyme';
+
+// import WechatRichmediaTemplatePreview from '../index';
+
+describe('<WechatRichmediaTemplatePreview />', () => {
+  it('Expect to have unit tests specified', () => {
+    expect(true).toEqual(false);
+  });
+});