From 5c5e2113f018bf792a3b735f5a34d9b0bca147b3 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Mon, 21 Nov 2022 22:52:47 -0600
Subject: [PATCH 01/28] optimized setDatasets call

---
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index e4dbaa9a699d0..419db0dfe6e13 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -77,6 +77,7 @@ export default function AddDataset() {
   >(datasetReducer, null);
   const [hasColumns, setHasColumns] = useState(false);
   const [datasets, setDatasets] = useState<DatasetObject[]>([]);
+  console.log(datasets);
   const datasetNames = datasets.map(dataset => dataset.table_name);
   const encodedSchema = dataset?.schema
     ? encodeURIComponent(dataset?.schema)

From e822b94ad196488e100940cd5255804acdbe9b0f Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 22 Nov 2022 10:11:16 -0600
Subject: [PATCH 02/28] Remove console.log

---
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index 419db0dfe6e13..e4dbaa9a699d0 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -77,7 +77,6 @@ export default function AddDataset() {
   >(datasetReducer, null);
   const [hasColumns, setHasColumns] = useState(false);
   const [datasets, setDatasets] = useState<DatasetObject[]>([]);
-  console.log(datasets);
   const datasetNames = datasets.map(dataset => dataset.table_name);
   const encodedSchema = dataset?.schema
     ? encodeURIComponent(dataset?.schema)

From 9ec9c99c07db48a1933cfad2009d96ab7be7e029 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 29 Nov 2022 10:02:33 -0600
Subject: [PATCH 03/28] Create dataset polish/bug fix

---
 .../src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index 4f7dfca196f4f..f11b476195261 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -40,6 +40,7 @@ import {
   emptyStateComponent,
 } from 'src/components/EmptyState';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
+import { emptyStateComponent } from 'src/SqlLab/components/SqlEditorLeftBar';
 import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {

From 7dc42efcbb33b11475d3237d7d2d110b154b88c1 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Mon, 19 Dec 2022 09:31:43 -0600
Subject: [PATCH 04/28] Make defaultPageSize a const and move
 emptyStateComponent into src/components/EmptyState

---
 .../src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index f11b476195261..4f7dfca196f4f 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -40,7 +40,6 @@ import {
   emptyStateComponent,
 } from 'src/components/EmptyState';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
-import { emptyStateComponent } from 'src/SqlLab/components/SqlEditorLeftBar';
 import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {

From 2a42fda938ba92b5c9a82898f487efddeada992a Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 3 Jan 2023 15:49:55 -0600
Subject: [PATCH 05/28] Change all add dataset entrances to use new create page

---
 .../components/DatasourcePanel/index.tsx      |  4 +-
 .../explore/components/ExploreChartPanel.jsx  |  4 +-
 .../ColumnSelectPopover.tsx                   |  2 +-
 .../AdhocMetricEditPopover/index.jsx          |  2 +-
 .../src/pages/ChartCreation/index.tsx         |  5 +--
 .../data/database/DatabaseModal/index.tsx     |  2 +-
 .../views/CRUD/data/dataset/DatasetList.tsx   | 43 ++-----------------
 .../src/views/components/RightMenu.tsx        | 17 +-------
 superset/views/datasource/views.py            |  5 +--
 9 files changed, 15 insertions(+), 69 deletions(-)

diff --git a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
index dedffc104455e..e24d1100ac69f 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
@@ -373,7 +373,9 @@ export default function DataSourcePanel({
                     <span
                       role="button"
                       tabIndex={0}
-                      onClick={() => setShowSaveDatasetModal(true)}
+                      onClick={() => {
+                        window.location.href = '/dataset/add/';
+                      }}
                       className="add-dataset-alert-description"
                     >
                       {t('Create a dataset')}
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel.jsx b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
index 03cda337bb951..ac9de71682860 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
@@ -324,7 +324,9 @@ const ExploreChartPanel = ({
                 <span
                   role="button"
                   tabIndex={0}
-                  onClick={() => setShowDatasetModal(true)}
+                  onClick={() => {
+                    window.location.href = '/dataset/add/';
+                  }}
                   css={{ textDecoration: 'underline' }}
                 >
                   {t('Create a dataset')}
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index fee2eb941ff60..6ea5dbbb907de 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -231,7 +231,7 @@ const ColumnSelectPopover = ({
   }, []);
 
   const setDatasetAndClose = () => {
-    if (setDatasetModal) setDatasetModal(true);
+    window.location.href = '/dataset/add/';
     onClose();
   };
 
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
index f49eb5b4f750c..f749a5d09fe94 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
@@ -388,7 +388,7 @@ export default class AdhocMetricEditPopover extends React.PureComponent {
                       tabIndex={0}
                       role="button"
                       onClick={() => {
-                        this.props.handleDatasetModal(true);
+                        window.location.href = '/dataset/add/';
                         this.props.onClose();
                       }}
                     >
diff --git a/superset-frontend/src/pages/ChartCreation/index.tsx b/superset-frontend/src/pages/ChartCreation/index.tsx
index 4aeb7aeed4df8..bea530fd3ad5e 100644
--- a/superset-frontend/src/pages/ChartCreation/index.tsx
+++ b/superset-frontend/src/pages/ChartCreation/index.tsx
@@ -337,10 +337,7 @@ export class ChartCreation extends React.PureComponent<
     const isButtonDisabled = this.isBtnDisabled();
     const datasetHelpText = this.state.canCreateDataset ? (
       <span data-test="dataset-write">
-        <Link
-          to="/tablemodelview/list/#create"
-          data-test="add-chart-new-dataset"
-        >
+        <Link to="/dataset/add/" data-test="add-chart-new-dataset">
           {t('Add a dataset')}
         </Link>
         {` ${t('or')} `}
diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index 6e374f85c8955..96b30eec8e4a1 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -1350,7 +1350,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         onClick={() => {
           setLoading(true);
           fetchAndSetDB();
-          window.location.href = '/tablemodelview/list#create';
+          window.location.href = '/dataset/add/';
         }}
       >
         {t('CREATE DATASET')}
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
index 68c65a7ad167e..7c73b5433965d 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -22,16 +22,13 @@ import React, {
   useState,
   useMemo,
   useCallback,
-  useEffect,
 } from 'react';
 import rison from 'rison';
-import { useHistory, useLocation } from 'react-router-dom';
 import {
   createFetchRelated,
   createFetchDistinct,
   createErrorHandler,
 } from 'src/views/CRUD/utils';
-import { getItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import { ColumnObject } from 'src/views/CRUD/data/dataset/types';
 import { useListViewResource } from 'src/views/CRUD/hooks';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
@@ -60,7 +57,6 @@ import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
 import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip';
 import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
 import { GenericLink } from 'src/components/GenericLink/GenericLink';
-import AddDatasetModal from './AddDatasetModal';
 
 import {
   PAGE_SIZE,
@@ -152,9 +148,6 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
     refreshData,
   } = useListViewResource<Dataset>('dataset', t('dataset'), addDangerToast);
 
-  const [datasetAddModalOpen, setDatasetAddModalOpen] =
-    useState<boolean>(false);
-
   const [datasetCurrentlyDeleting, setDatasetCurrentlyDeleting] = useState<
     (Dataset & { chart_count: number; dashboard_count: number }) | null
   >(null);
@@ -191,12 +184,6 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
     hasPerm('can_export') && isFeatureEnabled(FeatureFlag.VERSIONED_EXPORT);
 
   const initialSort = SORT_BY;
-  useEffect(() => {
-    const db = getItem(LocalStorageKeys.db, null);
-    if (!loading && db) {
-      setDatasetAddModalOpen(true);
-    }
-  }, [loading]);
 
   const openDatasetEditModal = useCallback(
     ({ id }: Dataset) => {
@@ -603,26 +590,6 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
     });
   }
 
-  const CREATE_HASH = '#create';
-  const location = useLocation();
-  const history = useHistory();
-
-  //  Sync Dataset Add modal with #create hash
-  useEffect(() => {
-    const modalOpen = location.hash === CREATE_HASH && canCreate;
-    setDatasetAddModalOpen(modalOpen);
-  }, [canCreate, location.hash]);
-
-  //  Add #create hash
-  const openDatasetAddModal = useCallback(() => {
-    history.replace(`${location.pathname}${location.search}${CREATE_HASH}`);
-  }, [history, location.pathname, location.search]);
-
-  //  Remove #create hash
-  const closeDatasetAddModal = useCallback(() => {
-    history.replace(`${location.pathname}${location.search}`);
-  }, [history, location.pathname, location.search]);
-
   if (canCreate) {
     buttonArr.push({
       name: (
@@ -630,7 +597,9 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
           <i className="fa fa-plus" /> {t('Dataset')}{' '}
         </>
       ),
-      onClick: openDatasetAddModal,
+      onClick: () => {
+        window.location.href = '/dataset/add/';
+      },
       buttonStyle: 'primary',
     });
 
@@ -727,12 +696,6 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
   return (
     <>
       <SubMenu {...menuData} />
-      <AddDatasetModal
-        show={datasetAddModalOpen}
-        onHide={closeDatasetAddModal}
-        onDatasetAdd={refreshData}
-        history={history}
-      />
       {datasetCurrentlyDeleting && (
         <DeleteModal
           description={t(
diff --git a/superset-frontend/src/views/components/RightMenu.tsx b/superset-frontend/src/views/components/RightMenu.tsx
index 59e7f7f448664..1957060502761 100644
--- a/superset-frontend/src/views/components/RightMenu.tsx
+++ b/superset-frontend/src/views/components/RightMenu.tsx
@@ -51,7 +51,6 @@ import {
   GlobalMenuDataOptions,
   RightMenuProps,
 } from './types';
-import AddDatasetModal from '../CRUD/data/dataset/AddDatasetModal';
 
 const extensionsRegistry = getExtensionsRegistry();
 
@@ -143,7 +142,6 @@ const RightMenu = ({
     HAS_GSHEETS_INSTALLED,
   } = useSelector<any, ExtentionConfigs>(state => state.common.conf);
   const [showDatabaseModal, setShowDatabaseModal] = useState<boolean>(false);
-  const [showDatasetModal, setShowDatasetModal] = useState<boolean>(false);
   const [engine, setEngine] = useState<string>('');
   const canSql = findPermission('can_sqllab', 'Superset', roles);
   const canDashboard = findPermission('can_write', 'Dashboard', roles);
@@ -179,6 +177,7 @@ const RightMenu = ({
         {
           label: t('Create dataset'),
           name: GlobalMenuDataOptions.DATASET_CREATION,
+          url: '/dataset/add/',
           perm: canDataset && nonExamplesDBConnected,
         },
         {
@@ -286,8 +285,6 @@ const RightMenu = ({
     } else if (itemChose.key === GlobalMenuDataOptions.GOOGLE_SHEETS) {
       setShowDatabaseModal(true);
       setEngine('Google Sheets');
-    } else if (itemChose.key === GlobalMenuDataOptions.DATASET_CREATION) {
-      setShowDatasetModal(true);
     }
   };
 
@@ -296,10 +293,6 @@ const RightMenu = ({
     setShowDatabaseModal(false);
   };
 
-  const handleOnHideDatasetModalModal = () => {
-    setShowDatasetModal(false);
-  };
-
   const isDisabled = isAdmin && !allowUploads;
 
   const tooltipText = t(
@@ -344,7 +337,6 @@ const RightMenu = ({
   );
 
   const handleDatabaseAdd = () => setQuery({ databaseAdded: true });
-  const handleDatasetAdd = () => setQuery({ datasetAdded: true });
 
   const theme = useTheme();
 
@@ -358,13 +350,6 @@ const RightMenu = ({
           onDatabaseAdd={handleDatabaseAdd}
         />
       )}
-      {canDataset && (
-        <AddDatasetModal
-          onHide={handleOnHideDatasetModalModal}
-          show={showDatasetModal}
-          onDatasetAdd={handleDatasetAdd}
-        />
-      )}
       {environmentTag?.text && (
         <Label
           css={{ borderRadius: `${theme.gridUnit * 125}px` }}
diff --git a/superset/views/datasource/views.py b/superset/views/datasource/views.py
index c2db174cb1daf..4f158e836936a 100644
--- a/superset/views/datasource/views.py
+++ b/superset/views/datasource/views.py
@@ -228,10 +228,7 @@ class DatasetEditor(BaseSupersetView):
     @has_access
     @permission_name("read")
     def root(self) -> FlaskResponse:
-        dev = request.args.get("testing")
-        if dev is not None:
-            return super().render_app_template()
-        return redirect("/")
+        return super().render_app_template()
 
     @expose("/<pk>", methods=["GET"])
     @has_access

From 047e25e0aa719c6ffe5be4ef072b1c58cb6b7fb8 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 3 Jan 2023 18:53:10 -0600
Subject: [PATCH 06/28] Cancel now redirects to the previous page

---
 .../views/CRUD/data/dataset/AddDataset/Footer/index.tsx  | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
index 5aecec0bb8920..28e2f71a6ff0d 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -17,6 +17,7 @@
  * under the License.
  */
 import React from 'react';
+import { useHistory } from 'react-router-dom';
 import Button from 'src/components/Button';
 import { t } from '@superset-ui/core';
 import { useSingleViewResource } from 'src/views/CRUD/hooks';
@@ -49,12 +50,12 @@ const LOG_ACTIONS = [
 ];
 
 function Footer({
-  url,
   datasetObject,
   addDangerToast,
   hasColumns = false,
   datasets,
 }: FooterProps) {
+  const history = useHistory();
   const { createResource } = useSingleViewResource<Partial<DatasetObject>>(
     'dataset',
     t('dataset'),
@@ -72,11 +73,7 @@ function Footer({
 
     return LOG_ACTIONS[value];
   };
-  const goToPreviousUrl = () => {
-    // this is a placeholder url until the final feature gets implemented
-    // at that point we will be passing in the url of the previous location.
-    window.location.href = url;
-  };
+  const goToPreviousUrl = () => history.goBack();
 
   const cancelButtonOnClick = () => {
     if (!datasetObject) {

From fc65ffedd58771b7657dc9c30f61b0c69430a4a9 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 5 Jan 2023 14:53:22 -0600
Subject: [PATCH 07/28] Create dataset returns user to dataset list

---
 .../src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
index 28e2f71a6ff0d..beb250ebd27b2 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -73,7 +73,6 @@ function Footer({
 
     return LOG_ACTIONS[value];
   };
-  const goToPreviousUrl = () => history.goBack();
 
   const cancelButtonOnClick = () => {
     if (!datasetObject) {
@@ -82,7 +81,7 @@ function Footer({
       const logAction = createLogAction(datasetObject);
       logEvent(logAction, datasetObject);
     }
-    goToPreviousUrl();
+    history.goBack();
   };
 
   const tooltipText = t('Select a database table.');
@@ -101,7 +100,8 @@ function Footer({
         if (typeof response === 'number') {
           logEvent(LOG_ACTIONS_DATASET_CREATION_SUCCESS, datasetObject);
           // When a dataset is created the response we get is its ID number
-          goToPreviousUrl();
+          window.location.href =
+            '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';
         }
       });
     }

From 65382369d91dc490d1482c3150151e94e603635e Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 5 Jan 2023 16:06:09 -0600
Subject: [PATCH 08/28] Delete AddDatasetModal

---
 .../CRUD/data/dataset/AddDatasetModal.tsx     | 172 ------------------
 .../src/views/components/RightMenu.test.tsx   |   3 -
 2 files changed, 175 deletions(-)
 delete mode 100644 superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx
deleted file mode 100644
index d4b1470f38f1c..0000000000000
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx
+++ /dev/null
@@ -1,172 +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, { FunctionComponent, useState, useEffect } from 'react';
-import { styled, t } from '@superset-ui/core';
-import { useSingleViewResource } from 'src/views/CRUD/hooks';
-import Modal from 'src/components/Modal';
-import TableSelector from 'src/components/TableSelector';
-import withToasts from 'src/components/MessageToasts/withToasts';
-import { DatabaseObject } from 'src/components/DatabaseSelector';
-import {
-  getItem,
-  LocalStorageKeys,
-  setItem,
-} from 'src/utils/localStorageHelpers';
-import { isEmpty } from 'lodash';
-
-type DatasetAddObject = {
-  id: number;
-  database: number;
-  schema: string;
-  table_name: string;
-};
-interface DatasetModalProps {
-  addDangerToast: (msg: string) => void;
-  addSuccessToast: (msg: string) => void;
-  onDatasetAdd?: (dataset: DatasetAddObject) => void;
-  onHide: () => void;
-  show: boolean;
-  history?: any; // So we can render the modal when not using SPA
-}
-
-const TableSelectorContainer = styled.div`
-  padding-bottom: 340px;
-  width: 65%;
-`;
-
-const DatasetModal: FunctionComponent<DatasetModalProps> = ({
-  addDangerToast,
-  onDatasetAdd,
-  onHide,
-  show,
-  history,
-}) => {
-  const [currentDatabase, setCurrentDatabase] = useState<
-    DatabaseObject | undefined
-  >();
-  const [currentSchema, setSchema] = useState<string | undefined>('');
-  const [currentTableName, setTableName] = useState('');
-  const [disableSave, setDisableSave] = useState(true);
-  const {
-    createResource,
-    state: { loading },
-  } = useSingleViewResource<Partial<DatasetAddObject>>(
-    'dataset',
-    t('dataset'),
-    addDangerToast,
-  );
-
-  useEffect(() => {
-    setDisableSave(currentDatabase === undefined || currentTableName === '');
-  }, [currentTableName, currentDatabase]);
-
-  useEffect(() => {
-    const currentUserSelectedDb = getItem(
-      LocalStorageKeys.db,
-      null,
-    ) as DatabaseObject;
-    if (currentUserSelectedDb) setCurrentDatabase(currentUserSelectedDb);
-  }, []);
-
-  const onDbChange = (db: DatabaseObject) => {
-    setCurrentDatabase(db);
-  };
-
-  const onSchemaChange = (schema?: string) => {
-    setSchema(schema);
-  };
-
-  const onTableChange = (tableName: string) => {
-    setTableName(tableName);
-  };
-
-  const clearModal = () => {
-    setSchema('');
-    setTableName('');
-    setCurrentDatabase(undefined);
-    setDisableSave(true);
-  };
-
-  const cleanup = () => {
-    clearModal();
-    setItem(LocalStorageKeys.db, null);
-  };
-
-  const hide = () => {
-    cleanup();
-    onHide();
-  };
-
-  const onSave = () => {
-    if (currentDatabase === undefined) {
-      return;
-    }
-    const data = {
-      database: currentDatabase.id,
-      ...(currentSchema ? { schema: currentSchema } : {}),
-      table_name: currentTableName,
-    };
-    createResource(data).then(response => {
-      if (!response) {
-        return;
-      }
-      if (onDatasetAdd) {
-        onDatasetAdd({ id: response.id, ...response });
-      }
-      // We need to be able to work with no SPA routes opening the modal
-      // So useHistory wont be available always thus we check for it
-      if (!isEmpty(history)) {
-        history?.push(`/chart/add?dataset=${currentTableName}`);
-        cleanup();
-      } else {
-        window.location.href = `/chart/add?dataset=${currentTableName}`;
-        cleanup();
-        onHide();
-      }
-    });
-  };
-
-  return (
-    <Modal
-      disablePrimaryButton={disableSave}
-      primaryButtonLoading={loading}
-      onHandledPrimaryAction={onSave}
-      onHide={hide}
-      primaryButtonName={t('Add Dataset and Create Chart')}
-      show={show}
-      title={t('Add dataset')}
-    >
-      <TableSelectorContainer>
-        <TableSelector
-          clearable={false}
-          formMode
-          database={currentDatabase}
-          schema={currentSchema}
-          tableValue={currentTableName}
-          onDbChange={onDbChange}
-          onSchemaChange={onSchemaChange}
-          onTableSelectChange={onTableChange}
-          handleError={addDangerToast}
-        />
-      </TableSelectorContainer>
-    </Modal>
-  );
-};
-
-export default withToasts(DatasetModal);
diff --git a/superset-frontend/src/views/components/RightMenu.test.tsx b/superset-frontend/src/views/components/RightMenu.test.tsx
index ec12e644dbde3..907c305ff64c8 100644
--- a/superset-frontend/src/views/components/RightMenu.test.tsx
+++ b/superset-frontend/src/views/components/RightMenu.test.tsx
@@ -30,9 +30,6 @@ jest.mock('react-redux', () => ({
 }));
 
 jest.mock('src/views/CRUD/data/database/DatabaseModal', () => () => <span />);
-jest.mock('src/views/CRUD/data/dataset/AddDatasetModal.tsx', () => () => (
-  <span />
-));
 
 const dropdownItems = [
   {

From 7e167c27996e2db394d12bdf10d335a8638ca8fc Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 5 Jan 2023 17:42:51 -0600
Subject: [PATCH 09/28] Fix tests

---
 .../DatasourcePanel/DatasourcePanel.test.tsx  | 21 -------------------
 .../dataset/AddDataset/AddDataset.test.tsx    |  8 +++++++
 .../dataset/AddDataset/Footer/Footer.test.tsx |  8 +++++++
 .../DatasetLayout/DatasetLayout.test.tsx      |  8 +++++++
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
index eedc2fb10117e..95258f443ec45 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.test.tsx
@@ -186,27 +186,6 @@ test('should render a create dataset infobox', async () => {
   expect(infoboxText).toBeVisible();
 });
 
-test('should render a save dataset modal when "Create a dataset" is clicked', async () => {
-  const newProps = {
-    ...props,
-    datasource: {
-      ...datasource,
-      type: DatasourceType.Query,
-    },
-  };
-  render(<DatasourcePanel {...newProps} />, { useRedux: true, useDnd: true });
-
-  const createButton = await screen.findByRole('button', {
-    name: /create a dataset/i,
-  });
-
-  userEvent.click(createButton);
-
-  const saveDatasetModalTitle = screen.getByText(/save or overwrite dataset/i);
-
-  expect(saveDatasetModalTitle).toBeVisible();
-});
-
 test('should not render a save dataset modal when datasource is not query or dataset', async () => {
   const newProps = {
     ...props,
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/AddDataset.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/AddDataset.test.tsx
index 39fb2b295b302..7e5a7de12ab3a 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/AddDataset.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/AddDataset.test.tsx
@@ -20,6 +20,14 @@ import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
 import AddDataset from 'src/views/CRUD/data/dataset/AddDataset';
 
+const mockHistoryPush = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockHistoryPush,
+  }),
+}));
+
 describe('AddDataset', () => {
   it('renders a blank state AddDataset', async () => {
     render(<AddDataset />, { useRedux: true });
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/Footer.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/Footer.test.tsx
index 8fcbd83b15cc4..a1818cdf2291f 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/Footer.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/Footer.test.tsx
@@ -20,6 +20,14 @@ import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
 import Footer from 'src/views/CRUD/data/dataset/AddDataset/Footer';
 
+const mockHistoryPush = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockHistoryPush,
+  }),
+}));
+
 const mockedProps = {
   url: 'realwebsite.com',
 };
diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetLayout/DatasetLayout.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetLayout/DatasetLayout.test.tsx
index 35375a52b4fb7..a1939761aa7c5 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetLayout/DatasetLayout.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetLayout/DatasetLayout.test.tsx
@@ -25,6 +25,14 @@ import DatasetPanel from 'src/views/CRUD/data/dataset/AddDataset/DatasetPanel';
 import RightPanel from 'src/views/CRUD/data/dataset/AddDataset/RightPanel';
 import Footer from 'src/views/CRUD/data/dataset/AddDataset/Footer';
 
+const mockHistoryPush = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockHistoryPush,
+  }),
+}));
+
 describe('DatasetLayout', () => {
   it('renders nothing when no components are passed in', () => {
     render(<DatasetLayout />);

From d2fbc98bc5246db6e8705fde27c591b72729ed44 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Mon, 9 Jan 2023 10:45:55 -0600
Subject: [PATCH 10/28] Use useHistory instead of window.location.href

---
 superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
index 7c73b5433965d..09067765060e1 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/DatasetList.tsx
@@ -23,6 +23,7 @@ import React, {
   useMemo,
   useCallback,
 } from 'react';
+import { useHistory } from 'react-router-dom';
 import rison from 'rison';
 import {
   createFetchRelated,
@@ -135,6 +136,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
   addSuccessToast,
   user,
 }) => {
+  const history = useHistory();
   const {
     state: {
       loading,
@@ -598,7 +600,7 @@ const DatasetList: FunctionComponent<DatasetListProps> = ({
         </>
       ),
       onClick: () => {
-        window.location.href = '/dataset/add/';
+        history.push('/dataset/add/');
       },
       buttonStyle: 'primary',
     });

From ee40bdb6eb86264326a40855d314a2fda162390a Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Wed, 11 Jan 2023 12:57:38 -0600
Subject: [PATCH 11/28] Address Cody's review comments

---
 .../src/explore/components/DatasourcePanel/index.tsx  |  4 +---
 .../src/explore/components/ExploreChartPanel.jsx      |  4 +---
 .../DndColumnSelectControl/ColumnSelectPopover.tsx    |  4 +++-
 .../MetricControl/AdhocMetricEditPopover/index.jsx    |  2 +-
 .../CRUD/data/dataset/AddDataset/Footer/index.tsx     |  3 +--
 .../CRUD/data/dataset/AddDataset/LeftPanel/index.tsx  | 11 +++++++++++
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
index e24d1100ac69f..dedffc104455e 100644
--- a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
+++ b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx
@@ -373,9 +373,7 @@ export default function DataSourcePanel({
                     <span
                       role="button"
                       tabIndex={0}
-                      onClick={() => {
-                        window.location.href = '/dataset/add/';
-                      }}
+                      onClick={() => setShowSaveDatasetModal(true)}
                       className="add-dataset-alert-description"
                     >
                       {t('Create a dataset')}
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel.jsx b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
index ac9de71682860..03cda337bb951 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
@@ -324,9 +324,7 @@ const ExploreChartPanel = ({
                 <span
                   role="button"
                   tabIndex={0}
-                  onClick={() => {
-                    window.location.href = '/dataset/add/';
-                  }}
+                  onClick={() => setShowDatasetModal(true)}
                   css={{ textDecoration: 'underline' }}
                 >
                   {t('Create a dataset')}
diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index 6ea5dbbb907de..dbbc8fe948432 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -231,7 +231,9 @@ const ColumnSelectPopover = ({
   }, []);
 
   const setDatasetAndClose = () => {
-    window.location.href = '/dataset/add/';
+    if (setDatasetModal) {
+      setDatasetModal(true);
+    }
     onClose();
   };
 
diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
index f749a5d09fe94..f49eb5b4f750c 100644
--- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
+++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx
@@ -388,7 +388,7 @@ export default class AdhocMetricEditPopover extends React.PureComponent {
                       tabIndex={0}
                       role="button"
                       onClick={() => {
-                        window.location.href = '/dataset/add/';
+                        this.props.handleDatasetModal(true);
                         this.props.onClose();
                       }}
                     >
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
index beb250ebd27b2..bc6bbc1e4851c 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -100,8 +100,7 @@ function Footer({
         if (typeof response === 'number') {
           logEvent(LOG_ACTIONS_DATASET_CREATION_SUCCESS, datasetObject);
           // When a dataset is created the response we get is its ID number
-          window.location.href =
-            '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';
+          history.push('/chart/add/');
         }
       });
     }
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index 4f7dfca196f4f..7e66fe59eae84 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -40,6 +40,7 @@ import {
   emptyStateComponent,
 } from 'src/components/EmptyState';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
+import { LocalStorageKeys, getItem } from 'src/utils/localStorageHelpers';
 import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {
@@ -211,6 +212,16 @@ export default function LeftPanel({
 
   const encodedSchema = schema ? encodeURIComponent(schema) : undefined;
 
+  useEffect(() => {
+    const currentUserSelectedDb = getItem(
+      LocalStorageKeys.db,
+      null,
+    ) as DatabaseObject;
+    if (currentUserSelectedDb) {
+      setDatabase(currentUserSelectedDb);
+    }
+  }, []);
+
   useEffect(() => {
     if (loadTables) {
       const endpoint = encodeURI(

From 64749a23772c57f91cb104555dca2890238b8ef8 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Wed, 11 Jan 2023 13:40:15 -0600
Subject: [PATCH 12/28] Add dangerToasts to error handling

---
 .../CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx  | 9 ++++++---
 .../CRUD/data/dataset/AddDataset/LeftPanel/index.tsx     | 8 +++++---
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx     | 8 +++++---
 superset-frontend/src/views/CRUD/data/hooks.ts           | 8 +++++---
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
index 15e6225e5612a..56939258e1b20 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
@@ -17,8 +17,9 @@
  * under the License.
  */
 import React, { useEffect, useState, useRef } from 'react';
-import { SupersetClient } from '@superset-ui/core';
+import { SupersetClient, logging } from '@superset-ui/core';
 import { DatasetObject } from 'src/views/CRUD/data/dataset/AddDataset/types';
+import { addDangerToast } from 'src/components/MessageToasts/actions';
 import DatasetPanel from './DatasetPanel';
 import { ITableColumn, IDatabaseTable, isIDatabaseTable } from './types';
 
@@ -94,8 +95,10 @@ const DatasetPanelWrapper = ({
         setColumnList([]);
         setHasColumns?.(false);
         setHasError(true);
-        // eslint-disable-next-line no-console
-        console.error(
+        addDangerToast(
+          `The API response from ${path} does not match the IDatabaseTable interface.`,
+        );
+        logging.error(
           `The API response from ${path} does not match the IDatabaseTable interface.`,
         );
       }
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index 7e66fe59eae84..50cfb3094862d 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -41,6 +41,7 @@ import {
 } from 'src/components/EmptyState';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { LocalStorageKeys, getItem } from 'src/utils/localStorageHelpers';
+import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {
@@ -193,9 +194,10 @@ export default function LeftPanel({
         setResetTables(false);
         setRefresh(false);
       })
-      .catch(error =>
-        logging.error('There was an error fetching tables', error),
-      );
+      .catch(error => {
+        addDangerToast('There was an error fetching tables');
+        logging.error('There was an error fetching tables', error);
+      });
   };
 
   const setSchema = (schema: string) => {
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index e4dbaa9a699d0..005e654627a0f 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -20,6 +20,7 @@ import React, { useReducer, Reducer, useEffect, useState } from 'react';
 import { logging } from '@superset-ui/core';
 import { UseGetDatasetsList } from 'src/views/CRUD/data/hooks';
 import rison from 'rison';
+import { addDangerToast } from 'src/components/MessageToasts/actions';
 import Header from './Header';
 import DatasetPanel from './DatasetPanel';
 import LeftPanel from './LeftPanel';
@@ -96,9 +97,10 @@ export default function AddDataset() {
       .then(json => {
         setDatasets(json?.result);
       })
-      .catch(error =>
-        logging.error('There was an error fetching dataset', error),
-      );
+      .catch(error => {
+        addDangerToast('There was an error fetching dataset');
+        logging.error('There was an error fetching dataset', error);
+      });
   };
 
   useEffect(() => {
diff --git a/superset-frontend/src/views/CRUD/data/hooks.ts b/superset-frontend/src/views/CRUD/data/hooks.ts
index 2f2bdd9a2ccab..82c63bb3200d0 100644
--- a/superset-frontend/src/views/CRUD/data/hooks.ts
+++ b/superset-frontend/src/views/CRUD/data/hooks.ts
@@ -18,6 +18,7 @@
  */
 import { useState, useEffect } from 'react';
 import { SupersetClient, logging } from '@superset-ui/core';
+import { addDangerToast } from 'src/components/MessageToasts/actions';
 
 type BaseQueryObject = {
   id: number;
@@ -80,6 +81,7 @@ export const UseGetDatasetsList = (queryParams: string | undefined) =>
     endpoint: `/api/v1/dataset/?q=${queryParams}`,
   })
     .then(({ json }) => json)
-    .catch(error =>
-      logging.error('There was an error fetching dataset', error),
-    );
+    .catch(error => {
+      addDangerToast('There was an error fetching dataset');
+      logging.error('There was an error fetching dataset', error);
+    });

From a31a141fca372d4e79627ef224ee9a5f910145e4 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Wed, 11 Jan 2023 13:49:22 -0600
Subject: [PATCH 13/28] Fix lint

---
 .../src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index 50cfb3094862d..be9181c70ac5c 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -41,7 +41,6 @@ import {
 } from 'src/components/EmptyState';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { LocalStorageKeys, getItem } from 'src/utils/localStorageHelpers';
-import { addDangerToast } from 'src/components/MessageToasts/actions';
 import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {

From b03efda40c1fa164926b88ef70f963f6547b1c2e Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 12 Jan 2023 13:28:53 -0600
Subject: [PATCH 14/28] Fix useEffect warnings and autosetting db from local
 storage, add translations, change window.location.href redirect to use
 history.push()

---
 .../data/database/DatabaseModal/index.tsx     |  6 +-
 .../dataset/AddDataset/DatasetPanel/index.tsx | 10 +-
 .../dataset/AddDataset/LeftPanel/index.tsx    | 98 +++++++++++--------
 .../CRUD/data/dataset/AddDataset/index.tsx    | 25 +++--
 .../CRUD/data/dataset/AddDataset/types.tsx    |  8 +-
 .../src/views/CRUD/data/hooks.ts              |  6 +-
 6 files changed, 89 insertions(+), 64 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index 96b30eec8e4a1..ad92ad0688685 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -31,6 +31,7 @@ import React, {
   useReducer,
   Reducer,
 } from 'react';
+import { useHistory } from 'react-router-dom';
 import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface';
 import Tabs from 'src/components/Tabs';
@@ -537,6 +538,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     t('database'),
     addDangerToast,
   );
+  const history = useHistory();
 
   const [tabKey, setTabKey] = useState<string>(DEFAULT_TAB_KEY);
   const [availableDbs, getAvailableDbs] = useAvailableDatabases();
@@ -1350,7 +1352,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         onClick={() => {
           setLoading(true);
           fetchAndSetDB();
-          window.location.href = '/dataset/add/';
+          history.push('/dataset/add/');
         }}
       >
         {t('CREATE DATASET')}
@@ -1361,7 +1363,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
         onClick={() => {
           setLoading(true);
           fetchAndSetDB();
-          window.location.href = `/superset/sqllab/?db=true`;
+          history.push(`/superset/sqllab/?db=true`);
         }}
       >
         {t('QUERY DATA IN SQL LAB')}
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
index 56939258e1b20..1095f044a0112 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { useEffect, useState, useRef } from 'react';
-import { SupersetClient, logging } from '@superset-ui/core';
+import { SupersetClient, logging, t } from '@superset-ui/core';
 import { DatasetObject } from 'src/views/CRUD/data/dataset/AddDataset/types';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import DatasetPanel from './DatasetPanel';
@@ -96,10 +96,14 @@ const DatasetPanelWrapper = ({
         setHasColumns?.(false);
         setHasError(true);
         addDangerToast(
-          `The API response from ${path} does not match the IDatabaseTable interface.`,
+          t(
+            'The API response from %s does not match the IDatabaseTable interface.',
+          ),
         );
         logging.error(
-          `The API response from ${path} does not match the IDatabaseTable interface.`,
+          t(
+            'The API response from %s does not match the IDatabaseTable interface.',
+          ),
         );
       }
     } catch (error) {
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index be9181c70ac5c..14dd7dca4b842 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -16,7 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useEffect, useState, SetStateAction, Dispatch } from 'react';
+import React, {
+  useEffect,
+  useState,
+  SetStateAction,
+  Dispatch,
+  useCallback,
+} from 'react';
 import {
   SupersetClient,
   t,
@@ -41,13 +47,15 @@ import {
 } from 'src/components/EmptyState';
 import { useToasts } from 'src/components/MessageToasts/withToasts';
 import { LocalStorageKeys, getItem } from 'src/utils/localStorageHelpers';
-import { DatasetActionType } from '../types';
+import {
+  DatasetActionType,
+  DatasetObject,
+} from 'src/views/CRUD/data/dataset/AddDataset/types';
 
 interface LeftPanelProps {
   setDataset: Dispatch<SetStateAction<object>>;
-  schema?: string | null | undefined;
-  dbId?: number;
-  datasets?: (string | null | undefined)[] | undefined;
+  dataset?: Partial<DatasetObject> | null;
+  datasetNames?: (string | null | undefined)[] | undefined;
 }
 
 const SearchIcon = styled(Icons.Search)`
@@ -146,9 +154,8 @@ const LeftPanelStyle = styled.div`
 
 export default function LeftPanel({
   setDataset,
-  schema,
-  dbId,
-  datasets,
+  dataset,
+  datasetNames,
 }: LeftPanelProps) {
   const theme = useTheme();
 
@@ -161,11 +168,14 @@ export default function LeftPanel({
 
   const { addDangerToast } = useToasts();
 
-  const setDatabase = (db: Partial<DatabaseObject>) => {
-    setDataset({ type: DatasetActionType.selectDatabase, payload: { db } });
-    setSelectedTable(null);
-    setResetTables(true);
-  };
+  const setDatabase = useCallback(
+    (db: Partial<DatabaseObject>) => {
+      setDataset({ type: DatasetActionType.selectDatabase, payload: { db } });
+      setSelectedTable(null);
+      setResetTables(true);
+    },
+    [setDataset],
+  );
 
   const setTable = (tableName: string, index: number) => {
     setSelectedTable(index);
@@ -175,29 +185,32 @@ export default function LeftPanel({
     });
   };
 
-  const getTablesList = (url: string) => {
-    SupersetClient.get({ url })
-      .then(({ json }) => {
-        const options: TableOption[] = json.options.map((table: Table) => {
-          const option: TableOption = {
-            value: table.value,
-            label: <TableOption table={table} />,
-            text: table.label,
-          };
+  const getTablesList = useCallback(
+    (url: string) => {
+      SupersetClient.get({ url })
+        .then(({ json }) => {
+          const options: TableOption[] = json.options.map((table: Table) => {
+            const option: TableOption = {
+              value: table.value,
+              label: <TableOption table={table} />,
+              text: table.label,
+            };
 
-          return option;
-        });
+            return option;
+          });
 
-        setTableOptions(options);
-        setLoadTables(false);
-        setResetTables(false);
-        setRefresh(false);
-      })
-      .catch(error => {
-        addDangerToast('There was an error fetching tables');
-        logging.error('There was an error fetching tables', error);
-      });
-  };
+          setTableOptions(options);
+          setLoadTables(false);
+          setResetTables(false);
+          setRefresh(false);
+        })
+        .catch(error => {
+          addDangerToast(t('There was an error fetching tables'));
+          logging.error(t('There was an error fetching tables'), error);
+        });
+    },
+    [addDangerToast],
+  );
 
   const setSchema = (schema: string) => {
     if (schema) {
@@ -211,7 +224,9 @@ export default function LeftPanel({
     setResetTables(true);
   };
 
-  const encodedSchema = schema ? encodeURIComponent(schema) : undefined;
+  const encodedSchema = dataset?.schema
+    ? encodeURIComponent(dataset?.schema)
+    : undefined;
 
   useEffect(() => {
     const currentUserSelectedDb = getItem(
@@ -221,16 +236,16 @@ export default function LeftPanel({
     if (currentUserSelectedDb) {
       setDatabase(currentUserSelectedDb);
     }
-  }, []);
+  }, [setDatabase]);
 
   useEffect(() => {
     if (loadTables) {
       const endpoint = encodeURI(
-        `/superset/tables/${dbId}/${encodedSchema}/${refresh}/`,
+        `/superset/tables/${dataset?.db?.id}/${encodedSchema}/${refresh}/`,
       );
       getTablesList(endpoint);
     }
-  }, [loadTables]);
+  }, [loadTables, dataset?.db?.id, encodedSchema, getTablesList, refresh]);
 
   useEffect(() => {
     if (resetTables) {
@@ -274,6 +289,7 @@ export default function LeftPanel({
         {SELECT_DATABASE_AND_SCHEMA_TEXT}
       </p>
       <DatabaseSelector
+        db={dataset?.db}
         handleError={addDangerToast}
         onDbChange={setDatabase}
         onSchemaChange={setSchema}
@@ -281,7 +297,7 @@ export default function LeftPanel({
         onEmptyResults={onEmptyResults}
       />
       {loadTables && !refresh && Loader(TABLE_LOADING_TEXT)}
-      {schema && !loadTables && !tableOptions.length && !searchVal && (
+      {dataset?.schema && !loadTables && !tableOptions.length && !searchVal && (
         <div className="emptystate">
           <EmptyStateMedium
             image="empty-table.svg"
@@ -291,7 +307,7 @@ export default function LeftPanel({
         </div>
       )}
 
-      {schema && (tableOptions.length > 0 || searchVal.length > 0) && (
+      {dataset?.schema && (tableOptions.length > 0 || searchVal.length > 0) && (
         <>
           <Form>
             <p className="table-title">{SELECT_DATABASE_TABLE_TEXT}</p>
@@ -335,7 +351,7 @@ export default function LeftPanel({
                   onClick={() => setTable(option.value, i)}
                 >
                   {option.label}
-                  {datasets?.includes(option.value) && (
+                  {datasetNames?.includes(option.value) && (
                     <Icons.Warning
                       iconColor={
                         selectedTable === i
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index 005e654627a0f..05ffc3a343ad1 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -16,8 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import React, { useReducer, Reducer, useEffect, useState } from 'react';
-import { logging } from '@superset-ui/core';
+import React, {
+  useReducer,
+  Reducer,
+  useEffect,
+  useState,
+  useCallback,
+} from 'react';
+import { logging, t } from '@superset-ui/core';
 import { UseGetDatasetsList } from 'src/views/CRUD/data/hooks';
 import rison from 'rison';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
@@ -92,22 +98,22 @@ export default function AddDataset() {
       })
     : undefined;
 
-  const getDatasetsList = async () => {
+  const getDatasetsList = useCallback(async () => {
     await UseGetDatasetsList(queryParams)
       .then(json => {
         setDatasets(json?.result);
       })
       .catch(error => {
-        addDangerToast('There was an error fetching dataset');
-        logging.error('There was an error fetching dataset', error);
+        addDangerToast(t('There was an error fetching dataset'));
+        logging.error(t('There was an error fetching dataset'), error);
       });
-  };
+  }, [queryParams]);
 
   useEffect(() => {
     if (dataset?.schema) {
       getDatasetsList();
     }
-  }, [dataset?.schema]);
+  }, [dataset?.schema, getDatasetsList]);
 
   const HeaderComponent = () => (
     <Header setDataset={setDataset} title={dataset?.table_name} />
@@ -116,9 +122,8 @@ export default function AddDataset() {
   const LeftPanelComponent = () => (
     <LeftPanel
       setDataset={setDataset}
-      schema={dataset?.schema}
-      dbId={dataset?.db?.id}
-      datasets={datasetNames}
+      dataset={dataset}
+      datasetNames={datasetNames}
     />
   );
 
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx
index dbeef93ead7b0..9fc1bf3e705aa 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx
@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { DatabaseObject } from 'src/components/DatabaseSelector';
+
 export enum DatasetActionType {
   selectDatabase,
   selectSchema,
@@ -24,11 +26,7 @@ export enum DatasetActionType {
 }
 
 export interface DatasetObject {
-  db: {
-    id: number;
-    database_name?: string;
-    owners?: number[];
-  };
+  db: DatabaseObject;
   schema?: string | null;
   dataset_name: string;
   table_name?: string | null;
diff --git a/superset-frontend/src/views/CRUD/data/hooks.ts b/superset-frontend/src/views/CRUD/data/hooks.ts
index 82c63bb3200d0..e15e4be957164 100644
--- a/superset-frontend/src/views/CRUD/data/hooks.ts
+++ b/superset-frontend/src/views/CRUD/data/hooks.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { useState, useEffect } from 'react';
-import { SupersetClient, logging } from '@superset-ui/core';
+import { SupersetClient, logging, t } from '@superset-ui/core';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 
 type BaseQueryObject = {
@@ -82,6 +82,6 @@ export const UseGetDatasetsList = (queryParams: string | undefined) =>
   })
     .then(({ json }) => json)
     .catch(error => {
-      addDangerToast('There was an error fetching dataset');
-      logging.error('There was an error fetching dataset', error);
+      addDangerToast(t('There was an error fetching dataset'));
+      logging.error(t('There was an error fetching dataset'), error);
     });

From 00feed81de4292e12ee5df5a66104cd330588bbf Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 12 Jan 2023 17:03:54 -0600
Subject: [PATCH 15/28] fix lint

---
 .../AddDataset/DatasetPanel/fixtures.ts       |  1 +
 .../AddDataset/LeftPanel/LeftPanel.test.tsx   | 20 +++++++++----------
 .../CRUD/data/dataset/AddDataset/types.tsx    |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/fixtures.ts b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/fixtures.ts
index d3ee58da14b9d..5c09188c61a87 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/fixtures.ts
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/fixtures.ts
@@ -40,6 +40,7 @@ export const exampleDataset: DatasetObject[] = [
       id: 1,
       database_name: 'test_database',
       owners: [1],
+      backend: 'test_backend',
     },
     schema: 'test_schema',
     dataset_name: 'example_dataset',
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx
index 7457f0c25095c..bc8c1d03debef 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx
@@ -21,6 +21,7 @@ import fetchMock from 'fetch-mock';
 import userEvent from '@testing-library/user-event';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import LeftPanel from 'src/views/CRUD/data/dataset/AddDataset/LeftPanel';
+import { exampleDataset } from 'src/views/CRUD/data/dataset/AddDataset/DatasetPanel/fixtures';
 
 const databasesEndpoint = 'glob:*/api/v1/database/?q*';
 const schemasEndpoint = 'glob:*/api/v1/database/*/schemas*';
@@ -181,7 +182,7 @@ test('does not render blank state if there is nothing selected', async () => {
 });
 
 test('renders list of options when user clicks on schema', async () => {
-  render(<LeftPanel setDataset={mockFun} schema="schema_a" dbId={1} />, {
+  render(<LeftPanel setDataset={mockFun} dataset={exampleDataset[0]} />, {
     useRedux: true,
   });
 
@@ -189,23 +190,21 @@ test('renders list of options when user clicks on schema', async () => {
   const databaseSelect = screen.getByRole('combobox', {
     name: 'Select database or type database name',
   });
-  // Schema select should be disabled until database is selected
-  const schemaSelect = screen.getByRole('combobox', {
-    name: /select schema or type schema name/i,
-  });
   userEvent.click(databaseSelect);
   expect(await screen.findByText('test-postgres')).toBeInTheDocument();
-  expect(schemaSelect).toBeDisabled();
   userEvent.click(screen.getByText('test-postgres'));
 
-  // Wait for schema field to be enabled
+  // Schema select will be automatically populated if there is only one schema
+  const schemaSelect = screen.getByRole('combobox', {
+    name: /select schema or type schema name/i,
+  });
   await waitFor(() => {
     expect(schemaSelect).toBeEnabled();
   });
 });
 
 test('searches for a table name', async () => {
-  render(<LeftPanel setDataset={mockFun} schema="schema_a" dbId={1} />, {
+  render(<LeftPanel setDataset={mockFun} dataset={exampleDataset[0]} />, {
     useRedux: true,
   });
 
@@ -245,9 +244,8 @@ test('renders a warning icon when a table name has a pre-existing dataset', asyn
   render(
     <LeftPanel
       setDataset={mockFun}
-      schema="schema_a"
-      dbId={1}
-      datasets={['Sheet2']}
+      dataset={exampleDataset[0]}
+      datasetNames={['Sheet2']}
     />,
     {
       useRedux: true,
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx
index 9fc1bf3e705aa..89473e5426cbb 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/types.tsx
@@ -26,7 +26,7 @@ export enum DatasetActionType {
 }
 
 export interface DatasetObject {
-  db: DatabaseObject;
+  db: DatabaseObject & { owners: [number] };
   schema?: string | null;
   dataset_name: string;
   table_name?: string | null;

From 3b0d32a9ac5e7d68e94a6e973c8e5f60efc78608 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 12 Jan 2023 17:09:03 -0600
Subject: [PATCH 16/28] Add path back into error message

---
 .../views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
index 1095f044a0112..73bea70b41f2f 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/DatasetPanel/index.tsx
@@ -98,11 +98,13 @@ const DatasetPanelWrapper = ({
         addDangerToast(
           t(
             'The API response from %s does not match the IDatabaseTable interface.',
+            path,
           ),
         );
         logging.error(
           t(
             'The API response from %s does not match the IDatabaseTable interface.',
+            path,
           ),
         );
       }

From c3673ec2970246dad94e57602098009d6f9c1643 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 12 Jan 2023 18:28:36 -0600
Subject: [PATCH 17/28] Fix DatabaseModal test by mocking useHistory hook

---
 .../views/CRUD/data/database/DatabaseModal/index.test.tsx | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx
index 5d58060155f70..8f2e4cda37af5 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.test.tsx
@@ -62,6 +62,14 @@ jest.mock('src/components/Icons/Icon', () => ({
   StyledIcon: () => <span />,
 }));
 
+const mockHistoryPush = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useHistory: () => ({
+    push: mockHistoryPush,
+  }),
+}));
+
 const dbProps = {
   show: true,
   database_name: 'my database',

From 585b915ee9f9704b5ce15cf0f6954c437c98ab7b Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 12 Jan 2023 18:45:59 -0600
Subject: [PATCH 18/28] Add table_name query to /chart/add/ redirect

---
 .../src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
index bc6bbc1e4851c..12fe94d49156d 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -100,7 +100,7 @@ function Footer({
         if (typeof response === 'number') {
           logEvent(LOG_ACTIONS_DATASET_CREATION_SUCCESS, datasetObject);
           // When a dataset is created the response we get is its ID number
-          history.push('/chart/add/');
+          history.push(`/chart/add/?dataset=${datasetObject.table_name}`);
         }
       });
     }

From fbd2f2dcb395a3f9b5d16bd4bb78ebe9c0558e13 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Fri, 13 Jan 2023 14:24:57 -0600
Subject: [PATCH 19/28] Change text on footer create button

---
 .../src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
index 12fe94d49156d..7f6717857f569 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -106,7 +106,7 @@ function Footer({
     }
   };
 
-  const CREATE_DATASET_TEXT = t('Create Dataset');
+  const CREATE_DATASET_TEXT = t('Create Dataset and Create Chart');
   const disabledCheck =
     !datasetObject?.table_name ||
     !hasColumns ||

From c31363e7883bcb7925ddea0b85b6ccb99bc23627 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 17 Jan 2023 15:57:37 -0600
Subject: [PATCH 20/28] Add filter by database ID to rison in queryParams

---
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index 05ffc3a343ad1..1cb4b0d5ae728 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -92,6 +92,7 @@ export default function AddDataset() {
   const queryParams = dataset?.schema
     ? rison.encode_uri({
         filters: [
+          { col: 'database', opr: 'rel_o_m', value: dataset?.db?.id },
           { col: 'schema', opr: 'eq', value: encodedSchema },
           { col: 'sql', opr: 'dataset_is_null_or_empty', value: '!t' },
         ],

From de429a9811c3ceb2908f209346d3c90858eae1ce Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 17 Jan 2023 16:33:53 -0600
Subject: [PATCH 21/28] Remove user-selected db from local storage when db is
 deleted

---
 .../src/views/CRUD/data/database/DatabaseList.tsx             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
index 744edb51b18e6..0e3642493ad07 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseList.tsx
@@ -21,6 +21,7 @@ import React, { useState, useMemo, useEffect } from 'react';
 import rison from 'rison';
 import { useSelector } from 'react-redux';
 import { useQueryParams, BooleanParam } from 'use-query-params';
+import { LocalStorageKeys, setItem } from 'src/utils/localStorageHelpers';
 
 import Loading from 'src/components/Loading';
 import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
@@ -157,6 +158,9 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
         refreshData();
         addSuccessToast(t('Deleted: %s', dbName));
 
+        // Delete user-selected db from local storage
+        setItem(LocalStorageKeys.db, null);
+
         // Close delete modal
         setDatabaseCurrentlyDeleting(null);
       },

From 211d8a1ae0aff9661585817e9368b90ccf4ce376 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Mon, 23 Jan 2023 15:21:55 -0600
Subject: [PATCH 22/28] Fix bugs

---
 .../CRUD/data/database/DatabaseModal/index.tsx | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index ad92ad0688685..f7260952f8cb3 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -31,7 +31,6 @@ import React, {
   useReducer,
   Reducer,
 } from 'react';
-import { useHistory } from 'react-router-dom';
 import { setItem, LocalStorageKeys } from 'src/utils/localStorageHelpers';
 import { UploadChangeParam, UploadFile } from 'antd/lib/upload/interface';
 import Tabs from 'src/components/Tabs';
@@ -138,6 +137,7 @@ interface DatabaseModalProps {
   show: boolean;
   databaseId: number | undefined; // If included, will go into edit mode
   dbEngine: string | undefined; // if included goto step 2 with engine already set
+  history?: any;
 }
 
 export enum ActionType {
@@ -522,6 +522,7 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   show,
   databaseId,
   dbEngine,
+  history,
 }) => {
   const [db, setDB] = useReducer<
     Reducer<Partial<DatabaseObject> | null, DBReducerActionType>
@@ -538,7 +539,6 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     t('database'),
     addDangerToast,
   );
-  const history = useHistory();
 
   const [tabKey, setTabKey] = useState<string>(DEFAULT_TAB_KEY);
   const [availableDbs, getAvailableDbs] = useAvailableDatabases();
@@ -655,6 +655,14 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
     onHide();
   };
 
+  const redirectURL = (url: string) => {
+    if (!isEmpty(history)) {
+      history?.push(url);
+    } else {
+      window.location.href = url;
+    }
+  };
+
   // Database import logic
   const {
     state: {
@@ -1347,23 +1355,21 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   const renderCTABtns = () => (
     <StyledBtns>
       <Button
-        // eslint-disable-next-line no-return-assign
         buttonStyle="secondary"
         onClick={() => {
           setLoading(true);
           fetchAndSetDB();
-          history.push('/dataset/add/');
+          redirectURL('/dataset/add/');
         }}
       >
         {t('CREATE DATASET')}
       </Button>
       <Button
         buttonStyle="secondary"
-        // eslint-disable-next-line no-return-assign
         onClick={() => {
           setLoading(true);
           fetchAndSetDB();
-          history.push(`/superset/sqllab/?db=true`);
+          redirectURL(`/superset/sqllab/?db=true`);
         }}
       >
         {t('QUERY DATA IN SQL LAB')}

From dff5f07ae2850c9d76c72f96cc9b4d14e5e2d333 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 24 Jan 2023 17:20:02 -0600
Subject: [PATCH 23/28] Fix bug: Create dataset disabled in topnav + menu

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

diff --git a/superset-frontend/src/views/components/RightMenu.tsx b/superset-frontend/src/views/components/RightMenu.tsx
index 1957060502761..ffea215715181 100644
--- a/superset-frontend/src/views/components/RightMenu.tsx
+++ b/superset-frontend/src/views/components/RightMenu.tsx
@@ -300,7 +300,8 @@ const RightMenu = ({
   );
 
   const buildMenuItem = (item: Record<string, any>) => {
-    const disabledText = isDisabled && item.url;
+    const disabledText =
+      isDisabled && item.url && !item.url.includes('dataset');
     return disabledText ? (
       <Menu.Item key={item.name} css={styledDisabled}>
         <Tooltip placement="top" title={tooltipText}>

From ee0f2f0d66cfa71e05b0db96fa8f9264b84f30d7 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 26 Jan 2023 16:47:17 -0600
Subject: [PATCH 24/28] Better solution for top nav create dataset disabled bug

---
 .../src/views/components/RightMenu.tsx              | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/superset-frontend/src/views/components/RightMenu.tsx b/superset-frontend/src/views/components/RightMenu.tsx
index ffea215715181..2e37424e04364 100644
--- a/superset-frontend/src/views/components/RightMenu.tsx
+++ b/superset-frontend/src/views/components/RightMenu.tsx
@@ -41,6 +41,7 @@ import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
 import {
   MenuObjectProps,
   UserWithPermissionsAndRoles,
+  MenuObjectChildProps,
 } from 'src/types/bootstrapTypes';
 import { RootState } from 'src/dashboard/types';
 import LanguagePicker from './LanguagePicker';
@@ -190,18 +191,21 @@ const RightMenu = ({
           name: 'Upload a CSV',
           url: '/csvtodatabaseview/form',
           perm: canUploadCSV && showUploads,
+          disable: isAdmin && !allowUploads,
         },
         {
           label: t('Upload columnar file to database'),
           name: 'Upload a Columnar file',
           url: '/columnartodatabaseview/form',
           perm: canUploadColumnar && showUploads,
+          disable: isAdmin && !allowUploads,
         },
         {
           label: t('Upload Excel file to database'),
           name: 'Upload Excel',
           url: '/exceltodatabaseview/form',
           perm: canUploadExcel && showUploads,
+          disable: isAdmin && !allowUploads,
         },
       ],
     },
@@ -293,16 +297,12 @@ const RightMenu = ({
     setShowDatabaseModal(false);
   };
 
-  const isDisabled = isAdmin && !allowUploads;
-
   const tooltipText = t(
     "Enable 'Allow file uploads to database' in any database's settings",
   );
 
-  const buildMenuItem = (item: Record<string, any>) => {
-    const disabledText =
-      isDisabled && item.url && !item.url.includes('dataset');
-    return disabledText ? (
+  const buildMenuItem = (item: MenuObjectChildProps) =>
+    item.disable ? (
       <Menu.Item key={item.name} css={styledDisabled}>
         <Tooltip placement="top" title={tooltipText}>
           {item.label}
@@ -313,7 +313,6 @@ const RightMenu = ({
         {item.url ? <a href={item.url}> {item.label} </a> : item.label}
       </Menu.Item>
     );
-  };
 
   const onMenuOpen = (openKeys: string[]) => {
     // We should query the API only if opening Data submenus

From 4bafc1ade736ccbe7e71c83c4c85b3625aa6316a Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 26 Jan 2023 18:14:12 -0600
Subject: [PATCH 25/28] Fix bug: already existing datasets are not marked as
 "already exists" in dataset creation page

---
 .../CRUD/data/dataset/AddDataset/index.tsx    | 36 +++++++---------
 .../src/views/CRUD/data/hooks.ts              | 42 +++++++++++++++----
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index 1cb4b0d5ae728..a6d84ff10ee60 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -25,7 +25,6 @@ import React, {
 } from 'react';
 import { logging, t } from '@superset-ui/core';
 import { UseGetDatasetsList } from 'src/views/CRUD/data/hooks';
-import rison from 'rison';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import Header from './Header';
 import DatasetPanel from './DatasetPanel';
@@ -89,26 +88,23 @@ export default function AddDataset() {
     ? encodeURIComponent(dataset?.schema)
     : undefined;
 
-  const queryParams = dataset?.schema
-    ? rison.encode_uri({
-        filters: [
-          { col: 'database', opr: 'rel_o_m', value: dataset?.db?.id },
-          { col: 'schema', opr: 'eq', value: encodedSchema },
-          { col: 'sql', opr: 'dataset_is_null_or_empty', value: '!t' },
-        ],
-      })
-    : undefined;
-
   const getDatasetsList = useCallback(async () => {
-    await UseGetDatasetsList(queryParams)
-      .then(json => {
-        setDatasets(json?.result);
-      })
-      .catch(error => {
-        addDangerToast(t('There was an error fetching dataset'));
-        logging.error(t('There was an error fetching dataset'), error);
-      });
-  }, [queryParams]);
+    if (dataset?.schema) {
+      const filters = [
+        { col: 'database', opr: 'rel_o_m', value: dataset?.db?.id },
+        { col: 'schema', opr: 'eq', value: encodedSchema },
+        { col: 'sql', opr: 'dataset_is_null_or_empty', value: true },
+      ];
+      await UseGetDatasetsList(filters)
+        .then(results => {
+          setDatasets(results);
+        })
+        .catch(error => {
+          addDangerToast(t('There was an error fetching dataset'));
+          logging.error(t('There was an error fetching dataset'), error);
+        });
+    }
+  }, [dataset?.db?.id, dataset?.schema, encodedSchema]);
 
   useEffect(() => {
     if (dataset?.schema) {
diff --git a/superset-frontend/src/views/CRUD/data/hooks.ts b/superset-frontend/src/views/CRUD/data/hooks.ts
index e15e4be957164..0c1528f07f437 100644
--- a/superset-frontend/src/views/CRUD/data/hooks.ts
+++ b/superset-frontend/src/views/CRUD/data/hooks.ts
@@ -19,6 +19,8 @@
 import { useState, useEffect } from 'react';
 import { SupersetClient, logging, t } from '@superset-ui/core';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
+import { DatasetObject } from 'src/views/CRUD/data/dataset/AddDataset/types';
+import rison from 'rison';
 
 type BaseQueryObject = {
   id: number;
@@ -76,12 +78,38 @@ export function useQueryPreviewState<D extends BaseQueryObject = any>({
   };
 }
 
-export const UseGetDatasetsList = (queryParams: string | undefined) =>
-  SupersetClient.get({
-    endpoint: `/api/v1/dataset/?q=${queryParams}`,
-  })
-    .then(({ json }) => json)
-    .catch(error => {
+/**
+ * Retrieves all pages of dataset results
+ */
+export const UseGetDatasetsList = async (filters: object[]) => {
+  let results: DatasetObject[] = [];
+  let page = 0;
+  let count;
+
+  // If count is undefined or less than results, we need to
+  // asynchronously retrieve a page of dataset results
+  while (count === undefined || results.length < count) {
+    const queryParams = rison.encode_uri({ filters, page });
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      const response = await SupersetClient.get({
+        endpoint: `/api/v1/dataset/?q=${queryParams}`,
+      });
+
+      // Reassign local count to response's count
+      ({ count } = response.json);
+
+      const {
+        json: { result },
+      } = response;
+
+      results = [...results, ...result];
+
+      page += 1;
+    } catch (error) {
       addDangerToast(t('There was an error fetching dataset'));
       logging.error(t('There was an error fetching dataset'), error);
-    });
+    }
+  }
+  return results;
+};

From e80adab2009e0c62e3f6507546ed106cd47ebb49 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 31 Jan 2023 16:16:18 -0600
Subject: [PATCH 26/28] Fix CREATE_DATASET_TEXT and tooltip in footer, add todo
 note to history functionality in DatabaseModal

---
 .../src/views/CRUD/data/database/DatabaseModal/index.tsx        | 2 ++
 .../src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx     | 2 +-
 superset-frontend/src/views/CRUD/data/dataset/styles.ts         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index f7260952f8cb3..72d3ddfd90a27 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -656,6 +656,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
   };
 
   const redirectURL = (url: string) => {
+    /* TODO (lyndsiWilliams): This check and passing history
+      as a prop can be removed once SQL Lab is in the SPA */
     if (!isEmpty(history)) {
       history?.push(url);
     } else {
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
index 7f6717857f569..e0853cdc9d587 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx
@@ -106,7 +106,7 @@ function Footer({
     }
   };
 
-  const CREATE_DATASET_TEXT = t('Create Dataset and Create Chart');
+  const CREATE_DATASET_TEXT = t('Create dataset and create chart');
   const disabledCheck =
     !datasetObject?.table_name ||
     !hasColumns ||
diff --git a/superset-frontend/src/views/CRUD/data/dataset/styles.ts b/superset-frontend/src/views/CRUD/data/dataset/styles.ts
index 45082dea7d265..268b9e273e486 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/styles.ts
+++ b/superset-frontend/src/views/CRUD/data/dataset/styles.ts
@@ -62,6 +62,7 @@ export const PanelRow = styled(Row)`
 export const FooterRow = styled(Row)`
   flex: 0 0 auto;
   height: ${({ theme }) => theme.gridUnit * 16}px;
+  z-index: 0;
 `;
 
 export const StyledLayoutHeader = styled.div`

From fcf1546a189748cc3dda99dbd454a5d750394766 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Wed, 1 Feb 2023 07:25:31 -0600
Subject: [PATCH 27/28] Fix rebase

---
 .../src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index c7f56492318c9..07ed32973ac1b 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -246,7 +246,7 @@ export default function LeftPanel({
         schema_name: encodedSchema,
       });
 
-      const endpoint = `/api/v1/database/${dbId}/tables/?q=${params}`;
+      const endpoint = `/api/v1/database/${dataset?.db?.id}/tables/?q=${params}`;
       getTablesList(endpoint);
     }
   }, [loadTables, dataset?.db?.id, encodedSchema, getTablesList, refresh]);

From bb94687ed957893d6c8f327e4417614e91c92d4d Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Wed, 1 Feb 2023 08:31:21 -0600
Subject: [PATCH 28/28] Fix LeftPanel test

---
 .../CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx
index 3996dc0fec5c6..b6c33cad3733b 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/LeftPanel.test.tsx
@@ -137,8 +137,8 @@ fetchMock.get(schemasEndpoint, {
 });
 
 fetchMock.get(tablesEndpoint, {
-  count: 3,
-  result: [
+  tableLength: 3,
+  options: [
     { value: 'Sheet1', type: 'table', extra: null },
     { value: 'Sheet2', type: 'table', extra: null },
     { value: 'Sheet3', type: 'table', extra: null },