You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by ly...@apache.org on 2023/01/19 16:36:05 UTC
[superset] 11/21: Address Cody's review comments
This is an automated email from the ASF dual-hosted git repository.
lyndsi pushed a commit to branch lyndsi/enable-dataset-creation
in repository https://gitbox.apache.org/repos/asf/superset.git
commit 22cc8369d110570283ae87e9bee4e5d2a53846ed
Author: lyndsiWilliams <kc...@gmail.com>
AuthorDate: Wed Jan 11 12:57:38 2023 -0600
Address Cody's review comments
---
.../src/explore/components/DatasourcePanel/index.tsx | 4 +---
.../src/explore/components/ExploreChartPanel.jsx | 4 +---
.../controls/DndColumnSelectControl/ColumnSelectPopover.tsx | 4 +++-
.../controls/MetricControl/AdhocMetricEditPopover/index.jsx | 2 +-
.../src/views/CRUD/data/dataset/AddDataset/Footer/index.tsx | 3 +--
.../views/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 e24d1100ac..dedffc1044 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 ac9de71682..03cda337bb 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 6ea5dbbb90..dbbc8fe948 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 f749a5d09f..f49eb5b4f7 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 beb250ebd2..bc6bbc1e48 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 4f7dfca196..7e66fe59ea 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(