@capillarytech/creatives-library 7.5.0 → 7.5.2

package/containers/Assets/Gallery/index.js

@@ -91,7 +91,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     if (!this.props.Gallery.fetchingAllAssets && !_.isEmpty(this.props.Gallery.assetList) && this.props.Gallery.assetList[0] && this.props.Gallery.assetList[0].totalCount && this.state.totalCount === 0) {
       this.setState({totalCount: this.props.Gallery.assetList[0].totalCount});
     }
-    if ( !_.isEqual(nextProps.Gallery.uploadAssetSuccess, this.props.Gallery.uploadAssetSuccess) && !nextProps.Gallery.uploadAssetSuccess && !nextProps.Gallery.assetUploading) {
+    if ( !_.isEqual(nextProps.Gallery.assetUploading, this.props.Gallery.assetUploading) && !nextProps.Gallery.uploadAssetSuccess && !nextProps.Gallery.assetUploading) {
       const message = getMessageObject('error', this.props.intl.formatMessage(messages.assetUploadFailed), true);
       this.props.globalActions.addMessageToQueue(message);
     }

package/package.json

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

package/utils/smsCharCountV2.js

@@ -70,47 +70,35 @@ export function updateCharCount(content = '', isUnicodeEnabled) {
   const noOfOptout = (content.match(optoutTag) || []).length;
   content = showOptoutCount ? content.replace(optoutTag, "") : content;
   var chars_arr = contentOriginal.split("");
+  var chars_arr_optedOut = content.split("");
   var coding = '7bit';
   var parts = 1;
-  var part = 1;
   var chars_used = 0;
   var chars_sms = 160;
-  var sms_parts_container = [];
   var partc = [];
-  for (let i = 0; i < chars_arr.length; i++) {
-    if (charset7bit.indexOf(chars_arr[i]) >= 0) {
+  for (let i = 0; i < chars_arr_optedOut.length; i++) {
+    if (charset7bit.indexOf(chars_arr_optedOut[i]) >= 0) {
       chars_used = chars_used + 1;
-    } else if (charset7bitext.indexOf(chars_arr[i]) >= 0) {
+    } else if (charset7bitext.indexOf(chars_arr_optedOut[i]) >= 0) {
       chars_used = chars_used + 2;
     } else {
       coding = '16bit';
-      chars_used = chars_arr.length;
+      chars_used = chars_arr_optedOut.length;
       break;
     }
   }
-  chars_used = showOptoutCount && optoutUrl && optoutUrl.length ? (chars_used + (((optoutUrl && optoutUrl.length) || 0) * noOfOptout) - (optoutTagLength * noOfOptout)) : chars_used;
+  chars_used = showOptoutCount && optoutUrl && optoutUrl.length ? (chars_used + ((optoutUrl && optoutUrl.length) || 0) * noOfOptout) : chars_used + optoutTagLength;
   if (coding == '7bit') {
     if (chars_used > 160) {
       var parts = Math.ceil(chars_used / 153);
       var part_chars_used = 7;
       chars_sms = 153;
       for (let i = 0; i < chars_arr.length; i++) {
-        if (part_chars_used + 1 > 160) {
-          part = part + 1;
-          part_chars_used = 7;
-          sms_parts_container.push(partc);
-        }
-        if (charset7bitext.indexOf(chars_arr[i]) >= 0 && part_chars_used + 2 > 160) {
-          part = part + 1;
+        if (part_chars_used + 1 > 160 || (charset7bitext.indexOf(chars_arr[i]) >= 0 && part_chars_used + 2 > 160)) {
           part_chars_used = 7;
-          sms_parts_container.push(partc);
         }
         partc = [...partc, charToSpan(chars_arr[i], coding, isUnicodeEnabled)];
-        if (charset7bitext.indexOf(chars_arr[i]) == -1) {
-          part_chars_used = part_chars_used + 1;
-        } else {
-          part_chars_used = part_chars_used + 2;
-        }
+        part_chars_used = charset7bitext.indexOf(chars_arr[i]) == -1 ? part_chars_used + 1 : part_chars_used + 2;
       }
     } else {
       chars_sms = 160;
@@ -125,7 +113,6 @@ export function updateCharCount(content = '', isUnicodeEnabled) {
       chars_sms = 67;
       for (let i = 0; i < chars_arr.length; i++) {
         if (part_chars_used + 1 > 70) {
-          part = part + 1;
           part_chars_used = 3;
         }
         partc = [...partc, charToSpan(chars_arr[i], coding, isUnicodeEnabled)];

package/v2Components/FormBuilder/index.js

@@ -2712,6 +2712,14 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
     );
   }
 
+  checkBeeEditorAllowedForLibrary = () => {
+    const { isFullMode = false, editor } = this.props || {};
+    if ((editor === "BEE" && !isFullMode) || isFullMode) {
+      return true;
+    }
+    return false;
+  }
+
   renderMultiColSection(section, childIndex) {
     const fields = [];
     let contentSections = [];
@@ -2956,7 +2964,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
             }
             const langIndex = 0;
             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;
-            if (!(_.get(this.state, `formData[${this.state.currentTab - 1}][${currentLang}].is_drag_drop`, false)) || channel !== 'EMAIL') {
+            const isBEEAppEnable = this.checkBeeEditorAllowedForLibrary();
+
+            if (!(_.get(this.state, `formData[${this.state.currentTab - 1}][${currentLang}].is_drag_drop`, false)) || isBEEAppEnable === false || channel !== 'EMAIL') {
               columns.push(
                 <CapColumn key={`input-${val.id}`} offset={val.offset} span={val.width ? val.width : ''} style={val.style ? val.style : {marginBottom: '16px'}}>
                   <TagList

package/v2Containers/Assets/Gallery/index.js

@@ -86,7 +86,7 @@ export class Gallery extends React.Component { // eslint-disable-line react/pref
     if (!this.props.Gallery.fetchingAllAssets && !_.isEmpty(this.props.Gallery.assetList) && this.props.Gallery.assetList[0] && this.props.Gallery.assetList[0].totalCount && this.state.totalCount === 0) {
       this.setState({totalCount: this.props.Gallery.assetList[0].totalCount});
     }
-    if ( !_.isEqual(nextProps.Gallery.uploadAssetSuccess, this.props.Gallery.uploadAssetSuccess) && !nextProps.Gallery.uploadAssetSuccess && !nextProps.Gallery.assetUploading) {
+    if ( !_.isEqual(nextProps.Gallery.assetUploading, this.props.Gallery.assetUploading) && !nextProps.Gallery.uploadAssetSuccess && !nextProps.Gallery.assetUploading) {
       const message = getMessageObject('error', this.props.intl.formatMessage(messages.assetUploadFailed), true);
       this.props.globalActions.addMessageToQueue(message);
     }

package/v2Containers/Email/index.js

@@ -2689,6 +2689,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
             <Col>
               { !_.isEmpty(schema) && (this.state.formData[0] || this.state.formData["0"]) ?
                 <FormBuilder
+                  editor={this.props.editor}
                   isFullMode={this.props.isFullMode}
                   schema={schema}
                   onSubmit={this.saveFormData}

package/v2Containers/Templates/index.js

@@ -360,7 +360,9 @@ export class Templates extends React.Component { // eslint-disable-line react/pr
 
     if (nextProps.Create && this.props.Create && nextProps.Create.createTemplateError && !isEqual(nextProps.Create.createTemplateError, this.props.Create.createTemplateError)) {
       const message = this.props.intl.formatMessage(messages.somethingWentWrong);
-      CapNotification.error({key: 'somethingWrong', message});
+      if ((this.state.channel || '').toLowerCase() !== "sms") {
+        CapNotification.error({key: 'somethingWrong', message});
+      }
       if ( this.state.channel) {
         if (this.state.channel.toLowerCase() === "sms") {
           this.props.smsActions.clearCreateResponse();