@capillarytech/creatives-library 8.0.336 → 8.0.338

package/v2Containers/Email/index.js

@@ -518,7 +518,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
         const isDragDropForHide = nextProps.Email.CmsSettings.isDragDrop && this.checkBeeEditorAllowedForLibrary();
         _.forEach(schema.containers, (container) => {
           if (container.isActive) {
-            _.forEach(container.tabBarExtraContent.sections[0].inputFields[0].cols, (col) => {
+            _.forEach(container?.tabBarExtraContent?.sections?.[0]?.inputFields?.[0]?.cols, (col) => {
               if (col.id === 'insert-image') {
                 col.style.display = isDragDropForHide ? 'none' : '';
               }
@@ -1379,6 +1379,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
       saveObj: {},
       showEdmEmailTemplates: false,
       editDataSet: false,
+      isGetBeeData: false,
     }, () => {
 
     });
@@ -2831,7 +2832,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
   }
 
   handleCancel = () => {
-    this.setState({ showConfirmationModal: false });
+    this.setState({ showConfirmationModal: false, editDataSet: false, isGetBeeData: false });
   }
 
   handleCancelModal = () => {
@@ -3169,6 +3170,7 @@ export class Email extends React.Component { // eslint-disable-line react/prefer
                   moduleType={moduleType}
                   showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
                   eventContextTags={this.props?.eventContextTags}
+                  waitEventContextTags={this.props?.waitEventContextTags}
                   forwardedTags={this.props?.forwardedTags}
                   isLoyaltyModule={this.props?.isLoyaltyModule}
                   isGetBeeData={this.state.isGetBeeData}

package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js

@@ -54,6 +54,7 @@ const EmailHTMLEditor = (props) => {
     globalActions,
     loadingTags,
     eventContextTags,
+    waitEventContextTags,
     forwardedTags,
     selectedOfferDetails,
     currentOrgDetails,
@@ -510,7 +511,7 @@ const EmailHTMLEditor = (props) => {
         setTagValidationError(null);
       }
     }
-  }, [tags, injectedTags, location, getDefaultTags, eventContextTags, showLiquidErrorInFooter]);
+  }, [tags, injectedTags, location, getDefaultTags, eventContextTags, waitEventContextTags, showLiquidErrorInFooter]);
 
   // Store the last validation state received from HTMLEditor
   const lastValidationStateRef = useRef(null);
@@ -1100,6 +1101,7 @@ const EmailHTMLEditor = (props) => {
               injectedTags={injectedTags || {}}
               selectedOfferDetails={selectedOfferDetails}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               showHeading
               showTagList
               showInput
@@ -1124,6 +1126,7 @@ const EmailHTMLEditor = (props) => {
             injectedTags={injectedTags}
             location={location}
             eventContextTags={eventContextTags}
+            waitEventContextTags={waitEventContextTags}
             selectedOfferDetails={selectedOfferDetails}
             channel={EMAIL}
             userLocale={intl.locale || 'en'}
@@ -1151,6 +1154,7 @@ EmailHTMLEditor.propTypes = {
   globalActions: PropTypes.object,
   loadingTags: PropTypes.bool,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   forwardedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   currentOrgDetails: PropTypes.object,
@@ -1197,6 +1201,7 @@ EmailHTMLEditor.defaultProps = {
   globalActions: {},
   loadingTags: false,
   eventContextTags: [],
+  waitEventContextTags: {},
   forwardedTags: {},
   selectedOfferDetails: [],
   currentOrgDetails: {},

package/v2Containers/EmailWrapper/components/EmailWrapperView.js

@@ -173,6 +173,7 @@ const EmailWrapperView = ({
   forwardedTags,
   selectedOfferDetails,
   eventContextTags,
+  waitEventContextTags,
   getFormdata,
   isGetFormData,
   getLiquidTags,
@@ -246,6 +247,7 @@ const EmailWrapperView = ({
     globalActions,
     loadingTags,
     eventContextTags,
+    waitEventContextTags,
     forwardedTags,
     selectedOfferDetails,
     currentOrgDetails,
@@ -371,6 +373,7 @@ EmailWrapperView.propTypes = {
   forwardedTags: PropTypes.object,
   selectedOfferDetails: PropTypes.array,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   emailActions: PropTypes.object,
   Email: PropTypes.object,
   templateData: PropTypes.object,

package/v2Containers/EmailWrapper/components/__tests__/EmailHTMLEditor.test.js

@@ -71,7 +71,10 @@ jest.mock('../../../../v2Components/HtmlEditor/index.lazy', () => {
     }));
 
     return (
-      <div data-testid="html-editor">
+      <div
+        data-testid="html-editor"
+        data-wait-event-context-tags={JSON.stringify(props.waitEventContextTags ?? null)}
+      >
         <button
           onClick={() => props.onContentChange && props.onContentChange('<p>New content</p>')}
           data-testid="trigger-content-change"
@@ -130,7 +133,10 @@ jest.mock('../../../../v2Components/HtmlEditor', () => {
     }));
 
     return (
-      <div data-testid="html-editor">
+      <div
+        data-testid="html-editor"
+        data-wait-event-context-tags={JSON.stringify(props.waitEventContextTags ?? null)}
+      >
         <button
           onClick={() => props.onContentChange && props.onContentChange('<p>New content</p>')}
           data-testid="trigger-content-change"
@@ -364,6 +370,7 @@ const defaultProps = {
   },
   loadingTags: false,
   eventContextTags: [],
+  waitEventContextTags: {},
   forwardedTags: {},
   selectedOfferDetails: [],
   currentOrgDetails: {
@@ -522,6 +529,17 @@ describe('EmailHTMLEditor', () => {
     });
   });
 
+  describe('waitEventContextTags', () => {
+    it('forwards waitEventContextTags to HTMLEditor', () => {
+      const waitMap = { b1: { eventName: 'E', blockName: 'B', tags: ['t'] } };
+      renderWithIntl({ waitEventContextTags: waitMap });
+      expect(screen.getByTestId('html-editor')).toHaveAttribute(
+        'data-wait-event-context-tags',
+        JSON.stringify(waitMap),
+      );
+    });
+  });
+
   describe('Content Initialization', () => {
     it('initializes with empty content in create mode', () => {
       renderWithIntl({ isGetFormData: false });

package/v2Containers/EmailWrapper/components/__tests__/EmailWrapperView.test.js

@@ -37,7 +37,14 @@ jest.mock('../EmailHTMLEditor', () => {
       getContentForPreview: jest.fn(() => '<p>Test</p>'),
     }));
 
-    return <div data-testid="email-html-editor">HTML Editor</div>;
+    return (
+      <div
+        data-testid="email-html-editor"
+        data-wait-event-context-tags={JSON.stringify(props.waitEventContextTags ?? null)}
+      >
+        HTML Editor
+      </div>
+    );
   });
 });
 
@@ -137,6 +144,7 @@ const defaultProps = {
   forwardedTags: {},
   selectedOfferDetails: [],
   eventContextTags: [],
+  waitEventContextTags: {},
   getFormdata: jest.fn(),
   isGetFormData: false,
   getLiquidTags: jest.fn(),
@@ -171,6 +179,13 @@ describe('EmailWrapperView', () => {
     jest.clearAllMocks();
   });
 
+  it('passes waitEventContextTags to EmailHTMLEditor when HTML editor is shown', () => {
+    const waitMap = { b1: { eventName: 'E', blockName: 'B', tags: [] } };
+    renderWithIntl({ waitEventContextTags: waitMap });
+    const el = screen.getByTestId('email-html-editor');
+    expect(el).toHaveAttribute('data-wait-event-context-tags', JSON.stringify(waitMap));
+  });
+
   describe('Mode Selection UI', () => {
     it('renders mode selection when step is MODE_SELECTION', () => {
       renderWithIntl({ step: STEPS.MODE_SELECTION });

package/v2Containers/EmailWrapper/hooks/useEmailWrapper.js

@@ -51,6 +51,7 @@ const useEmailWrapper = ({
   editor,
   moduleType,
   eventContextTags,
+  waitEventContextTags,
   isLoyaltyModule,
   // Props for CmsTemplates component
   cmsTemplatesLoader,
@@ -736,6 +737,7 @@ const useEmailWrapper = ({
       selectedEditorMode, // Pass selected mode to Email component (only for HTML_EDITOR)
       moduleType,
       eventContextTags,
+      waitEventContextTags,
       isLoyaltyModule,
       showTestAndPreviewSlidebox,
       handleTestAndPreview,
@@ -765,6 +767,7 @@ const useEmailWrapper = ({
     editor,
     moduleType,
     eventContextTags,
+    waitEventContextTags,
     isLoyaltyModule,
     showTestAndPreviewSlidebox,
     handleTestAndPreview,

package/v2Containers/EmailWrapper/index.js

@@ -63,6 +63,7 @@ const EmailWrapper = (props) => {
     onEnterTemplateName,
     onRemoveTemplateName,
     eventContextTags,
+    waitEventContextTags,
     isLoyaltyModule,
     cmsTemplatesLoader,
     onPreviewContentClicked,
@@ -130,6 +131,7 @@ const EmailWrapper = (props) => {
     onEnterTemplateName,
     onRemoveTemplateName,
     eventContextTags,
+    waitEventContextTags,
     isLoyaltyModule,
     cmsTemplatesLoader,
     onPreviewContentClicked,
@@ -184,6 +186,7 @@ const EmailWrapper = (props) => {
         forwardedTags={forwardedTags}
         selectedOfferDetails={selectedOfferDetails}
         eventContextTags={eventContextTags}
+        waitEventContextTags={waitEventContextTags}
         getFormdata={getFormdata}
         isGetFormData={isGetFormData}
         getLiquidTags={globalActionsProp?.getLiquidTags}
@@ -241,6 +244,7 @@ EmailWrapper.propTypes = {
   onEnterTemplateName: PropTypes.func,
   onRemoveTemplateName: PropTypes.func,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   isLoyaltyModule: PropTypes.bool,
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,

package/v2Containers/EmailWrapper/tests/useEmailWrapper.edgeCases.test.js

@@ -112,6 +112,7 @@ describe('useEmailWrapper - Edge Cases', () => {
       editor: 'HTML',
       moduleType: null,
       eventContextTags: [],
+      waitEventContextTags: {},
       isLoyaltyModule: false,
       cmsTemplatesLoader: jest.fn(),
       currentOrgDetails: {},

package/v2Containers/EmailWrapper/tests/useEmailWrapper.test.js

@@ -102,6 +102,7 @@ describe('useEmailWrapper', () => {
       editor: null,
       moduleType: '',
       eventContextTags: [],
+      waitEventContextTags: {},
       isLoyaltyModule: false,
       cmsTemplatesLoader: false,
       currentOrgDetails: { id: 'org1' },
@@ -120,6 +121,14 @@ describe('useEmailWrapper', () => {
     expect(result.current.onTemplateNameChange).toBeInstanceOf(Function);
   });
 
+  it('passes waitEventContextTags through emailProps', () => {
+    const waitMap = { block1: { eventName: 'E', blockName: 'B', tags: [] } };
+    const { result } = renderHook(() =>
+      useEmailWrapper({ ...mockProps, waitEventContextTags: waitMap }),
+    );
+    expect(result.current.emailProps.waitEventContextTags).toEqual(waitMap);
+  });
+
   it('handles template name change correctly', () => {
     const { result } = renderHook(() => useEmailWrapper(mockProps));
 

package/v2Containers/InAppWrapper/hooks/__tests__/useInAppWrapper.test.js

@@ -424,6 +424,7 @@ describe('useInAppWrapper', () => {
 
       expect(capturedState.inAppProps.getDefaultTags).toBe('defaultTags');
     });
+
   });
 
   describe('isShowInAppCreate', () => {

package/v2Containers/MobilePush/Create/index.js

@@ -1966,6 +1966,7 @@ export class Create extends React.Component { // eslint-disable-line react/prefe
                 hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
                 isFullMode={this.props.isFullMode}
                 eventContextTags={this.props?.eventContextTags}
+                waitEventContextTags={this.props?.waitEventContextTags}
                 messageDetails={this.props?.messageDetails}
                 restrictPersonalization={this.props.restrictPersonalization}
               />
@@ -2068,6 +2069,7 @@ Create.propTypes = {
   onPreviewContentClicked: PropTypes.func,
   onTestContentClicked: PropTypes.func,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   getLiquidTags: PropTypes.func,
   showLiquidErrorInFooter: PropTypes.func,
   showTestAndPreviewSlidebox: PropTypes.bool,

package/v2Containers/MobilePush/Edit/index.js

@@ -2233,6 +2233,7 @@ export class Edit extends React.Component { // eslint-disable-line react/prefer-
                 hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
                 isFullMode={this.props.isFullMode}
                 eventContextTags={this.props?.eventContextTags}
+                waitEventContextTags={this.props?.waitEventContextTags}
                 restrictPersonalization={this.props.restrictPersonalization}
               />;
               })()}
@@ -2339,6 +2340,7 @@ Edit.propTypes = {
   onTestContentClicked: PropTypes.func,
   creativesMode: PropTypes.string,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   getLiquidTags: PropTypes.func,
   showLiquidErrorInFooter: PropTypes.func,
   showTestAndPreviewSlidebox: PropTypes.bool,

package/v2Containers/MobilepushWrapper/index.js

@@ -72,7 +72,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
   }
 
   render() {
-    const {mobilePushCreateMode, step, getFormData, getLiquidTags, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
+    const {mobilePushCreateMode, step, getFormData, getLiquidTags, setIsLoadingContent, isGetFormData, query, isFullMode, showTemplateName, type, onValidationFail, onPreviewContentClicked, onTestContentClicked, templateData, eventContextTags = [], waitEventContextTags = {},showTestAndPreviewSlidebox, handleTestAndPreview, handleCloseTestAndPreview, restrictPersonalization, isAnonymousType, onPersonalizationTokensChange} = this.props;
     const {templateName} = this.state;
     const isShowMobilepushCreate = !isEmpty(mobilePushCreateMode);
     return (
@@ -121,6 +121,7 @@ export class MobilepushWrapper extends React.Component { // eslint-disable-line
               templateData={templateData}
               hideTestAndPreviewBtn={this.props.hideTestAndPreviewBtn}
               eventContextTags={eventContextTags}
+              waitEventContextTags={waitEventContextTags}
               showLiquidErrorInFooter={this.props.showLiquidErrorInFooter}
               showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
               handleTestAndPreview={handleTestAndPreview}
@@ -155,6 +156,7 @@ MobilepushWrapper.propTypes = {
   type: PropTypes.string,
   onValidationFail: PropTypes.func,
   eventContextTags: PropTypes.array,
+  waitEventContextTags: PropTypes.object,
   showLiquidErrorInFooter: PropTypes.func,
   showTestAndPreviewSlidebox: PropTypes.bool,
   handleTestAndPreview: PropTypes.func,

package/v2Containers/Rcs/index.js

@@ -148,6 +148,7 @@ export const Rcs = (props) => {
     smsRegister,
     selectedOfferDetails,
     eventContextTags,
+    waitEventContextTags,
     accountData = {},
     // TestAndPreviewSlidebox props
     showTestAndPreviewSlidebox: propsShowTestAndPreviewSlidebox,

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',
+  },
 });