@capillarytech/creatives-library 8.0.326 → 8.0.327

package/package.json

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

package/utils/tests/tagValidations.test.js

@@ -242,6 +242,7 @@ describe("validateTags", () => {
       tagsParam,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(true);
@@ -273,6 +274,7 @@ describe("validateTags", () => {
       tagsParam: tagsParamLocal,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(true);
@@ -310,6 +312,7 @@ describe("validateTags", () => {
       tagsParam: tagsParamLocal,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
 
     expect(result.valid).toEqual(false);
@@ -335,6 +338,7 @@ describe("validateTags", () => {
       tagsParam: tagsParamUnsubscribe,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
     expect(resultMissing.missingTags).toContain("unsubscribe");
     expect(resultMissing.valid).toBe(false);
@@ -345,6 +349,7 @@ describe("validateTags", () => {
       tagsParam: tagsParamUnsubscribe,
       location,
       tagModule,
+      waitEventContextTags: {},
     });
     expect(resultSkipped.missingTags).not.toContain("unsubscribe");
     expect(resultSkipped.valid).toBe(true);
@@ -360,6 +365,35 @@ 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 waitEventContextTags = {
+      block1: {
+        eventName: 'Order Placed',
+        blockName: 'Wait Block',
+        tags: [{ tagName: 'waitEvent.orderId', label: 'Order ID' }],
+      },
+    };
+
+    const result = validateTags({
+      content,
+      tagsParam,
+      injectedTagsParams,
+      location,
+      tagModule,
+      eventContextTags: [],
+      waitEventContextTags,
+    });
+
+    expect(result.valid).toEqual(true);
+    expect(result.missingTags).toEqual([]);
+    expect(result.isBraceError).toEqual(false);
+  });
 });
 
 describe('validateTags wrapper (v2 consumers)', () => {

package/v2Components/CapTagList/index.js

@@ -207,6 +207,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         } else {
           this.props.onSelect(selectedKeys, info);
           this.setState({visible: false});
+          this.setState({expandedKeys: []})
         }
       } else if (info && info.selectedNodes && info.selectedNodes.length > 0 && !info.selectedNodes[0].props.isLeaf) {
         this.handleOnExpand(selectedKeys[0]);
@@ -233,6 +234,13 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
     }
   };
 
+  /** Single-line ellipsis within popover width; full label on hover via CapTooltip. */
+  wrapTreeTitle = (displayNode, text) => (
+    <CapTooltip title={displayNode}>
+      {text || displayNode}
+    </CapTooltip>
+  );
+
   renderDynamicTagFlow = () => {
     this.setState({showModal: true, visible: false});
   };
@@ -280,7 +288,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
         if (temp?.length) {
           const tagValue = (
             <CapTreeNode
-              title={disabled ? <CapTooltip title={loyaltyAttrDisableText}>{val?.name}</CapTooltip> : val?.name}
+              title={disabled ? this.wrapTreeTitle(loyaltyAttrDisableText, val?.name) : this.wrapTreeTitle(val?.name)}
               tag={val}
               key={val?.incentiveSeriesId ? `${key}(${val?.incentiveSeriesId})` : `${key}`}
               disabled={disabled}
@@ -303,17 +311,9 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
               <CapTreeNode
                 title={
                   childDisabled ? (
-                    <CapTooltip
-                      title={
-                        key === CUSTOMER_BARCODE_TAG
-                          ? customerBarcodeDisableText
-                          : loyaltyAttrDisableText
-                      }
-                    >
-                      {val?.desc || val?.name}
-                    </CapTooltip>
+                    this.wrapTreeTitle(key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText, val?.desc || val?.name)
                   ) : (
-                    val?.desc || val?.name
+                    this.wrapTreeTitle(val?.desc || val?.name)
                   )
                 }
                 tag={val}
@@ -339,17 +339,9 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
             <CapTreeNode
               title={
                 childDisabled ? (
-                  <CapTooltip
-                    title={
-                      key === CUSTOMER_BARCODE_TAG
-                        ? customerBarcodeDisableText
-                        : loyaltyAttrDisableText
-                    }
-                  >
-                    {val?.desc || val?.name}
-                  </CapTooltip>
+                  this.wrapTreeTitle(key === CUSTOMER_BARCODE_TAG ? customerBarcodeDisableText : loyaltyAttrDisableText, val?.desc || val?.name)
                 ) : (
-                  val?.desc || val?.name
+                  this.wrapTreeTitle(val?.desc || val?.name)
                 )
               }
               tag={val}
@@ -407,7 +399,7 @@ class CapTagList extends React.Component { // eslint-disable-line react/prefer-s
       },
     ];
     const contentSection = (
-      <CapRow>
+      <CapRow className="cap-tag-list-popover-inner">
         <CapSpin tip={formatMessage(messages.gettingTags)} spinning={shouldShowLoading}>
           <Search
             style={{ marginBottom: 8, width: '250px'}}

package/v2Components/CapTagList/style.scss

@@ -1,5 +1,53 @@
 @import "~@capillarytech/cap-ui-library/styles/_variables";
 
+// Tag list popover: keep overlay width aligned with search (250px); tree rows ellipsis + tooltip for full text
+.cap-tag-list-popover-overlay.ant-popover {
+  .ant-popover-inner-content {
+    max-width: 20rem;
+    box-sizing: border-box;
+    overflow: hidden;
+  }
+}
+
+.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;
+    }
+
+    .cap-tag-list-tree-title-wrap {
+      display: inline-block;
+      width: 100%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      max-width: 100%;
+      vertical-align: top;
+      margin-top: 0.5rem;
+    }
+  }
+}
+
 @media (max-height: 25rem) {
   .ant-tree.cap-tree-v2.ant-tree-icon-hide {
     height: 8.5714rem;

package/v2Components/CapTagListWithInput/__tests__/CapTagListWithInput.test.js

@@ -0,0 +1,63 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { IntlProvider } from 'react-intl';
+import CapTagListWithInput from '../index';
+
+const capturedTagListProps = { current: null };
+
+jest.mock('../../../v2Containers/TagList', () => {
+  const React = require('react');
+  const Mock = (props) => {
+    capturedTagListProps.current = props;
+    return <div data-testid="mock-tag-list">TagList</div>;
+  };
+  return Mock;
+});
+
+jest.mock('@capillarytech/cap-ui-library/CapRow', () => ({ children }) => <div>{children}</div>);
+jest.mock('@capillarytech/cap-ui-library/CapColumn', () => ({ children }) => <div>{children}</div>);
+jest.mock('@capillarytech/cap-ui-library/CapHeading', () => () => null);
+jest.mock('@capillarytech/cap-ui-library/CapInput', () => () => <input data-testid="cap-input" />);
+
+const waitMap = {
+  b1: { eventName: 'Order Placed', blockName: 'Wait', tags: [] },
+};
+
+describe('CapTagListWithInput', () => {
+  beforeEach(() => {
+    capturedTagListProps.current = null;
+  });
+
+  it('forwards waitEventContextTags to TagList', () => {
+    render(
+      <IntlProvider locale="en" messages={{}}>
+        <CapTagListWithInput
+          inputId="test-url"
+          inputOnChange={jest.fn()}
+          waitEventContextTags={waitMap}
+          onTagSelect={jest.fn()}
+          onContextChange={jest.fn()}
+        />
+      </IntlProvider>
+    );
+
+    expect(screen.getByTestId('mock-tag-list')).toBeInTheDocument();
+    expect(capturedTagListProps.current.waitEventContextTags).toEqual(waitMap);
+  });
+
+  it('uses default empty object for waitEventContextTags when omitted', () => {
+    render(
+      <IntlProvider locale="en" messages={{}}>
+        <CapTagListWithInput
+          inputId="test-url"
+          inputOnChange={jest.fn()}
+          onTagSelect={jest.fn()}
+          onContextChange={jest.fn()}
+        />
+      </IntlProvider>
+    );
+
+    expect(capturedTagListProps.current.waitEventContextTags).toEqual({});
+  });
+});

package/v2Components/CapTagListWithInput/index.js

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

package/v2Components/CapWhatsappCTA/index.js

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

package/v2Components/FormBuilder/index.js

@@ -2990,6 +2990,7 @@ 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>
           );
@@ -3019,6 +3020,7 @@ 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 || {}}
@@ -3658,6 +3660,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     channel={channel}
                     eventContextTags={this.props?.eventContextTags}
                     restrictPersonalization={this.props.restrictPersonalization}
+                    waitEventContextTags={this.props?.waitEventContextTags}
                     getPopupContainer={this.props.tagListGetPopupContainer}
                     popoverOverlayStyle={this.props.tagListPopoverOverlayStyle}
                     popoverOverlayClassName={this.props.tagListPopoverOverlayClassName}
@@ -3707,6 +3710,7 @@ 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 || {}}
@@ -4001,6 +4005,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                   onContextChange={this.props.onContextChange}
                   moduleFilterEnabled={isModuleFilterEnabled}
                   eventContextTags={this.props?.eventContextTags}
+                  waitEventContextTags={this.props?.waitEventContextTags}
                 />
               </CapColumn>
             );
