@cdc/dashboard 4.24.3 → 4.24.4

package/src/helpers/getVizConfig.ts

@@ -0,0 +1,31 @@
+import _ from 'lodash'
+import { MultiDashboardConfig } from '../types/MultiDashboard'
+import DataTransform from '@cdc/core/helpers/DataTransform'
+
+const transform = new DataTransform()
+
+export const getVizConfig = (visualizationKey: string, rowNumber: number, config: MultiDashboardConfig, data: Object, filteredData?: Object) => {
+  const visualizationConfig = _.cloneDeep(config.visualizations[visualizationKey])
+  const rowData = config.rows[rowNumber]
+  if (rowData?.dataKey) {
+    // data configured on the row
+    Object.assign(visualizationConfig, _.pick(rowData, ['dataKey', 'dataDescription', 'formattedData', 'data']))
+  }
+
+  if (visualizationConfig.formattedData) visualizationConfig.originalFormattedData = visualizationConfig.formattedData
+  const filteredVizData = filteredData?.[rowNumber] ?? filteredData?.[visualizationKey]
+
+  if (filteredVizData) {
+    visualizationConfig.data = filteredVizData
+    if (visualizationConfig.formattedData) {
+      visualizationConfig.formattedData = visualizationConfig.data
+    }
+  } else {
+    const dataKey = visualizationConfig.dataKey || 'backwards-compatibility'
+    visualizationConfig.data = data[dataKey]
+    if (visualizationConfig.formattedData) {
+      visualizationConfig.formattedData = transform.developerStandardize(visualizationConfig.data, visualizationConfig.dataDescription) || visualizationConfig.data
+    }
+  }
+  return visualizationConfig
+}

package/src/helpers/getVizRowColumnLocator.ts

@@ -0,0 +1,9 @@
+import { ConfigRow } from '../types/ConfigRow'
+
+export const getVizRowColumnLocator = (rows: ConfigRow[]) =>
+  rows.reduce((acc, curr, index) => {
+    curr.columns?.forEach((column, columnIndex) => {
+      if (column.widget !== undefined) acc[column.widget] = { row: index, column: columnIndex }
+    })
+    return acc
+  }, {})

package/src/scss/grid.scss

@@ -35,8 +35,7 @@ $red: #f74242;
   flex-flow: row;
   width: 100%;
   position: relative;
-  top: 0;
-  padding: 1em;
+  padding: 2em 1em 1em;
   border: 1px solid #c2c2c2;
   transition: border 300ms cubic-bezier(0.16, 1, 0.3, 1);
   background-color: #f2f2f2;
