From 6c6ded139b80fd2799eb028f1421137c86096170 Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Mon, 2 Nov 2020 11:44:20 -0800
Subject: [PATCH] fix: Update "View In SQL Lab" Flow to render source query
 from datasource object (#11476)

---
 .../components/controls/DatasourceControl.jsx | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
index 1d702498ec..47ab0d5941 100644
--- a/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
+++ b/superset-frontend/src/explore/components/controls/DatasourceControl.jsx
@@ -28,6 +28,7 @@ import Icon from 'src/components/Icon';
 import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal';
 import DatasourceModal from 'src/datasource/DatasourceModal';
 import Label from 'src/components/Label';
+import { postForm } from 'src/explore/exploreUtils';
 
 import ControlHeader from '../ControlHeader';
 
@@ -86,7 +87,7 @@ const ColumnsCol = styled(Col)`
 `;
 
 const CHANGE_DATASET = 'change_dataset';
-const EXPLORE_IN_SQL_LAB = 'explore_in_sql_lab';
+const VIEW_IN_SQL_LAB = 'view_in_sql_lab';
 const EDIT_DATASET = 'edit_dataset';
 
 class DatasourceControl extends React.PureComponent {
@@ -138,6 +139,14 @@ class DatasourceControl extends React.PureComponent {
     if (key === EDIT_DATASET) {
       this.toggleEditDatasourceModal();
     }
+    if (key === VIEW_IN_SQL_LAB) {
+      const { datasource } = this.props;
+      const payload = {
+        datasourceKey: `${datasource.id}__${datasource.type}`,
+        sql: datasource.sql,
+      };
+      postForm('/superset/sqllab', payload);
+    }
   }
 
   renderDatasource() {
@@ -190,7 +199,7 @@ class DatasourceControl extends React.PureComponent {
       showEditDatasourceModal,
       showDatasource,
     } = this.state;
-    const { datasource, onChange, value } = this.props;
+    const { datasource, onChange } = this.props;
 
     const datasourceMenu = (
       <Menu onClick={this.handleMenuItemClick}>
@@ -200,15 +209,7 @@ class DatasourceControl extends React.PureComponent {
           </Menu.Item>
         )}
         <Menu.Item key={CHANGE_DATASET}>{t('Change Dataset')}</Menu.Item>
-        <Menu.Item key={EXPLORE_IN_SQL_LAB}>
-          <a
-            href={`/superset/sqllab?datasourceKey=${value}`}
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            {t('View in SQL Lab')}
-          </a>
-        </Menu.Item>
+        <Menu.Item key={VIEW_IN_SQL_LAB}>{t('View in SQL Lab')}</Menu.Item>
       </Menu>
     );