@capillarytech/creatives-library 7.17.33-alpha.9 → 7.17.34

package/containers/App/constants.js

@@ -44,4 +44,4 @@ export const HOSPITALITY_RELATED_TAGS = [
   "resID_Source",
 ];
 
-export const CUSTOMER_BAR_TAG = "customer_barcode";
+export const CUSTOMER_BARCODE_TAG = "customer_barcode";

package/package.json

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

package/utils/common.js

@@ -13,6 +13,7 @@ import {
   REGISTRATION_CUSTOM_FIELD,
   JP_LOCALE_HIDE_FEATURE,
   ENABLE_CUSTOMER_BARCODE_TAG,
+  CUSTOMER_BARCODE_TAG,
 } from '../containers/App/constants';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -95,6 +96,10 @@ export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails
     //filtering HOSPITALITY_RELATED_TAGS if org does not have HOSPITALITY_BASED_SCOPE feature enabled
     clonedTags = filterTags(HOSPITALITY_RELATED_TAGS, tagsList);
   }
+  if (!hasCustomerBarcodeFeatureEnabled()) {
+    //filtering CUSTOMER_BARCODE_TAG if org does not have CUSTOMER_BARCODE_TAG feature enabled
+    clonedTags = _.omit(clonedTags, CUSTOMER_BARCODE_TAG);
+  }
   _.forEach(clonedTags, (temp) => {
     const tag = temp.definition;
     if (!tag['tag-header']) { //if tag doesn't have subtag(s), which means this tag itself is tag and not a tag header.

package/utils/tests/cdnTransformation.test.js

@@ -6,6 +6,7 @@ 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, CUSTOMER_BAR_TAG } from '../../containers/App/constants';
+import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS, CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 import { hasCardBasedScope, hasCustomerBarcodeFeatureEnabled, hasHospitalityBasedScope } from '../../utils/common';
 
 import {
@@ -209,14 +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_BAR_TAG && !hasCustomerBarcodeFeatureEnabled()) {
+        if (key === CUSTOMER_BARCODE_TAG && !hasCustomerBarcodeFeatureEnabled()) {
           childDisabled = true;
         } else {
           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={key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
             tag={val}
             isLeaf
             key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}

package/v2Components/FormBuilder/index.js

@@ -54,6 +54,7 @@ import { convert } from 'html-to-text';
 import { AI_SUGGESTION_API_URL } from './constants';
 import { GET_TRANSLATION_MAPPED } from '../../containers/TagList/constants';
 import moment from 'moment';
+import { CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 const TabPane = Tabs.TabPane;
 const {Column} = Table;
 const {TextArea} = CapInput;
@@ -1150,7 +1151,7 @@ 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)){
+          if(tagValue === CUSTOMER_BARCODE_TAG && (matchImg === null || matchCustomerBarcode !== null)){
             ifSupported = false;
           }
         });

package/v2Containers/Email/index.js

@@ -36,6 +36,7 @@ import { FONT_COLOR_05 } from '@capillarytech/cap-ui-library/styled/variables';
 import { gtmPush } from '../../utils/gtmTrackers';
 const {CapCustomCardList} = CapCustomCard;
 import {transformEmailTemplates, storeS3FileSizeDetails, CREATIVES_S3_ASSET_FILESIZES} from '../../utils/cdnTransformation';
+import { CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 
 export class Email extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
@@ -643,7 +644,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) {
+    } else if (data === CUSTOMER_BARCODE_TAG && 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){
       this.state.editorInstanse.insertHtml(`{{${data}}}`);