@capillarytech/creatives-library 7.17.46-alpha.0 → 7.17.46

package/components/CapTagList/index.js

@@ -182,8 +182,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           visible={this.state.visible}
           onVisibleChange={this.togglePopoverVisibility}
           content={<div>
-            <Spin tip="Getting tags..." spinning={this.props.loading}>
-              <Search style={{ marginBottom: 8, width: '250px'}} placeholder={this.props.intl.formatMessage(messages.searchText)} onChange={this.onChange} />
+            <Spin tip={this.props?.intl?.formatMessage(messages.gettingTags)} spinning={this.props.loading}>
+              <Search style={{ marginBottom: 8, width: '250px'}} placeholder={this.props?.intl?.formatMessage(messages.searchText)} onChange={this.onChange} />
               {this.props.moduleFilterEnabled ? <CapSelect getPopupContainer={(triggerNode) => triggerNode.parentNode} style={{width: '250px', marginBottom: '16px', minWidth: 'initial', display: 'inherit'}} onChange={this.props.onContextChange} defaultValue="All" options={options}>
               </CapSelect> : ''}
               <Tree

package/components/CapTagList/messages.js

@@ -38,4 +38,8 @@ export default defineMessages({
     id: 'creatives.components.CapTagList.searchText',
     defaultMessage: 'Search',
   },
+  "gettingTags": {
+    id: 'creatives.components.CapTagList.gettingTags',
+    defaultMessage: "Getting tags...",
+  },
 });

package/package.json

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

package/utils/common.js

@@ -15,8 +15,6 @@ import {
   REGISTRATION_CUSTOM_FIELD,
   JP_LOCALE_HIDE_FEATURE,
   ENABLE_CUSTOMER_BARCODE_TAG,
-  PROMO_ENGINE_RELATED_TAGS,
-  GIFT_VOUCHER_RELATED_TAGS,
 } from '../containers/App/constants';
 import { apiMessageFormatHandler } from './commonUtils';
 
@@ -97,25 +95,16 @@ export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(
 export function getTreeStructuredTags({tagsList, userLocale = 'en', offerDetails = [], disableTagsDetails = {}}) {
   const mainTags = {};
   const { disableRelatedTags, childTagsToDisable, parentTagstoDisable} = disableTagsDetails;
-  const excludedTagList = [];
 
+  let clonedTags = tagsList;
   if (!hasCardBasedScope()) {
-    excludedTagList.push(CARD_RELATED_TAGS);
+    //filtering CARD_RELATED_TAGS if org does not have CARD_BASED_SCOPE feature enabled
+    clonedTags = filterTags(CARD_RELATED_TAGS, tagsList);
   }
-
   if (!hasHospitalityBasedScope()) {
-    excludedTagList.push(HOSPITALITY_RELATED_TAGS);
-  }
-
-  if (!hasPromoFeature()) {
-    excludedTagList.push(PROMO_ENGINE_RELATED_TAGS);
+    //filtering HOSPITALITY_RELATED_TAGS if org does not have HOSPITALITY_BASED_SCOPE feature enabled
+    clonedTags = filterTags(HOSPITALITY_RELATED_TAGS, tagsList);
   }
-
-  if (!hasGiftVoucherFeature()) {
-    excludedTagList.push(GIFT_VOUCHER_RELATED_TAGS);
-  }
-  const clonedTags = filterTags(excludedTagList, tagsList);
-
   _.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.
@@ -372,4 +361,4 @@ export const handleInjectedData = (data, scope) => {
 
 export const handlePreviewInNewTab = (previewUrl) => {
   window.open(previewUrl, '_blank');
-};
+}

package/v2Containers/TagList/index.js

@@ -22,7 +22,8 @@ import './_tagList.scss';
 import { selectCurrentOrgDetails } from '../Cap/selectors';
 import { injectIntl } from 'react-intl';
 import { scope } from './messages';
-import { handleInjectedData } from '../../utils/common';
+import { handleInjectedData, hasGiftVoucherFeature, hasPromoFeature } from '../../utils/common';
+import { GIFT_VOUCHER_RELATED_TAGS, PROMO_ENGINE_RELATED_TAGS } from '../../containers/App/constants';
 
 const TreeNode = Tree.TreeNode;
 
@@ -95,10 +96,24 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
   populateTags(tagsList) {
     const mainTags = {};
+    const excludedTags = [];
+    if (!hasPromoFeature()) {
+      excludedTags.push(...PROMO_ENGINE_RELATED_TAGS);
+      //filtering PROMO_ENGINE_RELATED_TAGS if org does not have PROMO_ENGINE feature enabled
+    }
+    if (!hasGiftVoucherFeature()) {
+      //filtering GIFT_VOUCHER_RELATED_TAGS if org does not have GIFT_CARDS feature enabled
+      excludedTags.push(...GIFT_VOUCHER_RELATED_TAGS);
+    }
     //Form tags object with tag headers
     _.forEach(tagsList, (temp) => {
       const tag = temp.definition;
       const { locale: userLocale } = this.props?.intl || {};
+
+      // Check if the tag.value should be skipped based on feature control
+      if (_.includes(excludedTags, tag.value)) {
+        return; // Skip processing this tag
+      }
       if (!tag['tag-header']) {
         mainTags[tag.value] = {
           "name": tag?.label[userLocale] ? tag?.label[userLocale] : tag?.label?.en,