@capillarytech/creatives-library 7.17.32 → 7.17.33-alpha.1

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 = "https://storage.crm.n.content-cdn.io/ckeditor_full/ckeditor/ckeditor.js";
+const defaultScriptUrl = `${window.location.origin}/arya/ui/library/ckeditor/ckeditor.js`; 
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {

package/containers/App/constants.js

@@ -42,3 +42,5 @@ export const HOSPITALITY_RELATED_TAGS = [
   "email",
   "resID_Source",
 ];
+
+const CUSTOMER_BARCODE_TAG = "customer_barcode";

package/package.json

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

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 } from '../../containers/App/constants';
+import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS, CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
 import { hasCardBasedScope, hasHospitalityBasedScope } from '../../utils/common';
 
 import {
@@ -25,7 +25,7 @@ import {
   JAPANESE_HELP_TEXT,
   TAG_TRANSLATION_DOC,
 } from "../../containers/TagList/constants";
-import { JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
+import { ENABLE_CUSTOMER_BARCODE_TAG, JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
 import { hidingDateTagsForJpLocale } from '../../v2Containers/TagList/utils';
 
 
@@ -176,12 +176,18 @@ 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} />;
     let clonedTags = _.cloneDeep(tags);
     if (!hasCardBasedScope()) {
       clonedTags = _.omit(clonedTags, CARD_RELATED_TAGS);
     }
+    //code to remove until barcode tag is not supported by BE
+    // if (!hasCardBasedScope()) {
+    //   clonedTags = _.omit(clonedTags, 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);
@@ -207,10 +213,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)) {
-        const childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
+        let childDisabled = true;
+        if (key === "customer_barcode" && !enabledCustomerBarcode) {
+          childDisabled = true;
+        } 
+        else childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         const tempNode = (
           <CapTreeNode
-            title={childDisabled ? <CapTooltip title={loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
+            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
             tag={val}
             isLeaf
             key={val.couponSeriesId ? `${key}(${val.couponSeriesId})` : `${key}`}

package/v2Components/CapTagList/messages.js

@@ -46,4 +46,8 @@ 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/Ckeditor/index.js

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

package/v2Containers/App/constants.js

@@ -118,3 +118,4 @@ 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';

package/v2Containers/Email/index.js

@@ -643,7 +643,9 @@ 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 (this.state.editorInstanse) {
+    } 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){
       this.state.editorInstanse.insertHtml(`{{${data}}}`);
     }
       //this.resetCkEditorInstance(currentTab, formData, true, data);