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

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",
 ];
+
+export const ENABLE_CUSTOMER_BARCODE_TAG = "ENABLE_CUSTOMER_BARCODE_TAG";

package/package.json

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

package/utils/common.js

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

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,15 +17,15 @@ 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 { hasCardBasedScope, hasHospitalityBasedScope } from '../../utils/common';
+import { CARD_RELATED_TAGS, HOSPITALITY_RELATED_TAGS, ENABLE_CUSTOMER_BARCODE_TAG } from '../../containers/App/constants';
+import { hasCardBasedScope, hasCustomerBarcodeFeatureEnabled, hasHospitalityBasedScope } from '../../utils/common';
 
 import {
   GET_TRANSLATION_MAPPED,
   JAPANESE_HELP_TEXT,
   TAG_TRANSLATION_DOC,
 } from "../../containers/TagList/constants";
-import { ENABLE_CUSTOMER_BARCODE_TAG, JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
+import { JP_LOCALE_HIDE_FEATURE } from '../../v2Containers/App/constants';
 import { hidingDateTagsForJpLocale } from '../../v2Containers/TagList/utils';
 
 
@@ -176,8 +176,7 @@ 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);
-    console.log("enabled-->", accessibleFeatures, enabledCustomerBarcode);
+    // const enabledCustomerBarcode = accessibleFeatures.includes(ENABLE_CUSTOMER_BARCODE_TAG);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     const customerBarcodeDisableText = <FormattedMessage {...messages.customerBarcodeDisable} />;
@@ -215,11 +214,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_barcode" && !enabledCustomerBarcode) {
+        if (key === "customer_barcode" && !hasCustomerBarcodeFeatureEnabled) {
           childDisabled = true;
         } 
         else childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
-        console.log("child", childDisabled);
         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

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 = 'https://nightly.intouch.capillarytech.com/arya/ui/library/ckeditor/ckeditor.js';
 const user = localStorage.getItem('user');
 let locale = 'en';
 if (user && JSON.parse(user).lang) {