cap-creatives-ui 8.0.280 → 8.0.321

package/app/v2Components/HtmlEditor/utils/__tests__/htmlValidator.enhanced.test.js

@@ -1076,6 +1076,138 @@ line4`;
       expect(result).toBeDefined();
       expect(Array.isArray(result.warnings)).toBe(true);
     });
+
+    it('routes warning-severity issues to warnings array — exact item check (line 112-113)', () => {
+      // Mock HTMLHint to return an issue with a warningRule ruleId
+      // getSeverityLevel('error', 'tag-pair') → 'warning' (warningRules match)
+      const htmlhint = require('htmlhint');
+      const original = htmlhint.HTMLHint.verify;
+      htmlhint.HTMLHint.verify = jest.fn(() => ([
+        {
+          type: 'error',
+          message: 'Tag must be paired',
+          line: 1,
+          col: 5,
+          rule: { id: 'tag-pair' },
+        },
+      ]));
+
+      const result = validateHTML('<p>unclosed');
+
+      expect(result.warnings.length).toBeGreaterThanOrEqual(1);
+      const item = result.warnings.find((w) => w.rule === 'tag-pair');
+      expect(item).toBeDefined();
+      expect(item.severity).toBe('warning');
+
+      htmlhint.HTMLHint.verify = original;
+    });
+
+    it('routes info-severity issues to info array — exact item check (line 114-115)', () => {
+      // getSeverityLevel('warning', 'space-tab-mixed-disabled') → 'info'
+      // (not in warningRules, type !== 'error')
+      const htmlhint = require('htmlhint');
+      const original = htmlhint.HTMLHint.verify;
+      htmlhint.HTMLHint.verify = jest.fn(() => ([
+        {
+          type: 'warning',
+          message: 'Mixed spaces and tabs',
+          line: 1,
+          col: 1,
+          rule: { id: 'space-tab-mixed-disabled' },
+        },
+      ]));
+
+      const result = validateHTML('<div>test</div>');
+
+      expect(result.info.length).toBeGreaterThanOrEqual(1);
+      const item = result.info.find((i) => i.rule === 'space-tab-mixed-disabled');
+      expect(item).toBeDefined();
+      expect(item.severity).toBe('info');
+
+      htmlhint.HTMLHint.verify = original;
+    });
+
+    it('downgrades HTMLHint error type to warning for non-warningRule (line 163-164) — exact item check', () => {
+      // getSeverityLevel('error', 'src-not-empty') → 'warning' (not in warningRules, but type === 'error')
+      const htmlhint = require('htmlhint');
+      const original = htmlhint.HTMLHint.verify;
+      htmlhint.HTMLHint.verify = jest.fn(() => ([
+        {
+          type: 'error',
+          message: 'The src attribute cannot be empty',
+          line: 1,
+          col: 1,
+          rule: { id: 'src-not-empty' },
+        },
+      ]));
+
+      const result = validateHTML('<img src="">');
+
+      // Should be downgraded to warning (not error)
+      expect(result.warnings.length).toBeGreaterThanOrEqual(1);
+      const item = result.warnings.find((w) => w.rule === 'src-not-empty');
+      expect(item).toBeDefined();
+      expect(item.severity).toBe('warning');
+      // Should NOT be in errors
+      expect(result.errors.find((e) => e.rule === 'src-not-empty')).toBeUndefined();
+
+      htmlhint.HTMLHint.verify = original;
+    });
+
+    it('returns info for HTMLHint warning type with unknown ruleId (line 165-166)', () => {
+      // getSeverityLevel('warning', 'unknown-rule') → 'info' (no warningRules match, type !== 'error')
+      const htmlhint = require('htmlhint');
+      const original = htmlhint.HTMLHint.verify;
+      htmlhint.HTMLHint.verify = jest.fn(() => ([
+        {
+          type: 'warning',
+          message: 'Some custom warning',
+          line: 2,
+          col: 3,
+          rule: { id: 'unknown-custom-rule' },
+        },
+      ]));
+
+      const result = validateHTML('<div>test</div>');
+
+      expect(result.info.length).toBeGreaterThanOrEqual(1);
+      const item = result.info.find((i) => i.rule === 'unknown-custom-rule');
+      expect(item).toBeDefined();
+      expect(item.severity).toBe('info');
+      expect(item.line).toBe(2);
+      expect(item.column).toBe(3);
+      // Should NOT be in errors or warnings
+      expect(result.errors.find((e) => e.rule === 'unknown-custom-rule')).toBeUndefined();
+      expect(result.warnings.find((w) => w.rule === 'unknown-custom-rule')).toBeUndefined();
+
+      htmlhint.HTMLHint.verify = original;
+    });
+
+    it('processes multiple HTMLHint issues with mixed severity correctly (lines 101-118)', () => {
+      const htmlhint = require('htmlhint');
+      const original = htmlhint.HTMLHint.verify;
+      htmlhint.HTMLHint.verify = jest.fn(() => ([
+        { type: 'error', message: 'Tag pair', line: 1, col: 1, rule: { id: 'tag-pair' } },           // → warning
+        { type: 'error', message: 'Src empty', line: 2, col: 1, rule: { id: 'src-not-empty' } },     // → warning (downgrade)
+        { type: 'warning', message: 'Mixed tabs', line: 3, col: 1, rule: { id: 'space-tab-mixed-disabled' } }, // → info
+      ]));
+
+      const result = validateHTML('<div>test</div>');
+
+      const tagPair = result.warnings.find((w) => w.rule === 'tag-pair');
+      expect(tagPair).toBeDefined();
+      expect(tagPair.severity).toBe('warning');
+
+      const srcEmpty = result.warnings.find((w) => w.rule === 'src-not-empty');
+      expect(srcEmpty).toBeDefined();
+      expect(srcEmpty.severity).toBe('warning');
+
+      const mixedTabs = result.info.find((i) => i.rule === 'space-tab-mixed-disabled');
+      expect(mixedTabs).toBeDefined();
+      expect(mixedTabs.severity).toBe('info');
+
+      htmlhint.HTMLHint.verify = original;
+    });
   });
 
   describe('extractAndValidateCSS Advanced Tests', () => {

package/app/v2Components/HtmlEditor/utils/htmlValidator.js

@@ -76,7 +76,7 @@ const CUSTOM_VALIDATIONS = {
  * @param {Function} formatMessage - Message formatter function for internationalization
  * @returns {Object} Validation result with errors and warnings
  */
-export const validateHTML = (html, variant = 'email', formatMessage = defaultMessageFormatter) => {
+export const validateHTML = (html, variant = 'email', formatMessage = defaultMessageFormatter, options = {}) => {
   if (!html || typeof html !== 'string') {
     return {
       isValid: true,
@@ -133,7 +133,9 @@ export const validateHTML = (html, variant = 'email', formatMessage = defaultMes
   // Always run custom validations and Liquid validation, even if HTMLHint failed
   // This ensures unsafe protocol detection and other critical validations still run
   runCustomValidations(html, variant, results, formatMessage);
-  runLiquidValidation(html, variant, results, formatMessage);
+  if (!options.skipLiquidValidation) {
+    runLiquidValidation(html, variant, results, formatMessage);
+  }
 
   return results;
 };

package/app/v2Components/SmsFallback/SmsFallbackLocalSelector.js

@@ -0,0 +1,87 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import CreativesContainer from '../../v2Containers/CreativesContainer';
+import CapPageSpinner from '../CapPageSpinner';
+import {
+  EMBEDDED_SMS_CREATIVES_LOCATION,
+  SMS_FALLBACK_CHANNEL_KEY,
+  SMS_FALLBACK_CREATIVE_EDITOR,
+  SMS_FALLBACK_ENABLE_NEW_CHANNELS,
+} from './constants';
+
+/**
+ * Reuse the exact embedded CreativesContainer SMS flow (same as normal SMS create).
+ * Avoid overriding Templates with local config so "Create new" follows built-in createTemplate path.
+ */
+export function SmsFallbackLocalSelector({
+  hidden,
+  fetchDetailsLoading,
+  templateList,
+  channelsToHide,
+  smsRegister,
+  onCloseCreatives,
+  onSelectTemplate,
+  filterContent,
+  location,
+  /** Required when user completes embedded SMS create/edit — `CreativesContainer` calls this on save (see `processCentralCommsMetaId`). */
+  getCreativesData,
+}) {
+  const rootClassName = [
+    'sms-fallback-selector',
+    hidden ? 'sms-fallback-selector--visually-hidden' : '',
+  ]
+    .filter(Boolean)
+    .join(' ');
+
+  return (
+    <div className={rootClassName}>
+      {fetchDetailsLoading && (
+        <div className="sms-fallback-selector__loading" aria-busy="true" aria-live="polite">
+          <CapPageSpinner spinning />
+        </div>
+      )}
+      <CreativesContainer
+        creativesMode="create"
+        location={location || EMBEDDED_SMS_CREATIVES_LOCATION}
+        templateData={null}
+        handleCloseCreatives={onCloseCreatives}
+        isFullMode={false}
+        smsRegister={smsRegister}
+        editor={SMS_FALLBACK_CREATIVE_EDITOR}
+        enableNewChannels={SMS_FALLBACK_ENABLE_NEW_CHANNELS}
+        channel={SMS_FALLBACK_CHANNEL_KEY}
+        channelsToHide={channelsToHide}
+        selectedBadges={[]}
+        localTemplatesConfig={{
+          useLocalTemplates: true,
+          localTemplates: templateList.templates,
+          localTemplatesLoading: templateList.loading,
+          localTemplatesFilterContent: filterContent,
+          localTemplatesOnPageChange: templateList.loadMore,
+          localTemplatesUseSkeleton: true,
+        }}
+        onSelectTemplate={onSelectTemplate}
+        getCreativesData={getCreativesData}
+      />
+    </div>
+  );
+}
+
+SmsFallbackLocalSelector.propTypes = {
+  hidden: PropTypes.bool,
+  fetchDetailsLoading: PropTypes.bool,
+  templateList: PropTypes.shape({
+    templates: PropTypes.array,
+    loading: PropTypes.bool,
+    loadMore: PropTypes.func,
+  }).isRequired,
+  channelsToHide: PropTypes.arrayOf(PropTypes.string),
+  smsRegister: PropTypes.any,
+  onCloseCreatives: PropTypes.func.isRequired,
+  onSelectTemplate: PropTypes.func.isRequired,
+  filterContent: PropTypes.node,
+  location: PropTypes.object,
+  getCreativesData: PropTypes.func.isRequired,
+};
+
+export default SmsFallbackLocalSelector;

package/app/v2Components/SmsFallback/constants.js

@@ -0,0 +1,73 @@
+import {
+  WHATSAPP,
+  RCS,
+  ZALO,
+  WEBPUSH,
+} from '../../v2Containers/CreativesContainer/constants';
+
+/**
+ * View modes for the SMS fallback slidebox (template list, create, edit).
+ * Used by SmsFallback and any channel that reuses it (RCS, etc.).
+ */
+export const SMS_FALLBACK_VIEW = {
+  SELECTING: 'selecting',
+  CREATING: 'creating',
+  EDITING: 'editing',
+};
+
+/**
+ * Channel keys to hide in TemplatesV2 so only SMS tab is shown.
+ * Uses normalized keys matching TemplatesV2 pane.key normalization (lowercase).
+ * Parent can override via channelsToHide prop.
+ */
+export const CHANNELS_TO_HIDE_FOR_SMS_ONLY = [
+  'email',
+  'mobilepush',
+  'webpush',
+  'viber',
+  'whatsapp',
+  'zalo',
+  'facebook',
+  'rcs',
+  'inapp',
+  'line',
+  'wechat',
+  'call_task',
+  'ftp',
+  'assets',
+];
+
+/** DLT category filter values — aligned with Templates `SMS_FILTERS` / `filterSMSTemplates`. */
+export const SMS_CATEGORY_FILTERS = {
+  ALL: 'all',
+  PROMOTIONAL: 'promo',
+  SERVICE_EXPLICIT: 'explicit',
+  SERVICE_IMPLICIT: 'implicit',
+};
+
+/** `location` for embedded SMS creatives picker (CreativesContainer / TemplatesV2). */
+export const EMBEDDED_SMS_CREATIVES_LOCATION = {
+  pathname: '/sms/create',
+  query: { type: 'embedded', module: 'library' },
+  search: '',
+};
+
+/** `location` for embedded SMS TRAI edit inside slidebox. */
+export const EMBEDDED_SMS_CREATIVES_EDIT_LOCATION = {
+  pathname: '/sms/edit',
+  query: { type: 'embedded', module: 'library' },
+  search: '',
+};
+
+/** API `channel` param for `getTemplateDetails` when loading an SMS template by id. */
+export const SMS_TEMPLATE_DETAILS_API_CHANNEL = 'Sms';
+
+export const SMS_FALLBACK_CREATIVE_EDITOR = 'BEE';
+
+export const SMS_FALLBACK_CHANNEL_KEY = 'sms';
+
+/** Route shape passed to SmsWrapper / SmsTraiEdit for embedded SMS flows. */
+export const SMS_FALLBACK_ROUTE = { name: SMS_FALLBACK_CHANNEL_KEY };
+
+/** Channels enabled in the SMS-only embedded picker (hide others via `channelsToHide`). */
+export const SMS_FALLBACK_ENABLE_NEW_CHANNELS = [WHATSAPP, RCS, ZALO, WEBPUSH];