@@ -71,7 +71,7 @@ import { DEFAULT_CHART_CONFIG } from './ChartUtils';
7171import { IS_LOCAL_MODE } from './config' ;
7272import { useDashboard } from './dashboard' ;
7373import DashboardFilters from './DashboardFilters' ;
74- import DashboardFiltersEditModal from './DashboardFiltersEditModal ' ;
74+ import DashboardFiltersModal from './DashboardFiltersModal ' ;
7575import { GranularityPickerControlled } from './GranularityPicker' ;
7676import HDXMarkdownChart from './HDXMarkdownChart' ;
7777import { withAppNav } from './layout' ;
@@ -517,6 +517,8 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
517517 dashboardHash,
518518 isLocalDashboard,
519519 isLocalDashboardEmpty,
520+ isFetching : isFetchingDashboard ,
521+ isSetting : isSavingDashboard ,
520522 } = useDashboard ( {
521523 dashboardId : dashboardId as string | undefined ,
522524 presetConfig,
@@ -562,7 +564,7 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
562564 parseAsString . withDefault ( 'lucene' ) ,
563565 ) ;
564566
565- const [ showVariablesModal , setShowVariablesModal ] = useState ( false ) ;
567+ const [ showFiltersModal , setShowFiltersModal ] = useState ( false ) ;
566568
567569 const filters = dashboard ?. filters ?? [ ] ;
568570 const { filterValues, setFilterValue, filterQueries } =
@@ -1084,7 +1086,7 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
10841086 color = "gray"
10851087 px = "xs"
10861088 mr = { 6 }
1087- onClick = { ( ) => setShowVariablesModal ( true ) }
1089+ onClick = { ( ) => setShowFiltersModal ( true ) }
10881090 >
10891091 < IconFilterEdit strokeWidth = { 1 } />
10901092 </ Button >
@@ -1161,12 +1163,13 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
11611163 >
11621164 + Add New Tile
11631165 </ Button >
1164- < DashboardFiltersEditModal
1165- opened = { showVariablesModal }
1166- onClose = { ( ) => setShowVariablesModal ( false ) }
1166+ < DashboardFiltersModal
1167+ opened = { showFiltersModal }
1168+ onClose = { ( ) => setShowFiltersModal ( false ) }
11671169 filters = { filters }
11681170 onSaveFilter = { handleSaveFilter }
11691171 onRemoveFilter = { handleRemoveFilter }
1172+ isLoading = { isSavingDashboard || isFetchingDashboard }
11701173 />
11711174 </ Box >
11721175 ) ;
0 commit comments