@@ -330,6 +329,14 @@ $red: #f74242;
 .builder-row {
   position: relative;
 
+  .btn-configure-row {
+    background: none;
+    display: block;
+    position: absolute;
+    right: 1em;
+    top: 0;
+  }
+
   .widget__content {
     padding: 0 2em;
 

package/src/scss/main.scss

@@ -10,6 +10,11 @@
     margin-top: 20%;
   }
 
+  > .cove-editor__content {
+    width: 100% !important;
+    left: 0px;
+  }
+
   .editor-heading {
     background-color: #ddd;
     border-bottom: #c7c7c7 1px solid;

package/src/store/dashboard.actions.ts

@@ -1,8 +1,14 @@
 import type { DashboardConfig as Config } from '../types/DashboardConfig'
 import { type Action } from '@cdc/core/types/Action'
 import { Tab } from '../types/Tab'
+<<<<<<< HEAD
+import { ConfigureData } from '@cdc/core/types/ConfigureData'
+import { ConfigRow } from '../types/ConfigRow'
+=======
+import { SharedFilter } from '../types/SharedFilter'
+>>>>>>> 35436844 (fixed api dropdowns)
 
-type SET_CONFIG = Action<'SET_CONFIG', Config>
+type SET_CONFIG = Action<'SET_CONFIG', Partial<Config>>
 type UPDATE_CONFIG = Action<'UPDATE_CONFIG', [Config, Object?]>
 type SET_DATA = Action<'SET_DATA', Object>
 type SET_LOADING = Action<'SET_LOADING', boolean>
@@ -17,6 +23,12 @@ type ADD_NEW_DASHBOARD = Action<'ADD_NEW_DASHBOARD', undefined>
 type SAVE_CURRENT_CHANGES = Action<'SAVE_CURRENT_CHANGES', undefined>
 type SWITCH_CONFIG = Action<'SWITCH_CONFIG', number>
 type TOGGLE_ROW = Action<'TOGGLE_ROW', { rowIndex: number; colIndex: number }>
+<<<<<<< HEAD
+type UPDATE_VISUALIZATION = Action<'UPDATE_VISUALIZATION', { vizKey: string; configureData: Partial<ConfigureData> }>
+type UPDATE_ROW = Action<'UPDATE_ROW', { rowIndex: number; rowData: Partial<ConfigRow> }>
+=======
+type SET_SHARED_FILTERS = Action<'SET_SHARED_FILTERS', SharedFilter[]>
+>>>>>>> 35436844 (fixed api dropdowns)
 
 type DashboardActions =
   | ADD_NEW_DASHBOARD
@@ -30,8 +42,11 @@ type DashboardActions =
   | SET_LOADING
   | SET_PREVIEW
   | SET_FILTERED_DATA
+  | SET_SHARED_FILTERS
   | SET_TAB_SELECTED
   | SWITCH_CONFIG
   | INITIALIZE_MULTIDASHBOARDS
   | TOGGLE_ROW
+  | UPDATE_VISUALIZATION
+  | UPDATE_ROW
 export default DashboardActions

package/src/store/dashboard.reducer.ts

@@ -41,7 +41,7 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
       return { ...state, config, filteredData }
     }
     case 'SET_CONFIG': {
-      return { ...state, config: action.payload }
+      return { ...state, config: { ...state.config, ...action.payload } }
     }
     case 'SET_DATA': {
       return { ...state, data: action.payload }
@@ -92,6 +92,11 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
       newMultiDashboards[saveSlot] = { ...toSave, label }
       return applyMultiDashboards(state, newMultiDashboards)
     }
+    case 'SET_SHARED_FILTERS': {
+      const newSharedFilters = action.payload
+      const newDashboardConfig = { ...state.config.dashboard, sharedFilters: newSharedFilters }
+      return { ...state, config: { ...state.config, dashboard: newDashboardConfig } }
+    }
     case 'INITIALIZE_MULTIDASHBOARDS': {
       const label = 'New Dashboard 1'
       const toSave = _.pick(state.config, ['dashboard', 'visualizations', 'rows'])
@@ -107,7 +112,25 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
     case 'TOGGLE_ROW': {
       const { rowIndex, colIndex } = action.payload
       const newRows = state.config.rows.map((row, index) => {
-        return index === rowIndex ? row.map((col, i) => ({ ...col, hide: i !== colIndex })) : row
+        if (index === rowIndex) {
+          const newColumns = row.columns.map((col, i) => ({ ...col, hide: i === colIndex }))
+          return { ...row, columns: newColumns }
+        }
+        return row
+      })
+      return { ...state, config: { ...state.config, rows: newRows } }
+    }
+    case 'UPDATE_VISUALIZATION': {
+      const { vizKey, configureData } = action.payload
+      return { ...state, config: { ...state.config, visualizations: { ...state.config.visualizations, [vizKey]: { ...state.config.visualizations[vizKey], ...configureData } } } }
+    }
+    case 'UPDATE_ROW': {
+      const { rowIndex, rowData } = action.payload
+      const newRows = state.config.rows.map((row, index) => {
+        if (index === rowIndex) {
+          return { ...row, ...rowData }
+        }
+        return row
       })
       return { ...state, config: { ...state.config, rows: newRows } }
     }

package/src/types/APIFilter.ts

@@ -1,5 +1,4 @@
-export type APIFilter = Record<'apiEndpoint'|'valueSelector'|'textSelector', string> & {
-    heirarchyLookup?: string
-    autoLoad?: boolean
-    defaultValue?: string
-}
+export type APIFilter = Record<'apiEndpoint' | 'valueSelector' | 'textSelector', string> & {
+  autoLoad?: boolean
+  defaultValue?: string
+}

package/src/types/ConfigRow.ts

@@ -1,8 +1,17 @@
-export type ConfigRow = {
+import { ConfigureData } from '@cdc/core/types/ConfigureData'
+
+type Col = {
   equalHeight?: boolean
   width: number | null
-  toggle?: boolean
   hide?: boolean
   widget?: string
   uuid?: string | number
-}[] & { uuid?: string | number }
+}
+
+export type ConfigRow = {
+  columns: Col[]
+  uuid?: string | number
+  toggle?: boolean
+  equalHeight?: boolean
+  multiVizColumn?: string
+} & ConfigureData

package/src/types/DataSet.ts

@@ -1,8 +1,11 @@
-export type DataSet = {
-  data: Object[]
-  dataDescription: {}
-  dataUrl: string
-  runtimeDataUrl: string
-  dataFileSourceType: string
-  formattedData: Object[]
-}
+import { ConfigureData } from '@cdc/core/types/ConfigureData'
+
+export type DataSet = ConfigureData & {
+  dataFileFormat?: string
+  dataFileName?: string
+  dataFileSize?: number
+  preview?: boolean
+  dataUrl: string
+  runtimeDataUrl: string
+  dataFileSourceType: string
+}

package/src/types/SharedFilter.ts

@@ -7,7 +7,7 @@ export type SharedFilter = {
   setByQueryParameter?: string
   active?: string | string[]
   queuedActive?: string
-  usedBy?: string[]
+  usedBy?: (string | number)[] // if number used by whole row, else used by specific viz
   parents?: string[]
   pivot?: string
   setBy?: string