You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ta...@apache.org on 2020/11/17 22:15:01 UTC

[incubator-superset] branch master updated: chore: remove SIP_34_ANNOTATIONS_UI feature flag (#11727)

This is an automated email from the ASF dual-hosted git repository.

tai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new b3ead23  chore: remove SIP_34_ANNOTATIONS_UI feature flag (#11727)
b3ead23 is described below

commit b3ead231cc4e64485cdef8af0b450c65ba3c71a2
Author: Lily Kuang <li...@preset.io>
AuthorDate: Tue Nov 17 14:11:11 2020 -0800

    chore: remove SIP_34_ANNOTATIONS_UI feature flag (#11727)
---
 superset/config.py            |  1 -
 superset/views/annotations.py | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/superset/config.py b/superset/config.py
index 9eb6cf1..fa5b385 100644
--- a/superset/config.py
+++ b/superset/config.py
@@ -322,7 +322,6 @@ DEFAULT_FEATURE_FLAGS: Dict[str, bool] = {
     "DISPLAY_MARKDOWN_HTML": True,
     # When True, this escapes HTML (rather than rendering it) in Markdown components
     "ESCAPE_MARKDOWN_HTML": False,
-    "SIP_34_ANNOTATIONS_UI": False,
     "VERSIONED_EXPORT": False,
     # Note that: RowLevelSecurityFilter is only given by default to the Admin role
     # and the Admin Role does have the all_datasources security permission.
diff --git a/superset/views/annotations.py b/superset/views/annotations.py
index 9fbeb23..03cc260 100644
--- a/superset/views/annotations.py
+++ b/superset/views/annotations.py
@@ -99,10 +99,7 @@ class AnnotationModelView(
     @expose("/<pk>/annotation/", methods=["GET"])
     @has_access
     def annotation(self, pk: int) -> FlaskResponse:  # pylint: disable=unused-argument
-        if not (
-            is_feature_enabled("ENABLE_REACT_CRUD_VIEWS")
-            and is_feature_enabled("SIP_34_ANNOTATIONS_UI")
-        ):
+        if not is_feature_enabled("ENABLE_REACT_CRUD_VIEWS"):
             return super().list()
 
         return super().render_app_template()
@@ -126,10 +123,7 @@ class AnnotationLayerModelView(SupersetModelView):  # pylint: disable=too-many-a
     @expose("/list/")
     @has_access
     def list(self) -> FlaskResponse:
-        if not (
-            is_feature_enabled("ENABLE_REACT_CRUD_VIEWS")
-            and is_feature_enabled("SIP_34_ANNOTATIONS_UI")
-        ):
+        if not is_feature_enabled("ENABLE_REACT_CRUD_VIEWS"):
             return super().list()
 
         return super().render_app_template()