@capillarytech/creatives-library 8.0.255-alpha.4 → 8.0.255

package/v2Components/HtmlEditor/components/ValidationErrorDisplay/index.js

@@ -1,18 +1,15 @@
 /**
- * ValidationErrorDisplay - HTML Editor validation using ErrorInfoNote
+ * ValidationErrorDisplay - HTML Editor validation display
  *
- * This component integrates the existing ErrorInfoNote component with the HTML Editor's
- * validation system, providing a consistent error display that matches the Figma design.
+ * This component displays validation errors using the new ValidationTabs component
+ * with tabbed interface for HTML, Label, and Liquid issues.
  */
 
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 
-import CapRow from '@capillarytech/cap-ui-library/CapRow';
-import ErrorInfoNote from '../../../ErrorInfoNote';
-
-import { transformValidationToErrorInfo, hasValidationErrors } from '../../utils/validationAdapter';
-import { HTML_EDITOR_VARIANTS } from '../../constants';
+import { hasValidationErrors } from '../../utils/validationAdapter';
+import ValidationTabs from '../ValidationTabs';
 
 // Styles
 import './_validationErrorDisplay.scss';
@@ -20,51 +17,72 @@ import './_validationErrorDisplay.scss';
 /**
  * ValidationErrorDisplay Component
  *
- * Displays validation errors using the existing ErrorInfoNote component
+ * Displays validation errors using the ValidationTabs component
  */
 const ValidationErrorDisplay = ({
   validation,
-  variant = HTML_EDITOR_VARIANTS.EMAIL,
   onErrorClick,
-  className = ''
+  onClose,
+  isLiquidEnabled = false,
+  className = '',
 }) => {
-  // Don't render if no validation or no errors
-  if (!hasValidationErrors(validation)) {
-    return null;
-  }
+  // Track if panel is dismissed
+  const [isDismissed, setIsDismissed] = useState(false);
 
-  // Transform validation data to ErrorInfoNote format
-  const errorData = transformValidationToErrorInfo(validation, variant);
-  const { errorMessages } = errorData || {};
-
-  // Handle error click if provided
-  const handleErrorClick = (error) => {
-    onErrorClick?.(error);
+  // Handle close - dismiss temporarily
+  const handleClose = () => {
+    setIsDismissed(true);
+    if (onClose) {
+      onClose();
+    }
   };
 
+  // Reset dismissed state when validation changes (new errors appear)
+  React.useEffect(() => {
+    if (hasValidationErrors(validation)) {
+      setIsDismissed(false);
+    }
+  }, [validation]);
+
+  // Don't render if no validation, no errors, or dismissed
+  if (!hasValidationErrors(validation) || isDismissed) {
+    return null;
+  }
+
   return (
-    <CapRow
+    <div
       className={`validation-error-display ${className}`}
       role="alert"
       aria-live="polite"
       aria-label="Validation errors"
     >
-      <ErrorInfoNote
-        errorMessages={errorMessages}
-        onErrorClick={handleErrorClick}
+      <ValidationTabs
+        validation={validation}
+        onErrorClick={onErrorClick}
+        onClose={handleClose}
+        isLiquidEnabled={isLiquidEnabled}
       />
-    </CapRow>
+    </div>
   );
 };
 
 ValidationErrorDisplay.propTypes = {
   validation: PropTypes.shape({
     isValidating: PropTypes.bool,
-    getAllIssues: PropTypes.func
+    getAllIssues: PropTypes.func,
   }),
-  variant: PropTypes.oneOf(Object.values(HTML_EDITOR_VARIANTS)),
   onErrorClick: PropTypes.func,
-  className: PropTypes.string
+  onClose: PropTypes.func,
+  isLiquidEnabled: PropTypes.bool,
+  className: PropTypes.string,
+};
+
+ValidationErrorDisplay.defaultProps = {
+  validation: null,
+  onErrorClick: null,
+  onClose: null,
+  isLiquidEnabled: false,
+  className: '',
 };
 
 export default ValidationErrorDisplay;

package/v2Components/HtmlEditor/components/ValidationPanel/_validationPanel.scss

@@ -5,17 +5,17 @@
 @import '~@capillarytech/cap-ui-library/styles/_variables.scss';
 
 .validation-panel {
-  border: 1px solid #d9d9d9;
-  border-radius: 6px;
-  background: #fff;
+  border: 1px solid $CAP_COLOR_16;
+  border-radius: $CAP_SPACE_06;
+  background: $CAP_WHITE;
 
   &--loading {
-    padding: 16px;
+    padding: $CAP_SPACE_16;
     text-align: center;
   }
 
   &--clean {
-    padding: 16px;
+    padding: $CAP_SPACE_16;
     text-align: center;
     background: #f6ffed;
     border-color: #b7eb8f;
@@ -25,7 +25,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    gap: 8px;
+    gap: $CAP_SPACE_08;
     color: #666;
     font-size: 14px;
   }
@@ -34,36 +34,36 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    gap: 8px;
+    gap: $CAP_SPACE_08;
     color: #52c41a;
     font-size: 14px;
-    font-weight: 500;
+    font-weight: $FONT_WEIGHT_MEDIUM;
   }
 
   &__summary {
     display: flex;
-    gap: 16px;
-    padding: 12px 16px;
-    background: #fafafa;
-    border-bottom: 1px solid #d9d9d9;
-    border-radius: 6px 6px 0 0;
+    gap: $CAP_SPACE_16;
+    padding: $CAP_SPACE_12 $CAP_SPACE_16;
+    background: $CAP_G21;
+    border-bottom: 1px solid $CAP_COLOR_16;
+    border-radius: $CAP_SPACE_06 $CAP_SPACE_06 0 0;
   }
 
   &__summary-item {
     display: flex;
     align-items: center;
-    gap: 4px;
-    font-size: 12px;
+    gap: $CAP_SPACE_04;
+    font-size: $CAP_SPACE_12;
     color: #666;
 
     &--security {
       color: #ff4d4f;
-      font-weight: 500;
+      font-weight: $FONT_WEIGHT_MEDIUM;
     }
 
     span:first-of-type {
       font-weight: 600;
-      margin-left: 2px;
+      margin-left: $CAP_SPACE_02;
     }
   }
 
@@ -72,7 +72,7 @@
       border: none;
 
       &:last-child {
-        border-radius: 0 0 6px 6px;
+        border-radius: 0 0 $CAP_SPACE_06 $CAP_SPACE_06;
       }
     }
 
