@cdc/core 4.26.1 → 4.26.3

package/helpers/ver/tests/4.26.2.test.ts

@@ -0,0 +1,298 @@
+import update_4_26_2 from '../4.26.2'
+import { expect, describe, it } from 'vitest'
+
+describe('update_4_26_2', () => {
+  describe('migrateAnnotationDimensions', () => {
+    it('should convert Y position from absolute pixels to percentage and delete savedDimensions', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        heights: { vertical: 400 },
+        annotations: [
+          {
+            text: 'Test Annotation',
+            x: 50,
+            y: 200,
+            savedDimensions: [800, 560], // old format: will be deleted
+            dx: 10,
+            dy: -10
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      // Y is now calculated as percentage of heights.vertical (400)
+      expect(result.annotations[0].y).toBe(50) // 200 / 400 * 100 = 50
+      expect(result.annotations[0].x).toBe(50)
+      // savedDimensions should be deleted to preserve old dx/dy behavior
+      expect(result.annotations[0].savedDimensions).toBeUndefined()
+      // dx/dy should be preserved unchanged
+      expect(result.annotations[0].dx).toBe(10)
+      expect(result.annotations[0].dy).toBe(-10)
+      expect(result.version).toBe('4.26.2')
+    })
+
+    it('should handle multiple annotations with different Y positions', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        heights: { vertical: 500 },
+        annotations: [
+          {
+            text: 'Top',
+            x: 25,
+            y: 100,
+            savedDimensions: [1000, 700]
+          },
+          {
+            text: 'Middle',
+            x: 75,
+            y: 250,
+            savedDimensions: [1000, 700]
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      // Y calculated as percentage of heights.vertical (500)
+      expect(result.annotations[0].y).toBe(20) // 100 / 500 * 100 = 20
+      expect(result.annotations[1].y).toBe(50) // 250 / 500 * 100 = 50
+      // savedDimensions should be deleted
+      expect(result.annotations[0].savedDimensions).toBeUndefined()
+      expect(result.annotations[1].savedDimensions).toBeUndefined()
+    })
+
+    it('should use default vertical height (300) when heights not specified', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        annotations: [
+          {
+            text: 'No heights config',
+            x: 50,
+            y: 150,
+            savedDimensions: [800, 560]
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      // Uses default vertical height of 300
+      expect(result.annotations[0].y).toBe(50) // 150 / 300 * 100 = 50
+      expect(result.annotations[0].savedDimensions).toBeUndefined()
+    })
+
+    it('should use horizontal height for horizontal orientation', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        orientation: 'horizontal',
+        heights: { horizontal: 750 },
+        annotations: [
+          {
+            text: 'Horizontal chart annotation',
+            x: 50,
+            y: 375,
+            savedDimensions: [800, 900]
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      // Uses heights.horizontal for horizontal charts
+      expect(result.annotations[0].y).toBe(50) // 375 / 750 * 100 = 50
+      expect(result.annotations[0].savedDimensions).toBeUndefined()
+    })
+
+    it('should handle dashboard configs with nested visualizations', () => {
+      const config: any = {
+        type: 'dashboard',
+        version: '4.26.1',
+        visualizations: {
+          chart1: {
+            type: 'chart',
+            heights: { vertical: 300 },
+            annotations: [
+              {
+                text: 'Chart 1 Annotation',
+                x: 30,
+                y: 150,
+                savedDimensions: [600, 450]
+              }
+            ]
+          }
+        }
+      }
+
+      const result = update_4_26_2(config)
+
+      expect(result.visualizations.chart1.annotations[0].y).toBe(50) // 150 / 300 * 100 = 50
+      expect(result.visualizations.chart1.annotations[0].savedDimensions).toBeUndefined()
+    })
+
+    it('should preserve all other annotation properties and delete xKey entirely', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        heights: { vertical: 500 },
+        annotations: [
+          {
+            text: 'Complex Annotation',
+            x: 50,
+            y: 250,
+            savedDimensions: [1000, 700],
+            dx: 20,
+            dy: -30,
+            xKey: 1577836800000,
+            yKey: '42',
+            seriesKey: 'series1',
+            marker: 'arrow'
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      const annotation = result.annotations[0]
+      expect(annotation.y).toBe(50) // 250 / 500 * 100 = 50
+      expect(annotation.text).toBe('Complex Annotation')
+      expect(annotation.dx).toBe(20)
+      expect(annotation.dy).toBe(-30)
+      // xKey is deleted entirely (not renamed to dataX) because old format
+      // stored timestamps but new dataX expects raw data values
+      expect(annotation.xKey).toBeUndefined()
+      expect(annotation.dataX).toBeUndefined()
+      expect(annotation.yKey).toBeUndefined()
+      // Non-empty seriesKey is preserved
+      expect(annotation.seriesKey).toBe('series1')
+      expect(annotation.savedDimensions).toBeUndefined()
+    })
+
+    it('should delete empty seriesKey', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        heights: { vertical: 300 },
+        annotations: [
+          {
+            text: 'Annotation with empty seriesKey',
+            x: 50,
+            y: 150,
+            seriesKey: ''
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      // Empty seriesKey should be deleted to prevent yScale(undefined) errors
+      expect(result.annotations[0].seriesKey).toBeUndefined()
+    })
+
+    it('should handle config with no annotations', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        title: 'Chart without annotations'
+      }
+
+      const result = update_4_26_2(config)
+
+      expect(result.annotations).toBeUndefined()
+      expect(result.title).toBe('Chart without annotations')
+    })
+
+    it('should handle annotation without savedDimensions', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        heights: { vertical: 300 },
+        annotations: [
+          {
+            text: 'No savedDimensions',
+            x: 50,
+            y: 150
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      expect(result.annotations[0].y).toBe(50) // 150 / 300 * 100 = 50
+      expect(result.annotations[0].savedDimensions).toBeUndefined()
+    })
+  })
+
+  describe('combined migrations', () => {
+    it('should run all migrations together', () => {
+      const config: any = {
+        type: 'dashboard',
+        version: '4.26.1',
+        dashboard: {
+          sharedFilters: [
+            {
+              type: 'datafilter',
+              parents: 'parent-id'
+            }
+          ]
+        },
+        visualizations: {
+          chart1: {
+            type: 'chart',
+            heights: { vertical: 400 },
+            brush: { enabled: true },
+            annotations: [
+              {
+                x: 50,
+                y: 200,
+                savedDimensions: [800, 560]
+              }
+            ]
+          }
+        }
+      }
+
+      const result = update_4_26_2(config)
+
+      expect(result.visualizations.chart1.annotations[0].y).toBe(50) // 200 / 400 * 100 = 50
+      expect(result.visualizations.chart1.annotations[0].anchorMode).toBe('fixed')
+      expect(result.visualizations.chart1.annotations[0].savedDimensions).toBeUndefined()
+      expect(result.visualizations.chart1.annotations[0].dataX).toBeUndefined()
+      expect(result.version).toBe('4.26.2')
+    })
+
+    it('should migrate data model along with Y position', () => {
+      const config: any = {
+        type: 'chart',
+        version: '4.26.1',
+        heights: { vertical: 400 },
+        annotations: [
+          {
+            x: 50,
+            y: 200,
+            savedDimensions: [800, 560],
+            xKey: 1577836800000,
+            yKey: '42',
+            snapToNearestPoint: true
+          }
+        ]
+      }
+
+      const result = update_4_26_2(config)
+
+      const annotation = result.annotations[0]
+      expect(annotation.y).toBe(50) // 200 / 400 * 100 = 50
+      expect(annotation.anchorMode).toBe('fixed')
+      // xKey is deleted entirely (not renamed to dataX) - format incompatible
+      expect(annotation.dataX).toBeUndefined()
+      expect(annotation.xKey).toBeUndefined()
+      expect(annotation.yKey).toBeUndefined()
+      expect(annotation.snapToNearestPoint).toBeUndefined()
+      expect(annotation.savedDimensions).toBeUndefined()
+    })
+  })
+})

package/helpers/ver/tests/4.26.3.test.ts

@@ -0,0 +1,168 @@
+import update_4_26_3 from '../4.26.3'
+import { expect, describe, it } from 'vitest'
+
+describe('update_4_26_3', () => {
+  it('should add locale "en-US" to a config without locale', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.2',
+      title: 'Test Chart'
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(result.locale).toBe('en-US')
+    expect(result.version).toBe('4.26.3')
+    expect(result.title).toBe('Test Chart')
+  })
+
+  it('should not overwrite an existing locale', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.2',
+      locale: 'es-MX'
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(result.locale).toBe('es-MX')
+  })
+
+  it('should add locale to dashboard child visualizations', () => {
+    const config: any = {
+      type: 'dashboard',
+      version: '4.26.2',
+      visualizations: {
+        chart1: {
+          type: 'chart',
+          title: 'Chart 1'
+        },
+        map1: {
+          type: 'map',
+          title: 'Map 1'
+        }
+      }
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(result.locale).toBe('en-US')
+    expect(result.visualizations.chart1.locale).toBe('en-US')
+    expect(result.visualizations.map1.locale).toBe('en-US')
+    expect(result.version).toBe('4.26.3')
+  })
+
+  it('should not overwrite existing locale on dashboard child visualizations', () => {
+    const config: any = {
+      type: 'dashboard',
+      version: '4.26.2',
+      locale: 'es-MX',
+      visualizations: {
+        chart1: {
+          type: 'chart',
+          locale: 'es-MX'
+        }
+      }
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(result.locale).toBe('es-MX')
+    expect(result.visualizations.chart1.locale).toBe('es-MX')
+  })
+
+  it('should not mutate the original config', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.2'
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(config.locale).toBeUndefined()
+    expect(result.locale).toBe('en-US')
+  })
+
+  it('turns off extra visual settings for a standalone chart config', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.2',
+      visual: {
+        border: true,
+        borderColorTheme: true,
+        accent: true,
+        background: true,
+        hideBackgroundColor: true
+      }
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(result.visual).toEqual({
+      border: false,
+      borderColorTheme: false,
+      accent: false,
+      background: false,
+      hideBackgroundColor: false
+    })
+  })
+
+  it('turns off extra visual settings for chart visualizations inside dashboards only', () => {
+    const config: any = {
+      type: 'dashboard',
+      version: '4.26.2',
+      visualizations: {
+        chart1: {
+          type: 'chart',
+          visual: {
+            border: true,
+            borderColorTheme: true,
+            accent: true,
+            background: true,
+            hideBackgroundColor: true
+          }
+        },
+        dataBite1: {
+          type: 'data-bite',
+          visual: {
+            borderColorTheme: true,
+            accent: true,
+            background: true,
+            hideBackgroundColor: true
+          }
+        }
+      }
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(result.visualizations.chart1.visual).toEqual({
+      border: false,
+      borderColorTheme: false,
+      accent: false,
+      background: false,
+      hideBackgroundColor: false
+    })
+    expect(result.visualizations.dataBite1.visual).toEqual({
+      borderColorTheme: true,
+      accent: true,
+      background: true,
+      hideBackgroundColor: true
+    })
+  })
+
+  it('does not mutate the original config visual settings', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.2',
+      visual: {
+        accent: true
+      }
+    }
+
+    const result = update_4_26_3(config)
+
+    expect(config.visual.accent).toBe(true)
+    expect(result.visual.accent).toBe(false)
+  })
+})

package/helpers/ver/tests/4.26.4.test.ts

@@ -0,0 +1,88 @@
+import update_4_26_4 from '../4.26.4'
+import { describe, expect, it } from 'vitest'
+
+describe('update_4_26_4', () => {
+  it('turns off extra visual settings for a standalone chart config', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.3',
+      visual: {
+        border: true,
+        borderColorTheme: true,
+        accent: true,
+        background: true,
+        hideBackgroundColor: true
+      }
+    }
+
+    const result = update_4_26_4(config)
+
+    expect(result.visual).toEqual({
+      border: false,
+      borderColorTheme: false,
+      accent: false,
+      background: false,
+      hideBackgroundColor: false
+    })
+    expect(result.version).toBe('4.26.4')
+  })
+
+  it('turns off extra visual settings for chart visualizations inside dashboards only', () => {
+    const config: any = {
+      type: 'dashboard',
+      version: '4.26.3',
+      visualizations: {
+        chart1: {
+          type: 'chart',
+          visual: {
+            border: true,
+            borderColorTheme: true,
+            accent: true,
+            background: true,
+            hideBackgroundColor: true
+          }
+        },
+        dataBite1: {
+          type: 'data-bite',
+          visual: {
+            borderColorTheme: true,
+            accent: true,
+            background: true,
+            hideBackgroundColor: true
+          }
+        }
+      }
+    }
+
+    const result = update_4_26_4(config)
+
+    expect(result.visualizations.chart1.visual).toEqual({
+      border: false,
+      borderColorTheme: false,
+      accent: false,
+      background: false,
+      hideBackgroundColor: false
+    })
+    expect(result.visualizations.dataBite1.visual).toEqual({
+      borderColorTheme: true,
+      accent: true,
+      background: true,
+      hideBackgroundColor: true
+    })
+  })
+
+  it('does not mutate the original config', () => {
+    const config: any = {
+      type: 'chart',
+      version: '4.26.3',
+      visual: {
+        accent: true
+      }
+    }
+
+    const result = update_4_26_4(config)
+
+    expect(config.visual.accent).toBe(true)
+    expect(result.visual.accent).toBe(false)
+  })
+})

