@capillarytech/creatives-library 8.0.299-alpha.0 → 8.0.299-alpha.2

package/package.json

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

package/utils/common.js

@@ -138,16 +138,15 @@ export const isEmailUnsubscribeTagMandatory = Auth.hasFeatureAccess.bind(
   EMAIL_UNSUBSCRIBE_TAG_MANDATORY,
 );
 
-// export const hasNewMobilePushFeatureEnabled = Auth.hasFeatureAccess.bind(
-//   null,
-//   ENABLE_NEW_MPUSH,
-// );
-
-
+export const hasNewMobilePushFeatureEnabled = Auth.hasFeatureAccess.bind(
+  null,
+  ENABLE_NEW_MPUSH,
+);
 
-export const hasNewEditorFlowInAppEnabled = () => {
-  return false;
-}
+export const hasNewEditorFlowInAppEnabled = Auth.hasFeatureAccess.bind(
+  null,
+  ENABLE_NEW_EDITOR_FLOW_INAPP,
+);
 
 //filtering tags based on scope
 export const filterTags = (tagsToFilter, tagsList) => tagsList?.filter(

package/v2Components/CommonTestAndPreview/CustomerCreationModal.js

@@ -74,7 +74,7 @@ const CustomerCreationModal = ({
       const details = res.customerDetails || [];
       if (!success) {
         const errorMessage = response?.message || response?.status?.message
-        if (errorMessage.toLowerCase().includes("merged customer found")) {
+        if (errorMessage?.toLowerCase().includes("merged customer found")) {
           return { success: true, exists: true, details: [] };
         }
       }

package/v2Components/CommonTestAndPreview/ExistingCustomerModal.js

@@ -2,7 +2,7 @@ import CapModal from "@capillarytech/cap-ui-library/CapModal";
 import { FormattedMessage, injectIntl } from "react-intl";
 import messages from "./messages";
 import React, { useState } from "react";
-import { CapCard, CapRow, CapColumn, CapLabel } from "@capillarytech/cap-ui-library";
+import { CapCard, CapRow, CapColumn } from "@capillarytech/cap-ui-library";
 import { CHANNELS } from "./constants";
 import CapButton from "@capillarytech/cap-ui-library/CapButton";    
 import CapIcon from "@capillarytech/cap-ui-library/CapIcon";

package/v2Components/CommonTestAndPreview/SendTestMessage.js

@@ -134,7 +134,7 @@ SendTestMessage.defaultProps = {
   channel: undefined,
   renderAddTestCustomerButton: undefined,
   searchValue: '',
-  setSearchValue: undefined,
+  setSearchValue: () => {}, // no-op when not provided; required by TreeSelect when showSearch is true
   deliverySettings: {},
   senderDetailsOptions: [],
   wecrmAccounts: [],

package/v2Components/CommonTestAndPreview/index.js

@@ -410,13 +410,15 @@ const CommonTestAndPreview = (props) => {
   /**
    * Common handler for saving test customers (both new and existing)
    */
-  const handleSaveTestCustomer = async (validationErrors = {},setIsLoading = false) => {
+  const handleSaveTestCustomer = async (validationErrors = {},setIsLoading) => {
     // Check for validation errors before saving (for new customers)
     if (customerModal[1] === CUSTOMER_MODAL_NEW && (validationErrors.email || validationErrors.mobile)) {
       return;
     }
 
-    setIsLoading(true);
+    if (typeof setIsLoading === 'function') {
+      setIsLoading(true);
+    }
     
     try {
       let payload;

package/v2Containers/BeePopupEditor/index.js

@@ -40,6 +40,11 @@ function BeePopupEditor(props) {
   const savedCallback = useRef();
   const beeInstanceRef = useRef(null);
   const isInitializedRef = useRef(false);
+  const beeJsonRef = useRef(beeJson);
+
+  useEffect(() => {
+    beeJsonRef.current = beeJson;
+  }, [beeJson]);
 
   const [visibleTaglist, setVisibleTaglist] = useState(false);
   const [selectedTag, setSelectedTag] = useState({});
@@ -111,8 +116,10 @@ function BeePopupEditor(props) {
     window.BeePlugin.create(tokenData, beeConfig, (instance) => {
       beePluginInstance = instance;
       beeInstanceRef.current = instance;
-      // Check if beeJson is already an object (happens when layout type changes)
-      const parseJson = typeof beeJson === 'string' ? JSON.parse(beeJson) : beeJson;
+      // Use ref to get the latest beeJson — the closure captures the value at effect time,
+      // but beeJsonRef.current is always up-to-date (e.g. when template data loads async)
+      const latestBeeJson = beeJsonRef.current;
+      const parseJson = typeof latestBeeJson === 'string' ? JSON.parse(latestBeeJson) : latestBeeJson;
       beePluginInstance.start(parseJson);
       saveBeeInstance(beePluginInstance, device);
       isInitializedRef.current = true;

package/v2Containers/CreativesContainer/tests/__snapshots__/SlideBoxContent.test.js.snap

@@ -1103,17 +1103,26 @@ exports[`Test SlideBoxContent container Should render correct component for what
 
 exports[`Test SlideBoxContent container Should render correct component for whatsapp channel create mode 2`] = `
 <SlideBoxContent__CreativesWrapper>
-  <Connect(Connect(UserIsAuthenticated(InjectIntl(CreativesCommon))))
-    date={0}
+  <ForwardRef
     getDefaultTags=""
-    key="creatives-inapp-wrapper"
+    key="creatives-inapp-create"
+    location={
+      Object {
+        "pathname": "/inapp/create",
+        "query": Object {
+          "isEditFromCampaigns": undefined,
+          "module": "library",
+          "type": "embedded",
+        },
+        "search": "",
+      }
+    }
     onCreateComplete={[MockFunction]}
     templateData={
       Object {
         "mode": "create",
       }
     }
-    type=""
   />
 </SlideBoxContent__CreativesWrapper>
 `;

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();
     });
   });

package/v2Containers/InApp/index.js

@@ -883,7 +883,7 @@ export const InApp = (props) => {
       // Use 'html editor template' as title for HTML editor to differentiate from BEE editor
       title: isHTMLTemplate ? 'html editor template' : titleAndroid,
       message: androidMessage,
-      bodyType: templateLayoutType,
+      bodyType: bodyTypeForBackend,
       expandableDetails: {
         style: androidExpandableStyle,
         message: androidMessage,

package/v2Containers/InApp/tests/mockData.js

@@ -894,5 +894,5 @@ export const deviceContentProps = {
     },
   ],
   tags: [],
+  isOtherDeviceSupported: true,
 };
-