@@ -123,8 +123,8 @@
   &__title {
     display: flex;
     align-items: center;
-    gap: 8px;
-    font-weight: 500;
+    gap: $CAP_SPACE_08;
+    font-weight: $FONT_WEIGHT_MEDIUM;
   }
 
   &__issues {
@@ -133,41 +133,41 @@
   }
 
   &__sanitization {
-    border-top: 1px solid #d9d9d9;
+    border-top: 1px solid $CAP_COLOR_16;
     background: #f9f9f9;
   }
 
   &__sanitization-header {
     display: flex;
     align-items: center;
-    gap: 8px;
-    padding: 12px 16px;
-    font-weight: 500;
+    gap: $CAP_SPACE_08;
+    padding: $CAP_SPACE_12 $CAP_SPACE_16;
+    font-weight: $FONT_WEIGHT_MEDIUM;
     color: #666;
     font-size: 13px;
   }
 
   &__sanitization-list {
-    padding: 0 16px 12px;
+    padding: 0 $CAP_SPACE_16 $CAP_SPACE_12;
   }
 
   &__sanitization-item {
-    padding: 4px 0;
-    font-size: 12px;
+    padding: $CAP_SPACE_04 0;
+    font-size: $CAP_SPACE_12;
     color: #8c8c8c;
   }
 }
 
 .validation-issue {
   display: flex;
-  gap: 12px;
-  padding: 12px 16px;
+  gap: $CAP_SPACE_12;
+  padding: $CAP_SPACE_12 $CAP_SPACE_16;
   border-bottom: 1px solid #f0f0f0;
   cursor: pointer;
   transition: background-color 0.2s;
 
   &:hover {
-    background: #fafafa;
+    background: $CAP_G21;
   }
 
   &:last-child {
@@ -189,6 +189,22 @@
   &__icon {
     flex-shrink: 0;
     margin-top: 2px;
+
+    &--error {
+      color: #ff4d4f;
+    }
+
+    &--info {
+      color: #1890ff;
+    }
+
+    &--warning {
+      color: #faad14;
+    }
+
+    &--security {
+      color: #ff4d4f;
+    }
   }
 
   &__content {
@@ -200,14 +216,14 @@
     font-size: 13px;
     line-height: 1.4;
     color: #262626;
-    margin-bottom: 4px;
+    margin-bottom: $CAP_SPACE_04;
     word-break: break-word;
   }
 
   &__meta {
     display: flex;
     flex-wrap: wrap;
-    gap: 8px;
+    gap: $CAP_SPACE_08;
     font-size: 11px;
     color: #8c8c8c;
   }
@@ -230,9 +246,9 @@
   &__source {
     display: flex;
     align-items: center;
-    gap: 4px;
+    gap: $CAP_SPACE_04;
     background: #f0f0f0;
-    padding: 2px 6px;
+    padding: $CAP_SPACE_02 $CAP_SPACE_06;
     border-radius: 3px;
   }
 }

package/v2Components/HtmlEditor/components/ValidationPanel/constants.js

@@ -0,0 +1,6 @@
+// Severity constants
+export const SEVERITY = {
+  ERROR: 'error',
+  WARNING: 'warning',
+  INFO: 'info',
+};

package/v2Components/HtmlEditor/components/ValidationPanel/index.js

@@ -21,13 +21,14 @@ import ShieldOutlined from '@ant-design/icons/ShieldOutlined';
 import BugOutlined from '@ant-design/icons/BugOutlined';
 import CodeOutlined from '@ant-design/icons/CodeOutlined';
 import EyeInvisibleOutlined from '@ant-design/icons/EyeInvisibleOutlined';
-import CheckCircleOutlined from '@ant-design/icons/CheckCircleOutlined';
+import CapIcon from '@capillarytech/cap-ui-library/CapIcon';
 
 import messages from './messages';
+import { BLOCKING_ERROR_RULE_IDS } from '../../constants';
 import './_validationPanel.scss';
+import { SEVERITY } from './constants';
 
 const { Panel } = Collapse;
-
 /**
  * ValidationPanel Component
  */
@@ -37,7 +38,7 @@ const ValidationPanel = ({
   onErrorClick,
   showLineNumbers = true,
   groupBySource = false,
-  variant = 'email'
+  variant = 'email',
 }) => {
   const [activeKeys, setActiveKeys] = useState(['errors', 'warnings']);
 
@@ -56,31 +57,50 @@ const ValidationPanel = ({
         groups[source].push(issue);
         return groups;
       }, {});
-    } else {
-      return {
-        errors: allIssues.filter(issue => issue.severity === 'error'),
-        warnings: allIssues.filter(issue => issue.severity === 'warning'),
-        info: allIssues.filter(issue => issue.severity === 'info')
-      };
     }
+    return {
+      errors: allIssues.filter((issue) => issue.severity === SEVERITY.ERROR),
+      warnings: allIssues.filter((issue) => issue.severity === SEVERITY.WARNING),
+      info: allIssues.filter((issue) => issue.severity === SEVERITY.INFO),
+    };
   }, [validation, groupBySource]);
 
