@cdc/dashboard 4.24.2 → 4.24.4

package/src/store/dashboard.reducer.ts

@@ -3,6 +3,7 @@ import { getUpdateConfig } from '../helpers/getUpdateConfig'
 import { MultiDashboardConfig } from '../types/MultiDashboard'
 import DashboardActions from './dashboard.actions'
 import { devToolsWrapper } from '@cdc/core/helpers/withDevTools'
+import { Tab } from '../types/Tab'
 
 const createBlankDashboard = () => ({
   dashboard: {
@@ -24,7 +25,7 @@ export type DashboardState = {
   filteredData: Object
   loading: boolean
   preview: boolean
-  tabSelected: number
+  tabSelected: Tab
 }
 
 const reducer = (state: DashboardState, action: DashboardActions): DashboardState => {
@@ -40,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 }
@@ -91,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'])
@@ -103,6 +109,31 @@ const reducer = (state: DashboardState, action: DashboardActions): DashboardStat
       const newConfigFields = state.config.multiDashboards[slot]
       return { ...state, config: { ...state.config, ...newConfigFields, activeDashboard: slot } }
     }
+    case 'TOGGLE_ROW': {
+      const { rowIndex, colIndex } = action.payload
+      const newRows = state.config.rows.map((row, index) => {
+        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 } }
+    }
     default:
       return state
   }

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,6 +1,17 @@
-export type ConfigRow = {
+import { ConfigureData } from '@cdc/core/types/ConfigureData'
+
+type Col = {
   equalHeight?: boolean
   width: number | null
+  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/InitialState.ts

@@ -1,4 +1,5 @@
 import { DashboardConfig } from './DashboardConfig'
+import { Tab } from './Tab'
 
 export type InitialState = {
   config: DashboardConfig
@@ -6,5 +7,5 @@ export type InitialState = {
   loading: boolean
   filteredData: Object
   preview: boolean
-  tabSelected: number
+  tabSelected: Tab
 }

package/src/types/SharedFilter.ts

@@ -1,14 +1,17 @@
 import { APIFilter } from './APIFilter'
 export type SharedFilter = {
   type?: 'urlfilter' | 'datafilter' | ''
-  fileName: string
+  fileName?: string
   filterBy?: 'Query String' | 'File Name'
   queryParameter?: string
-  active?: string
+  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
+  selectLimit?: number
   columnName?: string
   resetLabel?: string
   showDropdown?: boolean

package/src/types/Tab.ts

@@ -0,0 +1 @@
+export type Tab = 'Dashboard Description' | 'Dashboard Filters' | 'Data Table Settings' | 'Dashboard Preview'