From fc914fd347c77cfb3e97e7f5569cd7514d58db0b Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 31 Oct 2020 13:33:39 -0700
Subject: [PATCH 001/138] create boiler modal component

---
 .../src/SqlLab/components/ResultSet.tsx       |  4 +++
 .../SqlLab/components/SaveDatasetModal.tsx    | 26 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index f83aebb8dc0c3..d1a2c40cbdae9 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -34,6 +34,8 @@ import { prepareCopyToClipboardTabularData } from '../../utils/common';
 import { CtasEnum } from '../actions/sqlLab';
 import { Query } from '../types';
 
+import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal'
+
 const SEARCH_HEIGHT = 46;
 
 const LOADING_STYLES: CSSProperties = { position: 'relative', minHeight: 100 };
@@ -174,6 +176,7 @@ export default class ResultSet extends React.PureComponent<
       }
       return (
         <div className="ResultSetControls">
+          <SaveDatasetModal />
           <div className="ResultSetButtons">
             {this.props.visualize &&
               this.props.database &&
@@ -385,6 +388,7 @@ export default class ResultSet extends React.PureComponent<
         </div>
         <div>{progressBar}</div>
         <div>{trackingUrl}</div>
+        <SaveDatasetModal />
       </div>
     );
   }
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
new file mode 100644
index 0000000000000..2b2784176c9a8
--- /dev/null
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import React, { FunctionComponent } from 'react';
+import Modal from 'src/common/components/Modal';
+
+
+export const SaveDatasetModal = ({}) => {
+    return (<div>SaveDatasetModal</div>)
+}

From bfac037e04453d44af372d9ed524fefbc2680d96 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sun, 1 Nov 2020 18:52:31 -0800
Subject: [PATCH 002/138] hello world modal

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx  |  1 -
 .../src/SqlLab/components/SaveDatasetModal.tsx         | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index d1a2c40cbdae9..2c3e7f5bc57d0 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -388,7 +388,6 @@ export default class ResultSet extends React.PureComponent<
         </div>
         <div>{progressBar}</div>
         <div>{trackingUrl}</div>
-        <SaveDatasetModal />
       </div>
     );
   }
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 2b2784176c9a8..acdb279bcebed 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -20,7 +20,11 @@
 import React, { FunctionComponent } from 'react';
 import Modal from 'src/common/components/Modal';
 
-
+// eslint-disable-next-line no-empty-pattern
 export const SaveDatasetModal = ({}) => {
-    return (<div>SaveDatasetModal</div>)
-}
+  return (
+    <Modal show onHide={() => {}} title="Save a new dataset">
+      <div>hello world</div>
+    </Modal>
+  );
+};

From b2a8d6bf7cc5244ce916fe6a9a1cd8f3b41271e1 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 2 Nov 2020 09:16:37 -0800
Subject: [PATCH 003/138] setup modal flow

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index acdb279bcebed..b7bd1d39f271b 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -24,7 +24,7 @@ import Modal from 'src/common/components/Modal';
 export const SaveDatasetModal = ({}) => {
   return (
     <Modal show onHide={() => {}} title="Save a new dataset">
-      <div>hello world</div>
+      <div>To explore the results of this query, we need to save it as a virtual dataset</div>
     </Modal>
   );
 };

From 04e12163ec2bfee8f7ca272bcffdb67ab9070edb Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 9 Nov 2020 18:37:20 -0800
Subject: [PATCH 004/138] setup savemodal for components

---
 .../SqlLab/components/SaveDatasetModal.tsx    | 43 ++++++++++++++++++-
 .../components/controls/preset.code-workspace | 10 +++++
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 superset-frontend/src/explore/components/controls/preset.code-workspace

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index b7bd1d39f271b..708599123201a 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -17,14 +17,53 @@
  * under the License.
  */
 
-import React, { FunctionComponent } from 'react';
+import React, { useState } from 'react';
+import { Radio, AutoComplete, Input } from 'src/common/components';
 import Modal from 'src/common/components/Modal';
 
+const mockVal = (str, repeat = 1) => {
+  return {
+    value: str.repeat(repeat),
+  };
+};
+
 // eslint-disable-next-line no-empty-pattern
 export const SaveDatasetModal = ({}) => {
+  const [value, setValue] = useState('');
+  const [options, setOptions] = useState([]);
+
+  const onSearch = (searchText) => {
+    setOptions(
+      !searchText ? [] : [mockVal(searchText), mockVal(searchText, 2), mockVal(searchText, 3)],
+    );
+  };
+
+  const onSelect = (data) => {
+    console.log('onSelect', data);
+  };
+
+  const onChange = (data) => {
+    setValue(data);
+  };
+
   return (
     <Modal show onHide={() => {}} title="Save a new dataset">
-      <div>To explore the results of this query, we need to save it as a virtual dataset</div>
+      <div>
+        To explore the results of this query, we need to save it as a virtual dataset
+        <Radio>Save as new dataset</Radio>
+        <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" />
+        <br/>
+        <Radio>Overwrite existing dataset</Radio>
+        <AutoComplete
+          options={options}
+          style={{
+            width: 200,
+          }}
+          onSelect={onSelect}
+          onSearch={onSearch}
+          placeholder="input here"
+      />
+      </div>
     </Modal>
   );
 };
diff --git a/superset-frontend/src/explore/components/controls/preset.code-workspace b/superset-frontend/src/explore/components/controls/preset.code-workspace
new file mode 100644
index 0000000000000..419b3b4976b55
--- /dev/null
+++ b/superset-frontend/src/explore/components/controls/preset.code-workspace
@@ -0,0 +1,10 @@
+{
+    "folders": [
+        {
+            "path": "../../../../.."
+        },
+        {
+            "path": "../../../../../../superset-shell"
+        }
+    ]
+}

From 6d2a61b63ac7dd83dd016dc06cf629781612b4e5 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 14 Nov 2020 17:46:06 -0800
Subject: [PATCH 005/138] flake8

---
 .../src/SqlLab/components/ResultSet.tsx       | 23 +++++-
 .../SqlLab/components/SaveDatasetModal.tsx    | 73 ++++++++++++++-----
 2 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 2c3e7f5bc57d0..c613a0f113665 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -88,6 +88,7 @@ export default class ResultSet extends React.PureComponent<
       searchText: '',
       showExploreResultsButton: false,
       data: [],
+      showSaveDatasetModal: false
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -97,6 +98,8 @@ export default class ResultSet extends React.PureComponent<
     this.toggleExploreResultsButton = this.toggleExploreResultsButton.bind(
       this,
     );
+    this.handleSaveInDataset = this.handleSaveInDataset.bind(this);
+    this.handleHideSaveModal = this.handleHideSaveModal.bind(this);
   }
 
   componentDidMount() {
@@ -168,15 +171,30 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
+  handleSaveInDataset() {
+    console.log('Saving dataset');
+  }
+
+  handleHideSaveModal() {
+    console.log('hiding the modal');
+    this.setState({showSaveDatasetModal: false})
+  }
+
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
       let { data } = this.props.query.results;
       if (this.props.cache && this.props.query.cached) {
         ({ data } = this.state);
       }
+
+      const { showSaveDatasetModal } = this.state;
       return (
         <div className="ResultSetControls">
-          <SaveDatasetModal />
+          <SaveDatasetModal
+            visible={showSaveDatasetModal}
+            onOk={this.handleSaveInDataset}
+            onCancel={this.handleHideSaveModal}
+          />
           <div className="ResultSetButtons">
             {this.props.visualize &&
               this.props.database &&
@@ -186,6 +204,9 @@ export default class ResultSet extends React.PureComponent<
                   query={this.props.query}
                   database={this.props.database}
                   actions={this.props.actions}
+                  onClick={() => {
+                    this.setState({showSaveDatasetModal: true})
+                  }}
                 />
               )}
             {this.props.csv && (
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 708599123201a..e052e25c80dcc 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -17,9 +17,10 @@
  * under the License.
  */
 
-import React, { useState } from 'react';
+import React, { useState, FunctionComponent} from 'react';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import Modal from 'src/common/components/Modal';
+import Button from 'src/components/Button';
 
 const mockVal = (str, repeat = 1) => {
   return {
@@ -27,10 +28,14 @@ const mockVal = (str, repeat = 1) => {
   };
 };
 
+interface SaveDatasetModalProps = {
+}
+
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal = ({}) => {
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel}) => {
   const [value, setValue] = useState('');
   const [options, setOptions] = useState([]);
+  const [radioOption, setRadioOptions] = useState(1);
 
   const onSearch = (searchText) => {
     setOptions(
@@ -46,23 +51,57 @@ export const SaveDatasetModal = ({}) => {
     setValue(data);
   };
 
+  const onRadioChange = e => {
+    console.log('radio checked', e.target.value);
+    setRadioOptions(e.target.value)
+  };
+
+  const radioStyle = {
+    display: 'block',
+    height: '30px',
+    lineHeight: '30px',
+  };
+
   return (
-    <Modal show onHide={() => {}} title="Save a new dataset">
+    <Modal
+      show={visible}
+      onHide={() => {}}
+      title="Save a new dataset"
+      onCancel={onCancel}
+      footer={<>
+          <Button
+            buttonSize="sm"
+            buttonStyle="primary"
+            className="m-r-5"
+            onClick={onOk}
+          >
+            Save & Explore
+        </Button>
+      </>
+    }
+    >
       <div>
-        To explore the results of this query, we need to save it as a virtual dataset
-        <Radio>Save as new dataset</Radio>
-        <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" />
-        <br/>
-        <Radio>Overwrite existing dataset</Radio>
-        <AutoComplete
-          options={options}
-          style={{
-            width: 200,
-          }}
-          onSelect={onSelect}
-          onSearch={onSearch}
-          placeholder="input here"
-      />
+        <div>
+          To explore the results of this query, we need to save it as a virtual dataset
+        </div>
+        <Radio.Group onChange={onRadioChange} value={radioOption}>
+          <Radio style={radioStyle} value={1}>
+            Save as new dataset
+            <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" />
+          </Radio>
+          <Radio style={radioStyle} value={2}>
+            Overwrite existing dataset
+            <AutoComplete
+              options={options}
+              style={{
+                width: 200,
+              }}
+              onSelect={onSelect}
+              onSearch={onSearch}
+              placeholder="input here"
+            />
+          </Radio>
+        </Radio.Group>
       </div>
     </Modal>
   );

From 3170382c5855b08b259e181f25636a8866a5a5d4 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 16 Nov 2020 09:33:14 -0800
Subject: [PATCH 006/138] fix onclick reference

---
 .../components/ExploreResultsButton.jsx       | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
index ea52f09bed94c..30b99c7a2a4fc 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
@@ -46,7 +46,7 @@ class ExploreResultsButton extends React.PureComponent {
   constructor(props) {
     super(props);
     this.visualize = this.visualize.bind(this);
-    this.onClick = this.onClick.bind(this);
+    // this.onClick = this.onClick.bind(this);
     this.getInvalidColumns = this.getInvalidColumns.bind(this);
     this.renderInvalidColumnMessage = this.renderInvalidColumnMessage.bind(
       this,
@@ -54,37 +54,38 @@ class ExploreResultsButton extends React.PureComponent {
   }
 
   onClick() {
-    const { timeout } = this.props;
-    const msg = this.renderInvalidColumnMessage();
-    if (Math.round(this.getQueryDuration()) > timeout) {
-      this.dialog.show({
-        title: t('Explore'),
-        body: this.renderTimeoutWarning(),
-        actions: [
-          Dialog.CancelAction(),
-          Dialog.OKAction(() => {
-            this.visualize();
-          }),
-        ],
-        bsSize: 'large',
-        onHide: dialog => {
-          dialog.hide();
-        },
-      });
-    } else if (msg) {
-      this.dialog.show({
-        title: t('Explore'),
-        body: msg,
-        actions: [Dialog.DefaultAction('Ok', () => {})],
-        bsSize: 'large',
-        bsStyle: 'warning',
-        onHide: dialog => {
-          dialog.hide();
-        },
-      });
-    } else {
-      this.visualize();
-    }
+    console.log('in onclick')
+    // const { timeout } = this.props;
+    // const msg = this.renderInvalidColumnMessage();
+    // if (Math.round(this.getQueryDuration()) > timeout) {
+    //   this.dialog.show({
+    //     title: t('Explore'),
+    //     body: this.renderTimeoutWarning(),
+    //     actions: [
+    //       Dialog.CancelAction(),
+    //       Dialog.OKAction(() => {
+    //         this.visualize();
+    //       }),
+    //     ],
+    //     bsSize: 'large',
+    //     onHide: dialog => {
+    //       dialog.hide();
+    //     },
+    //   });
+    // } else if (msg) {
+    //   this.dialog.show({
+    //     title: t('Explore'),
+    //     body: msg,
+    //     actions: [Dialog.DefaultAction('Ok', () => {})],
+    //     bsSize: 'large',
+    //     bsStyle: 'warning',
+    //     onHide: dialog => {
+    //       dialog.hide();
+    //     },
+    //   });
+    // } else {
+    //   this.visualize();
+    // }
   }
 
   getColumns() {
@@ -217,7 +218,7 @@ class ExploreResultsButton extends React.PureComponent {
       <>
         <Button
           buttonSize="small"
-          onClick={this.onClick}
+          onClick={this.props.onClick}
           disabled={!allowsSubquery}
           tooltip={t('Explore the result set in the data exploration view')}
         >

From 268052cddfdfe063bde8b436baf3161b299f3c43 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 16 Nov 2020 10:20:33 -0800
Subject: [PATCH 007/138] working create datasource boiler

---
 .../src/SqlLab/components/ResultSet.tsx       | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index c613a0f113665..caed1d9303d9c 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -173,6 +173,34 @@ export default class ResultSet extends React.PureComponent<
 
   handleSaveInDataset() {
     console.log('Saving dataset');
+    console.log(this.props.query);
+    console.log(this.props.actions.createDatasource);
+    const { schema, sql, dbId, templateParams } = this.props.query;
+
+    let selectedColumns;
+    if (
+      this.props.query &&
+      this.props.query.results &&
+      this.props.query.results.selected_columns
+    ) {
+      selectedColumns = this.props.query.results.selected_columns;
+    } else {
+      selectedColumns = []
+    }
+
+    this.props.actions.createDatasource({
+        schema,
+        sql,
+        dbId,
+        templateParams,
+        datasourceName: 'hmiles.test_dataset_2',
+        columns: selectedColumns,
+      }).then(data => {
+          console.log(data);
+      }).catch(error => {
+          console.log('an error occurred trying to create a datasource');
+          console.log(error);
+      });
   }
 
   handleHideSaveModal() {
@@ -194,6 +222,8 @@ export default class ResultSet extends React.PureComponent<
             visible={showSaveDatasetModal}
             onOk={this.handleSaveInDataset}
             onCancel={this.handleHideSaveModal}
+            query={this.props.query}
+            createDatasource={this.props.actions.createDatasource}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&

From 74348a1d707da48ce299f23c41a9eaef8958a87c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 16 Nov 2020 10:48:19 -0800
Subject: [PATCH 008/138] saving spot for callback on text input

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx  | 10 +++++++---
 .../src/SqlLab/components/SaveDatasetModal.tsx         |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index caed1d9303d9c..c8cf1f21a57a1 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -88,7 +88,8 @@ export default class ResultSet extends React.PureComponent<
       searchText: '',
       showExploreResultsButton: false,
       data: [],
-      showSaveDatasetModal: false
+      showSaveDatasetModal: false,
+      newSaveDatasetName: '',
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -203,6 +204,10 @@ export default class ResultSet extends React.PureComponent<
       });
   }
 
+  handleDatasetNameChange(e) {
+    console.log(e.target.value)
+  }
+
   handleHideSaveModal() {
     console.log('hiding the modal');
     this.setState({showSaveDatasetModal: false})
@@ -222,8 +227,7 @@ export default class ResultSet extends React.PureComponent<
             visible={showSaveDatasetModal}
             onOk={this.handleSaveInDataset}
             onCancel={this.handleHideSaveModal}
-            query={this.props.query}
-            createDatasource={this.props.actions.createDatasource}
+            handleDatasetNameChange={this.handleDatasetNameChange}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index e052e25c80dcc..c0dccc62d0355 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -32,7 +32,7 @@ interface SaveDatasetModalProps = {
 }
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel}) => {
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange}) => {
   const [value, setValue] = useState('');
   const [options, setOptions] = useState([]);
   const [radioOption, setRadioOptions] = useState(1);
@@ -87,7 +87,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel})
         <Radio.Group onChange={onRadioChange} value={radioOption}>
           <Radio style={radioStyle} value={1}>
             Save as new dataset
-            <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" />
+            <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" onChange={handleDatasetNameChange} />
           </Radio>
           <Radio style={radioStyle} value={2}>
             Overwrite existing dataset

From 711c5ac20c9eca2a50a65cdf8bc71eaeedb9ee3f Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 16 Nov 2020 10:53:52 -0800
Subject: [PATCH 009/138] working dataset with input box

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index c8cf1f21a57a1..5129939e2cbaf 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -101,6 +101,7 @@ export default class ResultSet extends React.PureComponent<
     );
     this.handleSaveInDataset = this.handleSaveInDataset.bind(this);
     this.handleHideSaveModal = this.handleHideSaveModal.bind(this);
+    this.handleDatasetNameChange = this.handleDatasetNameChange.bind(this);
   }
 
   componentDidMount() {
@@ -194,7 +195,7 @@ export default class ResultSet extends React.PureComponent<
         sql,
         dbId,
         templateParams,
-        datasourceName: 'hmiles.test_dataset_2',
+        datasourceName: this.state.newSaveDatasetName,
         columns: selectedColumns,
       }).then(data => {
           console.log(data);
@@ -206,6 +207,7 @@ export default class ResultSet extends React.PureComponent<
 
   handleDatasetNameChange(e) {
     console.log(e.target.value)
+    this.setState({ newSaveDatasetName: e.target.value })
   }
 
   handleHideSaveModal() {

From a73444222303d0e150fe7481d772acb12a6a9646 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 16 Nov 2020 11:00:13 -0800
Subject: [PATCH 010/138] working redirect on completion

---
 .../src/SqlLab/components/ResultSet.tsx       | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5129939e2cbaf..1b8355c0acb0f 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -31,6 +31,7 @@ import FilterableTable from '../../components/FilterableTable/FilterableTable';
 import QueryStateLabel from './QueryStateLabel';
 import CopyToClipboard from '../../components/CopyToClipboard';
 import { prepareCopyToClipboardTabularData } from '../../utils/common';
+import { exploreChart } from '../../explore/exploreUtils';
 import { CtasEnum } from '../actions/sqlLab';
 import { Query } from '../types';
 
@@ -190,18 +191,28 @@ export default class ResultSet extends React.PureComponent<
       selectedColumns = []
     }
 
-    this.props.actions.createDatasource({
+    this.props.actions
+      .createDatasource({
         schema,
         sql,
         dbId,
         templateParams,
         datasourceName: this.state.newSaveDatasetName,
         columns: selectedColumns,
-      }).then(data => {
-          console.log(data);
+    }).then(data => {
+        console.log('Create datasource successfully');
+        exploreChart({
+          datasource: `${data.table_id}__table`,
+          metrics: [],
+          groupby: [],
+          time_range: 'No filter',
+          viz_type: 'table',
+          all_columns: selectedColumns.map(c => c.name),
+          row_limit: 1000,
+        })
       }).catch(error => {
-          console.log('an error occurred trying to create a datasource');
-          console.log(error);
+        console.log('an error occurred trying to create a datasource');
+        console.log(error);
       });
   }
 

From 0c7810a24af1a2536cae99a729e86c754dcbec0e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 16 Nov 2020 15:09:53 -0800
Subject: [PATCH 011/138] get data for owners dropdown

---
 .../src/SqlLab/components/ResultSet.tsx           | 15 ++++++++++++++-
 .../src/SqlLab/components/SaveDatasetModal.tsx    |  9 +++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 1b8355c0acb0f..e8d7fac3523d3 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -20,7 +20,7 @@ import React, { CSSProperties } from 'react';
 import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap';
 import Button from 'src/components/Button';
 import shortid from 'shortid';
-import { styled, t } from '@superset-ui/core';
+import { styled, t, SupersetClient} from '@superset-ui/core';
 
 import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
 import Loading from '../../components/Loading';
@@ -91,6 +91,7 @@ export default class ResultSet extends React.PureComponent<
       data: [],
       showSaveDatasetModal: false,
       newSaveDatasetName: '',
+      userDatasetsOwned: []
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -108,6 +109,17 @@ export default class ResultSet extends React.PureComponent<
   componentDidMount() {
     // only do this the first time the component is rendered/mounted
     this.reRunQueryIfSessionTimeoutErrorOnMount();
+
+    SupersetClient.get({
+      endpoint:
+        'api/v1/dataset/?q=(filters:!((col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)',
+      }).then(data => {
+          const userDatasetsOwned = data.json.result.map(r => {
+            return { dataSetName: r.table_name, dataSetId: r.id }
+          })
+          this.setState({userDatasetsOwned})
+    });
+
   }
 
   UNSAFE_componentWillReceiveProps(nextProps: ResultSetProps) {
@@ -241,6 +253,7 @@ export default class ResultSet extends React.PureComponent<
             onOk={this.handleSaveInDataset}
             onCancel={this.handleHideSaveModal}
             handleDatasetNameChange={this.handleDatasetNameChange}
+            userDatasetsOwned={this.state.userDatasetsOwned}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index c0dccc62d0355..a74258f96c10e 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -21,6 +21,7 @@ import React, { useState, FunctionComponent} from 'react';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import Modal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
+import { SupersetClient } from '@superset-ui/core';
 
 const mockVal = (str, repeat = 1) => {
   return {
@@ -32,14 +33,14 @@ interface SaveDatasetModalProps = {
 }
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange}) => {
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned}) => {
   const [value, setValue] = useState('');
   const [options, setOptions] = useState([]);
   const [radioOption, setRadioOptions] = useState(1);
 
   const onSearch = (searchText) => {
     setOptions(
-      !searchText ? [] : [mockVal(searchText), mockVal(searchText, 2), mockVal(searchText, 3)],
+      !searchText ? [] : userDatasetsOwned.map(d => ({value: d.dataSetName})),
     );
   };
 
@@ -47,10 +48,6 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
     console.log('onSelect', data);
   };
 
-  const onChange = (data) => {
-    setValue(data);
-  };
-
   const onRadioChange = e => {
     console.log('radio checked', e.target.value);
     setRadioOptions(e.target.value)

From c356796d9c31a177ef45055a9734afb516ec311e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 17 Nov 2020 18:37:07 -0800
Subject: [PATCH 012/138] fix build with pull from master

---
 superset-frontend/package-lock.json           | 114 +++++++++---------
 .../src/common/components/index.tsx           |   4 +
 2 files changed, 61 insertions(+), 57 deletions(-)

diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index ea758d431db26..c437e3cb46358 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -21829,28 +21829,28 @@
           "dependencies": {
             "abbrev": {
               "version": "1.1.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
               "dev": true,
               "optional": true
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
               "dev": true,
               "optional": true
             },
             "aproba": {
               "version": "1.2.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
               "dev": true,
               "optional": true
             },
             "are-we-there-yet": {
               "version": "1.1.5",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
               "dev": true,
               "optional": true,
@@ -21861,14 +21861,14 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
               "dev": true,
               "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
               "dev": true,
               "optional": true,
@@ -21879,35 +21879,35 @@
             },
             "code-point-at": {
               "version": "1.1.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
               "dev": true,
               "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
               "dev": true,
               "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
               "dev": true,
               "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
               "dev": true,
               "optional": true
             },
             "debug": {
               "version": "4.1.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
               "dev": true,
               "optional": true,
@@ -21917,35 +21917,35 @@
             },
             "deep-extend": {
               "version": "0.6.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
               "dev": true,
               "optional": true
             },
             "delegates": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
               "dev": true,
               "optional": true
             },
             "detect-libc": {
               "version": "1.0.3",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
               "dev": true,
               "optional": true
             },
             "fs.realpath": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
               "dev": true,
               "optional": true
             },
             "gauge": {
               "version": "2.7.4",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
               "dev": true,
               "optional": true,
@@ -21962,7 +21962,7 @@
             },
             "glob": {
               "version": "7.1.3",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
               "dev": true,
               "optional": true,
@@ -21977,14 +21977,14 @@
             },
             "has-unicode": {
               "version": "2.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
               "dev": true,
               "optional": true
             },
             "iconv-lite": {
               "version": "0.4.24",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
               "dev": true,
               "optional": true,
@@ -21994,7 +21994,7 @@
             },
             "ignore-walk": {
               "version": "3.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
               "dev": true,
               "optional": true,
@@ -22004,7 +22004,7 @@
             },
             "inflight": {
               "version": "1.0.6",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
               "dev": true,
               "optional": true,
@@ -22015,21 +22015,21 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
               "dev": true,
               "optional": true
             },
             "ini": {
               "version": "1.3.5",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
               "dev": true,
               "optional": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
               "dev": true,
               "optional": true,
@@ -22039,14 +22039,14 @@
             },
             "isarray": {
               "version": "1.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
               "dev": true,
               "optional": true
             },
             "minimatch": {
               "version": "3.0.4",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
               "dev": true,
               "optional": true,
@@ -22063,14 +22063,14 @@
             },
             "ms": {
               "version": "2.1.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
               "dev": true,
               "optional": true
             },
             "needle": {
               "version": "2.3.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
               "dev": true,
               "optional": true,
@@ -22082,7 +22082,7 @@
             },
             "node-pre-gyp": {
               "version": "0.12.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
               "dev": true,
               "optional": true,
@@ -22101,7 +22101,7 @@
             },
             "nopt": {
               "version": "4.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
               "dev": true,
               "optional": true,
@@ -22112,14 +22112,14 @@
             },
             "npm-bundled": {
               "version": "1.0.6",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
               "dev": true,
               "optional": true
             },
             "npm-packlist": {
               "version": "1.4.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
               "dev": true,
               "optional": true,
@@ -22130,7 +22130,7 @@
             },
             "npmlog": {
               "version": "4.1.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
               "dev": true,
               "optional": true,
@@ -22143,21 +22143,21 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
               "dev": true,
               "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
               "dev": true,
               "optional": true
             },
             "once": {
               "version": "1.4.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
               "dev": true,
               "optional": true,
@@ -22167,21 +22167,21 @@
             },
             "os-homedir": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
               "dev": true,
               "optional": true
             },
             "os-tmpdir": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
               "dev": true,
               "optional": true
             },
             "osenv": {
               "version": "0.1.5",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
               "dev": true,
               "optional": true,
@@ -22192,21 +22192,21 @@
             },
             "path-is-absolute": {
               "version": "1.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
               "dev": true,
               "optional": true
             },
             "process-nextick-args": {
               "version": "2.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
               "dev": true,
               "optional": true
             },
             "rc": {
               "version": "1.2.8",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
               "dev": true,
               "optional": true,
@@ -22219,7 +22219,7 @@
             },
             "readable-stream": {
               "version": "2.3.6",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
               "dev": true,
               "optional": true,
@@ -22235,7 +22235,7 @@
             },
             "rimraf": {
               "version": "2.6.3",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
               "dev": true,
               "optional": true,
@@ -22245,49 +22245,49 @@
             },
             "safe-buffer": {
               "version": "5.1.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
               "dev": true,
               "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
               "dev": true,
               "optional": true
             },
             "sax": {
               "version": "1.2.4",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
               "dev": true,
               "optional": true
             },
             "semver": {
               "version": "5.7.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
               "dev": true,
               "optional": true
             },
             "set-blocking": {
               "version": "2.0.0",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
               "dev": true,
               "optional": true
             },
             "signal-exit": {
               "version": "3.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
               "dev": true,
               "optional": true
             },
             "string-width": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "optional": true,
@@ -22299,7 +22299,7 @@
             },
             "string_decoder": {
               "version": "1.1.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
               "dev": true,
               "optional": true,
@@ -22309,7 +22309,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "optional": true,
@@ -22319,21 +22319,21 @@
             },
             "strip-json-comments": {
               "version": "2.0.1",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
               "dev": true,
               "optional": true
             },
             "util-deprecate": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
               "dev": true,
               "optional": true
             },
             "wide-align": {
               "version": "1.1.3",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
               "dev": true,
               "optional": true,
@@ -22343,7 +22343,7 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "resolved": false,
+              "resolved": "",
               "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
               "dev": true,
               "optional": true
diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index dbf2a3178a45e..5b6d4415c5d81 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,8 +19,10 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
+import { AutoComplete } from 'antd'
 import { Dropdown, Skeleton, Menu as AntdMenu } from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
+import { Radio } from 'antd'
 
 /*
   Antd is re-exported from here so we can override components with Emotion as needed.
@@ -29,6 +31,7 @@ import { DropDownProps } from 'antd/lib/dropdown';
  */
 // eslint-disable-next-line no-restricted-imports
 export {
+  AutoComplete,
   Avatar,
   Card,
   Collapse,
@@ -40,6 +43,7 @@ export {
   Popover,
   Select,
   Skeleton,
+  Radio,
   Tabs,
   Tooltip,
 } from 'antd';

From d3cd168ec939d13a2ec489c98b303c6c59796382 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 17 Nov 2020 19:07:19 -0800
Subject: [PATCH 013/138] fix the filteroption

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index a74258f96c10e..58e821a0261fd 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -44,6 +44,10 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
     );
   };
 
+  const filterAutocompleteOption = (inputValue, option) => {
+    return option.value.includes(inputValue)
+  }
+
   const onSelect = (data) => {
     console.log('onSelect', data);
   };
@@ -96,6 +100,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
               onSelect={onSelect}
               onSearch={onSearch}
               placeholder="input here"
+              filterOption={filterAutocompleteOption}
             />
           </Radio>
         </Radio.Group>

From e72d8820c94d298db004eb3ed3951cc2c29c9b25 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 17 Nov 2020 19:10:07 -0800
Subject: [PATCH 014/138] =?UTF-8?q?=F0=9F=92=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 58e821a0261fd..3f6d96c51d22c 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -53,7 +53,6 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
   };
 
   const onRadioChange = e => {
-    console.log('radio checked', e.target.value);
     setRadioOptions(e.target.value)
   };
 

From 4c7364f7078948b16a20778deaf60f11b8f3685c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 17 Nov 2020 19:34:41 -0800
Subject: [PATCH 015/138] move state to upper component

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 11 ++++++++++-
 .../src/SqlLab/components/SaveDatasetModal.tsx        |  9 ++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index e8d7fac3523d3..71337a66f3802 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -91,7 +91,8 @@ export default class ResultSet extends React.PureComponent<
       data: [],
       showSaveDatasetModal: false,
       newSaveDatasetName: '',
-      userDatasetsOwned: []
+      userDatasetsOwned: [],
+      saveDatasetRadioBtnState: 1,
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -104,6 +105,7 @@ export default class ResultSet extends React.PureComponent<
     this.handleSaveInDataset = this.handleSaveInDataset.bind(this);
     this.handleHideSaveModal = this.handleHideSaveModal.bind(this);
     this.handleDatasetNameChange = this.handleDatasetNameChange.bind(this);
+    this.handleSaveDatasetRadioBtnState = this.handleSaveDatasetRadioBtnState.bind(this);
   }
 
   componentDidMount() {
@@ -238,6 +240,11 @@ export default class ResultSet extends React.PureComponent<
     this.setState({showSaveDatasetModal: false})
   }
 
