@cdc/dashboard 4.26.2 → 4.26.4

package/src/helpers/processDataLegacy.ts

@@ -1,14 +1,19 @@
-import fetchRemoteData from '@cdc/core/helpers/fetchRemoteData'
-import { getFormattedData } from './getFormattedData'
-
-export const processDataLegacy = async (response: any) => {
-  let dataset = response.formattedData || response.data
-
-  if (response.dataUrl) {
-    dataset = await fetchRemoteData(`${response.dataUrl}`)
-
-    dataset = getFormattedData(dataset, response.dataDescription)
-  }
-
-  return dataset
-}
+import fetchRemoteData from '@cdc/core/helpers/fetchRemoteData'
+import { getFormattedData } from './getFormattedData'
+
+export const processDataLegacy = async (
+  response: any
+): Promise<{ data: any[]; dataMetadata: Record<string, string> }> => {
+  let dataset = response.formattedData || response.data
+  let dataMetadata: Record<string, string> = {}
+
+  if (response.dataUrl) {
+    const result = await fetchRemoteData(`${response.dataUrl}`)
+    dataset = result.data
+    dataMetadata = result.dataMetadata
+
+    dataset = getFormattedData(dataset, response.dataDescription)
+  }
+
+  return { data: dataset, dataMetadata }
+}

package/src/helpers/tests/addVisualization.test.ts

@@ -0,0 +1,52 @@
+import { describe, expect, it, vi } from 'vitest'
+import { addVisualization } from '../addVisualization'
+
+describe('addVisualization', () => {
+  it('creates chart visual settings with extra theme toggles disabled by default', () => {
+    vi.spyOn(Date, 'now').mockReturnValue(12345)
+
+    const visualization = addVisualization('chart', 'Bar')
+
+    expect(visualization).toMatchObject({
+      uid: 'chart12345',
+      type: 'chart',
+      visualizationType: 'Bar',
+      visual: {
+        border: false,
+        borderColorTheme: false,
+        accent: false,
+        background: false,
+        hideBackgroundColor: false
+      }
+    })
+  })
+
+  it('creates map visual settings with extra theme toggles disabled by default', () => {
+    vi.spyOn(Date, 'now').mockReturnValue(12345)
+
+    const visualization = addVisualization('map', 'single-state')
+
+    expect(visualization).toMatchObject({
+      uid: 'map12345',
+      type: 'map',
+      general: {
+        geoType: 'single-state'
+      },
+      visual: {
+        border: false,
+        borderColorTheme: false,
+        accent: false,
+        background: false,
+        hideBackgroundColor: false
+      }
+    })
+  })
+
+  it('preserves visualizationType for data-bite family visualizations', () => {
+    vi.spyOn(Date, 'now').mockReturnValue(12345)
+
+    expect(addVisualization('data-bite')).toMatchObject({ visualizationType: 'data-bite' })
+    expect(addVisualization('waffle-chart', 'Waffle')).toMatchObject({ visualizationType: 'Waffle' })
+    expect(addVisualization('filtered-text')).toMatchObject({ visualizationType: 'filtered-text' })
+  })
+})

package/src/helpers/tests/formatConfigBeforeSave.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { cleanSharedFilters } from '../formatConfigBeforeSave'
+import { cleanSharedFilters, stripConfig } from '../formatConfigBeforeSave'
 import { DashboardConfig } from '../../types/DashboardConfig'
 
 describe('cleanSharedFilters', () => {
@@ -67,3 +67,83 @@ describe('cleanSharedFilters', () => {
     expect(config.dashboard.sharedFilters).toEqual([{ id: 1, type: 'urlfilter' }])
   })
 })
