diff --git a/superset/config.py b/superset/config.py index 9eb6cf16b..fa5b3857f 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 9fbeb23f9..03cc26006 100644 --- a/superset/views/annotations.py +++ b/superset/views/annotations.py @@ -99,10 +99,7 @@ class AnnotationModelView( @expose("//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()