@cdc/dashboard 4.25.11 → 4.26.2

package/src/helpers/addValuesToDashboardFilters.ts

@@ -1,5 +1,5 @@
 import _ from 'lodash'
-import { getQueryStringFilterValue } from '@cdc/core/helpers/queryStringUtils'
+import { getQueryStringFilterValue, isFilterHiddenByQuery } from '@cdc/core/helpers/queryStringUtils'
 import { SharedFilter } from '../types/SharedFilter'
 import { handleSorting } from '@cdc/core/components/Filters'
 import { mergeCustomOrderValues } from '@cdc/core/helpers/mergeCustomOrderValues'
@@ -39,7 +39,11 @@ export const addValuesToDashboardFilters = (
     if (filtersToSkip.includes(index)) return filter
     if (filter.type === 'urlfilter') return filter
     const filterCopy = _.cloneDeep(filter)
-    const filterValues = generateValuesForFilter(getSelector(filter), data)
+
+    // Only generate values from data if not pre-configured
+    const hasPreConfiguredValues = filter.values && filter.values.length > 0
+    const filterValues = hasPreConfiguredValues ? filter.values : generateValuesForFilter(getSelector(filter), data)
+
     filterCopy.values = filterValues
 
     // Merge new values with existing custom order (fixes DEV-11740 & DEV-11376)
@@ -54,32 +58,20 @@ export const addValuesToDashboardFilters = (
         const active: string[] = Array.isArray(filterCopy.active) ? filterCopy.active : [filterCopy.active]
         filterCopy.active = active.filter(val => defaultValues.includes(val))
       } else {
-        // Preserve existing active value if it's valid in the new filter values
-        const currentActive = filterCopy.active as string
-        const isResetLabelValue = currentActive && currentActive === filterCopy.resetLabel
-        const isCurrentActiveValid = currentActive && (filterValues.includes(currentActive) || isResetLabelValue)
-
-        // Check if this is an intentional clear (empty string, but not undefined during initial load)
-        const isIntentionalClear = currentActive === ''
-
-        // Priority: defaultValue > valid current active > reset label > first value
+        // Use defaultValue if set, otherwise keep existing active or use first value
         if (filterCopy.defaultValue) {
-          // If defaultValue is explicitly set, always use it
           filterCopy.active = filterCopy.defaultValue
-        } else if (isCurrentActiveValid) {
-          // Keep the current active value if valid
-          filterCopy.active = currentActive
-        } else if (isIntentionalClear) {
-          // Don't override intentional clears
-          filterCopy.active = currentActive
-        } else {
-          // Set to reset label or first value
-          const defaultValue = filterCopy.resetLabel || filterCopy.values[0]
-          filterCopy.active = defaultValue
+        } else if (!filterCopy.active) {
+          filterCopy.active = filterCopy.resetLabel || filterCopy.values[0]
         }
       }
     }
 