+  handleSaveDatasetRadioBtnState(e) {
+    console.log(e.target.value)
+    this.setState({saveDatasetRadioBtnState: e.target.value});
+  }
+
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
       let { data } = this.props.query.results;
@@ -254,6 +261,8 @@ export default class ResultSet extends React.PureComponent<
             onCancel={this.handleHideSaveModal}
             handleDatasetNameChange={this.handleDatasetNameChange}
             userDatasetsOwned={this.state.userDatasetsOwned}
+            handleSaveDatasetRadioBtnState={this.handleSaveDatasetRadioBtnState}
+            saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 3f6d96c51d22c..77016e2ff77f5 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -33,8 +33,7 @@ interface SaveDatasetModalProps = {
 }
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned}) => {
-  const [value, setValue] = useState('');
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState}) => {
   const [options, setOptions] = useState([]);
   const [radioOption, setRadioOptions] = useState(1);
 
@@ -52,10 +51,6 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
     console.log('onSelect', data);
   };
 
-  const onRadioChange = e => {
-    setRadioOptions(e.target.value)
-  };
-
   const radioStyle = {
     display: 'block',
     height: '30px',
@@ -84,7 +79,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
         <div>
           To explore the results of this query, we need to save it as a virtual dataset
         </div>
-        <Radio.Group onChange={onRadioChange} value={radioOption}>
+        <Radio.Group onChange={handleSaveDatasetRadioBtnState} value={saveDatasetRadioBtnState}>
           <Radio style={radioStyle} value={1}>
             Save as new dataset
             <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" onChange={handleDatasetNameChange} />

From dba206a713bd9d55f5c4a4c98ee4ef00e6cae8aa Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 18 Nov 2020 12:51:27 -0800
Subject: [PATCH 016/138] add overwrite state

---
 .../src/SqlLab/components/ResultSet.tsx       | 19 ++++++++--
 .../SqlLab/components/SaveDatasetModal.tsx    | 36 ++++++++++++++++---
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 71337a66f3802..56acb7035d240 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -93,6 +93,7 @@ export default class ResultSet extends React.PureComponent<
       newSaveDatasetName: '',
       userDatasetsOwned: [],
       saveDatasetRadioBtnState: 1,
+      overwriteDataSet: false,
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -106,6 +107,7 @@ export default class ResultSet extends React.PureComponent<
     this.handleHideSaveModal = this.handleHideSaveModal.bind(this);
     this.handleDatasetNameChange = this.handleDatasetNameChange.bind(this);
     this.handleSaveDatasetRadioBtnState = this.handleSaveDatasetRadioBtnState.bind(this);
+    this.handleOverwriteCancel = this.handleOverwriteCancel.bind(this);
   }
 
   componentDidMount() {
@@ -190,6 +192,13 @@ export default class ResultSet extends React.PureComponent<
 
   handleSaveInDataset() {
     console.log('Saving dataset');
+    console.log(this.state.saveDatasetRadioBtnState)
+    if (this.state.saveDatasetRadioBtnState === 2) {
+      this.setState({overwriteDataSet: true})
+      console.log('make sure user is okay with overwriting')
+      return
+    }
+
     console.log(this.props.query);
     console.log(this.props.actions.createDatasource);
     const { schema, sql, dbId, templateParams } = this.props.query;
@@ -231,20 +240,21 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleDatasetNameChange(e) {
-    console.log(e.target.value)
     this.setState({ newSaveDatasetName: e.target.value })
   }
 
   handleHideSaveModal() {
-    console.log('hiding the modal');
     this.setState({showSaveDatasetModal: false})
   }
 
   handleSaveDatasetRadioBtnState(e) {
-    console.log(e.target.value)
     this.setState({saveDatasetRadioBtnState: e.target.value});
   }
 
+  handleOverwriteCancel() {
+    this.setState({overwriteDataSet: false})
+  }
+
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
       let { data } = this.props.query.results;
@@ -253,6 +263,7 @@ export default class ResultSet extends React.PureComponent<
       }
 
       const { showSaveDatasetModal } = this.state;
+      console.log(this.state.overwriteDataSet)
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
@@ -263,6 +274,8 @@ export default class ResultSet extends React.PureComponent<
             userDatasetsOwned={this.state.userDatasetsOwned}
             handleSaveDatasetRadioBtnState={this.handleSaveDatasetRadioBtnState}
             saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
+            overwriteDataSet={this.state.overwriteDataSet}
+            handleOverwriteCancel={this.handleOverwriteCancel}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 77016e2ff77f5..4816cacbeaa67 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -33,7 +33,7 @@ interface SaveDatasetModalProps = {
 }
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState}) => {
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel}) => {
   const [options, setOptions] = useState([]);
   const [radioOption, setRadioOptions] = useState(1);
 
@@ -63,7 +63,9 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
       onHide={() => {}}
       title="Save a new dataset"
       onCancel={onCancel}
-      footer={<>
+      footer={
+      <>
+       {!overwriteDataSet &&
           <Button
             buttonSize="sm"
             buttonStyle="primary"
@@ -71,11 +73,29 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
             onClick={onOk}
           >
             Save & Explore
-        </Button>
+          </Button>
+        }
+        {overwriteDataSet && <> <Button
+            buttonSize="sm"
+            buttonStyle="danger"
+            className="m-r-5"
+            onClick={() => {
+              console.log('go back to original screen')
+              handleOverwriteCancel()
+            }}
+          >Cancel</Button>
+          <Button
+            buttonSize="sm"
+            buttonStyle="primary"
+            className="m-r-5"
+            onClick={() => {
+              console.log('overwriting dataset')
+            }}
+          >Ok</Button> </>}
       </>
     }
     >
-      <div>
+      {!overwriteDataSet && <div>
         <div>
           To explore the results of this query, we need to save it as a virtual dataset
         </div>
@@ -98,7 +118,13 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
             />
           </Radio>
         </Radio.Group>
-      </div>
+        </div>
+      }
+      {overwriteDataSet &&
+        <div>
+          Are you sure you want to overwrite this dataset?
+        </div>
+      }
     </Modal>
   );
 };

From 398bfee0cabd5e9a13615cb8d40ec8ba6eca45b5 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 13:24:33 -0800
Subject: [PATCH 017/138] hacked overwrite process

---
 .../src/SqlLab/components/ResultSet.tsx       | 42 +++++++++++++++++++
 .../SqlLab/components/SaveDatasetModal.tsx    | 16 +++----
 2 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 56acb7035d240..02f0bd709b9da 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -94,6 +94,7 @@ export default class ResultSet extends React.PureComponent<
       userDatasetsOwned: [],
       saveDatasetRadioBtnState: 1,
       overwriteDataSet: false,
+      datasetToOverwrite: {}
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -108,6 +109,8 @@ export default class ResultSet extends React.PureComponent<
     this.handleDatasetNameChange = this.handleDatasetNameChange.bind(this);
     this.handleSaveDatasetRadioBtnState = this.handleSaveDatasetRadioBtnState.bind(this);
     this.handleOverwriteCancel = this.handleOverwriteCancel.bind(this);
+    this.handleOverwriteDataset = this.handleOverwriteDataset.bind(this);
+    this.handleOverwriteDatasetOption = this.handleOverwriteDatasetOption.bind(this);
   }
 
   componentDidMount() {
@@ -190,6 +193,43 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
+  handleOverwriteDatasetOption(data, option) {
+    console.log(option);
+    this.setState({ datasetToOverwrite: option })
+  }
+
+  handleOverwriteDataset() {
+    console.log('handle overwrite dataset')
+    const { sql, results } = this.props.query;
+    const { datasetToOverwrite } = this.state
+    console.log(sql)
+    console.log(results.selected_columns)
+    console.log(datasetToOverwrite)
+
+    // HACK: to clear the columns in the previous dataset and update
+    // it with the new selected columns from the query
+    SupersetClient.put({
+      endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        columns: []
+      }),
+    }).then(d => {
+      console.log(d)
+    }).catch(err => console.log(err))
+
+    SupersetClient.put({
+      endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({
+        sql,
+        columns: results.selected_columns.map(d => ({column_name: d.name}))
+      }),
+    }).then(d => {
+      console.log(d)
+    }).catch(err => console.log(err))
+  }
+
   handleSaveInDataset() {
     console.log('Saving dataset');
     console.log(this.state.saveDatasetRadioBtnState)
@@ -276,6 +316,8 @@ export default class ResultSet extends React.PureComponent<
             saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
             overwriteDataSet={this.state.overwriteDataSet}
             handleOverwriteCancel={this.handleOverwriteCancel}
+            handleOverwriteDataset={this.handleOverwriteDataset}
+            handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 4816cacbeaa67..7f9ce1d15784a 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -33,13 +33,14 @@ interface SaveDatasetModalProps = {
 }
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel}) => {
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption}) => {
   const [options, setOptions] = useState([]);
   const [radioOption, setRadioOptions] = useState(1);
 
   const onSearch = (searchText) => {
+    console.log(userDatasetsOwned)
     setOptions(
-      !searchText ? [] : userDatasetsOwned.map(d => ({value: d.dataSetName})),
+      !searchText ? [] : userDatasetsOwned.map(d => ({value: d.dataSetName, dataSetId: d.dataSetId})),
     );
   };
 
@@ -47,10 +48,6 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
     return option.value.includes(inputValue)
   }
 
-  const onSelect = (data) => {
-    console.log('onSelect', data);
-  };
-
   const radioStyle = {
     display: 'block',
     height: '30px',
@@ -80,7 +77,6 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
             buttonStyle="danger"
             className="m-r-5"
             onClick={() => {
-              console.log('go back to original screen')
               handleOverwriteCancel()
             }}
           >Cancel</Button>
@@ -88,9 +84,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
             buttonSize="sm"
             buttonStyle="primary"
             className="m-r-5"
-            onClick={() => {
-              console.log('overwriting dataset')
-            }}
+            onClick={handleOverwriteDataset}
           >Ok</Button> </>}
       </>
     }
@@ -111,7 +105,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
               style={{
                 width: 200,
               }}
-              onSelect={onSelect}
+              onSelect={handleOverwriteDatasetOption}
               onSearch={onSearch}
               placeholder="input here"
               filterOption={filterAutocompleteOption}

From 07e7388487c53fb03e7b63112f96092bc3d0c711 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 13:33:24 -0800
Subject: [PATCH 018/138] linting

---
 .../src/SqlLab/components/ResultSet.tsx              | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 02f0bd709b9da..712110765c185 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -199,12 +199,8 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleOverwriteDataset() {
-    console.log('handle overwrite dataset')
     const { sql, results } = this.props.query;
     const { datasetToOverwrite } = this.state
-    console.log(sql)
-    console.log(results.selected_columns)
-    console.log(datasetToOverwrite)
 
     // HACK: to clear the columns in the previous dataset and update
     // it with the new selected columns from the query
@@ -231,16 +227,12 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleSaveInDataset() {
-    console.log('Saving dataset');
-    console.log(this.state.saveDatasetRadioBtnState)
+    // if user wants to overwrite a dataset we need to prompt them
     if (this.state.saveDatasetRadioBtnState === 2) {
       this.setState({overwriteDataSet: true})
-      console.log('make sure user is okay with overwriting')
       return
     }
 
-    console.log(this.props.query);
-    console.log(this.props.actions.createDatasource);
     const { schema, sql, dbId, templateParams } = this.props.query;
 
     let selectedColumns;
@@ -284,7 +276,7 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleHideSaveModal() {
-    this.setState({showSaveDatasetModal: false})
+    this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
   }
 
   handleSaveDatasetRadioBtnState(e) {

From 203aa157ad611c2823f764b8f54bfd1e0cef463e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 13:50:55 -0800
Subject: [PATCH 019/138] fix filter

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 712110765c185..b24d01db34c3a 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -116,10 +116,9 @@ export default class ResultSet extends React.PureComponent<
   componentDidMount() {
     // only do this the first time the component is rendered/mounted
     this.reRunQueryIfSessionTimeoutErrorOnMount();
-
+    const userId = 3;
     SupersetClient.get({
-      endpoint:
-        'api/v1/dataset/?q=(filters:!((col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)',
+      endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)`,
       }).then(data => {
           const userDatasetsOwned = data.json.result.map(r => {
             return { dataSetName: r.table_name, dataSetId: r.id }
@@ -211,7 +210,7 @@ export default class ResultSet extends React.PureComponent<
         columns: []
       }),
     }).then(d => {
-      console.log(d)
+        console.log(d)
     }).catch(err => console.log(err))
 
     SupersetClient.put({

From f8a34be29e118411893190d13fd71d9ceae4fc4b Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 14:03:52 -0800
Subject: [PATCH 020/138] cleaning up the coe

---
 .../src/SqlLab/components/ResultSet.tsx       | 44 ++++++++++---------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index b24d01db34c3a..24a28d59d6b35 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -116,16 +116,18 @@ export default class ResultSet extends React.PureComponent<
   componentDidMount() {
     // only do this the first time the component is rendered/mounted
     this.reRunQueryIfSessionTimeoutErrorOnMount();
+
+    // Todo: figure out how to get user information to properly query datasets they own
+    // Todo: move this to actions file
     const userId = 3;
     SupersetClient.get({
       endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)`,
-      }).then(data => {
-          const userDatasetsOwned = data.json.result.map(r => {
-            return { dataSetName: r.table_name, dataSetId: r.id }
-          })
-          this.setState({userDatasetsOwned})
+    }).then(data => {
+      const userDatasetsOwned = data.json.result.map(r => {
+        return { dataSetName: r.table_name, dataSetId: r.id };
+      });
+      this.setState({ userDatasetsOwned })
     });
-
   }
 
   UNSAFE_componentWillReceiveProps(nextProps: ResultSetProps) {
@@ -193,7 +195,6 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleOverwriteDatasetOption(data, option) {
-    console.log(option);
     this.setState({ datasetToOverwrite: option })
   }
 
@@ -203,15 +204,18 @@ export default class ResultSet extends React.PureComponent<
 
     // HACK: to clear the columns in the previous dataset and update
     // it with the new selected columns from the query
+    // Todo: move this to actions file
     SupersetClient.put({
       endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
-        columns: []
+        columns: [],
       }),
-    }).then(d => {
-        console.log(d)
-    }).catch(err => console.log(err))
+    })
+      .then(d => {
+        console.log(d);
+      })
+      .catch(err => console.log(err));
 
     SupersetClient.put({
       endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
@@ -221,20 +225,21 @@ export default class ResultSet extends React.PureComponent<
         columns: results.selected_columns.map(d => ({column_name: d.name}))
       }),
     }).then(d => {
-      console.log(d)
-    }).catch(err => console.log(err))
+        console.log(d);
+      })
+      .catch(err => console.log(err));
   }
 
   handleSaveInDataset() {
     // if user wants to overwrite a dataset we need to prompt them
     if (this.state.saveDatasetRadioBtnState === 2) {
       this.setState({overwriteDataSet: true})
-      return
+      return;
     }
 
     const { schema, sql, dbId, templateParams } = this.props.query;
 
-    let selectedColumns;
+    let selectedColumns: any[];
     if (
       this.props.query &&
       this.props.query.results &&
@@ -253,8 +258,8 @@ export default class ResultSet extends React.PureComponent<
         templateParams,
         datasourceName: this.state.newSaveDatasetName,
         columns: selectedColumns,
-    }).then(data => {
-        console.log('Create datasource successfully');
+      })
+      .then((data: { table_id: any }) => {
         exploreChart({
           datasource: `${data.table_id}__table`,
           metrics: [],
@@ -263,8 +268,8 @@ export default class ResultSet extends React.PureComponent<
           viz_type: 'table',
           all_columns: selectedColumns.map(c => c.name),
           row_limit: 1000,
-        })
-      }).catch(error => {
+        });
+      }).catch((error: any) => {
         console.log('an error occurred trying to create a datasource');
         console.log(error);
       });
@@ -294,7 +299,6 @@ export default class ResultSet extends React.PureComponent<
       }
 
       const { showSaveDatasetModal } = this.state;
-      console.log(this.state.overwriteDataSet)
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal

From 066054eb30964c97f9bbe8874652cdb3018b4218 Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 14:09:17 -0800
Subject: [PATCH 021/138] Delete preset.code-workspace

---
 .../explore/components/controls/preset.code-workspace  | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 superset-frontend/src/explore/components/controls/preset.code-workspace

diff --git a/superset-frontend/src/explore/components/controls/preset.code-workspace b/superset-frontend/src/explore/components/controls/preset.code-workspace
deleted file mode 100644
index 419b3b4976b55..0000000000000
--- a/superset-frontend/src/explore/components/controls/preset.code-workspace
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "folders": [
-        {
-            "path": "../../../../.."
-        },
-        {
-            "path": "../../../../../../superset-shell"
-        }
-    ]
-}

From 482353f02420d5fc5a3baeacc56bf6dc4869dabc Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 14:11:41 -0800
Subject: [PATCH 022/138] remove unused code

---
 .../components/ExploreResultsButton.jsx       | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
index cf9a8192e82de..6663b0e5926fe 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
@@ -46,48 +46,12 @@ class ExploreResultsButton extends React.PureComponent {
   constructor(props) {
     super(props);
     this.visualize = this.visualize.bind(this);
-    // this.onClick = this.onClick.bind(this);
     this.getInvalidColumns = this.getInvalidColumns.bind(this);
     this.renderInvalidColumnMessage = this.renderInvalidColumnMessage.bind(
       this,
     );
   }
 
-  onClick() {
-    console.log('in onclick')
-    // const { timeout } = this.props;
-    // const msg = this.renderInvalidColumnMessage();
-    // if (Math.round(this.getQueryDuration()) > timeout) {
-    //   this.dialog.show({
-    //     title: t('Explore'),
-    //     body: this.renderTimeoutWarning(),
-    //     actions: [
-    //       Dialog.CancelAction(),
-    //       Dialog.OKAction(() => {
-    //         this.visualize();
-    //       }),
-    //     ],
-    //     bsSize: 'large',
-    //     onHide: dialog => {
-    //       dialog.hide();
-    //     },
-    //   });
-    // } else if (msg) {
-    //   this.dialog.show({
-    //     title: t('Explore'),
-    //     body: msg,
-    //     actions: [Dialog.DefaultAction('Ok', () => {})],
-    //     bsSize: 'large',
-    //     bsStyle: 'warning',
-    //     onHide: dialog => {
-    //       dialog.hide();
-    //     },
-    //   });
-    // } else {
-    //   this.visualize();
-    // }
-  }
-
   getColumns() {
     const { props } = this;
     if (

From cc5dfff82935a9b1fc3186239c1db148c3d6ba64 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 14:12:48 -0800
Subject: [PATCH 023/138] remove visualize

---
 .../components/ExploreResultsButton.jsx       | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
index 6663b0e5926fe..fa724273da1ad 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
@@ -45,7 +45,6 @@ const defaultProps = {
 class ExploreResultsButton extends React.PureComponent {
   constructor(props) {
     super(props);
-    this.visualize = this.visualize.bind(this);
     this.getInvalidColumns = this.getInvalidColumns.bind(this);
     this.renderInvalidColumnMessage = this.renderInvalidColumnMessage.bind(
       this,
@@ -102,35 +101,6 @@ class ExploreResultsButton extends React.PureComponent {
     };
   }
 
-  visualize() {
-    this.props.actions
-      .createDatasource(this.buildVizOptions())
-      .then(data => {
-        const columns = this.getColumns();
-        const formData = {
-          datasource: `${data.table_id}__table`,
-          metrics: [],
-          groupby: [],
-          time_range: 'No filter',
-          viz_type: 'table',
-          all_columns: columns.map(c => c.name),
-          row_limit: 1000,
-        };
-
-        this.props.actions.addInfoToast(
-          t('Creating a data source and creating a new tab'),
-        );
-
-        // open new window for data visualization
-        exploreChart(formData);
-      })
-      .catch(() => {
-        this.props.actions.addDangerToast(
-          this.props.errorMessage || t('An error occurred'),
-        );
-      });
-  }
-
   renderTimeoutWarning() {
     return (
       <Alert bsStyle="warning">

From 616480beb2f06c8e6e92aeec5297cbcf1f49fcf8 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 14:37:55 -0800
Subject: [PATCH 024/138] update default value

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx        | 4 ++++
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 24a28d59d6b35..6428152bc80c8 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -299,6 +299,9 @@ export default class ResultSet extends React.PureComponent<
       }
 
       const { showSaveDatasetModal } = this.state;
+
+      console.log(this.props)
+
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
@@ -313,6 +316,7 @@ export default class ResultSet extends React.PureComponent<
             handleOverwriteCancel={this.handleOverwriteCancel}
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}
+            defaultCreateDatasetValue={`${this.props.query.tab}_${Date.now()}`}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 7f9ce1d15784a..21982c0352566 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -33,7 +33,7 @@ interface SaveDatasetModalProps = {
 }
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption}) => {
+export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption, defaultCreateDatasetValue}) => {
   const [options, setOptions] = useState([]);
   const [radioOption, setRadioOptions] = useState(1);
 
@@ -96,7 +96,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
         <Radio.Group onChange={handleSaveDatasetRadioBtnState} value={saveDatasetRadioBtnState}>
           <Radio style={radioStyle} value={1}>
             Save as new dataset
-            <Input style={{ width: 200 }} defaultValue="my_new_dataset_A" onChange={handleDatasetNameChange} />
+            <Input style={{ width: 200 }} defaultValue={defaultCreateDatasetValue} onChange={handleDatasetNameChange} />
           </Radio>
           <Radio style={radioStyle} value={2}>
             Overwrite existing dataset

From c6f17dc80788fe3a96904042a8145cb01f8e22c3 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 17:04:14 -0800
Subject: [PATCH 025/138] remove unneeded vars

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx       | 3 ---
 .../src/SqlLab/components/SaveDatasetModal.tsx              | 6 ------
 2 files changed, 9 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 6428152bc80c8..a358a17accc86 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -299,9 +299,6 @@ export default class ResultSet extends React.PureComponent<
       }
 
       const { showSaveDatasetModal } = this.state;
-
-      console.log(this.props)
-
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 21982c0352566..3ae83181259ce 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -23,12 +23,6 @@ import Modal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
 import { SupersetClient } from '@superset-ui/core';
 
-const mockVal = (str, repeat = 1) => {
-  return {
-    value: str.repeat(repeat),
-  };
-};
-
 interface SaveDatasetModalProps = {
 }
 

From 251b82909bb3ee9fa5ef4875af18b42762f60c96 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 17:05:20 -0800
Subject: [PATCH 026/138] checkout package-lock.json

---
 superset-frontend/package-lock.json | 114 ++++++++++++++--------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index c437e3cb46358..ea758d431db26 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -21829,28 +21829,28 @@
           "dependencies": {
             "abbrev": {
               "version": "1.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
               "dev": true,
               "optional": true
             },
             "ansi-regex": {
               "version": "2.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
               "dev": true,
               "optional": true
             },
             "aproba": {
               "version": "1.2.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
               "dev": true,
               "optional": true
             },
             "are-we-there-yet": {
               "version": "1.1.5",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
               "dev": true,
               "optional": true,
@@ -21861,14 +21861,14 @@
             },
             "balanced-match": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
               "dev": true,
               "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
               "dev": true,
               "optional": true,
@@ -21879,35 +21879,35 @@
             },
             "code-point-at": {
               "version": "1.1.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
               "dev": true,
               "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
               "dev": true,
               "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
               "dev": true,
               "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
               "dev": true,
               "optional": true
             },
             "debug": {
               "version": "4.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
               "dev": true,
               "optional": true,
@@ -21917,35 +21917,35 @@
             },
             "deep-extend": {
               "version": "0.6.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
               "dev": true,
               "optional": true
             },
             "delegates": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
               "dev": true,
               "optional": true
             },
             "detect-libc": {
               "version": "1.0.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
               "dev": true,
               "optional": true
             },
             "fs.realpath": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
               "dev": true,
               "optional": true
             },
             "gauge": {
               "version": "2.7.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
               "dev": true,
               "optional": true,
@@ -21962,7 +21962,7 @@
             },
             "glob": {
               "version": "7.1.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
               "dev": true,
               "optional": true,
@@ -21977,14 +21977,14 @@
             },
             "has-unicode": {
               "version": "2.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
               "dev": true,
               "optional": true
             },
             "iconv-lite": {
               "version": "0.4.24",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
               "dev": true,
               "optional": true,
@@ -21994,7 +21994,7 @@
             },
             "ignore-walk": {
               "version": "3.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
               "dev": true,
               "optional": true,
@@ -22004,7 +22004,7 @@
             },
             "inflight": {
               "version": "1.0.6",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
               "dev": true,
               "optional": true,
@@ -22015,21 +22015,21 @@
             },
             "inherits": {
               "version": "2.0.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
               "dev": true,
               "optional": true
             },
             "ini": {
               "version": "1.3.5",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
               "dev": true,
               "optional": true
             },
             "is-fullwidth-code-point": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
               "dev": true,
               "optional": true,
@@ -22039,14 +22039,14 @@
             },
             "isarray": {
               "version": "1.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
               "dev": true,
               "optional": true
             },
             "minimatch": {
               "version": "3.0.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
               "dev": true,
               "optional": true,
@@ -22063,14 +22063,14 @@
             },
             "ms": {
               "version": "2.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
               "dev": true,
               "optional": true
             },
             "needle": {
               "version": "2.3.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
               "dev": true,
               "optional": true,
@@ -22082,7 +22082,7 @@
             },
             "node-pre-gyp": {
               "version": "0.12.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
               "dev": true,
               "optional": true,
@@ -22101,7 +22101,7 @@
             },
             "nopt": {
               "version": "4.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
               "dev": true,
               "optional": true,
@@ -22112,14 +22112,14 @@
             },
             "npm-bundled": {
               "version": "1.0.6",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
               "dev": true,
               "optional": true
             },
             "npm-packlist": {
               "version": "1.4.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
               "dev": true,
               "optional": true,
@@ -22130,7 +22130,7 @@
             },
             "npmlog": {
               "version": "4.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
               "dev": true,
               "optional": true,
@@ -22143,21 +22143,21 @@
             },
             "number-is-nan": {
               "version": "1.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
               "dev": true,
               "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
               "dev": true,
               "optional": true
             },
             "once": {
               "version": "1.4.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
               "dev": true,
               "optional": true,
@@ -22167,21 +22167,21 @@
             },
             "os-homedir": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
               "dev": true,
               "optional": true
             },
             "os-tmpdir": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
               "dev": true,
               "optional": true
             },
             "osenv": {
               "version": "0.1.5",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
               "dev": true,
               "optional": true,
@@ -22192,21 +22192,21 @@
             },
             "path-is-absolute": {
               "version": "1.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
               "dev": true,
               "optional": true
             },
             "process-nextick-args": {
               "version": "2.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
               "dev": true,
               "optional": true
             },
             "rc": {
               "version": "1.2.8",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
               "dev": true,
               "optional": true,
@@ -22219,7 +22219,7 @@
             },
             "readable-stream": {
               "version": "2.3.6",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
               "dev": true,
               "optional": true,
@@ -22235,7 +22235,7 @@
             },
             "rimraf": {
               "version": "2.6.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
               "dev": true,
               "optional": true,
@@ -22245,49 +22245,49 @@
             },
             "safe-buffer": {
               "version": "5.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
               "dev": true,
               "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
               "dev": true,
               "optional": true
             },
             "sax": {
               "version": "1.2.4",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
               "dev": true,
               "optional": true
             },
             "semver": {
               "version": "5.7.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
               "dev": true,
               "optional": true
             },
             "set-blocking": {
               "version": "2.0.0",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
               "dev": true,
               "optional": true
             },
             "signal-exit": {
               "version": "3.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
               "dev": true,
               "optional": true
             },
             "string-width": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
               "dev": true,
               "optional": true,
