From 56dc74e09f1665c1030a8e6ccf66e27fb4f24e9b Mon Sep 17 00:00:00 2001 From: Yongjie Zhao Date: Wed, 7 Apr 2021 17:08:24 +0800 Subject: [PATCH] fix: Pie chart not displayed in viz (#13987) --- .../components/controls/VizTypeControl.jsx | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx index df3bfd35dc..c6d267b0db 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx @@ -107,6 +107,11 @@ function VizSupportValidation({ vizType }) { ); } +const nativeFilterGate = behaviors => + !behaviors.includes(Behavior.NATIVE_FILTER) || + (isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) && + behaviors.includes(Behavior.CROSS_FILTER)); + const VizTypeControl = props => { const [showModal, setShowModal] = useState(false); const [filter, setFilter] = useState(''); @@ -168,11 +173,7 @@ const VizTypeControl = props => { const filteredTypes = DEFAULT_ORDER.filter(type => registry.has(type)) .filter(type => { const behaviors = registry.get(type)?.behaviors || []; - return ( - (isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) && - behaviors.includes(Behavior.CROSS_FILTER)) || - !behaviors.length - ); + return nativeFilterGate(behaviors); }) .map(type => ({ key: type, @@ -183,11 +184,7 @@ const VizTypeControl = props => { .entries() .filter(entry => { const behaviors = entry.value?.behaviors || []; - return ( - (isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) && - behaviors.includes(Behavior.CROSS_FILTER)) || - !behaviors.length - ); + return nativeFilterGate(behaviors); }) .filter(({ key }) => !typesWithDefaultOrder.has(key)), )