@capillarytech/creatives-library 7.17.24 → 7.17.26-alpha.0

package/package.json

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

package/utils/common.js

@@ -282,16 +282,13 @@ export const isTraiDLTEnable = (isFullMode, smsRegister) => {
   return isTraiDltFeature;
 };
 
-export const intlKeyGenerator = (value = "") => {
-  return value.replace(/[^a-zA-Z0-9_]/g, "");
-};
+export const intlKeyGenerator = (value = "") => String(value).replace(/[^a-zA-Z0-9_]/g, "");
 
 export const handleInjectedData = (data, scope) => {
-  const temp = _.cloneDeep(data);
   let tagType;
-  for (const tagKey in temp) {
-    if (temp.hasOwnProperty(tagKey)) {
-      const tag = temp[tagKey];
+  for (const tagKey in data) {
+    if (data.hasOwnProperty(tagKey)) {
+      const tag = data[tagKey];
 
       if (tag?.name === REGISTRATION_CUSTOM_FIELD) {
         tagType = CUSTOM_TAG;
@@ -300,19 +297,19 @@ export const handleInjectedData = (data, scope) => {
       }
 
       if (tag?.name) {
-        const name = tag?.name;
+        const name = tag.name;
         const key = intlKeyGenerator(name);
         const id = tagType
           ? `${scope}.${key}_name.${tagType}`
           : `${scope}.${key}`;
 
-        tag["name"] = apiMessageFormatHandler(id, name);
+        tag.name = apiMessageFormatHandler(id, name);
       }
 
       if (tag?.subtags) {
         for (const subtagKey in tag.subtags) {
-          if (tag["subtags"].hasOwnProperty(subtagKey)) {
-            const subtag = tag["subtags"][subtagKey];
+          if (tag.subtags.hasOwnProperty(subtagKey)) {
+            const subtag = tag.subtags[subtagKey];
             if (subtag?.name) {
               const name = subtag?.name;
               const key = intlKeyGenerator(name);
@@ -320,7 +317,7 @@ export const handleInjectedData = (data, scope) => {
                 ? `${scope}.${key}_name.${tagType}`
                 : `${scope}.${key}`;
 
-              subtag["name"] = apiMessageFormatHandler(id, name);
+              subtag.name = apiMessageFormatHandler(id, name);
             }
             if (subtag?.desc) {
               const desc = subtag?.desc;
@@ -329,7 +326,7 @@ export const handleInjectedData = (data, scope) => {
                 ? `${scope}.${key}_desc.${tagType}`
                 : `${scope}.${key}`;
 
-              subtag["desc"] = apiMessageFormatHandler(id, desc);
+              subtag.desc = apiMessageFormatHandler(id, desc);
             }
           }
         }
@@ -337,5 +334,5 @@ export const handleInjectedData = (data, scope) => {
       tagType = "";
     }
   }
-  return temp;
+  return data;
 };

package/v2Components/CapTagList/index.js

@@ -25,7 +25,7 @@ import {
   JAPANESE_HELP_TEXT,
   TAG_TRANSLATION_DOC,
 } from "../../containers/TagList/constants";
-import { HIDE_ENGAGEMENT_CHANNELS } from '../../v2Containers/App/constants';
+import { HIDE_FOR_JP_LOCALE } from '../../v2Containers/App/constants';
 import { hidingDateTagsForJpLocale } from '../../v2Containers/TagList/utils';
 
 
@@ -175,7 +175,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   renderTags(tags, searchString = '') {
     const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
     const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
-    const hideDateTagsForJpLocale = accessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS);
+    const hideDateTagsForJpLocale = accessibleFeatures.includes(HIDE_FOR_JP_LOCALE);
     const list = [];
     const loyaltyAttrDisableText = <FormattedMessage {...messages.loyaltyAttributeDisable} />;
     let clonedTags = _.cloneDeep(tags);

package/v2Containers/App/constants.js

@@ -54,7 +54,7 @@ export const LINE = 'line';
 export const EMAIL = 'email';
 export const ASSETS = 'assets';
 
-export const HIDE_ENGAGEMENT_CHANNELS = 'HIDE_ENGAGEMENT_CHANNELS';
+export const HIDE_FOR_JP_LOCALE = 'HIDE_FOR_JP_LOCALE';
 
 export const TRACK_EDIT_SMS = 'editSms';
 export const TRACK_EDIT_EMAIL = 'editEmail';

package/v2Containers/TagList/index.js

@@ -20,17 +20,18 @@ import * as globalActions from '../Cap/actions';
 import CapTagList from '../../v2Components/CapTagList';
 import './_tagList.scss';
 import { selectCurrentOrgDetails } from '../Cap/selectors';
-const TreeNode = Tree.TreeNode;
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
 import { handleInjectedData } from '../../utils/common';
 
+const TreeNode = Tree.TreeNode;
+
 export class TagList extends React.Component { // eslint-disable-line react/prefer-stateless-function
   constructor(props) {
     super(props);
     this.state = {
       loading: false,
-      tags: []
+      tags: [],
     };
     this.renderTags = this.renderTags.bind(this);
     this.populateTags = this.populateTags.bind(this);
@@ -40,35 +41,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
 
   componentDidMount() {
-    
-  }
-
-  componentDidUpdate(prevProps) {
-    if (this.props.tags !== prevProps.tags || this.props.injectedTags !== prevProps.injectedTags || this.props.selectedOfferDetails !== prevProps.selectedOfferDetails) {
-      this.setState({
-        tags: this.generateTags(this.props),
-      });
-    }
-  }
-
-  generateTags(props) {
-    let tags = {};
-    let injectedTags = {};
-    if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
-      const formattedInjectedTags = handleInjectedData(
-        props.injectedTags,
-        scope
-      );
-      injectedTags = this.transformInjectedTags(formattedInjectedTags);
-    }
-    if (props.tags && props.tags.length > 0) {
-      tags = this.populateTags(props.tags);
-      console.log('populating tags', Object.keys(tags || {}).length);
-    }
-    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) && (tags && tags.coupon)) {
-      this.transformCouponTags(props.selectedOfferDetails, tags);
-    }
-    return _.merge( {}, tags, injectedTags);
+    this.generateTags(this.props);
   }
 
   componentWillReceiveProps(nextProps) {
@@ -76,33 +49,52 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       this.setState({loading: true});
     }
     if (!_.isEqual(nextProps.injectedTags, this.props.injectedTags)) {
-      
+
       this.setState({loading: false});
     }
     if (!_.isEqual(nextProps.tags, this.props.tags)) {
-      
+
       this.setState({loading: false});
     }
 
   }
-
+  componentDidUpdate(prevProps) {
+    if (this.props.tags !== prevProps.tags || this.props.injectedTags !== prevProps.injectedTags || this.props.selectedOfferDetails !== prevProps.selectedOfferDetails) {
+      this.generateTags(this.props);
+    }
+  }
   onSelect = (selectedKeys) => {
     this.props.onTagSelect(selectedKeys[0]);
   };
 
   onClick = (e, data) => {
-    
+
   };
 
   getTagsforContext = (data) => {
     //this.setState({loading: true});
     this.props.onContextChange(data);
   }
-
+  generateTags = (props) => {
+    let tags = {};
+    let injectedTags = {};
+    if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
+      const formattedInjectedTags = handleInjectedData(
+        props.injectedTags,
+        scope
+      );
+      injectedTags = this.transformInjectedTags(formattedInjectedTags);
+    }
+    if (props.tags && props.tags.length > 0) {
+      tags = this.populateTags(props.tags);
+    }
+    if (props.selectedOfferDetails && !_.isEmpty(props.selectedOfferDetails) && (tags && tags.coupon)) {
+      this.transformCouponTags(props.selectedOfferDetails, tags);
+    }
+    this.setState({tags: _.merge( {}, tags, injectedTags)});
+  }
   populateTags(tagsList) {
-    console.log('populating tags', (tagsList || []).length);
     const mainTags = {};
-
     //Form tags object with tag headers
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
@@ -115,7 +107,6 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
       } else if (tag['tag-header'] && mainTags[tag.value]) {
         mainTags[tag.value].subtags = _.concat(mainTags[tag.value].subtags, tag.subtags);
       } else if (!mainTags[tag.value]) {
-        // 
         mainTags[tag.value] = {
           'tag-header': true,
           "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,

package/v2Containers/TemplatesV2/index.js

@@ -29,7 +29,7 @@ import FTP from '../FTP';
 import Gallery from '../Assets/Gallery';
 import withStyles from '../../hoc/withStyles';
 import styles, { CapTabStyle } from './TemplatesV2.style';
-import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, HIDE_ENGAGEMENT_CHANNELS } from '../App/constants';
+import { CREATIVES_UI_VIEW, LOYALTY, WHATSAPP, RCS, LINE, EMAIL, ASSETS, HIDE_FOR_JP_LOCALE } from '../App/constants';
 import AccessForbidden from '../../v2Components/AccessForbidden';
 import { getObjFromQueryParams } from '../../utils/v2common';
 import { selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
@@ -119,8 +119,8 @@ export class TemplatesV2 extends React.Component { // eslint-disable-line react/
     const { accessibleFeatures = [] } = currentOrgDetails || {};
     // This data will be available when it will be accessed in library mode
     const { currentOrgDetails: { accessibleFeatures: libModeAccessibleFeatures = [] } = {} } = cap || {};
-    const hideEngagementChannel = accessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS) || libModeAccessibleFeatures.includes(HIDE_ENGAGEMENT_CHANNELS);
-    // Show only line and email channel content with both channel tabs if the HIDE_ENGAGEMENT_CHANNELS feature is enabled;
+    const hideEngagementChannel = accessibleFeatures.includes(HIDE_FOR_JP_LOCALE) || libModeAccessibleFeatures.includes(HIDE_FOR_JP_LOCALE);
+    // Show only line and email channel content with both channel tabs if the HIDE_FOR_JP_LOCALE feature is enabled;
     filteredPanes = hideEngagementChannel ? filteredPanes?.filter((pane) => [EMAIL, LINE, ASSETS].includes(pane?.key) && pane) : filteredPanes;
     defaultChannel = hideEngagementChannel ? EMAIL : defaultChannel;
 

package/v2Containers/TemplatesV2/tests/mockData.js

@@ -599,7 +599,7 @@ export const authData = {
       "ENABLE_PRODUCT_SUPPORT_VIDEOS",
       "ENABLE_RANDOM_COUPON_CODE",
       "HIDE_DEFAULT_EMAIL_TEMPLATES",
-      "HIDE_ENGAGEMENT_CHANNELS",
+      "HIDE_FOR_JP_LOCALE",
     ],
     org_loyalty_v2_status: true,
     module_details: [
@@ -680,6 +680,6 @@ export const currentOrgDetails = {
     "JOURNEY_UI",
     "LOYALTY_PROMOTION_ENABLED",
     "HIDE_DEFAULT_EMAIL_TEMPLATES",
-    "HIDE_ENGAGEMENT_CHANNELS",
+    "HIDE_FOR_JP_LOCALE",
   ],
 };