package/helpers/ver/tests/coveUpdateWorker.test.ts

@@ -0,0 +1,57 @@
+import { coveUpdateWorker } from '../../coveUpdateWorker'
+import { expect, describe, it } from 'vitest'
+
+const makeMultiDashConfig = (version: string) => ({
+  type: 'dashboard',
+  version,
+  dashboard: { title: 'Parent Dashboard' },
+  rows: [],
+  visualizations: {},
+  multiDashboards: [
+    {
+      type: 'dashboard',
+      dashboard: { title: 'Sub Dashboard' },
+      rows: [],
+      visualizations: {
+        chart1: {
+          type: 'chart',
+          title: 'My Chart',
+          brush: { enabled: true }
+        }
+      }
+    }
+  ]
+})
+
+describe('coveUpdateWorker', () => {
+  describe('multi-dashboard recursion', () => {
+    it('should NOT run 4.26.1 migration on sub-dashboards when parent is at 4.26.2', () => {
+      const config: any = makeMultiDashConfig('4.26.2')
+      const result = coveUpdateWorker(config)
+      const subDash = result.multiDashboards[0]
+
+      // 4.26.1 removeOldBrushKeys should NOT have run
+      expect(subDash.visualizations.chart1.brush).toEqual({ enabled: true })
+      // 4.26.1 migrateTitleStyle should NOT have run
+      expect(subDash.visualizations.chart1.titleStyle).toBeUndefined()
+    })
+
+    it('should run 4.26.1 migration on sub-dashboards when parent is at 4.26.0', () => {
+      const config: any = makeMultiDashConfig('4.26.0')
+      const result = coveUpdateWorker(config)
+      const subDash = result.multiDashboards[0]
+
+      // 4.26.1 removeOldBrushKeys SHOULD have run
+      expect(subDash.visualizations.chart1.brush).toBeUndefined()
+      // 4.26.1 migrateTitleStyle SHOULD have run
+      expect(subDash.visualizations.chart1.titleStyle).toBe('legacy')
+    })
+
+    it('should strip version from sub-dashboards after processing', () => {
+      const config: any = makeMultiDashConfig('4.25.0')
+      const result = coveUpdateWorker(config)
+
+      expect(result.multiDashboards[0].version).toBeUndefined()
+    })
+  })
+})

