@capillarytech/creatives-library 8.0.250-alpha.2 → 8.0.251

package/v2Containers/EmailWrapper/index.js

@@ -9,7 +9,6 @@ import { connect } from 'react-redux';
 import { injectIntl, intlShape } from 'react-intl';
 import { createStructuredSelector } from 'reselect';
 import { bindActionCreators } from 'redux';
-import { compose } from 'redux';
 import { UserIsAuthenticated } from '../../utils/authWrapper';
 import {
   selectEmailLayout,
@@ -19,17 +18,10 @@ import {
   selectCmsTemplatesLoader,
 } from '../Templates/selectors';
 import * as templatesActionsCreators from '../Templates/actions';
-import { selectCurrentOrgDetails, makeSelectMetaEntities, isLoadingMetaEntities, setInjectedTags, selectLiquidStateDetails } from "../../v2Containers/Cap/selectors";
-import { makeSelectEmail, selectLoadingStatus, makeSelectFetchingCmsData } from '../Email/selectors';
-import * as emailActionsCreators from '../Email/actions';
-import * as globalActions from '../Cap/actions';
+import { selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
 import EmailWrapperView from './components/EmailWrapperView';
 import useEmailWrapper from './hooks/useEmailWrapper';
 import HTMLEditorTesting from './components/HTMLEditorTesting';
-import injectReducer from '../../utils/injectReducer';
-import injectSaga from '../../utils/injectSaga';
-import v2EmailReducer from '../Email/reducer';
-import { v2EmailSagas } from '../Email/sagas';
 
 
 const EmailWrapper = (props) => {
@@ -72,19 +64,6 @@ const EmailWrapper = (props) => {
     handleTestAndPreview,
     handleCloseTestAndPreview,
     isTestAndPreviewMode,
-    location,
-    emailActions,
-    Email,
-    metaEntities,
-    loadingTags,
-    injectedTags,
-    globalActions: globalActionsProp,
-    templateData,
-    params,
-    fetchingLiquidTags,
-    createTemplateInProgress,
-    fetchingCmsData,
-    onHtmlEditorValidationStateChange,
   } = props;
 
   // Pass destructured props to the custom hook
@@ -138,70 +117,32 @@ const EmailWrapper = (props) => {
     handleTestAndPreview,
     handleCloseTestAndPreview,
     isTestAndPreviewMode,
-    location,
-    emailActions,
-    Email,
-    templateData,
-    params,
   });
 
   // Render using the presentation component with data from the hook
   return (
     <div>
       <EmailWrapperView
-        isUploading={isUploading}
-        emailCreateMode={emailCreateMode}
-        step={step}
-        isFullMode={isFullMode}
-        templateName={templateName}
-        onTemplateNameChange={onTemplateNameChange}
-        isTemplateNameEmpty={isTemplateNameEmpty}
-        modes={modes}
-        onChange={onChange}
-        EmailLayout={EmailLayout}
-        modeContent={modeContent}
-        useFileUpload={useFileUpload}
-        uploadButtonLabel={uploadButtonLabel}
-        isShowEmailCreate={isShowEmailCreate}
-        emailProps={emailProps}
-        cmsTemplatesProps={cmsTemplatesProps}
-        onPreviewContentClicked={onPreviewContentClicked}
-        onTestContentClicked={onTestContentClicked}
-        editor={editor}
-        // New flow props - only used when supportCKEditor is false
-        // These props are needed for EmailHTMLEditor component (tag loading, validation, etc.)
-        metaEntities={metaEntities}
-        loadingTags={loadingTags}
-        injectedTags={injectedTags}
-        globalActions={globalActionsProp}
-        supportedTags={props.supportedTags}
-        getDefaultTags={type}
-        location={location}
-        currentOrgDetails={currentOrgDetails}
-        onValidationFail={onValidationFail}
-        forwardedTags={forwardedTags}
-        selectedOfferDetails={selectedOfferDetails}
-        eventContextTags={eventContextTags}
-        getFormdata={getFormdata}
-        isGetFormData={isGetFormData}
-        getLiquidTags={globalActionsProp?.getLiquidTags}
-        showLiquidErrorInFooter={showLiquidErrorInFooter}
-        intl={intl}
-        emailActions={emailActions}
-        showTestAndPreviewSlidebox={showTestAndPreviewSlidebox}
-        handleTestAndPreview={handleTestAndPreview}
-        handleCloseTestAndPreview={handleCloseTestAndPreview}
-        Email={Email}
-        setIsLoadingContent={setIsLoadingContent}
-        templateData={templateData}
-        params={params}
-        showTemplateName={showTemplateName}
-        fetchingLiquidTags={fetchingLiquidTags}
-        createTemplateInProgress={createTemplateInProgress}
-        fetchingCmsData={fetchingCmsData}
-        onHtmlEditorValidationStateChange={onHtmlEditorValidationStateChange}
-        moduleType={moduleType}
-      />
+      isUploading={isUploading}
+      emailCreateMode={emailCreateMode}
+      step={step}
+      isFullMode={isFullMode}
+      templateName={templateName}
+      onTemplateNameChange={onTemplateNameChange}
+      isTemplateNameEmpty={isTemplateNameEmpty}
+      modes={modes}
+      onChange={onChange}
+      EmailLayout={EmailLayout}
+      modeContent={modeContent}
+      useFileUpload={useFileUpload}
+      uploadButtonLabel={uploadButtonLabel}
+      isShowEmailCreate={isShowEmailCreate}
+      emailProps={emailProps}
+      cmsTemplatesProps={cmsTemplatesProps}
+      onPreviewContentClicked={onPreviewContentClicked}
+      onTestContentClicked={onTestContentClicked}
+      editor={editor}
+    />
 
       {/* HTMLEditor Testing Component - Console Controlled */}
       <HTMLEditorTesting />
@@ -218,7 +159,7 @@ EmailWrapper.propTypes = {
   templatesActions: PropTypes.object,
   CmsTemplates: PropTypes.arrayOf(PropTypes.object),
   SelectedEdmDefaultTemplate: PropTypes.object,
-  step: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  step: PropTypes.string,
   showNextStep: PropTypes.func,
   getFormdata: PropTypes.func,
   intl: intlShape,
@@ -246,8 +187,6 @@ EmailWrapper.propTypes = {
   handleTestAndPreview: PropTypes.func,
   handleCloseTestAndPreview: PropTypes.func,
   isTestAndPreviewMode: PropTypes.bool,
-  location: PropTypes.object,
-  onHtmlEditorValidationStateChange: PropTypes.func,
 };
 
 const mapStateToProps = createStructuredSelector({
@@ -257,31 +196,12 @@ const mapStateToProps = createStructuredSelector({
   isUploading: uploadSelector(),
   cmsTemplatesLoader: selectCmsTemplatesLoader(),
   currentOrgDetails: selectCurrentOrgDetails(),
-  Email: makeSelectEmail(),
-  metaEntities: makeSelectMetaEntities(),
-  loadingTags: isLoadingMetaEntities(),
-  injectedTags: setInjectedTags(),
-  fetchingLiquidTags: selectLiquidStateDetails(),
-  createTemplateInProgress: selectLoadingStatus(),
-  fetchingCmsData: makeSelectFetchingCmsData(),
 });
 
 function mapDispatchToProps(dispatch) {
   return {
     templatesActions: bindActionCreators(templatesActionsCreators, dispatch),
-    emailActions: bindActionCreators(emailActionsCreators, dispatch),
-    globalActions: bindActionCreators(globalActions, dispatch),
   };
 }
 
-// Inject Email reducer and saga so that getCmsSetting action can be handled
-const withReducer = injectReducer({ key: 'email', reducer: v2EmailReducer });
-const withEmailSaga = injectSaga({ key: 'email', saga: v2EmailSagas });
-
-const ConnectedEmailWrapper = connect(mapStateToProps, mapDispatchToProps)(injectIntl(EmailWrapper));
-
-export default compose(
-  UserIsAuthenticated,
-  withReducer,
-  withEmailSaga,
-)(ConnectedEmailWrapper);
+export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(EmailWrapper)));

package/v2Containers/EmailWrapper/messages.js

@@ -60,66 +60,6 @@ export default defineMessages({
   },
   emptyTemplateName: {
     id: `creatives.containersV2.EmailWrapper.emptyTemplateName`,
-    defaultMessage: `Please enter template name.`,
-  },
-  htmlEditorTitle: {
-    id: 'creatives.EmailWrapper.htmlEditorTitle',
-    defaultMessage: 'HTML editor',
-  },
-  htmlEditorDesc: {
-    id: 'creatives.EmailWrapper.htmlEditorDesc',
-    defaultMessage: 'Use a basic HTML editor to write and format your content. Suitable if you are familiar with HTML.',
-  },
-  dragDropEditorTitle: {
-    id: 'creatives.EmailWrapper.dragDropEditorTitle',
-    defaultMessage: 'Drag & drop editor',
-  },
-  dragDropEditorDesc: {
-    id: 'creatives.EmailWrapper.dragDropEditorDesc',
-    defaultMessage: 'Create your content visually by dragging blocks — no coding needed. Great for quick, easy designs.',
-  },
-  uploadZipTitle: {
-    id: 'creatives.EmailWrapper.uploadZipTitle',
-    defaultMessage: 'Upload zip file',
-  },
-  uploadZipDesc: {
-    id: 'creatives.EmailWrapper.uploadZipDesc',
-    defaultMessage: 'Upload a ZIP containing your custom HTML, images, and assets. Ideal if your content is already built.',
-  },
-  next: {
-    id: 'creatives.EmailWrapper.next',
-    defaultMessage: 'Next',
-  },
-  beeEditorDisabledTooltip: {
-    id: 'creatives.EmailWrapper.beeEditorDisabledTooltip',
-    defaultMessage: 'Please get the drag & drop editor enabled for your brand',
-  },
-  emailContent: {
-    id: 'creatives.containersV2.Email.emailContent',
-    defaultMessage: 'Email content',
-  },
-  create: {
-    id: 'creatives.containersV2.EmailWrapper.create',
-    defaultMessage: 'Create',
-  },
-  update: {
-    id: 'creatives.containersV2.EmailWrapper.update',
-    defaultMessage: 'Update',
-  },
-  previewAndTest: {
-    id: 'creatives.containersV2.EmailWrapper.previewAndTest',
-    defaultMessage: 'Preview and Test',
-  },
-  required: {
-    id: 'creatives.containersV2.EmailWrapper.required',
-    defaultMessage: 'Required',
-  },
-  subject: {
-    id: 'creatives.containersV2.EmailWrapper.subject',
-    defaultMessage: 'Subject',
-  },
-  enterEmailSubject: {
-    id: 'creatives.containersV2.EmailWrapper.enterEmailSubject',
-    defaultMessage: 'Enter Email Subject',
+    defaultMessage: `Please enter template name.`
   },
 });

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

@@ -0,0 +1,214 @@
+import React from 'react';
+import { render, fireEvent, within, screen } 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 { initialReducer } from '../../../initialReducer';
+import EmailWrapperView from '../components/EmailWrapperView';
+import { EmailWrapperViewMockProps } from '../mockdata/mockdata';
+import { EMAIL_CREATE_MODES } from '../constants';
+import history from '../../../utils/history';
+
+// This mock needs to be before any imports
+jest.mock('../../../v2Containers/Email', () => ({
+  __esModule: true,
+  default: () => <div data-testid="email-create-container" />,
+}));
+
+// Mock react-router
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: jest.fn(),
+    replace: jest.fn(),
+    go: jest.fn(),
+    goBack: jest.fn(),
+    goForward: jest.fn(),
+    location: { search: '' }
+  }),
+}));
+
+// Mock redux-auth-wrapper
+jest.mock('redux-auth-wrapper/history4/redirect', () => ({
+  connectedRouterRedirect: () => (Component) => Component,
+}));
+
+// Mock react-router
+jest.mock('connected-react-router', () => ({
+  push: jest.fn(),
+  replace: jest.fn(),
+  go: jest.fn(),
+  goBack: jest.fn(),
+  goForward: jest.fn(),
+}));
+
+// Mock the saga injector
+jest.mock('@capillarytech/vulcan-react-sdk/utils/injectSaga', () => ({
+  __esModule: true,
+  default: () => (Component) => Component,
+}));
+
+
+const initialState = {
+  cap: { loading: false, error: null },
+  router: { location: { pathname: '/' } }
+};
+
+describe('EmailWrapperView', () => {
+  let store;
+
+  beforeAll(() => {
+    store = configureStore(initialState, initialReducer, history);
+  });
+
+  const renderWithProviders = (component) => {
+    return render(
+      <Provider store={store}>
+        <IntlProvider locale="en" messages={{}}>
+          {component}
+        </IntlProvider>
+      </Provider>
+    );
+  };
+
+  it('renders mode selection UI when step is modeSelection', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      step: 'modeSelection',
+    };
+
+    const { getByText } = renderWithProviders(<EmailWrapperView {...props} />);
+    expect(getByText('Create using editor')).toBeInTheDocument();
+    expect(getByText('Upload zip file')).toBeInTheDocument();
+  });
+
+  it('shows template name input in full mode', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      isFullMode: true,
+      step: 'modeSelection',
+    };
+
+    const { container } = renderWithProviders(<EmailWrapperView {...props} />);
+    const input = container.querySelector('.ant-input');
+    expect(input).toBeInTheDocument();
+    expect(input.value).toBe(props.templateName);
+  });
+
+  it('handles template name changes', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      isFullMode: true,
+      step: 'modeSelection',
+      onTemplateNameChange: jest.fn(),
+    };
+
+    const { container } = renderWithProviders(<EmailWrapperView {...props} />);
+    const input = container.querySelector('.ant-input');
+    expect(input).toBeInTheDocument();
+
+    // Create a change event and fire it
+    fireEvent.change(input, { target: { value: 'New Template Name' } });
+
+    // Just verify that the function was called
+    expect(props.onTemplateNameChange).toHaveBeenCalled();
+  });
+
+  it('shows upload button when in upload mode', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      step: 'modeSelection',
+      emailCreateMode: EMAIL_CREATE_MODES.UPLOAD,
+      uploadButtonLabel: 'Upload',
+    };
+
+    const { getByText, container } = renderWithProviders(<EmailWrapperView {...props} />);
+
+    // Find the "Upload zip file" section
+    const modeSelectionSection = getByText('Upload zip file').closest('div');
+
+    // Find any button in the upload section
+    const uploadButton = container.querySelector('.ant-btn');
+
+    // Verify that we found an upload button
+    expect(uploadButton).toBeInTheDocument();
+    expect(uploadButton.textContent).toContain('Upload');
+  });
+
+  it('shows loading spinner when uploading', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      isUploading: true,
+      emailCreateMode: EMAIL_CREATE_MODES.UPLOAD,
+      step: 'modeSelection',
+    };
+
+    const { container } = renderWithProviders(<EmailWrapperView {...props} />);
+    const spinner = container.querySelector('.ant-spin');
+    expect(spinner).toBeInTheDocument();
+  });
+
+  it('shows content creation UI when not in mode selection', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      step: 'contentCreation',
+      isShowEmailCreate: true,
+    };
+
+    const { getByTestId } = renderWithProviders(<EmailWrapperView {...props} />);
+    expect(getByTestId('email-create-container')).toBeInTheDocument();
+  });
+
+  it('disables upload button when template name is empty in full mode', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      isFullMode: true,
+      step: 'modeSelection',
+      emailCreateMode: EMAIL_CREATE_MODES.UPLOAD,
+      templateName: '',
+      isTemplateNameEmpty: true,
+      uploadButtonLabel: 'Upload',
+    };
+
+    const { getByText, container } = renderWithProviders(<EmailWrapperView {...props} />);
+
+    // Find the Upload section
+    getByText('Upload zip file');
+
+    // Find button in the container
+    const uploadButton = container.querySelector('.ant-btn');
+
+    // Check if the button is disabled
+    expect(uploadButton).toBeDisabled();
+  });
+
+  it('shows error message when template name is empty during upload', () => {
+    const props = {
+      ...EmailWrapperViewMockProps,
+      isFullMode: true,
+      step: 'modeSelection',
+      emailCreateMode: EMAIL_CREATE_MODES.UPLOAD,
+      templateName: '',
+      isTemplateNameEmpty: true,
+      // Add errorMessage directly to the props
+      errorMessage: 'Please enter template name',
+      intl: {
+        formatMessage: () => 'Please enter template name',
+      },
+    };
+
+    const { container } = renderWithProviders(<EmailWrapperView {...props} />);
+
+    // Look for error feedback in the Ant Design form
+    const errorElement = container.querySelector('.ant-form-item-explain');
+
+    if (errorElement) {
+      expect(errorElement.textContent).toContain('Please enter template name');
+    } else {
+      // If the standard error element is not found, look for any element containing the error text
+      const allText = container.textContent;
+      expect(allText).toContain('Please enter template name');
+    }
+  });
+});