remove from api

apache · Apr 4, 2023 · 4017244 · 4017244
1 parent 1a1ee73
commit 4017244
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 39 deletions.
diff --git a/superset/charts/api.py b/superset/charts/api.py
@@ -145,8 +145,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "query_context",
         "is_managed_externally",
     ]
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        show_columns += ["tags.id", "tags.name", "tags.type"]
+
+    show_columns += ["tags.id", "tags.name", "tags.type"]
 
     show_select_columns = show_columns + ["table.id"]
     list_columns = [
@@ -195,8 +195,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "url",
         "viz_type",
     ]
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        list_columns += ["tags.id", "tags.name", "tags.type"]
+    list_columns += ["tags.id", "tags.name", "tags.type"]
     list_select_columns = list_columns + ["changed_by_fk", "changed_on"]
     order_columns = [
         "changed_by.first_name",
@@ -225,8 +224,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "slice_name",
         "viz_type",
     ]
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        search_columns += ["tags"]
+    search_columns += ["tags"]
     base_order = ("changed_on", "desc")
     base_filters = [["id", ChartFilter, lambda: []]]
     search_filters = {
@@ -238,8 +236,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "slice_name": [ChartAllTextFilter],
         "created_by": [ChartHasCreatedByFilter, ChartCreatedByMeFilter],
     }
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        search_filters["tags"] = [ChartTagFilter]
+    search_filters["tags"] = [ChartTagFilter]
 
     # Will just affect _info endpoint
     edit_columns = ["slice_name"]

diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
@@ -190,8 +190,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "roles.name",
         "is_managed_externally",
     ]
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        list_columns += ["tags.id", "tags.name", "tags.type"]
+    list_columns += ["tags.id", "tags.name", "tags.type"]
     list_select_columns = list_columns + ["changed_on", "created_on", "changed_by_fk"]
     order_columns = [
         "changed_by.first_name",
@@ -217,28 +216,15 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
     edit_columns = add_columns
 
     search_columns = (
-        (
-            "created_by",
-            "changed_by",
-            "dashboard_title",
-            "id",
-            "owners",
-            "published",
-            "roles",
-            "slug",
-            "tags",
-        )
-        if is_feature_enabled("TAGGING_SYSTEM")
-        else (
-            "created_by",
-            "changed_by",
-            "dashboard_title",
-            "id",
-            "owners",
-            "published",
-            "roles",
-            "slug",
-        )
+        "created_by",
+        "changed_by",
+        "dashboard_title",
+        "id",
+        "owners",
+        "published",
+        "roles",
+        "slug",
+        "tags",
     )
     search_filters = {
         "dashboard_title": [DashboardTitleOrSlugFilter],

diff --git a/superset/queries/saved_queries/api.py b/superset/queries/saved_queries/api.py
@@ -26,7 +26,6 @@
 from flask_appbuilder.models.sqla.interface import SQLAInterface
 from flask_babel import ngettext
 
-from superset import is_feature_enabled
 from superset.commands.importers.exceptions import (
     IncorrectFormatError,
     NoValidFilesFoundError,
@@ -119,8 +118,7 @@ class SavedQueryRestApi(BaseSupersetModelRestApi):
         "sql",
         "sql_tables",
     ]
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        list_columns += ["tags.id", "tags.name", "tags.type"]
+    list_columns += ["tags.id", "tags.name", "tags.type"]
     list_select_columns = list_columns + ["changed_by_fk", "changed_on"]
     add_columns = [
         "db_id",
@@ -145,14 +143,13 @@ class SavedQueryRestApi(BaseSupersetModelRestApi):
     ]
 
     search_columns = ["id", "database", "label", "schema", "created_by"]
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        search_columns += ["tags"]
+    search_columns += ["tags"]
     search_filters = {
         "id": [SavedQueryFavoriteFilter],
         "label": [SavedQueryAllTextFilter],
     }
-    if is_feature_enabled("TAGGING_SYSTEM"):
-        search_filters["tags"] = [SavedQueryTagFilter]
+
+    search_filters["tags"] = [SavedQueryTagFilter]
 
     apispec_parameter_schemas = {
         "get_delete_ids_schema": get_delete_ids_schema,