package/helpers/viewports.ts

@@ -15,4 +15,6 @@ export const isMobileTerritoryViewport = currentViewport => isBelowBreakpoint('s
 
 export const isMobileFontViewport = currentViewport => isBelowBreakpoint('sm', currentViewport)
 
+export const isMobileAnnotationViewport = currentViewport => isBelowBreakpoint('sm', currentViewport)
+
 export const isMobileSmallMultiplesViewport = currentViewport => isBelowBreakpoint('md', currentViewport)

package/package.json

@@ -1,54 +1,49 @@
 {
   "name": "@cdc/core",
-  "version": "4.26.1",
+  "version": "4.26.3",
   "description": "Core components, styles, hooks, and helpers, for the CDC Open Visualization project",
-  "moduleName": "CdcCore",
-  "main": "dist/cdccore",
-  "type": "module",
-  "scripts": {
-    "test": "vitest run --environment jsdom --reporter verbose",
-    "test-watch": "vitest watch --reporter verbose",
-    "test-watch:ui": "vitest --ui",
-    "build": "sass styles/cove-main.scss dist/cove-main.css"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/CDCgov/cdc-open-viz.git"
-  },
-  "author": "Rob Shelnutt <rob@blackairplane.com>",
-  "homepage": "https://github.com/CDCgov/cdc-open-viz#readme",
-  "bugs": {
-    "url": "https://github.com/CDCgov/cdc-open-viz/issues"
-  },
   "license": "Apache-2.0",
+  "author": "Rob Shelnutt <rob@blackairplane.com>",
+  "bugs": "https://github.com/CDCgov/cdc-open-viz/issues",
   "dependencies": {
     "@hello-pangea/dnd": "^16.2.0",
-    "chroma-js": "3.1.2",
-    "dompurify": "^3.2.4",
-    "html-react-parser": "5.2.3",
+    "chroma-js": "^3.1.2",
+    "dompurify": "^3.3.1",
+    "html-react-parser": "^5.2.3",
     "html2canvas": "^1.4.1",
     "json-edit-react": "^1.27.0",
-    "papaparse": "5.5.2",
+    "papaparse": "^5.5.2",
     "prop-types": "^15.8.1",
     "react-accessible-accordion": "^5.0.1",
     "react-select": "^5.3.1",
     "react-tooltip": "5.8.2-beta.3",
     "resize-observer-polyfill": "^1.5.1",
-    "use-debounce": "^10.0.5",
+    "use-debounce": "^10.1.0",
     "vega": "^6.1.0",
     "vega-lite": "^6.1.0"
   },
-  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "gitHead": "7e3b27098c4eb7a24bc9c3654ad53f88d6419f16",
   "devDependencies": {
     "@rollup/plugin-dsv": "^3.0.2",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^5.1.2",
     "sass": "^1.89.2",
-    "vite": "^5.4.21",
+    "vite": "^7.3.1",
     "vite-plugin-css-injected-by-js": "^2.4.0",
     "vite-plugin-svgr": "^4.2.0"
-  }
+  },
+  "gitHead": "d50e45a074fbefa56cac904917e707d57f237737",
+  "homepage": "https://github.com/CDCgov/cdc-open-viz#readme",
+  "main": "dist/cdccore",
+  "moduleName": "CdcCore",
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "repository": "CDCgov/cdc-open-viz.git",
+  "scripts": {
+    "build": "sass styles/cove-main.scss dist/cove-main.css",
+    "test": "vitest run --environment jsdom --reporter verbose",
+    "test-watch": "vitest watch --reporter verbose",
+    "test-watch:ui": "vitest --ui"
+  },
+  "type": "module"
 }