mirror of
https://github.com/apache/superset.git
synced 2024-09-12 00:29:39 -04:00
fix(native-filters): Don't send unnecessary PUT request on dashboard render (#15146)
* fix(native-filters): Don't send unnecessary PUT request on dashboard render * Run native filters scopes only if feature flag is enabled * Change action name * Run native filters scopes only if at least 1 filter added * Fix lint
This commit is contained in:
parent
57035c1b93
commit
3866044938
@ -49,6 +49,11 @@ export interface SetFilterConfigFail {
|
||||
type: typeof SET_FILTER_CONFIG_FAIL;
|
||||
filterConfig: FilterConfiguration;
|
||||
}
|
||||
export const SET_IN_SCOPE_STATUS_OF_FILTERS = 'SET_IN_SCOPE_STATUS_OF_FILTERS';
|
||||
export interface SetInScopeStatusOfFilters {
|
||||
type: typeof SET_IN_SCOPE_STATUS_OF_FILTERS;
|
||||
filterConfig: FilterConfiguration;
|
||||
}
|
||||
export const SET_FILTER_SETS_CONFIG_BEGIN = 'SET_FILTER_SETS_CONFIG_BEGIN';
|
||||
export interface SetFilterSetsConfigBegin {
|
||||
type: typeof SET_FILTER_SETS_CONFIG_BEGIN;
|
||||
@ -124,6 +129,25 @@ export const setFilterConfiguration = (
|
||||
}
|
||||
};
|
||||
|
||||
export const setInScopeStatusOfFilters = (
|
||||
filterScopes: {
|
||||
filterId: string;
|
||||
chartsInScope: number[];
|
||||
tabsInScope: string[];
|
||||
}[],
|
||||
) => async (dispatch: Dispatch, getState: () => any) => {
|
||||
const filters = getState().nativeFilters?.filters;
|
||||
const filtersWithScopes = filterScopes.map(scope => ({
|
||||
...filters[scope.filterId],
|
||||
chartsInScope: scope.chartsInScope,
|
||||
tabsInScope: scope.tabsInScope,
|
||||
}));
|
||||
dispatch({
|
||||
type: SET_IN_SCOPE_STATUS_OF_FILTERS,
|
||||
filterConfig: filtersWithScopes,
|
||||
});
|
||||
};
|
||||
|
||||
type BootstrapData = {
|
||||
nativeFilters: {
|
||||
filters: Filters;
|
||||
@ -227,6 +251,7 @@ export type AnyFilterAction =
|
||||
| SetFilterSetsConfigBegin
|
||||
| SetFilterSetsConfigComplete
|
||||
| SetFilterSetsConfigFail
|
||||
| SetInScopeStatusOfFilters
|
||||
| SaveFilterSets
|
||||
| SetBootstrapData
|
||||
| SetFocusedNativeFilter
|
||||
|
@ -18,10 +18,11 @@
|
||||
*/
|
||||
// ParentSize uses resize observer so the dashboard will update size
|
||||
// when its container size changes, due to e.g., builder side panel opening
|
||||
import { ParentSize } from '@vx/responsive';
|
||||
import Tabs from 'src/components/Tabs';
|
||||
import React, { FC, useEffect, useState } from 'react';
|
||||
import { useDispatch, useSelector } from 'react-redux';
|
||||
import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
|
||||
import { ParentSize } from '@vx/responsive';
|
||||
import Tabs from 'src/components/Tabs';
|
||||
import DashboardGrid from 'src/dashboard/containers/DashboardGrid';
|
||||
import getLeafComponentIdFromPath from 'src/dashboard/util/getLeafComponentIdFromPath';
|
||||
import { DashboardLayout, LayoutItem, RootState } from 'src/dashboard/types';
|
||||
@ -33,7 +34,7 @@ import { getRootLevelTabIndex } from './utils';
|
||||
import { Filters } from '../../reducers/types';
|
||||
import { getChartIdsInFilterScope } from '../../util/activeDashboardFilters';
|
||||
import { findTabsWithChartsInScope } from '../nativeFilters/utils';
|
||||
import { setFilterConfiguration } from '../../actions/nativeFilters';
|
||||
import { setInScopeStatusOfFilters } from '../../actions/nativeFilters';
|
||||
|
||||
type DashboardContainerProps = {
|
||||
topLevelTabs?: LayoutItem;
|
||||
@ -43,9 +44,9 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
|
||||
const dashboardLayout = useSelector<RootState, DashboardLayout>(
|
||||
state => state.dashboardLayout.present,
|
||||
);
|
||||
const nativeFilters = useSelector<RootState, Filters>(
|
||||
state => state.nativeFilters.filters,
|
||||
);
|
||||
const nativeFilters =
|
||||
useSelector<RootState, Filters>(state => state.nativeFilters?.filters) ??
|
||||
{};
|
||||
const directPathToChild = useSelector<RootState, string[]>(
|
||||
state => state.dashboardState.directPathToChild,
|
||||
);
|
||||
@ -63,9 +64,15 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
|
||||
const nativeFiltersValues = Object.values(nativeFilters);
|
||||
const scopes = nativeFiltersValues.map(filter => filter.scope);
|
||||
useEffect(() => {
|
||||
nativeFiltersValues.forEach(filter => {
|
||||
if (
|
||||
!isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) ||
|
||||
nativeFiltersValues.length === 0
|
||||
) {
|
||||
return;
|
||||
}
|
||||
const filterScopes = nativeFiltersValues.map(filter => {
|
||||
const filterScope = filter.scope;
|
||||
const chartsInScope = getChartIdsInFilterScope({
|
||||
const chartsInScope: number[] = getChartIdsInFilterScope({
|
||||
filterScope: {
|
||||
scope: filterScope.rootPath,
|
||||
// @ts-ignore
|
||||
@ -76,12 +83,13 @@ const DashboardContainer: FC<DashboardContainerProps> = ({ topLevelTabs }) => {
|
||||
dashboardLayout,
|
||||
chartsInScope,
|
||||
);
|
||||
Object.assign(filter, {
|
||||
chartsInScope,
|
||||
return {
|
||||
filterId: filter.id,
|
||||
tabsInScope: Array.from(tabsInScope),
|
||||
});
|
||||
chartsInScope,
|
||||
};
|
||||
});
|
||||
dispatch(setFilterConfiguration(nativeFiltersValues));
|
||||
dispatch(setInScopeStatusOfFilters(filterScopes));
|
||||
}, [JSON.stringify(scopes), JSON.stringify(dashboardLayout)]);
|
||||
|
||||
const childIds: string[] = topLevelTabs
|
||||
|
@ -20,6 +20,7 @@ import {
|
||||
AnyFilterAction,
|
||||
SAVE_FILTER_SETS,
|
||||
SET_FILTER_CONFIG_COMPLETE,
|
||||
SET_IN_SCOPE_STATUS_OF_FILTERS,
|
||||
SET_FILTER_SETS_CONFIG_COMPLETE,
|
||||
SET_FOCUSED_NATIVE_FILTER,
|
||||
UNSET_FOCUSED_NATIVE_FILTER,
|
||||
@ -92,6 +93,7 @@ export default function nativeFilterReducer(
|
||||
};
|
||||
|
||||
case SET_FILTER_CONFIG_COMPLETE:
|
||||
case SET_IN_SCOPE_STATUS_OF_FILTERS:
|
||||
return getInitialState({ filterConfig: action.filterConfig, state });
|
||||
|
||||
case SET_FILTER_SETS_CONFIG_COMPLETE:
|
||||
|
Loading…
Reference in New Issue
Block a user