Skip to content

Commit b06ab7d

Browse files
refactor: Removes the deprecated ENABLE_TEMPLATE_REMOVE_FILTERS feature flag (#26345)
1 parent 6443001 commit b06ab7d

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

RESOURCES/FEATURE_FLAGS.md

-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ These features flags currently default to True and **will be removed in a future
8888
- DASHBOARD_NATIVE_FILTERS
8989
- ENABLE_EXPLORE_JSON_CSRF_PROTECTION
9090
- ENABLE_JAVASCRIPT_CONTROLS
91-
- ENABLE_TEMPLATE_REMOVE_FILTERS
9291
- GENERIC_CHART_AXES
9392
- KV_STORE
9493
- VERSIONED_EXPORT

UPDATING.md

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ assists people when migrating to a new version.
3030

3131
### Breaking Changes
3232

33+
- [26345](https://github.com/apache/superset/issues/26345): Removes the deprecated `ENABLE_TEMPLATE_REMOVE_FILTERS` feature flag. The previous value of the feature flag was `True` and now the feature is permanently enabled.
3334
- [26346](https://github.com/apache/superset/issues/26346): Removes the deprecated `REMOVE_SLICE_LEVEL_LABEL_COLORS` feature flag. The previous value of the feature flag was `False` and now the feature is permanently removed.
3435
- [26348](https://github.com/apache/superset/issues/26348): Removes the deprecated `CLIENT_CACHE` feature flag. The previous value of the feature flag was `False` and now the feature is permanently removed.
3536
- [26349](https://github.com/apache/superset/issues/26349): Removes the deprecated `DASHBOARD_CACHE` feature flag. The previous value of the feature flag was `False` and now the feature is permanently removed.

superset-frontend/packages/superset-ui-core/src/utils/featureFlags.ts

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ export enum FeatureFlag {
4444
/** @deprecated */
4545
ENABLE_JAVASCRIPT_CONTROLS = 'ENABLE_JAVASCRIPT_CONTROLS',
4646
ENABLE_TEMPLATE_PROCESSING = 'ENABLE_TEMPLATE_PROCESSING',
47-
ENABLE_TEMPLATE_REMOVE_FILTERS = 'ENABLE_TEMPLATE_REMOVE_FILTERS',
4847
ESCAPE_MARKDOWN_HTML = 'ESCAPE_MARKDOWN_HTML',
4948
ESTIMATE_QUERY_COST = 'ESTIMATE_QUERY_COST',
5049
GENERIC_CHART_AXES = 'GENERIC_CHART_AXES',

superset/config.py

-1
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,6 @@ class D3Format(TypedDict, total=False):
418418
# See `PR 7935 <https://github.com/apache/superset/pull/7935>`_ for more details.
419419
"ENABLE_EXPLORE_JSON_CSRF_PROTECTION": False, # deprecated
420420
"ENABLE_TEMPLATE_PROCESSING": False,
421-
"ENABLE_TEMPLATE_REMOVE_FILTERS": True, # deprecated
422421
# Allow for javascript controls components
423422
# this enables programmers to customize certain charts (like the
424423
# geospatial ones) by inputting javascript in controls. This exposes

superset/models/helpers.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1760,10 +1760,9 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma
17601760
col_obj = columns_by_name.get(cast(str, flt_col))
17611761
filter_grain = flt.get("grain")
17621762

1763-
if is_feature_enabled("ENABLE_TEMPLATE_REMOVE_FILTERS"):
1764-
if get_column_name(flt_col) in removed_filters:
1765-
# Skip generating SQLA filter when the jinja template handles it.
1766-
continue
1763+
if get_column_name(flt_col) in removed_filters:
1764+
# Skip generating SQLA filter when the jinja template handles it.
1765+
continue
17671766

17681767
if col_obj or sqla_col is not None:
17691768
if sqla_col is not None:

0 commit comments

Comments
 (0)