QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(native-filters): remove indicators outside scope (#14838)

Browse Source 
* fix(native-filters): remove indicators outside scope

* lint
This commit is contained in:
Ville Brofeldt
2021-05-27 07:53:52 +03:00
committed by GitHub
parent 80d22f5b33
commit bd2c087f78
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts
View File

@@ -192,20 +192,15 @@ export const selectNativeIndicatorsForChart = (
const getStatus = ({
value,
isAffectedByScope,
column,
type = DataMaskType.NativeFilters,
}: {
value: any;
isAffectedByScope: boolean;
column?: string;
type?: DataMaskType;
}): IndicatorStatus => {
// a filter is only considered unset if it's value is null
const hasValue = value !== null;
if (!isAffectedByScope) {
return IndicatorStatus.Unset;
}
if (type === DataMaskType.CrossFilters && hasValue) {
return IndicatorStatus.CrossFilterApplied;
}
@@ -223,14 +218,13 @@ export const selectNativeIndicatorsForChart = (
let nativeFilterIndicators: any = [];
if (isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS)) {
nativeFilterIndicators = Object.values(nativeFilters.filters).map(
nativeFilter => {
const isAffectedByScope = getTreeCheckedItems(
nativeFilter.scope,
dashboardLayout,
).some(
nativeFilterIndicators = Object.values(nativeFilters.filters)
.filter(nativeFilter =>
getTreeCheckedItems(nativeFilter.scope, dashboardLayout).some(
layoutItem => dashboardLayout[layoutItem]?.meta?.chartId === chartId,
);
),
)
.map(nativeFilter => {
const column = nativeFilter.targets[0]?.column?.name;
let value = dataMask[nativeFilter.id]?.filterState?.value ?? null;
if (!Array.isArray(value) && value !== null) {
@@ -240,25 +234,24 @@ export const selectNativeIndicatorsForChart = (
column,
name: nativeFilter.name,
path: [nativeFilter.id],
status: getStatus({ value, isAffectedByScope, column }),
status: getStatus({ value, column }),
value,
};
},
);
});
}
let crossFilterIndicators: any = [];
if (isFeatureEnabled(FeatureFlag.DASHBOARD_CROSS_FILTERS)) {
crossFilterIndicators = Object.values(chartConfiguration)
.map(chartConfig => {
const scope = chartConfig?.crossFilters?.scope;
const isAffectedByScope = getTreeCheckedItems(
scope,
.filter(chartConfig =>
getTreeCheckedItems(
chartConfig?.crossFilters?.scope,
dashboardLayout,
).some(
layoutItem => dashboardLayout[layoutItem]?.meta?.chartId === chartId,
);
),
)
.map(chartConfig => {
let value = dataMask[chartConfig.id]?.filterState?.value ?? null;
if (!Array.isArray(value) && value !== null) {
value = [value];
@@ -270,7 +263,6 @@ export const selectNativeIndicatorsForChart = (
path: [`${chartConfig.id}`],
status: getStatus({
value,
isAffectedByScope,
type: DataMaskType.CrossFilters,
}),
value,