This is an automated email from the ASF dual-hosted git repository. rusackas pushed a commit to branch fix/13863 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 5a049d70ec4284c07b5884b26b0929d0ab3e554c Author: Evan Rusackas <[email protected]> AuthorDate: Tue Mar 30 23:06:51 2021 -0700 fix: Consistent left margin for dashboard layout. Fixes #13863 --- .../components/DashboardBuilder/DashboardBuilder.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx index 17a2362..b532b3b 100644 --- a/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx +++ b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.tsx @@ -112,6 +112,10 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => { const filters = useFilters(); const filterValues = Object.values<Filter>(filters); + const nativeFiltersEnabled = isFeatureEnabled( + FeatureFlag.DASHBOARD_NATIVE_FILTERS, + ); + const [dashboardFiltersOpen, setDashboardFiltersOpen] = useState(true); const toggleDashboardFiltersOpen = (visible?: boolean) => { @@ -150,7 +154,11 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => { (topLevelTabs ? TABS_HEIGHT : 0); useEffect(() => { - if (filterValues.length === 0 && dashboardFiltersOpen) { + if ( + filterValues.length === 0 && + dashboardFiltersOpen && + nativeFiltersEnabled + ) { toggleDashboardFiltersOpen(false); } }, [filterValues.length]); @@ -215,7 +223,7 @@ const DashboardBuilder: FC<DashboardBuilderProps> = () => { className="dashboard-content" dashboardFiltersOpen={dashboardFiltersOpen} > - {isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) && !editMode && ( + {nativeFiltersEnabled && !editMode && ( <StickyVerticalBar filtersOpen={dashboardFiltersOpen} topOffset={barTopOffset}