@@ -22299,7 +22299,7 @@
             },
             "string_decoder": {
               "version": "1.1.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
               "dev": true,
               "optional": true,
@@ -22309,7 +22309,7 @@
             },
             "strip-ansi": {
               "version": "3.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
               "dev": true,
               "optional": true,
@@ -22319,21 +22319,21 @@
             },
             "strip-json-comments": {
               "version": "2.0.1",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
               "dev": true,
               "optional": true
             },
             "util-deprecate": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
               "dev": true,
               "optional": true
             },
             "wide-align": {
               "version": "1.1.3",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
               "dev": true,
               "optional": true,
@@ -22343,7 +22343,7 @@
             },
             "wrappy": {
               "version": "1.0.2",
-              "resolved": "",
+              "resolved": false,
               "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
               "dev": true,
               "optional": true

From 14b2a71b05c282107bddfd2cfbc6d0d83539e503 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 17:45:26 -0800
Subject: [PATCH 027/138] linting

---
 superset/views/core.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/superset/views/core.py b/superset/views/core.py
index fbfac7cb944e2..e12e50c248cce 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -2729,6 +2729,8 @@ def sqllab(self) -> FlaskResponse:
                 payload["requested_query"] = json.loads(form_data)
             except json.JSONDecodeError:
                 pass
+
+        payload["user"] = bootstrap_user_data(g.user)
         bootstrap_data = json.dumps(
             payload, default=utils.pessimistic_json_iso_dttm_ser
         )

From 2c99c7f4ad73342b7fbec8c04c91f7eb3c729091 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 18:30:50 -0800
Subject: [PATCH 028/138] get user id

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx    | 9 ++++++---
 superset-frontend/src/SqlLab/reducers/getInitialState.js | 2 ++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index a358a17accc86..d03297831105f 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -94,7 +94,7 @@ export default class ResultSet extends React.PureComponent<
       userDatasetsOwned: [],
       saveDatasetRadioBtnState: 1,
       overwriteDataSet: false,
-      datasetToOverwrite: {}
+      datasetToOverwrite: {},
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -117,11 +117,14 @@ export default class ResultSet extends React.PureComponent<
     // only do this the first time the component is rendered/mounted
     this.reRunQueryIfSessionTimeoutErrorOnMount();
 
+    // Hack: waiting for talks with tai to pull data out of the initial state
+    const appContainer = document.getElementById('app');
+    const bootstrapData = JSON.parse(appContainer.getAttribute('data-bootstrap'));
+
     // Todo: figure out how to get user information to properly query datasets they own
     // Todo: move this to actions file
-    const userId = 3;
     SupersetClient.get({
-      endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)`,
+      endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${bootstrapData.user.userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)`,
     }).then(data => {
       const userDatasetsOwned = data.json.result.map(r => {
         return { dataSetName: r.table_name, dataSetId: r.id };
diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js
index 14efdeef912a8..831df3ba3a7d2 100644
--- a/superset-frontend/src/SqlLab/reducers/getInitialState.js
+++ b/superset-frontend/src/SqlLab/reducers/getInitialState.js
@@ -27,6 +27,7 @@ export default function getInitialState({
   databases,
   queries: queries_,
   requested_query: requestedQuery,
+  user,
 }) {
   /**
    * Before YYYY-MM-DD, the state for SQL Lab was stored exclusively in the
@@ -190,5 +191,6 @@ export default function getInitialState({
       flash_messages: common.flash_messages,
       conf: common.conf,
     },
+    user,
   };
 }

From c02a8181344744a76b1eda6776dcecf3e1fde5b9 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 19 Nov 2020 18:32:42 -0800
Subject: [PATCH 029/138] remove page filter

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index d03297831105f..f8c87cac76d38 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -124,7 +124,7 @@ export default class ResultSet extends React.PureComponent<
     // Todo: figure out how to get user information to properly query datasets they own
     // Todo: move this to actions file
     SupersetClient.get({
-      endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${bootstrapData.user.userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0,page_size:25)`,
+      endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${bootstrapData.user.userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0)`,
     }).then(data => {
       const userDatasetsOwned = data.json.result.map(r => {
         return { dataSetName: r.table_name, dataSetId: r.id };

From 4ad9bee75e75c5d537f0def86f2464337ce949ac Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 20 Nov 2020 13:45:13 -0800
Subject: [PATCH 030/138] setup proper call for updating columns in dataset

---
 .../src/SqlLab/components/ResultSet.tsx       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index f8c87cac76d38..d96aaa1aeb75d 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -205,32 +205,26 @@ export default class ResultSet extends React.PureComponent<
     const { sql, results } = this.props.query;
     const { datasetToOverwrite } = this.state
 
-    // HACK: to clear the columns in the previous dataset and update
-    // it with the new selected columns from the query
-    // Todo: move this to actions file
-    SupersetClient.put({
-      endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        columns: [],
-      }),
-    })
-      .then(d => {
-        console.log(d);
-      })
-      .catch(err => console.log(err));
-
     SupersetClient.put({
       endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         sql,
         columns: results.selected_columns.map(d => ({column_name: d.name}))
+        //columns: []
       }),
     }).then(d => {
         console.log(d);
       })
       .catch(err => console.log(err));
+
+    // sync columns for dataset
+    // SupersetClient.get({
+    //   endpoint: `/datasource/external_metadata/table/${datasetToOverwrite.dataSetId}`,
+    //   headers: { 'Content-Type': 'application/json' },
+    // }).then(d => {
+    //   console.log(d);
+    // }).catch(err => console.log(err));
   }
 
   handleSaveInDataset() {

From 98fa585039b7414ba22d5c0f6358e1409b6767a6 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 20 Nov 2020 13:49:30 -0800
Subject: [PATCH 031/138] add move to explore flow

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index d96aaa1aeb75d..1ab14b113ae99 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -215,9 +215,20 @@ export default class ResultSet extends React.PureComponent<
       }),
     }).then(d => {
         console.log(d);
+        exploreChart({
+          datasource: `${datasetToOverwrite.dataSetId}__table`,
+          metrics: [],
+          groupby: [],
+          time_range: 'No filter',
+          viz_type: 'table',
+          all_columns: results.selected_columns.map(d => d.name) // selectedColumns.map(c => c.name),
+          row_limit: 1000,
+        });
       })
       .catch(err => console.log(err));
 
+      this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
+
     // sync columns for dataset
     // SupersetClient.get({
     //   endpoint: `/datasource/external_metadata/table/${datasetToOverwrite.dataSetId}`,

From 2a8cca1c8bf656d102d4194757e9fde9c6741dc9 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 20 Nov 2020 15:03:25 -0800
Subject: [PATCH 032/138] linting

---
 superset/datasets/api.py             | 13 ++++++++++-
 superset/datasets/commands/update.py | 33 +++++++++++++++++++---------
 superset/datasets/dao.py             | 15 +++++++++++--
 3 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index 1decc707ac032..a2f10f92c038a 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -248,6 +248,10 @@ def put(self, pk: int) -> Response:
             schema:
               type: integer
             name: pk
+          - in: path
+            schema:
+              type: bool
+            name: override_column
           requestBody:
             description: Dataset schema
             required: true
@@ -280,6 +284,11 @@ def put(self, pk: int) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
+        override_column = (
+            request.args["override_column"]
+            if request.args.get("override_column")
+            else False
+        )
         if not request.is_json:
             return self.response_400(message="Request is not JSON")
         try:
@@ -288,7 +297,9 @@ def put(self, pk: int) -> Response:
         except ValidationError as error:
             return self.response_400(message=error.messages)
         try:
-            changed_model = UpdateDatasetCommand(g.user, pk, item).run()
+            changed_model = UpdateDatasetCommand(
+                g.user, pk, item, override_column
+            ).run()
             response = self.response(200, id=changed_model.id, result=item)
         except DatasetNotFoundError:
             response = self.response_404()
diff --git a/superset/datasets/commands/update.py b/superset/datasets/commands/update.py
index dfc3986c09f22..809720ed6ab39 100644
--- a/superset/datasets/commands/update.py
+++ b/superset/datasets/commands/update.py
@@ -16,7 +16,7 @@
 # under the License.
 import logging
 from collections import Counter
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from flask_appbuilder.models.sqla import Model
 from flask_appbuilder.security.sqla.models import User
@@ -48,17 +48,28 @@
 
 
 class UpdateDatasetCommand(BaseCommand):
-    def __init__(self, user: User, model_id: int, data: Dict[str, Any]):
+    def __init__(
+        self,
+        user: User,
+        model_id: int,
+        data: Dict[str, Any],
+        override_columns: Union[bool, Any, None] = False,
+    ):
         self._actor = user
         self._model_id = model_id
         self._properties = data.copy()
         self._model: Optional[SqlaTable] = None
+        self.override_columns = override_columns
 
     def run(self) -> Model:
         self.validate()
         if self._model:
             try:
-                dataset = DatasetDAO.update(self._model, self._properties)
+                dataset = DatasetDAO.update(
+                    self._model,
+                    self._properties,
+                    override_columns=self.override_columns,
+                )
                 return dataset
             except DAOUpdateFailedError as ex:
                 logger.exception(ex.exception)
@@ -123,14 +134,16 @@ def _validate_columns(
             ]
             if not DatasetDAO.validate_columns_exist(self._model_id, columns_ids):
                 exceptions.append(DatasetColumnNotFoundValidationError())
+
             # validate new column names uniqueness
-            columns_names: List[str] = [
-                column["column_name"] for column in columns if "id" not in column
-            ]
-            if not DatasetDAO.validate_columns_uniqueness(
-                self._model_id, columns_names
-            ):
-                exceptions.append(DatasetColumnsExistsValidationError())
+            if not self.override_columns:
+                columns_names: List[str] = [
+                    column["column_name"] for column in columns if "id" not in column
+                ]
+                if not DatasetDAO.validate_columns_uniqueness(
+                    self._model_id, columns_names
+                ):
+                    exceptions.append(DatasetColumnsExistsValidationError())
 
     def _validate_metrics(
         self, metrics: List[Dict[str, Any]], exceptions: List[ValidationError]
diff --git a/superset/datasets/dao.py b/superset/datasets/dao.py
index 3b905f450cd0f..22526e92079bf 100644
--- a/superset/datasets/dao.py
+++ b/superset/datasets/dao.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Union
 
 from flask import current_app
 from sqlalchemy.exc import SQLAlchemyError
@@ -144,7 +144,11 @@ def validate_metrics_uniqueness(dataset_id: int, metrics_names: List[str]) -> bo
 
     @classmethod
     def update(
-        cls, model: SqlaTable, properties: Dict[str, Any], commit: bool = True
+        cls,
+        model: SqlaTable,
+        properties: Dict[str, Any],
+        commit: bool = True,
+        override_columns: Union[bool, Any, None] = False,
     ) -> Optional[SqlaTable]:
         """
         Updates a Dataset model on the metadata DB
@@ -175,6 +179,13 @@ def update(
                 new_metrics.append(metric_obj)
             properties["metrics"] = new_metrics
 
+        if override_columns:
+            # remove columns initially for full refresh
+            original_properties = properties["columns"]
+            properties["columns"] = []
+            super().update(model, properties, commit=commit)
+            properties["columns"] = original_properties
+
         return super().update(model, properties, commit=commit)
 
     @classmethod

From ef9693953e6da38816a18584830670a0e25064b6 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 09:57:27 -0800
Subject: [PATCH 033/138] add param for overriding columns

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 1ab14b113ae99..fe5870bf5a5ac 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -206,7 +206,7 @@ export default class ResultSet extends React.PureComponent<
     const { datasetToOverwrite } = this.state
 
     SupersetClient.put({
-      endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}`,
+      endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}?override_column=true`,
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
         sql,

From 140227c60e628dfc7b76ca01366a21aa218c7ee4 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 11:59:40 -0800
Subject: [PATCH 034/138] linting

---
 .../SqlLab/components/SaveDatasetModal.tsx    | 158 ++++++++++--------
 1 file changed, 87 insertions(+), 71 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 3ae83181259ce..8caed25190e62 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -19,17 +19,38 @@
 
 import React, { useState, FunctionComponent} from 'react';
 import { Radio, AutoComplete, Input } from 'src/common/components';
-import Modal from 'src/common/components/Modal';
+import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
-import { SupersetClient } from '@superset-ui/core';
+import { styled } from '@superset-ui/core';
 
 interface SaveDatasetModalProps = {
 }
 
+const Styles = styled.div`
+    .smd-input {
+      margin-left: 45px;
+      width: 290px;
+    }
+    .smd-autocomplete {
+      margin-left: 8px;
+      width: 290px;
+    }
+    .smd-radio {
+      display: block;
+      height: 30px;
+      margin: 10px 0px;
+      line-height: 30px;
+    }
+    .smd-body {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+`;
+
 // eslint-disable-next-line no-empty-pattern
 export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption, defaultCreateDatasetValue}) => {
   const [options, setOptions] = useState([]);
-  const [radioOption, setRadioOptions] = useState(1);
 
   const onSearch = (searchText) => {
     console.log(userDatasetsOwned)
@@ -42,77 +63,72 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
     return option.value.includes(inputValue)
   }
 
-  const radioStyle = {
-    display: 'block',
-    height: '30px',
-    lineHeight: '30px',
-  };
 
   return (
-    <Modal
-      show={visible}
-      onHide={() => {}}
-      title="Save a new dataset"
-      onCancel={onCancel}
-      footer={
-      <>
-       {!overwriteDataSet &&
-          <Button
-            buttonSize="sm"
-            buttonStyle="primary"
-            className="m-r-5"
-            onClick={onOk}
-          >
-            Save & Explore
-          </Button>
-        }
-        {overwriteDataSet && <> <Button
-            buttonSize="sm"
-            buttonStyle="danger"
-            className="m-r-5"
-            onClick={() => {
-              handleOverwriteCancel()
-            }}
-          >Cancel</Button>
-          <Button
-            buttonSize="sm"
-            buttonStyle="primary"
-            className="m-r-5"
-            onClick={handleOverwriteDataset}
-          >Ok</Button> </>}
-      </>
-    }
-    >
-      {!overwriteDataSet && <div>
-        <div>
-          To explore the results of this query, we need to save it as a virtual dataset
-        </div>
-        <Radio.Group onChange={handleSaveDatasetRadioBtnState} value={saveDatasetRadioBtnState}>
-          <Radio style={radioStyle} value={1}>
-            Save as new dataset
-            <Input style={{ width: 200 }} defaultValue={defaultCreateDatasetValue} onChange={handleDatasetNameChange} />
-          </Radio>
-          <Radio style={radioStyle} value={2}>
-            Overwrite existing dataset
-            <AutoComplete
-              options={options}
-              style={{
-                width: 200,
+      <StyledModal
+        show={visible}
+        onHide={() => {}}
+        title="Save a new dataset"
+        onCancel={onCancel}
+        footer={
+        <>
+        {!overwriteDataSet &&
+            <Button
+              buttonSize="sm"
+              buttonStyle="primary"
+              className="m-r-5"
+              onClick={onOk}
+            >
+              Save & Explore
+            </Button>
+          }
+          {overwriteDataSet && <> <Button
+              buttonSize="sm"
+              buttonStyle="danger"
+              className="m-r-5"
+              onClick={() => {
+                handleOverwriteCancel()
               }}
-              onSelect={handleOverwriteDatasetOption}
-              onSearch={onSearch}
-              placeholder="input here"
-              filterOption={filterAutocompleteOption}
-            />
-          </Radio>
-        </Radio.Group>
-        </div>
-      }
-      {overwriteDataSet &&
-        <div>
-          Are you sure you want to overwrite this dataset?
-        </div>
+            >Cancel</Button>
+            <Button
+              buttonSize="sm"
+              buttonStyle="primary"
+              className="m-r-5"
+              onClick={handleOverwriteDataset}
+            >Ok</Button> </>}
+        </>
       }
-    </Modal>
+      >
+      <Styles>
+        {!overwriteDataSet && <div className="smd-body">
+          <div className="smd-prompt">
+            To explore the results of this query, we need to save it as a virtual dataset
+          </div>
+          <Radio.Group onChange={handleSaveDatasetRadioBtnState} value={saveDatasetRadioBtnState}>
+            <Radio className="smd-radio" value={1}>
+              Save as new dataset
+              <Input className="smd-input" defaultValue={defaultCreateDatasetValue} onChange={handleDatasetNameChange} />
+            </Radio>
+            <Radio className="smd-radio" value={2}>
+              Overwrite existing dataset
+              <AutoComplete
+                className="smd-autocomplete"
+                options={options}
+                onSelect={handleOverwriteDatasetOption}
+                onSearch={onSearch}
+                placeholder="input here"
+                filterOption={filterAutocompleteOption}
+              />
+            </Radio>
+          </Radio.Group>
+          </div>
+        }
+        {overwriteDataSet &&
+          <div>
+            Are you sure you want to overwrite this dataset?
+          </div>
+        }
+        </Styles>
+      </StyledModal>
   );
 };

From 56d4648d2bcca84376b253adf60ebfa2e867da32 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 14:53:44 -0800
Subject: [PATCH 035/138] change title

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 8caed25190e62..d0940807a9aa0 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -68,7 +68,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
       <StyledModal
         show={visible}
         onHide={() => {}}
-        title="Save a new dataset"
+        title="Save or Overwrite Datasets"
         onCancel={onCancel}
         footer={
         <>

From acb255a4673712b156f29fea74b0ee71dcfc600b Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 15:28:53 -0800
Subject: [PATCH 036/138] fix some tings

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx  |  5 +++--
 .../src/SqlLab/components/SaveDatasetModal.tsx         | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index fe5870bf5a5ac..af3d071049fda 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -306,7 +306,8 @@ export default class ResultSet extends React.PureComponent<
         ({ data } = this.state);
       }
 
-      const { showSaveDatasetModal } = this.state;
+      const defaultCreateDatasetValue = `${this.props.query.tab} ${new Date().toLocaleString().replace(',', '')}`
+
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
@@ -321,7 +322,7 @@ export default class ResultSet extends React.PureComponent<
             handleOverwriteCancel={this.handleOverwriteCancel}
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}
-            defaultCreateDatasetValue={`${this.props.query.tab}_${Date.now()}`}
+            defaultCreateDatasetValue={defaultCreateDatasetValue}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index d0940807a9aa0..1fd5bad4b4cad 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -68,7 +68,7 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
       <StyledModal
         show={visible}
         onHide={() => {}}
-        title="Save or Overwrite Datasets"
+        title="Save or Overwrite Dataset"
         onCancel={onCancel}
         footer={
         <>
@@ -102,21 +102,21 @@ export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel,
       <Styles>
         {!overwriteDataSet && <div className="smd-body">
           <div className="smd-prompt">
-            To explore the results of this query, we need to save it as a virtual dataset
+            Save this query as virtual dataset to continue exploring.
           </div>
           <Radio.Group onChange={handleSaveDatasetRadioBtnState} value={saveDatasetRadioBtnState}>
             <Radio className="smd-radio" value={1}>
-              Save as new dataset
+              Save as new
               <Input className="smd-input" defaultValue={defaultCreateDatasetValue} onChange={handleDatasetNameChange} />
             </Radio>
             <Radio className="smd-radio" value={2}>
-              Overwrite existing dataset
+              Overwrite existing
               <AutoComplete
                 className="smd-autocomplete"
                 options={options}
                 onSelect={handleOverwriteDatasetOption}
                 onSearch={onSearch}
-                placeholder="input here"
+                placeholder="Select or type dataset name"
                 filterOption={filterAutocompleteOption}
               />
             </Radio>

From 546dd2a5444ca837ef7d99ef06ee2d93fe2d5815 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 16:06:39 -0800
Subject: [PATCH 037/138] cleanup

---
 .../src/SqlLab/components/ResultSet.tsx              | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index af3d071049fda..bc14f609e1962 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -211,10 +211,8 @@ export default class ResultSet extends React.PureComponent<
       body: JSON.stringify({
         sql,
         columns: results.selected_columns.map(d => ({column_name: d.name}))
-        //columns: []
       }),
     }).then(d => {
-        console.log(d);
         exploreChart({
           datasource: `${datasetToOverwrite.dataSetId}__table`,
           metrics: [],
@@ -225,17 +223,9 @@ export default class ResultSet extends React.PureComponent<
           row_limit: 1000,
         });
       })
-      .catch(err => console.log(err));
+      .catch(err => alert(err));
 
       this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
-
-    // sync columns for dataset
-    // SupersetClient.get({
-    //   endpoint: `/datasource/external_metadata/table/${datasetToOverwrite.dataSetId}`,
-    //   headers: { 'Content-Type': 'application/json' },
-    // }).then(d => {
-    //   console.log(d);
-    // }).catch(err => console.log(err));
   }
 
   handleSaveInDataset() {

From c1a2615386a01c8d8eeb17298c4d9ce1d6bb1a00 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 16:22:48 -0800
Subject: [PATCH 038/138] linting

---
 .../src/SqlLab/components/ResultSet.tsx       | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index bc14f609e1962..5fc3873b16f7d 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -129,7 +129,7 @@ export default class ResultSet extends React.PureComponent<
       const userDatasetsOwned = data.json.result.map(r => {
         return { dataSetName: r.table_name, dataSetId: r.id };
       });
-      this.setState({ userDatasetsOwned })
+      this.setState({ userDatasetsOwned });
     });
   }
 
@@ -203,7 +203,7 @@ export default class ResultSet extends React.PureComponent<
 
   handleOverwriteDataset() {
     const { sql, results } = this.props.query;
-    const { datasetToOverwrite } = this.state
+    const { datasetToOverwrite } = this.state;
 
     SupersetClient.put({
       endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}?override_column=true`,
@@ -219,13 +219,13 @@ export default class ResultSet extends React.PureComponent<
           groupby: [],
           time_range: 'No filter',
           viz_type: 'table',
-          all_columns: results.selected_columns.map(d => d.name) // selectedColumns.map(c => c.name),
+          all_columns: results.selected_columns.map(d => d.name),
           row_limit: 1000,
         });
       })
       .catch(err => alert(err));
 
-      this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
+    this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
   }
 
   handleSaveInDataset() {
@@ -273,16 +273,16 @@ export default class ResultSet extends React.PureComponent<
       });
   }
 
-  handleDatasetNameChange(e) {
-    this.setState({ newSaveDatasetName: e.target.value })
+  handleDatasetNameChange(e: { target: { value: any } }) {
+    this.setState({ newSaveDatasetName: e.target.value });
   }
 
   handleHideSaveModal() {
     this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
   }
 
-  handleSaveDatasetRadioBtnState(e) {
-    this.setState({saveDatasetRadioBtnState: e.target.value});
+  handleSaveDatasetRadioBtnState(e: { target: { value: any } }) {
+    this.setState({ saveDatasetRadioBtnState: e.target.value });
   }
 
   handleOverwriteCancel() {
@@ -296,7 +296,9 @@ export default class ResultSet extends React.PureComponent<
         ({ data } = this.state);
       }
 
-      const defaultCreateDatasetValue = `${this.props.query.tab} ${new Date().toLocaleString().replace(',', '')}`
+      const defaultCreateDatasetValue = `${
+        this.props.query.tab
+      } ${new Date().toLocaleString().replace(',', '')}`;
 
       return (
         <div className="ResultSetControls">

From 9991c602b8857ea91846bdfd0f4e41ef215596d6 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 17:00:23 -0800
Subject: [PATCH 039/138] add types in some places

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx     | 8 +++++++-
 .../src/SqlLab/components/SaveDatasetModal.tsx            | 7 +++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5fc3873b16f7d..d759a580c94dd 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -58,6 +58,12 @@ interface ResultSetState {
   searchText: string;
   showExploreResultsButton: boolean;
   data: Record<string, any>[];
+  showSaveDatasetModal: boolean;
+  newSaveDatasetName: string;
+  userDatasetsOwned: [];
+  saveDatasetRadioBtnState: number;
+  overwriteDataSet: boolean;
+  datasetToOverwrite: Record<string, any>;
 }
 
 // Making text render line breaks/tabs as is as monospace,
@@ -303,7 +309,7 @@ export default class ResultSet extends React.PureComponent<
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
-            visible={showSaveDatasetModal}
+            visible={this.state.showSaveDatasetModal}
             onOk={this.handleSaveInDataset}
             onCancel={this.handleHideSaveModal}
             handleDatasetNameChange={this.handleDatasetNameChange}
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 1fd5bad4b4cad..993a61cfafde6 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -52,14 +52,13 @@ const Styles = styled.div`
 export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption, defaultCreateDatasetValue}) => {
   const [options, setOptions] = useState([]);
 
-  const onSearch = (searchText) => {
-    console.log(userDatasetsOwned)
+  const onSearch = (searchText: any) => {
     setOptions(
-      !searchText ? [] : userDatasetsOwned.map(d => ({value: d.dataSetName, dataSetId: d.dataSetId})),
+      !searchText ? [] : userDatasetsOwned.map((d: { dataSetName: any; dataSetId: any; }) => ({value: d.dataSetName, dataSetId: d.dataSetId})),
     );
   };
 
-  const filterAutocompleteOption = (inputValue, option) => {
+  const filterAutocompleteOption = (inputValue: any, option: { value: string | any[]; }) => {
     return option.value.includes(inputValue)
   }
 

From a09f9c45d214930f63a3a6da8353a1c4b54b1485 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 19:16:41 -0800
Subject: [PATCH 040/138] save toast

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index d759a580c94dd..60ddc59f50be7 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -273,9 +273,11 @@ export default class ResultSet extends React.PureComponent<
           all_columns: selectedColumns.map(c => c.name),
           row_limit: 1000,
         });
-      }).catch((error: any) => {
-        console.log('an error occurred trying to create a datasource');
-        console.log(error);
+      })
+      .catch((error: any) => {
+        this.props.actions.addDangerToast(
+          t('An error occurred saving dataset'),
+        );
       });
   }
 

From 80179cbca668e868632b3c248f3f8805ac5d04f4 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 23 Nov 2020 20:11:53 -0800
Subject: [PATCH 041/138] use moment

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 60ddc59f50be7..c586b4530d133 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -18,6 +18,7 @@
  */
 import React, { CSSProperties } from 'react';
 import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap';
+import moment from 'moment';
 import Button from 'src/components/Button';
 import shortid from 'shortid';
 import { styled, t, SupersetClient} from '@superset-ui/core';
@@ -306,7 +307,7 @@ export default class ResultSet extends React.PureComponent<
 
       const defaultCreateDatasetValue = `${
         this.props.query.tab
-      } ${new Date().toLocaleString().replace(',', '')}`;
+      } ${moment().format('MM/DD/YYYY HH:mm:ss')}`;
 
       return (
         <div className="ResultSetControls">

From fb317937fd4d52b2d9749262956b72039615fa71 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 11:27:55 -0800
Subject: [PATCH 042/138] add error toast

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index c586b4530d133..5cafdb36dc9f8 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -230,7 +230,11 @@ export default class ResultSet extends React.PureComponent<
           row_limit: 1000,
         });
       })
-      .catch(err => alert(err));
+      .catch(() => {
+        this.props.actions.addDangerToast(
+          t('An error occurred overwriting dataset'),
+        );
+      });
 
     this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
   }
@@ -275,7 +279,7 @@ export default class ResultSet extends React.PureComponent<
           row_limit: 1000,
         });
       })
-      .catch((error: any) => {
+      .catch(() => {
         this.props.actions.addDangerToast(
           t('An error occurred saving dataset'),
         );

From fdd06e52f7dac015aeb43d29148d3320bdfc2851 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 11:37:10 -0800
Subject: [PATCH 043/138] create enum for radio states

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5cafdb36dc9f8..012738a172788 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -40,6 +40,9 @@ import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal'
 
 const SEARCH_HEIGHT = 46;
 
+const SAVE_NEW_DATASET_RADIO_STATE = 1;
+const OVERWRITE_DATASET_RADIO_STATE = 2;
+
 const LOADING_STYLES: CSSProperties = { position: 'relative', minHeight: 100 };
 
 interface ResultSetProps {
@@ -99,7 +102,7 @@ export default class ResultSet extends React.PureComponent<
       showSaveDatasetModal: false,
       newSaveDatasetName: '',
       userDatasetsOwned: [],
-      saveDatasetRadioBtnState: 1,
+      saveDatasetRadioBtnState: SAVE_NEW_DATASET_RADIO_STATE,
       overwriteDataSet: false,
       datasetToOverwrite: {},
     };
@@ -241,8 +244,8 @@ export default class ResultSet extends React.PureComponent<
 
   handleSaveInDataset() {
     // if user wants to overwrite a dataset we need to prompt them
-    if (this.state.saveDatasetRadioBtnState === 2) {
-      this.setState({overwriteDataSet: true})
+    if (this.state.saveDatasetRadioBtnState === OVERWRITE_DATASET_RADIO_STATE) {
+      this.setState({ overwriteDataSet: true });
       return;
     }
 

From a3e4cc7f806ce5469b7915deb2434e20a1b60f24 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 11:51:26 -0800
Subject: [PATCH 044/138] initial state for saving query

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx  | 10 ++++------
 .../src/SqlLab/components/SaveDatasetModal.tsx         |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 012738a172788..259a73fea2f04 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -100,7 +100,9 @@ export default class ResultSet extends React.PureComponent<
       showExploreResultsButton: false,
       data: [],
       showSaveDatasetModal: false,
-      newSaveDatasetName: '',
+      newSaveDatasetName: `${props.query.tab} ${moment().format(
+        'MM/DD/YYYY HH:mm:ss',
+      )}`,
       userDatasetsOwned: [],
       saveDatasetRadioBtnState: SAVE_NEW_DATASET_RADIO_STATE,
       overwriteDataSet: false,
@@ -312,10 +314,6 @@ export default class ResultSet extends React.PureComponent<
         ({ data } = this.state);
       }
 
-      const defaultCreateDatasetValue = `${
-        this.props.query.tab
-      } ${moment().format('MM/DD/YYYY HH:mm:ss')}`;
-
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
@@ -330,7 +328,7 @@ export default class ResultSet extends React.PureComponent<
             handleOverwriteCancel={this.handleOverwriteCancel}
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}
-            defaultCreateDatasetValue={defaultCreateDatasetValue}
+            defaultCreateDatasetValue={this.state.newSaveDatasetName}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 993a61cfafde6..06a182d998a9b 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -49,7 +49,7 @@ const Styles = styled.div`
 `;
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption, defaultCreateDatasetValue}) => {
+export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption, defaultCreateDatasetValue}) => {
   const [options, setOptions] = useState([]);
 
   const onSearch = (searchText: any) => {

From a7228bfee95b05597422adefa2ab00ab2c853d27 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 11:53:54 -0800
Subject: [PATCH 045/138] add tpying

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 259a73fea2f04..074da99337a54 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -273,7 +273,7 @@ export default class ResultSet extends React.PureComponent<
         datasourceName: this.state.newSaveDatasetName,
         columns: selectedColumns,
       })
-      .then((data: { table_id: any }) => {
+      .then((data: { table_id: number }) => {
         exploreChart({
           datasource: `${data.table_id}__table`,
           metrics: [],

From 0b1acfd5d20c5e4dbd0777c5a620e7fc76637eb8 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 11:56:40 -0800
Subject: [PATCH 046/138] addressing concerns

---
 .../src/SqlLab/components/ResultSet.tsx              | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 074da99337a54..35c329c38531e 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -252,17 +252,7 @@ export default class ResultSet extends React.PureComponent<
     }
 
     const { schema, sql, dbId, templateParams } = this.props.query;
-
-    let selectedColumns: any[];
-    if (
-      this.props.query &&
-      this.props.query.results &&
-      this.props.query.results.selected_columns
-    ) {
-      selectedColumns = this.props.query.results.selected_columns;
-    } else {
-      selectedColumns = []
-    }
+    const selectedColumns = this.props.query?.results?.selected_columns || [];
 
     this.props.actions
       .createDatasource({

From 3f9c417998c11fda1ce79e19f190508004b181fc Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 11:57:46 -0800
Subject: [PATCH 047/138] update propTypes

---
 superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
index fa724273da1ad..192687774266d 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
@@ -37,6 +37,7 @@ const propTypes = {
   errorMessage: PropTypes.string,
   timeout: PropTypes.number,
   database: PropTypes.object.isRequired,
+  onClick: PropTypes.func.isRequired,
 };
 const defaultProps = {
   query: {},

From 02f4da799a5bde5d10490c610b7f6f9b3abcc8bb Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 12:13:14 -0800
Subject: [PATCH 048/138] add functionality for CTAS explor btn

---
 .../src/SqlLab/components/ResultSet.tsx       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 35c329c38531e..9ecf28e71faa7 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -281,6 +281,43 @@ export default class ResultSet extends React.PureComponent<
       });
   }
 
+  handleCTASSaveInDataset() {
+    // if user wants to overwrite a dataset we need to prompt them
+    if (this.state.saveDatasetRadioBtnState === OVERWRITE_DATASET_RADIO_STATE) {
+      this.setState({ overwriteDataSet: true });
+      return;
+    }
+
+    const { schema, sql, dbId, templateParams } = this.props.query;
+    this.props.actions
+      .createCtasDatasource({
+        schema,
+        dbId,
+        templateParams,
+        datasourceName: this.state.newSaveDatasetName,
+      })
+      .then((data: { table_id: number }) => {
+        const formData = {
+          datasource: `${data.table_id}__table`,
+          metrics: ['count'],
+          groupby: [],
+          viz_type: 'table',
+          since: '100 years ago',
+          all_columns: [],
+          row_limit: 1000,
+        };
+        this.props.actions.addInfoToast(
+          t('Creating a data source and creating a new tab'),
+        );
+
+        // open new window for data visualization
+        exploreChart(formData);
+      })
+      .catch(() => {
+        this.props.actions.addDangerToast(t('An error occurred'));
+      });
+  }
+
   handleDatasetNameChange(e: { target: { value: any } }) {
     this.setState({ newSaveDatasetName: e.target.value });
   }

From 9b1f5a263d05d2da3d4eaadf0858f3be8347d532 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 12:19:57 -0800
Subject: [PATCH 049/138] handle CTAS state

---
 .../src/SqlLab/components/ResultSet.tsx       | 120 +++++++++---------
 1 file changed, 59 insertions(+), 61 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 9ecf28e71faa7..369c3ab6c46e0 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -107,6 +107,7 @@ export default class ResultSet extends React.PureComponent<
       saveDatasetRadioBtnState: SAVE_NEW_DATASET_RADIO_STATE,
       overwriteDataSet: false,
       datasetToOverwrite: {},
+      ctasSave: false,
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -254,68 +255,62 @@ export default class ResultSet extends React.PureComponent<
     const { schema, sql, dbId, templateParams } = this.props.query;
     const selectedColumns = this.props.query?.results?.selected_columns || [];
 
-    this.props.actions
-      .createDatasource({
-        schema,
-        sql,
-        dbId,
-        templateParams,
-        datasourceName: this.state.newSaveDatasetName,
-        columns: selectedColumns,
-      })
-      .then((data: { table_id: number }) => {
-        exploreChart({
-          datasource: `${data.table_id}__table`,
-          metrics: [],
-          groupby: [],
-          time_range: 'No filter',
-          viz_type: 'table',
-          all_columns: selectedColumns.map(c => c.name),
-          row_limit: 1000,
+    if (this.state.ctasSave) {
+      // Create Table As flow for explore view
+      this.props.actions
+        .createCtasDatasource({
+          schema,
+          dbId,
+          templateParams,
+          datasourceName: this.state.newSaveDatasetName,
+        })
+        .then((data: { table_id: number }) => {
+          const formData = {
+            datasource: `${data.table_id}__table`,
+            metrics: ['count'],
+            groupby: [],
+            viz_type: 'table',
+            since: '100 years ago',
+            all_columns: [],
+            row_limit: 1000,
+          };
+          this.props.actions.addInfoToast(
+            t('Creating a data source and creating a new tab'),
+          );
+
+          // open new window for data visualization
+          exploreChart(formData);
+        })
+        .catch(() => {
+          this.props.actions.addDangerToast(t('An error occurred'));
+        });
+    } else {
+      this.props.actions
+        .createDatasource({
+          schema,
+          sql,
+          dbId,
+          templateParams,
+          datasourceName: this.state.newSaveDatasetName,
+          columns: selectedColumns,
+        })
+        .then((data: { table_id: number }) => {
+          exploreChart({
+            datasource: `${data.table_id}__table`,
+            metrics: [],
+            groupby: [],
+            time_range: 'No filter',
+            viz_type: 'table',
+            all_columns: selectedColumns.map(c => c.name),
+            row_limit: 1000,
+          });
+        })
+        .catch(() => {
+          this.props.actions.addDangerToast(
+            t('An error occurred saving dataset'),
+          );
         });
-      })
-      .catch(() => {
-        this.props.actions.addDangerToast(
-          t('An error occurred saving dataset'),
-        );
-      });
-  }
-
-  handleCTASSaveInDataset() {
-    // if user wants to overwrite a dataset we need to prompt them
-    if (this.state.saveDatasetRadioBtnState === OVERWRITE_DATASET_RADIO_STATE) {
-      this.setState({ overwriteDataSet: true });
-      return;
     }
-
-    const { schema, sql, dbId, templateParams } = this.props.query;
-    this.props.actions
-      .createCtasDatasource({
-        schema,
-        dbId,
-        templateParams,
-        datasourceName: this.state.newSaveDatasetName,
-      })
-      .then((data: { table_id: number }) => {
-        const formData = {
-          datasource: `${data.table_id}__table`,
-          metrics: ['count'],
-          groupby: [],
-          viz_type: 'table',
-          since: '100 years ago',
-          all_columns: [],
-          row_limit: 1000,
-        };
-        this.props.actions.addInfoToast(
-          t('Creating a data source and creating a new tab'),
-        );
-
-        // open new window for data visualization
-        exploreChart(formData);
-      })
-      .catch(() => {
-        this.props.actions.addDangerToast(t('An error occurred'));
-      });
   }
 
   handleDatasetNameChange(e: { target: { value: any } }) {
@@ -367,7 +362,7 @@ export default class ResultSet extends React.PureComponent<
                   database={this.props.database}
                   actions={this.props.actions}
                   onClick={() => {
-                    this.setState({showSaveDatasetModal: true})
+                    this.setState({showSaveDatasetModal: true, ctasSave: false})
                   }}
                 />
               )}
@@ -468,6 +463,9 @@ export default class ResultSet extends React.PureComponent<
                 dbId={exploreDBId}
                 database={this.props.database}
                 actions={this.props.actions}
+                onClick={() => {
+                  this.setState({ showSaveDatasetModal: true, ctasSave: true })
+                }}
               />
             </ButtonGroup>
           </Alert>

From 9e3d5282149d0394ff70db6056860ba8de88367c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 12:21:32 -0800
Subject: [PATCH 050/138] fix onclick to reference upper level component

---
 .../components/ExploreCtasResultsButton.jsx   | 41 +------------------
 1 file changed, 2 insertions(+), 39 deletions(-)

diff --git a/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx b/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx
index 915ea9b87ee8b..85d7283d77c0f 100644
--- a/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx
+++ b/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx
@@ -35,6 +35,7 @@ const propTypes = {
   dbId: PropTypes.number.isRequired,
   errorMessage: PropTypes.string,
   templateParams: PropTypes.string,
+  onClick: PropTypes.func.isRequired,
 };
 const defaultProps = {
   vizRequest: {},
@@ -46,50 +47,12 @@ class ExploreCtasResultsButton extends React.PureComponent {
     this.visualize = this.visualize.bind(this);
     this.onClick = this.onClick.bind(this);
   }
-  onClick() {
-    this.visualize();
-  }
-
-  buildVizOptions() {
-    return {
-      datasourceName: this.props.table,
-      schema: this.props.schema,
-      dbId: this.props.dbId,
-      templateParams: this.props.templateParams,
-    };
-  }
-  visualize() {
-    this.props.actions
-      .createCtasDatasource(this.buildVizOptions())
-      .then(data => {
-        const formData = {
-          datasource: `${data.table_id}__table`,
-          metrics: ['count'],
-          groupby: [],
-          viz_type: 'table',
-          since: '100 years ago',
-          all_columns: [],
-          row_limit: 1000,
-        };
-        this.props.actions.addInfoToast(
-          t('Creating a data source and creating a new tab'),
-        );
-
-        // open new window for data visualization
-        exploreChart(formData);
-      })
-      .catch(() => {
-        this.props.actions.addDangerToast(
-          this.props.errorMessage || t('An error occurred'),
-        );
-      });
-  }
   render() {
     return (
       <>
         <Button
           buttonSize="small"
-          onClick={this.onClick}
+          onClick={this.props.onClick}
           tooltip={t('Explore the result set in the data exploration view')}
         >
           <InfoTooltipWithTrigger

From d13943e58883b5b601bc1617a90e785de8c98fc5 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 12:29:23 -0800
Subject: [PATCH 051/138] formatting

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 369c3ab6c46e0..5c06427e72aea 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -362,7 +362,10 @@ export default class ResultSet extends React.PureComponent<
                   database={this.props.database}
                   actions={this.props.actions}
                   onClick={() => {
-                    this.setState({showSaveDatasetModal: true, ctasSave: false})
+                    this.setState({
+                      showSaveDatasetModal: true,
+                      ctasSave: false,
+                    });
                   }}
                 />
               )}

From 3d07498d2eaebf8e19bc555ec2c7bdfed4390edf Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 12:38:03 -0800
Subject: [PATCH 052/138] reset state after closing

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5c06427e72aea..0129efc747f0d 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -242,7 +242,7 @@ export default class ResultSet extends React.PureComponent<
         );
       });
 
-    this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
+    this.setState({showSaveDatasetModal: false, overwriteDataSet: false, datasetToOverwrite: {}})
   }
 
   handleSaveInDataset() {

From 12cba4e54a32c87925758ba3467e5356c1388035 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 12:42:15 -0800
Subject: [PATCH 053/138] add error message when user doesn't pick an already
 selected dataset

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 0129efc747f0d..0546b538cb3c0 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -218,6 +218,12 @@ export default class ResultSet extends React.PureComponent<
     const { sql, results } = this.props.query;
     const { datasetToOverwrite } = this.state;
 
+    if (Object.keys(datasetToOverwrite).length === 0 && datasetToOverwrite.constructor === Object) {
+      this.props.actions.addDangerToast(
+        t('You must select a dataset that has already been created'),
+      );
+    }
+
     SupersetClient.put({
       endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}?override_column=true`,
       headers: { 'Content-Type': 'application/json' },

From 886c84a97130b7ae78c47024e181c51d3e6c4a90 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 13:06:57 -0800
Subject: [PATCH 054/138] remove unneeded todo

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 0546b538cb3c0..3badedc02076e 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -134,7 +134,6 @@ export default class ResultSet extends React.PureComponent<
     const appContainer = document.getElementById('app');
     const bootstrapData = JSON.parse(appContainer.getAttribute('data-bootstrap'));
 
-    // Todo: figure out how to get user information to properly query datasets they own
     // Todo: move this to actions file
     SupersetClient.get({
       endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${bootstrapData.user.userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0)`,

From dc350cc1bd0bf58216fc6498027944280a5697aa Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 24 Nov 2020 17:50:57 -0800
Subject: [PATCH 055/138] remove styling

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 06a182d998a9b..b23c408d2c6ca 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -41,11 +41,6 @@ const Styles = styled.div`
       margin: 10px 0px;
       line-height: 30px;
     }
-    .smd-body {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-    }
 `;
 
 // eslint-disable-next-line no-empty-pattern

From a3315da51ed75a07e3bf3bdec1f152e007159a52 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 25 Nov 2020 20:04:09 -0800
Subject: [PATCH 056/138] move async calls to api directory

---
 .../src/SqlLab/components/ResultSet.tsx       | 28 +++++++++++++------
 superset-frontend/src/api/dataset.ts          | 17 +++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)
 create mode 100644 superset-frontend/src/api/dataset.ts

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 3badedc02076e..61a75a1839f58 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -38,6 +38,8 @@ import { Query } from '../types';
 
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal'
 
+import { get as getDataset} from 'src/api/dataset';
+
 const SEARCH_HEIGHT = 46;
 
 const SAVE_NEW_DATASET_RADIO_STATE = 1;
@@ -80,6 +82,17 @@ const MonospaceDiv = styled.div`
   white-space: pre-wrap;
 `;
 
+async function getDatasetAsync() {
+  try {
+    const dataset = await getDataset();
+    console.log('in async')
+    console.log(dataset);
+    this.set
+  } catch (e) {
+    console.error('oops..');
+  }
+}
+
 export default class ResultSet extends React.PureComponent<
   ResultSetProps,
   ResultSetState
@@ -126,7 +139,7 @@ export default class ResultSet extends React.PureComponent<
     this.handleOverwriteDatasetOption = this.handleOverwriteDatasetOption.bind(this);
   }
 
-  componentDidMount() {
+  async componentDidMount() {
     // only do this the first time the component is rendered/mounted
     this.reRunQueryIfSessionTimeoutErrorOnMount();
 
@@ -134,15 +147,12 @@ export default class ResultSet extends React.PureComponent<
     const appContainer = document.getElementById('app');
     const bootstrapData = JSON.parse(appContainer.getAttribute('data-bootstrap'));
 
-    // Todo: move this to actions file
-    SupersetClient.get({
-      endpoint: `/api/v1/dataset/?q=(filters:!((col:owners,opr:rel_m_m,value:${bootstrapData.user.userId}),(col:table_name,opr:ct,value:%27%27)),order_column:changed_on_delta_humanized,order_direction:desc,page:0)`,
-    }).then(data => {
-      const userDatasetsOwned = data.json.result.map(r => {
-        return { dataSetName: r.table_name, dataSetId: r.id };
-      });
-      this.setState({ userDatasetsOwned });
+    const datasets = await getDataset();
+    const userDatasetsOwned = datasets.map(r => {
+      return { dataSetName: r.table_name, dataSetId: r.id };
     });
+
+    this.setState({ userDatasetsOwned });
   }
 
   UNSAFE_componentWillReceiveProps(nextProps: ResultSetProps) {
diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
new file mode 100644
index 0000000000000..5fc4332f540f1
--- /dev/null
+++ b/superset-frontend/src/api/dataset.ts
@@ -0,0 +1,17 @@
+import { SupersetClient, JsonResponse } from '@superset-ui/core';
+import rison from 'rison';
+
+export const get = async () => {
+  const queryParams = rison.encode({
+    order_column: 'changed_on_delta_humanized',
+    order_direction: 'desc',
+    page: 0,
+    page_size: 10,
+  });
+  const endpoint = `/api/v1/dataset?q=${queryParams}`;
+  const data: JsonResponse = await SupersetClient.get({
+    endpoint,
+  });
+  console.log(data);
+  return data.json.result;
+};

From af766a9a03fe7d07b7d366d7dadf903252c2e644 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 25 Nov 2020 20:04:26 -0800
Subject: [PATCH 057/138] remove console.log

---
 superset-frontend/src/api/dataset.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index 5fc4332f540f1..58d4e9860f344 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -12,6 +12,5 @@ export const get = async () => {
   const data: JsonResponse = await SupersetClient.get({
     endpoint,
   });
-  console.log(data);
   return data.json.result;
 };

From 18d86de6171bde48e1c21d02521fbd78f222c0c7 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 25 Nov 2020 20:12:09 -0800
Subject: [PATCH 058/138] add user id param

---
 .../src/SqlLab/components/ResultSet.tsx            |  2 +-
 superset-frontend/src/api/dataset.ts               | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 61a75a1839f58..88636a15f3c86 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -147,7 +147,7 @@ export default class ResultSet extends React.PureComponent<
     const appContainer = document.getElementById('app');
     const bootstrapData = JSON.parse(appContainer.getAttribute('data-bootstrap'));
 
-    const datasets = await getDataset();
+    const datasets = await getDataset(bootstrapData.user.userId);
     const userDatasetsOwned = datasets.map(r => {
       return { dataSetName: r.table_name, dataSetId: r.id };
     });
diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index 58d4e9860f344..fc17b8c45349c 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -1,16 +1,24 @@
 import { SupersetClient, JsonResponse } from '@superset-ui/core';
 import rison from 'rison';
 
-export const get = async () => {
+export const get = async (userId: int) => {
+  console.log(userId);
   const queryParams = rison.encode({
+    filters: [
+      {
+        col: 'owners',
+        opr: 'rel_m_m',
+        value: userId,
+      },
+    ],
     order_column: 'changed_on_delta_humanized',
     order_direction: 'desc',
-    page: 0,
-    page_size: 10,
   });
   const endpoint = `/api/v1/dataset?q=${queryParams}`;
   const data: JsonResponse = await SupersetClient.get({
     endpoint,
   });
+
+  console.log(data.json.result)
   return data.json.result;
 };

From 1f5443924217dad0f55b1559fc5d496139ecc61a Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 25 Nov 2020 20:19:09 -0800
Subject: [PATCH 059/138] typing

---
 superset-frontend/src/api/dataset.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index fc17b8c45349c..2722df45fa816 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -2,7 +2,6 @@ import { SupersetClient, JsonResponse } from '@superset-ui/core';
 import rison from 'rison';
 
 export const get = async (userId: int) => {
-  console.log(userId);
   const queryParams = rison.encode({
     filters: [
       {
@@ -18,7 +17,5 @@ export const get = async (userId: int) => {
   const data: JsonResponse = await SupersetClient.get({
     endpoint,
   });
-
-  console.log(data.json.result)
   return data.json.result;
 };

From 6d3f846cc76e7be0fee4b23736f0965014595222 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 25 Nov 2020 20:19:29 -0800
Subject: [PATCH 060/138] littty

---
 superset-frontend/src/api/dataset.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index 2722df45fa816..37b4a94c277d7 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -1,7 +1,7 @@
 import { SupersetClient, JsonResponse } from '@superset-ui/core';
 import rison from 'rison';
 
-export const get = async (userId: int) => {
+export const get = async (userId: number) => {
   const queryParams = rison.encode({
     filters: [
       {

From f4a7849afbca2fa4aeec76da03b49202e13323ae Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 27 Nov 2020 10:44:21 -0800
Subject: [PATCH 061/138] move put to seperate file

---
 .../src/SqlLab/components/ResultSet.tsx       | 67 ++++++++++---------
 superset-frontend/src/api/dataset.ts          | 21 ++++++
 2 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 88636a15f3c86..916a5717ba5ea 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -21,7 +21,7 @@ import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap';
 import moment from 'moment';
 import Button from 'src/components/Button';
 import shortid from 'shortid';
-import { styled, t, SupersetClient} from '@superset-ui/core';
+import { styled, t, SupersetClient } from '@superset-ui/core';
 
 import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
 import Loading from '../../components/Loading';
@@ -36,9 +36,9 @@ import { exploreChart } from '../../explore/exploreUtils';
 import { CtasEnum } from '../actions/sqlLab';
 import { Query } from '../types';
 
-import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal'
+import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 
-import { get as getDataset} from 'src/api/dataset';
+import { get as getDataset, put as updateDatset } from 'src/api/dataset';
 
 const SEARCH_HEIGHT = 46;
 
@@ -66,7 +66,7 @@ interface ResultSetState {
   data: Record<string, any>[];
   showSaveDatasetModal: boolean;
   newSaveDatasetName: string;
-  userDatasetsOwned: [];
+  userDatasetsOwned: Array<Record<string, any>>[];
   saveDatasetRadioBtnState: number;
   overwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
@@ -82,17 +82,6 @@ const MonospaceDiv = styled.div`
   white-space: pre-wrap;
 `;
 
-async function getDatasetAsync() {
-  try {
-    const dataset = await getDataset();
-    console.log('in async')
-    console.log(dataset);
-    this.set
-  } catch (e) {
-    console.error('oops..');
-  }
-}
-
 export default class ResultSet extends React.PureComponent<
   ResultSetProps,
   ResultSetState
@@ -133,10 +122,14 @@ export default class ResultSet extends React.PureComponent<
     this.handleSaveInDataset = this.handleSaveInDataset.bind(this);
     this.handleHideSaveModal = this.handleHideSaveModal.bind(this);
     this.handleDatasetNameChange = this.handleDatasetNameChange.bind(this);
-    this.handleSaveDatasetRadioBtnState = this.handleSaveDatasetRadioBtnState.bind(this);
+    this.handleSaveDatasetRadioBtnState = this.handleSaveDatasetRadioBtnState.bind(
+      this,
+    );
     this.handleOverwriteCancel = this.handleOverwriteCancel.bind(this);
     this.handleOverwriteDataset = this.handleOverwriteDataset.bind(this);
-    this.handleOverwriteDatasetOption = this.handleOverwriteDatasetOption.bind(this);
+    this.handleOverwriteDatasetOption = this.handleOverwriteDatasetOption.bind(
+      this,
+    );
   }
 
   async componentDidMount() {
@@ -145,7 +138,9 @@ export default class ResultSet extends React.PureComponent<
 
     // Hack: waiting for talks with tai to pull data out of the initial state
     const appContainer = document.getElementById('app');
-    const bootstrapData = JSON.parse(appContainer.getAttribute('data-bootstrap'));
+    const bootstrapData = JSON.parse(
+      appContainer.getAttribute('data-bootstrap'),
+    );
 
     const datasets = await getDataset(bootstrapData.user.userId);
     const userDatasetsOwned = datasets.map(r => {
@@ -220,27 +215,29 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleOverwriteDatasetOption(data, option) {
-    this.setState({ datasetToOverwrite: option })
+    this.setState({ datasetToOverwrite: option });
   }
 
-  handleOverwriteDataset() {
+  async handleOverwriteDataset() {
     const { sql, results } = this.props.query;
     const { datasetToOverwrite } = this.state;
 
-    if (Object.keys(datasetToOverwrite).length === 0 && datasetToOverwrite.constructor === Object) {
+    if (
+      Object.keys(datasetToOverwrite).length === 0 &&
+      datasetToOverwrite.constructor === Object
+    ) {
       this.props.actions.addDangerToast(
         t('You must select a dataset that has already been created'),
       );
     }
 
-    SupersetClient.put({
-      endpoint: `api/v1/dataset/${datasetToOverwrite.dataSetId}?override_column=true`,
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        sql,
-        columns: results.selected_columns.map(d => ({column_name: d.name}))
-      }),
-    }).then(d => {
+    updateDatset(
+      datasetToOverwrite.dataSetId,
+      sql,
+      results.selected_columns.map(d => ({ column_name: d.name })),
+      true,
+    )
+      .then(d => {
         exploreChart({
           datasource: `${datasetToOverwrite.dataSetId}__table`,
           metrics: [],
@@ -257,7 +254,11 @@ export default class ResultSet extends React.PureComponent<
         );
       });
 
-    this.setState({showSaveDatasetModal: false, overwriteDataSet: false, datasetToOverwrite: {}})
+    this.setState({
+      showSaveDatasetModal: false,
+      overwriteDataSet: false,
+      datasetToOverwrite: {},
+    });
   }
 
   handleSaveInDataset() {
@@ -333,7 +334,7 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleHideSaveModal() {
-    this.setState({showSaveDatasetModal: false, overwriteDataSet: false})
+    this.setState({ showSaveDatasetModal: false, overwriteDataSet: false });
   }
 
   handleSaveDatasetRadioBtnState(e: { target: { value: any } }) {
@@ -341,7 +342,7 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleOverwriteCancel() {
-    this.setState({overwriteDataSet: false})
+    this.setState({ overwriteDataSet: false });
   }
 
   renderControls() {
@@ -482,7 +483,7 @@ export default class ResultSet extends React.PureComponent<
                 database={this.props.database}
                 actions={this.props.actions}
                 onClick={() => {
-                  this.setState({ showSaveDatasetModal: true, ctasSave: true })
+                  this.setState({ showSaveDatasetModal: true, ctasSave: true });
                 }}
               />
             </ButtonGroup>
diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index 37b4a94c277d7..baa2e950901b6 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -19,3 +19,24 @@ export const get = async (userId: number) => {
   });
   return data.json.result;
 };
+
+export const put = async (
+  datasetId: number,
+  sql: string,
+  columns: Array<number>,
+  overrideColumns: boolean,
+) => {
+  const endpoint = `api/v1/dataset/${datasetId}?override_column=${overrideColumns}`;
+  const headers = { 'Content-Type': 'application/json' };
+  const body = JSON.stringify({
+    sql,
+    columns,
+  });
+
+  const data: JsonResponse = await SupersetClient.put({
+    endpoint,
+    headers,
+    body,
+  });
+  return data.json.result;
+};

From 7509940b9c060ccdb53aec36a3a1467eaf13f051 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 27 Nov 2020 10:50:36 -0800
Subject: [PATCH 062/138] save

---
 .../src/SqlLab/components/ResultSet.tsx       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 916a5717ba5ea..ee038b59f493a 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -44,6 +44,12 @@ const SEARCH_HEIGHT = 46;
 
 const SAVE_NEW_DATASET_RADIO_STATE = 1;
 const OVERWRITE_DATASET_RADIO_STATE = 2;
+const EXPLORE_CHART_DEFAULT = {
+  metrics: [],
+  groupby: [],
+  time_range: 'No filter',
+  viz_type: 'table',
+}
 
 const LOADING_STYLES: CSSProperties = { position: 'relative', minHeight: 100 };
 
@@ -214,7 +220,7 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
-  handleOverwriteDatasetOption(data, option) {
+  handleOverwriteDatasetOption(data: string, option) {
     this.setState({ datasetToOverwrite: option });
   }
 
@@ -239,13 +245,9 @@ export default class ResultSet extends React.PureComponent<
     )
       .then(d => {
         exploreChart({
+          ...EXPLORE_CHART_DEFAULT,
           datasource: `${datasetToOverwrite.dataSetId}__table`,
-          metrics: [],
-          groupby: [],
-          time_range: 'No filter',
-          viz_type: 'table',
           all_columns: results.selected_columns.map(d => d.name),
-          row_limit: 1000,
         });
       })
       .catch(() => {
@@ -282,13 +284,8 @@ export default class ResultSet extends React.PureComponent<
         })
         .then((data: { table_id: number }) => {
           const formData = {
+            ...EXPLORE_CHART_DEFAULT,
             datasource: `${data.table_id}__table`,
-            metrics: ['count'],
-            groupby: [],
-            viz_type: 'table',
-            since: '100 years ago',
-            all_columns: [],
-            row_limit: 1000,
           };
           this.props.actions.addInfoToast(
             t('Creating a data source and creating a new tab'),

From 49e4e865625b18ed91e5a1fc1ac3abd18169535d Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 27 Nov 2020 12:55:40 -0800
Subject: [PATCH 063/138] dsf

---
 superset-frontend/src/api/dataset.ts | 2 +-
 superset/datasets/api.py             | 9 +++++----
 superset/datasets/commands/update.py | 4 ++--
 superset/datasets/dao.py             | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index baa2e950901b6..bf118cda17935 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -26,7 +26,7 @@ export const put = async (
   columns: Array<number>,
   overrideColumns: boolean,
 ) => {
-  const endpoint = `api/v1/dataset/${datasetId}?override_column=${overrideColumns}`;
+  const endpoint = `api/v1/dataset/${datasetId}?override_columns=${overrideColumns}`;
   const headers = { 'Content-Type': 'application/json' };
   const body = JSON.stringify({
     sql,
diff --git a/superset/datasets/api.py b/superset/datasets/api.py
index a2f10f92c038a..5a38ea5c78fd1 100644
--- a/superset/datasets/api.py
+++ b/superset/datasets/api.py
@@ -16,6 +16,7 @@
 # under the License.
 import logging
 from datetime import datetime
+from distutils.util import strtobool
 from io import BytesIO
 from typing import Any
 from zipfile import ZipFile
@@ -284,9 +285,9 @@ def put(self, pk: int) -> Response:
             500:
               $ref: '#/components/responses/500'
         """
-        override_column = (
-            request.args["override_column"]
-            if request.args.get("override_column")
+        override_columns = (
+            bool(strtobool(request.args["override_columns"]))
+            if "override_columns" in request.args
             else False
         )
         if not request.is_json:
@@ -298,7 +299,7 @@ def put(self, pk: int) -> Response:
             return self.response_400(message=error.messages)
         try:
             changed_model = UpdateDatasetCommand(
-                g.user, pk, item, override_column
+                g.user, pk, item, override_columns
             ).run()
             response = self.response(200, id=changed_model.id, result=item)
         except DatasetNotFoundError:
diff --git a/superset/datasets/commands/update.py b/superset/datasets/commands/update.py
index 809720ed6ab39..216d7f8956a32 100644
--- a/superset/datasets/commands/update.py
+++ b/superset/datasets/commands/update.py
@@ -16,7 +16,7 @@
 # under the License.
 import logging
 from collections import Counter
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 from flask_appbuilder.models.sqla import Model
 from flask_appbuilder.security.sqla.models import User
@@ -53,7 +53,7 @@ def __init__(
         user: User,
         model_id: int,
         data: Dict[str, Any],
-        override_columns: Union[bool, Any, None] = False,
+        override_columns: bool = False,
     ):
         self._actor = user
         self._model_id = model_id
diff --git a/superset/datasets/dao.py b/superset/datasets/dao.py
index 22526e92079bf..ed865fff1219d 100644
--- a/superset/datasets/dao.py
+++ b/superset/datasets/dao.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import logging
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 from flask import current_app
 from sqlalchemy.exc import SQLAlchemyError
@@ -148,7 +148,7 @@ def update(
         model: SqlaTable,
         properties: Dict[str, Any],
         commit: bool = True,
-        override_columns: Union[bool, Any, None] = False,
+        override_columns: bool = False,
     ) -> Optional[SqlaTable]:
         """
         Updates a Dataset model on the metadata DB

From 41731746367aefb60e292d540d4d77e81976a08a Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 08:03:23 -0800
Subject: [PATCH 064/138] fix typing errors

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 11 +++++------
 superset-frontend/src/SqlLab/types.ts                 |  3 +++
 superset-frontend/src/api/dataset.ts                  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index ee038b59f493a..5bc95a1d3141a 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -21,9 +21,11 @@ import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap';
 import moment from 'moment';
 import Button from 'src/components/Button';
 import shortid from 'shortid';
-import { styled, t, SupersetClient } from '@superset-ui/core';
+import { styled, t } from '@superset-ui/core';
 
 import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
+import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
+import { get as getDataset, put as updateDatset } from 'src/api/dataset';
 import Loading from '../../components/Loading';
 import ExploreCtasResultsButton from './ExploreCtasResultsButton';
 import ExploreResultsButton from './ExploreResultsButton';
@@ -36,9 +38,6 @@ import { exploreChart } from '../../explore/exploreUtils';
 import { CtasEnum } from '../actions/sqlLab';
 import { Query } from '../types';
 
-import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
-
-import { get as getDataset, put as updateDatset } from 'src/api/dataset';
 
 const SEARCH_HEIGHT = 46;
 
@@ -49,7 +48,7 @@ const EXPLORE_CHART_DEFAULT = {
   groupby: [],
   time_range: 'No filter',
   viz_type: 'table',
-}
+};
 
 const LOADING_STYLES: CSSProperties = { position: 'relative', minHeight: 100 };
 
@@ -220,7 +219,7 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
-  handleOverwriteDatasetOption(data: string, option) {
+  handleOverwriteDatasetOption(data: string, option: Record<string, any>) {
     this.setState({ datasetToOverwrite: option });
   }
 
diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index 0fe83a7f5e434..4a6c6841f4dde 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -41,8 +41,10 @@ export type Query = {
     columns: Column[];
     data: Record<string, unknown>[];
     expanded_columns: Column[];
+    selected_columns: Column[];
   };
   resultsKey: string | null;
+  schema: string;
   sql: string;
   sqlEditorId: string;
   state:
@@ -56,4 +58,5 @@ export type Query = {
   tempSchema: string | null;
   tempTable: string;
   trackingUrl: string | null;
+  templateParams: any;
 };
diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index bf118cda17935..b58727078751d 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -23,7 +23,7 @@ export const get = async (userId: number) => {
 export const put = async (
   datasetId: number,
   sql: string,
-  columns: Array<number>,
+  columns: Array<Record<string, any>>,
   overrideColumns: boolean,
 ) => {
   const endpoint = `api/v1/dataset/${datasetId}?override_columns=${overrideColumns}`;

From f67d21ab9598bd22255a6408bba4d085f0e0c9ff Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 08:04:40 -0800
Subject: [PATCH 065/138] adding more types

---
 superset-frontend/src/SqlLab/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/SqlLab/types.ts b/superset-frontend/src/SqlLab/types.ts
index 4a6c6841f4dde..4189a297579cd 100644
--- a/superset-frontend/src/SqlLab/types.ts
+++ b/superset-frontend/src/SqlLab/types.ts
@@ -55,6 +55,7 @@ export type Query = {
     | 'scheduled'
     | 'success'
     | 'timed_out';
+  tab: string | null;
   tempSchema: string | null;
   tempTable: string;
   trackingUrl: string | null;

From a4b5513496812e1a9e43f9cb0af447db427aa1b2 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 08:19:19 -0800
Subject: [PATCH 066/138] fix typing erros

---
 .../SqlLab/components/SaveDatasetModal.tsx    | 195 +++++++++++-------
 1 file changed, 121 insertions(+), 74 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index b23c408d2c6ca..dfb75fd5dbb80 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -17,56 +17,88 @@
  * under the License.
  */
 
-import React, { useState, FunctionComponent} from 'react';
+import React, { useState, FunctionComponent } from 'react';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
 import { styled } from '@superset-ui/core';
 
-interface SaveDatasetModalProps = {
+interface SaveDatasetModalProps {
+  visible: boolean;
+  onOk: () => void;
+  onCancel: () => void;
+  handleDatasetNameChange: (e: { target: { value: any } }) => void;
+  userDatasetsOwned: Array<Record<string, any>>;
+  handleSaveDatasetRadioBtnState: () => void;
+  saveDatasetRadioBtnState: number;
+  overwriteDataSet: boolean;
+  handleOverwriteCancel: () => void;
+  handleOverwriteDataset: () => void;
+  handleOverwriteDatasetOption: () => void;
+  defaultCreateDatasetValue: () => void;
 }
 
 const Styles = styled.div`
-    .smd-input {
-      margin-left: 45px;
-      width: 290px;
-    }
-    .smd-autocomplete {
-      margin-left: 8px;
-      width: 290px;
-    }
-    .smd-radio {
-      display: block;
-      height: 30px;
-      margin: 10px 0px;
-      line-height: 30px;
-    }
+  .smd-input {
+    margin-left: 45px;
+    width: 290px;
+  }
+  .smd-autocomplete {
+    margin-left: 8px;
+    width: 290px;
+  }
+  .smd-radio {
+    display: block;
+    height: 30px;
+    margin: 10px 0px;
+    line-height: 30px;
+  }
 `;
 
 // eslint-disable-next-line no-empty-pattern
-export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({visible, onOk, onCancel, handleDatasetNameChange, userDatasetsOwned, handleSaveDatasetRadioBtnState, saveDatasetRadioBtnState, overwriteDataSet, handleOverwriteCancel, handleOverwriteDataset, handleOverwriteDatasetOption, defaultCreateDatasetValue}) => {
+export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
+  visible,
+  onOk,
+  onCancel,
+  handleDatasetNameChange,
+  userDatasetsOwned,
+  handleSaveDatasetRadioBtnState,
+  saveDatasetRadioBtnState,
+  overwriteDataSet,
+  handleOverwriteCancel,
+  handleOverwriteDataset,
+  handleOverwriteDatasetOption,
+  defaultCreateDatasetValue,
+}) => {
   const [options, setOptions] = useState([]);
 
   const onSearch = (searchText: any) => {
     setOptions(
-      !searchText ? [] : userDatasetsOwned.map((d: { dataSetName: any; dataSetId: any; }) => ({value: d.dataSetName, dataSetId: d.dataSetId})),
+      !searchText
+        ? []
+        : userDatasetsOwned.map((d: { dataSetName: any; dataSetId: any }) => ({
+            value: d.dataSetName,
+            dataSetId: d.dataSetId,
+          })),
     );
   };
 
-  const filterAutocompleteOption = (inputValue: any, option: { value: string | any[]; }) => {
-    return option.value.includes(inputValue)
-  }
-
+  const filterAutocompleteOption = (
+    inputValue: any,
+    option: { value: string | any[] },
+  ) => {
+    return option.value.includes(inputValue);
+  };
 
   return (
-      <StyledModal
-        show={visible}
-        onHide={() => {}}
-        title="Save or Overwrite Dataset"
-        onCancel={onCancel}
-        footer={
+    <StyledModal
+      show={visible}
+      onHide={() => {}}
+      title="Save or Overwrite Dataset"
+      onCancel={onCancel}
+      footer={
         <>
-        {!overwriteDataSet &&
+          {!overwriteDataSet && (
             <Button
               buttonSize="sm"
               buttonStyle="primary"
@@ -75,54 +107,69 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({visi
             >
               Save & Explore
             </Button>
-          }
-          {overwriteDataSet && <> <Button
-              buttonSize="sm"
-              buttonStyle="danger"
-              className="m-r-5"
-              onClick={() => {
-                handleOverwriteCancel()
-              }}
-            >Cancel</Button>
-            <Button
-              buttonSize="sm"
-              buttonStyle="primary"
-              className="m-r-5"
-              onClick={handleOverwriteDataset}
-            >Ok</Button> </>}
+          )}
+          {overwriteDataSet && (
+            <>
+              {' '}
+              <Button
+                buttonSize="sm"
+                buttonStyle="danger"
+                className="m-r-5"
+                onClick={() => {
+                  handleOverwriteCancel();
+                }}
+              >
+                Cancel
+              </Button>
+              <Button
+                buttonSize="sm"
+                buttonStyle="primary"
+                className="m-r-5"
+                onClick={handleOverwriteDataset}
+              >
+                Ok
+              </Button>{' '}
+            </>
+          )}
         </>
       }
-      >
+    >
       <Styles>
-        {!overwriteDataSet && <div className="smd-body">
-          <div className="smd-prompt">
-            Save this query as virtual dataset to continue exploring.
-          </div>
-          <Radio.Group onChange={handleSaveDatasetRadioBtnState} value={saveDatasetRadioBtnState}>
-            <Radio className="smd-radio" value={1}>
-              Save as new
-              <Input className="smd-input" defaultValue={defaultCreateDatasetValue} onChange={handleDatasetNameChange} />
-            </Radio>
-            <Radio className="smd-radio" value={2}>
-              Overwrite existing
-              <AutoComplete
-                className="smd-autocomplete"
-                options={options}
-                onSelect={handleOverwriteDatasetOption}
-                onSearch={onSearch}
-                placeholder="Select or type dataset name"
-                filterOption={filterAutocompleteOption}
-              />
-            </Radio>
-          </Radio.Group>
-          </div>
-        }
-        {overwriteDataSet &&
-          <div>
-            Are you sure you want to overwrite this dataset?
+        {!overwriteDataSet && (
+          <div className="smd-body">
+            <div className="smd-prompt">
+              Save this query as virtual dataset to continue exploring.
+            </div>
+            <Radio.Group
+              onChange={handleSaveDatasetRadioBtnState}
+              value={saveDatasetRadioBtnState}
+            >
+              <Radio className="smd-radio" value={1}>
+                Save as new
+                <Input
+                  className="smd-input"
+                  defaultValue={defaultCreateDatasetValue}
+                  onChange={handleDatasetNameChange}
+                />
+              </Radio>
+              <Radio className="smd-radio" value={2}>
+                Overwrite existing
+                <AutoComplete
+                  className="smd-autocomplete"
+                  options={options}
+                  onSelect={handleOverwriteDatasetOption}
+                  onSearch={onSearch}
+                  placeholder="Select or type dataset name"
+                  filterOption={filterAutocompleteOption}
+                />
+              </Radio>
+            </Radio.Group>
           </div>
-        }
-        </Styles>
-      </StyledModal>
+        )}
+        {overwriteDataSet && (
+          <div>Are you sure you want to overwrite this dataset?</div>
+        )}
+      </Styles>
+    </StyledModal>
   );
 };

From 056bf143349e80d25d5f9353ce574caa4ebe1b30 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 08:22:55 -0800
Subject: [PATCH 067/138] linting

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx    | 1 +
 .../src/SqlLab/components/SaveDatasetModal.tsx           | 9 ++++++---
 superset-frontend/src/common/components/index.tsx        | 4 +---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5bc95a1d3141a..769fe15312c3e 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -75,6 +75,7 @@ interface ResultSetState {
   saveDatasetRadioBtnState: number;
   overwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
+  ctasSave: boolean;
 }
 
 // Making text render line breaks/tabs as is as monospace,
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index dfb75fd5dbb80..2cdc4e7c8f499 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -29,13 +29,16 @@ interface SaveDatasetModalProps {
   onCancel: () => void;
   handleDatasetNameChange: (e: { target: { value: any } }) => void;
   userDatasetsOwned: Array<Record<string, any>>;
-  handleSaveDatasetRadioBtnState: () => void;
+  handleSaveDatasetRadioBtnState: (e: { target: { value: any } }) => void;
   saveDatasetRadioBtnState: number;
   overwriteDataSet: boolean;
   handleOverwriteCancel: () => void;
   handleOverwriteDataset: () => void;
-  handleOverwriteDatasetOption: () => void;
-  defaultCreateDatasetValue: () => void;
+  handleOverwriteDatasetOption: (
+    data: string,
+    option: Record<string, any>,
+  ) => void;
+  defaultCreateDatasetValue: string;
 }
 
 const Styles = styled.div`
diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index 12f251ae4adad..dff007dc4df30 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,10 +19,8 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
-import { AutoComplete } from 'antd'
-import { Dropdown, Skeleton, Menu as AntdMenu } from 'antd';
+import { AutoComplete, Dropdown, Skeleton, Menu as AntdMenu, Radio} from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
-import { Radio } from 'antd'
 
 /*
   Antd is re-exported from here so we can override components with Emotion as needed.

From f6c60e84e52282945c7be2fdab7493bcca02e9b5 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 09:17:19 -0800
Subject: [PATCH 068/138] add basic spec test

---
 .../sqllab/SaveDatasetModal_spec.jsx          | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
new file mode 100644
index 0000000000000..89fa7567e6540
--- /dev/null
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import sinon from 'sinon';
+import { Radio, AutoComplete, Input } from 'src/common/components';
+import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
+
+describe('SaveDatasetModal', () => {
+  const mockedProps = {};
+  it('renders a radio group btn', () => {
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    expect(wrapper.find(Radio.Group)).toExist();
+  });
+  it('renders a autocomplete', () => {
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    expect(wrapper.find(AutoComplete)).toExist();
+  });
+  it('renders an input form ', () => {
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    expect(wrapper.find(Input)).toExist();
+  });
+});

From 7834b193369fbe69b13d6424018ffcb12002b432 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 13:44:51 -0800
Subject: [PATCH 069/138] create dataset modal

---
 .../sqllab/SaveDatasetModal_spec.jsx          |  39 ++++
 .../SqlLab/components/SaveDatasetModal.tsx    | 178 ++++++++++++++++++
 2 files changed, 217 insertions(+)
 create mode 100644 superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
 create mode 100644 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
new file mode 100644
index 0000000000000..89fa7567e6540
--- /dev/null
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import sinon from 'sinon';
+import { Radio, AutoComplete, Input } from 'src/common/components';
+import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
+
+describe('SaveDatasetModal', () => {
+  const mockedProps = {};
+  it('renders a radio group btn', () => {
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    expect(wrapper.find(Radio.Group)).toExist();
+  });
+  it('renders a autocomplete', () => {
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    expect(wrapper.find(AutoComplete)).toExist();
+  });
+  it('renders an input form ', () => {
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    expect(wrapper.find(Input)).toExist();
+  });
+});
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
new file mode 100644
index 0000000000000..2cdc4e7c8f499
--- /dev/null
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -0,0 +1,178 @@
+/**
+ * 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.
+ */
+
+import React, { useState, FunctionComponent } from 'react';
+import { Radio, AutoComplete, Input } from 'src/common/components';
+import StyledModal from 'src/common/components/Modal';
+import Button from 'src/components/Button';
+import { styled } from '@superset-ui/core';
+
+interface SaveDatasetModalProps {
+  visible: boolean;
+  onOk: () => void;
+  onCancel: () => void;
+  handleDatasetNameChange: (e: { target: { value: any } }) => void;
+  userDatasetsOwned: Array<Record<string, any>>;
+  handleSaveDatasetRadioBtnState: (e: { target: { value: any } }) => void;
+  saveDatasetRadioBtnState: number;
+  overwriteDataSet: boolean;
+  handleOverwriteCancel: () => void;
+  handleOverwriteDataset: () => void;
+  handleOverwriteDatasetOption: (
+    data: string,
+    option: Record<string, any>,
+  ) => void;
+  defaultCreateDatasetValue: string;
+}
+
+const Styles = styled.div`
+  .smd-input {
+    margin-left: 45px;
+    width: 290px;
+  }
+  .smd-autocomplete {
+    margin-left: 8px;
+    width: 290px;
+  }
+  .smd-radio {
+    display: block;
+    height: 30px;
+    margin: 10px 0px;
+    line-height: 30px;
+  }
+`;
+
+// eslint-disable-next-line no-empty-pattern
+export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
+  visible,
+  onOk,
+  onCancel,
+  handleDatasetNameChange,
+  userDatasetsOwned,
+  handleSaveDatasetRadioBtnState,
+  saveDatasetRadioBtnState,
+  overwriteDataSet,
+  handleOverwriteCancel,
+  handleOverwriteDataset,
+  handleOverwriteDatasetOption,
+  defaultCreateDatasetValue,
+}) => {
+  const [options, setOptions] = useState([]);
+
+  const onSearch = (searchText: any) => {
+    setOptions(
+      !searchText
+        ? []
+        : userDatasetsOwned.map((d: { dataSetName: any; dataSetId: any }) => ({
+            value: d.dataSetName,
+            dataSetId: d.dataSetId,
+          })),
+    );
+  };
+
+  const filterAutocompleteOption = (
+    inputValue: any,
+    option: { value: string | any[] },
+  ) => {
+    return option.value.includes(inputValue);
+  };
+
+  return (
+    <StyledModal
+      show={visible}
+      onHide={() => {}}
+      title="Save or Overwrite Dataset"
+      onCancel={onCancel}
+      footer={
+        <>
+          {!overwriteDataSet && (
+            <Button
+              buttonSize="sm"
+              buttonStyle="primary"
+              className="m-r-5"
+              onClick={onOk}
+            >
+              Save & Explore
+            </Button>
+          )}
+          {overwriteDataSet && (
+            <>
+              {' '}
+              <Button
+                buttonSize="sm"
+                buttonStyle="danger"
+                className="m-r-5"
+                onClick={() => {
+                  handleOverwriteCancel();
+                }}
+              >
+                Cancel
+              </Button>
+              <Button
+                buttonSize="sm"
+                buttonStyle="primary"
+                className="m-r-5"
+                onClick={handleOverwriteDataset}
+              >
+                Ok
+              </Button>{' '}
+            </>
+          )}
+        </>
+      }
+    >
+      <Styles>
+        {!overwriteDataSet && (
+          <div className="smd-body">
+            <div className="smd-prompt">
+              Save this query as virtual dataset to continue exploring.
+            </div>
+            <Radio.Group
+              onChange={handleSaveDatasetRadioBtnState}
+              value={saveDatasetRadioBtnState}
+            >
+              <Radio className="smd-radio" value={1}>
+                Save as new
+                <Input
+                  className="smd-input"
+                  defaultValue={defaultCreateDatasetValue}
+                  onChange={handleDatasetNameChange}
+                />
+              </Radio>
+              <Radio className="smd-radio" value={2}>
+                Overwrite existing
+                <AutoComplete
+                  className="smd-autocomplete"
+                  options={options}
+                  onSelect={handleOverwriteDatasetOption}
+                  onSearch={onSearch}
+                  placeholder="Select or type dataset name"
+                  filterOption={filterAutocompleteOption}
+                />
+              </Radio>
+            </Radio.Group>
+          </div>
+        )}
+        {overwriteDataSet && (
+          <div>Are you sure you want to overwrite this dataset?</div>
+        )}
+      </Styles>
+    </StyledModal>
+  );
+};

From 734efab0596be0f96883a274310f0ba1a4cf42e6 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 13:45:45 -0800
Subject: [PATCH 070/138] add components reference

---
 superset-frontend/src/common/components/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index cb11a6f1cf1dc..e88573503cc4e 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
-import { Dropdown, Skeleton, Menu as AntdMenu } from 'antd';
+import { AutoComplete, Dropdown, Skeleton, Menu as AntdMenu, Radio} from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
 
 /*
@@ -29,6 +29,7 @@ import { DropDownProps } from 'antd/lib/dropdown';
  */
 // eslint-disable-next-line no-restricted-imports
 export {
+  AutoComplete,
   Avatar,
   Button,
   Card,
@@ -41,6 +42,7 @@ export {
   Popover,
   Select,
   Skeleton,
+  Radio,
   Tabs,
   Tooltip,
 } from 'antd';

From 77594ce1e3aba7b833e7b3ea9605fd4987015f8c Mon Sep 17 00:00:00 2001
From: "Hugh A. Miles II" <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 13:51:00 -0800
Subject: [PATCH 071/138] Rename SaveDatasetModal_spec.jsx to
 SaveDatasetModal_spec.tsx

---
 .../{SaveDatasetModal_spec.jsx => SaveDatasetModal_spec.tsx}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename superset-frontend/spec/javascripts/sqllab/{SaveDatasetModal_spec.jsx => SaveDatasetModal_spec.tsx} (100%)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
rename to superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx

From bde85ebfecefa5437ab98f7af087156f0f552bb6 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 23:00:42 -0800
Subject: [PATCH 072/138] remove sinon for now

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.tsx            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
index 89fa7567e6540..a26b56c99f115 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
@@ -18,7 +18,6 @@
  */
 import React from 'react';
 import { shallow } from 'enzyme';
-import sinon from 'sinon';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 

From 7c26b280aa700966e6569c70fc3b271786d0d0a9 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 30 Nov 2020 23:41:02 -0800
Subject: [PATCH 073/138] fix typing errors on modal files

---
 .../SqlLab/components/SaveDatasetModal.tsx    | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 2cdc4e7c8f499..9ae3ce8328cf2 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -22,14 +22,15 @@ import { Radio, AutoComplete, Input } from 'src/common/components';
 import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
 import { styled } from '@superset-ui/core';
+import { RadioChangeEvent } from 'antd/lib/radio';
 
 interface SaveDatasetModalProps {
   visible: boolean;
   onOk: () => void;
-  onCancel: () => void;
+  onHide: () => void;
   handleDatasetNameChange: (e: { target: { value: any } }) => void;
   userDatasetsOwned: Array<Record<string, any>>;
-  handleSaveDatasetRadioBtnState: (e: { target: { value: any } }) => void;
+  handleSaveDatasetRadioBtnState: (e: RadioChangeEvent) => void;
   saveDatasetRadioBtnState: number;
   overwriteDataSet: boolean;
   handleOverwriteCancel: () => void;
@@ -62,7 +63,7 @@ const Styles = styled.div`
 export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   visible,
   onOk,
-  onCancel,
+  onHide,
   handleDatasetNameChange,
   userDatasetsOwned,
   handleSaveDatasetRadioBtnState,
@@ -73,13 +74,17 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   handleOverwriteDatasetOption,
   defaultCreateDatasetValue,
 }) => {
-  const [options, setOptions] = useState([]);
+  const [options, setOptions] = useState<{
+      value: string;
+      dataSetId: number;
+    }[]
+  >([]);
 
   const onSearch = (searchText: any) => {
     setOptions(
       !searchText
         ? []
-        : userDatasetsOwned.map((d: { dataSetName: any; dataSetId: any }) => ({
+        : userDatasetsOwned.map(d => ({
             value: d.dataSetName,
             dataSetId: d.dataSetId,
           })),
@@ -87,8 +92,8 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   };
 
   const filterAutocompleteOption = (
-    inputValue: any,
-    option: { value: string | any[] },
+    inputValue: string,
+    option: { [key: string]: any } | any,
   ) => {
     return option.value.includes(inputValue);
   };
@@ -96,9 +101,8 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   return (
     <StyledModal
       show={visible}
-      onHide={() => {}}
       title="Save or Overwrite Dataset"
-      onCancel={onCancel}
+      onHide={onHide}
       footer={
         <>
           {!overwriteDataSet && (
@@ -108,7 +112,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
               className="m-r-5"
               onClick={onOk}
             >
-              Save & Explore
+              Save &amp; Explore
             </Button>
           )}
           {overwriteDataSet && (

From b46f125f38fbeea68aec2a07f70bc09c2454bd85 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 09:15:24 -0800
Subject: [PATCH 074/138] fix linting

---
 .../src/SqlLab/components/SaveDatasetModal.tsx            | 3 ++-
 superset-frontend/src/common/components/index.tsx         | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 9ae3ce8328cf2..f7293b0bf281d 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -74,7 +74,8 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   handleOverwriteDatasetOption,
   defaultCreateDatasetValue,
 }) => {
-  const [options, setOptions] = useState<{
+  const [options, setOptions] = useState<
+    {
       value: string;
       dataSetId: number;
     }[]
diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index e88573503cc4e..94d16de23361b 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,7 +19,13 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
-import { AutoComplete, Dropdown, Skeleton, Menu as AntdMenu, Radio} from 'antd';
+import {
+  AutoComplete,
+  Dropdown,
+  Skeleton,
+  Menu as AntdMenu,
+  Radio,
+} from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
 
 /*

From d4d4ddd3396e2716ee392d0f37e3ee1380171dae Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 19:25:27 -0800
Subject: [PATCH 075/138] address comments

---
 .../src/SqlLab/components/SaveDatasetModal.tsx     | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 887f4d0b5d6ec..fe6c4950fcd78 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -22,25 +22,15 @@ import { Radio, AutoComplete, Input } from 'src/common/components';
 import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
 import { styled } from '@superset-ui/core';
-<<<<<<< HEAD
-=======
 import { RadioChangeEvent } from 'antd/lib/radio';
->>>>>>> 014cdeeac4dfd1fc61d176e0796a07d29db808d6
 
 interface SaveDatasetModalProps {
   visible: boolean;
   onOk: () => void;
-<<<<<<< HEAD
-  onCancel: () => void;
-  handleDatasetNameChange: (e: { target: { value: any } }) => void;
-  userDatasetsOwned: Array<Record<string, any>>;
-  handleSaveDatasetRadioBtnState: (e: { target: { value: any } }) => void;
-=======
   onHide: () => void;
   handleDatasetNameChange: (e: { target: { value: any } }) => void;
   userDatasetsOwned: Array<Record<string, any>>;
   handleSaveDatasetRadioBtnState: (e: RadioChangeEvent) => void;
->>>>>>> 014cdeeac4dfd1fc61d176e0796a07d29db808d6
   saveDatasetRadioBtnState: number;
   overwriteDataSet: boolean;
   handleOverwriteCancel: () => void;
@@ -92,7 +82,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
     }[]
   >([]);
 
-  const onSearch = (searchText: any) => {
+  const onSearch = (searchText: string | undefined) => {
     setOptions(
       !searchText
         ? []
@@ -147,7 +137,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 onClick={handleOverwriteDataset}
               >
                 Ok
-              </Button>{' '}
+              </Button>
             </>
           )}
         </>

From d01b0be3f510d0955144c3314778d428ff2a3a75 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 20:14:23 -0800
Subject: [PATCH 076/138] attempt to fix linting

---
 .../sqllab/SaveDatasetModal_spec.jsx           | 18 +++++++++++++++---
 .../SqlLab/components/ExploreResultsButton.jsx |  2 --
 .../src/SqlLab/components/ResultSet.tsx        |  1 -
 .../src/SqlLab/components/SaveDatasetModal.tsx |  1 -
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
index 89fa7567e6540..41cadec74ffe9 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
@@ -18,14 +18,26 @@
  */
 import React from 'react';
 import { shallow } from 'enzyme';
-import sinon from 'sinon';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 
 describe('SaveDatasetModal', () => {
-  const mockedProps = {};
+  const mockedProps = {
+    visible: false,
+    onOk: () => {},
+    onHide: () => {},
+    handleDatasetNameChange: () => {},
+    userDatasetsOwned: [],
+    handleSaveDatasetRadioBtnState: () => {},
+    saveDatasetRadioBtnState: 1,
+    overwriteDataSet: false,
+    handleOverwriteCancel: () => {},
+    handleOverwriteDataset: () => {},
+    handleOverwriteDatasetOption: () => {},
+    defaultCreateDatasetValue: 'someDatasets',
+  };
   it('renders a radio group btn', () => {
-    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    const wrapper = shallow(<SaveDatasetModal visible />);
     expect(wrapper.find(Radio.Group)).toExist();
   });
   it('renders a autocomplete', () => {
diff --git a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
index 192687774266d..fc8c8ac017d60 100644
--- a/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
+++ b/superset-frontend/src/SqlLab/components/ExploreResultsButton.jsx
@@ -26,9 +26,7 @@ import { t } from '@superset-ui/core';
 import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import shortid from 'shortid';
 
-import Modal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
-import { exploreChart } from '../../explore/exploreUtils';
 import * as actions from '../actions/sqlLab';
 
 const propTypes = {
diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 0951b7115352f..a418f9657506f 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -38,7 +38,6 @@ import { exploreChart } from '../../explore/exploreUtils';
 import { CtasEnum } from '../actions/sqlLab';
 import { Query } from '../types';
 
-
 const SEARCH_HEIGHT = 46;
 
 const SAVE_NEW_DATASET_RADIO_STATE = 1;
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index fe6c4950fcd78..c6ade3c80cb5d 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -74,7 +74,6 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   handleOverwriteDatasetOption,
   defaultCreateDatasetValue,
 }) => {
-
   const [options, setOptions] = useState<
     {
       value: string;

From c5977822497dd200b71837986739ea9daeeefc18 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 20:22:02 -0800
Subject: [PATCH 077/138] add props

---
 .../sqllab/SaveDatasetModal_spec.tsx            | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
index a26b56c99f115..41cadec74ffe9 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
@@ -22,9 +22,22 @@ import { Radio, AutoComplete, Input } from 'src/common/components';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
 
 describe('SaveDatasetModal', () => {
-  const mockedProps = {};
+  const mockedProps = {
+    visible: false,
+    onOk: () => {},
+    onHide: () => {},
+    handleDatasetNameChange: () => {},
+    userDatasetsOwned: [],
+    handleSaveDatasetRadioBtnState: () => {},
+    saveDatasetRadioBtnState: 1,
+    overwriteDataSet: false,
+    handleOverwriteCancel: () => {},
+    handleOverwriteDataset: () => {},
+    handleOverwriteDatasetOption: () => {},
+    defaultCreateDatasetValue: 'someDatasets',
+  };
   it('renders a radio group btn', () => {
-    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
+    const wrapper = shallow(<SaveDatasetModal visible />);
     expect(wrapper.find(Radio.Group)).toExist();
   });
   it('renders a autocomplete', () => {

From 5f134d264282d23832b851ec245f7fb399fc0028 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 20:25:26 -0800
Subject: [PATCH 078/138] fix test

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
index 41cadec74ffe9..905e743c7f2e6 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
@@ -37,7 +37,7 @@ describe('SaveDatasetModal', () => {
     defaultCreateDatasetValue: 'someDatasets',
   };
   it('renders a radio group btn', () => {
-    const wrapper = shallow(<SaveDatasetModal visible />);
+    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
     expect(wrapper.find(Radio.Group)).toExist();
   });
   it('renders a autocomplete', () => {

From aa1df1b376598f6ac498ca6fa3ec28908c4ab291 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 22:06:32 -0800
Subject: [PATCH 079/138] fix the linting

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 4 ++--
 superset-frontend/src/common/components/index.tsx            | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index f7293b0bf281d..2b63154f83fd6 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -81,7 +81,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
     }[]
   >([]);
 
-  const onSearch = (searchText: any) => {
+  const onSearch = (searchText: string) => {
     setOptions(
       !searchText
         ? []
@@ -136,7 +136,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 onClick={handleOverwriteDataset}
               >
                 Ok
-              </Button>{' '}
+              </Button>
             </>
           )}
         </>
diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index 3d169324bba56..ab2dd06a7b9c3 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -20,11 +20,9 @@ import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
 import {
-  AutoComplete,
   Dropdown,
   Skeleton,
   Menu as AntdMenu,
-  Radio,
 } from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
 

From e4988f28a522a5766764facba713d3e8a3b21af0 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 22:45:07 -0800
Subject: [PATCH 080/138] yerp

---
 superset-frontend/src/common/components/index.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index ab2dd06a7b9c3..228404b2a7575 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,11 +19,6 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
-import {
-  Dropdown,
-  Skeleton,
-  Menu as AntdMenu,
-} from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
 
 /*
@@ -42,6 +37,7 @@ export {
   Dropdown,
   Empty,
   Input,
+  Menu as AntdMenu,
   Modal,
   Popover,
   Select,

From e0e1261bb7e8a3d32aeb52567bf87e5344693b7b Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 22:56:27 -0800
Subject: [PATCH 081/138] fix this references

---
 superset-frontend/src/common/components/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index 228404b2a7575..7852fbe016dec 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,6 +19,7 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
+import { Menu as AntdMenu, Dropdown, Skeleton} from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
 
 /*
@@ -37,7 +38,6 @@ export {
   Dropdown,
   Empty,
   Input,
-  Menu as AntdMenu,
   Modal,
   Popover,
   Select,

From 38f03dff99f61a7309bb46539f8a4184d2989001 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 22:59:03 -0800
Subject: [PATCH 082/138] spaces

---
 superset-frontend/src/common/components/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx
index 7852fbe016dec..97ddef73f2412 100644
--- a/superset-frontend/src/common/components/index.tsx
+++ b/superset-frontend/src/common/components/index.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { styled } from '@superset-ui/core';
 // eslint-disable-next-line no-restricted-imports
-import { Menu as AntdMenu, Dropdown, Skeleton} from 'antd';
+import { Menu as AntdMenu, Dropdown, Skeleton } from 'antd';
 import { DropDownProps } from 'antd/lib/dropdown';
 
 /*

From 1c44814f92e3d9ec07a2911ffc31ceb5a35472c4 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 23:17:57 -0800
Subject: [PATCH 083/138] handleOverwriteCancel reference cleanup

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 2b63154f83fd6..d4f240ae4ee6a 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -118,14 +118,11 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
           )}
           {overwriteDataSet && (
             <>
-              {' '}
               <Button
                 buttonSize="sm"
                 buttonStyle="danger"
                 className="m-r-5"
-                onClick={() => {
-                  handleOverwriteCancel();
-                }}
+                onClick={handleOverwriteCancel}
               >
                 Cancel
               </Button>

From ad4f9526adc1abd758e3f2cfaa6342868fe3f8b4 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 23:41:07 -0800
Subject: [PATCH 084/138] rename bool value for shouldOverwriteDataset

---
 .../src/SqlLab/components/SaveDatasetModal.tsx       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index d4f240ae4ee6a..422f89abf8512 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -32,7 +32,7 @@ interface SaveDatasetModalProps {
   userDatasetsOwned: Array<Record<string, any>>;
   handleSaveDatasetRadioBtnState: (e: RadioChangeEvent) => void;
   saveDatasetRadioBtnState: number;
-  overwriteDataSet: boolean;
+  shouldOverwriteDataset: boolean;
   handleOverwriteCancel: () => void;
   handleOverwriteDataset: () => void;
   handleOverwriteDatasetOption: (
@@ -68,7 +68,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   userDatasetsOwned,
   handleSaveDatasetRadioBtnState,
   saveDatasetRadioBtnState,
-  overwriteDataSet,
+  shouldOverwriteDataset,
   handleOverwriteCancel,
   handleOverwriteDataset,
   handleOverwriteDatasetOption,
@@ -106,7 +106,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
       onHide={onHide}
       footer={
         <>
-          {!overwriteDataSet && (
+          {!shouldOverwriteDataset && (
             <Button
               buttonSize="sm"
               buttonStyle="primary"
@@ -116,7 +116,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
               Save &amp; Explore
             </Button>
           )}
-          {overwriteDataSet && (
+          {shouldOverwriteDataset && (
             <>
               <Button
                 buttonSize="sm"
@@ -140,7 +140,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
       }
     >
       <Styles>
-        {!overwriteDataSet && (
+        {!shouldOverwriteDataset && (
           <div className="smd-body">
             <div className="smd-prompt">
               Save this query as virtual dataset to continue exploring.
@@ -171,7 +171,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
             </Radio.Group>
           </div>
         )}
-        {overwriteDataSet && (
+        {shouldOverwriteDataset && (
           <div>Are you sure you want to overwrite this dataset?</div>
         )}
       </Styles>

From 1d880ab388a3e100521934dae469e12d59a8188b Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 1 Dec 2020 23:45:58 -0800
Subject: [PATCH 085/138] fix typing for onChange

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 422f89abf8512..0a7e95aa17fcc 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -28,7 +28,7 @@ interface SaveDatasetModalProps {
   visible: boolean;
   onOk: () => void;
   onHide: () => void;
-  handleDatasetNameChange: (e: { target: { value: any } }) => void;
+  handleDatasetNameChange: (e: React.FormEvent<HTMLInputElement>) => void;
   userDatasetsOwned: Array<Record<string, any>>;
   handleSaveDatasetRadioBtnState: (e: RadioChangeEvent) => void;
   saveDatasetRadioBtnState: number;

From cadca8e52ceb2e66f495798922696f5afdabd049 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 2 Dec 2020 00:12:07 -0800
Subject: [PATCH 086/138] you still the best in the world

---
 .../src/SqlLab/components/ResultSet.tsx             | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index a418f9657506f..1d767ba2bb871 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -19,6 +19,7 @@
 import React, { CSSProperties } from 'react';
 import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap';
 import moment from 'moment';
+import { RadioChangeEvent } from 'antd/lib/radio';
 import Button from 'src/components/Button';
 import shortid from 'shortid';
 import { styled, t } from '@superset-ui/core';
@@ -323,9 +324,11 @@ export default class ResultSet extends React.PureComponent<
           );
         });
     }
+
+    this.setState({ showSaveDatasetModal: false });
   }
 
-  handleDatasetNameChange(e: { target: { value: any } }) {
+  handleDatasetNameChange(e: React.FormEvent<HTMLInputElement>) {
     this.setState({ newSaveDatasetName: e.target.value });
   }
 
@@ -333,8 +336,8 @@ export default class ResultSet extends React.PureComponent<
     this.setState({ showSaveDatasetModal: false, overwriteDataSet: false });
   }
 
-  handleSaveDatasetRadioBtnState(e: { target: { value: any } }) {
-    this.setState({ saveDatasetRadioBtnState: e.target.value });
+  handleSaveDatasetRadioBtnState(e: RadioChangeEvent) {
+    this.setState({ saveDatasetRadioBtnState: Number(e.target.value) });
   }
 
   handleOverwriteCancel() {
@@ -353,12 +356,12 @@ export default class ResultSet extends React.PureComponent<
           <SaveDatasetModal
             visible={this.state.showSaveDatasetModal}
             onOk={this.handleSaveInDataset}
-            onCancel={this.handleHideSaveModal}
+            onHide={this.handleHideSaveModal}
             handleDatasetNameChange={this.handleDatasetNameChange}
             userDatasetsOwned={this.state.userDatasetsOwned}
             handleSaveDatasetRadioBtnState={this.handleSaveDatasetRadioBtnState}
             saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
-            overwriteDataSet={this.state.overwriteDataSet}
+            shouldOverwriteDataset={this.state.overwriteDataSet}
             handleOverwriteCancel={this.handleOverwriteCancel}
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}

From 2622a82dca80d71405184a47055f5ca7f9cc5f28 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 2 Dec 2020 17:03:16 -0800
Subject: [PATCH 087/138] fix spec

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
index 905e743c7f2e6..4b6ef601efac8 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
@@ -30,7 +30,7 @@ describe('SaveDatasetModal', () => {
     userDatasetsOwned: [],
     handleSaveDatasetRadioBtnState: () => {},
     saveDatasetRadioBtnState: 1,
-    overwriteDataSet: false,
+    shouldOverwriteDataset: false,
     handleOverwriteCancel: () => {},
     handleOverwriteDataset: () => {},
     handleOverwriteDatasetOption: () => {},

From e3c7e465cb0e49136965b3a4ef6a7268343eb7a2 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 2 Dec 2020 18:27:30 -0800
Subject: [PATCH 088/138] align branches

---
 .../src/SqlLab/components/SaveDatasetModal.tsx         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 0a7e95aa17fcc..c100dff369bff 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -77,7 +77,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   const [options, setOptions] = useState<
     {
       value: string;
-      dataSetId: number;
+      datasetId: number;
     }[]
   >([]);
 
@@ -86,16 +86,18 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
       !searchText
         ? []
         : userDatasetsOwned.map(d => ({
-            value: d.dataSetName,
-            dataSetId: d.dataSetId,
+            value: d.datasetName,
+            datasetId: d.datasetId,
           })),
     );
   };
 
   const filterAutocompleteOption = (
     inputValue: string,
-    option: { [key: string]: any } | any,
+    option: { value: string; datasetId: number },
   ) => {
+    // We need to add "es7" to tsconfig for this to error to go way
+    // https://stackoverflow.com/questions/51811239/ts2339-property-includes-does-not-exist-on-type-string/51811417
     return option.value.includes(inputValue);
   };
 

From 5e7821348e817eb7dc743878e531d6c23aa50908 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 2 Dec 2020 18:41:48 -0800
Subject: [PATCH 089/138] push

---
 .../src/SqlLab/components/ResultSet.tsx           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 1d767ba2bb871..cf841e73ab23c 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -26,7 +26,7 @@ import { styled, t } from '@superset-ui/core';
 
 import ErrorMessageWithStackTrace from 'src/components/ErrorMessage/ErrorMessageWithStackTrace';
 import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
-import { getByUser as getDataset, put as updateDatset } from 'src/api/dataset';
+import { getByUser, put as updateDatset } from 'src/api/dataset';
 import Loading from '../../components/Loading';
 import ExploreCtasResultsButton from './ExploreCtasResultsButton';
 import ExploreResultsButton from './ExploreResultsButton';
@@ -145,13 +145,15 @@ export default class ResultSet extends React.PureComponent<
     // Hack: waiting for talks with tai to pull data out of the initial state
     const appContainer = document.getElementById('app');
     const bootstrapData = JSON.parse(
-      appContainer.getAttribute('data-bootstrap'),
+      appContainer?.getAttribute('data-bootstrap') || '{}',
     );
 
-    const datasets = await getDataset(bootstrapData.user.userId);
-    const userDatasetsOwned = datasets.map(r => {
-      return { dataSetName: r.table_name, dataSetId: r.id };
-    });
+    const datasets = await getByUser(bootstrapData.user.userId);
+    const userDatasetsOwned = datasets.map(
+      (r: { table_name: string; id: number }) => {
+        return { dataSetName: r.table_name, dataSetId: r.id };
+      },
+    );
 
     this.setState({ userDatasetsOwned });
   }
@@ -329,6 +331,7 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleDatasetNameChange(e: React.FormEvent<HTMLInputElement>) {
+    // @ts-expect-error
     this.setState({ newSaveDatasetName: e.target.value });
   }
 

From c3d40be4d06ff096a3862294001b84c20f0e75c0 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 2 Dec 2020 19:27:12 -0800
Subject: [PATCH 090/138] fix key names

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index cf841e73ab23c..9c871793dcf99 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -151,7 +151,7 @@ export default class ResultSet extends React.PureComponent<
     const datasets = await getByUser(bootstrapData.user.userId);
     const userDatasetsOwned = datasets.map(
       (r: { table_name: string; id: number }) => {
-        return { dataSetName: r.table_name, dataSetId: r.id };
+        return { datasetName: r.table_name, datasetId: r.id };
       },
     );
 

From 7f955191f6c317ff30921e46cfa7d911f19f7446 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Wed, 2 Dec 2020 21:04:48 -0800
Subject: [PATCH 091/138] fix dataset reference

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 9c871793dcf99..dab760cefb285 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -240,7 +240,7 @@ export default class ResultSet extends React.PureComponent<
     }
 
     updateDatset(
-      datasetToOverwrite.dataSetId,
+      datasetToOverwrite.datasetId,
       sql,
       results.selected_columns.map(d => ({ column_name: d.name })),
       true,
@@ -248,7 +248,7 @@ export default class ResultSet extends React.PureComponent<
       .then(d => {
         exploreChart({
           ...EXPLORE_CHART_DEFAULT,
-          datasource: `${datasetToOverwrite.dataSetId}__table`,
+          datasource: `${datasetToOverwrite.datasetId}__table`,
           all_columns: results.selected_columns.map(d => d.name),
         });
       })

From f57859a84483ace94dbf0d250cc1cba8fde9b7db Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 3 Dec 2020 18:18:36 -0800
Subject: [PATCH 092/138] lowercase

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 01906b70fb840..adfdd6e0e4c0f 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -96,7 +96,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
     inputValue: string,
     option: { value: string; datasetId: number },
   ) => {
-    return option.value.includes(inputValue);
+    return option.value.toLowerCase().includes(inputValue.toLowerCase());
   };
 
   return (

From 34deb19ed929abab780e7c5bb80bf8e96c30f8e2 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 3 Dec 2020 18:41:09 -0800
Subject: [PATCH 093/138] fix save bug with tiem

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 84ef23c27cd07..f828fdffc85e0 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -258,10 +258,17 @@ export default class ResultSet extends React.PureComponent<
         );
       });
 
+    console.log(
+      `${this.props.query.tab} ${moment().format('MM/DD/YYYY HH:mm:ss')}`,
+    );
+
     this.setState({
       showSaveDatasetModal: false,
       overwriteDataSet: false,
       datasetToOverwrite: {},
+      newSaveDatasetName: `${this.props.query.tab} ${moment().format(
+        'MM/DD/YYYY HH:mm:ss',
+      )}`,
     });
   }
 
@@ -327,7 +334,9 @@ export default class ResultSet extends React.PureComponent<
         });
     }
 
-    this.setState({ showSaveDatasetModal: false });
+    this.setState({ showSaveDatasetModal: false, newSaveDatasetName: `${this.props.query.tab} ${moment().format(
+      'MM/DD/YYYY HH:mm:ss',
+    )}`,});
   }
 
   handleDatasetNameChange(e: React.FormEvent<HTMLInputElement>) {

From ccef2de229b16852fb17dbb1e84bb426a1933372 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 3 Dec 2020 21:34:03 -0800
Subject: [PATCH 094/138] fixed styling

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index adfdd6e0e4c0f..1190da6f6a789 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -43,6 +43,9 @@ interface SaveDatasetModalProps {
 }
 
 const Styles = styled.div`
+  .smd-body {
+    margin: 0 8px;
+  }
   .smd-input {
     margin-left: 45px;
     width: 290px;

From e51b294c648f4bceab920343317a7e62e8edc169 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 3 Dec 2020 21:38:18 -0800
Subject: [PATCH 095/138] fix date state after push to explore

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index f828fdffc85e0..3c62926fa4747 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -334,9 +334,12 @@ export default class ResultSet extends React.PureComponent<
         });
     }
 
-    this.setState({ showSaveDatasetModal: false, newSaveDatasetName: `${this.props.query.tab} ${moment().format(
-      'MM/DD/YYYY HH:mm:ss',
-    )}`,});
+    this.setState({
+      showSaveDatasetModal: false,
+      newSaveDatasetName: `${this.props.query.tab} ${moment().format(
+        'MM/DD/YYYY HH:mm:ss',
+      )}`,
+    });
   }
 
   handleDatasetNameChange(e: React.FormEvent<HTMLInputElement>) {

From 6d78f7f270ad2a75c7c888f35fd7e1775a211a89 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Thu, 3 Dec 2020 21:41:48 -0800
Subject: [PATCH 096/138] add disabling states

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 1190da6f6a789..e34dcb7ce01e6 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -158,6 +158,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                   className="smd-input"
                   defaultValue={defaultCreateDatasetValue}
                   onChange={handleDatasetNameChange}
+                  disabled={saveDatasetRadioBtnState !== 1}
                 />
               </Radio>
               <Radio className="smd-radio" value={2}>
@@ -169,6 +170,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                   onSearch={onSearch}
                   placeholder="Select or type dataset name"
                   filterOption={filterAutocompleteOption}
+                  disabled={saveDatasetRadioBtnState !== 2}
                 />
               </Radio>
             </Radio.Group>

From ef3bece1dd45066e85c7ce94ce9e785f274c5f8a Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 4 Dec 2020 14:35:51 -0800
Subject: [PATCH 097/138] plz refactor this

---
 .../src/SqlLab/components/ResultSet.tsx       | 76 ++++++++++++++++-
 .../SqlLab/components/SaveDatasetModal.tsx    | 83 ++++++++++---------
 .../src/explore/components/SaveModal.jsx      |  4 +-
 3 files changed, 118 insertions(+), 45 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 3c62926fa4747..220ed00de9f83 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -76,6 +76,7 @@ interface ResultSetState {
   overwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
   ctasSave: boolean;
+  disableSaveAndExploreBtn: boolean;
 }
 
 // Making text render line breaks/tabs as is as monospace,
@@ -116,6 +117,8 @@ export default class ResultSet extends React.PureComponent<
       overwriteDataSet: false,
       datasetToOverwrite: {},
       ctasSave: false,
+      disableSaveAndExploreBtn: false,
+      testOptions: []
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -136,6 +139,15 @@ export default class ResultSet extends React.PureComponent<
     this.handleOverwriteDatasetOption = this.handleOverwriteDatasetOption.bind(
       this,
     );
+    this.handleDisableSaveAndExploreBtn = this.handleDisableSaveAndExploreBtn.bind(
+      this,
+    );
+    this.handleSaveDatasetModalSearch = this.handleSaveDatasetModalSearch.bind(
+      this,
+    );
+    this.handleFilterAutocompleteOption = this.handleFilterAutocompleteOption.bind(
+      this,
+    );
   }
 
   async componentDidMount() {
@@ -222,10 +234,6 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
-  handleOverwriteDatasetOption(data: string, option: Record<string, any>) {
-    this.setState({ datasetToOverwrite: option });
-  }
-
   async handleOverwriteDataset() {
     const { sql, results } = this.props.query;
     const { datasetToOverwrite } = this.state;
@@ -342,6 +350,10 @@ export default class ResultSet extends React.PureComponent<
     });
   }
 
+  handleOverwriteDatasetOption(data: string, option: Record<string, any>) {
+    this.setState({ datasetToOverwrite: option });
+  }
+
   handleDatasetNameChange(e: React.FormEvent<HTMLInputElement>) {
     // @ts-expect-error
     this.setState({ newSaveDatasetName: e.target.value });
@@ -359,6 +371,46 @@ export default class ResultSet extends React.PureComponent<
     this.setState({ overwriteDataSet: false });
   }
 
+  handleSaveDatasetModalSearch(searchText: string) {
+    const { userDatasetsOwned } = this.state;
+    const newState = !searchText
+      ? []
+      : userDatasetsOwned.map(d => ({
+          value: d.datasetName,
+          datasetId: d.datasetId,
+        }));
+
+    console.log(newState);
+    this.setState({testOptions: newState});
+  }
+
+  handleFilterAutocompleteOption = (
+    inputValue: string,
+    option: { value: string; datasetId: number },
+  ) => {
+    console.log('toooo');
+    return option.value.toLowerCase().includes(inputValue.toLowerCase());
+  };
+
+  handleDisableSaveAndExploreBtn() {
+    // console.log(this.state.saveDatasetRadioBtnState) // radio btn state 1 || 2
+    // console.log(this.state.newSaveDatasetName) // input value for save new
+    // console.log(this.state.datasetToOverwrite) // input value from options
+    const {
+      saveDatasetRadioBtnState,
+      newSaveDatasetName,
+      datasetToOverwrite,
+    } = this.state;
+
+    // console.log(newSaveDatasetName.length)
+    // console.log(Object.keys(datasetToOverwrite).length)
+
+    const disableSaveAndExploreBtn =
+      (saveDatasetRadioBtnState === 1 && newSaveDatasetName.length === 0) ||
+      (saveDatasetRadioBtnState === 2 &&
+        Object.keys(datasetToOverwrite).length === 0);
+  }
+
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
       let { data } = this.props.query.results;
@@ -366,6 +418,18 @@ export default class ResultSet extends React.PureComponent<
         ({ data } = this.state);
       }
 