+    // Check if filter should be hidden by query parameter
+    if (isFilterHiddenByQuery(filterCopy)) {
+      filterCopy.showDropdown = false
+    }
+
     // Handle nested dropdown subGrouping.active property
     if (filterCopy.subGrouping && filterCopy.subGrouping.valuesLookup) {
       const groupName = filterCopy.active as string
@@ -89,17 +81,24 @@ export const addValuesToDashboardFilters = (
       }
       const queryStringFilterValue = getQueryStringFilterValue(subGroupingFilter)
       const groupActive = groupName || filterCopy.values[0]
-      const defaultSubValue = filterCopy.subGrouping.valuesLookup[groupActive as string]?.values[0]
+      const currentGroupValues = filterCopy.subGrouping.valuesLookup[groupActive as string]?.values || []
+      const defaultSubValue = currentGroupValues[0]
 
-      // Priority order: query string > existing active > configured default > first available value
-      let activeValue = queryStringFilterValue || filterCopy.subGrouping.active
+      // Priority order: query string > configured default > existing active > first available value
+      let activeValue: string | undefined
 
-      // If we have a configured default value and it exists in the current group's options, use it
-      if (!activeValue && filterCopy.subGrouping.defaultValue) {
-        const currentGroupValues = filterCopy.subGrouping.valuesLookup[groupActive as string]?.values || []
-        if (currentGroupValues.includes(filterCopy.subGrouping.defaultValue)) {
-          activeValue = filterCopy.subGrouping.defaultValue
-        }
+      if (queryStringFilterValue && currentGroupValues.includes(queryStringFilterValue)) {
+        // 1. Query string parameter takes highest priority (only if valid for the current group)
+        activeValue = queryStringFilterValue
+      } else if (
+        filterCopy.subGrouping.defaultValue &&
+        currentGroupValues.includes(filterCopy.subGrouping.defaultValue)
+      ) {
+        // 2. Use configured defaultValue if it exists and is valid for the current group
+        activeValue = filterCopy.subGrouping.defaultValue
+      } else if (filterCopy.subGrouping.active && currentGroupValues.includes(filterCopy.subGrouping.active)) {
+        // 3. Keep existing active value if it's valid for the current group
+        activeValue = filterCopy.subGrouping.active
       }
 
       filterCopy.subGrouping.active = activeValue || defaultSubValue

package/src/helpers/apiFilterHelpers.ts

@@ -119,35 +119,31 @@ export const getToFetch = (
 }
 
 export const setActiveNestedDropdown = (dropdownOptions, sharedFilter) => {
-  const defaultQueryParamValue = getQueryParam(sharedFilter?.setByQueryParameter)
-  const defaultValue = dropdownOptions[0]?.value
-  const subDefaultValue = dropdownOptions[0]?.subOptions[0].value
-  const subDefaultQueryParamValue = getQueryParam(sharedFilter?.subGrouping.setByQueryParameter)
-  if (!sharedFilter.active) {
-    sharedFilter.active = defaultQueryParamValue || defaultValue
-    sharedFilter.subGrouping.active = subDefaultQueryParamValue || subDefaultValue
-  } else {
-    const currentOption = dropdownOptions.find(option => option.value === sharedFilter.active)
-    sharedFilter.active = currentOption ? currentOption.value : defaultValue
-    if (currentOption) {
-      const currentSubOption = currentOption.subOptions.find(option => option.value === sharedFilter.subGrouping.active)
-      sharedFilter.subGrouping.active = currentSubOption?.value || subDefaultValue
-    } else {
-      sharedFilter.subGrouping.active = subDefaultValue
-    }
-  }
+  const queryValue = getQueryParam(sharedFilter?.setByQueryParameter)
+  const subQueryValue = getQueryParam(sharedFilter?.subGrouping?.setByQueryParameter)
+
+  // Priority: query string > configured defaultValue > existing active (if valid) > first option
+  // Note: use loose equality here to match values across possible string/number differences
+  const validActive = dropdownOptions.find(option => option.value == sharedFilter.active)
+  sharedFilter.active =
+    queryValue || sharedFilter.defaultValue || (validActive ? sharedFilter.active : dropdownOptions[0]?.value)
+
+  const options = dropdownOptions.find(option => option.value == sharedFilter.active)?.subOptions || []
+  const validSubActive = options.find(o => o.value == sharedFilter.subGrouping?.active)
+  sharedFilter.subGrouping.active =
+    subQueryValue ||
+    sharedFilter.subGrouping?.defaultValue ||
+    (validSubActive ? sharedFilter.subGrouping.active : options[0]?.value)
 }
 
 export const setActiveMultiDropdown = (dropdownOptions, sharedFilter) => {
-  const defaultQueryParamValue = getQueryParam(sharedFilter?.setByQueryParameter)
-  const multiDefaultQueryParamValue = Array.isArray(defaultQueryParamValue)
-    ? defaultQueryParamValue
-    : defaultQueryParamValue?.split(',')
-  const multiDefaultValue = defaultQueryParamValue ? multiDefaultQueryParamValue : [dropdownOptions[0]?.value]
+  const queryValue = getQueryParam(sharedFilter?.setByQueryParameter)
+  const queryValues = Array.isArray(queryValue) ? queryValue : queryValue?.split(',')
+  const defaultValues = queryValue ? queryValues : [dropdownOptions[0]?.value]
   const currentOption = (Array.isArray(sharedFilter.active) ? sharedFilter.active : []).filter(activeVal =>
     dropdownOptions.find(option => option.value === activeVal)
   )
-  sharedFilter.active = currentOption.length ? currentOption : multiDefaultValue
+  sharedFilter.active = currentOption.length ? currentOption : defaultValues
 }
 
 export const setAutoLoadDefaultValue = (
@@ -158,20 +154,20 @@ export const setAutoLoadDefaultValue = (
 ): SharedFilter => {
   const sharedFiltersCopy = _.cloneDeep(sharedFilters)
   const sharedFilter = _.cloneDeep(sharedFiltersCopy[sharedFilterIndex])
-  const defaultQueryParamValue = getQueryParam(sharedFilter?.setByQueryParameter)
-  const hasQueryParameter = sharedFilter.setByQueryParameter ? defaultQueryParamValue !== undefined : false
+  const queryValue = getQueryParam(sharedFilter?.setByQueryParameter)
+  const hasQuery = sharedFilter.setByQueryParameter ? queryValue !== undefined : false
   if (!autoLoadFilterIndexes.length || !dropdownOptions?.length) {
-    if (hasQueryParameter && sharedFilter.apiFilter) {
+    if (hasQuery && sharedFilter.apiFilter) {
       const subQueryValue = getQueryParam(sharedFilter.subGrouping?.setByQueryParameter)
-      const isNestedDropdown = subQueryValue !== undefined
-      sharedFilter.queuedActive = isNestedDropdown ? [defaultQueryParamValue, subQueryValue] : defaultQueryParamValue
+      const isNested = subQueryValue !== undefined
+      sharedFilter.queuedActive = isNested ? [queryValue, subQueryValue] : queryValue
     }
     return sharedFilter // no autoLoading happening
   }
-  if (autoLoadFilterIndexes.includes(sharedFilterIndex) || hasQueryParameter) {
+  if (autoLoadFilterIndexes.includes(sharedFilterIndex) || hasQuery) {
     const filterParents = sharedFiltersCopy.filter(f => sharedFilter.parents?.includes(f.key))
-    const notAllParentFiltersSelected = filterParents.some(p => !(p.active || p.queuedActive))
-    if (filterParents && notAllParentFiltersSelected) return sharedFilter
+    const missingParents = filterParents.some(p => !(p.active || p.queuedActive))
+    if (missingParents) return sharedFilter
     if (sharedFilter.filterStyle === FILTER_STYLE.multiSelect) {
       setActiveMultiDropdown(dropdownOptions, sharedFilter)
     } else if (sharedFilter.filterStyle === FILTER_STYLE.nestedDropdown) {
@@ -179,7 +175,7 @@ export const setAutoLoadDefaultValue = (
     } else {
       const defaultValue = dropdownOptions[0]?.value
       if (!sharedFilter.active) {
-        sharedFilter.active = defaultQueryParamValue || defaultValue
+        sharedFilter.active = queryValue ?? defaultValue
       } else {
         const currentOption = dropdownOptions.find(option => option.value == sharedFilter.active) // loose equality required: 2017 should equal '2017'
         sharedFilter.active = currentOption ? currentOption.value : defaultValue

package/src/helpers/changeFilterActive.ts

@@ -1,65 +1,67 @@
-import _ from 'lodash'
-import { FilterBehavior } from '../helpers/FilterBehavior'
-import {
-  getQueryParams,
-  removeQueryParam,
-  updateQueryParam,
-  updateQueryString
-} from '@cdc/core/helpers/queryStringUtils'
-import { SharedFilter } from '../types/SharedFilter'
-import { DashboardFilters } from '../types/DashboardFilters'
-import { FILTER_STYLE } from '../types/FilterStyles'
-
-const handleChildren = (sharedFilters: SharedFilter[], parentIndex: number) => {
-  const parentKey = sharedFilters[parentIndex].key
-  const childFilterIndexes = sharedFilters
-    .map((filter, index) => (filter.parents?.includes(parentKey) ? index : null))
-    .filter(i => i !== null)
-  if (childFilterIndexes.length) {
-    childFilterIndexes.forEach(filterIndex => {
-      const cur = sharedFilters[filterIndex]
-      if (cur.setByQueryParameter) removeQueryParam(cur.setByQueryParameter)
-      cur.active = ''
-      if (cur.subGrouping) {
-        cur.subGrouping.active = ''
-      }
-    })
-  }
-  return childFilterIndexes
-}
-
-export const changeFilterActive = (
-  filterIndex: number,
-  value: string | string[],
-  sharedFilters: SharedFilter[],
-  vizConfig: DashboardFilters
-): [SharedFilter[], number[]] => {
-  const sharedFiltersCopy = _.cloneDeep(sharedFilters)
-  const currentFilter = sharedFiltersCopy[filterIndex]
-  if (vizConfig.filterBehavior !== FilterBehavior.Apply || vizConfig.autoLoad) {
-    if (currentFilter?.filterStyle === FILTER_STYLE.nestedDropdown) {
-      sharedFiltersCopy[filterIndex].active = value[0]
-      sharedFiltersCopy[filterIndex].subGrouping.active = value[1]
-    } else {
-      sharedFiltersCopy[filterIndex].active = value
-      handleChildren(sharedFiltersCopy, filterIndex)
-      const queryParams = getQueryParams()
-      if (
-        currentFilter.setByQueryParameter &&
-        queryParams[currentFilter.setByQueryParameter] !== currentFilter.active
-      ) {
-        queryParams[currentFilter.setByQueryParameter] = currentFilter.active
-        updateQueryString(queryParams)
-      }
-    }
-  } else if (currentFilter.subGrouping) {
-    updateQueryParam(currentFilter.setByQueryParameter, value[0])
-    updateQueryParam(currentFilter.subGrouping.setByQueryParameter, value[1])
-    sharedFiltersCopy[filterIndex].queuedActive = value
-  } else {
-    const paramVal = Array.isArray(value) ? value.join(',') : value
-    if (currentFilter.setByQueryParameter) updateQueryParam(currentFilter.setByQueryParameter, paramVal)
-    sharedFiltersCopy[filterIndex].queuedActive = value
-  }
-  return [sharedFiltersCopy, handleChildren(sharedFiltersCopy, filterIndex)]
-}
+import _ from 'lodash'
+import { FilterBehavior } from '../helpers/FilterBehavior'
+import {
+  getQueryParams,
+  removeQueryParam,
+  updateQueryParam,
+  updateQueryString
+} from '@cdc/core/helpers/queryStringUtils'
+import { SharedFilter } from '../types/SharedFilter'
+import { DashboardFilters } from '../types/DashboardFilters'
+import { FILTER_STYLE } from '../types/FilterStyles'
+
+const handleChildren = (sharedFilters: SharedFilter[], parentIndex: number) => {
+  const parentKey = sharedFilters[parentIndex].key
+  const childFilterIndexes = sharedFilters
+    .map((filter, index) => (filter.parents?.includes(parentKey) ? index : null))
+    .filter(i => i !== null)
+  if (childFilterIndexes.length) {
+    childFilterIndexes.forEach(filterIndex => {
+      const cur = sharedFilters[filterIndex]
+      if (cur.type === 'urlfilter') {
+        if (cur.setByQueryParameter) removeQueryParam(cur.setByQueryParameter)
+        cur.active = ''
+        if (cur.subGrouping) {
+          cur.subGrouping.active = ''
+        }
+      }
+    })
+  }
+  return childFilterIndexes
+}
+
+export const changeFilterActive = (
+  filterIndex: number,
+  value: string | string[],
+  sharedFilters: SharedFilter[],
+  vizConfig: DashboardFilters
+): [SharedFilter[], number[]] => {
+  const sharedFiltersCopy = _.cloneDeep(sharedFilters)
+  const currentFilter = sharedFiltersCopy[filterIndex]
+  if (vizConfig.filterBehavior !== FilterBehavior.Apply || vizConfig.autoLoad) {
+    if (currentFilter?.filterStyle === FILTER_STYLE.nestedDropdown) {
+      sharedFiltersCopy[filterIndex].active = value[0]
+      sharedFiltersCopy[filterIndex].subGrouping.active = value[1]
+    } else {
+      sharedFiltersCopy[filterIndex].active = value
+      handleChildren(sharedFiltersCopy, filterIndex)
+      const queryParams = getQueryParams()
+      if (
+        currentFilter.setByQueryParameter &&
+        queryParams[currentFilter.setByQueryParameter] !== currentFilter.active
+      ) {
+        queryParams[currentFilter.setByQueryParameter] = currentFilter.active
+        updateQueryString(queryParams)
+      }
+    }
+  } else if (currentFilter.subGrouping) {
+    updateQueryParam(currentFilter.setByQueryParameter, value[0])
+    updateQueryParam(currentFilter.subGrouping.setByQueryParameter, value[1])
+    sharedFiltersCopy[filterIndex].queuedActive = value
+  } else {
+    const paramVal = Array.isArray(value) ? value.join(',') : value
+    if (currentFilter.setByQueryParameter) updateQueryParam(currentFilter.setByQueryParameter, paramVal)
+    sharedFiltersCopy[filterIndex].queuedActive = value
+  }
+  return [sharedFiltersCopy, handleChildren(sharedFiltersCopy, filterIndex)]
+}

package/src/helpers/formatConfigBeforeSave.ts

@@ -17,11 +17,12 @@ const cleanDashboardFootnotes = (config: DashboardConfig) => {
   }
 }
 
-const cleanDashboardData = (config: DashboardConfig) => {
+const cleanDashboardData = (config: DashboardConfig, isEditor = false) => {
   if (config.datasets) {
     Object.keys(config.datasets).forEach(datasetKey => {
       delete config.datasets[datasetKey].formattedData
-      if (config.datasets[datasetKey].dataUrl) {
+      // Only delete data when not in editor mode
+      if (config.datasets[datasetKey].dataUrl && !isEditor) {
         delete config.datasets[datasetKey].data
       }
     })
@@ -104,12 +105,12 @@ const removeRuntimeDataURLs = (config: DashboardConfig) => {
   }
 }
 
-export const stripConfig = configToStrip => {
+export const stripConfig = (configToStrip, isEditor = false) => {
   const strippedConfig = cloneConfig(configToStrip)
   if (strippedConfig.type === 'dashboard') {
     if (strippedConfig.multiDashboards) {
       strippedConfig.multiDashboards.forEach((multiDashboard, i) => {
-        cleanDashboardData(strippedConfig.multiDashboards[i])
+        cleanDashboardData(strippedConfig.multiDashboards[i], isEditor)
         cleanSharedFilters(strippedConfig.multiDashboards[i])
         cleanDashboardFootnotes(strippedConfig.multiDashboards[i])
         cleanVisualizationFilters(strippedConfig.multiDashboards[i])
@@ -120,7 +121,7 @@ export const stripConfig = configToStrip => {
       delete strippedConfig.label
     }
     delete strippedConfig.activeDashboard
-    cleanDashboardData(strippedConfig)
+    cleanDashboardData(strippedConfig, isEditor)
     cleanSharedFilters(strippedConfig)
     cleanDashboardFootnotes(strippedConfig)
     cleanVisualizationFilters(strippedConfig)

package/src/helpers/getUpdateConfig.ts

@@ -1,91 +1,91 @@
-import { DashboardState } from '../store/dashboard.reducer'
-import { DashboardConfig as Config, DashboardConfig } from '../types/DashboardConfig'
-import { filterData } from './filterData'
-import { generateValuesForFilter } from './generateValuesForFilter'
-import { getFormattedData } from './getFormattedData'
-import { getVizKeys } from './getVizKeys'
-import { getVizRowColumnLocator } from './getVizRowColumnLocator'
-
-import { getQueryStringFilterValue } from '@cdc/core/helpers/queryStringUtils'
-
-type UpdateState = Omit<DashboardState, 'config'> & {
-  config?: DashboardConfig
-}
-
-export const getUpdateConfig =
-  (state: UpdateState) =>
-  (newConfig, dataOverride?: Object): [Config, Object] => {
-    let newFilteredData = {}
-    let visualizationKeys = getVizKeys(newConfig)
-
-    const vizRowColumnLocator = getVizRowColumnLocator(newConfig.rows)
-
-    if (newConfig.dashboard.sharedFilters) {
-      newConfig.dashboard.sharedFilters.forEach((filter, i) => {
-        const filterIsSetByVizData = !!visualizationKeys.find(key => key === filter.setBy)
-        const _filter = newConfig.dashboard.sharedFilters[i]
-
-        const setValuesAndActive = filterValues => {
-          _filter.values = filterValues
-          if (filterValues.length > 0) {
-            const defaultValues = _filter.pivot ? _filter.values : _filter.values[0]
-
-            const queryStringFilterValue = getQueryStringFilterValue(_filter)
-            if (queryStringFilterValue) {
-              _filter.active = queryStringFilterValue
-            } else {
-              _filter.active = _filter.active || defaultValues
-            }
-          }
-        }
-
-        const filterValues = generateValuesForFilter(filter.columnName, dataOverride || state.data)
-        if (filterIsSetByVizData) {
-          if (_filter.order === 'asc') {
-            filterValues.sort()
-          }
-          if (_filter.order === 'desc') {
-            filterValues.sort().reverse()
-          }
-
-          setValuesAndActive(filterValues)
-        } else if ((!filter.values || filter.values.length === 0) && filter.showDropdown) {
-          setValuesAndActive(filterValues)
-        }
-      })
-
-      visualizationKeys.forEach(visualizationKey => {
-        const row = vizRowColumnLocator[visualizationKey]
-        if (newConfig.rows[row]?.datakey) return // data configured on the row level
-        const applicableFilters = newConfig.dashboard.sharedFilters.filter(
-          sharedFilter => sharedFilter.usedBy && sharedFilter.usedBy.indexOf(visualizationKey) !== -1
-        )
-
-        if (applicableFilters.length > 0) {
-          const visualization = newConfig.visualizations[visualizationKey]
-          const _newConfigDataSet = newConfig.datasets[visualization.dataKey]
-          const formattedData = getFormattedData(
-            _newConfigDataSet?.data || visualization.data,
-            visualization.dataDescription
-          )
-          const _data = formattedData || (dataOverride || state.data)[visualization.dataKey]
-          newFilteredData[visualizationKey] = filterData(applicableFilters, _data)
-        }
-      })
-
-      newConfig.rows.forEach((row, rowIndex) => {
-        const applicableFilters = newConfig.dashboard.sharedFilters.filter(
-          sharedFilter => sharedFilter.usedBy && sharedFilter.usedBy.indexOf(rowIndex) !== -1
-        )
-
-        if (applicableFilters.length > 0) {
-          const formattedData = getFormattedData(row.data, row.dataDescription)
-          const _data = formattedData || (dataOverride || state.data)[rowIndex]
-          newFilteredData[rowIndex] = filterData(applicableFilters, _data)
-        }
-      })
-    }
-    //Enforce default values that need to be calculated at runtime
-    newConfig.runtime = {}
-    return [newConfig, newFilteredData]
-  }
+import { DashboardState } from '../store/dashboard.reducer'
+import { DashboardConfig as Config, DashboardConfig } from '../types/DashboardConfig'
+import { filterData } from './filterData'
+import { generateValuesForFilter } from './generateValuesForFilter'
+import { getFormattedData } from './getFormattedData'
+import { getVizKeys } from './getVizKeys'
+import { getVizRowColumnLocator } from './getVizRowColumnLocator'
+
+import { getQueryStringFilterValue } from '@cdc/core/helpers/queryStringUtils'
+
+type UpdateState = Omit<DashboardState, 'config'> & {
+  config?: DashboardConfig
+}
+
+export const getUpdateConfig =
+  (state: UpdateState) =>
+  (newConfig, dataOverride?: Object): [Config, Object] => {
+    let newFilteredData = {}
+    let visualizationKeys = getVizKeys(newConfig)
+
+    const vizRowColumnLocator = getVizRowColumnLocator(newConfig.rows)
+
+    if (newConfig.dashboard.sharedFilters) {
+      newConfig.dashboard.sharedFilters.forEach((filter, i) => {
+        const filterIsSetByVizData = !!visualizationKeys.find(key => key === filter.setBy)
+        const _filter = newConfig.dashboard.sharedFilters[i]
+
+        const setValuesAndActive = filterValues => {
+          _filter.values = filterValues
+          if (filterValues.length > 0) {
+            const defaultValues = _filter.pivot ? _filter.values : _filter.values[0]
+
+            const queryStringFilterValue = getQueryStringFilterValue(_filter)
+            if (queryStringFilterValue) {
+              _filter.active = queryStringFilterValue
+            } else {
+              _filter.active = _filter.active || defaultValues
+            }
+          }
+        }
+
+        const filterValues = generateValuesForFilter(filter.columnName, dataOverride || state.data)
+        if (filterIsSetByVizData) {
+          if (_filter.order === 'asc') {
+            filterValues.sort()
+          }
+          if (_filter.order === 'desc') {
+            filterValues.sort().reverse()
+          }
+
+          setValuesAndActive(filterValues)
+        } else if ((!filter.values || filter.values.length === 0) && filter.showDropdown) {
+          setValuesAndActive(filterValues)
+        }
+      })
+
+      visualizationKeys.forEach(visualizationKey => {
+        const row = vizRowColumnLocator[visualizationKey]
+        if (newConfig.rows[row]?.datakey) return // data configured on the row level
+        const applicableFilters = newConfig.dashboard.sharedFilters.filter(
+          sharedFilter => sharedFilter.usedBy && sharedFilter.usedBy.indexOf(visualizationKey) !== -1
+        )
+
+        if (applicableFilters.length > 0) {
+          const visualization = newConfig.visualizations[visualizationKey]
+          const _newConfigDataSet = newConfig.datasets[visualization.dataKey]
+          const formattedData = getFormattedData(
+            _newConfigDataSet?.data || visualization.data,
+            visualization.dataDescription
+          )
+          const _data = formattedData || (dataOverride || state.data)[visualization.dataKey]
+          newFilteredData[visualizationKey] = filterData(applicableFilters, _data)
+        }
+      })
+
+      newConfig.rows.forEach((row, rowIndex) => {
+        const applicableFilters = newConfig.dashboard.sharedFilters.filter(
+          sharedFilter => sharedFilter.usedBy && sharedFilter.usedBy.indexOf(rowIndex) !== -1
+        )
+
+        if (applicableFilters.length > 0) {
+          const formattedData = getFormattedData(row.data, row.dataDescription)
+          const _data = formattedData || (dataOverride || state.data)[rowIndex]
+          newFilteredData[rowIndex] = filterData(applicableFilters, _data)
+        }
+      })
+    }
+    //Enforce default values that need to be calculated at runtime
+    newConfig.runtime = {}
+    return [newConfig, newFilteredData]
+  }