+  // Check if an issue is a blocking error (API error, Rule Group #1, or client-side Liquid validation errors)
+  const isBlockingError = (issue) => {
+    const { rule, source, severity } = issue || {};
+    // API errors are blocking
+    if (rule === 'liquid-api-validation' || rule === 'standard-api-validation') {
+      return true;
+    }
+    // Client-side Liquid validation errors are blocking (genuine syntax errors)
+    if (source === 'liquid-validator' && severity === 'error') {
+      return true;
+    }
+    // Rule Group #1 errors are blocking
+    if (BLOCKING_ERROR_RULE_IDS.includes(rule)) {
+      return true;
+    }
+    return false;
+  };
+
   // Get icon for issue type
-  const getIssueIcon = (severity, source) => {
+  // Blocking errors use error-icon, warnings use alert-warning
+  const getIssueIcon = (issue) => {
+    const { source, severity } = issue || {};
     if (source === 'security') {
-      return <ShieldOutlined style={{ color: '#ff4d4f' }} />;
+      return <ShieldOutlined className="validation-issue__icon validation-issue__icon--security" />;
     }
 
-    switch (severity) {
-      case 'error':
-        return <ExclamationCircleOutlined style={{ color: '#ff4d4f' }} />;
-      case 'warning':
-        return <WarningOutlined style={{ color: '#faad14' }} />;
-      case 'info':
-        return <InfoCircleOutlined style={{ color: '#1890ff' }} />;
-      default:
-        return <BugOutlined style={{ color: '#666' }} />;
+    // Only show error icon for blocking errors (API errors or Rule Group #1)
+    if (isBlockingError(issue)) {
+      return <CapIcon type="error-icon" className="validation-issue__icon validation-issue__icon--error" />;
+    }
+
+    // All other issues show as warnings
+    if (severity === SEVERITY.INFO) {
+      return <CapIcon type="info" className="validation-issue__icon validation-issue__icon--info" />;
     }
+    return <CapIcon type="alert-warning" className="validation-issue__icon validation-issue__icon--warning" />;
   };
 
   // Get source icon
@@ -106,7 +126,7 @@ const ValidationPanel = ({
         line: issue.line,
         column: issue.column || 1,
         message: issue.message,
-        severity: issue.severity
+        severity: issue.severity,
       });
     }
   };
