From 98aa3e34fa4ee32e41bfeae0c6f04fc9b570ca9b Mon Sep 17 00:00:00 2001 From: Murad CDC Date: Mon, 21 Jul 2025 15:32:01 -0400 Subject: [PATCH 1/3] Allow Markup Includes & Filtered Text to Blank Out on Reset Value --- packages/dashboard/src/helpers/getVizConfig.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/packages/dashboard/src/helpers/getVizConfig.ts b/packages/dashboard/src/helpers/getVizConfig.ts index da56290c0..8dc8d109e 100644 --- a/packages/dashboard/src/helpers/getVizConfig.ts +++ b/packages/dashboard/src/helpers/getVizConfig.ts @@ -88,6 +88,20 @@ export const getVizConfig = ( } return visConfigWithFootnotes } + // for markup-include & filtered text reset data on Reset Value on Filters + const filters = config.dashboard.sharedFilters + + const isResetActive = filters.some(f => f.resetLabel && f.resetLabel === f.active) + const isMarkupUsed = filters.some(f => f?.usedBy?.includes(visualizationKey)) + const isFilteredTextUsed = filters.some(f => f?.usedBy?.includes(visualizationKey)) + + if ( + visualizationKey.startsWith('markup-include') || + (visualizationKey.startsWith('filtered-text') && isResetActive && (isMarkupUsed || isFilteredTextUsed)) + ) { + visualizationConfig.data = [] + visualizationConfig.formattedData = [] + } return visualizationConfig as AnyVisualization } From ee282fd8508f21c8ed6545ab371ed74b9b15bc53 Mon Sep 17 00:00:00 2001 From: Murad CDC Date: Mon, 21 Jul 2025 15:32:27 -0400 Subject: [PATCH 2/3] Add guards --- packages/dashboard/src/helpers/getVizConfig.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dashboard/src/helpers/getVizConfig.ts b/packages/dashboard/src/helpers/getVizConfig.ts index 8dc8d109e..2cdd11f05 100644 --- a/packages/dashboard/src/helpers/getVizConfig.ts +++ b/packages/dashboard/src/helpers/getVizConfig.ts @@ -91,7 +91,7 @@ export const getVizConfig = ( // for markup-include & filtered text reset data on Reset Value on Filters const filters = config.dashboard.sharedFilters - const isResetActive = filters.some(f => f.resetLabel && f.resetLabel === f.active) + const isResetActive = filters.some(f => f?.resetLabel && f?.resetLabel === f?.active) const isMarkupUsed = filters.some(f => f?.usedBy?.includes(visualizationKey)) const isFilteredTextUsed = filters.some(f => f?.usedBy?.includes(visualizationKey)) From 721393101859e4a0a251d4c97ff69f1037ba7b7e Mon Sep 17 00:00:00 2001 From: Murad CDC Date: Mon, 21 Jul 2025 15:42:27 -0400 Subject: [PATCH 3/3] update logic --- packages/dashboard/src/helpers/getVizConfig.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/dashboard/src/helpers/getVizConfig.ts b/packages/dashboard/src/helpers/getVizConfig.ts index 2cdd11f05..77d0949c5 100644 --- a/packages/dashboard/src/helpers/getVizConfig.ts +++ b/packages/dashboard/src/helpers/getVizConfig.ts @@ -95,10 +95,11 @@ export const getVizConfig = ( const isMarkupUsed = filters.some(f => f?.usedBy?.includes(visualizationKey)) const isFilteredTextUsed = filters.some(f => f?.usedBy?.includes(visualizationKey)) - if ( - visualizationKey.startsWith('markup-include') || - (visualizationKey.startsWith('filtered-text') && isResetActive && (isMarkupUsed || isFilteredTextUsed)) - ) { + if (visualizationKey.startsWith('markup-include') && isResetActive && isMarkupUsed) { + visualizationConfig.data = [] + visualizationConfig.formattedData = [] + } + if (visualizationKey.startsWith('filtered-text') && isResetActive && isFilteredTextUsed) { visualizationConfig.data = [] visualizationConfig.formattedData = [] }