@capillarytech/creatives-library 8.0.242-alpha.10 → 8.0.242-alpha.11

package/v2Containers/Email/actions.js

@@ -66,13 +66,6 @@ export function clearCRUDResponse() {
   };
 }
 
-export function getCmsAccounts(cmsType) {
-  return {
-    type: types.GET_CMS_ACCOUNTS_REQUEST,
-    cmsType,
-  };
-}
-
 export function clearStoreValues() {
   return {
     type: types.CLEAR_ALL_VALUES,

package/v2Containers/Email/constants.js

@@ -36,8 +36,4 @@ export const DUPLICATE_TEMPLATE_REQUEST = 'app/v2Containers/Email/DUPLICATE_TEMP
 export const DUPLICATE_TEMPLATE_SUCCESS = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_SUCCESS';
 export const DUPLICATE_TEMPLATE_FAILURE = 'app/v2Containers/Email/DUPLICATE_TEMPLATE_FAILURE';
 
-export const TRANSFORM_EMAIL_TEMPLATE_REQUEST = 'app/v2Containers/Email/TRANSFORM_EMAIL_TEMPLATE_REQUEST';
-
-export const GET_CMS_ACCOUNTS_REQUEST = 'app/v2Containers/Email/GET_CMS_ACCOUNTS_REQUEST';
-export const GET_CMS_ACCOUNTS_SUCCESS = 'app/v2Containers/Email/GET_CMS_ACCOUNTS_SUCCESS';
-export const GET_CMS_ACCOUNTS_FAILURE = 'app/v2Containers/Email/GET_CMS_ACCOUNTS_FAILURE';
+export const TRANSFORM_EMAIL_TEMPLATE_REQUEST = 'app/v2Containers/Email/TRANSFORM_EMAIL_TEMPLATE_REQUEST';

package/v2Containers/Email/index.js

@@ -2998,19 +2998,6 @@ function mapDispatchToProps(dispatch) {
 const withReducer = injectReducer({ key: 'email', reducer: v2EmailReducer });
 const withEmailSaga = injectSaga({ key: 'email', saga: v2EmailSagas });
 
-// Base Email component without saga registration (for use from EmailWrapper)
-// EmailWrapper already registers the saga, so we don't need to register it here
-export const EmailWithoutSaga = withCreatives({
-  WrappedComponent: Email,
-  mapStateToProps,
-  mapDispatchToProps,
-  userAuth: true,
-  sagas: [], // No saga - EmailWrapper registers it
-  reducers: [withReducer],
-});
-
-// Email component with saga registration (for direct use from SlideBoxContent in Edit mode)
-// When Email is used directly (not as child of EmailWrapper), it needs to register the saga
 export default withCreatives({
   WrappedComponent: Email,
   mapStateToProps,

package/v2Containers/Email/messages.js

@@ -302,36 +302,4 @@ export default defineMessages({
     id: 'creatives.containersV2.Email.base64ImageError',
     defaultMessage: 'Base64 images are not allowed. Please upload your image to a gallery and use it, or add the image URL instead.',
   },
-  "editorTypeTitle": {
-    id: 'creatives.containersV2.Email.editorTypeTitle',
-    defaultMessage: 'Editor type',
-  },
-  "htmlEditorTitle": {
-    id: 'creatives.containersV2.Email.htmlEditorTitle',
-    defaultMessage: 'HTML editor',
-  },
-  "htmlEditorDescription": {
-    id: 'creatives.containersV2.Email.htmlEditorDescription',
-    defaultMessage: 'Use a basic HTML editor to write and format your content. Suitable if you are familiar with HTML.',
-  },
-  "dragDropEditorTitle": {
-    id: 'creatives.containersV2.Email.dragDropEditorTitle',
-    defaultMessage: 'Drag & drop editor',
-  },
-  "dragDropEditorDescription": {
-    id: 'creatives.containersV2.Email.dragDropEditorDescription',
-    defaultMessage: 'Create your content visually by dragging blocks — no coding needed. Great for quick, easy designs.',
-  },
-  "uploadZipTitle": {
-    id: 'creatives.containersV2.Email.uploadZipTitle',
-    defaultMessage: 'Upload zip file',
-  },
-  "uploadZipDescription": {
-    id: 'creatives.containersV2.Email.uploadZipDescription',
-    defaultMessage: 'Upload a ZIP containing your custom HTML, images, and assets. Ideal if your content is already built.',
-  },
-  "nextButton": {
-    id: 'creatives.containersV2.Email.nextButton',
-    defaultMessage: 'Next',
-  },
 });

package/v2Containers/Email/reducer.js

@@ -11,7 +11,6 @@ import * as types from './constants';
 const initialState = fromJS({
   createTemplateInProgress: false,
   createResponse: {},
-  isBeeEnabled: false,
 });
 
 function emailReducer(state = initialState, action) {
@@ -108,15 +107,6 @@ function emailReducer(state = initialState, action) {
       return state
         .set('fetchingCmsData', false)
         .set('fetchingCmsDataFailed', true);
-    case types.GET_CMS_ACCOUNTS_REQUEST:
-      return state
-        .set('isBeeEnabled', false); // default to false
-    case types.GET_CMS_ACCOUNTS_SUCCESS:
-      return state
-        .set('isBeeEnabled', action.isBeeEnabled);
-    case types.GET_CMS_ACCOUNTS_FAILURE:
-      return state
-        .set('isBeeEnabled', false);
     case types.CLEAR_EMAIL_CRUD_RESPONSE_REQUEST:
       return state
         .set('createResponse', fromJS({}));
@@ -149,8 +139,7 @@ function emailReducer(state = initialState, action) {
         .set('CmsSettings', fromJS({}))
         .set('fetchingCmsData', false)
         .set('duplicateResponse', fromJS({}))
-        .set('cmsData', '')
-        .set('isBeeEnabled', false);
+        .set('cmsData', '');
     case types.TRANSFORM_EMAIL_TEMPLATE_REQUEST:
       return state.set("createTemplateInProgress", true);
     default:

package/v2Containers/Email/sagas.js

@@ -9,29 +9,15 @@ export function* createTemplate(template) {
   let errorMsg;
   try {
     const result = yield call(Api.createEmailTemplate, template);
-    // Check if the API call failed (non-2xx status codes or explicit failure)
-    const statusCode = result.status?.code || result.status;
-    const isError = !result.success || statusCode >= 400;
-
-    if (isError) {
+    if (!result.success || result.status.code === 500) {
       errorMsg = result.message;
       yield put({ type: types.CREATE_TEMPLATE_FAILURE, errorMsg });
-      // Call callback with error so component can handle it
-      if (template.onCreateTemplateComplete) {
-        yield template.onCreateTemplateComplete({ error: true, message: errorMsg, statusCode });
-      }
     } else {
-      yield put({
-        type: types.CREATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg,
-      });
+      yield put({ type: types.CREATE_TEMPLATE_SUCCESS, data: result.response, statusCode: result.status ? result.status.code : '', errorMsg });
       yield template.onCreateTemplateComplete(result.response);
     }
   } catch (error) {
     yield put({ type: types.CREATE_TEMPLATE_FAILURE, error, errorMsg });
-    // Call callback with error so component can handle it
-    if (template.onCreateTemplateComplete) {
-      yield template.onCreateTemplateComplete({ error: true, message: errorMsg || error.message });
-    }
   }
 }
 
@@ -40,14 +26,14 @@ export function* transformEmailTemplate({template, callback}) {
     const result = yield call(transformEmailTemplates, template);
     yield callback(result);
   } catch (error) {
-    yield callback(template);
+    yield callback(template);    
   }
 }
 
 export function* duplicateTemplate(payload) {
   let errorMsg;
   let result;
-  const { id, channel, callback } = payload;
+  let { id, channel, callback } = payload;
   try {
     result = yield call(Api.duplicateTemplate, {id, channel} );
     if (result.status.code === 500) {
@@ -56,9 +42,7 @@ export function* duplicateTemplate(payload) {
     if (callback) {
       callback(result?.response);
     }
-    yield put({
-      type: types.DUPLICATE_TEMPLATE_SUCCESS, data: result?.response, statusCode: result?.status?.code, errorMsg,
-    });
+    yield put({ type: types.DUPLICATE_TEMPLATE_SUCCESS, data: result?.response, statusCode: result?.status?.code, errorMsg });
   } catch (error) {
     yield put({ type: types.DUPLICATE_TEMPLATE_FAILURE, error, errorMsg });
   }
@@ -83,9 +67,7 @@ export function* getAllAssets(assetType, queryParams) {
   }
 }
 
-export function* getCmsSetting({
-  cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable,
-}) {
+export function* getCmsSetting({cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable}) {
   try {
     const result = yield call(Api.getCmsTemplateSettingsV2, cmsType, projectId, cmsMode, langId, isEdmSupport, isBEEAppEnable);
 
@@ -105,17 +87,6 @@ export function* getCmsData({cmsType, projectId, langId}) {
   }
 }
 
-export function* getCmsAccounts({cmsType}) {
-  try {
-    const result = yield call(Api.getCmsAccounts, cmsType);
-    const { cmsAccounts } = result.data?.response || {};
-    const isBeeEnabled = cmsAccounts?.type === cmsType;
-    yield put({ type: types.GET_CMS_ACCOUNTS_SUCCESS, isBeeEnabled });
-  } catch (error) {
-    yield put({ type: types.GET_CMS_ACCOUNTS_FAILURE, error });
-  }
-}
-
 export function* uploadAsset(file, assetType, fileParams) {
   try {
     const result = yield call(Api.uploadFile, file, assetType, fileParams);
@@ -152,10 +123,6 @@ function* watchGetCmsData() {
   yield takeEvery(types.GET_CMS_EDITOR_DATA_REQUEST, getCmsData);
 }
 
-function* watchGetCmsAccounts() {
-  yield takeEvery(types.GET_CMS_ACCOUNTS_REQUEST, getCmsAccounts);
-}
-
 function* watchUploadAsset() {
   yield takeLatest(types.UPLOAD_ASSET_REQUEST, uploadAsset);
 }
@@ -172,7 +139,6 @@ export default [
   watchGetAllAssets,
   watchGetCmsSetting,
   watchGetCmsData,
-  watchGetCmsAccounts,
   watchUploadAsset,
   watchDuplicateTemplate,
 ];
@@ -185,7 +151,6 @@ export function* v2EmailSagas() {
     watchGetAllAssets(),
     watchGetCmsSetting(),
     watchGetCmsData(),
-    watchGetCmsAccounts(),
     watchUploadAsset(),
   ]);
 }

package/v2Containers/Email/tests/__snapshots__/reducer.test.js.snap

@@ -4,7 +4,6 @@ exports[` 1`] = `
 Immutable.Map {
   "createTemplateInProgress": false,
   "createResponse": Immutable.Map {},
-  "isBeeEnabled": false,
 }
 `;
 
@@ -12,6 +11,5 @@ exports[` 2`] = `
 Immutable.Map {
   "createTemplateInProgress": true,
   "createResponse": Immutable.Map {},
-  "isBeeEnabled": false,
 }
 `;

package/v2Containers/EmailWrapper/components/EmailWrapperView.js

@@ -1,4 +1,4 @@
-import React, { useRef, useCallback } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from 'react-intl';
 import styled from 'styled-components';
@@ -11,15 +11,10 @@ import CapSpin from '@capillarytech/cap-ui-library/CapSpin';
 import CapButton from '@capillarytech/cap-ui-library/CapButton';
 import CapError from '@capillarytech/cap-ui-library/CapError';
 import ComponentWithLabelHOC from '@capillarytech/cap-ui-library/assets/HOCs/ComponentWithLabelHOC';
-import { CAP_COLOR_06, CAP_WHITE } from '@capillarytech/cap-ui-library/styled/variables';
-import { EmailWithoutSaga } from '../../Email';
+import Email from '../../Email';
 import CmsTemplatesComponent from '../../../v2Components/CmsTemplatesComponent';
-import EmailHTMLEditor from './EmailHTMLEditor';
-import TestAndPreviewSlidebox from '../../../v2Components/TestAndPreviewSlidebox';
-import { EMAIL } from '../../CreativesContainer/constants';
 import messages from '../messages';
 import { EMAIL_CREATE_MODES, STEPS } from '../constants';
-import { hasSupportCKEditor } from '../../../utils/common';
 
 const CapRadioCardWithLabel = ComponentWithLabelHOC(CapRadioCard);
 
@@ -32,23 +27,9 @@ const CardContainer = styled.div`
       }
     }
   }
-
-  .ant-radio-group.cap-radioCard-v2 {
-    .ant-radio-button-wrapper {
-      &.ant-radio-button-wrapper-checked {
-        .icon-container {
-          background-color: ${CAP_COLOR_06};
-          .anticon,
-          .cap-icon {
-            color: ${CAP_WHITE};
-          }
-        }
-      }
-    }
-  }
 `;
 
-// Mode selection component
+// Mode selection component that handles the creation mode selection UI
 const ModeSelectionUI = ({
   isFullMode,
   templateName,
@@ -70,7 +51,7 @@ const ModeSelectionUI = ({
         value={templateName}
         labelPosition="top"
         size="default"
-        style={{ width: '68%' }}
+        style={{ width: '68%'}}
       />
     )}
     <CardContainer>
@@ -117,21 +98,15 @@ ModeSelectionUI.propTypes = {
   uploadButtonLabel: PropTypes.node.isRequired,
 };
 
-// Content creation component
+// Content creation component that handles the email or template selection UI
 const ContentCreationUI = ({
   isShowEmailCreate,
   emailProps,
   cmsTemplatesProps,
-  isHTMLEditorMode,
-  htmlEditorProps,
 }) => (
   <>
     {isShowEmailCreate ? (
-      isHTMLEditorMode ? (
-        <EmailHTMLEditor {...htmlEditorProps} />
-      ) : (
-        <EmailWithoutSaga {...emailProps} />
-      )
+      <Email {...emailProps} />
     ) : (
       <CmsTemplatesComponent {...cmsTemplatesProps} />
     )}
@@ -142,8 +117,6 @@ ContentCreationUI.propTypes = {
   isShowEmailCreate: PropTypes.bool.isRequired,
   emailProps: PropTypes.object.isRequired,
   cmsTemplatesProps: PropTypes.object.isRequired,
-  isHTMLEditorMode: PropTypes.bool,
-  htmlEditorProps: PropTypes.object,
 };
 
 // Main EmailWrapper presentational component
@@ -164,130 +137,9 @@ const EmailWrapperView = ({
   isShowEmailCreate,
   emailProps,
   cmsTemplatesProps,
-  metaEntities,
-  loadingTags,
-  injectedTags,
-  globalActions,
-  supportedTags,
-  getDefaultTags,
-  location,
-  currentOrgDetails,
-  forwardedTags,
-  selectedOfferDetails,
-  eventContextTags,
-  getFormdata,
-  isGetFormData,
-  getLiquidTags,
-  showLiquidErrorInFooter,
-  onValidationFail,
-  emailActions,
-  Email,
-  templateData: templateDataProp,
-  params,
-  fetchingLiquidTags,
-  createTemplateInProgress,
-  fetchingCmsData,
-  setIsLoadingContent,
-  showTestAndPreviewSlidebox,
-  handleCloseTestAndPreview,
-  showTemplateName,
 }) => {
-  const htmlEditorRef = useRef(null);
-  const supportCKEditor = hasSupportCKEditor();
-  const hasParamsIdForEditor = params?.id || location?.query?.id || location?.params?.id || location?.pathname?.includes('/edit/');
-  const isEditModeForEditor = hasParamsIdForEditor;
-  const isBEEFromProps = emailProps?.editor === 'BEE' && emailProps?.selectedEditorMode === null;
-  const isDragDropFromCreateMode = emailCreateMode === EMAIL_CREATE_MODES.DRAG_DROP;
-  const isExplicitlyBEEEditor = isBEEFromProps || isDragDropFromCreateMode;
-  let isHTMLEditorMode = false;
 
-  if (supportCKEditor) {
-    isHTMLEditorMode = false; // Legacy flow: use Email component
-  } else if (isEditModeForEditor) {
-    isHTMLEditorMode = !isExplicitlyBEEEditor;
-  } else {
-    if (isExplicitlyBEEEditor || isBEEFromProps || isDragDropFromCreateMode) {
-      isHTMLEditorMode = false;
-    } else {
-      isHTMLEditorMode = emailProps?.selectedEditorMode === EMAIL_CREATE_MODES.HTML_EDITOR ||
-        emailCreateMode === EMAIL_CREATE_MODES.HTML_EDITOR;
-    }
-  }
-
-  const isShowTemplateSelection = step === STEPS.MODE_SELECTION;
-
-  // Create onFormDataChange callback for template name updates (similar to Email component)
-  // This allows CreativesContainer to update the template name when user clicks "Edit name"
-  // When user edits the name in CreativesContainer header, it calls this callback
-  // which updates the template name in EmailWrapper, and then CreativesContainer
-  // will call showTemplateName again with the updated formData
-  const handleFormDataChange = useCallback((updatedFormData) => {
-    const newTemplateName = updatedFormData?.['template-name'] || templateName;
-    if (newTemplateName !== templateName && onTemplateNameChange) {
-      // Update template name in parent (useEmailWrapper hook)
-      onTemplateNameChange({ target: { value: newTemplateName } });
-    }
-    // Note: CreativesContainer will call showTemplateName again after this callback
-    // (it stores the callback in templateContainerDetails and calls it after state updates)
-  }, [templateName, onTemplateNameChange]);
-
-  const htmlEditorProps = isHTMLEditorMode ? {
-    // Location and params
-    location,
-    params,
-    // Tag-related props
-    getDefaultTags,
-    supportedTags,
-    metaEntities,
-    injectedTags,
-    globalActions,
-    loadingTags,
-    eventContextTags,
-    forwardedTags,
-    selectedOfferDetails,
-    currentOrgDetails,
-    // Email Redux state and actions
-    Email,
-    emailActions,
-    // Full mode props
-    isFullMode,
-    templateName,
-    isGetFormData,
-    getFormdata,
-    // Library mode props
-    templateData: templateDataProp,
-    // Uploaded content from zip file
-    EmailLayout,
-    // Liquid validation
-    getLiquidTags,
-    showLiquidErrorInFooter,
-    onValidationFail,
-    // Template name
-    showTemplateName,
-    onFormDataChange: handleFormDataChange,
-    // Loading states
-    fetchingLiquidTags: fetchingLiquidTags || false,
-    createTemplateInProgress: createTemplateInProgress || false,
-    fetchingCmsData: fetchingCmsData || false,
-    // Parent loading control
-    setIsLoadingContent,
-    ref: htmlEditorRef,
-  } : {};
-
-  // Get formData for TestAndPreviewSlidebox when needed
-  const getFormDataForPreview = () => {
-    if (htmlEditorRef.current && htmlEditorRef.current.getFormDataForPreview) {
-      return htmlEditorRef.current.getFormDataForPreview();
-    }
-    return {};
-  };
-
-  const getContentForPreview = () => {
-    if (htmlEditorRef.current && htmlEditorRef.current.getContentForPreview) {
-      return htmlEditorRef.current.getContentForPreview();
-    }
-    return '';
-  };
+  const isShowTemplateSelection = step === STEPS.MODE_SELECTION || (step === STEPS.TEMPLATE_SELECTION && emailCreateMode === EMAIL_CREATE_MODES.UPLOAD);
 
   return (
     <>
@@ -311,22 +163,9 @@ const EmailWrapperView = ({
             isShowEmailCreate={isShowEmailCreate}
             emailProps={emailProps}
             cmsTemplatesProps={cmsTemplatesProps}
-            isHTMLEditorMode={isHTMLEditorMode}
-            htmlEditorProps={htmlEditorProps}
           />
         )}
       </CapSpin>
-      {/* Render TestAndPreviewSlidebox for HTML Editor (similar to legacy Email component) */}
-      {isHTMLEditorMode && showTestAndPreviewSlidebox && (
-        <TestAndPreviewSlidebox
-          show={showTestAndPreviewSlidebox}
-          onClose={handleCloseTestAndPreview}
-          formData={getFormDataForPreview()}
-          content={getContentForPreview()}
-          currentChannel={EMAIL}
-          currentTab={1}
-        />
-      )}
     </>
   );
 };
@@ -336,10 +175,6 @@ EmailWrapperView.propTypes = {
   emailCreateMode: PropTypes.string,
   step: PropTypes.string,
   isFullMode: PropTypes.bool,
-  getFormdata: PropTypes.func,
-  isGetFormData: PropTypes.bool,
-  getLiquidTags: PropTypes.func,
-  showLiquidErrorInFooter: PropTypes.func,
   templateName: PropTypes.string,
   onTemplateNameChange: PropTypes.func.isRequired,
   isTemplateNameEmpty: PropTypes.bool,
@@ -352,27 +187,6 @@ EmailWrapperView.propTypes = {
   isShowEmailCreate: PropTypes.bool.isRequired,
   emailProps: PropTypes.object.isRequired,
   cmsTemplatesProps: PropTypes.object.isRequired,
-  metaEntities: PropTypes.object,
-  loadingTags: PropTypes.bool,
-  injectedTags: PropTypes.object,
-  globalActions: PropTypes.object,
-  supportedTags: PropTypes.array,
-  getDefaultTags: PropTypes.string,
-  location: PropTypes.object,
-  currentOrgDetails: PropTypes.object,
-  forwardedTags: PropTypes.object,
-  selectedOfferDetails: PropTypes.array,
-  eventContextTags: PropTypes.array,
-  emailActions: PropTypes.object,
-  Email: PropTypes.object,
-  templateData: PropTypes.object,
-  params: PropTypes.object,
-  fetchingLiquidTags: PropTypes.bool,
-  createTemplateInProgress: PropTypes.bool,
-  fetchingCmsData: PropTypes.bool,
-  setIsLoadingContent: PropTypes.func,
-  showTestAndPreviewSlidebox: PropTypes.bool,
-  handleCloseTestAndPreview: PropTypes.func,
 };
 
 export default EmailWrapperView;