@@ -126,7 +146,7 @@ const ValidationPanel = ({
       }}
     >
       <div className="validation-issue__icon">
-        {getIssueIcon(issue.severity, issue.source)}
+        {getIssueIcon(issue)}
       </div>
 
       <div className="validation-issue__content">
@@ -137,10 +157,12 @@ const ValidationPanel = ({
         <div className="validation-issue__meta">
           {showLineNumbers && issue.line && (
             <span className="validation-issue__location">
-              <FormattedMessage {...messages.lineColumn} values={{
-                line: issue.line,
-                column: issue.column || 1
-              }} />
+              <FormattedMessage
+                {...messages.lineColumn}
+                values={{
+                  line: issue.line,
+                  column: issue.column || 1,
+                }} />
             </span>
           )}
 
@@ -162,17 +184,24 @@ const ValidationPanel = ({
   );
 
   // Render panel header with count
-  const renderPanelHeader = (title, count, severity) => (
-    <div className="validation-panel__header">
-      <span className="validation-panel__title">
-        {getIssueIcon(severity)}
-        <FormattedMessage {...title} />
-      </span>
-      {count > 0 && (
-        <Badge count={count} style={{ backgroundColor: getSeverityColor(severity) }} />
-      )}
-    </div>
-  );
+  const renderPanelHeader = (title, count, severity, issues = []) => {
+    // Check if any issue in this group is a blocking error
+    const hasBlocking = issues.some((issue) => isBlockingError(issue));
+    // Use blocking error icon only if there are blocking errors, otherwise use warning icon
+    const iconIssue = hasBlocking ? { rule: 'blocking', source: 'blocking' } : { severity: 'warning' };
+
+    return (
+      <div className="validation-panel__header">
+        <span className="validation-panel__title">
+          {getIssueIcon(iconIssue)}
+          <FormattedMessage {...title} />
+        </span>
+        {count > 0 && (
+          <Badge count={count} style={{ backgroundColor: getSeverityColor(severity) }} />
+        )}
+      </div>
+    );
+  };
 
   // Get severity color
   const getSeverityColor = (severity) => {
@@ -241,14 +270,14 @@ const ValidationPanel = ({
             : messages[key] || { id: `htmlEditor.validation.${key}`, defaultMessage: key };
 
           const severity = isSourceGroup
-            ? (issues.find(i => i.severity === 'error') ? 'error' :
-               issues.find(i => i.severity === 'warning') ? 'warning' : 'info')
+            ? (issues.find((i) => i.severity === 'error') ? 'error'
+              : issues.find((i) => i.severity === 'warning') ? 'warning' : 'info')
             : key;
 
           return (
             <Panel
               key={key}
-              header={renderPanelHeader(title, issues.length, severity)}
+              header={renderPanelHeader(title, issues.length, severity, issues)}
               className={`validation-panel__panel validation-panel__panel--${severity}`}
             >
               <div className="validation-panel__issues">
@@ -291,7 +320,7 @@ ValidationPanel.propTypes = {
   onErrorClick: PropTypes.func,
   showLineNumbers: PropTypes.bool,
   groupBySource: PropTypes.bool,
-  variant: PropTypes.oneOf(['email', 'inapp'])
+  variant: PropTypes.oneOf(['email', 'inapp']),
 };
 
 export default ValidationPanel;