@cdc/core 4.26.2 → 4.26.3

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cdc/core",
-  "version": "4.26.2",
+  "version": "4.26.3",
   "description": "Core components, styles, hooks, and helpers, for the CDC Open Visualization project",
   "license": "Apache-2.0",
   "author": "Rob Shelnutt <rob@blackairplane.com>",
@@ -30,7 +30,7 @@
     "vite-plugin-css-injected-by-js": "^2.4.0",
     "vite-plugin-svgr": "^4.2.0"
   },
-  "gitHead": "be3413e8e1149abf94225108f86a7910f56e0616",
+  "gitHead": "d50e45a074fbefa56cac904917e707d57f237737",
   "homepage": "https://github.com/CDCgov/cdc-open-viz#readme",
   "main": "dist/cdccore",
   "moduleName": "CdcCore",

package/styles/_global.scss

@@ -83,7 +83,7 @@ strong {
   }
 
   &.danger {
-    background-color: $red;
+    background-color: var(--red);
     padding: 0em 0.6em 0em;
     height: 1.6em;
     font-size: 0.8 em;
@@ -131,7 +131,7 @@ textarea {
   display: flex;
   text-decoration: none;
   color: #444;
-  border: $lightGray 1px solid;
+  border: var(--lightGray) 1px solid;
   position: relative;
   transition: 0.2s all;
   font-size: 1em;
@@ -139,7 +139,7 @@ textarea {
   &:before {
     content: ' ';
     width: 5px;
-    background: $blue;
+    background: var(--blue);
     left: -1px;
     top: -1px;
     bottom: -1px;
@@ -147,7 +147,7 @@ textarea {
   }
 
   &:hover {
-    background: $lightestGray;
+    background: var(--lightestGray);
     transition: 0.2s all;
     color: #444;
   }
@@ -158,7 +158,7 @@ textarea {
 
   svg {
     width: 60px;
-    color: $blue;
+    color: var(--blue);
     margin-right: 1rem;
 
     path {
@@ -186,8 +186,8 @@ section.footnotes {
 }
 
 .btn.btn-primary:not([disabled]) {
-  background-color: $blue;
-  border-color: $blue;
+  background-color: var(--blue);
+  border-color: var(--blue);
 
   &:hover:not([disabled]) {
     background-color: color.adjust($blue, $lightness: -5%);

package/styles/_reset.scss

@@ -1,4 +1,4 @@
-.cdc-open-viz-module {
+.cove-visualization {
   margin: 0;
   font-family: var(--app-font-main);
   font-size: 1em;
@@ -11,7 +11,7 @@
     outline: none !important;
   }
 }
-.cdc-open-viz-module {
+.cove-visualization {
   applet,
   object,
   iframe,

package/styles/{v2/base → base}/_file-selector.scss

@@ -2,19 +2,19 @@
   padding: 1rem 3rem;
   text-align: center;
   font-size: 0.875rem;
-  color: $mediumGray;
-  border: $lightGray 2px dashed;
+  color: var(--mediumGray);
+  border: var(--lightGray) 2px dashed;
   border-radius: 0.2rem;
   cursor: pointer;
   transition: 0.1s all;
 
   &.drag-active {
-    background-color: $lightestGray;
+    background-color: var(--lightestGray);
   }
 
   span {
     white-space: pre;
-    color: $blue;
+    color: var(--blue);
     text-decoration: underline;
   }
 }

package/styles/{v2/base → base}/_general.scss

@@ -1,5 +1,3 @@
-@import '../themes/color-definitions';
-
 .cove {
   margin: 0;
   font-family: var(--app-font-main);
@@ -8,14 +6,14 @@
   font-weight: 400;
   font-style: normal;
   line-height: 1.4;
-  color: $baseColor;
+  color: var(--baseColor);
   text-rendering: optimizeLegibility;
 
   small {
     display: block;
     font-size: 0.8rem;
     font-style: italic;
-    color: $mediumGray;
+    color: var(--mediumGray);
   }
 
   .sr-only,

package/styles/{v2/base → base}/index.scss

@@ -1,4 +1,4 @@
-// @import 'reset'; //TODO: Enable after cove refactor
+@import 'reset';
 
 @import 'general';
 @import 'heading';