From 5a05124ce1fd0fdaa6bdf2d50e7551aa650099ea Mon Sep 17 00:00:00 2001 From: John Bodley <4567245+john-bodley@users.noreply.github.com> Date: Tue, 12 Sep 2023 14:39:38 -0700 Subject: [PATCH] chore: Remove the ability to switch to filter-box chart when DASHBOARD_NATIVE_FILTERS feature is enabled (#25275) (cherry picked from commit 8eff5a75b433592462fba3841419efbe264f9745) --- .../explore/components/controls/VizTypeControl/index.tsx | 9 +++++++++ superset-frontend/src/pages/ChartCreation/index.tsx | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx index bdfcf1e40a87d..ec78b4267d870 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl/index.tsx @@ -23,6 +23,8 @@ import { getChartMetadataRegistry, styled, SupersetTheme, + isFeatureEnabled, + FeatureFlag, } from '@superset-ui/core'; import { usePluginContext } from 'src/components/DynamicPlugins'; import Modal from 'src/components/Modal'; @@ -46,6 +48,13 @@ const bootstrapData = getBootstrapData(); const denyList: string[] = bootstrapData.common.conf.VIZ_TYPE_DENYLIST || []; const metadataRegistry = getChartMetadataRegistry(); +if ( + isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) && + !denyList.includes('filter_box') +) { + denyList.push('filter_box'); +} + export const VIZ_TYPE_CONTROL_TEST_ID = 'viz-type-control'; function VizSupportValidation({ vizType }: { vizType: string }) { diff --git a/superset-frontend/src/pages/ChartCreation/index.tsx b/superset-frontend/src/pages/ChartCreation/index.tsx index 7ff3442c9d7bc..aebb72a7316fa 100644 --- a/superset-frontend/src/pages/ChartCreation/index.tsx +++ b/superset-frontend/src/pages/ChartCreation/index.tsx @@ -70,7 +70,7 @@ const denyList: string[] = bootstrapData.common.conf.VIZ_TYPE_DENYLIST || []; if ( isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) && - !('filter_box' in denyList) + !denyList.includes('filter_box') ) { denyList.push('filter_box'); }