@@ -4303,6 +4308,7 @@ FormBuilder.defaultProps = {
   userLocale: localStorage.getItem('jlocale') || 'en',
   showLiquidErrorInFooter: () => {},
   metaDataStatus: "",
+  waitEventContextTags: {},
   isTestAndPreviewMode: false, // Default to false to maintain existing behavior
 };
 
@@ -4353,6 +4359,7 @@ FormBuilder.propTypes = {
   moduleType: PropTypes.string.isRequired,
   showLiquidErrorInFooter: PropTypes.func.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,6 +94,7 @@ const HTMLEditor = forwardRef(({
   injectedTags = {},
   location,
   eventContextTags = [],
+  waitEventContextTags,
   selectedOfferDetails = [],
   channel,
   userLocale = 'en',
@@ -361,7 +362,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,
@@ -663,6 +664,7 @@ const HTMLEditor = forwardRef(({
               injectedTags={injectedTags}
               location={location}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               selectedOfferDetails={selectedOfferDetails}
               channel={channel}
               userLocale={userLocale}
@@ -734,6 +736,7 @@ const HTMLEditor = forwardRef(({
                   injectedTags={injectedTags}
                   location={location}
                   eventContextTags={eventContextTags}
+                  waitEventContextTags={waitEventContextTags}
                   selectedOfferDetails={selectedOfferDetails}
                   channel={channel}
                   userLocale={userLocale}
@@ -772,6 +775,7 @@ HTMLEditor.propTypes = {
   injectedTags: PropTypes.object,
   location: PropTypes.object,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   channel: PropTypes.string,
   userLocale: PropTypes.string,
@@ -805,6 +809,7 @@ HTMLEditor.defaultProps = {
   injectedTags: {},
   location: null,
   eventContextTags: [],
+  waitEventContextTags: {},
   selectedOfferDetails: [],
   channel: null,
   userLocale: 'en',

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

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