@capillarytech/creatives-library 7.17.33-alpha.6 → 7.17.33-alpha.7

package/components/Ckeditor/index.js

@@ -13,7 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
+const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/containers/App/constants.js

@@ -43,4 +43,5 @@ export const HOSPITALITY_RELATED_TAGS = [
   "resID_Source",
 ];
 
-export const ENABLE_CUSTOMER_BARCODE_TAG = "ENABLE_CUSTOMER_BARCODE_TAG";
+export const ENABLE_CUSTOMER_BARCODE_TAG = "ENABLE_CUSTOMER_BARCODE_TAG";
+export const CUSTOMER_BAR_TAG = "customer_barcode";

package/package.json

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

package/utils/tests/cdnTransformation.test.js

@@ -6,7 +6,6 @@ import * as cdnTransformationHandler from './cdnTransformation.handler.mockdata'
 
 var bugsnagSpy;
 var localStorageMock;
-jest.setTimeout(10000);
 beforeEach(() => {
   localStorageMock = (function () {
     var store = {

package/v2Components/CapTagList/index.js

@@ -17,7 +17,7 @@ import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import messages from './messages';
 import { makeSelectLoyaltyPromotionDisplay } from '../../v2Containers/Cap/selectors';
-import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS, ENABLE_CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
+import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS, CUSTOMER_BAR_TAG } from '../../containers/App/constants';
 import { hasCardBasedScope, hasCustomerBarcodeFeatureEnabled, hasHospitalityBasedScope } from '../../utils/common';
 
 import {
@@ -176,7 +176,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
     const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
     const hideDateTagsForJpLocale = accessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE);
-    // const enabledCustomerBarcode = accessibleFeatures.includes(ENABLE_CUSTOMER_BARCODE_TAG);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     const customerBarcodeDisableText = <FormattedMessage {...messages.customerBarcodeDisable} />;
@@ -184,10 +183,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     if (!hasCardBasedScope()) {
       clonedTags = _.omit(clonedTags, CARD_RELATED_TAGS);
     }
-    // code to remove until barcode tag is not supported by BE
-    // if (!hasCustomerBarcodeFeatureEnabled()) {
-    //   clonedTags = _.omit(clonedTags, ENABLE_CUSTOMER_BARCODE_TAG);
-    // }
     if (!hasHospitalityBasedScope()) {
       //filtering HOSPITALITY_RELATED_TAGS if org does not have HOSPITALITY_BASED_SCOPE feature enabled
       clonedTags = _.omit(clonedTags, HOSPITALITY_RELATED_TAGS);
@@ -214,13 +209,14 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tagValue);
       } else if (searchString === '' || !searchString || ((val.name || '').toLowerCase().indexOf(searchString.toLowerCase()) !== -1)) {
         let childDisabled = true;
-        if (key === "customer_barcode" && !hasCustomerBarcodeFeatureEnabled) {
+        if (key === CUSTOMER_BAR_TAG && !hasCustomerBarcodeFeatureEnabled()) {
           childDisabled = true;
-        } 
-        else childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
+        } else {
+          childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
+        }
         const tempNode = (
           <CapTreeNode
-            title={childDisabled ? <CapTooltip title={key === "customer_barcode" ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)} //need to add key name to get tooltip
+            title={childDisabled ? <CapTooltip title={key === CUSTOMER_BAR_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
             tag={val}
             isLeaf
             key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}

package/v2Components/Ckeditor/index.js

@@ -13,8 +13,7 @@ import React from 'react';
 import _ from 'lodash';
 // import messages from './messages';
 const loadScript = require('load-script');
-const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`;
-//const defaultScriptUrl = 'https://nightly.intouch.capillarytech.com/arya/ui/library/ckeditor/ckeditor.js';
+const defaultScriptUrl = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/ckeditor.js";
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/v2Components/FormBuilder/index.js

@@ -1136,9 +1136,13 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           }
         });
       });
-      const regex = /{{[(A-Z\w+(\s\w+)*$\(\)@!#$%^&*~.,/\\]+}}/g;
+      const regex = /{{[(A-Z\w\(\)@!#$%^&*~.,/\\]+}}/g;
       let match = regex.exec(content);
-      while (match !== null) {
+      const regexImgSrc=/<img[^>]*\bsrc\s*=\s*"[^"]*{{customer_barcode}}[^"]*"/;
+      let matchImg = regexImgSrc.exec(content);
+      const regexCustomerBarcode = /{{customer_barcode}}(?![^<]*>)/g;
+      let matchCustomerBarcode = regexCustomerBarcode.exec(content);
+      while (match !== null ) {
         const tagValue = match[0].substring(this.indexOfEnd(match[0], '{{'), match[0].indexOf('}}'));
         match = regex.exec(content);
         let ifSupported = false;
@@ -1146,6 +1150,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           if (tag.definition.value === tagValue) {
             ifSupported = true;
           }
+          if(tagValue === "customer_barcode" && (matchImg === null || matchCustomerBarcode !== null)){
+            ifSupported = false;
+          }
         });
         const ifSkipped = this.skipTags(tagValue);
         if (ifSkipped) {

package/v2Containers/App/constants.js

@@ -118,4 +118,3 @@ export const LOYALTY = 'loyalty';
 export const FAILURE = 'FAILURE';
 export const DATE_DISPLAY_FORMAT = 'D MMM YYYY';
 export const TIME_DISPLAY_FORMAT = 'hh:mm A';
-export const ENABLE_CUSTOMER_BARCODE_TAG = 'ENABLE_CUSTOMER_BARCODE_TAG';