@capillarytech/creatives-library 8.0.259 → 8.0.260-alpha.0

package/v2Containers/CreativesContainer/SlideBoxFooter.js

@@ -7,15 +7,12 @@ import PropTypes from 'prop-types';
 import messages from './messages';
 import ErrorInfoNote from '../../v2Components/ErrorInfoNote';
 import { PREVIEW } from './constants';
-import { EMAIL_CREATE_MODES } from '../EmailWrapper/constants';
 
-function getFullModeSaveBtn(slidBoxContent, isCreatingTemplate) {
-  if (isCreatingTemplate) {
-    return <FormattedMessage {...messages.creativesTemplatesDone} />;
-  }
-  return slidBoxContent === "editTemplate"
-    ? <FormattedMessage {...messages.creativesTemplatesUpdate} />
-    : <FormattedMessage {...messages.creativesTemplatesSaveFullMode} />;
+function getFullModeSaveBtn(slidBoxContent) {
+  return slidBoxContent === "editTemplate" ?
+    <FormattedMessage {...messages.creativesTemplatesUpdate}/>
+    :
+    <FormattedMessage {...messages.creativesTemplatesSaveFullMode}/>;
 }
 function SlideBoxFooter(props) {
   const {
@@ -27,119 +24,18 @@ function SlideBoxFooter(props) {
     fetchingCmsData,
     isTemplateNameEmpty,
     errorMessages,
-    // eslint-disable-next-line no-unused-vars
-    isLiquidValidationError, // Legacy prop, kept for PropTypes compatibility
+    isLiquidValidationError,
     currentTab,
     onTestAndPreview,
     // isEmptyContent,
     showTestAndPreviewButton,
     shouldShowDoneFooter,
     shouldShowContinueFooter,
-    isContinueButtonDisabled,
-    continueButtonLabel,
-    htmlEditorValidationState,
-    isCreatingTemplate,
-    currentChannel,
-    emailCreateMode,
-    selectedEmailCreateMode,
   } = props;
 
-  // Calculate if buttons should be disabled
-  // Only apply validation state checks for EMAIL channel in HTML Editor mode (not BEE/DragDrop)
-  // For other channels, BEE editor, or when htmlEditorValidationState is not provided, don't disable based on validation
-  const isEmailChannel = currentChannel?.toUpperCase() === 'EMAIL';
-  const isEditMode = slidBoxContent === 'editTemplate';
-
-  // Use selectedEmailCreateMode for accurate mode detection in create mode (emailCreateMode is mapped for backwards compatibility)
-  // In edit mode: htmlEditorValidationState is initialized as {} but only updated by HTML Editor
-  // If it's still in initial state (validationComplete === false, issueCounts.total === 0), it's BEE editor
-  // Upload mode also uses HTML Editor, so include it in HTML Editor mode check
-  const isUploadMode = emailCreateMode === EMAIL_CREATE_MODES.UPLOAD;
-  const isHTMLEditorModeInCreate = selectedEmailCreateMode === EMAIL_CREATE_MODES.HTML_EDITOR || isUploadMode;
-  // In edit mode: Check if htmlEditorValidationState has been updated by HTML Editor
-  // HTML Editor will call updateHtmlEditorValidationState, setting validationComplete to true at some point
-  // If validationComplete is false and issueCounts.total === 0, it's likely still in initial state (BEE editor)
-  const isHtmlEditorValidationStateActive = htmlEditorValidationState && (
-    htmlEditorValidationState.validationComplete === true
-    || (htmlEditorValidationState.issueCounts && htmlEditorValidationState.issueCounts.total > 0)
-    || htmlEditorValidationState.hasErrors === true
-  );
-  const isHTMLEditorModeInEdit = isEditMode && isHtmlEditorValidationStateActive;
-  const isHTMLEditorMode = isHTMLEditorModeInCreate || isHTMLEditorModeInEdit;
-  console.log('***isHTMLEditorMode', isHTMLEditorMode, 'isHTMLEditorModeInCreate', isHTMLEditorModeInCreate, 'isHTMLEditorModeInEdit', isHTMLEditorModeInEdit, 'isHtmlEditorValidationStateActive', isHtmlEditorValidationStateActive);
-
-  // BEE editor detection: drag_drop mode OR (editor mode AND not HTML Editor)
-  // In edit mode: if htmlEditorValidationState is in initial state (not updated by HTML Editor), it's BEE editor
-  const isBEEEditor = selectedEmailCreateMode === EMAIL_CREATE_MODES.DRAG_DROP
-    || (emailCreateMode === EMAIL_CREATE_MODES.EDITOR && !isHTMLEditorMode)
-    || (isEditMode && !isHtmlEditorValidationStateActive);
-  // Only check validation for HTML Editor mode, not for BEE/DragDrop editor
-  const shouldCheckValidation = isEmailChannel && htmlEditorValidationState && isHTMLEditorMode && !isBEEEditor;
-  const isContentEmpty = shouldCheckValidation ? (htmlEditorValidationState?.isContentEmpty ?? true) : false;
-  // Check if validation has completed
-  const validationComplete = shouldCheckValidation ? (htmlEditorValidationState?.validationComplete ?? false) : true;
-  // Only Rule Group #1 (Input & Sanitization) blocks; hasErrors is set by HTMLEditor from hasBlockingErrors.
-  // hasErrors should always be set (defaults to false), so we only check for explicit true value.
-  // Warnings (label issues, HTML/CSS compatibility) do NOT block buttons.
-  const hasValidationErrors = shouldCheckValidation && htmlEditorValidationState?.hasErrors === true;
-  console.log('***hasValidationErrors', hasValidationErrors);
-  const errorsAcknowledged = shouldCheckValidation ? (htmlEditorValidationState?.errorsAcknowledged ?? false) : true;
-  console.log('***errorsAcknowledged', errorsAcknowledged);
-
-  // IMPORTANT: In both modes, if validation finds errors, buttons must stay disabled until user acknowledges by clicking redirection icon
-  let shouldDisableButtons = false;
-  if (shouldCheckValidation) {
-    if (isEditMode) {
-      // Edit mode: Disable if validation has completed AND found errors AND errors not acknowledged
-      shouldDisableButtons = validationComplete && hasValidationErrors && !errorsAcknowledged;
-    } else {
-      // Create mode:
-      // 1. Disable until validation completes
-      // 2. Disable if content is empty
-      // 3. Disable if validation finds errors AND errors not acknowledged (user must click redirection icon)
-      shouldDisableButtons = !validationComplete || isContentEmpty || (hasValidationErrors && !errorsAcknowledged);
-    }
-  }
-
-  // Show ErrorInfoNote for API validation errors (from validateLiquidTemplateContent)
-  // For HTML Editor: API validation errors are shown in ValidationErrorDisplay (inside CodeEditorPane), not here
-  const hasStandardErrors = errorMessages && errorMessages.STANDARD_ERROR_MSG && errorMessages.STANDARD_ERROR_MSG.length > 0;
-  const hasLiquidErrors = errorMessages && errorMessages.LIQUID_ERROR_MSG && errorMessages.LIQUID_ERROR_MSG.length > 0;
-
-  // Check if htmlEditorValidationState has actual validation errors
-  // If htmlEditorValidationState exists but has no errors (total === 0), and we have STANDARD/LIQUID errors,
-  // then those errors are from BEE editor (FormBuilder validation), not HTML Editor
-  const htmlEditorHasErrors = htmlEditorValidationState && htmlEditorValidationState.issueCounts && htmlEditorValidationState.issueCounts.total > 0;
-
-  // BEE editor errors: We have STANDARD/LIQUID errors AND either:
-  // 1. No htmlEditorValidationState exists, OR
-  // 2. htmlEditorValidationState exists but has no actual errors (meaning errors are from FormBuilder/BEE editor)
-  // IMPORTANT: Only check for BEE editor errors when NOT in HTML Editor mode (upload or html_editor)
-  // Upload mode uses HTML Editor, so BEE editor errors don't apply
-  // IMPORTANT: BEE editor doesn't have real-time content updates,
-  // so we should NOT disable buttons based on validation errors
-  // In edit mode: Check if htmlEditorValidationState is in initial state (not updated by HTML Editor)
-  // In edit mode with BEE editor, htmlEditorValidationState will remain in initial state
-  // In create mode, check selectedEmailCreateMode or emailCreateMode
-  const isBEEEditorModeInEdit = isEditMode && !isHtmlEditorValidationStateActive;
-  console.log('***isBEEEditorModeInEdit', isBEEEditorModeInEdit, 'isHtmlEditorValidationStateActive', isHtmlEditorValidationStateActive);
-  const isBEEEditorModeInCreate = !isHTMLEditorMode && !isEditMode;
-  console.log('***isBEEEditorModeInCreate', isBEEEditorModeInCreate);
-  const isBEEEditorMode = isBEEEditorModeInEdit || isBEEEditorModeInCreate;
-  console.log('***isBEEEditorMode', isBEEEditorMode);
-  const hasBEEEditorErrors = isEmailChannel && isBEEEditorMode && (hasStandardErrors || hasLiquidErrors) && (!htmlEditorValidationState || !htmlEditorHasErrors);
-  console.log('***hasBEEEditorErrors', hasBEEEditorErrors);
-
-  const shouldShowErrorInfoNote = hasBEEEditorErrors;
   return (
-    <div className="template-footer-width">
-      {shouldShowErrorInfoNote && (
-        <ErrorInfoNote
-          errorMessages={errorMessages}
-          currentTab={currentTab?.toUpperCase()}
-          useLegacyDisplay // Use simple list display for BEE Editor (not tabbed interface)
-        />
-      )}
+    <div className='template-footer-width'>
+      {isLiquidValidationError && (<ErrorInfoNote errorMessages={errorMessages} currentTab={currentTab?.toUpperCase()} />)}
       <div>
         {shouldShowDoneFooter() && (
           <div>
@@ -151,10 +47,10 @@ function SlideBoxFooter(props) {
             <CapRow>
               <CapButton
                 onClick={onSave}
-                disabled={isTemplateNameEmpty || fetchingCmsData || shouldDisableButtons}
+                disabled={isTemplateNameEmpty || fetchingCmsData || false}
               >
                 {isFullMode ? (
-                  getFullModeSaveBtn(slidBoxContent, isCreatingTemplate)
+                  getFullModeSaveBtn(slidBoxContent)
                 ) : (
                   <FormattedMessage {...messages.creativesTemplatesSave} />
                 )}
@@ -163,7 +59,7 @@ function SlideBoxFooter(props) {
                 <CapButton
                   type="secondary"
                   onClick={onTestAndPreview}
-                  disabled={shouldDisableButtons}
+                  // disabled={isEmptyContent || false}
                   style={{ marginLeft: '8px' }}
                 >
                   <FormattedMessage {...messages.testAndPreview} />
@@ -174,11 +70,8 @@ function SlideBoxFooter(props) {
           </div>
         )}
         {shouldShowContinueFooter() && (
-          <CapButton
-            onClick={onCreateNextStep}
-            disabled={isContinueButtonDisabled || false}
-          >
-            <FormattedMessage {...(continueButtonLabel || messages.continue)} />
+          <CapButton onClick={onCreateNextStep}>
+            <FormattedMessage {...messages.continue} />
           </CapButton>
         )}
         {slidBoxContent === PREVIEW && (
@@ -206,48 +99,5 @@ SlideBoxFooter.propTypes = {
   onTestAndPreview: PropTypes.func,
   isEmptyContent: PropTypes.bool,
   showTestAndPreviewButton: PropTypes.bool,
-  isContinueButtonDisabled: PropTypes.bool,
-  continueButtonLabel: PropTypes.object,
-  htmlEditorValidationState: PropTypes.shape({
-    isContentEmpty: PropTypes.bool,
-    issueCounts: PropTypes.shape({
-      html: PropTypes.number,
-      label: PropTypes.number,
-      liquid: PropTypes.number,
-      total: PropTypes.number,
-    }),
-    validationComplete: PropTypes.bool,
-    /** Only Rule Group #1 (Input & Sanitization) blocks; warnings do not block */
-    hasErrors: PropTypes.bool,
-  }),
-  isCreatingTemplate: PropTypes.bool,
-  currentChannel: PropTypes.string,
-  emailCreateMode: PropTypes.string,
-  selectedEmailCreateMode: PropTypes.string,
-};
-
-SlideBoxFooter.defaultProps = {
-  slidBoxContent: '',
-  onSave: () => {},
-  onEditTemplate: () => {},
-  onCreateNextStep: () => {},
-  shouldShowContinueFooter: () => {},
-  shouldShowDoneFooter: () => {},
-  isFullMode: false,
-  fetchingCmsData: false,
-  isTemplateNameEmpty: false,
-  errorMessages: [],
-  isLiquidValidationError: false,
-  currentTab: '',
-  onTestAndPreview: () => {},
-  isEmptyContent: false,
-  showTestAndPreviewButton: false,
-  isContinueButtonDisabled: false,
-  continueButtonLabel: {},
-  htmlEditorValidationState: {},
-  isCreatingTemplate: false,
-  currentChannel: '',
-  emailCreateMode: '',
-  selectedEmailCreateMode: '',
 };
 export default SlideBoxFooter;

package/v2Containers/CreativesContainer/SlideBoxHeader.js

@@ -45,7 +45,6 @@ export function SlideBoxHeader(props) {
   const isZaloEdit = channel.toLowerCase() === ZALO && slidBoxContent === 'editTemplate';
   const zaloOverview = isZaloEdit && isFullMode;
   const whatsappOverview = isWhatsappEdit && isFullMode;
-  const shouldShowInAppEditHeader = isInAppEdit && !isFullMode;
   const headerMessage = whatsappOverview ? messages.whatsappOverview : zaloOverview ? messages.zaloOverview : messages.editMessageContent;
   const {
     whatsappTemplateName,
@@ -111,7 +110,7 @@ export function SlideBoxHeader(props) {
             }
           />
         )}
-      {!showTemplateNameHeader && slidBoxContent === 'editTemplate' && (shouldShowInAppEditHeader || !isInAppCreate) && (
+      {!showTemplateNameHeader && slidBoxContent === 'editTemplate' && (
         <CapHeader
           className="support-video-elements"
           title={<FormattedMessage {...headerMessage} values={{ channel: getChannelLabel(channel) }} />}

package/v2Containers/CreativesContainer/constants.js

@@ -26,7 +26,6 @@ export const WEBPUSH_BRAND_ICON = "WEBPUSH_BRAND_ICON";
 export const PREVIEW = "preview";
 export const EDIT_TEMPLATE = "editTemplate";
 export const JOURNEY = "journey";
-export const HTML = "HTML";
 
 export const LOYALTY_SUPPORTED_ACTION = "SEND_COMMUNICATION_ACTION";