= ({
) : (
<>
- {crossFilters}
+
{filterControls}
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts b/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts
index 232ff57de2ffe..0539a4317a77e 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/selectors.ts
@@ -21,11 +21,9 @@ import {
DataMaskStateWithId,
DataMaskType,
ensureIsArray,
- FeatureFlag,
Filters,
FilterState,
getColumnLabel,
- isFeatureEnabled,
NativeFilterType,
NO_TIME_RANGE,
QueryFormColumn,
@@ -289,39 +287,37 @@ export const selectChartCrossFilters = (
filterEmitter = false,
): Indicator[] | CrossFilterIndicator[] => {
let crossFilterIndicators: any = [];
- if (isFeatureEnabled(FeatureFlag.DashboardCrossFilters)) {
- crossFilterIndicators = Object.values(chartConfiguration)
- .filter(chartConfig => {
- const inScope =
- chartConfig.crossFilters?.chartsInScope?.includes(chartId);
- if (!filterEmitter && inScope) {
- return true;
- }
- if (filterEmitter && !inScope) {
- return true;
- }
- return false;
- })
- .map(chartConfig => {
- const filterIndicator = getCrossFilterIndicator(
- Number(chartConfig.id),
- dataMask[chartConfig.id],
- chartLayoutItems,
- );
- const filterStatus = getStatus({
- label: filterIndicator.value,
- column: filterIndicator.column
- ? getColumnLabel(filterIndicator.column)
- : undefined,
- type: DataMaskType.CrossFilters,
- appliedColumns,
- rejectedColumns,
- });
+ crossFilterIndicators = Object.values(chartConfiguration)
+ .filter(chartConfig => {
+ const inScope =
+ chartConfig.crossFilters?.chartsInScope?.includes(chartId);
+ if (!filterEmitter && inScope) {
+ return true;
+ }
+ if (filterEmitter && !inScope) {
+ return true;
+ }
+ return false;
+ })
+ .map(chartConfig => {
+ const filterIndicator = getCrossFilterIndicator(
+ Number(chartConfig.id),
+ dataMask[chartConfig.id],
+ chartLayoutItems,
+ );
+ const filterStatus = getStatus({
+ label: filterIndicator.value,
+ column: filterIndicator.column
+ ? getColumnLabel(filterIndicator.column)
+ : undefined,
+ type: DataMaskType.CrossFilters,
+ appliedColumns,
+ rejectedColumns,
+ });
- return { ...filterIndicator, status: filterStatus };
- })
- .filter(filter => filter.status === IndicatorStatus.CrossFilterApplied);
- }
+ return { ...filterIndicator, status: filterStatus };
+ })
+ .filter(filter => filter.status === IndicatorStatus.CrossFilterApplied);
return crossFilterIndicators;
};
@@ -379,16 +375,14 @@ export const selectNativeIndicatorsForChart = (
});
let crossFilterIndicators: any = [];
- if (isFeatureEnabled(FeatureFlag.DashboardCrossFilters)) {
- crossFilterIndicators = selectChartCrossFilters(
- dataMask,
- chartId,
- chartLayoutItems,
- chartConfiguration,
- appliedColumns,
- rejectedColumns,
- );
- }
+ crossFilterIndicators = selectChartCrossFilters(
+ dataMask,
+ chartId,
+ chartLayoutItems,
+ chartConfiguration,
+ appliedColumns,
+ rejectedColumns,
+ );
const indicators = crossFilterIndicators.concat(nativeFilterIndicators);
cachedNativeIndicatorsForChart[chartId] = indicators;
cachedNativeFilterDataForChart[chartId] = {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts
index db21db547d597..fa27873732814 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.test.ts
@@ -45,6 +45,12 @@ describe('nativeFilterGate', () => {
});
it('should return false for native filter chart with cross filter support', () => {
+ isFeatureEnabledMock.mockImplementation(feature => {
+ if (feature === FeatureFlag.DASHBOARD_CROSS_FILTERS) return false;
+ if (feature === FeatureFlag.DASHBOARD_NATIVE_FILTERS) return false;
+ return false;
+ });
+
expect(
nativeFilterGate([Behavior.NativeFilter, Behavior.InteractiveChart]),
).toEqual(false);
@@ -59,9 +65,11 @@ describe('nativeFilterGate', () => {
beforeAll(() => {
isFeatureEnabledMock = jest
.spyOn(uiCore, 'isFeatureEnabled')
- .mockImplementation((featureFlag: FeatureFlag) =>
- [FeatureFlag.DashboardCrossFilters].includes(featureFlag),
- );
+ .mockImplementation(feature => {
+ if (feature === FeatureFlag.DASHBOARD_CROSS_FILTERS) return true;
+ if (feature === FeatureFlag.DASHBOARD_NATIVE_FILTERS) return true;
+ return false;
+ });
});
afterAll(() => {
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
index 734e0ce91fe9d..868803254c88c 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
+++ b/superset-frontend/src/dashboard/components/nativeFilters/utils.ts
@@ -23,12 +23,12 @@ import {
EXTRA_FORM_DATA_APPEND_KEYS,
EXTRA_FORM_DATA_OVERRIDE_KEYS,
ExtraFormData,
- isFeatureEnabled,
- FeatureFlag,
Filter,
getChartMetadataRegistry,
QueryFormData,
t,
+ isFeatureEnabled,
+ FeatureFlag,
} from '@superset-ui/core';
import { LayoutItem } from 'src/dashboard/types';
import extractUrlParams from 'src/dashboard/util/extractUrlParams';
@@ -148,11 +148,22 @@ export function getExtraFormData(
}
export function nativeFilterGate(behaviors: Behavior[]): boolean {
- return (
- !behaviors.includes(Behavior.NativeFilter) ||
- (isFeatureEnabled(FeatureFlag.DashboardCrossFilters) &&
- behaviors.includes(Behavior.InteractiveChart))
- );
+ const hasNativeFilter = behaviors.includes(Behavior.NativeFilter);
+
+ // If it's not a native filter, always allow
+ if (!hasNativeFilter) {
+ return true;
+ }
+
+ // Native filters are not allowed when feature flags are disabled
+ if (!isFeatureEnabled(FeatureFlag.DASHBOARD_NATIVE_FILTERS)) {
+ return false;
+ }
+
+ // When feature flag is enabled:
+ // - Pure native filters are not allowed
+ // - Native filters with interactive chart behavior are allowed
+ return behaviors.includes(Behavior.InteractiveChart);
}
export const findTabsWithChartsInScope = (
diff --git a/superset-frontend/src/dashboard/util/crossFilters.test.ts b/superset-frontend/src/dashboard/util/crossFilters.test.ts
index 07e8064e7d00e..06a3aa2069f99 100644
--- a/superset-frontend/src/dashboard/util/crossFilters.test.ts
+++ b/superset-frontend/src/dashboard/util/crossFilters.test.ts
@@ -17,7 +17,7 @@
* under the License.
*/
import sinon, { SinonStub } from 'sinon';
-import { Behavior, FeatureFlag } from '@superset-ui/core';
+import { Behavior } from '@superset-ui/core';
import * as core from '@superset-ui/core';
import { getCrossFiltersConfiguration } from './crossFilters';
import { DEFAULT_CROSS_FILTER_SCOPING } from '../constants';
@@ -146,11 +146,6 @@ afterEach(() => {
});
test('Generate correct cross filters configuration without initial configuration', () => {
- // @ts-ignore
- global.featureFlags = {
- [FeatureFlag.DashboardCrossFilters]: true,
- };
-
// @ts-ignore
expect(getCrossFiltersConfiguration(DASHBOARD_LAYOUT, {}, CHARTS)).toEqual({
chartConfiguration: {
@@ -180,11 +175,6 @@ test('Generate correct cross filters configuration without initial configuration
});
test('Generate correct cross filters configuration with initial configuration', () => {
- // @ts-ignore
- global.featureFlags = {
- [FeatureFlag.DashboardCrossFilters]: true,
- };
-
expect(
getCrossFiltersConfiguration(
DASHBOARD_LAYOUT,
@@ -221,25 +211,7 @@ test('Generate correct cross filters configuration with initial configuration',
});
});
-test('Return undefined if DASHBOARD_CROSS_FILTERS feature flag is disabled', () => {
- // @ts-ignore
- global.featureFlags = {
- [FeatureFlag.DashboardCrossFilters]: false,
- };
- expect(
- getCrossFiltersConfiguration(
- DASHBOARD_LAYOUT,
- CHART_CONFIG_METADATA,
- CHARTS,
- ),
- ).toEqual(undefined);
-});
-
test('Recalculate charts in global filter scope when charts change', () => {
- // @ts-ignore
- global.featureFlags = {
- [FeatureFlag.DashboardCrossFilters]: true,
- };
expect(
getCrossFiltersConfiguration(
{
diff --git a/superset-frontend/src/dashboard/util/crossFilters.ts b/superset-frontend/src/dashboard/util/crossFilters.ts
index 123435a430a1f..04d3e368fc0c9 100644
--- a/superset-frontend/src/dashboard/util/crossFilters.ts
+++ b/superset-frontend/src/dashboard/util/crossFilters.ts
@@ -19,10 +19,8 @@
import { cloneDeep } from 'lodash';
import {
Behavior,
- FeatureFlag,
getChartMetadataRegistry,
isDefined,
- isFeatureEnabled,
} from '@superset-ui/core';
import { getChartIdsInFilterScope } from './getChartIdsInFilterScope';
import {
@@ -38,8 +36,7 @@ import { CHART_TYPE } from './componentTypes';
export const isCrossFiltersEnabled = (
metadataCrossFiltersEnabled: boolean | undefined,
): boolean =>
- isFeatureEnabled(FeatureFlag.DashboardCrossFilters) &&
- (metadataCrossFiltersEnabled === undefined || metadataCrossFiltersEnabled);
+ metadataCrossFiltersEnabled === undefined || metadataCrossFiltersEnabled;
export const getCrossFiltersConfiguration = (
dashboardLayout: DashboardLayout,
@@ -49,10 +46,6 @@ export const getCrossFiltersConfiguration = (
>,
charts: ChartsState,
) => {
- if (!isFeatureEnabled(FeatureFlag.DashboardCrossFilters)) {
- return undefined;
- }
-
const chartLayoutItems = Object.values(dashboardLayout).filter(
item => item?.type === CHART_TYPE,
);
diff --git a/superset-frontend/src/dataMask/reducer.ts b/superset-frontend/src/dataMask/reducer.ts
index b79f17fb1dbec..6d240b498953e 100644
--- a/superset-frontend/src/dataMask/reducer.ts
+++ b/superset-frontend/src/dataMask/reducer.ts
@@ -24,8 +24,6 @@ import {
DataMask,
DataMaskStateWithId,
DataMaskWithId,
- isFeatureEnabled,
- FeatureFlag,
Filter,
FilterConfiguration,
Filters,
@@ -148,16 +146,14 @@ const dataMaskReducer = produce(
// TODO: update hydrate to .ts
// @ts-ignore
case HYDRATE_DASHBOARD:
- if (isFeatureEnabled(FeatureFlag.DashboardCrossFilters)) {
- Object.keys(
- // @ts-ignore
- action.data.dashboardInfo?.metadata?.chart_configuration,
- ).forEach(id => {
- cleanState[id] = {
- ...getInitialDataMask(id), // take initial data
- };
- });
- }
+ Object.keys(
+ // @ts-ignore
+ action.data.dashboardInfo?.metadata?.chart_configuration,
+ ).forEach(id => {
+ cleanState[id] = {
+ ...getInitialDataMask(id), // take initial data
+ };
+ });
fillNativeFilters(
// @ts-ignore
action.data.dashboardInfo?.metadata?.native_filter_configuration ??
diff --git a/superset/config.py b/superset/config.py
index 7ab30185bceb4..3c2b0fd3bfa48 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -491,7 +491,6 @@ class D3TimeFormat(TypedDict, total=False):
"LISTVIEWS_DEFAULT_CARD_VIEW": False,
# When True, this escapes HTML (rather than rendering it) in Markdown components
"ESCAPE_MARKDOWN_HTML": False,
- "DASHBOARD_CROSS_FILTERS": True, # deprecated
"DASHBOARD_VIRTUALIZATION": True,
# This feature flag is stil in beta and is not recommended for production use.
"GLOBAL_ASYNC_QUERIES": False,