diff --git a/superset-frontend/src/dashboard/constants.ts b/superset-frontend/src/dashboard/constants.ts index ecc893bcb7..d4e5fed4b6 100644 --- a/superset-frontend/src/dashboard/constants.ts +++ b/superset-frontend/src/dashboard/constants.ts @@ -1,4 +1,4 @@ -import { DatasourceType } from '@superset-ui/core'; +import { DatasourceType, NativeFilterScope } from '@superset-ui/core'; import { Datasource } from 'src/dashboard/types'; import { DASHBOARD_ROOT_ID } from './util/constants'; /** @@ -44,7 +44,7 @@ export const FILTER_BAR_TABS_HEIGHT = 46; export const BUILDER_SIDEPANEL_WIDTH = 374; export const OVERWRITE_INSPECT_FIELDS = ['css', 'json_metadata.filter_scopes']; -export const DEFAULT_CROSS_FILTER_SCOPING = { +export const DEFAULT_CROSS_FILTER_SCOPING: NativeFilterScope = { rootPath: [DASHBOARD_ROOT_ID], excluded: [], }; diff --git a/superset-frontend/src/dashboard/util/crossFilters.ts b/superset-frontend/src/dashboard/util/crossFilters.ts index 425c725989..8e1a706286 100644 --- a/superset-frontend/src/dashboard/util/crossFilters.ts +++ b/superset-frontend/src/dashboard/util/crossFilters.ts @@ -52,7 +52,7 @@ export const getCrossFiltersConfiguration = ( return undefined; } - const globalChartConfiguration = metadata.global_chart_configuration + const globalChartConfiguration = metadata.global_chart_configuration?.scope ? { scope: metadata.global_chart_configuration.scope, chartsInScope: getChartIdsInFilterScope(