@cdc/core 4.26.1 → 4.26.2

package/_stories/PageWastewater.stories.tsx

@@ -115,18 +115,32 @@ type MapStory = StoryObj<typeof CdcMap>
 type ChartStory = StoryObj<typeof Chart>
 type DashboardStory = StoryObj<typeof Dashboard>
 
-// Helper function to test map rendering
+// Helper function to test map rendering (supports both SVG and canvas-based maps)
 const testMapRendering = async (canvasElement: HTMLElement, storyName: string) => {
-  const canvas = within(canvasElement)
-
   await step('Wait for map to render', async () => {
-    const mapElement = await canvas.findByRole('img', { hidden: true }, { timeout: 10000 })
-    expect(mapElement).toBeInTheDocument()
+    await new Promise<void>((resolve, reject) => {
+      const startTime = Date.now()
+      const timeout = 15000
+
+      const checkMap = () => {
+        const svgMap = canvasElement.querySelector('svg[role="img"]')
+        const canvasMap = canvasElement.querySelector('canvas')
+        if (svgMap || canvasMap) {
+          resolve()
+        } else if (Date.now() - startTime > timeout) {
+          reject(new Error(`Timeout: No map element (svg or canvas) found after ${timeout}ms`))
+        } else {
+          setTimeout(checkMap, 100)
+        }
+      }
+      checkMap()
+    })
   })
 
-  await step('Verify SVG element is present', async () => {
-    const svgElement = canvasElement.querySelector('svg')
-    expect(svgElement).toBeInTheDocument()
+  await step('Verify map visualization is present', async () => {
+    const svgMap = canvasElement.querySelector('svg[role="img"]')
+    const canvasMap = canvasElement.querySelector('canvas')
+    expect(svgMap || canvasMap).toBeTruthy()
   })
 
   await step('Verify COVE module wrapper is present', async () => {
@@ -167,7 +181,7 @@ const testDashboardRendering = async (canvasElement: HTMLElement, storyName: str
       const timeout = 15000
 
       const checkDashboard = () => {
-        const dashboardElement = canvasElement.querySelector('.cove-dashboard')
+        const dashboardElement = canvasElement.querySelector('.type-dashboard')
         if (dashboardElement) {
           resolve()
         } else if (Date.now() - startTime > timeout) {
@@ -181,7 +195,7 @@ const testDashboardRendering = async (canvasElement: HTMLElement, storyName: str
   })
 
   await step('Verify dashboard wrapper is present', async () => {
-    const dashboard = canvasElement.querySelector('.cove-dashboard')
+    const dashboard = canvasElement.querySelector('.type-dashboard')
     expect(dashboard).toBeInTheDocument()
   })
 
@@ -289,14 +303,14 @@ export const COVID_Time_Period_Map: MapStory = {
  *
  * COVID-19 wastewater data visualization by state.
  */
-export const COVID_State_Level: ChartStory = {
+export const COVID_State_Level: MapStory = {
   render: () => {
     const config = useConfigWithAbsoluteDataUrl(CONFIG_URLS.covidStateLevel)
     if (!config) return <div>Loading...</div>
-    return <Chart config={config} />
+    return <CdcMap config={config} />
   },
   play: async ({ canvasElement }) => {
-    await testChartRendering(canvasElement, 'COVID State Level')
+    await testMapRendering(canvasElement, 'COVID State Level')
   }
 }
 
@@ -325,10 +339,10 @@ export const COVID_State_Level_Rest: ChartStory = {
   render: () => {
     const config = useConfigWithAbsoluteDataUrl(CONFIG_URLS.covidStateLevelRest)
     if (!config) return <div>Loading...</div>
-    return <Chart config={config} />
+    return <Dashboard config={config} />
   },
   play: async ({ canvasElement }) => {
-    await testChartRendering(canvasElement, 'COVID State Level Rest')
+    await testDashboardRendering(canvasElement, 'COVID State Level Rest')
   }
 }
 
@@ -365,50 +379,50 @@ export const All_Wastewater_Visualizations: StoryObj = {
     }
 
     return (
-      <div className="container-fluid p-4">
-        <h1 className="mb-4">NWSS - All Wastewater Visualizations</h1>
+      <div className='container-fluid p-4'>
+        <h1 className='mb-4'>NWSS - All Wastewater Visualizations</h1>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>NWSS Home Page</h2>
           <Dashboard config={homePageConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>Measles - Summary Modules</h2>
           <Dashboard config={measlesTopConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>Measles - US Map</h2>
           <CdcMap config={measlesMapConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>Measles - Time Period</h2>
           <Dashboard config={measlesTimePeriodConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>COVID-19 - Summary Modules</h2>
           <Dashboard config={covidTopConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>COVID-19 - State Map</h2>
           <CdcMap config={covidMapConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>COVID-19 - State Level Data</h2>
           <Chart config={covidStateLevelConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>COVID-19 - National and Regional Trends</h2>
           <Chart config={covidNationalRegionalConfig} />
         </section>
 
-        <section className="mb-5">
+        <section className='mb-5'>
           <h2>COVID-19 - State Trends</h2>
           <Chart config={covidStateRestConfig} />
         </section>

package/_stories/VegaImport.stories.tsx

@@ -0,0 +1,401 @@
+/**
+ * Vega Import Stories
+ *
+ * Each story imports a Vega/Vega-Lite JSON config, converts it to a COVE config
+ * via the Vega importer pipeline, and renders the resulting chart or map.
+ *
+ * Play functions verify that each conversion renders without errors.
+ */
+import React from 'react'
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import { within, expect, waitFor } from 'storybook/test'
+
+import Chart from '@cdc/chart/src/CdcChart'
+import CdcMap from '@cdc/map/src/CdcMap'
+import { maybeConvertVega } from '@cdc/core/helpers/vegaConfigImport'
+
+// --- Import Vega fixture JSON files (alphabetical by filename) ---
+import vegaBarsWithLine from './vega-fixtures/bars-with-line.json'
+import vegaBars from './vega-fixtures/bars.json'
+import vegaComboBarRollingMean from './vega-fixtures/combo-bar-rolling-mean.json'
+import vegaCombo from './vega-fixtures/combo.json'
+import vegaGroupedHorizontalBars from './vega-fixtures/grouped-horizontal-bars.json'
+import vegaGroupedHorizontalBars2 from './vega-fixtures/grouped-horizontal-bars2.json'
+import vegaHorizontalBar from './vega-fixtures/horizontal-bar.json'
+import vegaHorizontalBarsWithBadColors from './vega-fixtures/horizontal-bars-with-bad-colors.json'
+import vegaHorizontalBars2 from './vega-fixtures/horizontal-bars2.json'
+import vegaLines from './vega-fixtures/lines.json'
+import vegaMeaslesBars from './vega-fixtures/measles-bars.json'
+import vegaMeaslesMap from './vega-fixtures/measles-map.json'
+import vegaMeaslesStackedBars from './vega-fixtures/measles-stacked-bars.json'
+import vegaMultiDataset from './vega-fixtures/multi-dataset.json'
+import vegaNoData from './vega-fixtures/no-data.json'
+import vegaPieChart from './vega-fixtures/pie-chart.json'
+import vegaRepeatSpec from './vega-fixtures/repeat-spec.json'
+import vegaStackedArea from './vega-fixtures/stacked-area.json'
+import vegaStackedBarWithRect from './vega-fixtures/stacked-bar-with-rect.json'
+import vegaStackedBars from './vega-fixtures/stacked-bars.json'
+import vegaStackedBarsWithLine from './vega-fixtures/stacked-bars-with-line.json'
+import vegaStackedHorizontalBars from './vega-fixtures/stacked-horizontal-bars.json'
+import vegaWarningCombo from './vega-fixtures/warning-combo.json'
+import vegaWarningScatterAndLine from './vega-fixtures/warning-scatter-and-line.json'
+
+// --- Convert all configs at module evaluation time (top-level await) ---
+// Ordered alphabetically by original filename
+const fixtures: Record<string, any> = {
+  barsWithLine: vegaBarsWithLine,
+  bars: vegaBars,
+  comboBarRollingMean: vegaComboBarRollingMean,
+  combo: vegaCombo,
+  groupedHorizontalBars: vegaGroupedHorizontalBars,
+  groupedHorizontalBars2: vegaGroupedHorizontalBars2,
+  horizontalBar: vegaHorizontalBar,
+  horizontalBarsWithBadColors: vegaHorizontalBarsWithBadColors,
+  horizontalBars2: vegaHorizontalBars2,
+  lines: vegaLines,
+  measlesBars: vegaMeaslesBars,
+  measlesMap: vegaMeaslesMap,
+  measlesStackedBars: vegaMeaslesStackedBars,
+  multiDataset: vegaMultiDataset,
+  noData: vegaNoData,
+  pieChart: vegaPieChart,
+  repeatSpec: vegaRepeatSpec,
+  stackedArea: vegaStackedArea,
+  stackedBarWithRect: vegaStackedBarWithRect,
+  stackedBars: vegaStackedBars,
+  stackedBarsWithLine: vegaStackedBarsWithLine,
+  stackedHorizontalBars: vegaStackedHorizontalBars,
+  warningCombo: vegaWarningCombo,
+  warningScatterAndLine: vegaWarningScatterAndLine
+}
+
+const convertedConfigs: Record<string, any> = {}
+const conversionErrors: Record<string, string[]> = {}
+const conversionWarnings: Record<string, string[]> = {}
+
+for (const [key, vegaJson] of Object.entries(fixtures)) {
+  // Capture console warnings/errors during conversion
+  const warnings: string[] = []
+  const errors: string[] = []
+
+  const originalWarn = console.warn
+  const originalError = console.error
+
+  console.warn = (...args: any[]) => {
+    const message = args.map(arg => (typeof arg === 'string' ? arg : JSON.stringify(arg))).join(' ')
+    warnings.push(message)
+  }
+
+  console.error = (...args: any[]) => {
+    const message = args.map(arg => (typeof arg === 'string' ? arg : JSON.stringify(arg))).join(' ')
+    errors.push(message)
+  }
+
+  try {
+    convertedConfigs[key] = await maybeConvertVega({ ...vegaJson })
+  } catch (err) {
+    console.error(`Failed to convert ${key}:`, err)
+    convertedConfigs[key] = null
+  }
+
+  console.warn = originalWarn
+  console.error = originalError
+
+  conversionErrors[key] = [...warnings, ...errors]
+  conversionWarnings[key] = warnings
+}
+
+// --- Storybook meta ---
+const meta: Meta = {
+  title: 'Regression Tests/Vega Importer',
+  parameters: {
+    layout: 'fullscreen'
+  },
+  tags: ['!autodocs']
+}
+
+export default meta
+
+// --- Shared play function: verify the chart/map rendered ---
+const assertRendered = async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+  await waitFor(
+    () => {
+      const coveModule = canvasElement.querySelector('.cdc-open-viz-module')
+      expect(coveModule).toBeTruthy()
+    },
+    { timeout: 15000 }
+  )
+
+  // Verify an SVG was rendered
+  const svgs = canvasElement.querySelectorAll('svg')
+  expect(svgs.length).toBeGreaterThan(0)
+}
+
+// --- Shared play function: verify map rendered ---
+const assertMapRendered = async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+  await waitFor(
+    () => {
+      const coveModule = canvasElement.querySelector('.cdc-open-viz-module')
+      expect(coveModule).toBeTruthy()
+    },
+    { timeout: 15000 }
+  )
+
+  // For maps, check for either SVG or canvas elements
+  await waitFor(
+    () => {
+      const svgs = canvasElement.querySelectorAll('svg')
+      const canvases = canvasElement.querySelectorAll('canvas')
+      const hasRenderedContent = svgs.length > 0 || canvases.length > 0
+      expect(hasRenderedContent).toBe(true)
+    },
+    { timeout: 15000 }
+  )
+}
+
+// --- Shared play function: verify error configs failed properly ---
+const assertConversionFailed =
+  (expectedErrorPattern: string | RegExp) =>
+  async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+    // Wait a bit for any async operations to complete
+    await new Promise(resolve => setTimeout(resolve, 500))
+
+    // Verify error message is displayed
+    const errorElement = canvasElement.querySelector('[data-testid="error"]')
+    expect(errorElement).toBeTruthy()
+    expect(errorElement?.textContent).toContain('failed to convert')
+
+    // Verify the specific error message appears
+    const errorMessages = canvasElement.querySelector('[data-testid="error-messages"]')
+    expect(errorMessages).toBeTruthy()
+
+    const errorText = errorMessages?.textContent || ''
+    if (typeof expectedErrorPattern === 'string') {
+      expect(errorText).toContain(expectedErrorPattern)
+    } else {
+      expect(expectedErrorPattern.test(errorText)).toBe(true)
+    }
+
+    // Verify no visualization rendered
+    const coveModule = canvasElement.querySelector('.cdc-open-viz-module')
+    expect(coveModule).toBeNull()
+  }
+
+// --- Helper to build a chart story ---
+const chartStory = (key: string): StoryObj => ({
+  render: () => {
+    const config = convertedConfigs[key]
+    if (!config) return <div data-testid='error'>Config "{key}" failed to convert</div>
+    return <Chart config={{ ...config }} isEditor={false} />
+  },
+  play: assertRendered
+})
+
+// --- Helper to build a map story ---
+const mapStory = (key: string): StoryObj => ({
+  render: () => {
+    const config = convertedConfigs[key]
+    if (!config) return <div data-testid='error'>Config "{key}" failed to convert</div>
+    return <CdcMap config={{ ...config }} navigationHandler={() => {}} setConfig={() => {}} />
+  },
+  play: assertMapRendered
+})
+
+// --- Helper to build an error story (expects conversion to fail) ---
+const errorStory = (key: string, expectedErrorPattern: string | RegExp): StoryObj => ({
+  render: () => {
+    const config = convertedConfigs[key]
+    const errorMessages = conversionErrors[key] || []
+
+    if (!config) {
+      return (
+        <div style={{ padding: '20px', fontFamily: 'monospace' }}>
+          <div data-testid='error' style={{ color: '#28a745', fontWeight: 'bold', marginBottom: '10px' }}>
+            ✓ Config "{key}" failed to convert (expected)
+          </div>
+          <div
+            data-testid='error-messages'
+            style={{
+              backgroundColor: '#f5f5f5',
+              padding: '15px',
+              borderRadius: '4px',
+              border: '1px solid #ddd'
+            }}
+          >
+            <strong>Error Messages:</strong>
+            <ul style={{ marginTop: '10px', paddingLeft: '20px' }}>
+              {errorMessages.map((msg, i) => (
+                <li key={i} style={{ marginBottom: '5px' }}>
+                  {msg}
+                </li>
+              ))}
+            </ul>
+          </div>
+        </div>
+      )
+    }
+
+    return (
+      <div data-testid='unexpected-success' style={{ padding: '20px', color: '#c41e3a', fontWeight: 'bold' }}>
+        ⚠️ Config "{key}" unexpectedly succeeded - this should have failed!
+      </div>
+    )
+  },
+  play: assertConversionFailed(expectedErrorPattern)
+})
+
+// --- Helper to build a warning story (renders with warnings) ---
+const warningStory = (
+  key: string,
+  Component: typeof Chart | typeof CdcMap,
+  expectedWarningPattern: string | RegExp
+): StoryObj => ({
+  render: () => {
+    const config = convertedConfigs[key]
+    const warnings = conversionWarnings[key] || []
+
+    if (!config) {
+      return <div data-testid='error'>Config "{key}" failed to convert</div>
+    }
+
+    return (
+      <div>
+        {warnings.length > 0 && (
+          <div
+            data-testid='warnings'
+            style={{
+              backgroundColor: '#fff3cd',
+              border: '1px solid #ffc107',
+              borderRadius: '4px',
+              padding: '15px',
+              margin: '20px',
+              fontFamily: 'monospace',
+              fontSize: '14px'
+            }}
+          >
+            <div style={{ color: '#856404', fontWeight: 'bold', marginBottom: '10px' }}>⚠️ Conversion Warnings:</div>
+            <ul style={{ margin: '0', paddingLeft: '20px', color: '#856404' }}>
+              {warnings.map((msg, i) => (
+                <li key={i} style={{ marginBottom: '5px' }}>
+                  {msg}
+                </li>
+              ))}
+            </ul>
+          </div>
+        )}
+        <Component config={{ ...config }} isEditor={false} />
+      </div>
+    )
+  },
+  play: async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+    // Verify warnings were captured
+    const warningsElement = canvasElement.querySelector('[data-testid="warnings"]')
+    expect(warningsElement).toBeTruthy()
+
+    // Verify the warning contains the expected text
+    const warningText = warningsElement?.textContent || ''
+
+    if (typeof expectedWarningPattern === 'string') {
+      expect(warningText).toContain(expectedWarningPattern)
+    } else {
+      expect(expectedWarningPattern.test(warningText)).toBe(true)
+    }
+
+    // Verify the visualization still rendered
+    await assertRendered({ canvasElement })
+  }
+})
+
+// ============================================================================
+// Stories — alphabetical by original filename
+// ============================================================================
+
+// bars-with-line.json
+export const BarsWithLineTests: StoryObj = chartStory('barsWithLine')
+
+// bars.json
+export const BarsTests: StoryObj = chartStory('bars')
+
+// combo-bar-rolling-mean.json
+export const ComboBarRollingMeanTests: StoryObj = chartStory('comboBarRollingMean')
+
+// combo.json
+export const ComboTests: StoryObj = chartStory('combo')
+
+// grouped-horizontal-bars.json
+export const GroupedHorizontalBarsTests: StoryObj = chartStory('groupedHorizontalBars')
+
+// grouped-horizontal-bars2.json
+export const GroupedHorizontalBars2Tests: StoryObj = chartStory('groupedHorizontalBars2')
+
+// horizontal-bar.json
+export const HorizontalBarTests: StoryObj = chartStory('horizontalBar')
+
+// horizontal-bars-with-bad-colors.json
+export const HorizontalBarsWithBadColorsTests: StoryObj = chartStory('horizontalBarsWithBadColors')
+
+// horizontal-bars2.json
+export const HorizontalBars2Tests: StoryObj = chartStory('horizontalBars2')
+
+// lines.json
+export const LinesTests: StoryObj = chartStory('lines')
+
+// measles-bars.json
+export const MeaslesBarsTests: StoryObj = chartStory('measlesBars')
+
+// measles-map.json
+export const MeaslesMapTests: StoryObj = mapStory('measlesMap')
+
+// measles-stacked-bars.json
+export const MeaslesStackedBarsTests: StoryObj = chartStory('measlesStackedBars')
+
+// multi-dataset.json
+export const MultiDatasetTests: StoryObj = chartStory('multiDataset')
+
+// stacked-area.json
+export const StackedAreaTests: StoryObj = chartStory('stackedArea')
+
+// stacked-bar-with-rect.json
+export const StackedBarWithRectTests: StoryObj = chartStory('stackedBarWithRect')
+
+// stacked-bars.json
+export const StackedBarsTests: StoryObj = chartStory('stackedBars')
+
+// stacked-horizontal-bars.json
+export const StackedHorizontalBarsTests: StoryObj = chartStory('stackedHorizontalBars')
+
+// ============================================================================
+// Error Test Stories (Expected to Fail)
+// ============================================================================
+
+// no-data.json - Config references external data URL instead of embedded data
+export const NoDataErrorTests: StoryObj = errorStory('noData', 'No data was found')
+
+// pie-chart.json - Pie charts are not supported by COVE's Vega importer
+export const PieChartErrorTests: StoryObj = errorStory(
+  'pieChart',
+  /could not find a COVE chart type|Supported marks are/
+)
+
+// repeat-spec.json - Vega-Lite repeat/spec operators are not supported
+export const RepeatSpecErrorTests: StoryObj = errorStory('repeatSpec', /does not support.*repeat\/spec operator/)
+
+// stacked-bars-with-line.json - Complex combinations may not be supported
+export const StackedBarsWithLineErrorTests: StoryObj = errorStory(
+  'stackedBarsWithLine',
+  /one of them appears to be stacked/
+)
+
+// ============================================================================
+// Warning Test Stories (Render with Warnings)
+// ============================================================================
+
+// warning-combo.json - Combo chart with multiple mark types
+export const WarningComboTests: StoryObj = warningStory('warningCombo', Chart, 'only support these types of marks')
+
+// warning-scatter-and-line.json - Scatter plot with line
+export const WarningScatterAndLineTests: StoryObj = warningStory(
+  'warningScatterAndLine',
+  Chart,
+  'only support these types of marks'
+)