+      const {
+        saveDatasetRadioBtnState,
+        newSaveDatasetName,
+        datasetToOverwrite,
+      } = this.state;
+      const disableSaveAndExploreBtn =
+        (saveDatasetRadioBtnState === 1 && newSaveDatasetName.length === 0) ||
+        (saveDatasetRadioBtnState === 2 &&
+          Object.keys(datasetToOverwrite).length === 0);
+
+      console.log('radio2', Object.keys(datasetToOverwrite).length);
+      console.log('before render', disableSaveAndExploreBtn);
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
@@ -381,6 +445,10 @@ export default class ResultSet extends React.PureComponent<
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}
             defaultCreateDatasetValue={this.state.newSaveDatasetName}
+            disableSaveAndExploreBtn={disableSaveAndExploreBtn}
+            handleSaveDatasetModalSearch={this.handleSaveDatasetModalSearch}
+            filterAutocompleteOption={this.handleFilterAutocompleteOption}
+            testOptions={this.state.testOptions}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index e34dcb7ce01e6..749abd1f9ee0c 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -40,6 +40,8 @@ interface SaveDatasetModalProps {
     option: Record<string, any>,
   ) => void;
   defaultCreateDatasetValue: string;
+  disableSaveAndExploreBtn: boolean;
+  handleSaveDatasetModalSearch: () => void;
 }
 
 const Styles = styled.div`
@@ -48,11 +50,11 @@ const Styles = styled.div`
   }
   .smd-input {
     margin-left: 45px;
-    width: 290px;
+    width: 401px;
   }
   .smd-autocomplete {
     margin-left: 8px;
-    width: 290px;
+    width: 401px;
   }
   .smd-radio {
     display: block;
@@ -76,31 +78,40 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   handleOverwriteDataset,
   handleOverwriteDatasetOption,
   defaultCreateDatasetValue,
+  disableSaveAndExploreBtn,
+  handleSaveDatasetModalSearch,
+  filterAutocompleteOption,
+  testOptions,
 }) => {
-  const [options, setOptions] = useState<
-    {
-      value: string;
-      datasetId: number;
-    }[]
-  >([]);
+  // const [options, setOptions] = useState<
+  //   {
+  //     value: string;
+  //     datasetId: number;
+  //   }[]
+  // >([]);
 
-  const onSearch = (searchText: string) => {
-    setOptions(
-      !searchText
-        ? []
-        : userDatasetsOwned.map(d => ({
-            value: d.datasetName,
-            datasetId: d.datasetId,
-          })),
-    );
-  };
+  // const onSearch = (searchText: string) => {
+  //   setOptions(
+  //     !searchText
+  //       ? []
+  //       : userDatasetsOwned
+  //           .filter(d => d.datasetName.includes(searchText))
+  //           .map(d => ({
+  //             value: d.datasetName,
+  //             datasetId: d.datasetId,
+  //         })),
+  //   );
+  // };
 
-  const filterAutocompleteOption = (
-    inputValue: string,
-    option: { value: string; datasetId: number },
-  ) => {
-    return option.value.toLowerCase().includes(inputValue.toLowerCase());
-  };
+  // const filterAutocompleteOption = (
+  //   inputValue: string,
+  //   option: { value: string; datasetId: number },
+  // ) => {
+  //   console.log('toooo')
+  //   return option.value.toLowerCase().includes(inputValue.toLowerCase());
+  // };
+
+  console.log('in saveModal', disableSaveAndExploreBtn)
 
   return (
     <StyledModal
@@ -111,9 +122,9 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
         <>
           {!shouldOverwriteDataset && (
             <Button
-              buttonSize="sm"
+              disabled={disableSaveAndExploreBtn}
+              buttonSize="medium"
               buttonStyle="primary"
-              className="m-r-5"
               onClick={onOk}
             >
               Save &amp; Explore
@@ -121,21 +132,17 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
           )}
           {shouldOverwriteDataset && (
             <>
-              <Button
-                buttonSize="sm"
-                buttonStyle="danger"
-                className="m-r-5"
-                onClick={handleOverwriteCancel}
-              >
-                Cancel
+              <Button buttonSize="medium" onClick={handleOverwriteCancel}>
+                Back
               </Button>
               <Button
-                buttonSize="sm"
+                className="md"
+                buttonSize="medium"
                 buttonStyle="primary"
-                className="m-r-5"
                 onClick={handleOverwriteDataset}
+                disabled={disableSaveAndExploreBtn}
               >
-                Ok
+                Save &amp; Explore
               </Button>
             </>
           )}
@@ -165,9 +172,9 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 Overwrite existing
                 <AutoComplete
                   className="smd-autocomplete"
-                  options={options}
+                  options={testOptions}
                   onSelect={handleOverwriteDatasetOption}
-                  onSearch={onSearch}
+                  onSearch={handleSaveDatasetModalSearch}
                   placeholder="Select or type dataset name"
                   filterOption={filterAutocompleteOption}
                   disabled={saveDatasetRadioBtnState !== 2}
diff --git a/superset-frontend/src/explore/components/SaveModal.jsx b/superset-frontend/src/explore/components/SaveModal.jsx
index 67d1c5b5d8064..cffbc271b85d5 100644
--- a/superset-frontend/src/explore/components/SaveModal.jsx
+++ b/superset-frontend/src/explore/components/SaveModal.jsx
@@ -139,12 +139,11 @@ class SaveModal extends React.Component {
         title={t('Save Chart')}
         footer={
           <div data-test="save-modal-footer">
-            <Button id="btn_cancel" buttonSize="sm" onClick={this.props.onHide}>
+            <Button id="btn_cancel" onClick={this.props.onHide}>
               {t('Cancel')}
             </Button>
             <Button
               id="btn_modal_save_goto_dash"
-              buttonSize="sm"
               disabled={
                 !this.state.newSliceName || !this.state.newDashboardName
               }
@@ -154,7 +153,6 @@ class SaveModal extends React.Component {
             </Button>
             <Button
               id="btn_modal_save"
-              buttonSize="sm"
               buttonStyle="primary"
               onClick={this.saveOrOverwrite.bind(this, false)}
               disabled={!this.state.newSliceName}

From f667f40d3201be3632033269c49e80ba3a553bfc Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Fri, 4 Dec 2020 15:18:47 -0800
Subject: [PATCH 098/138] this is working fully now

---
 .../src/SqlLab/components/ResultSet.tsx         | 17 ++++++++++++++---
 .../src/SqlLab/components/SaveDatasetModal.tsx  |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 220ed00de9f83..b2d3c39942816 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -77,6 +77,7 @@ interface ResultSetState {
   datasetToOverwrite: Record<string, any>;
   ctasSave: boolean;
   disableSaveAndExploreBtn: boolean;
+  saveModalAutocompleteValue: string;
 }
 
 // Making text render line breaks/tabs as is as monospace,
@@ -117,7 +118,7 @@ export default class ResultSet extends React.PureComponent<
       overwriteDataSet: false,
       datasetToOverwrite: {},
       ctasSave: false,
-      disableSaveAndExploreBtn: false,
+      saveModalAutocompleteValue: '',
       testOptions: []
     };
 
@@ -148,6 +149,9 @@ export default class ResultSet extends React.PureComponent<
     this.handleFilterAutocompleteOption = this.handleFilterAutocompleteOption.bind(
       this,
     );
+    this.handleOnChangeAutoComplete = this.handleOnChangeAutoComplete.bind(
+      this,
+    );
   }
 
   async componentDidMount() {
@@ -388,10 +392,14 @@ export default class ResultSet extends React.PureComponent<
     inputValue: string,
     option: { value: string; datasetId: number },
   ) => {
-    console.log('toooo');
     return option.value.toLowerCase().includes(inputValue.toLowerCase());
   };
 
+  handleOnChangeAutoComplete = (e) => {
+    console.log('in handleOnChangeAutoComplete', e.length)
+    this.setState({ datasetToOverwrite: {} });
+  }
+
   handleDisableSaveAndExploreBtn() {
     // console.log(this.state.saveDatasetRadioBtnState) // radio btn state 1 || 2
     // console.log(this.state.newSaveDatasetName) // input value for save new
@@ -422,11 +430,13 @@ export default class ResultSet extends React.PureComponent<
         saveDatasetRadioBtnState,
         newSaveDatasetName,
         datasetToOverwrite,
+        saveModalAutocompleteValue,
       } = this.state;
       const disableSaveAndExploreBtn =
         (saveDatasetRadioBtnState === 1 && newSaveDatasetName.length === 0) ||
         (saveDatasetRadioBtnState === 2 &&
-          Object.keys(datasetToOverwrite).length === 0);
+          Object.keys(datasetToOverwrite).length === 0 &&
+          saveModalAutocompleteValue.length === 0);
 
       console.log('radio2', Object.keys(datasetToOverwrite).length);
       console.log('before render', disableSaveAndExploreBtn);
@@ -449,6 +459,7 @@ export default class ResultSet extends React.PureComponent<
             handleSaveDatasetModalSearch={this.handleSaveDatasetModalSearch}
             filterAutocompleteOption={this.handleFilterAutocompleteOption}
             testOptions={this.state.testOptions}
+            onChangeAutoComplete={this.handleOnChangeAutoComplete}
           />
           <div className="ResultSetButtons">
             {this.props.visualize &&
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 749abd1f9ee0c..c2a58d12ac58a 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -82,6 +82,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   handleSaveDatasetModalSearch,
   filterAutocompleteOption,
   testOptions,
+  onChangeAutoComplete,
 }) => {
   // const [options, setOptions] = useState<
   //   {
@@ -175,6 +176,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                   options={testOptions}
                   onSelect={handleOverwriteDatasetOption}
                   onSearch={handleSaveDatasetModalSearch}
+                  onChange={onChangeAutoComplete}
                   placeholder="Select or type dataset name"
                   filterOption={filterAutocompleteOption}
                   disabled={saveDatasetRadioBtnState !== 2}

From 527af3dd210d4d589810ded9b84d1a9a3cabd1c0 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:12:23 -0800
Subject: [PATCH 099/138] do some renaming

---
 .../src/SqlLab/components/ResultSet.tsx       | 38 ++++---------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index b2d3c39942816..478b17ead604a 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -119,7 +119,7 @@ export default class ResultSet extends React.PureComponent<
       datasetToOverwrite: {},
       ctasSave: false,
       saveModalAutocompleteValue: '',
-      testOptions: []
+      userDatasetOptions: [],
     };
 
     this.changeSearch = this.changeSearch.bind(this);
@@ -140,9 +140,6 @@ export default class ResultSet extends React.PureComponent<
     this.handleOverwriteDatasetOption = this.handleOverwriteDatasetOption.bind(
       this,
     );
-    this.handleDisableSaveAndExploreBtn = this.handleDisableSaveAndExploreBtn.bind(
-      this,
-    );
     this.handleSaveDatasetModalSearch = this.handleSaveDatasetModalSearch.bind(
       this,
     );
@@ -376,16 +373,17 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleSaveDatasetModalSearch(searchText: string) {
+    // Making sure that autocomplete input has a value before rendering the dropdown
+    // Transforming the userDatasetsOwned data for SaveModalComponent
     const { userDatasetsOwned } = this.state;
-    const newState = !searchText
+    const userDatasets = !searchText
       ? []
       : userDatasetsOwned.map(d => ({
           value: d.datasetName,
           datasetId: d.datasetId,
         }));
 
-    console.log(newState);
-    this.setState({testOptions: newState});
+    this.setState({userDatasetOptions: userDatasets});
   }
 
   handleFilterAutocompleteOption = (
@@ -395,29 +393,9 @@ export default class ResultSet extends React.PureComponent<
     return option.value.toLowerCase().includes(inputValue.toLowerCase());
   };
 
-  handleOnChangeAutoComplete = (e) => {
-    console.log('in handleOnChangeAutoComplete', e.length)
+  handleOnChangeAutoComplete = () => {
     this.setState({ datasetToOverwrite: {} });
-  }
-
-  handleDisableSaveAndExploreBtn() {
-    // console.log(this.state.saveDatasetRadioBtnState) // radio btn state 1 || 2
-    // console.log(this.state.newSaveDatasetName) // input value for save new
-    // console.log(this.state.datasetToOverwrite) // input value from options
-    const {
-      saveDatasetRadioBtnState,
-      newSaveDatasetName,
-      datasetToOverwrite,
-    } = this.state;
-
-    // console.log(newSaveDatasetName.length)
-    // console.log(Object.keys(datasetToOverwrite).length)
-
-    const disableSaveAndExploreBtn =
-      (saveDatasetRadioBtnState === 1 && newSaveDatasetName.length === 0) ||
-      (saveDatasetRadioBtnState === 2 &&
-        Object.keys(datasetToOverwrite).length === 0);
-  }
+  };
 
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
@@ -458,7 +436,7 @@ export default class ResultSet extends React.PureComponent<
             disableSaveAndExploreBtn={disableSaveAndExploreBtn}
             handleSaveDatasetModalSearch={this.handleSaveDatasetModalSearch}
             filterAutocompleteOption={this.handleFilterAutocompleteOption}
-            testOptions={this.state.testOptions}
+            testOptions={this.state.userDatasetOptions}
             onChangeAutoComplete={this.handleOnChangeAutoComplete}
           />
           <div className="ResultSetButtons">

From cd82c7593d44da1b44d59beabb4bd37edc7d2f9e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:15:30 -0800
Subject: [PATCH 100/138] renaming

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx        | 2 +-
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 478b17ead604a..5e4525db7eccf 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -436,7 +436,7 @@ export default class ResultSet extends React.PureComponent<
             disableSaveAndExploreBtn={disableSaveAndExploreBtn}
             handleSaveDatasetModalSearch={this.handleSaveDatasetModalSearch}
             filterAutocompleteOption={this.handleFilterAutocompleteOption}
-            testOptions={this.state.userDatasetOptions}
+            userDatasetOptions={this.state.userDatasetOptions}
             onChangeAutoComplete={this.handleOnChangeAutoComplete}
           />
           <div className="ResultSetButtons">
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index c2a58d12ac58a..07f6fc8094bbc 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -81,7 +81,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   disableSaveAndExploreBtn,
   handleSaveDatasetModalSearch,
   filterAutocompleteOption,
-  testOptions,
+  userDatasetOptions,
   onChangeAutoComplete,
 }) => {
   // const [options, setOptions] = useState<
@@ -173,7 +173,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 Overwrite existing
                 <AutoComplete
                   className="smd-autocomplete"
-                  options={testOptions}
+                  options={userDatasetOptions}
                   onSelect={handleOverwriteDatasetOption}
                   onSearch={handleSaveDatasetModalSearch}
                   onChange={onChangeAutoComplete}

From 6a7ebdad4f75fb76351f5030e449e96c3cc24c64 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:15:50 -0800
Subject: [PATCH 101/138] remove console.logs

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5e4525db7eccf..1434eb778b492 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -416,8 +416,6 @@ export default class ResultSet extends React.PureComponent<
           Object.keys(datasetToOverwrite).length === 0 &&
           saveModalAutocompleteValue.length === 0);
 
