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

package/containers/App/constants.js

@@ -42,6 +42,3 @@ export const HOSPITALITY_RELATED_TAGS = [
   "email",
   "resID_Source",
 ];
-
-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.7",
+  "version": "7.17.33",
   "description": "Capillary creatives ui",
   "main": "./index.js",
   "module": "./index.es.js",

package/utils/common.js

@@ -12,7 +12,6 @@ import {
   CUSTOM_TAG,
   REGISTRATION_CUSTOM_FIELD,
   JP_LOCALE_HIDE_FEATURE,
-  ENABLE_CUSTOMER_BARCODE_TAG,
 } from '../containers/App/constants';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -72,11 +71,6 @@ export const hasJPLocaleHideFeatureEnabled = Auth.hasFeatureAccess.bind(
   JP_LOCALE_HIDE_FEATURE,
 );
 
-export const hasCustomerBarcodeFeatureEnabled = Auth.hasFeatureAccess.bind(
-  null,
-  ENABLE_CUSTOMER_BARCODE_TAG,
-);
-
 //filtering tags based on scope
 export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
     (tag) => !tagsToFilter?.includes(tag?.definition?.value)

package/v2Components/CapTagList/index.js

@@ -17,8 +17,8 @@ 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, CUSTOMER_BAR_TAG } from '../../containers/App/constants';
-import { hasCardBasedScope, hasCustomerBarcodeFeatureEnabled, hasHospitalityBasedScope } from '../../utils/common';
+import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS } from '../../containers/App/constants';
+import { hasCardBasedScope, hasHospitalityBasedScope } from '../../utils/common';
 
 import {
   GET_TRANSLATION_MAPPED,
@@ -178,7 +178,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     const hideDateTagsForJpLocale = accessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
-    const customerBarcodeDisableText = <FormattedMessage {...messages.customerBarcodeDisable} />;
     let clonedTags = _.cloneDeep(tags);
     if (!hasCardBasedScope()) {
       clonedTags = _.omit(clonedTags, CARD_RELATED_TAGS);
@@ -208,15 +207,10 @@ 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_BAR_TAG && !hasCustomerBarcodeFeatureEnabled()) {
-          childDisabled = true;
-        } else {
-          childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
-        }
+        const childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         const tempNode = (
           <CapTreeNode
-            title={childDisabled ? <CapTooltip title={key === CUSTOMER_BAR_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
+            title={childDisabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
             tag={val}
             isLeaf
             key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}

package/v2Components/CapTagList/messages.js

@@ -46,8 +46,4 @@ export default defineMessages({
     id: `creatives.componentsV2.CapTagList.loyaltyAttributeDisable`,
     defaultMessage: 'You won’t be able to add loyalty related attributes since the loyalty program/ card series is None.',
   },
-  "customerBarcodeDisable": {
-    id: `creatives.componentsV2.CapTagList.customerBarcodeDisable`,
-    defaultMessage: 'This label is not enabled for your organization. Please connect with your Capillary POC',
-  },
 });

package/v2Components/FormBuilder/index.js

@@ -1136,13 +1136,9 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
           }
         });
       });
-      const regex = /{{[(A-Z\w\(\)@!#$%^&*~.,/\\]+}}/g;
+      const regex = /{{[(A-Z\w+(\s\w+)*$\(\)@!#$%^&*~.,/\\]+}}/g;
       let match = regex.exec(content);
-      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 ) {
+      while (match !== null) {
         const tagValue = match[0].substring(this.indexOfEnd(match[0], '{{'), match[0].indexOf('}}'));
         match = regex.exec(content);
         let ifSupported = false;
@@ -1150,9 +1146,6 @@ 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/Email/index.js

@@ -643,9 +643,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
     } else if (data === "unsubscribe" && this.state.editorInstanse) {
       const anchor = `<a href='{{${data}}}'>${data}</a>`;
       this.state.editorInstanse.insertHtml(`${anchor}`);
-    } else if (data === "customer_barcode" && this.state.editorInstanse) {
-      this.state.editorInstanse.insertHtml(`<img src="https://crm-nightly-new-fileservice.s3.amazonaws.com/intouch_creative_assets/8ebc8301-e262-45a6-bdab-ff0de91a.png?code={{${data}}}" />`);
-    } else if (this.state.editorInstanse){
+    } else if (this.state.editorInstanse) {
       this.state.editorInstanse.insertHtml(`{{${data}}}`);
     }
       //this.resetCkEditorInstance(currentTab, formData, true, data);