diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py index e2744e38b..b1d320797 100644 --- a/superset/dashboards/api.py +++ b/superset/dashboards/api.py @@ -191,9 +191,11 @@ class DashboardRestApi(BaseSupersetModelRestApi): "roles.id", "roles.name", "is_managed_externally", + "tags.id", + "tags.name", + "tags.type", ] - if is_feature_enabled("TAGGING_SYSTEM"): - 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", @@ -219,36 +221,22 @@ class DashboardRestApi(BaseSupersetModelRestApi): 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], "id": [DashboardFavoriteFilter, DashboardCertifiedFilter], "created_by": [DashboardCreatedByMeFilter, DashboardHasCreatedByFilter], + "tags": [DashboardTagFilter], } - if is_feature_enabled("TAGGING_SYSTEM"): - search_filters["tags"] = [DashboardTagFilter] base_order = ("changed_on", "desc")