+
+describe('stripConfig', () => {
+  it('removes inline data for non-dashboard URL-backed configs when isEditor is false', () => {
+    const config = {
+      type: 'bar',
+      dataUrl: '/api/data.csv',
+      data: [{ value: 10 }],
+      runtime: { loaded: true },
+      formattedData: [{ value: 10 }]
+    }
+
+    const stripped = stripConfig(config)
+
+    expect(stripped.data).toBeUndefined()
+    expect(stripped.dataUrl).toBe('/api/data.csv')
+    expect(stripped.runtime).toBeUndefined()
+    expect(stripped.formattedData).toBeUndefined()
+  })
+
+  it('preserves inline data for non-dashboard URL-backed configs when isEditor is true', () => {
+    const config = {
+      type: 'bar',
+      dataUrl: '/api/data.csv',
+      data: [{ value: 10 }],
+      runtime: { loaded: true },
+      formattedData: [{ value: 10 }]
+    }
+
+    const stripped = stripConfig(config, true)
+
+    expect(stripped.data).toEqual([{ value: 10 }])
+    expect(stripped.dataUrl).toBe('/api/data.csv')
+    expect(stripped.runtime).toBeUndefined()
+    expect(stripped.formattedData).toBeUndefined()
+  })
+
+  it('removes dashboard dataset data when dataset has dataUrl and isEditor is false', () => {
+    const config = {
+      type: 'dashboard',
+      dashboard: { sharedFilters: [] },
+      datasets: {
+        data_1: {
+          dataUrl: '/api/dashboard.csv',
+          data: [{ a: 1 }],
+          formattedData: [{ a: 1 }]
+        }
+      },
+      visualizations: {},
+      rows: []
+    } as any
+
+    const stripped = stripConfig(config)
+
+    expect(stripped.datasets.data_1.data).toBeUndefined()
+    expect(stripped.datasets.data_1.formattedData).toBeUndefined()
+    expect(stripped.datasets.data_1.dataUrl).toBe('/api/dashboard.csv')
+  })
+
+  it('preserves dashboard dataset data when dataset has dataUrl and isEditor is true', () => {
+    const config = {
+      type: 'dashboard',
+      dashboard: { sharedFilters: [] },
+      datasets: {
+        data_1: {
+          dataUrl: '/api/dashboard.csv',
+          data: [{ a: 1 }],
+          formattedData: [{ a: 1 }]
+        }
+      },
+      visualizations: {},
+      rows: []
+    } as any
+
+    const stripped = stripConfig(config, true)
+
+    expect(stripped.datasets.data_1.data).toEqual([{ a: 1 }])
+    expect(stripped.datasets.data_1.formattedData).toBeUndefined()
+    expect(stripped.datasets.data_1.dataUrl).toBe('/api/dashboard.csv')
+  })
+})

package/src/scss/editor-panel.scss

@@ -4,7 +4,7 @@
 // Shift down for top level Dashboard bar when in edit mode
 .layout-container,
 .editor-panel + .cdc-dashboard-inner-container,
-.editor-heading + .cdc-open-viz-module {
+.editor-heading + .cove-visualization {
   position: relative;
   min-height: 80vh;
 }

package/src/scss/grid.scss

@@ -102,17 +102,29 @@ $red: #f74242;
 }
 
 .row-menu__btn {
+  align-items: center;
   background-color: #c2c2c2;
   border-radius: 0.2em 0.2em 0 0;
+  justify-content: center;
+  min-height: 0;
   outline: none;
   transition: background-color 300ms cubic-bezier(0.16, 1, 0.3, 1);
   padding: 0.2em 0.3em;
   display: flex;
   fill: #fff;
+  box-shadow: none;
+  transform: none;
+  line-height: 1;
 
   + .row-menu__btn {
     margin-left: 0.2em;
   }
+
+  &:hover:not(:disabled),
+  &:active:not(:disabled) {
+    box-shadow: none;
+    transform: none;
+  }
 }
 
 .row-menu__btn-disabled {
@@ -276,21 +288,32 @@ $red: #f74242;
   }
 }
 
-.btn--fluid {
-  @extend .btn;
-  width: 100%;
-  text-align: center;
-}
-
 .builder-row {
   position: relative;
 
   .btn-configure-row {
-    background: none;
-    display: block;
+    align-items: center;
+    background: transparent !important;
+    border: 0;
+    border-radius: 0;
+    box-shadow: none;
+    color: var(--blue);
+    display: inline-flex;
+    justify-content: center;
+    min-height: 32px;
+    min-width: 32px;
+    padding: 0.375rem;
     position: absolute;
     right: 1em;
     top: 0;
+    transform: none;
+
+    &:hover:not(:disabled),
+    &:active:not(:disabled) {
+      background: transparent !important;
+      box-shadow: none;
+      transform: none;
+    }
   }
 
   .footnotes {
@@ -351,3 +374,10 @@ $red: #f74242;
     border-color: var(--blue);
   }
 }
+
+.row-menu__btn svg,
+.builder-row .btn-configure-row svg {
+  margin-bottom: 0;
+  top: 0;
+  vertical-align: middle;
+}