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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@capillarytech/creatives-library",
   "author": "meharaj",
-  "version": "7.17.217",
+  "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;

package/v2Containers/MobilePush/Edit/index.js

@@ -117,11 +117,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     const { id: selectedWeChatAccountId } = editSelectedWeChatAccount || {};
     const { definition } = templateDetails || {};
     const { accountId: templateAccountId } = definition || {};
-    const { Edit: nextEdit } = nextProps || {};
+    const { Templates: nextTemplates, Edit: nextEdit } = nextProps || {};
     if (isEmbeddedEditOrPreview(queryType, creativesMode)) {
       selectedWeChatAccount = !_.isEmpty(editSelectedWeChatAccount)
         ? editSelectedWeChatAccount
-        : nextEdit?.selectedWeChatAccount;
+        : nextTemplates?.selectedWeChatAccount;
     } else if (!_.isEmpty(Templates?.selectedWeChatAccount)) {
       selectedWeChatAccount = Templates?.selectedWeChatAccount;
     }
@@ -154,11 +154,11 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
     ) {
       this.setMobilePushAccountOptions(nextEdit?.weCrmAccounts, templateAccountId);
     }
-    if (!_.isEmpty(nextEdit?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
+    if (!_.isEmpty(nextTemplates?.selectedWeChatAccount) && !_.isEqual(editSelectedWeChatAccount, nextEdit?.selectedWeChatAccount) && (queryType === EMBEDDED) && this.props.location.query.module === "loyalty") {
       const params = {
         name: '',
         sortBy: 'Most Recent',
-        accountId: nextEdit?.selectedWeChatAccount?.id,
+        accountId: nextTemplates?.selectedWeChatAccount?.id,
       };
       this.props.actions.getMobilepushTemplatesList('mobilepush', params);
     }
@@ -169,8 +169,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
         if (nextProps.location.query.module !== 'loyalty' && templateId && templateId !== 'temp') {
           this.props.actions.getTemplateDetails(templateId);
         }
-        const type = this.props.location.query.type;
-        if (type === 'embedded' && templateId === 'temp' && _.isEmpty(this.state.formData)) { // when his.props.params.id is temp that means mobile push template content will be passed from post message from parent with startTemplateCreation action
+        if (queryType === EMBEDDED && templateId === 'temp' && _.isEmpty(this.state.formData)) { // when his.props.params.id is temp that means mobile push template content will be passed from post message from parent with startTemplateCreation action
           const response = {
             action: 'startTemplateCreation',
           };
@@ -178,12 +177,12 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
           this.getTags();
         }
       });
-      if (this.props.location.query.type === 'embedded') {
+      if (queryType === EMBEDDED) {
         this.showNext();
       }
     }
     if (nextProps.metaEntities && nextProps.metaEntities.layouts && nextProps.metaEntities.layouts.length > 0 && nextProps.Edit.mobilepushTemplates && !_.isEqual(nextProps.Edit.mobilepushTemplates, this.props.Edit.mobilepushTemplates)) { //used inloyalty
-      if (nextProps.location.query.type === 'embedded' && nextProps.location.query.module === 'loyalty') {
+      if (nextProps.location.query.type === EMBEDDED && nextProps.location.query.module === 'loyalty') {
         this.setTemplateOptions(nextProps.Edit.mobilepushTemplates);
       }
     }