@capillarytech/creatives-library 7.9.11 → 7.9.13

package/package.json

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

package/v2Components/Ckeditor/index.js

@@ -205,7 +205,27 @@ class Ckeditor extends React.Component { // eslint-disable-line react/prefer-sta
     //this.editorInstance.name = this.id;
 
     //Register listener for custom events if any
-    this.editorInstance.on('change', this.handleContentChange);
+    // this.editorInstance.on('change', this.handleContentChange);
+
+    // mode event is fired whenever mode is toggled from normal to source mode or vice versa
+    // change event works only in wysiwyg(non-source) mode, key event works in both source & wysiwyg(non-source) mode but, 
+    // key event doesn't get fired up while setting text to bold,italic etc..
+    this.editorInstance.on('mode',()=>{
+      if(this.editorInstance.mode==="source"){
+        this.editorInstance.on('key',this.handleContentChange)
+      }
+      else{
+        if(this.editorInstance.hasListeners("key")){
+          /*Removing the 'key' listener is necessary. If not removed and the mode is switched in the following manner :
+          source mode -> Non-source mode -> source mode,
+          then under this scenario both 'key' and 'change' listener will get fired on entering text. Except that 'key' listener will not get fired when setting text to 'bold', 'italic' etc.  
+          */
+          this.editorInstance.removeListener("key",this.handleContentChange)
+        }
+        this.editorInstance.on('change',this.handleContentChange)
+      }
+    })
+
     _.forEach(this.props.events, (event, index) => {
       this.editorInstance.on(index, event);
     });

package/v2Containers/Cap/constants.js

@@ -11,9 +11,9 @@ export const LOGOUT_SUCCESS_V2 = 'cap/LOGOUT_SUCCESS_V2';
 export const LOGOUT_FAILURE_V2 = 'cap/LOGOUT_FAILURE_V2';
 export const ADD_MESSAGE = 'cap/ADD_MESSAGE';
 export const REMOVE_MESSAGE = 'cap/REMOVE_MESSAGE';
-export const GET_USER_DATA_REQUEST = 'cap/GET_USER_DATA_REQUEST';
-export const GET_USER_DATA_SUCCESS = 'cap/GET_USER_DATA_SUCCESS';
-export const GET_USER_DATA_FAILURE = 'cap/GET_USER_DATA_FAILURE';
+export const GET_USER_DATA_REQUEST = 'cap/GET_USER_DATA_REQUEST_V2';
+export const GET_USER_DATA_SUCCESS = 'cap/GET_USER_DATA_SUCCESS_V2';
+export const GET_USER_DATA_FAILURE = 'cap/GET_USER_DATA_FAILURE_V2';
 
 export const GET_SCHEMA_FOR_ENTITY_FAILURE = 'cap/GET_SCHEMA_FOR_ENTITY_FAILURE';
 export const GET_SCHEMA_FOR_ENTITY_REQUEST = 'cap/GET_SCHEMA_FOR_ENTITY_REQUEST';

package/v2Containers/CreativesContainer/SlideBoxContent.js

@@ -214,14 +214,15 @@ function SlideBoxContent(props) {
           stickerId,
           packageId,
           baseUrl,
-          video: {
+          video,
+          template,
+        }) => {
+          const {
             originalContentUrl,
             externalLink: {
               linkUri,
             } = {},
-          } = {},
-          template,
-        }) => {
+          } = video || {};
           const previewContent = {};
           previewContent.messageContent = text;
           previewContent.previewImageUrl = previewImageUrl;

package/v2Containers/Email/index.js

@@ -2179,7 +2179,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     } else {
       this.setState({injectedTags: data.tags});
     }
-    data.tags && this.props.globalActions.setInjectedTags(data.tags);
+    this.props.globalActions.setInjectedTags(data.tags);
   }
 
   startLoading = (ifEdit) => {

package/v2Containers/Templates/index.js

@@ -810,7 +810,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
       { [WECHAT, MOBILE_PUSH].includes(currentChannel) && this.showAccountName() }
       {filterContent}
       <CapSpin spinning={isLoading} tip={loadingTip} style={{width: '100%'}}>
-        {!isLoading && <div>
+        {<div>
           {!isEmpty(filteredTemplates) || !isEmpty(this.state.searchText) || !isEmpty(this.props.Templates.templateError) ? (
             <div className={!isEmpty(this.state.searchText) && isEmpty(cardDataList) ? '' : "pagination-container"}>
               <CapCustomCardList
@@ -821,7 +821,7 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
                 fbType={"list"}
                 />
             </div>)
-            : ['sms', "email"].includes(this.state.channel.toLowerCase()) && <CapIllustration buttonClassName={`create-new-${channelLowerCase}`} {...this.getChannelTypeIllustrationInfo(currentChannel)} />
+            : ['sms', "email"].includes(this.state.channel.toLowerCase()) && !isLoading && <CapIllustration buttonClassName={`create-new-${channelLowerCase}`} {...this.getChannelTypeIllustrationInfo(currentChannel)} />
           }
 
           {(this.state.selectedAccount === '' && isEmpty(this.props.Templates.selectedWeChatAccount)) && (this.state.channel.toLowerCase() === 'wechat' || this.state.channel.toLowerCase() === "mobilepush") &&