@capillarytech/creatives-library 7.17.218 → 7.17.219-alpha.0

package/package.json

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

package/v2Components/CapTagList/index.js

@@ -106,13 +106,16 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   getSearchedExpandedKeys(tags, value = '') {
     let list = [];
     _.forEach(tags, (val = {}, key) => {
+      const tagName = typeof(val?.name) === "string" ? _.toLower(_.get(val, 'name', '')) : _.toLower(_.get(val, 'name.props.defaultMessage', ''));
+      const tagNameWithoutUnderscore = tagName.replace(/_/g, ' ');
+      const searchStringLower = _.toLower(value);
       if (_.has(val, 'subtags')) {
-        if (val.name && typeof val.name === 'string' && (val.name || '').toLowerCase().indexOf(value.toLowerCase()) !== -1) {
+        if (val.name && (tagName.includes(searchStringLower) || tagNameWithoutUnderscore.includes(searchStringLower))) {
           list.push(key);
         }
         const temp = this.getSearchedExpandedKeys(val.subtags, value);
         list = list.concat(temp);
-      } else if (val.name && typeof val.name === 'string' && (val.name || '').toLowerCase().indexOf(value.toLowerCase()) !== -1) {
+      } else if (val.name && (tagName.includes(searchStringLower) || tagNameWithoutUnderscore.includes(searchStringLower))) {
         list.push(key);
       }
     });
@@ -185,7 +188,8 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     this.setState({showModal: true, visible: false});
   };
 
-  renderTags(tags, searchString = '') {
+  renderTags(tags) {
+    const searchString = this.state.searchValue || '';
     const { disableRelatedTags, childTagsToDisable, parentTagstoDisable, showCardsRelatedTags } = this?.props?.disableTagsDetails;
     const { accessibleFeatures = [] } = this?.props?.currentOrgDetails || {};
     const hideDateTagsForJpLocale = accessibleFeatures.includes(JP_LOCALE_HIDE_FEATURE);
@@ -210,40 +214,58 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         supportedTagsString += `${supportedTag} ,`;
       });
       supportedTagsString = supportedTagsString.replace(/,\s*$/, "");
-      const tagDescriptionOrName = _.toLower(String(_.get(val, 'desc', '') || _.get(val, 'name', '')));
+      const tagName = typeof(val?.name) === "string" ? _.toLower(_.get(val, 'name', '')) : _.toLower(_.get(val, 'name.props.defaultMessage', ''));
+      const tagNameWithoutUnderscore = tagName.replace(/_/g, ' ');
       const searchStringLower = _.toLower(searchString);
-      const tagContainsSearchedString = tagDescriptionOrName.includes(searchStringLower);
+      const tagContainsSearchedString = searchStringLower && (tagName.includes(searchStringLower) || tagNameWithoutUnderscore.includes(searchStringLower));
       if (_.has(val, 'subtags')) {
         const disabled = disableRelatedTags ? parentTagstoDisable.includes(key) : false;
-        const temp = this.renderTags(val.subtags, '', disabled);
-        const tagValue = (
-          <CapTreeNode
-            title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val?.name}</CapTooltip> : val?.name}
-            tag={val}
-            key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
-            disabled={disabled}
-          >
-            {temp}
-          </CapTreeNode>
-        );
-        hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tagValue);
-      } else if (searchString === '' || !searchString || tagContainsSearchedString) {
+        const temp = this.renderTags(val?.subtags);
+        if (temp?.length) {
+          const tagValue = (
+            <CapTreeNode
+              title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val?.name}</CapTooltip> : val?.name}
+              tag={val}
+              key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
+              disabled={disabled}
+            >
+              {temp}
+            </CapTreeNode>
+          );
+          hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tagValue);
+        }
+      } else {
         let childDisabled = true;
         if (key === CUSTOMER_BARCODE_TAG && !hasCustomerBarcodeFeatureEnabled()) {
           childDisabled = true;
         } else {
           childDisabled = disableRelatedTags ? childTagsToDisable.includes(key) : false;
         }
-        const tempNode = (
-          <CapTreeNode
-            title={childDisabled ? <CapTooltip title={key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val.desc || val.name}</CapTooltip> : (val.desc || val.name)}
-            tag={val}
-            isLeaf
-            key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
-            disabled={childDisabled}
-          >
-          </CapTreeNode>);
-        hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tempNode);
+        if (searchString) {
+          if (tagContainsSearchedString) {
+            const tempNode = (
+              <CapTreeNode
+                title={childDisabled ? <CapTooltip title={key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val?.desc || val?.name}</CapTooltip> : (val?.desc || val?.name)}
+                tag={val}
+                isLeaf
+                key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
+                disabled={childDisabled}
+              >
+              </CapTreeNode>);
+            hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tempNode);
+          }
+        } else {
+          const tempNode = (
+            <CapTreeNode
+              title={childDisabled ? <CapTooltip title={key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText}>{val?.desc || val?.name}</CapTooltip> : (val?.desc || val?.name)}
+              tag={val}
+              isLeaf
+              key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
+              disabled={childDisabled}
+            >
+            </CapTreeNode>);
+          hidingDateTagsForJpLocale(hideDateTagsForJpLocale, val, list, tempNode);
+        }
       }
     });
     return list;