From c4e109f31e2c3639efa6d237f7d90d74219e7394 Mon Sep 17 00:00:00 2001
From: Daniel Gaspar <danielvazgaspar@gmail.com>
Date: Thu, 3 Sep 2020 16:37:26 +0100
Subject: [PATCH 1/3] fix: MVC show saved query

---
 superset/views/sql_lab.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py
index 606e9a61ef949..2d5ae677b80d8 100644
--- a/superset/views/sql_lab.py
+++ b/superset/views/sql_lab.py
@@ -98,7 +98,6 @@ def show(self, pk: int) -> FlaskResponse:
             title=self.show_title,
             widgets=widgets,
             related_views=self._related_views,
-            bootstrap_data=json.dumps(payload, default=utils.json_iso_dttm_ser),
         )
 
 

From 42e32fdba3dd5f9fb3051e2cb520527491be7252 Mon Sep 17 00:00:00 2001
From: Daniel Gaspar <danielvazgaspar@gmail.com>
Date: Thu, 3 Sep 2020 16:54:45 +0100
Subject: [PATCH 2/3] remove it completely

---
 .../superset/models/savedquery/show.html      | 33 -------------------
 superset/views/sql_lab.py                     | 19 -----------
 2 files changed, 52 deletions(-)
 delete mode 100644 superset/templates/superset/models/savedquery/show.html

diff --git a/superset/templates/superset/models/savedquery/show.html b/superset/templates/superset/models/savedquery/show.html
deleted file mode 100644
index 10da57212eecf..0000000000000
--- a/superset/templates/superset/models/savedquery/show.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{#
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
-#}
-{% extends "appbuilder/general/model/show.html" %}
-
-{% block show_form %}
-  {{ super() }}
-  <div
-    id="schedule-info"
-    style="padding: 0 10px;"
-    data-bootstrap="{{ bootstrap_data }}"
-  ></div>
-{% endblock %}
-
-{% block tail_js %}
-  {{ super() }}
-  {{ js_bundle("showSavedQuery") }}
-{% endblock %}
diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py
index 2d5ae677b80d8..492d2ae27ec41 100644
--- a/superset/views/sql_lab.py
+++ b/superset/views/sql_lab.py
@@ -75,31 +75,12 @@ class SavedQueryView(
         "changed_on": _("Changed on"),
     }
 
-    show_template = "superset/models/savedquery/show.html"
-
     def pre_add(self, item: "SavedQueryView") -> None:
         item.user = g.user
 
     def pre_update(self, item: "SavedQueryView") -> None:
         self.pre_add(item)
 
-    @has_access
-    @expose("show/<pk>")
-    def show(self, pk: int) -> FlaskResponse:
-        pk = self._deserialize_pk_if_composite(pk)
-        widgets = self._show(pk)
-        query = self.datamodel.get(pk).to_json()
-        query["extra_json"] = json.loads(query["extra_json"])
-        payload = {"common": {"feature_flags": get_feature_flags(), "query": query}}
-
-        return self.render_template(
-            self.show_template,
-            pk=pk,
-            title=self.show_title,
-            widgets=widgets,
-            related_views=self._related_views,
-        )
-
 
 class SavedQueryViewApi(SavedQueryView):  # pylint: disable=too-many-ancestors
     include_route_methods = {

From 180443d962a09128034a5844daca528b21e27be1 Mon Sep 17 00:00:00 2001
From: Daniel Gaspar <danielvazgaspar@gmail.com>
Date: Thu, 3 Sep 2020 17:05:15 +0100
Subject: [PATCH 3/3] fix lint

---
 superset/views/sql_lab.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py
index 492d2ae27ec41..a85fb534124da 100644
--- a/superset/views/sql_lab.py
+++ b/superset/views/sql_lab.py
@@ -21,7 +21,7 @@
 from flask_appbuilder.security.decorators import has_access, has_access_api
 from flask_babel import lazy_gettext as _
 
-from superset import db, get_feature_flags
+from superset import db
 from superset.constants import RouteMethod
 from superset.models.sql_lab import Query, SavedQuery, TableSchema, TabState
 from superset.typing import FlaskResponse