From df99293c2b1f184abe480d89f64661d708c4f465 Mon Sep 17 00:00:00 2001
From: AAfghahi <arash.afghahi@gmail.com>
Date: Mon, 29 Aug 2022 12:30:06 -0400
Subject: [PATCH 1/8] rough draft of footer component

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

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 5500d5ded22f0..6f641d66075b9 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -80,6 +80,12 @@ export default function AddDataset() {
       schema={dataset?.schema}
       dbId={dataset?.db?.id}
     />
+  )
+  const prevUrl =
+    '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';
+
+  const FooterComponent = () => (
+    <Footer url={prevUrl} datasetObject={dataset} />
   );
   const prevUrl =
     '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';

From dfc8ec9d37bd3992c8be1ea4ba85ce535bb2fe1b Mon Sep 17 00:00:00 2001
From: AAfghahi <arash.afghahi@gmail.com>
Date: Thu, 8 Sep 2022 15:41:32 -0400
Subject: [PATCH 2/8] with create functionality

---
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx            | 2 +-
 1 file changed, 1 insertion(+), 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 6f641d66075b9..559f98802a2da 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -80,7 +80,7 @@ export default function AddDataset() {
       schema={dataset?.schema}
       dbId={dataset?.db?.id}
     />
-  )
+  );
   const prevUrl =
     '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';
 

From c0e47d8f1c40135dac9ba046f0e1104a2f9c433d Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Tue, 20 Sep 2022 11:28:31 -0500
Subject: [PATCH 3/8] header is now uneditable and holds proper default values

---
 .../dataset/AddDataset/Header/Header.test.tsx | 47 ++++++-------------
 .../data/dataset/AddDataset/Header/index.tsx  | 12 +++--
 .../dataset/AddDataset/LeftPanel/index.tsx    |  2 +-
 .../CRUD/data/dataset/AddDataset/index.tsx    |  8 +++-
 4 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx
index d4058d8ca7bed..4c7c693619ce7 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import Header from 'src/views/CRUD/data/dataset/AddDataset/Header';
@@ -24,17 +23,13 @@ import Header from 'src/views/CRUD/data/dataset/AddDataset/Header';
 describe('Header', () => {
   const mockSetDataset = jest.fn();
 
-  const waitForRender = (datasetName: string) =>
-    waitFor(() =>
-      render(<Header setDataset={mockSetDataset} datasetName={datasetName} />),
-    );
+  const waitForRender = (props?: any) =>
+    waitFor(() => render(<Header setDataset={mockSetDataset} {...props} />));
 
-  it('renders a blank state Header', async () => {
-    await waitForRender('');
+  test('renders a blank state Header', async () => {
+    await waitForRender();
 
-    const datasetNameTextbox = screen.getByRole('textbox', {
-      name: /dataset name/i,
-    });
+    const datasetName = screen.getByTestId('editable-title');
     const saveButton = screen.getByRole('button', {
       name: /save save/i,
     });
@@ -42,38 +37,26 @@ describe('Header', () => {
       name: /menu actions trigger/i,
     });
 
-    expect(datasetNameTextbox).toBeVisible();
+    expect(datasetName).toBeVisible();
     expect(saveButton).toBeVisible();
     expect(saveButton).toBeDisabled();
     expect(menuButton).toBeVisible();
     expect(menuButton).toBeDisabled();
   });
 
-  it('updates display value of dataset name textbox when Header title is changed', async () => {
-    await waitForRender('');
-
-    const datasetNameTextbox = screen.getByRole('textbox', {
-      name: /dataset name/i,
-    });
+  test('displays "New dataset" when a table is not selected', async () => {
+    await waitForRender();
 
-    // Textbox should start with an empty display value and placeholder text
-    expect(datasetNameTextbox).toHaveDisplayValue('');
-    expect(
-      screen.getByPlaceholderText(/add the name of the dataset/i),
-    ).toBeVisible();
-
-    // Textbox should update its display value when user inputs a new value
-    userEvent.type(datasetNameTextbox, 'Test name');
-    expect(datasetNameTextbox).toHaveDisplayValue('Test name');
+    const datasetName = screen.getByTestId('editable-title');
+    expect(datasetName.innerHTML).toBe('New dataset');
   });
 
-  it('passes an existing dataset title into the dataset name textbox', async () => {
-    await waitForRender('Existing Dataset Name');
+  test('displays table name when a table is selected', async () => {
+    // The schema and table name are passed in through props once selected
+    await waitForRender({ schema: 'testSchema', title: 'testTable' });
 
-    const datasetNameTextbox = screen.getByRole('textbox', {
-      name: /dataset name/i,
-    });
+    const datasetName = screen.getByTestId('editable-title');
 
-    expect(datasetNameTextbox).toHaveDisplayValue('Existing Dataset Name');
+    expect(datasetName.innerHTML).toBe('testTable');
   });
 });
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
index b4cf81d03272c..bdde65967fb26 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
@@ -59,21 +59,23 @@ const renderOverlay = () => (
 
 export default function Header({
   setDataset,
-  datasetName,
+  title,
+  schema,
 }: {
   setDataset: React.Dispatch<DSReducerActionType>;
-  datasetName: string;
+  title: string;
+  schema?: string;
 }) {
   const editableTitleProps = {
-    title: datasetName,
-    placeholder: t('Add the name of the dataset'),
+    title: schema ? title : t('New dataset'),
+    placeholder: t('New dataset'),
     onSave: (newDatasetName: string) => {
       setDataset({
         type: DatasetActionType.changeDataset,
         payload: { name: 'dataset_name', value: newDatasetName },
       });
     },
-    canEdit: true,
+    canEdit: false,
     label: t('dataset name'),
   };
 
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 bcc7a4a0dbba5..a35a9f4cf0ab4 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,7 @@ import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {
   setDataset: Dispatch<SetStateAction<object>>;
-  schema?: string | undefined | null;
+  schema?: string;
   dbId?: number;
 }
 
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 559f98802a2da..23440a9e1cea6 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -71,13 +71,17 @@ export default function AddDataset() {
   >(datasetReducer, null);
 
   const HeaderComponent = () => (
-    <Header setDataset={setDataset} datasetName={dataset?.dataset_name ?? ''} />
+    <Header
+      setDataset={setDataset}
+      title={dataset?.table_name ?? 'New dataset'}
+      schema={dataset?.schema ?? ''}
+    />
   );
 
   const LeftPanelComponent = () => (
     <LeftPanel
       setDataset={setDataset}
-      schema={dataset?.schema}
+      schema={dataset?.schema ?? ''}
       dbId={dataset?.db?.id}
     />
   );

From ac9d80a14e4b7c909588edd88c77b1bfefdfd14f Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 22 Sep 2022 15:36:07 -0500
Subject: [PATCH 4/8] Fix DatasetLayout test

---
 .../data/dataset/DatasetLayout/DatasetLayout.test.tsx  | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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 42dc3a994b451..a159bd9ce8e66 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
@@ -36,18 +36,12 @@ describe('DatasetLayout', () => {
   const mockSetDataset = jest.fn();
 
   const waitForRender = () =>
-    waitFor(() =>
-      render(<Header setDataset={mockSetDataset} datasetName="" />),
-    );
+    waitFor(() => render(<Header setDataset={mockSetDataset} title="" />));
 
   it('renders a Header when passed in', async () => {
     await waitForRender();
 
-    expect(
-      screen.getByRole('textbox', {
-        name: /dataset name/i,
-      }),
-    ).toBeVisible();
+    expect(screen.getByTestId('editable-title')).toBeVisible();
   });
 
   it('renders a LeftPanel when passed in', async () => {

From f27495b958267cb900dbac172a1f3e785d2c3797 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 22 Sep 2022 16:45:34 -0500
Subject: [PATCH 5/8] Fix AddDataset test

---
 .../views/CRUD/data/dataset/AddDataset/AddDataset.test.tsx  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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 f20c5ae5d1e41..25e7e9cd289ab 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
@@ -27,11 +27,7 @@ describe('AddDataset', () => {
     const blankeStateImgs = screen.getAllByRole('img', { name: /empty/i });
 
     // Header
-    expect(
-      await screen.findByRole('textbox', {
-        name: /dataset name/i,
-      }),
-    ).toBeVisible();
+    expect(await screen.findByTestId('editable-title')).toBeVisible();
     // Left panel
     expect(blankeStateImgs[0]).toBeVisible();
     // Footer

From d7b29690039b65d4d6c6a57e69669a92f5638b19 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Fri, 23 Sep 2022 16:55:35 -0500
Subject: [PATCH 6/8] Fix schema typing

---
 .../src/views/CRUD/data/dataset/AddDataset/Header/index.tsx   | 2 +-
 .../views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx    | 2 +-
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
index bdde65967fb26..815f4c5e17cda 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
@@ -64,7 +64,7 @@ export default function Header({
 }: {
   setDataset: React.Dispatch<DSReducerActionType>;
   title: string;
-  schema?: string;
+  schema?: string | null | undefined;
 }) {
   const editableTitleProps = {
     title: schema ? title : t('New dataset'),
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 a35a9f4cf0ab4..bb497da7c5a03 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,7 @@ import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {
   setDataset: Dispatch<SetStateAction<object>>;
-  schema?: string;
+  schema?: string | null | undefined;
   dbId?: number;
 }
 
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 23440a9e1cea6..a1d48beebef1c 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -74,14 +74,14 @@ export default function AddDataset() {
     <Header
       setDataset={setDataset}
       title={dataset?.table_name ?? 'New dataset'}
-      schema={dataset?.schema ?? ''}
+      schema={dataset?.schema}
     />
   );
 
   const LeftPanelComponent = () => (
     <LeftPanel
       setDataset={setDataset}
-      schema={dataset?.schema ?? ''}
+      schema={dataset?.schema}
       dbId={dataset?.db?.id}
     />
   );

From 96235fe4134a9eeb95133b6a116d41811cb2ae00 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Wed, 28 Sep 2022 16:29:23 -0500
Subject: [PATCH 7/8] Fix weird rebase issue

---
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx        | 6 ------
 1 file changed, 6 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 a1d48beebef1c..538d71f024652 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -88,12 +88,6 @@ export default function AddDataset() {
   const prevUrl =
     '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';
 
-  const FooterComponent = () => (
-    <Footer url={prevUrl} datasetObject={dataset} />
-  );
-  const prevUrl =
-    '/tablemodelview/list/?pageIndex=0&sortColumn=changed_on_delta_humanized&sortOrder=desc';
-
   const FooterComponent = () => (
     <Footer url={prevUrl} datasetObject={dataset} />
   );

From e9f6eb28b1a684b08eb097d43dee99034d775df8 Mon Sep 17 00:00:00 2001
From: lyndsiWilliams <kcatgirl@gmail.com>
Date: Thu, 6 Oct 2022 11:19:21 -0500
Subject: [PATCH 8/8] Address review comments

---
 .../data/dataset/AddDataset/Header/Header.test.tsx    |  6 ++++--
 .../CRUD/data/dataset/AddDataset/Header/index.tsx     | 11 ++++++-----
 .../src/views/CRUD/data/dataset/AddDataset/index.tsx  |  6 +-----
 .../data/dataset/DatasetLayout/DatasetLayout.test.tsx |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx
index 4c7c693619ce7..edeeac446e423 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/Header.test.tsx
@@ -18,7 +18,9 @@
  */
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import Header from 'src/views/CRUD/data/dataset/AddDataset/Header';
+import Header, {
+  DEFAULT_TITLE,
+} from 'src/views/CRUD/data/dataset/AddDataset/Header';
 
 describe('Header', () => {
   const mockSetDataset = jest.fn();
@@ -48,7 +50,7 @@ describe('Header', () => {
     await waitForRender();
 
     const datasetName = screen.getByTestId('editable-title');
-    expect(datasetName.innerHTML).toBe('New dataset');
+    expect(datasetName.innerHTML).toBe(DEFAULT_TITLE);
   });
 
   test('displays table name when a table is selected', async () => {
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
index 815f4c5e17cda..7c1e4f51e6d2d 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
@@ -32,6 +32,8 @@ import {
   DSReducerActionType,
 } from 'src/views/CRUD/data/dataset/AddDataset/types';
 
+export const DEFAULT_TITLE = t('New dataset');
+
 const tooltipProps: { text: string; placement: TooltipPlacement } = {
   text: t('Select a database table and create dataset'),
   placement: 'bottomRight',
@@ -59,16 +61,15 @@ const renderOverlay = () => (
 
 export default function Header({
   setDataset,
-  title,
-  schema,
+  title = DEFAULT_TITLE,
 }: {
   setDataset: React.Dispatch<DSReducerActionType>;
-  title: string;
+  title?: string | null | undefined;
   schema?: string | null | undefined;
 }) {
   const editableTitleProps = {
-    title: schema ? title : t('New dataset'),
-    placeholder: t('New dataset'),
+    title: title ?? DEFAULT_TITLE,
+    placeholder: DEFAULT_TITLE,
     onSave: (newDatasetName: string) => {
       setDataset({
         type: DatasetActionType.changeDataset,
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 538d71f024652..032a9437e25cb 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -71,11 +71,7 @@ export default function AddDataset() {
   >(datasetReducer, null);
 
   const HeaderComponent = () => (
-    <Header
-      setDataset={setDataset}
-      title={dataset?.table_name ?? 'New dataset'}
-      schema={dataset?.schema}
-    />
+    <Header setDataset={setDataset} title={dataset?.table_name} />
   );
 
   const LeftPanelComponent = () => (
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 a159bd9ce8e66..2173f83fa0440 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
@@ -36,7 +36,7 @@ describe('DatasetLayout', () => {
   const mockSetDataset = jest.fn();
 
   const waitForRender = () =>
-    waitFor(() => render(<Header setDataset={mockSetDataset} title="" />));
+    waitFor(() => render(<Header setDataset={mockSetDataset} />));
 
   it('renders a Header when passed in', async () => {
     await waitForRender();