From 654d37d28305aa7098a3f582432f701d16dc1143 Mon Sep 17 00:00:00 2001 From: hughhhh Date: Thu, 11 May 2023 14:23:59 -0400 Subject: [PATCH 1/5] remove feature flags from api --- superset/charts/api.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/superset/charts/api.py b/superset/charts/api.py index 8f9ecae8fb6b3..0fdb12af21532 100644 --- a/superset/charts/api.py +++ b/superset/charts/api.py @@ -144,9 +144,10 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]: "viz_type", "query_context", "is_managed_externally", + "tags.id", + "tags.name", + "tags.type", ] - if is_feature_enabled("TAGGING_SYSTEM"): - show_columns += ["tags.id", "tags.name", "tags.type"] show_select_columns = show_columns + ["table.id"] list_columns = [ @@ -194,9 +195,10 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]: "thumbnail_url", "url", "viz_type", + "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_by_fk", "changed_on"] order_columns = [ "changed_by.first_name", @@ -224,9 +226,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]: "dashboards", "slice_name", "viz_type", + "tags", ] - if is_feature_enabled("TAGGING_SYSTEM"): - search_columns += ["tags"] base_order = ("changed_on", "desc") base_filters = [["id", ChartFilter, lambda: []]] search_filters = { @@ -237,10 +238,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]: ], "slice_name": [ChartAllTextFilter], "created_by": [ChartHasCreatedByFilter, ChartCreatedByMeFilter], + "tags": [ChartTagFilter], } - if is_feature_enabled("TAGGING_SYSTEM"): - search_filters["tags"] = [ChartTagFilter] - # Will just affect _info endpoint edit_columns = ["slice_name"] add_columns = edit_columns From 51abd6d65a022b753fbe3968bf2a91e41a226e31 Mon Sep 17 00:00:00 2001 From: hughhhh Date: Thu, 11 May 2023 16:44:48 -0400 Subject: [PATCH 2/5] ad tags --- superset/charts/schemas.py | 1 + 1 file changed, 1 insertion(+) diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py index e70dbad476e69..3970e8a007d87 100644 --- a/superset/charts/schemas.py +++ b/superset/charts/schemas.py @@ -290,6 +290,7 @@ class ChartPutSchema(Schema): ) is_managed_externally = fields.Boolean(allow_none=True, dump_default=False) external_url = fields.String(allow_none=True) + tags = fields.Nested(TagSchema, many=True) class ChartGetDatasourceObjectDataResponseSchema(Schema): From 0ab178c92c1b364cb9abc092be05f679c8299c5b Mon Sep 17 00:00:00 2001 From: hughhhh Date: Fri, 12 May 2023 12:39:43 -0400 Subject: [PATCH 3/5] make field integer --- superset/charts/schemas.py | 2 +- superset/dashboards/schemas.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py index 3970e8a007d87..04e2c30f76fa2 100644 --- a/superset/charts/schemas.py +++ b/superset/charts/schemas.py @@ -152,7 +152,7 @@ class TagSchema(Schema): id = fields.Int() name = fields.String() - type = fields.String() + type = fields.Int() class ChartEntityResponseSchema(Schema): diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py index 156a3ac1f9111..98d94e59d51ca 100644 --- a/superset/dashboards/schemas.py +++ b/superset/dashboards/schemas.py @@ -169,7 +169,7 @@ class RolesSchema(Schema): class TagSchema(Schema): id = fields.Int() name = fields.String() - type = fields.String() + type = fields.Int() class DashboardGetResponseSchema(Schema): From 8932ef6aefd720ba5677b475ef1d1f97d0e0bd59 Mon Sep 17 00:00:00 2001 From: hughhhh Date: Tue, 16 May 2023 10:31:41 -0400 Subject: [PATCH 4/5] enum field --- superset/charts/schemas.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py index 04e2c30f76fa2..44252ef06f9aa 100644 --- a/superset/charts/schemas.py +++ b/superset/charts/schemas.py @@ -28,6 +28,7 @@ from superset import app from superset.common.chart_data import ChartDataResultFormat, ChartDataResultType from superset.db_engine_specs.base import builtin_time_grains +from superset.tags.models import TagTypes from superset.utils import pandas_postprocessing, schema as utils from superset.utils.core import ( AnnotationType, @@ -152,7 +153,7 @@ class TagSchema(Schema): id = fields.Int() name = fields.String() - type = fields.Int() + type = EnumField(TagTypes, by_value=True) class ChartEntityResponseSchema(Schema): From b19888cfbbcbb6244fafd6e2f173f45e4d007dcf Mon Sep 17 00:00:00 2001 From: hughhhh Date: Mon, 22 May 2023 12:42:14 -0400 Subject: [PATCH 5/5] ok --- superset/dashboards/schemas.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py index 98d94e59d51ca..30b5b4fa1bf14 100644 --- a/superset/dashboards/schemas.py +++ b/superset/dashboards/schemas.py @@ -20,8 +20,10 @@ from marshmallow import fields, post_load, pre_load, Schema from marshmallow.validate import Length, ValidationError +from marshmallow_enum import EnumField from superset.exceptions import SupersetException +from superset.tags.models import TagTypes from superset.utils import core as utils get_delete_ids_schema = {"type": "array", "items": {"type": "integer"}} @@ -169,7 +171,7 @@ class RolesSchema(Schema): class TagSchema(Schema): id = fields.Int() name = fields.String() - type = fields.Int() + type = EnumField(TagTypes, by_value=True) class DashboardGetResponseSchema(Schema):