@capillarytech/creatives-library 8.0.345-alpha.15 → 8.0.345-alpha.16

package/v2Components/CommonTestAndPreview/tests/UnifiedPreview/index.test.js

@@ -9,16 +9,7 @@ import { render, screen } from '@testing-library/react';
 import '@testing-library/jest-dom';
 import { injectIntl, IntlProvider } from 'react-intl';
 import UnifiedPreview from '../../UnifiedPreview';
-import {
-  CHANNELS,
-  DESKTOP,
-  TABLET,
-  MOBILE,
-  ANDROID,
-  IOS,
-  PREVIEW_TAB_RCS,
-  PREVIEW_TAB_SMS_FALLBACK,
-} from '../../constants';
+import { CHANNELS, DESKTOP, TABLET, MOBILE, ANDROID, IOS } from '../../constants';
 import messages from '../../messages';
 
 // Convert messages object to format expected by IntlProvider
@@ -556,195 +547,6 @@ describe('UnifiedPreview', () => {
 
       expect(screen.getByTestId('rcs-sender-id')).toHaveTextContent('RCS_SENDER');
     });
-
-    describe('RCS SMS fallback — Test & Preview tabs', () => {
-      it('without SMS fallback selected, shows only RCS preview (no RCS+SMS tab layout)', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: undefined,
-        };
-
-        const { container } = render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        expect(container.querySelector('.unified-preview-rcs-tabs')).toBeNull();
-        expect(screen.getByTestId('rcs-preview')).toBeInTheDocument();
-        expect(screen.queryByTestId('sms-preview')).not.toBeInTheDocument();
-      });
-
-      it('with SMS fallback template body, shows RCS and Fallback SMS tabs', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: {
-            content: 'SMS fallback body',
-            templateContent: 'SMS fallback body',
-          },
-        };
-
-        const { container } = render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        expect(container.querySelector('.unified-preview-rcs-tabs')).toBeInTheDocument();
-        expect(
-          screen.getByRole('tab', { name: messages.rcsTab.defaultMessage })
-        ).toBeInTheDocument();
-        expect(
-          screen.getByRole('tab', { name: messages.smsFallbackTab.defaultMessage })
-        ).toBeInTheDocument();
-      });
-
-      it('on SMS fallback tab, renders SMS preview with resolved fallback text when smsFallbackResolvedText is set', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: {
-            content: '{{var}}',
-            templateContent: '{{var}}',
-          },
-          smsFallbackResolvedText: 'Resolved SMS for preview',
-          activePreviewTab: PREVIEW_TAB_SMS_FALLBACK,
-          onPreviewTabChange: jest.fn(),
-        };
-
-        render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        expect(screen.getByTestId('sms-content')).toHaveTextContent('Resolved SMS for preview');
-      });
-
-      it('on RCS tab (default), renders RCS preview when dual tabs are shown', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Only RCS pane' },
-          smsFallbackContent: { content: 'SMS', templateContent: 'SMS' },
-          activePreviewTab: PREVIEW_TAB_RCS,
-          onPreviewTabChange: jest.fn(),
-        };
-
-        render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        expect(screen.getByTestId('rcs-preview')).toBeInTheDocument();
-        expect(screen.getByTestId('rcs-content')).toHaveTextContent(/Only RCS pane/);
-      });
-
-      it('on SMS fallback tab, shows raw template when no varmap and no resolved text', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: {
-            content: 'Hello {{name}}',
-            templateContent: 'Hello {{name}}',
-            // no rcsSmsFallbackVarMapped
-          },
-          smsFallbackResolvedText: undefined,
-          activePreviewTab: PREVIEW_TAB_SMS_FALLBACK,
-          onPreviewTabChange: jest.fn(),
-        };
-
-        render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        // rawFallbackTemplate is shown directly — {{tags}} remain visible
-        expect(screen.getByTestId('sms-content')).toHaveTextContent('Hello {{name}}');
-      });
-
-      it('on SMS fallback tab, treats empty resolved text as absent and shows raw template', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: {
-            content: 'Raw {{var}} template',
-            templateContent: 'Raw {{var}} template',
-          },
-          smsFallbackResolvedText: '',
-          activePreviewTab: PREVIEW_TAB_SMS_FALLBACK,
-          onPreviewTabChange: jest.fn(),
-        };
-
-        render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        expect(screen.getByTestId('sms-content')).toHaveTextContent('Raw {{var}} template');
-      });
-
-      it('on SMS fallback tab, applies varmap slot substitution when varmap entries exist and no resolved text', () => {
-        // getFallbackResolvedContent key format: `${fullToken}_${segmentIndex}`
-        // 'Hello {{name}}' → segments ['Hello ', '{{name}}'], so {{name}} is at index 1 → key '{{name}}_1'
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: {
-            content: 'Hello {{name}}',
-            templateContent: 'Hello {{name}}',
-            rcsSmsFallbackVarMapped: { '{{name}}_1': 'World' },
-          },
-          smsFallbackResolvedText: undefined,
-          activePreviewTab: PREVIEW_TAB_SMS_FALLBACK,
-          onPreviewTabChange: jest.fn(),
-        };
-
-        render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        expect(screen.getByTestId('sms-content')).toHaveTextContent('Hello World');
-      });
-
-      it('on SMS fallback tab, resolved text takes priority over varmap entries', () => {
-        const props = {
-          ...defaultProps,
-          channel: CHANNELS.RCS,
-          content: { rcsTitle: 'Hello RCS' },
-          smsFallbackContent: {
-            content: 'Hello {{name}}',
-            templateContent: 'Hello {{name}}',
-            rcsSmsFallbackVarMapped: { '{{name}}_1': 'World' },
-          },
-          smsFallbackResolvedText: 'Hello John',
-          activePreviewTab: PREVIEW_TAB_SMS_FALLBACK,
-          onPreviewTabChange: jest.fn(),
-        };
-
-        render(
-          <TestWrapper>
-            <ComponentToRender {...props} />
-          </TestWrapper>
-        );
-
-        // resolvedText wins over varmap substitution
-        expect(screen.getByTestId('sms-content')).toHaveTextContent('Hello John');
-      });
-    });
   });
 
   describe('Channel Routing - INAPP', () => {

package/v2Components/CommonTestAndPreview/tests/index.test.js

@@ -30,28 +30,23 @@ jest.mock('@capillarytech/cap-ui-library/CapNotification', () => ({
 }));
 
 // Mock child components - must use React.createElement to avoid hoisting issues
-let lastLeftPanelContentProps = null;
 jest.mock('../LeftPanelContent', () => {
   // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const ReactLib = require('react');
   return {
     __esModule: true,
-    default: function MockLeftPanelContent(props) {
-      lastLeftPanelContentProps = props;
-      const editorEl = props.renderCustomValuesEditor ? props.renderCustomValuesEditor() : null;
-      return ReactLib.createElement('div', { 'data-testid': 'left-panel' }, 'Left Panel', editorEl);
+    default: function MockLeftPanelContent() {
+      return ReactLib.createElement('div', { 'data-testid': 'left-panel' }, 'Left Panel');
     },
   };
 });
 
-let lastCustomValuesEditorProps = null;
 jest.mock('../CustomValuesEditor', () => {
   // eslint-disable-next-line global-require, import/no-extraneous-dependencies
   const ReactLib = require('react');
   return {
     __esModule: true,
-    default: function MockCustomValuesEditor(props) {
-      lastCustomValuesEditorProps = props;
+    default: function MockCustomValuesEditor() {
       return ReactLib.createElement('div', { 'data-testid': 'custom-values-editor' }, 'Custom Values Editor');
     },
   };
@@ -196,8 +191,6 @@ describe('CommonTestAndPreview', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     lastSendTestMessageProps = null;
-    lastLeftPanelContentProps = null;
-    lastCustomValuesEditorProps = null;
     // Reset all mock function implementations
     Object.values(mockActions).forEach((mockFn) => {
       if (jest.isMockFunction(mockFn)) {
@@ -252,24 +245,6 @@ describe('CommonTestAndPreview', () => {
       });
     });
 
-    it('should call getSenderDetailsRequested for RCS and SMS when channel is RCS', async () => {
-      render(
-        <TestWrapper>
-          <CommonTestAndPreview {...defaultProps} channel={CHANNELS.RCS} />
-        </TestWrapper>
-      );
-      await waitFor(() => {
-        expect(mockActions.getSenderDetailsRequested).toHaveBeenCalledWith({
-          channel: CHANNELS.RCS,
-          orgUnitId: -1,
-        });
-        expect(mockActions.getSenderDetailsRequested).toHaveBeenCalledWith({
-          channel: CHANNELS.SMS,
-          orgUnitId: -1,
-        });
-      });
-    });
-
     it('should not call getSenderDetailsRequested when channel is INAPP', async () => {
       render(
         <TestWrapper>
@@ -328,7 +303,7 @@ describe('CommonTestAndPreview', () => {
       });
       expect(lastSendTestMessageProps).toBeDefined();
       expect(lastSendTestMessageProps.deliverySettings).toBeDefined();
-      expect(lastSendTestMessageProps.senderDetailsByChannel).toEqual(senderDetailsByChannel);
+      expect(lastSendTestMessageProps.senderDetailsOptions).toEqual(senderDetailsByChannel[CHANNELS.SMS]);
       expect(lastSendTestMessageProps.wecrmAccounts).toEqual([]);
       expect(typeof lastSendTestMessageProps.onSaveDeliverySettings).toBe('function');
       expect(lastSendTestMessageProps.isLoadingSenderDetails).toBe(false);
@@ -3306,107 +3281,4 @@ describe('CommonTestAndPreview', () => {
       });
     });
   });
-
-  describe('SMS DLT and mustache tag discrimination (smsTemplateHasMustacheTags / buildSyntheticSmsMustacheTags)', () => {
-    it('should return no tags for SMS content that contains only DLT {#var#} tokens', async () => {
-      render(
-        <TestWrapper>
-          <CommonTestAndPreview
-            {...defaultProps}
-            channel={CHANNELS.SMS}
-            formData={{ 0: { 'sms-editor': 'Order {#orderId#} is confirmed' } }}
-            extractedTags={[]}
-          />
-        </TestWrapper>
-      );
-
-      await waitFor(() => expect(lastLeftPanelContentProps).not.toBeNull());
-
-      // smsTemplateHasMustacheTags returns false for DLT-only → extractedTags is []
-      expect(lastLeftPanelContentProps.extractedTags).toEqual([]);
-    });
-
-    it('should build synthetic tags from {{mustache}} tokens, excluding DLT {#var#} tokens', async () => {
-      render(
-        <TestWrapper>
-          <CommonTestAndPreview
-            {...defaultProps}
-            channel={CHANNELS.SMS}
-            formData={{ 0: { 'sms-editor': 'Hi {{name}}, order {#orderId#} shipped' } }}
-            extractedTags={[]}
-          />
-        </TestWrapper>
-      );
-
-      await waitFor(() => expect(lastLeftPanelContentProps).not.toBeNull());
-
-      const tags = lastLeftPanelContentProps.extractedTags;
-      // Only {{name}} should become a tag — {#orderId#} must be excluded
-      expect(tags).toHaveLength(1);
-      expect(tags[0].name).toBe('name');
-    });
-
-    it('should use API-extracted tags when present instead of building synthetic ones', async () => {
-      const apiTags = [{ name: 'firstName', metaData: { userDriven: true }, children: [] }];
-      render(
-        <TestWrapper>
-          <CommonTestAndPreview
-            {...defaultProps}
-            channel={CHANNELS.SMS}
-            formData={{ 0: { 'sms-editor': 'Hi {{firstName}}' } }}
-            extractedTags={apiTags}
-          />
-        </TestWrapper>
-      );
-
-      await waitFor(() => expect(lastLeftPanelContentProps).not.toBeNull());
-
-      // API tags take priority over buildSyntheticSmsMustacheTags
-      expect(lastLeftPanelContentProps.extractedTags).toEqual(apiTags);
-    });
-  });
-
-  describe('handleDiscardCustomValues — preview reset', () => {
-    it('should call updatePreviewRequested when handleDiscardCustomValues is invoked', async () => {
-      render(
-        <TestWrapper>
-          <CommonTestAndPreview
-            {...defaultProps}
-            channel={CHANNELS.SMS}
-            formData={{ 0: { 'sms-editor': 'Hi {{name}}' } }}
-          />
-        </TestWrapper>
-      );
-
-      await waitFor(() => expect(lastCustomValuesEditorProps).not.toBeNull());
-
-      lastCustomValuesEditorProps.handleDiscardCustomValues();
-
-      expect(mockActions.updatePreviewRequested).toHaveBeenCalledTimes(1);
-    });
-
-    it('should call updatePreviewRequested with RCS channel when handleDiscardCustomValues is invoked for RCS with fallback', async () => {
-      render(
-        <TestWrapper>
-          <CommonTestAndPreview
-            {...defaultProps}
-            channel={CHANNELS.RCS}
-            smsFallbackContent={{
-              templateContent: 'Fallback {{name}}',
-              content: 'Fallback {{name}}',
-            }}
-            formData={{}}
-          />
-        </TestWrapper>
-      );
-
-      await waitFor(() => expect(lastCustomValuesEditorProps).not.toBeNull());
-
-      lastCustomValuesEditorProps.handleDiscardCustomValues();
-
-      // updatePreviewRequested is called; syncSmsFallbackPreview (which hits Api directly) is NOT called
-      expect(mockActions.updatePreviewRequested).toHaveBeenCalledTimes(1);
-    });
-  });
 });
-

package/v2Components/CommonTestAndPreview/tests/sagas.test.js

@@ -5,7 +5,7 @@
  */
 
 import {
-  call, put, takeLatest, takeEvery, all,
+  call, put, takeLatest, all,
 } from 'redux-saga/effects';
 import {
   searchCustomersSaga,
@@ -1333,7 +1333,7 @@ describe('CommonTestAndPreview Sagas', () => {
     it('should watch for GET_SENDER_DETAILS_REQUESTED', () => {
       const generator = watchGetSenderDetails();
       expect(generator.next().value).toEqual(
-        takeEvery('app/CommonTestAndPreview/GET_SENDER_DETAILS_REQUESTED', getSenderDetailsSaga)
+        takeLatest('app/CommonTestAndPreview/GET_SENDER_DETAILS_REQUESTED', getSenderDetailsSaga)
       );
       expect(generator.next().done).toBe(true);
     });

package/v2Components/FormBuilder/index.js

@@ -37,7 +37,6 @@ import { createStructuredSelector } from 'reselect';
 import { CAP_SPACE_12, CAP_SPACE_08, FONT_COLOR_05, FONT_COLOR_04 } from '@capillarytech/cap-ui-library/styled/variables';
 import UnifiedPreview from '../CommonTestAndPreview/UnifiedPreview';
 import { ANDROID } from '../CommonTestAndPreview/constants';
-import TemplatePreview from '../TemplatePreview';
 import TagList from '../../v2Containers/TagList';
 import CapTagListWithInput from '../CapTagListWithInput';
 import SlideBox from '../SlideBox';
@@ -2991,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>
           );
@@ -3020,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 || {}}
@@ -3659,9 +3660,7 @@ class FormBuilder extends React.Component { // eslint-disable-line react/prefer-
                     channel={channel}
                     eventContextTags={this.props?.eventContextTags}
                     restrictPersonalization={this.props.restrictPersonalization}
-                    getPopupContainer={this.props.tagListGetPopupContainer}
-                    popoverOverlayStyle={this.props.tagListPopoverOverlayStyle}
-                    popoverOverlayClassName={this.props.tagListPopoverOverlayClassName}
+                    waitEventContextTags={this.props?.waitEventContextTags}
                   />
                 </CapColumn>
               );
@@ -3708,6 +3707,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 || {}}
@@ -4002,6 +4002,9 @@ 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}
                 />
               </CapColumn>
             );
@@ -4304,6 +4307,7 @@ FormBuilder.defaultProps = {
   userLocale: localStorage.getItem('jlocale') || 'en',
   showLiquidErrorInFooter: () => {},
   metaDataStatus: "",
+  waitEventContextTags: {},
   isTestAndPreviewMode: false, // Default to false to maintain existing behavior
 };
 
@@ -4352,15 +4356,13 @@ FormBuilder.propTypes = {
   type: PropTypes.string.isRequired,
   isEmailLoading: PropTypes.bool.isRequired,
   moduleType: PropTypes.string.isRequired,
-  showLiquidErrorInFooter: PropTypes.func.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
   restrictPersonalization: PropTypes.bool,
-  tagListGetPopupContainer: PropTypes.func,
-  tagListPopoverOverlayStyle: PropTypes.object,
-  tagListPopoverOverlayClassName: PropTypes.string,
 };
 
 const mapStateToProps = createStructuredSelector({

package/v2Components/TemplatePreview/_templatePreview.scss

@@ -537,21 +537,20 @@
       .unicode-disabled{
         font-size: 16px;
       }
-      position: absolute;
-      overflow: auto;
-      top: 0;
-      left: 17%;
-      white-space: pre-wrap;
-      word-break: break-word;
-      max-height: 100%;
-      line-height: 14px;
-      font-size: 10px;
-      font-family: 'open-sans';
-
       &.sms {
+        max-height: 100%;
+        position: absolute;
         // width: initial;
+        overflow: auto;
+        top: 0;
+        left: 17%;
+        white-space: pre-wrap;
+        word-break: break-word;
+        line-height: 14px;
         padding: 0 8px 8px 8px;
+        font-size: 10px;
         width: 100%;
+        font-family: 'open-sans';
         .rcs-image{
           width: 100%;
           height: 123px;
@@ -583,12 +582,22 @@
       &:not(.sms){
         padding: 4px;
         background: #3F51B5;
+        position: absolute;
         // width: initial;
+        overflow: auto;
+        top: 0;
+        left: 17%;
+        white-space: pre-wrap;
+        word-break: break-word;
         border-radius: 4px;
+        max-height: 100%;
         color: #FFFFFF;
         width: 70%;
         min-height: 26px;
+        line-height: 14px;
         padding: 8px;
+        font-size: 10px;
+        font-family: 'open-sans';
       }
       &.message-pop-carousel {
         position: relative; 
@@ -833,27 +842,6 @@
   }
 }
 
-.shell-v2.rcs-preview {
-  // Override `.message-pop:not(.sms)` (blue background) for RCS carousel cards.
-  .msg-container.sms {
-    .message-pop.sms {
-      .rcs-carousel-card {
-        background: $CAP_WHITE;
-        color: $CAP_G01;
-        width: 10.4rem;
-        left: 0;
-        flex-shrink: 0;
-        padding: $CAP_SPACE_04 0 $CAP_SPACE_08;
-        border-radius: 0.428rem;
-
-        .carousel-title {
-          font-weight: 700 !important;
-        }
-      }
-    }
-  }
-}
-
 .align-center {
   text-align: center;
 }
@@ -1024,7 +1012,9 @@
   top: 0;
 }
 .video-icon {
-  position: sticky;
+  position: absolute;
+  right: -17px;
+  bottom: -17px;
 }
 
 .zalo-preview-container {