diff --git a/superset-frontend/src/featureFlags.ts b/superset-frontend/src/featureFlags.ts index ffc1e56d38..46a3455c3e 100644 --- a/superset-frontend/src/featureFlags.ts +++ b/superset-frontend/src/featureFlags.ts @@ -27,7 +27,6 @@ export enum FeatureFlag { SHARE_QUERIES_VIA_KV_STORE = 'SHARE_QUERIES_VIA_KV_STORE', SQLLAB_BACKEND_PERSISTENCE = 'SQLLAB_BACKEND_PERSISTENCE', THUMBNAILS = 'THUMBNAILS', - SIP_34_SAVED_QUERIES_UI = 'SIP_34_SAVED_QUERIES_UI', LISTVIEWS_DEFAULT_CARD_VIEW = 'LISTVIEWS_DEFAULT_CARD_VIEW', } diff --git a/superset-frontend/src/views/CRUD/data/common.ts b/superset-frontend/src/views/CRUD/data/common.ts index 0400a427a3..9b2194a2d3 100644 --- a/superset-frontend/src/views/CRUD/data/common.ts +++ b/superset-frontend/src/views/CRUD/data/common.ts @@ -17,7 +17,6 @@ * under the License. */ import { t } from '@superset-ui/core'; -import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; export const commonMenuData = { name: t('Data'), @@ -38,7 +37,7 @@ export const commonMenuData = { name: 'Saved Queries', label: t('Saved Queries'), url: '/savedqueryview/list/', - usesRouter: isFeatureEnabled(FeatureFlag.SIP_34_SAVED_QUERIES_UI), + usesRouter: true, }, ], }; diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py index 63df0ae0cb..81ec4fe0cb 100644 --- a/superset/views/sql_lab.py +++ b/superset/views/sql_lab.py @@ -23,7 +23,6 @@ from flask_babel import lazy_gettext as _ from superset import app, db from superset.constants import RouteMethod -from superset.extensions import feature_flag_manager from superset.models.sql_lab import Query, SavedQuery, TableSchema, TabState from superset.typing import FlaskResponse from superset.utils import core as utils @@ -79,10 +78,7 @@ class SavedQueryView( @expose("/list/") @has_access def list(self) -> FlaskResponse: - if not ( - app.config["ENABLE_REACT_CRUD_VIEWS"] - and feature_flag_manager.is_feature_enabled("SIP_34_SAVED_QUERIES_UI") - ): + if not app.config["ENABLE_REACT_CRUD_VIEWS"]: return super().list() return super().render_app_template()