iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(cross-filters): only apply filters if ff is set (#13704) 

* fix(cross-filters): only apply filters if ff is set

* fix missing parent
This commit is contained in:
Ville Brofeldt 2021-03-20 10:56:02 +02:00 committed by GitHub
parent 95a017aa2d
commit 1a67f1564c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/state.ts
View File

@ -51,8 +51,9 @@ export function useFilterScopeTree(
const validNodes = useMemo(
() =>
Object.values(layout).reduce<string[]>((acc, cur) => {
if (cur?.type === CHART_TYPE && currentChartId !== cur?.meta?.chartId) {
return [...new Set([...acc, ...cur?.parents, cur.id])];
const { id, parents = [], type, meta } = cur;
if (type === CHART_TYPE && currentChartId !== meta?.chartId) {
return [...new Set([...acc, ...parents, id])];
}
return acc;
}, []),

15
superset-frontend/src/dataMask/actions.ts
View File

@ -18,6 +18,7 @@
*/
import { DataMaskType, MaskWithId } from './types';
import { FilterConfiguration } from '../dashboard/components/nativeFilters/types';
import { FeatureFlag, isFeatureEnabled } from '../featureFlags';
export const UPDATE_DATA_MASK = 'UPDATE_DATA_MASK';
export interface UpdateDataMask {
@ -50,10 +51,22 @@ export function updateDataMask(
ownFilters?: Omit<MaskWithId, 'id'>;
},
): UpdateDataMask {
const { nativeFilters, crossFilters, ownFilters } = dataMask;
const filteredDataMask: {
nativeFilters?: Omit<MaskWithId, 'id'>;
crossFilters?: Omit<MaskWithId, 'id'>;
ownFilters?: Omit<MaskWithId, 'id'>;
} = { ownFilters };
if (isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS) && nativeFilters) {
filteredDataMask.nativeFilters = nativeFilters;
}
if (isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS) && crossFilters) {
filteredDataMask.crossFilters = crossFilters;
}
return {
type: UPDATE_DATA_MASK,
filterId,
...dataMask,
...filteredDataMask,
};
}