@capillarytech/creatives-library 8.0.304 → 8.0.306

package/v2Containers/EmailWrapper/components/EmailHTMLEditor.js

@@ -956,8 +956,8 @@ const EmailHTMLEditor = (props) => {
       }
     };
 
-    // If liquid enabled, validate first using extractTags API
-    if (isLiquidEnabled && getLiquidTags) {
+    // If liquid enabled, validate first using extractTags API (skip in full/standalone mode)
+    if (isLiquidEnabled && getLiquidTags && !isFullMode) {
       // Note: API validation errors are already cleared at the start of handleSave
       // This ensures fresh validation on every save attempt
 

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

@@ -1176,9 +1176,10 @@ describe('EmailHTMLEditor', () => {
       mockGetAllIssues.mockReturnValue([]);
 
       // Set subject and content via component interactions
+      // Use isFullMode: false (library mode) to test liquid validation path
       const { rerender } = renderWithIntl({
         isGetFormData: false,
-        isFullMode: true,
+        isFullMode: false,
         metaEntities: {
           tags: {
             standard: [{ name: 'customer.name' }],
@@ -1206,7 +1207,7 @@ describe('EmailHTMLEditor', () => {
             <EmailHTMLEditor
               {...defaultProps}
               isGetFormData
-              isFullMode
+              isFullMode={false}
               metaEntities={{
                 tags: {
                   standard: [{ name: 'customer.name' }],
@@ -1231,9 +1232,10 @@ describe('EmailHTMLEditor', () => {
       mockGetAllIssues.mockReturnValue([]);
 
       // Set subject and content via component interactions
+      // Use isFullMode: false (library mode) to test liquid validation path
       const { rerender } = renderWithIntl({
         isGetFormData: false,
-        isFullMode: true,
+        isFullMode: false,
         isLiquidEnabled: true,
         getLiquidTags,
       });
@@ -1253,7 +1255,7 @@ describe('EmailHTMLEditor', () => {
       await act(async () => {
         rerender(
           <IntlProvider locale="en" messages={{}}>
-            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode getLiquidTags={getLiquidTags} />
+            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode={false} getLiquidTags={getLiquidTags} />
           </IntlProvider>
         );
       });
@@ -1281,9 +1283,10 @@ describe('EmailHTMLEditor', () => {
       mockGetAllIssues.mockReturnValue([]);
 
       // Set subject and content via component interactions
+      // Use isFullMode: false (library mode) to test liquid validation path
       const { rerender } = renderWithIntl({
         isGetFormData: false,
-        isFullMode: true,
+        isFullMode: false,
         isLiquidEnabled: true,
         getLiquidTags,
         showLiquidErrorInFooter,
@@ -1305,7 +1308,7 @@ describe('EmailHTMLEditor', () => {
       await act(async () => {
         rerender(
           <IntlProvider locale="en" messages={{}}>
-            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode getLiquidTags={getLiquidTags} showLiquidErrorInFooter={showLiquidErrorInFooter} onValidationFail={onValidationFail} />
+            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode={false} getLiquidTags={getLiquidTags} showLiquidErrorInFooter={showLiquidErrorInFooter} onValidationFail={onValidationFail} />
           </IntlProvider>
         );
       });
@@ -1325,13 +1328,7 @@ describe('EmailHTMLEditor', () => {
         return Promise.resolve(true);
       });
 
-      const emailActions = {
-        ...defaultProps.emailActions,
-        transformEmailTemplate: jest.fn((obj, callback) => callback(obj)),
-        createTemplate: jest.fn((obj, callback) => {
-          callback({ templateId: { _id: '123', versions: {} } });
-        }),
-      };
+      const getFormdata = jest.fn();
       const getLiquidTags = jest.fn((content, callback) => {
         callback({ askAiraResponse: { data: [] }, isError: false });
       });
@@ -1339,12 +1336,12 @@ describe('EmailHTMLEditor', () => {
       mockGetAllIssues.mockReturnValue([]);
 
       // Set subject and content via component interactions
+      // Use isFullMode: false (library mode) to test liquid validation path
       const { rerender } = renderWithIntl({
         isGetFormData: false,
-        isFullMode: true,
-        isLiquidEnabled: true,
+        isFullMode: false,
         getLiquidTags,
-        emailActions,
+        getFormdata,
         templateName: 'New Template',
       });
       const input = screen.getByTestId('subject-input');
@@ -1363,7 +1360,7 @@ describe('EmailHTMLEditor', () => {
       await act(async () => {
         rerender(
           <IntlProvider locale="en" messages={{}}>
-            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode getLiquidTags={getLiquidTags} emailActions={emailActions} templateName="New Template" />
+            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode={false} getLiquidTags={getLiquidTags} getFormdata={getFormdata} templateName="New Template" />
           </IntlProvider>
         );
       });
@@ -1372,8 +1369,9 @@ describe('EmailHTMLEditor', () => {
         expect(validateLiquidTemplateContent).toHaveBeenCalled();
       }, { timeout: 5000 });
 
+      // In library mode (isFullMode=false), save proceeds via getFormdata
       await waitFor(() => {
-        expect(emailActions.createTemplate).toHaveBeenCalled();
+        expect(getFormdata).toHaveBeenCalled();
       }, { timeout: 5000 });
     });
 
@@ -2711,4 +2709,98 @@ describe('EmailHTMLEditor', () => {
       expect(screen.getByTestId('html-editor')).toBeInTheDocument();
     });
   });
+
+  describe('isFullMode - skip liquid validation on save', () => {
+    it('skips liquid validation when isFullMode is true', async () => {
+      validateLiquidTemplateContent.mockClear();
+      const getLiquidTags = jest.fn((content, callback) => {
+        callback({ askAiraResponse: { data: [] }, isError: false });
+      });
+      const getFormdata = jest.fn();
+      // Ensure no HTML/Label/Liquid errors from HtmlEditor
+      mockGetAllIssues.mockReturnValue([]);
+
+      const { rerender } = renderWithIntl({
+        isGetFormData: false,
+        isFullMode: true,
+        isLiquidEnabled: true,
+        getLiquidTags,
+        getFormdata,
+      });
+      const input = screen.getByTestId('subject-input');
+      await act(async () => {
+        fireEvent.change(input, { target: { value: 'Valid Subject' } });
+      });
+      const changeButton = screen.getByTestId('trigger-content-change');
+      await act(async () => {
+        fireEvent.click(changeButton);
+      });
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      });
+      // Trigger save
+      await act(async () => {
+        rerender(
+          <IntlProvider locale="en" messages={{}}>
+            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode getLiquidTags={getLiquidTags} getFormdata={getFormdata} />
+          </IntlProvider>
+        );
+      });
+
+      // In full mode, liquid validation should be skipped entirely
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 200));
+      });
+      expect(validateLiquidTemplateContent).not.toHaveBeenCalled();
+    });
+
+    it('proceeds directly to save without liquid validation in full mode', async () => {
+      validateLiquidTemplateContent.mockClear();
+      const getLiquidTags = jest.fn((content, callback) => {
+        callback({ askAiraResponse: { data: [] }, isError: false });
+      });
+      const emailActions = {
+        ...defaultProps.emailActions,
+        transformEmailTemplate: jest.fn((obj, callback) => callback(obj)),
+        createTemplate: jest.fn((obj, callback) => {
+          callback({ templateId: { _id: '123', versions: {} } });
+        }),
+      };
+      // Ensure no HTML/Label/Liquid errors from HtmlEditor
+      mockGetAllIssues.mockReturnValue([]);
+
+      const { rerender } = renderWithIntl({
+        isGetFormData: false,
+        isFullMode: true,
+        getLiquidTags,
+        emailActions,
+        templateName: 'New Template',
+      });
+      const input = screen.getByTestId('subject-input');
+      await act(async () => {
+        fireEvent.change(input, { target: { value: 'Valid Subject' } });
+      });
+      const changeButton = screen.getByTestId('trigger-content-change');
+      await act(async () => {
+        fireEvent.click(changeButton);
+      });
+      await act(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+      });
+      // Trigger save
+      await act(async () => {
+        rerender(
+          <IntlProvider locale="en" messages={{}}>
+            <EmailHTMLEditor {...defaultProps} isGetFormData isFullMode getLiquidTags={getLiquidTags} emailActions={emailActions} templateName="New Template" />
+          </IntlProvider>
+        );
+      });
+
+      // Should skip liquid validation and proceed to save directly
+      await waitFor(() => {
+        expect(emailActions.createTemplate).toHaveBeenCalled();
+      }, { timeout: 5000 });
+      expect(validateLiquidTemplateContent).not.toHaveBeenCalled();
+    });
+  });
 });

package/v2Containers/InApp/__tests__/InAppHTMLEditor.test.js

@@ -39,33 +39,58 @@ jest.mock('../../../utils/common', () => ({
 // Mock HTMLEditor component - must be before imports
 jest.mock('../../../v2Components/HtmlEditor', () => {
   const React = require('react');
-  const MockHTMLEditor = function MockHTMLEditor({ variant, initialContent, onContentChange, onSave, 'data-test': dataTest }) {
-    return React.createElement('div', { 'data-testid': dataTest || 'html-editor' },
+
+  const MockHTMLEditor = function MockHTMLEditor({
+    variant,
+    initialContent,
+    onContentChange,
+    onSave,
+    'data-test': dataTest,
+  }) {
+    return React.createElement(
+      'div',
+      { 'data-testid': dataTest || 'inapp-html-editor' },
       React.createElement('div', { 'data-testid': 'html-editor-variant' }, variant),
-      React.createElement('div', { 'data-testid': 'html-editor-initial-android' }, initialContent?.android || ''),
-      React.createElement('div', { 'data-testid': 'html-editor-initial-ios' }, initialContent?.ios || ''),
-      React.createElement('button', {
-        'data-testid': 'html-editor-change-button',
-        onClick: () => {
-          if (onContentChange) {
-            onContentChange({
-              android: '<p>Updated Android HTML</p>',
-              ios: '<p>Updated iOS HTML</p>',
-            });
-          }
-        }
-      }, 'Simulate Content Change'),
-      React.createElement('button', {
-        'data-testid': 'html-editor-save-button',
-        onClick: () => {
-          if (onSave) {
-            onSave({
-              android: '<p>Saved Android HTML</p>',
-              ios: '<p>Saved iOS HTML</p>',
-            });
-          }
-        }
-      }, 'Simulate Save')
+      React.createElement(
+        'div',
+        { 'data-testid': 'html-editor-initial-android' },
+        initialContent?.android || ''
+      ),
+      React.createElement(
+        'div',
+        { 'data-testid': 'html-editor-initial-ios' },
+        initialContent?.ios || ''
+      ),
+      React.createElement(
+        'button',
+        {
+          'data-testid': 'html-editor-change-button',
+          onClick: () => {
+            if (onContentChange) {
+              onContentChange({
+                android: '<p>Updated Android HTML</p>',
+                ios: '<p>Updated iOS HTML</p>',
+              });
+            }
+          },
+        },
+        'Simulate Content Change'
+      ),
+      React.createElement(
+        'button',
+        {
+          'data-testid': 'html-editor-save-button',
+          onClick: () => {
+            if (onSave) {
+              onSave({
+                android: '<p>Saved Android HTML</p>',
+                ios: '<p>Saved iOS HTML</p>',
+              });
+            }
+          },
+        },
+        'Simulate Save'
+      )
     );
   };
   MockHTMLEditor.displayName = 'MockHTMLEditor';
@@ -75,22 +100,25 @@ jest.mock('../../../v2Components/HtmlEditor', () => {
   };
 });
 
-import React from 'react';
-import { render, screen, fireEvent, waitFor, act } from '@testing-library/react';
-import '@testing-library/jest-dom';
-import { IntlProvider } from 'react-intl';
-import { Provider } from 'react-redux';
-import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils';
-import history from '../../../utils/history';
-import { initialReducer } from '../../../initialReducer';
-import { InApp } from '../index';
-import { INAPP_EDITOR_TYPES } from '../../InAppWrapper/constants';
-
-
-// Mock other dependencies
+/**
+ * Mock CapDeviceContent to ensure HTMLEditor renders
+ */
 jest.mock('../../../v2Components/CapDeviceContent', () => {
+  const React = require('react');
+  const HTMLEditor = require('../../../v2Components/HtmlEditor').default;
+
   return function MockCapDeviceContent() {
-    return <div data-testid="cap-device-content">Device Content</div>;
+    return (
+      <div data-testid="cap-device-content">
+        <HTMLEditor
+          variant="inapp"
+          initialContent={{ android: '', ios: '' }}
+          onContentChange={jest.fn()}
+          onSave={jest.fn()}
+          data-test="inapp-html-editor"
+        />
+      </div>
+    );
   };
 });
 
@@ -100,7 +128,20 @@ jest.mock('../../../v2Components/TemplatePreview', () => {
   };
 });
 
+import React from 'react';
+import { render, screen, fireEvent, act } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { IntlProvider } from 'react-intl';
+import { Provider } from 'react-redux';
+import { configureStore } from '@capillarytech/vulcan-react-sdk/utils';
+
+import history from '../../../utils/history';
+import { initialReducer } from '../../../initialReducer';
+import { InApp } from '../index';
+import { INAPP_EDITOR_TYPES } from '../../InAppWrapper/constants';
+
 let store;
+
 beforeAll(() => {
   store = configureStore({}, initialReducer, history);
 });
@@ -135,8 +176,6 @@ const defaultProps = {
       configs: {
         android: '1',
         ios: '1',
-        accessToken: 'test-token',
-        deeplink: '{}',
       },
     },
   },
@@ -145,7 +184,6 @@ const defaultProps = {
     query: {},
     search: '',
   },
-  getDefaultTags: null,
   supportedTags: [],
   metaEntities: {
     tags: {
@@ -158,26 +196,11 @@ const defaultProps = {
   currentOrgDetails: {
     accessibleFeatures: [],
   },
-  fetchingLiquidValidation: false,
-  getTemplateDetailsInProgress: false,
-  isEditInApp: false,
-};
-
-// Create stable defaultData objects outside renderComponent to avoid reference changes
-const createStableDefaultData = (editorType) => {
-  if (!editorType) return {};
-  return { 'editor-type': editorType };
 };
 
 const renderComponent = (props = {}) => {
   const mergedProps = { ...defaultProps, ...props };
-  // Ensure defaultData is always an object and stable
-  if (!mergedProps.defaultData) {
-    mergedProps.defaultData = {};
-  } else if (mergedProps.defaultData['editor-type']) {
-    // Create a stable reference for defaultData
-    mergedProps.defaultData = createStableDefaultData(mergedProps.defaultData['editor-type']);
-  }
+
   return render(
     <Provider store={store}>
       <IntlProvider locale="en" messages={{}}>
@@ -195,36 +218,33 @@ describe('InApp HTMLEditor Integration', () => {
   describe('Template Name Editing', () => {
     test('should not truncate template name when editing', async () => {
       const showTemplateNameMock = jest.fn();
+
       renderComponent({
-        defaultData: { 'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR, 'template-name': 'abcd' },
+        defaultData: {
+          'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR,
+          'template-name': 'abcd',
+        },
         showTemplateName: showTemplateNameMock,
       });
 
-      // Wait for HTML editor to render
-      await waitFor(() => {
-        expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
-      });
-
-      // Verify showTemplateName was called with the template name
-      // The template name input is handled by the wrapper, not the InApp component
-      // So we verify that the callback was set up correctly
+      const editor = await screen.findByTestId('inapp-html-editor');
+      expect(editor).toBeInTheDocument();
       expect(showTemplateNameMock).toBeDefined();
     });
 
     test('should preserve template name when showTemplateName callback is provided', async () => {
       const showTemplateNameMock = jest.fn();
+
       renderComponent({
-        defaultData: { 'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR, 'template-name': 'test' },
+        defaultData: {
+          'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR,
+          'template-name': 'test',
+        },
         showTemplateName: showTemplateNameMock,
       });
 
-      // Wait for HTML editor to render
-      await waitFor(() => {
-        expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
-      });
-
-      // Verify the component renders correctly with template name
-      // The template name is managed by the wrapper component
+      const editor = await screen.findByTestId('inapp-html-editor');
+      expect(editor).toBeInTheDocument();
       expect(showTemplateNameMock).toBeDefined();
     });
   });
@@ -232,40 +252,7 @@ describe('InApp HTMLEditor Integration', () => {
   describe('TAG API Calls', () => {
     test('should only make one TAG API call when HTML Editor is used', async () => {
       const fetchSchemaForEntityMock = jest.fn();
-      
-      renderComponent({
-        defaultData: { 'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR },
-        globalActions: {
-          ...defaultProps.globalActions,
-          fetchSchemaForEntity: fetchSchemaForEntityMock,
-        },
-      });
-
-      // Wait for component to mount and initialize
-      await waitFor(() => {
-        // Component should be rendered
-        expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
-      });
 
-      // Wait a bit for all useEffects to complete
-      await waitFor(() => {
-        // After isHTMLTemplate is set to true, fetchSchemaForEntity should not be called again
-        // The initial call might happen before isHTMLTemplate is set, but subsequent calls should not happen
-        // For HTML Editor, tags should only be fetched via handleOnTagsContextChange
-      }, { timeout: 1000 });
-
-      // For HTML Editor, fetchSchemaForEntity should not be called after isHTMLTemplate is set
-      // (It might be called once initially before isHTMLTemplate is set, but that's acceptable)
-      // The key is that it's not called multiple times
-      const callCount = fetchSchemaForEntityMock.mock.calls.length;
-      // Allow 0 or 1 calls (1 if it was called before isHTMLTemplate was set)
-      expect(callCount).toBeLessThanOrEqual(1);
-    });
-
-    test('should make TAG API call only once when handleOnTagsContextChange is called', async () => {
-      const fetchSchemaForEntityMock = jest.fn();
-      
-      // We need to access the handler, but since it's internal, we'll test via HTMLEditor's onContextChange
       renderComponent({
         defaultData: { 'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR },
         globalActions: {
@@ -274,19 +261,8 @@ describe('InApp HTMLEditor Integration', () => {
         },
       });
 
-      await waitFor(() => {
-        expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
-      });
-
-      // Wait a bit for all useEffects to complete
-      await waitFor(() => {
-        // After isHTMLTemplate is set to true, fetchSchemaForEntity should not be called again
-      }, { timeout: 1000 });
+      await screen.findByTestId('inapp-html-editor');
 
-      // Simulate context change from HTMLEditor (which would call onContextChange)
-      // Since we can't directly access the handler, we verify the behavior
-      // by checking that fetchSchemaForEntity is not called multiple times
-      // (It might be called once initially before isHTMLTemplate is set, but that's acceptable)
       const callCount = fetchSchemaForEntityMock.mock.calls.length;
       expect(callCount).toBeLessThanOrEqual(1);
     });
@@ -298,45 +274,37 @@ describe('InApp HTMLEditor Integration', () => {
         defaultData: { 'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR },
       });
 
-      await waitFor(() => {
-        expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
-      });
+      await screen.findByTestId('inapp-html-editor');
 
-      // Simulate content being added
       const changeButton = screen.getByTestId('html-editor-change-button');
+
       act(() => {
         fireEvent.click(changeButton);
       });
 
-      // Get the layout radio buttons
       const layoutRadios = container.querySelectorAll('input[type="radio"]');
-      expect(layoutRadios.length).toBeGreaterThan(0);
 
-      // Change layout type
       if (layoutRadios.length > 1) {
         act(() => {
-          fireEvent.change(layoutRadios[1], { target: { value: 'HEADER' } });
+          fireEvent.change(layoutRadios[1], {
+            target: { value: 'HEADER' },
+          });
         });
 
-        // Content should still be present in the editor
-        // The HTMLEditor should preserve content via initialContent prop
-        await waitFor(() => {
-          const editor = screen.getByTestId('inapp-html-editor');
-          expect(editor).toBeInTheDocument();
-        });
+        const editor = await screen.findByTestId('inapp-html-editor');
+        expect(editor).toBeInTheDocument();
       }
     });
   });
 
   describe('Layout Labels', () => {
     test('should use correct layout labels in constants', () => {
-      const { INAPP_LAYOUT_DETAILS, INAPP_MESSAGE_LAYOUT_TYPES } = require('../constants');
-      
-      // Verify that HEADER maps to Top banner
+      const { INAPP_LAYOUT_DETAILS, INAPP_MESSAGE_LAYOUT_TYPES } =
+        require('../constants');
+
       expect(INAPP_MESSAGE_LAYOUT_TYPES.TOPBANNER).toBe('HEADER');
       expect(INAPP_LAYOUT_DETAILS.HEADER).toBeDefined();
-      
-      // Verify that FOOTER maps to Bottom banner
+
       expect(INAPP_MESSAGE_LAYOUT_TYPES.BOTTOMBANNER).toBe('FOOTER');
       expect(INAPP_LAYOUT_DETAILS.FOOTER).toBeDefined();
     });
@@ -346,29 +314,16 @@ describe('InApp HTMLEditor Integration', () => {
     test('should allow creating template with Android-only content when both devices supported', async () => {
       renderComponent({
         defaultData: { 'editor-type': INAPP_EDITOR_TYPES.HTML_EDITOR },
-        accountData: {
-          selectedWeChatAccount: {
-            ...defaultProps.accountData.selectedWeChatAccount,
-            configs: {
-              android: '1',
-              ios: '1',
-            },
-          },
-        },
       });
 
-      await waitFor(() => {
-        expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
-      });
+      await screen.findByTestId('inapp-html-editor');
 
-      // Simulate adding content only for Android
       const changeButton = screen.getByTestId('html-editor-change-button');
+
       act(() => {
         fireEvent.click(changeButton);
       });
 
-      // Done button should be enabled (not disabled)
-      // We can't directly test isDisableDone, but we can verify the component renders
       expect(screen.getByTestId('inapp-html-editor')).toBeInTheDocument();
     });
   });