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

package/v2Containers/EmailWrapper/index.js

@@ -9,6 +9,7 @@ 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,
@@ -18,10 +19,17 @@ import {
   selectCmsTemplatesLoader,
 } from '../Templates/selectors';
 import * as templatesActionsCreators from '../Templates/actions';
-import { selectCurrentOrgDetails } from "../../v2Containers/Cap/selectors";
+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 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) => {
@@ -64,6 +72,18 @@ const EmailWrapper = (props) => {
     handleTestAndPreview,
     handleCloseTestAndPreview,
     isTestAndPreviewMode,
+    location,
+    emailActions,
+    Email,
+    metaEntities,
+    loadingTags,
+    injectedTags,
+    globalActions: globalActionsProp,
+    templateData,
+    params,
+    fetchingLiquidTags,
+    createTemplateInProgress,
+    fetchingCmsData,
   } = props;
 
   // Pass destructured props to the custom hook
@@ -117,32 +137,68 @@ 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}
-    />
+        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}
+      />
 
       {/* HTMLEditor Testing Component - Console Controlled */}
       <HTMLEditorTesting />
@@ -159,7 +215,7 @@ EmailWrapper.propTypes = {
   templatesActions: PropTypes.object,
   CmsTemplates: PropTypes.arrayOf(PropTypes.object),
   SelectedEdmDefaultTemplate: PropTypes.object,
-  step: PropTypes.string,
+  step: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   showNextStep: PropTypes.func,
   getFormdata: PropTypes.func,
   intl: intlShape,
@@ -187,6 +243,7 @@ EmailWrapper.propTypes = {
   handleTestAndPreview: PropTypes.func,
   handleCloseTestAndPreview: PropTypes.func,
   isTestAndPreviewMode: PropTypes.bool,
+  location: PropTypes.object,
 };
 
 const mapStateToProps = createStructuredSelector({
@@ -196,12 +253,31 @@ 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),
   };
 }
 
-export default UserIsAuthenticated(connect(mapStateToProps, mapDispatchToProps)(injectIntl(EmailWrapper)));
+// 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);

package/v2Containers/EmailWrapper/messages.js

@@ -60,6 +60,66 @@ export default defineMessages({
   },
   emptyTemplateName: {
     id: `creatives.containersV2.EmailWrapper.emptyTemplateName`,
-    defaultMessage: `Please enter template name.`
+    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',
   },
 });

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

@@ -5,10 +5,34 @@ import { IntlProvider } from 'react-intl';
 import { Provider } from 'react-redux';
 import { configureStore }  from '@capillarytech/vulcan-react-sdk/utils'
 import { initialReducer } from '../../../initialReducer';
+import history from '../../../utils/history';
 import EmailWrapperView from '../components/EmailWrapperView';
 import { EmailWrapperViewMockProps } from '../mockdata/mockdata';
 import { EMAIL_CREATE_MODES } from '../constants';
-import history from '../../../utils/history';
+
+// Mock pathConfig before history import - must be a string, not undefined
+jest.mock('../../../config/path', () => ({
+  publicPath: '/creatives/ui',
+  engagePlusPublicPath: '/campaigns/ui',
+}));
+
+// Mock window.location for createBrowserHistory
+const originalLocation = window.location;
+beforeAll(() => {
+  delete window.location;
+  window.location = {
+    ...originalLocation,
+    pathname: '/',
+    search: '',
+    hash: '',
+    href: 'http://localhost/',
+    replace: jest.fn(),
+  };
+});
+
+afterAll(() => {
+  window.location = originalLocation;
+});
 
 // This mock needs to be before any imports
 jest.mock('../../../v2Containers/Email', () => ({
@@ -59,6 +83,7 @@ describe('EmailWrapperView', () => {
   let store;
 
   beforeAll(() => {
+    // Use the real history (pathConfig is mocked, so it should work)
     store = configureStore(initialState, initialReducer, history);
   });