-      console.log('radio2', Object.keys(datasetToOverwrite).length);
-      console.log('before render', disableSaveAndExploreBtn);
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal

From 2e95b72fb6120c27e6c00a2b7c3d6e6df421277c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:21:29 -0800
Subject: [PATCH 102/138] still refactoring

---
 .../src/SqlLab/components/SaveDatasetModal.tsx       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 07f6fc8094bbc..93a71ca1bc5fe 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -29,10 +29,12 @@ interface SaveDatasetModalProps {
   onOk: () => void;
   onHide: () => void;
   handleDatasetNameChange: (e: React.FormEvent<HTMLInputElement>) => void;
-  userDatasetsOwned: Array<Record<string, any>>;
+  handleSaveDatasetModalSearch: (searchText: string) => void;
+  filterAutocompleteOption: (
+    inputValue: string,
+    option: { value: string; datasetId: number },
+  ) => void;
   handleSaveDatasetRadioBtnState: (e: RadioChangeEvent) => void;
-  saveDatasetRadioBtnState: number;
-  shouldOverwriteDataset: boolean;
   handleOverwriteCancel: () => void;
   handleOverwriteDataset: () => void;
   handleOverwriteDatasetOption: (
@@ -41,7 +43,9 @@ interface SaveDatasetModalProps {
   ) => void;
   defaultCreateDatasetValue: string;
   disableSaveAndExploreBtn: boolean;
-  handleSaveDatasetModalSearch: () => void;
+  saveDatasetRadioBtnState: number;
+  shouldOverwriteDataset: boolean;
+  userDatasetsOwned: Array<Record<string, any>>;
 }
 
 const Styles = styled.div`

From 6a675e8215b7fa2a1e532827ea4d5a5547b20b8f Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:22:16 -0800
Subject: [PATCH 103/138] remove unneeded code

---
 .../SqlLab/components/SaveDatasetModal.tsx    | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 93a71ca1bc5fe..387737830cc9e 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -74,7 +74,6 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   onOk,
   onHide,
   handleDatasetNameChange,
-  userDatasetsOwned,
   handleSaveDatasetRadioBtnState,
   saveDatasetRadioBtnState,
   shouldOverwriteDataset,
@@ -88,35 +87,6 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   userDatasetOptions,
   onChangeAutoComplete,
 }) => {
-  // const [options, setOptions] = useState<
-  //   {
-  //     value: string;
-  //     datasetId: number;
-  //   }[]
-  // >([]);
-
-  // const onSearch = (searchText: string) => {
-  //   setOptions(
-  //     !searchText
-  //       ? []
-  //       : userDatasetsOwned
-  //           .filter(d => d.datasetName.includes(searchText))
-  //           .map(d => ({
-  //             value: d.datasetName,
-  //             datasetId: d.datasetId,
-  //         })),
-  //   );
-  // };
-
-  // const filterAutocompleteOption = (
-  //   inputValue: string,
-  //   option: { value: string; datasetId: number },
-  // ) => {
-  //   console.log('toooo')
-  //   return option.value.toLowerCase().includes(inputValue.toLowerCase());
-  // };
-
-  console.log('in saveModal', disableSaveAndExploreBtn)
 
   return (
     <StyledModal

From 148130c7c86c305cc997418f67ad83d6c7606e26 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:27:46 -0800
Subject: [PATCH 104/138] remove unneeded variables

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx        | 1 -
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 1434eb778b492..c47eba48b7692 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -423,7 +423,6 @@ export default class ResultSet extends React.PureComponent<
             onOk={this.handleSaveInDataset}
             onHide={this.handleHideSaveModal}
             handleDatasetNameChange={this.handleDatasetNameChange}
-            userDatasetsOwned={this.state.userDatasetsOwned}
             handleSaveDatasetRadioBtnState={this.handleSaveDatasetRadioBtnState}
             saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
             shouldOverwriteDataset={this.state.overwriteDataSet}
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 387737830cc9e..66918b8fdc6c4 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -45,7 +45,7 @@ interface SaveDatasetModalProps {
   disableSaveAndExploreBtn: boolean;
   saveDatasetRadioBtnState: number;
   shouldOverwriteDataset: boolean;
-  userDatasetsOwned: Array<Record<string, any>>;
+  userDatasetOptions: Array<Record<string, any>>;
 }
 
 const Styles = styled.div`

From 68213744f6baf29e07cdb311221903a45b8087e8 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:29:57 -0800
Subject: [PATCH 105/138] still cleaning

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 66918b8fdc6c4..36382f97b1f90 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -41,6 +41,7 @@ interface SaveDatasetModalProps {
     data: string,
     option: Record<string, any>,
   ) => void;
+  onChangeAutoComplete: () => void;
   defaultCreateDatasetValue: string;
   disableSaveAndExploreBtn: boolean;
   saveDatasetRadioBtnState: number;

From 56e6aa24cf3ed28860c130844994db3256232bfd Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:40:59 -0800
Subject: [PATCH 106/138] added interface

---
 .../src/SqlLab/components/ResultSet.tsx           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index c47eba48b7692..00c5588c066bf 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -52,6 +52,11 @@ const EXPLORE_CHART_DEFAULT = {
 
 const LOADING_STYLES: CSSProperties = { position: 'relative', minHeight: 100 };
 
+interface DatasetOption {
+  datasetId: number;
+  datasetName: string;
+}
+
 interface ResultSetProps {
   actions: Record<string, any>;
   cache?: boolean;
@@ -71,7 +76,7 @@ interface ResultSetState {
   data: Record<string, any>[];
   showSaveDatasetModal: boolean;
   newSaveDatasetName: string;
-  userDatasetsOwned: Array<Record<string, any>>[];
+  userDatasetsOwned: DatasetOption[];
   saveDatasetRadioBtnState: number;
   overwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
@@ -192,6 +197,10 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
+  handleOnChangeAutoComplete = () => {
+    this.setState({ datasetToOverwrite: {} });
+  };
+
   clearQueryResults(query: Query) {
     this.props.actions.clearQueryResults(query);
   }
@@ -393,10 +402,6 @@ export default class ResultSet extends React.PureComponent<
     return option.value.toLowerCase().includes(inputValue.toLowerCase());
   };
 
-  handleOnChangeAutoComplete = () => {
-    this.setState({ datasetToOverwrite: {} });
-  };
-
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {
       let { data } = this.props.query.results;

From 391e562cf9a17696735df8215b122a77d841ca1d Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:45:53 -0800
Subject: [PATCH 107/138] fix typing issues

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx    | 9 ++++++++-
 .../src/SqlLab/components/SaveDatasetModal.tsx           | 1 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 00c5588c066bf..35234f14c6384 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -57,6 +57,11 @@ interface DatasetOption {
   datasetName: string;
 }
 
+interface DatasetOptionAutocomplete {
+  value: string;
+  datasetId: number;
+}
+
 interface ResultSetProps {
   actions: Record<string, any>;
   cache?: boolean;
@@ -83,6 +88,7 @@ interface ResultSetState {
   ctasSave: boolean;
   disableSaveAndExploreBtn: boolean;
   saveModalAutocompleteValue: string;
+  userDatasetOptions: DatasetOptionAutocomplete[];
 }
 
 // Making text render line breaks/tabs as is as monospace,
@@ -392,7 +398,7 @@ export default class ResultSet extends React.PureComponent<
           datasetId: d.datasetId,
         }));
 
-    this.setState({userDatasetOptions: userDatasets});
+    this.setState({ userDatasetOptions: userDatasets });
   }
 
   handleFilterAutocompleteOption = (
@@ -409,6 +415,7 @@ export default class ResultSet extends React.PureComponent<
         ({ data } = this.state);
       }
 
+      // Added compute logic to stop user from being able to Save & Explore
       const {
         saveDatasetRadioBtnState,
         newSaveDatasetName,
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 36382f97b1f90..ed1962454d0b7 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -88,7 +88,6 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
   userDatasetOptions,
   onChangeAutoComplete,
 }) => {
-
   return (
     <StyledModal
       show={visible}

From eaf75902fd24455d037e72a62606a828f8e7f9cb Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:51:28 -0800
Subject: [PATCH 108/138] cleanup unused code

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 35234f14c6384..84090af6b18e8 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -86,7 +86,6 @@ interface ResultSetState {
   overwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
   ctasSave: boolean;
-  disableSaveAndExploreBtn: boolean;
   saveModalAutocompleteValue: string;
   userDatasetOptions: DatasetOptionAutocomplete[];
 }

From 92cb0448dfe95bfcd839b74d4213b57224aae8a8 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:53:23 -0800
Subject: [PATCH 109/138] fix npm lnit

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 84090af6b18e8..854b3ae2f99d5 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -400,12 +400,12 @@ export default class ResultSet extends React.PureComponent<
     this.setState({ userDatasetOptions: userDatasets });
   }
 
-  handleFilterAutocompleteOption = (
+  handleFilterAutocompleteOption(
     inputValue: string,
     option: { value: string; datasetId: number },
-  ) => {
+  ) {
     return option.value.toLowerCase().includes(inputValue.toLowerCase());
-  };
+  }
 
   renderControls() {
     if (this.props.search || this.props.visualize || this.props.csv) {

From 6fd598c24fa292b1d9f6c6fb6350d1e8db539d77 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 09:56:43 -0800
Subject: [PATCH 110/138] fix initial problems

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index ed1962454d0b7..3ebda3fbf9718 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React, { useState, FunctionComponent } from 'react';
+import React, { FunctionComponent } from 'react';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
@@ -33,7 +33,7 @@ interface SaveDatasetModalProps {
   filterAutocompleteOption: (
     inputValue: string,
     option: { value: string; datasetId: number },
-  ) => void;
+  ) => boolean;
   handleSaveDatasetRadioBtnState: (e: RadioChangeEvent) => void;
   handleOverwriteCancel: () => void;
   handleOverwriteDataset: () => void;

From 2a0d0455192837ce9693f8c69bc11f4286b106fc Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sat, 5 Dec 2020 10:06:37 -0800
Subject: [PATCH 111/138] add props to test

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.jsx           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
index 41cadec74ffe9..75da0707280e8 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
@@ -35,6 +35,8 @@ describe('SaveDatasetModal', () => {
     handleOverwriteDataset: () => {},
     handleOverwriteDatasetOption: () => {},
     defaultCreateDatasetValue: 'someDatasets',
+    shouldOverwriteDataset: false,
+    userDatasetOptions: [],
   };
   it('renders a radio group btn', () => {
     const wrapper = shallow(<SaveDatasetModal visible />);

From b07b5e55a233f5e5c16ce5361de33ea805a8c2dc Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sun, 6 Dec 2020 20:06:13 -0800
Subject: [PATCH 112/138] remove unneeded files

---
 superset-frontend/src/explore/components/SaveModal.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/explore/components/SaveModal.jsx b/superset-frontend/src/explore/components/SaveModal.jsx
index cffbc271b85d5..67d1c5b5d8064 100644
--- a/superset-frontend/src/explore/components/SaveModal.jsx
+++ b/superset-frontend/src/explore/components/SaveModal.jsx
@@ -139,11 +139,12 @@ class SaveModal extends React.Component {
         title={t('Save Chart')}
         footer={
           <div data-test="save-modal-footer">
-            <Button id="btn_cancel" onClick={this.props.onHide}>
+            <Button id="btn_cancel" buttonSize="sm" onClick={this.props.onHide}>
               {t('Cancel')}
             </Button>
             <Button
               id="btn_modal_save_goto_dash"
+              buttonSize="sm"
               disabled={
                 !this.state.newSliceName || !this.state.newDashboardName
               }
@@ -153,6 +154,7 @@ class SaveModal extends React.Component {
             </Button>
             <Button
               id="btn_modal_save"
+              buttonSize="sm"
               buttonStyle="primary"
               onClick={this.saveOrOverwrite.bind(this, false)}
               disabled={!this.state.newSliceName}

From e2c1f2005822494ee63e59ddea4a4d87ea2ffa44 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sun, 6 Dec 2020 20:33:18 -0800
Subject: [PATCH 113/138] skip linting

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.jsx            | 1 +
 superset-frontend/src/SqlLab/components/ResultSet.tsx            | 1 +
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
index 75da0707280e8..b9dec7ca4c61d 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
@@ -37,6 +37,7 @@ describe('SaveDatasetModal', () => {
     defaultCreateDatasetValue: 'someDatasets',
     shouldOverwriteDataset: false,
     userDatasetOptions: [],
+    disableSaveAndExploreBtn: false,
   };
   it('renders a radio group btn', () => {
     const wrapper = shallow(<SaveDatasetModal visible />);
diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 854b3ae2f99d5..913004e1d367f 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -638,6 +638,7 @@ export default class ResultSet extends React.PureComponent<
     if (query.progress > 0) {
       progressBar = (
         <ProgressBar
+          // @ts-ignore
           percent={parseInt(query.progress.toFixed(0), 10)}
           striped
         />
diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 3ebda3fbf9718..31938924c68d2 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -147,6 +147,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 Overwrite existing
                 <AutoComplete
                   className="smd-autocomplete"
+                  // @ts-ignore
                   options={userDatasetOptions}
                   onSelect={handleOverwriteDatasetOption}
                   onSearch={handleSaveDatasetModalSearch}

From 9697f9edbbd5162d9bcc19100b632955b17b03ff Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sun, 6 Dec 2020 21:08:38 -0800
Subject: [PATCH 114/138] saving

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.jsx        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
index b9dec7ca4c61d..e807cc1a06d82 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
@@ -38,9 +38,12 @@ describe('SaveDatasetModal', () => {
     shouldOverwriteDataset: false,
     userDatasetOptions: [],
     disableSaveAndExploreBtn: false,
+    handleSaveDatasetModalSearch: '',
+    filterAutocompleteOption: false,
+    onChangeAutoComplete: () => {},
   };
   it('renders a radio group btn', () => {
-    const wrapper = shallow(<SaveDatasetModal visible />);
+    const wrapper = shallow(<SaveDatasetModal />);
     expect(wrapper.find(Radio.Group)).toExist();
   });
   it('renders a autocomplete', () => {

From c8dd04dd4415c29563ff6ec76ca94fb89d2414fc Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Sun, 6 Dec 2020 21:18:03 -0800
Subject: [PATCH 115/138] this works

---
 .../spec/javascripts/sqllab/SaveDatasetModal_spec.tsx     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
index 4b6ef601efac8..0c5cc33582a20 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
@@ -30,11 +30,17 @@ describe('SaveDatasetModal', () => {
     userDatasetsOwned: [],
     handleSaveDatasetRadioBtnState: () => {},
     saveDatasetRadioBtnState: 1,
-    shouldOverwriteDataset: false,
+    overwriteDataSet: false,
     handleOverwriteCancel: () => {},
     handleOverwriteDataset: () => {},
     handleOverwriteDatasetOption: () => {},
     defaultCreateDatasetValue: 'someDatasets',
+    shouldOverwriteDataset: false,
+    userDatasetOptions: [],
+    disableSaveAndExploreBtn: false,
+    handleSaveDatasetModalSearch: () => {},
+    filterAutocompleteOption: () => false,
+    onChangeAutoComplete: () => {},
   };
   it('renders a radio group btn', () => {
     const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);

From b43412e1271346e3a1df296845150d6609123701 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 00:58:32 -0800
Subject: [PATCH 116/138] remove old test

---
 .../sqllab/ExploreResultsButton_spec.jsx       | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx b/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
index 98affc0055ba3..e96b59f2ed700 100644
--- a/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
@@ -185,24 +185,6 @@ describe('ExploreResultsButton', () => {
       fetchMock.reset();
     });
 
-    it('should build request with correct args', () => {
-      return new Promise(done => {
-        wrapper.instance().visualize();
-
-        setTimeout(() => {
-          const calls = fetchMock.calls(visualizeEndpoint);
-          expect(calls).toHaveLength(1);
-          const formData = calls[0][1].body;
-          Object.keys(mockOptions).forEach(key => {
-            // eslint-disable-next-line no-unused-expressions
-            expect(formData.get(key)).toBeDefined();
-          });
-
-          done();
-        });
-      });
-    });
-
     it('should export chart and add an info toast', () => {
       return new Promise(done => {
         const infoToastSpy = sinon.spy();

From 86c7984793588835372bb7efb7ac985ec2028087 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 06:50:53 -0800
Subject: [PATCH 117/138] remove old test

---
 .../sqllab/ExploreResultsButton_spec.jsx      | 54 -------------------
 1 file changed, 54 deletions(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx b/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
index e96b59f2ed700..264b618e70483 100644
--- a/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
@@ -184,59 +184,5 @@ describe('ExploreResultsButton', () => {
       wrapper.instance().buildVizOptions.restore();
       fetchMock.reset();
     });
-
-    it('should export chart and add an info toast', () => {
-      return new Promise(done => {
-        const infoToastSpy = sinon.spy();
-        const datasourceSpy = sinon.stub();
-
-        datasourceSpy.callsFake(() => Promise.resolve(visualizationPayload));
-
-        wrapper.setProps({
-          actions: {
-            addInfoToast: infoToastSpy,
-            createDatasource: datasourceSpy,
-          },
-        });
-
-        wrapper.instance().visualize();
-
-        setTimeout(() => {
-          expect(datasourceSpy.callCount).toBe(1);
-          expect(exploreUtils.exploreChart.callCount).toBe(1);
-          expect(exploreUtils.exploreChart.getCall(0).args[0].datasource).toBe(
-            '107__table',
-          );
-          expect(infoToastSpy.callCount).toBe(1);
-          done();
-        });
-      });
-    });
-
-    it('should add error toast', () => {
-      return new Promise(done => {
-        const dangerToastSpy = sinon.stub(actions, 'addDangerToast');
-        const datasourceSpy = sinon.stub();
-
-        datasourceSpy.callsFake(() => Promise.reject({ error: 'error' }));
-
-        wrapper.setProps({
-          actions: {
-            createDatasource: datasourceSpy,
-            addDangerToast: dangerToastSpy,
-          },
-        });
-
-        wrapper.instance().visualize();
-
-        setTimeout(() => {
-          expect(datasourceSpy.callCount).toBe(1);
-          expect(exploreUtils.exportChart.callCount).toBe(0);
-          expect(dangerToastSpy.callCount).toBe(1);
-          dangerToastSpy.restore();
-          done();
-        });
-      });
-    });
   });
 });

From 3734ca0b336527252186a48ff994dca87deb39aa Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 07:16:03 -0800
Subject: [PATCH 118/138] fix linting

---
 .../spec/javascripts/sqllab/ExploreResultsButton_spec.jsx        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx b/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
index 264b618e70483..108835ea0c8fd 100644
--- a/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
+++ b/superset-frontend/spec/javascripts/sqllab/ExploreResultsButton_spec.jsx
@@ -24,7 +24,6 @@ import sinon from 'sinon';
 import fetchMock from 'fetch-mock';
 import shortid from 'shortid';
 import sqlLabReducer from 'src/SqlLab/reducers/index';
-import * as actions from 'src/SqlLab/actions/sqlLab';
 import ExploreResultsButton from 'src/SqlLab/components/ExploreResultsButton';
 import * as exploreUtils from 'src/explore/exploreUtils';
 import Button from 'src/components/Button';

From bbb706e141a20b08617b2a539bc66de815f69c14 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 10:39:27 -0800
Subject: [PATCH 119/138] fix broken test

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 913004e1d367f..9f9492597e4cd 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -17,7 +17,8 @@
  * under the License.
  */
 import React, { CSSProperties } from 'react';
-import { Alert, ButtonGroup, ProgressBar } from 'react-bootstrap';
+import { Alert, ButtonGroup } from 'react-bootstrap';
+import ProgressBar from 'src/common/components/ProgressBar';
 import moment from 'moment';
 import { RadioChangeEvent } from 'antd/lib/radio';
 import Button from 'src/components/Button';

From 3d3924155c3eeec9c32aa8c36a3773187101aa05 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 10:51:38 -0800
Subject: [PATCH 120/138] remove jsx file

---
 .../sqllab/SaveDatasetModal_spec.jsx          | 57 -------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
deleted file mode 100644
index e807cc1a06d82..0000000000000
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.jsx
+++ /dev/null
@@ -1,57 +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.
- */
-import React from 'react';
-import { shallow } from 'enzyme';
-import { Radio, AutoComplete, Input } from 'src/common/components';
-import { SaveDatasetModal } from 'src/SqlLab/components/SaveDatasetModal';
-
-describe('SaveDatasetModal', () => {
-  const mockedProps = {
-    visible: false,
-    onOk: () => {},
-    onHide: () => {},
-    handleDatasetNameChange: () => {},
-    userDatasetsOwned: [],
-    handleSaveDatasetRadioBtnState: () => {},
-    saveDatasetRadioBtnState: 1,
-    overwriteDataSet: false,
-    handleOverwriteCancel: () => {},
-    handleOverwriteDataset: () => {},
-    handleOverwriteDatasetOption: () => {},
-    defaultCreateDatasetValue: 'someDatasets',
-    shouldOverwriteDataset: false,
-    userDatasetOptions: [],
-    disableSaveAndExploreBtn: false,
-    handleSaveDatasetModalSearch: '',
-    filterAutocompleteOption: false,
-    onChangeAutoComplete: () => {},
-  };
-  it('renders a radio group btn', () => {
-    const wrapper = shallow(<SaveDatasetModal />);
-    expect(wrapper.find(Radio.Group)).toExist();
-  });
-  it('renders a autocomplete', () => {
-    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
-    expect(wrapper.find(AutoComplete)).toExist();
-  });
-  it('renders an input form ', () => {
-    const wrapper = shallow(<SaveDatasetModal {...mockedProps} />);
-    expect(wrapper.find(Input)).toExist();
-  });
-});

From 6cbc4f4fa81e530d9b1a241c00071605b5f70f6d Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 10:54:04 -0800
Subject: [PATCH 121/138] refactoring

---
 .../javascripts/sqllab/SaveDatasetModal_spec.tsx   |  1 -
 .../src/SqlLab/components/ResultSet.tsx            | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
index 0c5cc33582a20..0da9a9d07afe5 100644
--- a/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
+++ b/superset-frontend/spec/javascripts/sqllab/SaveDatasetModal_spec.tsx
@@ -30,7 +30,6 @@ describe('SaveDatasetModal', () => {
     userDatasetsOwned: [],
     handleSaveDatasetRadioBtnState: () => {},
     saveDatasetRadioBtnState: 1,
-    overwriteDataSet: false,
     handleOverwriteCancel: () => {},
     handleOverwriteDataset: () => {},
     handleOverwriteDatasetOption: () => {},
diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 9f9492597e4cd..db59ed40f280c 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -84,7 +84,7 @@ interface ResultSetState {
   newSaveDatasetName: string;
   userDatasetsOwned: DatasetOption[];
   saveDatasetRadioBtnState: number;
-  overwriteDataSet: boolean;
+  shouldOverwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
   ctasSave: boolean;
   saveModalAutocompleteValue: string;
@@ -126,7 +126,7 @@ export default class ResultSet extends React.PureComponent<
       )}`,
       userDatasetsOwned: [],
       saveDatasetRadioBtnState: SAVE_NEW_DATASET_RADIO_STATE,
-      overwriteDataSet: false,
+      shouldOverwriteDataSet: false,
       datasetToOverwrite: {},
       ctasSave: false,
       saveModalAutocompleteValue: '',
@@ -288,7 +288,7 @@ export default class ResultSet extends React.PureComponent<
 
     this.setState({
       showSaveDatasetModal: false,
-      overwriteDataSet: false,
+      shouldOverwriteDataSet: false,
       datasetToOverwrite: {},
       newSaveDatasetName: `${this.props.query.tab} ${moment().format(
         'MM/DD/YYYY HH:mm:ss',
@@ -299,7 +299,7 @@ export default class ResultSet extends React.PureComponent<
   handleSaveInDataset() {
     // if user wants to overwrite a dataset we need to prompt them
     if (this.state.saveDatasetRadioBtnState === OVERWRITE_DATASET_RADIO_STATE) {
-      this.setState({ overwriteDataSet: true });
+      this.setState({ shouldOverwriteDataSet: true });
       return;
     }
 
@@ -376,7 +376,7 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleHideSaveModal() {
-    this.setState({ showSaveDatasetModal: false, overwriteDataSet: false });
+    this.setState({ showSaveDatasetModal: false, shouldOverwriteDataSet: false });
   }
 
   handleSaveDatasetRadioBtnState(e: RadioChangeEvent) {
@@ -384,7 +384,7 @@ export default class ResultSet extends React.PureComponent<
   }
 
   handleOverwriteCancel() {
-    this.setState({ overwriteDataSet: false });
+    this.setState({ shouldOverwriteDataSet: false });
   }
 
   handleSaveDatasetModalSearch(searchText: string) {
@@ -437,7 +437,7 @@ export default class ResultSet extends React.PureComponent<
             handleDatasetNameChange={this.handleDatasetNameChange}
             handleSaveDatasetRadioBtnState={this.handleSaveDatasetRadioBtnState}
             saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
-            shouldOverwriteDataset={this.state.overwriteDataSet}
+            shouldOverwriteDataset={this.state.shouldOverwriteDataSet}
             handleOverwriteCancel={this.handleOverwriteCancel}
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}

From c9d5c6c896adf9286c635f288fa37e74aeb7d57c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 11:06:11 -0800
Subject: [PATCH 122/138] cleanup

---
 .../src/SqlLab/components/ResultSet.tsx       | 149 +++++++++---------
 1 file changed, 77 insertions(+), 72 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index db59ed40f280c..1859c5de0fcb5 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -207,50 +207,7 @@ export default class ResultSet extends React.PureComponent<
     this.setState({ datasetToOverwrite: {} });
   };
 
-  clearQueryResults(query: Query) {
-    this.props.actions.clearQueryResults(query);
-  }
-
-  popSelectStar(tempSchema: string | null, tempTable: string) {
-    const qe = {
-      id: shortid.generate(),
-      title: tempTable,
-      autorun: false,
-      dbId: this.props.query.dbId,
-      sql: `SELECT * FROM ${tempSchema ? `${tempSchema}.` : ''}${tempTable}`,
-    };
-    this.props.actions.addQueryEditor(qe);
-  }
-
-  toggleExploreResultsButton() {
-    this.setState(prevState => ({
-      showExploreResultsButton: !prevState.showExploreResultsButton,
-    }));
-  }
-
-  changeSearch(event: React.ChangeEvent<HTMLInputElement>) {
-    this.setState({ searchText: event.target.value });
-  }
-
-  fetchResults(query: Query) {
-    this.props.actions.fetchQueryResults(query, this.props.displayLimit);
-  }
-
-  reFetchQueryResults(query: Query) {
-    this.props.actions.reFetchQueryResults(query);
-  }
-
-  reRunQueryIfSessionTimeoutErrorOnMount() {
-    const { query } = this.props;
-    if (
-      query.errorMessage &&
-      query.errorMessage.indexOf('session timed out') > 0
-    ) {
-      this.props.actions.runQuery(query, true);
-    }
-  }
-
-  async handleOverwriteDataset() {
+  handleOverwriteDataset = async () => {
     const { sql, results } = this.props.query;
     const { datasetToOverwrite } = this.state;
 
@@ -282,10 +239,6 @@ export default class ResultSet extends React.PureComponent<
         );
       });
 
-    console.log(
-      `${this.props.query.tab} ${moment().format('MM/DD/YYYY HH:mm:ss')}`,
-    );
-
     this.setState({
       showSaveDatasetModal: false,
       shouldOverwriteDataSet: false,
@@ -294,9 +247,9 @@ export default class ResultSet extends React.PureComponent<
         'MM/DD/YYYY HH:mm:ss',
       )}`,
     });
-  }
+  };
 
-  handleSaveInDataset() {
+  handleSaveInDataset = () => {
     // if user wants to overwrite a dataset we need to prompt them
     if (this.state.saveDatasetRadioBtnState === OVERWRITE_DATASET_RADIO_STATE) {
       this.setState({ shouldOverwriteDataSet: true });
@@ -364,30 +317,36 @@ export default class ResultSet extends React.PureComponent<
         'MM/DD/YYYY HH:mm:ss',
       )}`,
     });
-  }
+  };
 
-  handleOverwriteDatasetOption(data: string, option: Record<string, any>) {
+  handleOverwriteDatasetOption = (
+    _data: string,
+    option: Record<string, any>,
+  ) => {
     this.setState({ datasetToOverwrite: option });
-  }
+  };
 
-  handleDatasetNameChange(e: React.FormEvent<HTMLInputElement>) {
+  handleDatasetNameChange = (e: React.FormEvent<HTMLInputElement>) => {
     // @ts-expect-error
     this.setState({ newSaveDatasetName: e.target.value });
-  }
+  };
 
-  handleHideSaveModal() {
-    this.setState({ showSaveDatasetModal: false, shouldOverwriteDataSet: false });
-  }
+  handleHideSaveModal = () => {
+    this.setState({
+      showSaveDatasetModal: false,
+      shouldOverwriteDataSet: false,
+    });
+  };
 
-  handleSaveDatasetRadioBtnState(e: RadioChangeEvent) {
+  handleSaveDatasetRadioBtnState = (e: RadioChangeEvent) => {
     this.setState({ saveDatasetRadioBtnState: Number(e.target.value) });
-  }
+  };
 
-  handleOverwriteCancel() {
+  handleOverwriteCancel = () => {
     this.setState({ shouldOverwriteDataSet: false });
-  }
+  };
 
-  handleSaveDatasetModalSearch(searchText: string) {
+  handleSaveDatasetModalSearch = (searchText: string) => {
     // Making sure that autocomplete input has a value before rendering the dropdown
     // Transforming the userDatasetsOwned data for SaveModalComponent
     const { userDatasetsOwned } = this.state;
@@ -399,13 +358,56 @@ export default class ResultSet extends React.PureComponent<
         }));
 
     this.setState({ userDatasetOptions: userDatasets });
-  }
+  };
 
-  handleFilterAutocompleteOption(
+  handleFilterAutocompleteOption = (
     inputValue: string,
     option: { value: string; datasetId: number },
-  ) {
+  ) => {
     return option.value.toLowerCase().includes(inputValue.toLowerCase());
+  };
+
+  clearQueryResults(query: Query) {
+    this.props.actions.clearQueryResults(query);
+  }
+
+  popSelectStar(tempSchema: string | null, tempTable: string) {
+    const qe = {
+      id: shortid.generate(),
+      title: tempTable,
+      autorun: false,
+      dbId: this.props.query.dbId,
+      sql: `SELECT * FROM ${tempSchema ? `${tempSchema}.` : ''}${tempTable}`,
+    };
+    this.props.actions.addQueryEditor(qe);
+  }
+
+  toggleExploreResultsButton() {
+    this.setState(prevState => ({
+      showExploreResultsButton: !prevState.showExploreResultsButton,
+    }));
+  }
+
+  changeSearch(event: React.ChangeEvent<HTMLInputElement>) {
+    this.setState({ searchText: event.target.value });
+  }
+
+  fetchResults(query: Query) {
+    this.props.actions.fetchQueryResults(query, this.props.displayLimit);
+  }
+
+  reFetchQueryResults(query: Query) {
+    this.props.actions.reFetchQueryResults(query);
+  }
+
+  reRunQueryIfSessionTimeoutErrorOnMount() {
+    const { query } = this.props;
+    if (
+      query.errorMessage &&
+      query.errorMessage.indexOf('session timed out') > 0
+    ) {
+      this.props.actions.runQuery(query, true);
+    }
   }
 
   renderControls() {
@@ -421,6 +423,9 @@ export default class ResultSet extends React.PureComponent<
         newSaveDatasetName,
         datasetToOverwrite,
         saveModalAutocompleteValue,
+        shouldOverwriteDataSet,
+        userDatasetOptions,
+        showSaveDatasetModal,
       } = this.state;
       const disableSaveAndExploreBtn =
         (saveDatasetRadioBtnState === 1 && newSaveDatasetName.length === 0) ||
@@ -431,21 +436,21 @@ export default class ResultSet extends React.PureComponent<
       return (
         <div className="ResultSetControls">
           <SaveDatasetModal
-            visible={this.state.showSaveDatasetModal}
+            visible={showSaveDatasetModal}
             onOk={this.handleSaveInDataset}
+            saveDatasetRadioBtnState={saveDatasetRadioBtnState}
+            shouldOverwriteDataset={shouldOverwriteDataSet}
+            defaultCreateDatasetValue={newSaveDatasetName}
+            userDatasetOptions={userDatasetOptions}
+            disableSaveAndExploreBtn={disableSaveAndExploreBtn}
             onHide={this.handleHideSaveModal}
             handleDatasetNameChange={this.handleDatasetNameChange}
             handleSaveDatasetRadioBtnState={this.handleSaveDatasetRadioBtnState}
-            saveDatasetRadioBtnState={this.state.saveDatasetRadioBtnState}
-            shouldOverwriteDataset={this.state.shouldOverwriteDataSet}
             handleOverwriteCancel={this.handleOverwriteCancel}
             handleOverwriteDataset={this.handleOverwriteDataset}
             handleOverwriteDatasetOption={this.handleOverwriteDatasetOption}
-            defaultCreateDatasetValue={this.state.newSaveDatasetName}
-            disableSaveAndExploreBtn={disableSaveAndExploreBtn}
             handleSaveDatasetModalSearch={this.handleSaveDatasetModalSearch}
             filterAutocompleteOption={this.handleFilterAutocompleteOption}
-            userDatasetOptions={this.state.userDatasetOptions}
             onChangeAutoComplete={this.handleOnChangeAutoComplete}
           />
           <div className="ResultSetButtons">

From e73238629285f56e641217ece370b707e5bea7b3 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 11:07:43 -0800
Subject: [PATCH 123/138] remove comments

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 1859c5de0fcb5..906ec80dbbca7 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -166,7 +166,6 @@ export default class ResultSet extends React.PureComponent<
     // only do this the first time the component is rendered/mounted
     this.reRunQueryIfSessionTimeoutErrorOnMount();
 
-    // Hack: waiting for talks with tai to pull data out of the initial state
     const appContainer = document.getElementById('app');
     const bootstrapData = JSON.parse(
       appContainer?.getAttribute('data-bootstrap') || '{}',

From f23721014fcc157064af9a0eb5a00f56248ff245 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 11:08:46 -0800
Subject: [PATCH 124/138] reset user object

---
 superset-frontend/src/SqlLab/reducers/getInitialState.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js
index 831df3ba3a7d2..14efdeef912a8 100644
--- a/superset-frontend/src/SqlLab/reducers/getInitialState.js
+++ b/superset-frontend/src/SqlLab/reducers/getInitialState.js
@@ -27,7 +27,6 @@ export default function getInitialState({
   databases,
   queries: queries_,
   requested_query: requestedQuery,
-  user,
 }) {
   /**
    * Before YYYY-MM-DD, the state for SQL Lab was stored exclusively in the
@@ -191,6 +190,5 @@ export default function getInitialState({
       flash_messages: common.flash_messages,
       conf: common.conf,
     },
-    user,
   };
 }

From 8d2d98285317a7c34b7160e5a4f60a394d09c9fb Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 11:19:37 -0800
Subject: [PATCH 125/138] fix functions

---
 .../src/SqlLab/components/ResultSet.tsx       | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 906ec80dbbca7..c9013051a7a33 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -160,6 +160,8 @@ export default class ResultSet extends React.PureComponent<
     this.handleOnChangeAutoComplete = this.handleOnChangeAutoComplete.bind(
       this,
     );
+    this.handleCTASExploreBtnClick = this.handleCTASExploreBtnClick.bind(this);
+    this.handleExploreBtnClick = this.handleExploreBtnClick.bind(this);
   }
 
   async componentDidMount() {
@@ -345,6 +347,20 @@ export default class ResultSet extends React.PureComponent<
     this.setState({ shouldOverwriteDataSet: false });
   };
 
+  handleCTASExploreBtnClick = () => {
+    this.setState({
+      showSaveDatasetModal: true,
+      ctasSave: false,
+    });
+  };
+
+  handleExploreBtnClick = () => {
+    this.setState({
+      showSaveDatasetModal: true,
+      ctasSave: true,
+    });
+  };
+
   handleSaveDatasetModalSearch = (searchText: string) => {
     // Making sure that autocomplete input has a value before rendering the dropdown
     // Transforming the userDatasetsOwned data for SaveModalComponent
@@ -461,12 +477,7 @@ export default class ResultSet extends React.PureComponent<
                   query={this.props.query}
                   database={this.props.database}
                   actions={this.props.actions}
-                  onClick={() => {
-                    this.setState({
-                      showSaveDatasetModal: true,
-                      ctasSave: false,
-                    });
-                  }}
+                  onClick={this.handleExploreBtnClick}
                 />
               )}
             {this.props.csv && (
@@ -566,9 +577,7 @@ export default class ResultSet extends React.PureComponent<
                 dbId={exploreDBId}
                 database={this.props.database}
                 actions={this.props.actions}
-                onClick={() => {
-                  this.setState({ showSaveDatasetModal: true, ctasSave: true });
-                }}
+                onClick={this.handleCTASExploreBtnClick}
               />
             </ButtonGroup>
           </Alert>

From d3612969203c96e88e96270de709425a9cf7b09c Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 12:08:36 -0800
Subject: [PATCH 126/138] fix this

---
 .../src/SqlLab/components/ResultSet.tsx       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index c9013051a7a33..5fa1b6ce8f0e7 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -42,8 +42,11 @@ import { Query } from '../types';
 
 const SEARCH_HEIGHT = 46;
 
-const SAVE_NEW_DATASET_RADIO_STATE = 1;
-const OVERWRITE_DATASET_RADIO_STATE = 2;
+enum DatasetRadioState {
+  SAVE_NEW = 1,
+  OVERWRITE_DATASET = 2,
+}
+
 const EXPLORE_CHART_DEFAULT = {
   metrics: [],
   groupby: [],
@@ -125,7 +128,7 @@ export default class ResultSet extends React.PureComponent<
         'MM/DD/YYYY HH:mm:ss',
       )}`,
       userDatasetsOwned: [],
-      saveDatasetRadioBtnState: SAVE_NEW_DATASET_RADIO_STATE,
+      saveDatasetRadioBtnState: DatasetRadioState.SAVE_NEW,
       shouldOverwriteDataSet: false,
       datasetToOverwrite: {},
       ctasSave: false,
@@ -175,9 +178,10 @@ export default class ResultSet extends React.PureComponent<
 
     const datasets = await getByUser(bootstrapData.user.userId);
     const userDatasetsOwned = datasets.map(
-      (r: { table_name: string; id: number }) => {
-        return { datasetName: r.table_name, datasetId: r.id };
-      },
+      (r: { table_name: string; id: number }) => ({
+        datasetName: r.table_name,
+        datasetId: r.id,
+      }),
     );
 
     this.setState({ userDatasetsOwned });
@@ -252,7 +256,10 @@ export default class ResultSet extends React.PureComponent<
 
   handleSaveInDataset = () => {
     // if user wants to overwrite a dataset we need to prompt them
-    if (this.state.saveDatasetRadioBtnState === OVERWRITE_DATASET_RADIO_STATE) {
+    if (
+      this.state.saveDatasetRadioBtnState ===
+      DatasetRadioState.OVERWRITE_DATASET
+    ) {
       this.setState({ shouldOverwriteDataSet: true });
       return;
     }

From 70166d0701564445e5b7af850242d5da6be373d9 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 13:36:20 -0800
Subject: [PATCH 127/138] reverting CTAS btn flow

---
 .../components/ExploreCtasResultsButton.jsx   | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx b/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx
index 85d7283d77c0f..915ea9b87ee8b 100644
--- a/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx
+++ b/superset/assets/src/SqlLab/components/ExploreCtasResultsButton.jsx
@@ -35,7 +35,6 @@ const propTypes = {
   dbId: PropTypes.number.isRequired,
   errorMessage: PropTypes.string,
   templateParams: PropTypes.string,
-  onClick: PropTypes.func.isRequired,
 };
 const defaultProps = {
   vizRequest: {},
@@ -47,12 +46,50 @@ class ExploreCtasResultsButton extends React.PureComponent {
     this.visualize = this.visualize.bind(this);
     this.onClick = this.onClick.bind(this);
   }
+  onClick() {
+    this.visualize();
+  }
+
+  buildVizOptions() {
+    return {
+      datasourceName: this.props.table,
+      schema: this.props.schema,
+      dbId: this.props.dbId,
+      templateParams: this.props.templateParams,
+    };
+  }
+  visualize() {
+    this.props.actions
+      .createCtasDatasource(this.buildVizOptions())
+      .then(data => {
+        const formData = {
+          datasource: `${data.table_id}__table`,
+          metrics: ['count'],
+          groupby: [],
+          viz_type: 'table',
+          since: '100 years ago',
+          all_columns: [],
+          row_limit: 1000,
+        };
+        this.props.actions.addInfoToast(
+          t('Creating a data source and creating a new tab'),
+        );
+
+        // open new window for data visualization
+        exploreChart(formData);
+      })
+      .catch(() => {
+        this.props.actions.addDangerToast(
+          this.props.errorMessage || t('An error occurred'),
+        );
+      });
+  }
   render() {
     return (
       <>
         <Button
           buttonSize="small"
-          onClick={this.props.onClick}
+          onClick={this.onClick}
           tooltip={t('Explore the result set in the data exploration view')}
         >
           <InfoTooltipWithTrigger

From b4c53b6b167b998ed47c8fdf2ce70678c5bdfaff Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 13:37:15 -0800
Subject: [PATCH 128/138] remove onclick

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5fa1b6ce8f0e7..02e4ef6e6c073 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -584,7 +584,6 @@ export default class ResultSet extends React.PureComponent<
                 dbId={exploreDBId}
                 database={this.props.database}
                 actions={this.props.actions}
-                onClick={this.handleCTASExploreBtnClick}
               />
             </ButtonGroup>
           </Alert>

From 250fd9948b025954ad9faa9c4f2cb80504cc8c05 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 17:07:20 -0800
Subject: [PATCH 129/138] save frontend work

---
 .../src/SqlLab/components/ResultSet.tsx       | 88 ++++++-------------
 superset-frontend/src/api/dataset.ts          |  2 +
 2 files changed, 28 insertions(+), 62 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 02e4ef6e6c073..62ad4529b996f 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -89,7 +89,6 @@ interface ResultSetState {
   saveDatasetRadioBtnState: number;
   shouldOverwriteDataSet: boolean;
   datasetToOverwrite: Record<string, any>;
-  ctasSave: boolean;
   saveModalAutocompleteValue: string;
   userDatasetOptions: DatasetOptionAutocomplete[];
 }
@@ -131,7 +130,6 @@ export default class ResultSet extends React.PureComponent<
       saveDatasetRadioBtnState: DatasetRadioState.SAVE_NEW,
       shouldOverwriteDataSet: false,
       datasetToOverwrite: {},
-      ctasSave: false,
       saveModalAutocompleteValue: '',
       userDatasetOptions: [],
     };
@@ -163,7 +161,6 @@ export default class ResultSet extends React.PureComponent<
     this.handleOnChangeAutoComplete = this.handleOnChangeAutoComplete.bind(
       this,
     );
-    this.handleCTASExploreBtnClick = this.handleCTASExploreBtnClick.bind(this);
     this.handleExploreBtnClick = this.handleExploreBtnClick.bind(this);
   }
 
@@ -213,7 +210,7 @@ export default class ResultSet extends React.PureComponent<
   };
 
   handleOverwriteDataset = async () => {
-    const { sql, results } = this.props.query;
+    const { sql, results, dbId } = this.props.query;
     const { datasetToOverwrite } = this.state;
 
     if (
@@ -227,6 +224,7 @@ export default class ResultSet extends React.PureComponent<
 
     updateDatset(
       datasetToOverwrite.datasetId,
+      dbId,
       sql,
       results.selected_columns.map(d => ({ column_name: d.name })),
       true,
@@ -267,57 +265,31 @@ export default class ResultSet extends React.PureComponent<
     const { schema, sql, dbId, templateParams } = this.props.query;
     const selectedColumns = this.props.query?.results?.selected_columns || [];
 
-    if (this.state.ctasSave) {
-      // Create Table As flow for explore view
-      this.props.actions
-        .createCtasDatasource({
-          schema,
-          dbId,
-          templateParams,
-          datasourceName: this.state.newSaveDatasetName,
-        })
-        .then((data: { table_id: number }) => {
-          const formData = {
-            ...EXPLORE_CHART_DEFAULT,
-            datasource: `${data.table_id}__table`,
-          };
-          this.props.actions.addInfoToast(
-            t('Creating a data source and creating a new tab'),
-          );
-
-          // open new window for data visualization
-          exploreChart(formData);
-        })
-        .catch(() => {
-          this.props.actions.addDangerToast(t('An error occurred'));
-        });
-    } else {
-      this.props.actions
-        .createDatasource({
-          schema,
-          sql,
-          dbId,
-          templateParams,
-          datasourceName: this.state.newSaveDatasetName,
-          columns: selectedColumns,
-        })
-        .then((data: { table_id: number }) => {
-          exploreChart({
-            datasource: `${data.table_id}__table`,
-            metrics: [],
-            groupby: [],
-            time_range: 'No filter',
-            viz_type: 'table',
-            all_columns: selectedColumns.map(c => c.name),
-            row_limit: 1000,
-          });
-        })
-        .catch(() => {
-          this.props.actions.addDangerToast(
-            t('An error occurred saving dataset'),
-          );
+    this.props.actions
+      .createDatasource({
+        schema,
+        sql,
+        dbId,
+        templateParams,
+        datasourceName: this.state.newSaveDatasetName,
+        columns: selectedColumns,
+      })
+      .then((data: { table_id: number }) => {
+        exploreChart({
+          datasource: `${data.table_id}__table`,
+          metrics: [],
+          groupby: [],
+          time_range: 'No filter',
+          viz_type: 'table',
+          all_columns: selectedColumns.map(c => c.name),
+          row_limit: 1000,
         });
-    }
+      })
+      .catch(() => {
+        this.props.actions.addDangerToast(
+          t('An error occurred saving dataset'),
+        );
+      });
 
     this.setState({
       showSaveDatasetModal: false,
@@ -354,17 +326,9 @@ export default class ResultSet extends React.PureComponent<
     this.setState({ shouldOverwriteDataSet: false });
   };
 
-  handleCTASExploreBtnClick = () => {
-    this.setState({
-      showSaveDatasetModal: true,
-      ctasSave: false,
-    });
-  };
-
   handleExploreBtnClick = () => {
     this.setState({
       showSaveDatasetModal: true,
-      ctasSave: true,
     });
   };
 
diff --git a/superset-frontend/src/api/dataset.ts b/superset-frontend/src/api/dataset.ts
index 048487c50ef8b..d426daffddb1a 100644
--- a/superset-frontend/src/api/dataset.ts
+++ b/superset-frontend/src/api/dataset.ts
@@ -41,6 +41,7 @@ export const getByUser = async (userId: number) => {
 
 export const put = async (
   datasetId: number,
+  dbId: number,
   sql: string,
   columns: Array<Record<string, any>>,
   overrideColumns: boolean,
@@ -50,6 +51,7 @@ export const put = async (
   const body = JSON.stringify({
     sql,
     columns,
+    database_id: dbId,
   });
 
   const data: JsonResponse = await SupersetClient.put({

From c09950c6b3120f8c31e937c72cee4207e3781b56 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 17:07:55 -0800
Subject: [PATCH 130/138] allow for database id to be passed as param in body

---
 superset/datasets/schemas.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset/datasets/schemas.py b/superset/datasets/schemas.py
index f32e8d57fda76..b32d958924066 100644
--- a/superset/datasets/schemas.py
+++ b/superset/datasets/schemas.py
@@ -75,6 +75,7 @@ class DatasetPostSchema(Schema):
 
 class DatasetPutSchema(Schema):
     table_name = fields.String(allow_none=True, validate=Length(1, 250))
+    database_id = fields.Integer()
     sql = fields.String(allow_none=True)
     filter_select_enabled = fields.Boolean(allow_none=True)
     fetch_values_predicate = fields.String(allow_none=True, validate=Length(0, 1000))

From 0bae866caa25df6afa7d864bc2b891356094c118 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 17:22:13 -0800
Subject: [PATCH 131/138] use enum

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 62ad4529b996f..26269b8801ea6 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -414,8 +414,8 @@ export default class ResultSet extends React.PureComponent<
         showSaveDatasetModal,
       } = this.state;
       const disableSaveAndExploreBtn =
-        (saveDatasetRadioBtnState === 1 && newSaveDatasetName.length === 0) ||
-        (saveDatasetRadioBtnState === 2 &&
+        (saveDatasetRadioBtnState === DatasetRadioState.SAVE_NEW && newSaveDatasetName.length === 0) ||
+        (saveDatasetRadioBtnState === DatasetRadioState.OVERWRITE_DATASET &&
           Object.keys(datasetToOverwrite).length === 0 &&
           saveModalAutocompleteValue.length === 0);
 

From d9a64349ff72ed9dfd1f1680178c6ac31b517fb8 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Mon, 7 Dec 2020 17:53:10 -0800
Subject: [PATCH 132/138] fix linting

---
 .../src/SqlLab/components/ResultSet.tsx            | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 26269b8801ea6..672348ae1e01a 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -213,15 +213,6 @@ export default class ResultSet extends React.PureComponent<
     const { sql, results, dbId } = this.props.query;
     const { datasetToOverwrite } = this.state;
 
-    if (
-      Object.keys(datasetToOverwrite).length === 0 &&
-      datasetToOverwrite.constructor === Object
-    ) {
-      this.props.actions.addDangerToast(
-        t('You must select a dataset that has already been created'),
-      );
-    }
-
     updateDatset(
       datasetToOverwrite.datasetId,
       dbId,
@@ -229,7 +220,7 @@ export default class ResultSet extends React.PureComponent<
       results.selected_columns.map(d => ({ column_name: d.name })),
       true,
     )
-      .then(d => {
+      .then(() => {
         exploreChart({
           ...EXPLORE_CHART_DEFAULT,
           datasource: `${datasetToOverwrite.datasetId}__table`,
@@ -414,7 +405,8 @@ export default class ResultSet extends React.PureComponent<
         showSaveDatasetModal,
       } = this.state;
       const disableSaveAndExploreBtn =
-        (saveDatasetRadioBtnState === DatasetRadioState.SAVE_NEW && newSaveDatasetName.length === 0) ||
+        (saveDatasetRadioBtnState === DatasetRadioState.SAVE_NEW &&
+          newSaveDatasetName.length === 0) ||
         (saveDatasetRadioBtnState === DatasetRadioState.OVERWRITE_DATASET &&
           Object.keys(datasetToOverwrite).length === 0 &&
           saveModalAutocompleteValue.length === 0);

From d151c1bcaa843445b96304881094419f120275e1 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 8 Dec 2020 12:30:53 -0800
Subject: [PATCH 133/138] style alignment

---
 .../src/SqlLab/components/SaveDatasetModal.tsx      | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index 31938924c68d2..f64841aef83fa 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -21,7 +21,7 @@ import React, { FunctionComponent } from 'react';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
-import { styled } from '@superset-ui/core';
+import { styled, t } from '@superset-ui/core';
 import { RadioChangeEvent } from 'antd/lib/radio';
 
 interface SaveDatasetModalProps {
@@ -67,6 +67,9 @@ const Styles = styled.div`
     margin: 10px 0px;
     line-height: 30px;
   }
+  .smd-overwrite-msg {
+    margin: 7px;
+  }
 `;
 
 // eslint-disable-next-line no-empty-pattern
@@ -102,7 +105,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
               buttonStyle="primary"
               onClick={onOk}
             >
-              Save &amp; Explore
+              {t('Save & Explore')}
             </Button>
           )}
           {shouldOverwriteDataset && (
@@ -117,7 +120,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 onClick={handleOverwriteDataset}
                 disabled={disableSaveAndExploreBtn}
               >
-                Save &amp; Explore
+                {t('Overwrite & Explore')}
               </Button>
             </>
           )}
@@ -161,7 +164,9 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
           </div>
         )}
         {shouldOverwriteDataset && (
-          <div>Are you sure you want to overwrite this dataset?</div>
+          <div className="smd-overwrite-msg">
+            Are you sure you want to overwrite this dataset?
+          </div>
         )}
       </Styles>
     </StyledModal>

From 2ec480a97bf3f60fd4f59271ba4f824462764e2e Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 8 Dec 2020 12:43:39 -0800
Subject: [PATCH 134/138] get rid of .then

---
 .../src/SqlLab/components/ResultSet.tsx       | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 672348ae1e01a..5692808709ee2 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -213,25 +213,13 @@ export default class ResultSet extends React.PureComponent<
     const { sql, results, dbId } = this.props.query;
     const { datasetToOverwrite } = this.state;
 
-    updateDatset(
+    await updateDatset(
       datasetToOverwrite.datasetId,
       dbId,
       sql,
       results.selected_columns.map(d => ({ column_name: d.name })),
       true,
-    )
-      .then(() => {
-        exploreChart({
-          ...EXPLORE_CHART_DEFAULT,
-          datasource: `${datasetToOverwrite.datasetId}__table`,
-          all_columns: results.selected_columns.map(d => d.name),
-        });
-      })
-      .catch(() => {
-        this.props.actions.addDangerToast(
-          t('An error occurred overwriting dataset'),
-        );
-      });
+    );
 
     this.setState({
       showSaveDatasetModal: false,
@@ -241,6 +229,12 @@ export default class ResultSet extends React.PureComponent<
         'MM/DD/YYYY HH:mm:ss',
       )}`,
     });
+
+    exploreChart({
+      ...EXPLORE_CHART_DEFAULT,
+      datasource: `${datasetToOverwrite.datasetId}__table`,
+      all_columns: results.selected_columns.map(d => d.name),
+    });
   };
 
   handleSaveInDataset = () => {
@@ -325,7 +319,7 @@ export default class ResultSet extends React.PureComponent<
 
   handleSaveDatasetModalSearch = (searchText: string) => {
     // Making sure that autocomplete input has a value before rendering the dropdown
-    // Transforming the userDatasetsOwned data for SaveModalComponent
+    // Transforming the userDatasetsOwned data for SaveModalComponent)
     const { userDatasetsOwned } = this.state;
     const userDatasets = !searchText
       ? []

From 1d8686a91f9b74a78ddbdb7a84549beab5efb624 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 8 Dec 2020 12:50:01 -0800
Subject: [PATCH 135/138] add function to compute default value with tiem

---
 .../src/SqlLab/components/ResultSet.tsx              | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 5692808709ee2..d92a2978d44fc 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -123,9 +123,7 @@ export default class ResultSet extends React.PureComponent<
       showExploreResultsButton: false,
       data: [],
       showSaveDatasetModal: false,
-      newSaveDatasetName: `${props.query.tab} ${moment().format(
-        'MM/DD/YYYY HH:mm:ss',
-      )}`,
+      newSaveDatasetName: this.getDefaultDatasetName(),
       userDatasetsOwned: [],
       saveDatasetRadioBtnState: DatasetRadioState.SAVE_NEW,
       shouldOverwriteDataSet: false,
@@ -205,6 +203,10 @@ export default class ResultSet extends React.PureComponent<
     }
   }
 
+  getDefaultDatasetName = () => {
+    return `${this.props.query.tab} ${moment().format('MM/DD/YYYY HH:mm:ss')}`;
+  };
+
   handleOnChangeAutoComplete = () => {
     this.setState({ datasetToOverwrite: {} });
   };
@@ -225,9 +227,7 @@ export default class ResultSet extends React.PureComponent<
       showSaveDatasetModal: false,
       shouldOverwriteDataSet: false,
       datasetToOverwrite: {},
-      newSaveDatasetName: `${this.props.query.tab} ${moment().format(
-        'MM/DD/YYYY HH:mm:ss',
-      )}`,
+      newSaveDatasetName: this.getDefaultDatasetName(),
     });
 
     exploreChart({

From 88ba7a17f1be913c4998b569e87f0ba588ee5147 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 8 Dec 2020 13:12:12 -0800
Subject: [PATCH 136/138] lit

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index d92a2978d44fc..44c5ed654c950 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -278,9 +278,7 @@ export default class ResultSet extends React.PureComponent<
 
     this.setState({
       showSaveDatasetModal: false,
-      newSaveDatasetName: `${this.props.query.tab} ${moment().format(
-        'MM/DD/YYYY HH:mm:ss',
-      )}`,
+      newSaveDatasetName: this.getDefaultDatasetName(),
     });
   };
 

From 1aff0f1c9dbe5ce2ea2d6692a8d70a7c580ccaa4 Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 8 Dec 2020 13:45:24 -0800
Subject: [PATCH 137/138] remove ts-error

---
 superset-frontend/src/SqlLab/components/ResultSet.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/SqlLab/components/ResultSet.tsx b/superset-frontend/src/SqlLab/components/ResultSet.tsx
index 44c5ed654c950..a5a1d5f842054 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet.tsx
@@ -606,7 +606,6 @@ export default class ResultSet extends React.PureComponent<
     if (query.progress > 0) {
       progressBar = (
         <ProgressBar
-          // @ts-ignore
           percent={parseInt(query.progress.toFixed(0), 10)}
           striped
         />

From 2953258ad1e40b3aeb10f8d511e6f2b5b17a5bcb Mon Sep 17 00:00:00 2001
From: hughhhh <hughmil3s@gmail.com>
Date: Tue, 8 Dec 2020 14:08:10 -0800
Subject: [PATCH 138/138] fix typing

---
 superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
index f64841aef83fa..7e3cd87059a81 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
@@ -18,6 +18,7 @@
  */
 
 import React, { FunctionComponent } from 'react';
+import { AutoCompleteProps } from 'antd/lib/auto-complete';
 import { Radio, AutoComplete, Input } from 'src/common/components';
 import StyledModal from 'src/common/components/Modal';
 import Button from 'src/components/Button';
@@ -46,7 +47,7 @@ interface SaveDatasetModalProps {
   disableSaveAndExploreBtn: boolean;
   saveDatasetRadioBtnState: number;
   shouldOverwriteDataset: boolean;
-  userDatasetOptions: Array<Record<string, any>>;
+  userDatasetOptions: AutoCompleteProps['options'];
 }
 
 const Styles = styled.div`
@@ -150,7 +151,6 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                 Overwrite existing
                 <AutoComplete
                   className="smd-autocomplete"
-                  // @ts-ignore
                   options={userDatasetOptions}
                   onSelect={handleOverwriteDatasetOption}
                   onSearch={handleSaveDatasetModalSearch}