@capillarytech/creatives-library 8.0.332 → 8.0.334

package/v2Containers/Rcs/index.js

@@ -148,6 +148,7 @@ export const Rcs = (props) => {
     smsRegister,
     selectedOfferDetails,
     eventContextTags,
+    waitEventContextTags,
     accountData = {},
     // TestAndPreviewSlidebox props
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,
@@ -300,7 +301,6 @@ export const Rcs = (props) => {
   const [accessToken, setAccessToken] = useState('');
   const [hostName, setHostName] = useState('');
   const [accountName, setAccountName] = useState('');
-  const [rcsAccount, setRcsAccount] = useState('');
   useEffect(() => {
     const accountObj = accountData.selectedRcsAccount || {};
     if (!isEmpty(accountObj)) {
@@ -313,7 +313,6 @@ export const Rcs = (props) => {
       setAccessToken(configs.accessToken || '');
       setHostName(accountObj.hostName || '');
       setAccountName(accountObj.name || '');
-      setRcsAccount(accountObj.id || '');
     }
   }, [accountData.selectedRcsAccount]);
 
@@ -608,10 +607,6 @@ export const Rcs = (props) => {
       const mediaData = get(details, 'versions.base.content.RCS.rcsContent.cardContent[0].media', '');
       const cardSettings = get(details, 'versions.base.content.RCS.rcsContent.cardSettings', '');
       setMediaData(mediaData, mediaType, cardSettings);
-      if (details?.edit) {
-        const rcsAccountId = get(details, 'versions.base.content.RCS.rcsContent.accountId', '');
-        setRcsAccount(rcsAccountId);
-      }
     }
   }, [rcsData, templateData, isFullMode, isEditFlow]);
   
@@ -1967,7 +1962,6 @@ const splitTemplateVarString = (str) => {
           content: {
             RCS: {
               rcsContent: {
-                ...(rcsAccount && !isFullMode && { accountId: rcsAccount }),
                 cardType: STANDALONE,
                 cardSettings: {
                   cardOrientation: isMediaTypeImage ? RCS_IMAGE_DIMENSIONS[selectedDimension]?.orientation || VERTICAL : RCS_VIDEO_THUMBNAIL_DIMENSIONS[selectedDimension]?.orientation || VERTICAL,

package/v2Containers/Sms/Create/index.js

@@ -1096,6 +1096,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 onTestContentClicked={this.props.onTestContentClicked}
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 eventContextTags={this.props?.eventContextTags}
+                waitEventContextTags={this.props?.waitEventContextTags}
               />
             </CapColumn>
           </CapRow>
@@ -1132,6 +1133,7 @@ Create.propTypes = {
   isLoadingMetaEntities: PropTypes.bool,
   selectedOfferDetails: PropTypes.array,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   showTestAndPreviewSlidebox: PropTypes.bool,
   handleTestAndPreview: PropTypes.func,
   handleCloseTestAndPreview: PropTypes.func,

package/v2Containers/Sms/Edit/index.js

@@ -1091,6 +1091,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 onPreviewContentClicked={this.props.onPreviewContentClicked}
                 onTestContentClicked={this.props.onTestContentClicked}
                 eventContextTags={this.props?.eventContextTags}
+                waitEventContextTags={this.props?.waitEventContextTags}
                 messageDetails={this.props?.messageDetails}
               />
             </CapColumn>
@@ -1131,6 +1132,7 @@ Edit.propTypes = {
   injectedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   messageDetails: PropTypes.object,
   showTestAndPreviewSlidebox: PropTypes.bool,
   handleTestAndPreview: PropTypes.func,

package/v2Containers/SmsTrai/Edit/index.js

@@ -82,6 +82,7 @@ export const SmsTraiEdit = (props) => {
     templateData = {},
     selectedOfferDetails,
     eventContextTags,
+    waitEventContextTags,
     fetchingLiquidTags,
     getLiquidTags,
     showLiquidErrorInFooter,
@@ -660,6 +661,7 @@ export const SmsTraiEdit = (props) => {
                     hidePopover={disablehandler()}
                     selectedOfferDetails={selectedOfferDetails}
                     eventContextTags={eventContextTags}
+                    waitEventContextTags={waitEventContextTags}
                   />
                 )}
               />

package/v2Containers/SmsWrapper/index.js

@@ -30,6 +30,7 @@ const SmsWrapper = (props) => {
     smsRegister,
     onShowTemplates,
     eventContextTags,
+    waitEventContextTags,
     showLiquidErrorInFooter,
     getLiquidTags,
     showTestAndPreviewSlidebox,
@@ -53,6 +54,7 @@ const SmsWrapper = (props) => {
     onPreviewContentClicked,
     onTestContentClicked,
     eventContextTags,
+    waitEventContextTags,
     showLiquidErrorInFooter,
     getLiquidTags,
     showTestAndPreviewSlidebox,

package/v2Containers/TagList/index.js

@@ -94,10 +94,28 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
   }
 
   componentDidUpdate(prevProps) {
-    const { tags, injectedTags, selectedOfferDetails } = this.props;
-    const { tags: prevTags, injectedTags: prevInjectedTags, selectedOfferDetails: prevSelectedOfferDetails } = prevProps;
-
-    if (tags !== prevTags || injectedTags !== prevInjectedTags || selectedOfferDetails !== prevSelectedOfferDetails) {
+    const {
+      tags,
+      injectedTags,
+      selectedOfferDetails,
+      eventContextTags,
+      waitEventContextTags,
+    } = this.props;
+    const {
+      tags: prevTags,
+      injectedTags: prevInjectedTags,
+      selectedOfferDetails: prevSelectedOfferDetails,
+      eventContextTags: prevEventContextTags,
+      waitEventContextTags: prevWaitEventContextTags,
+    } = prevProps;
+
+    if (
+      tags !== prevTags
+      || injectedTags !== prevInjectedTags
+      || selectedOfferDetails !== prevSelectedOfferDetails
+      || !_.isEqual(eventContextTags, prevEventContextTags)
+      || !_.isEqual(waitEventContextTags, prevWaitEventContextTags)
+    ) {
       this.generateTags(this.props);
     }
   }
@@ -162,7 +180,7 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
     let injectedTags = {};
     const eventContextTagsObj = {};
 
-    const {selectedOfferDetails, eventContextTags } = props;
+    const {selectedOfferDetails, eventContextTags, waitEventContextTags } = props;
     if (props.injectedTags && !_.isEmpty(props.injectedTags)) {
       const formattedInjectedTags = handleInjectedData(
         props.injectedTags,
@@ -214,6 +232,43 @@ export class TagList extends React.Component { // eslint-disable-line react/pref
         };
       });
     }
+    // Wait event context tags should be displayed in the Add Labels when node is next to Event based wait node.
+    if (waitEventContextTags && Object.keys(waitEventContextTags)?.length) {
+
+      Object.keys(waitEventContextTags).forEach((blockId) => {
+      const WAIT_EVENT_HEADER_MSG_LABEL = `${waitEventContextTags[blockId].eventName} (${waitEventContextTags[blockId].blockName})`;
+        eventContextTagsObj[blockId] = {
+          "name": WAIT_EVENT_HEADER_MSG_LABEL,
+          "desc": WAIT_EVENT_HEADER_MSG_LABEL,
+          "resolved": true,
+          'tag-header': true,
+          "subtags": {},
+        };
+
+      waitEventContextTags?.[blockId]?.tags?.forEach((tag) => {
+        const {
+          tagName, label, profileId, profileName, blockName, eventName
+        } = tag || {};
+        if (!profileId || !tagName || !label || !profileName) return;
+        // Initializing the tags profile if it doesn't exist
+        if (!eventContextTagsObj?.[blockId]?.subtags?.[profileId]) {
+          eventContextTagsObj[blockId].subtags[profileId] = {
+            "name": profileName,
+            "desc": profileName,
+            "resolved": true,
+            'tag-header': true,
+            "subtags": {},
+          };
+        }
+        // Adding the current tag to the profile group
+        eventContextTagsObj[blockId].subtags[profileId].subtags[tagName] = {
+          name: label,
+          desc: label,
+          resolved: true,
+        };
+      });
+    });
+    }
     this.setState({tags: _.merge( {}, tags, injectedTags, eventContextTagsObj )});
   }
 
@@ -432,6 +487,7 @@ TagList.defaultProps = {
   isNewVersionFlow: false,
   userLocale: 'en',
   eventContextTags: [],
+  waitEventContextTags: {},
 };
 
 TagList.propTypes = {
@@ -452,6 +508,7 @@ TagList.propTypes = {
   disabled: PropTypes.bool,
   fetchingSchemaError: PropTypes.bool,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   popoverPlacement: PropTypes.string,
   // message to show when Add Label button is disabled (e.g. personalization restriction)
   disableTooltipMsg: PropTypes.string,

package/v2Containers/TagList/messages.js

@@ -19,4 +19,8 @@ export default defineMessages({
     id: `${scope}.personalizationNotSupportedAnonymous`,
     defaultMessage: 'Personalization tags are not supported for anonymous customers',
   },
+  waitEvent: {
+    id: `${scope}.waitEvent`,
+    defaultMessage: 'Wait Event',
+  },
 });

package/v2Containers/TagList/tests/TagList.test.js

@@ -5,28 +5,34 @@ import { initialReducer } from '../../../initialReducer';
 import { injectIntl } from "react-intl";
 import { fireEvent } from "@testing-library/react";
 import { TagList } from '../index';
-import { TagListData, eventContextTags } from './mockdata';
+import { TagListData, eventContextTags, waitEventContextTags } from './mockdata';
+import { OfferTag, badgesTags, offer } from '../../../utils/tests/common.mockdata';
+import * as commonUtils from "../../../utils/common";
 import { Provider } from 'react-redux';
 import { screen, render } from '../../../utils/test-utils';
 import history from '../../../utils/history';
 const { getByText, queryByText } = screen;
 
+const buildProps = (props = {}) => ({
+  ...TagListData,
+  onTagSelect: jest.fn(),
+  ...props,
+});
 
-const initializeTagList = (props) => {
+const initializeTagList = (props = {}) => {
   const store = configureStore({}, initialReducer, history);
   const Component = injectIntl(TagList);
-
-  const propsObj = {
-    ...TagListData,
-    onTagSelect: jest.fn(),
-    ...props,
+  const propsObj = buildProps(props);
+  return {
+    ...render(
+      <Provider store={store}>
+        <Component {...propsObj} />
+      </Provider>
+    ),
+    store,
+    Component,
+    propsObj,
   };
-
-  return render(
-    <Provider store={store}>
-      <Component {...propsObj} />
-    </Provider>
-  );
 };
 
 const addLabelBtnAssertion = () => {
@@ -41,19 +47,117 @@ describe("TagList test :  UNIT", () => {
     addLabelBtnAssertion();
   });
 
-  it('should render event context tags correctly from generateTags and show tags under profile', () => {
-    initializeTagList({eventContextTags});
+  it('should render event context tag section from generateTags', () => {
+    initializeTagList({ eventContextTags, moduleFilterEnabled: false });
     addLabelBtnAssertion();
     const EVENT_CONTEXT_TAG_HEADER = getByText(/Entry event/i);
     expect(EVENT_CONTEXT_TAG_HEADER).toBeInTheDocument();
-    fireEvent.click(EVENT_CONTEXT_TAG_HEADER);
-    // Customer profile tags
-    const CUSTOMER_PROFILE = getByText(/Current Customer/i);
-    fireEvent.click(CUSTOMER_PROFILE);
-    expect(getByText(/lifetimePurchases/i)).toBeInTheDocument();
 
     // Behavioural event profile tags should not be visible as label and profile name is not present
     const BEHAVIOURAL_EVENT_PROFILE = queryByText(/Behavioural event/i);
     expect(BEHAVIOURAL_EVENT_PROFILE).not.toBeInTheDocument();
   });
+
+  it('should render wait event context section when waitEventContextTags is provided', () => {
+    initializeTagList({ waitEventContextTags, moduleFilterEnabled: false });
+    addLabelBtnAssertion();
+    const WAIT_EVENT_HEADER = getByText(/Order Placed \(Wait Block\)/i);
+    expect(WAIT_EVENT_HEADER).toBeInTheDocument();
+  });
+
+  it('should merge empty waitEventContextTags with entry event tags', () => {
+    initializeTagList({ eventContextTags, waitEventContextTags: {}, moduleFilterEnabled: false });
+    addLabelBtnAssertion();
+    expect(getByText(/Entry event/i)).toBeInTheDocument();
+  });
+
+  it('calls parent onContextChange with Outbound when tags and injectedTags are empty on popover open', () => {
+    const onContextChange = jest.fn();
+    initializeTagList({
+      tags: [],
+      injectedTags: {},
+      onContextChange,
+      onTagSelect: jest.fn(),
+    });
+    // Default fetch is triggered when the Add Label popover opens (not on mount)
+    addLabelBtnAssertion();
+    expect(onContextChange).toHaveBeenCalledWith('Outbound');
+  });
+
+  it('applies fetchingSchemaError from props via componentWillReceiveProps', () => {
+    const { rerender, Component, propsObj, store } = initializeTagList({ fetchingSchemaError: false });
+    addLabelBtnAssertion();
+    rerender(
+      <Provider store={store}>
+        <Component {...propsObj} fetchingSchemaError />
+      </Provider>
+    );
+    expect(screen.getByText(/add label/i)).toBeInTheDocument();
+  });
+
+  it('disables Add label when restrictPersonalization is true', () => {
+    initializeTagList({
+      restrictPersonalization: true,
+      disabled: false,
+      moduleFilterEnabled: false,
+    });
+    const btn = screen.getByText(/add label/i).closest('button');
+    expect(btn).toBeDisabled();
+  });
+
+  it('calls transformCouponTags when selectedOfferDetails and coupon tags are present', () => {
+    const spy = jest.spyOn(TagList.prototype, 'transformCouponTags');
+    initializeTagList({
+      tags: OfferTag,
+      injectedTags: {},
+      selectedOfferDetails: [{ id: 'c1', couponName: 'Promo Coupon', couponSeriesId: 'c1' }],
+      moduleFilterEnabled: false,
+    });
+    expect(spy).toHaveBeenCalled();
+    spy.mockRestore();
+  });
+
+  it('calls transformBadgeTags from common when badge offer and Badge tags are present', () => {
+    const spy = jest.spyOn(commonUtils, 'transformBadgeTags');
+    initializeTagList({
+      tags: badgesTags,
+      injectedTags: {},
+      selectedOfferDetails: offer,
+      moduleFilterEnabled: false,
+    });
+    expect(spy).toHaveBeenCalled();
+    spy.mockRestore();
+  });
+
+  it('unmounts without throwing', () => {
+    const { unmount } = initializeTagList();
+    expect(() => unmount()).not.toThrow();
+  });
+
+  it('regenerates tags when props.tags change (componentDidUpdate)', () => {
+    const { rerender, Component, store } = initializeTagList({ tags: TagListData.tags });
+    const extra = [
+      ...TagListData.tags,
+      {
+        _id: 'extra-tag',
+        type: 'TAG',
+        definition: {
+          label: { en: 'Extra' },
+          value: 'extra_value',
+          subtags: [],
+          'tag-header': false,
+          supportedModules: [{ context: 'default', layout: 'sms', mandatory: false }],
+        },
+        scope: { tag: 'STANDARD', orgId: -1, verticals: [] },
+        isActive: true,
+      },
+    ];
+    rerender(
+      <Provider store={store}>
+        <Component {...buildProps({ tags: extra })} />
+      </Provider>
+    );
+    addLabelBtnAssertion();
+    expect(screen.getByText(/add label/i)).toBeInTheDocument();
+  });
 });

package/v2Containers/TagList/tests/mockdata.js

@@ -149,3 +149,20 @@ export const eventContextTags = [
         "isDynamicFact": false
     }
 ];
+
+export const waitEventContextTags = {
+  block1: {
+    eventName: 'Order Placed',
+    blockName: 'Wait Block',
+    tags: [
+      {
+        tagName: 'waitEvent.orderId',
+        label: 'Order ID',
+        profileId: 'ORDER_PROFILE',
+        profileName: 'Order Profile',
+        blockName: 'Wait Block',
+        eventName: 'Order Placed',
+      },
+    ],
+  },
+};

package/v2Containers/Viber/index.js

@@ -82,6 +82,7 @@ export const Viber = (props) => {
     viberData = {},
     selectedOfferDetails = [],
     eventContextTags,
+    waitEventContextTags,
     // TestAndPreviewSlidebox props
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,
     handleTestAndPreview: propsHandleTestAndPreview,
@@ -287,6 +288,7 @@ export const Viber = (props) => {
           userLocale={localStorage.getItem("jlocale") || "en"}
           selectedOfferDetails={selectedOfferDetails}
           eventContextTags={eventContextTags}
+          waitEventContextTags={waitEventContextTags}
         />
       </CapColumn>
       <div className="viber-textarea-wrapper">
@@ -592,6 +594,7 @@ export const Viber = (props) => {
         userLocale={localStorage.getItem("jlocale") || "en"}
         selectedOfferDetails={selectedOfferDetails}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
       />
       <CapColumn className="cta-actions">
         <CapButton

package/v2Containers/WebPush/Create/hooks/useTagManagement.js

@@ -22,8 +22,6 @@ export const useTagManagement = ({
   metaEntities,
   getDefaultTags,
   supportedTags = EMPTY_ARRAY,
-  injectedTags,
-  eventContextTags = EMPTY_ARRAY,
 }) => {
   const [tags, setTags] = useState([]);
   const tagFetchKeyRef = useRef(null);

package/v2Containers/WebPush/Create/index.js

@@ -84,6 +84,7 @@ const MemoizedTagList = memo(({
   injectedTags,
   selectedOfferDetails,
   eventContextTags,
+  waitEventContextTags,
   forwardedTags,
   onTagSelect,
   restrictPersonalization = false,
@@ -99,6 +100,7 @@ const MemoizedTagList = memo(({
     injectedTags={injectedTags}
     selectedOfferDetails={selectedOfferDetails}
     eventContextTags={eventContextTags}
+    waitEventContextTags={waitEventContextTags}
     forwardedTags={forwardedTags}
     onTagSelect={onTagSelect}
     restrictPersonalization={restrictPersonalization}
@@ -116,6 +118,7 @@ const MemoizedTagList = memo(({
     && prevProps.injectedTags === nextProps.injectedTags
     && prevProps.selectedOfferDetails === nextProps.selectedOfferDetails
     && prevProps.eventContextTags === nextProps.eventContextTags
+    && prevProps.waitEventContextTags === nextProps.waitEventContextTags
     && prevProps.forwardedTags === nextProps.forwardedTags
     && prevProps.onTagSelect === nextProps.onTagSelect
     && prevProps.restrictPersonalization === nextProps.restrictPersonalization
@@ -152,6 +155,7 @@ const WebPushCreate = ({
   forwardedTags,
   selectedOfferDetails = [],
   eventContextTags = [],
+  waitEventContextTags = {},
   templateActions: templateActionsProps,
   Templates,
   restrictPersonalization = false,
@@ -232,6 +236,7 @@ const WebPushCreate = ({
     supportedTags: memoizedSupportedTags,
     injectedTags,
     eventContextTags,
+    waitEventContextTags,
   });
   const { tags, handleOnTagsContextChange, validationConfig } = tagState;
   const { weCrmAccounts } = Templates;
@@ -837,12 +842,13 @@ const WebPushCreate = ({
       injectedTags,
       selectedOfferDetails,
       eventContextTags,
+      waitEventContextTags,
       forwardedTags,
       restrictPersonalization,
       disabled: restrictPersonalization,
       disableTooltipMsg: restrictPersonalization ? formatMessage(messages.personalizationNotSupportedAnonymous) : undefined,
     }),
-    [tags, injectedTags, selectedOfferDetails, eventContextTags, forwardedTags, restrictPersonalization, formatMessage],
+    [tags, injectedTags, selectedOfferDetails, eventContextTags, waitEventContextTags, forwardedTags, restrictPersonalization, formatMessage],
   );
 
   // Memoized TagList components with optimized props
@@ -1083,6 +1089,7 @@ WebPushCreate.propTypes = {
   forwardedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   templateActions: PropTypes.object,
   restrictPersonalization: PropTypes.bool,
 };
@@ -1111,6 +1118,7 @@ WebPushCreate.defaultProps = {
   forwardedTags: {},
   selectedOfferDetails: [],
   eventContextTags: [],
+  waitEventContextTags: {},
   templateActions: {},
   Templates: {},
   restrictPersonalization: false,

package/v2Containers/Whatsapp/index.js

@@ -180,6 +180,7 @@ export const Whatsapp = (props) => {
     getFormData,
     selectedOfferDetails,
     eventContextTags,
+    waitEventContextTags = {},
     metaDataStatus = "",
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,
     handleTestAndPreview: propsHandleTestAndPreview,
@@ -950,6 +951,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
               injectedTags={injectedTags || {}}
               selectedOfferDetails={selectedOfferDetails}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
             />
           )}
         </>
@@ -1951,6 +1953,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
                             injectedTags={injectedTags || {}}
                             selectedOfferDetails={selectedOfferDetails}
                             eventContextTags={eventContextTags}
+                            waitEventContextTags={waitEventContextTags}
                           />
                         )
                       : !isAuthenticationTemplate && (
@@ -2757,6 +2760,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
                 injectedTags={injectedTags || {}}
                 selectedOfferDetails={selectedOfferDetails}
                 eventContextTags={eventContextTags}
+                waitEventContextTags={waitEventContextTags}
               />
             )
           }
@@ -2875,6 +2879,7 @@ const isAuthenticationTemplate = isEqual(templateCategory, WHATSAPP_CATEGORIES.a
               injectedTags={injectedTags || {}}
               selectedOfferDetails={selectedOfferDetails}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
             />
           )}
           {isBtnTypeQuickReply && (