@capillarytech/creatives-library 7.17.61 → 7.17.63

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -211,7 +211,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           </CapTreeNode>
         );
         hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tagValue);
-      } else if (searchString === '' || !searchString || ((val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
+      } else if (searchString === '' || !searchString || (String(val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
         let childDisabled = true;
         if (key === CUSTOMER_BARCODE_TAG && !hasCustomerBarcodeFeatureEnabled()) {
           childDisabled = true;

package/v2Components/Ckeditor/index.js

@@ -11,6 +11,7 @@ import React from 'react';
 
 // import { FormattedMessage } from 'react-intl';
 import _ from 'lodash';
+import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 // import messages from './messages';
 const loadScript = require('load-script');
 const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
@@ -137,6 +138,8 @@ class Ckeditor extends React.Component { // eslint-disable-line react/prefer-sta
       content: "",
       editorInstance: undefined,
       setInitData: false,
+      isLoading: true,
+      scriptLoaded: false,
     };
 
     this.delayTimer = 0;
@@ -182,10 +185,14 @@ class Ckeditor extends React.Component { // eslint-disable-line react/prefer-sta
       }
     }
   }
+  onLoad = () => {
+    this.setState({ scriptLoaded: true }, () => {
+      this.initializeEditor();
+    });
+  };
 
-  onLoad() {
+  initializeEditor = () => {
     if (this.unmounting) return;
-
     
     if (!window.CKEDITOR) {
       console.error("CKEditor not found");
@@ -243,6 +250,7 @@ class Ckeditor extends React.Component { // eslint-disable-line react/prefer-sta
         this.editorInstance.on(index, event);
       });
     }
+    this.setState({ isLoading: false });
   }
 
   onFocusOut = () => {
@@ -271,11 +279,12 @@ class Ckeditor extends React.Component { // eslint-disable-line react/prefer-sta
   };
 
   render() {
-    
     return (
-      <div id={this.props.id} style={{borderRight: "1px solid #000 !important"}}>
-        <div className={this.props.activeClass} ref={(node) => (this.node = node)}/>
-      </div>
+      <CapSpin spinning={this.state.isLoading}>
+        <div id={this.props.id} style={{borderRight: "1px solid #000 !important"}}>
+          <div className={this.props.activeClass} ref={(node) => (this.node = node)}/>
+        </div>
+      </CapSpin>
     );
   }
 }

package/v2Containers/Email/index.js

@@ -2362,7 +2362,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       history: [],
     };
     if (this.state.isEdit) {
-      obj._id = this.props.Email.templateDetails._id;
+      obj._id = this.props.Email.templateDetails?._id || '';
     }
     obj.type = 'EMAIL';
     const baseLanguage = this.props.currentOrgDetails.basic_details.base_language;

package/v2Containers/Whatsapp/index.js

@@ -874,7 +874,6 @@ export const Whatsapp = (props) => {
 
   const templateMessageErrorHandler = (value) => {
     let errorMessage = false;
-    const percentSignRegex = /%/;
     if (value === '') {
       errorMessage = formatMessage(messages.emptyTemplateMessageErrorMessage);
     } else if (
@@ -882,9 +881,6 @@ export const Whatsapp = (props) => {
       TEMPLATE_MESSAGE_MAX_LENGTH
     ) {
       errorMessage = formatMessage(messages.templateMessageLengthError);
-    } else if ( host === HOST_GUPSHUP && percentSignRegex.test(value)
-    ) {
-      errorMessage = formatMessage(messages.noPercentSign);
     } else {
       const validVarArr = value.match(validVarRegex) || [];
       const validVarSet = [...new Set(validVarArr)];

package/v2Containers/Zalo/constants.js

@@ -17,6 +17,7 @@ export const DEFAULT = 'default';
 export const LIBRARY = 'library';
 export const FULL = 'full';
 export const ALL = 'all';
+export const OUTBOUND = 'outbound';
 
 const prefix = 'app/v2Containers/Zalo';
 export const ZALO_TEMPLATE_INFO_REQUEST = `${prefix}/ZALO_TEMPLATE_INFO_REQUEST`;

package/v2Containers/Zalo/index.js

@@ -35,6 +35,7 @@ import {
   TAG,
   FULL,
   ALL,
+  OUTBOUND,
   LIBRARY,
   ERROR_ALERT,
   WARNING_ALERT,
@@ -83,6 +84,7 @@ export const Zalo = (props) => {
   const {
     _id = '',
     accountId = '',
+    zaloAccountId = '',
     accountName = '',
     templateConfigs: { id = '', varMapped = {} } = {},
     token: zaloToken = '',
@@ -110,7 +112,8 @@ export const Zalo = (props) => {
         configs: { token: accessToken = '' } = {},
         name = '',
       } = selectedZaloAccount;
-      setOaId(sourceAccountIdentifier || accountId);
+      const oaId = getDefaultTags === OUTBOUND ? zaloAccountId : accountId;
+      setOaId(sourceAccountIdentifier || oaId);
       setToken(accessToken || zaloToken);
       setUsername(name || accountName);
     }
@@ -356,6 +359,9 @@ export const Zalo = (props) => {
     const payload = {
       channel: ZALO,
       accountId: oa_id,
+      ...(getDefaultTags === OUTBOUND && {
+        zaloAccountId: oa_id,
+      }),
       accountName: username,
       templateConfigs: {
         id: templateId?.toString(),