@capillarytech/creatives-library 8.0.338 → 8.0.339

package/package.json

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

package/utils/tests/tagValidations.test.js

@@ -360,26 +360,6 @@ describe("validateTags", () => {
     expect(resultWhitespace.valid).toBe(true);
     expect(resultWhitespace.unsupportedTags ?? []).toEqual([]);
   });
-
-  it('should treat tags from waitEventContextTags as supported', () => {
-    const content = 'Hello {{waitEvent.orderId}}';
-    const tagsParam = [];
-    const injectedTagsParams = [];
-    const location = { query: { module: 'DEFAULT' } };
-    const tagModule = null;
-
-    const result = validateTags({
-      content,
-      tagsParam,
-      injectedTagsParams,
-      location,
-      tagModule,
-    });
-
-    expect(result.valid).toEqual(true);
-    expect(result.missingTags).toEqual([]);
-    expect(result.isBraceError).toEqual(false);
-  });
 });
 
 describe('validateTags wrapper (v2 consumers)', () => {

package/v2Components/CapTagList/index.js

@@ -44,7 +44,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     super(props);
     this.state = {
       tagValue: '',
-      selectedNodeKey: '',
       expandedKeys: [],
       searchValue: '',
       autoExpandParent: true,
@@ -123,11 +122,9 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     this.handleOnExpand(info.node.props.eventKey);
   };
 
-  getSearchedExpandedKeys(tags, value = '', parentPath = '') {
+  getSearchedExpandedKeys(tags, value = '') {
     let list = [];
     _.forEach(tags, (val = {}, key) => {
-      const rawKey = val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`;
-      const nodeKey = parentPath ? `${parentPath}.${rawKey}` : rawKey;
       const tagName =
         typeof val?.name === 'string'
           ? _.toLower(_.get(val, "name", ""))
@@ -140,16 +137,16 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           && (tagName.includes(searchStringLower)
             || tagNameWithoutUnderscore.includes(searchStringLower))
         ) {
-          list.push(nodeKey);
+          list.push(key);
         }
-        const temp = this.getSearchedExpandedKeys(val?.subtags, value, nodeKey);
+        const temp = this.getSearchedExpandedKeys(val?.subtags, value);
         list = list.concat(temp);
       } else if (
         val?.name
         && (tagName.includes(searchStringLower)
           || tagNameWithoutUnderscore.includes(searchStringLower))
       ) {
-        list.push(nodeKey);
+        list.push(key);
       }
     });
     return list;
@@ -203,17 +200,12 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
   handleOnSelect = (selectedKeys, info) => {
     if (selectedKeys.length > 0) {
       if (info && info.selectedNodes && info.selectedNodes.length > 0 && info.selectedNodes[0].props.isLeaf) {
-        const selectedNode = info.selectedNodes[0];
-        const selectedTagValue = selectedNode?.props?.tagKey || selectedKeys[0];
-        this.setState({
-          tagValue: selectedTagValue,
-          selectedNodeKey: selectedKeys[0],
-        });
-        const ifDynamicTag = this.checkIfDynamicTag(selectedTagValue);
+        this.setState({tagValue: selectedKeys[0]});
+        const ifDynamicTag = this.checkIfDynamicTag(selectedKeys[0]);
         if (ifDynamicTag) {
           this.renderDynamicTagFlow();
         } else {
-          this.props.onSelect([selectedTagValue], info);
+          this.props.onSelect(selectedKeys, info);
           this.setState({visible: false});
         }
       } else if (info && info.selectedNodes && info.selectedNodes.length > 0 && !info.selectedNodes[0].props.isLeaf) {
@@ -245,7 +237,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     this.setState({showModal: true, visible: false});
   };
 
-  renderTags = (tags, parentPath = '') => {
+  renderTags = (tags) => {
     const searchString = this.state.searchValue || '';
     const {
       disableRelatedTags, childTagsToDisable, parentTagstoDisable,
@@ -268,8 +260,6 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       clonedTags = _.omit(clonedTags, CUSTOMER_BARCODE_TAG);
     }
     _.forEach(clonedTags, (val = '', key) => {
-      const rawKey = val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`;
-      const nodeKey = parentPath ? `${parentPath}.${rawKey}` : rawKey;
       let supportedTagsString = '';
       _.forEach(val.supportedTags, (supportedTag) => {
         supportedTagsString += `${supportedTag} ,`;
@@ -286,14 +276,13 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           || tagNameWithoutUnderscore.includes(searchStringLower));
       if (_.has(val, 'subtags')) {
         const disabled = disableRelatedTags ? parentTagstoDisable.includes(key) : false;
-        const temp = this.renderTags(val?.subtags, nodeKey);
+        const temp = this.renderTags(val?.subtags);
         if (temp?.length) {
           const tagValue = (
             <CapTreeNode
               title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val?.name}</CapTooltip> : val?.name}
               tag={val}
-              tagKey={rawKey}
-              key={nodeKey}
+              key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
               disabled={disabled}
             >
               {temp}
@@ -328,9 +317,12 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
                   )
                 }
                 tag={val}
-                tagKey={rawKey}
                 isLeaf
-                key={nodeKey}
+                key={
+                  val?.incentiveSeriesId
+                    ? `${key}(${val?.incentiveSeriesId})`
+                    : `${key}`
+                }
                 disabled={childDisabled}
               >
               </CapTreeNode>
@@ -361,9 +353,12 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
                 )
               }
               tag={val}
-              tagKey={rawKey}
               isLeaf
-              key={nodeKey}
+              key={
+                val?.incentiveSeriesId
+                  ? `${key}(${val?.incentiveSeriesId})`
+                  : `${key}`
+              }
               disabled={childDisabled}
             >
             </CapTreeNode>
@@ -390,7 +385,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     } = this.props;
     const {formatMessage} = intl;
     const {
-      tagValue, selectedNodeKey, expandedKeys, autoExpandParent, visible, translationLang, selectedContext, isLoadingLoyaltyTags, isLoadingContextChange,
+      tagValue, expandedKeys, autoExpandParent, visible, translationLang, selectedContext, isLoadingLoyaltyTags, isLoadingContextChange,
     } = this.state;
 
     // Show loading spinner if general loading OR if specifically loading loyalty tags OR if context change is in progress
@@ -409,7 +404,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       },
     ];
     const contentSection = (
-      <CapRow className="cap-tag-list-popover-inner">
+      <CapRow>
         <CapSpin tip={formatMessage(messages.gettingTags)} spinning={shouldShowLoading}>
           <Search
             style={{ marginBottom: 8, width: '250px'}}
@@ -429,7 +424,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
           <CapTree
             styling={{height: '350px', overflow: 'auto'}}
             onSelect={this.handleOnSelect}
-            selectedKeys={selectedNodeKey ? [selectedNodeKey] : []}
+            selectedKeys={tagValue}
             expandedKeys={expandedKeys}
             autoExpandParent={autoExpandParent}
             onExpand={this.onExpand}

package/v2Components/CapTagList/style.scss

@@ -1,34 +1,5 @@
 @import "~@capillarytech/cap-ui-library/styles/_variables";
 
-.cap-tag-list-popover-inner {
-  max-width: 20rem;
-  min-width: 0;
-  box-sizing: border-box;
-
-  .ant-tree.cap-tree-v2.ant-tree-icon-hide {
-    width: 100%;
-    max-width: 100%;
-
-    ul {
-      max-width: 100%;
-    }
-
-    li {
-      overflow: hidden;
-      max-width: 100%;
-    }
-
-    li .ant-tree-node-content-wrapper {
-      width: calc(100% - 3.5rem); // leave room for switcher (~24px)
-      max-width: calc(100% - 3.5rem);
-      overflow: hidden;
-      vertical-align: top;
-      box-sizing: border-box;
-      text-overflow: ellipsis;
-    }
-  }
-}
-
 @media (max-height: 25rem) {
   .ant-tree.cap-tree-v2.ant-tree-icon-hide {
     height: 8.5714rem;

package/v2Components/CapTagListWithInput/index.js

@@ -27,7 +27,6 @@ export const CapTagListWithInput = (props) => {
     userLocale = 'en',
     eventContextTags = [],
     restrictPersonalization = false,
-    waitEventContextTags = {},
     // CapInput props
     inputId,
     inputValue = '',
@@ -78,7 +77,6 @@ export const CapTagListWithInput = (props) => {
             userLocale={userLocale}
             selectedOfferDetails={selectedOfferDetails}
             eventContextTags={eventContextTags}
-            waitEventContextTags={waitEventContextTags}
             style={tagListStyle}
             popoverPlacement={popoverPlacement}
             restrictPersonalization={restrictPersonalization}
@@ -118,7 +116,6 @@ CapTagListWithInput.propTypes = {
   userLocale: PropTypes.string,
   eventContextTags: PropTypes.array,
   restrictPersonalization: PropTypes.bool,
-  waitEventContextTags: PropTypes.object,
 
   // CapInput props
   inputId: PropTypes.string.isRequired,
@@ -157,7 +154,6 @@ CapTagListWithInput.defaultProps = {
   userLocale: 'en',
   eventContextTags: [],
   restrictPersonalization: false,
-  waitEventContextTags: {},
   inputValue: '',
   inputSize: 'default',
   inputRequired: false,

package/v2Components/CapWhatsappCTA/index.js

@@ -52,7 +52,6 @@ export const CapWhatsappCTA = (props) => {
     injectedTags = {},
     selectedOfferDetails = [],
     eventContextTags = [],
-    waitEventContextTags = {},
   } = props;
   const { formatMessage } = intl;
   const invalidVarRegex = /{{(.*?)}}/g;
@@ -284,7 +283,6 @@ export const CapWhatsappCTA = (props) => {
                   injectedTags={injectedTags}
                   selectedOfferDetails={selectedOfferDetails}
                   eventContextTags={eventContextTags}
-                  waitEventContextTags={waitEventContextTags}
                 />
               </CapColumn>
             )}

package/v2Components/FormBuilder/index.js

@@ -2990,7 +2990,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 eventContextTags={this.props?.eventContextTags}
                 restrictPersonalization={this.props.restrictPersonalization}
-                waitEventContextTags={this.props?.waitEventContextTags}
               />
             </CapColumn>
           );
@@ -3020,7 +3019,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                 userLocale={this.props.userLocale}
                 selectedOfferDetails={this.props.selectedOfferDetails}
                 eventContextTags={this.props?.eventContextTags}
-                waitEventContextTags={this.props?.waitEventContextTags}
                 moduleFilterEnabled={this.props.location && this.props.location.query && this.props.location.query.type !== 'embedded'}
                 containerStyle={val.style || {}}
                 inputProps={val.inputProps || {}}
@@ -3660,7 +3658,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     channel={channel}
                     eventContextTags={this.props?.eventContextTags}
                     restrictPersonalization={this.props.restrictPersonalization}
-                    waitEventContextTags={this.props?.waitEventContextTags}
                   />
                 </CapColumn>
               );
@@ -3707,7 +3704,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     userLocale={this.state.translationLang}
                     selectedOfferDetails={this.props.selectedOfferDetails}
                     eventContextTags={this.props?.eventContextTags}
-                    waitEventContextTags={this.props?.waitEventContextTags}
                     moduleFilterEnabled={moduleFilterEnabledForCapTagList}
                     containerStyle={val.style || {}}
                     inputProps={val.inputProps || {}}
@@ -4002,7 +3998,6 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   onContextChange={this.props.onContextChange}
                   moduleFilterEnabled={isModuleFilterEnabled}
                   eventContextTags={this.props?.eventContextTags}
-                  waitEventContextTags={this.props?.waitEventContextTags}
                   isGetBeeData={this.props?.isGetBeeData}
                   getBEEData={this.props?.getBEEData}
                 />
@@ -4307,7 +4302,6 @@ FormBuilder.defaultProps = {
   userLocale: localStorage.getItem('jlocale') || 'en',
   showLiquidErrorInFooter: () => {},
   metaDataStatus: "",
-  waitEventContextTags: {},
   isTestAndPreviewMode: false, // Default to false to maintain existing behavior
 };
 
@@ -4358,7 +4352,6 @@ FormBuilder.propTypes = {
   moduleType: PropTypes.string.isRequired,
   showLiquidErrorInFooter: PropTypes.bool.isRequired,
   eventContextTags: PropTypes.array.isRequired,
-  waitEventContextTags: PropTypes.object,
   forwardedTags: PropTypes.object.isRequired,
   isLoyaltyModule: PropTypes.bool.isRequired,
   isTestAndPreviewMode: PropTypes.bool, // Add new prop type

package/v2Components/HtmlEditor/HTMLEditor.js

@@ -94,7 +94,6 @@ const HTMLEditor = forwardRef(({
   injectedTags = {},
   location,
   eventContextTags = [],
-  waitEventContextTags,
   selectedOfferDetails = [],
   channel,
   userLocale = 'en',
@@ -362,7 +361,7 @@ const HTMLEditor = forwardRef(({
     const issueCounts = calculateIssueCounts();
     const isContentEmpty = !currentContent || currentContent.trim() === '';
 
-    // hasErrors = only Rule Group #1 (Input & Sanitization) - gates Done/Update/Preview/Test
+    // hasErrors = only Rule Group #1 (Input & Sanitization) – gates Done/Update/Preview/Test
     const newState = {
       isContentEmpty,
       issueCounts,
@@ -664,7 +663,6 @@ const HTMLEditor = forwardRef(({
               injectedTags={injectedTags}
               location={location}
               eventContextTags={eventContextTags}
-              waitEventContextTags={waitEventContextTags}
               selectedOfferDetails={selectedOfferDetails}
               channel={channel}
               userLocale={userLocale}
@@ -736,7 +734,6 @@ const HTMLEditor = forwardRef(({
                   injectedTags={injectedTags}
                   location={location}
                   eventContextTags={eventContextTags}
-                  waitEventContextTags={waitEventContextTags}
                   selectedOfferDetails={selectedOfferDetails}
                   channel={channel}
                   userLocale={userLocale}
@@ -775,7 +772,6 @@ HTMLEditor.propTypes = {
   injectedTags: PropTypes.object,
   location: PropTypes.object,
   eventContextTags: PropTypes.array,
-  waitEventContextTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   channel: PropTypes.string,
   userLocale: PropTypes.string,
@@ -809,7 +805,6 @@ HTMLEditor.defaultProps = {
   injectedTags: {},
   location: null,
   eventContextTags: [],
-  waitEventContextTags: {},
   selectedOfferDetails: [],
   channel: null,
   userLocale: 'en',

package/v2Components/HtmlEditor/__tests__/HTMLEditor.apiErrors.test.js

@@ -225,7 +225,6 @@ const defaultProps = {
   injectedTags: {},
   location: { query: {} },
   eventContextTags: [],
-  waitEventContextTags: {},
   selectedOfferDetails: [],
   channel: 'EMAIL',
   userLocale: 'en',