@capillarytech/creatives-library 8.0.249 → 8.0.250-alpha.0

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/index.js

@@ -21,9 +21,10 @@ 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';
 
 const { Panel } = Collapse;
@@ -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 === 'error'),
+      warnings: allIssues.filter((issue) => issue.severity === 'warning'),
+      info: allIssues.filter((issue) => issue.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' }} />;
     }
 
-    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" style={{ color: '#ff4d4f' }} />;
+    }
+
+    // All other issues show as warnings
+    if (severity === 'info') {
+      return <CapIcon type="info" style={{ color: '#1890ff' }} />;
     }
+    return <CapIcon type="alert-warning" style={{ color: '#faad14' }} />;
   };
 
   // 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;

package/v2Components/HtmlEditor/components/ValidationTabs/_validationTabs.scss

@@ -0,0 +1,254 @@
+/**
+ * ValidationTabs Styles
+ */
+
+@import '~@capillarytech/cap-ui-library/styles/_variables.scss';
+
+.validation-tabs {
+  overflow-y: hidden;
+  width: 100%;
+  background-color: $CAP_COLOR_05; // Light pink background
+  border-radius: 0.25rem;
+  padding: 1rem 1rem;
+  box-sizing: border-box;
+
+  &__header {
+    display: flex;
+    align-items: flex-start;
+    justify-content: space-between;
+    width: 100%;
+  }
+
+  &__tabs {
+    flex: 1;
+    
+    // Override CapTab styles for proper spacing
+    .cap-tab-v2 {
+      .ant-tabs-nav {
+        margin-bottom: 0;
+        
+        &::before {
+          border-bottom: none;
+        }
+      }
+
+      .ant-tabs-tab {
+        padding: 0.5rem 0.75rem; // Add horizontal padding for spacing
+        margin-right: 0; // Remove margin, use padding instead
+        color: $CAP_G03;
+        font-size: 0.875rem;
+        font-weight: 500;
+        
+        & + .ant-tabs-tab {
+          margin-left: 1.5rem; // Add space between tabs
+        }
+        
+        &:hover {
+          color: $CAP_COLOR_05;
+          background: transparent;
+        }
+
+        &.ant-tabs-tab-active {
+          .ant-tabs-tab-btn {
+            color: $CAP_COLOR_05;
+            font-weight: 600;
+          }
+        }
+      }
+
+      .ant-tabs-ink-bar {
+        background-color: $CAP_COLOR_05;
+        height: 0.125rem;
+      }
+
+      .ant-tabs-content-holder {
+        padding-top: 0.25rem; // Reduced from 0.5rem
+        padding-bottom: 0; // No bottom padding
+      }
+    }
+  }
+
+  &__tab-label {
+    display: flex;
+    align-items: center;
+    gap: 0.25rem;
+  }
+
+  &__tab-count {
+    color: inherit;
+  }
+
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+    flex-shrink: 0;
+    padding-top: 0.5rem;
+  }
+
+  &__close {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 1.5rem;
+    height: 1.5rem;
+    padding: 0;
+    background: transparent;
+    border: none;
+    border-radius: 0.25rem;
+    cursor: pointer;
+    color: $CAP_G03;
+    transition: all 0.2s ease;
+
+    &:hover {
+      background-color: rgba($CAP_COLOR_05, 0.1);
+      color: $CAP_COLOR_05;
+    }
+
+    .cap-icon-v2 {
+      font-size: 0.875rem;
+    }
+  }
+
+  &__content {
+    max-height: 15rem; // Limit height for many errors
+    overflow-y: auto;
+    padding-right: 0.25rem;
+    padding-bottom: 0; // Remove bottom padding completely
+
+    // Custom scrollbar
+    &::-webkit-scrollbar {
+      width: 0.375rem;
+    }
+
+    &::-webkit-scrollbar-track {
+      background: transparent;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background-color: $CAP_G06;
+      border-radius: 0.1875rem;
+
+      &:hover {
+        background-color: $CAP_G04;
+      }
+    }
+  }
+
+  &__item {
+    display: flex;
+    align-items: flex-start;
+    gap: 0.5rem;
+    padding: 0.25rem 0; // Reduced from 0.375rem
+    border-bottom: 1px solid rgba($CAP_G06, 0.3);
+
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0.25rem; // Minimal padding on last item
+    }
+
+    &--error {
+      .validation-tabs__icon--error {
+        color: $CAP_RED;
+      }
+    }
+
+    &--warning {
+      .validation-tabs__icon--warning {
+        color: $CAP_YELLOW;
+      }
+    }
+  }
+
+  &__item-icon {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    padding-top: 0.125rem;
+  }
+
+  &__icon {
+    font-size: 0.875rem;
+
+    &--error {
+      color: $CAP_RED;
+    }
+
+    &--warning {
+      color: $CAP_YELLOW;
+    }
+  }
+
+  &__item-content {
+    flex: 1;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: baseline;
+    gap: 0.25rem;
+    font-size: 0.75rem;
+    line-height: 1.4;
+    color: $CAP_G01;
+  }
+
+  &__item-message {
+    color: $CAP_G01;
+  }
+
+  &__item-location {
+    color: $CAP_G03;
+    white-space: nowrap;
+  }
+
+  &__item-rule {
+    color: $CAP_G04;
+    font-family: monospace;
+    font-size: 0.6875rem;
+  }
+
+  &__item-navigate {
+    flex-shrink: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 1.25rem;
+    height: 1.25rem;
+    padding: 0;
+    background: transparent;
+    border: none;
+    border-radius: 0.25rem;
+    cursor: pointer;
+    color: $CAP_G04;
+    transition: all 0.2s ease;
+
+    &:hover {
+      background-color: rgba($CAP_G01, 0.1);
+      color: $CAP_G01;
+    }
+
+    .anticon {
+      font-size: 0.75rem;
+    }
+  }
+}
+
+// Responsive adjustments
+@media (max-width: 768px) {
+  .validation-tabs {
+    padding: 0.375rem 0.5rem;
+
+    &__tabs {
+      .ant-tabs-tab {
+        margin-right: 1rem;
+        font-size: 0.8125rem;
+      }
+    }
+
+    &__content {
+      max-height: 10rem;
+    }
+
+    &__item-content {
+      font-size: 0.6875rem;
+    }
+  }
+}