QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-24 10:35:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(explore): Get Explore data from endpoint instead of bootstrap_data (#20519)

Browse Source 
* feat(explore): Use v1/explore endpoint data instead of bootstrapData

* Add tests

* Fix ci

* Remove redundant dependency

* Use form_data_key in cypress tests

* Add auth headers to for data request

* Address comments

* Remove displaying danger toast

* Conditionally add auth headers

* Address comments

* Fix typing bug

* fix

* Fix opening dataset

* Fix sqllab chart create

* Run queries in parallel

* Fix dashboard id autofill

* Fix lint

* Fix test
This commit is contained in:
Kamil Gabryjelski
2022-06-30 21:06:51 +02:00
committed by GitHub
parent f2af81b1c7
commit b30f6a5db1
55 changed files with 845 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
View File

@@ -46,8 +46,11 @@ import {
SqlLabExploreRootState,
getInitialState,
ExploreDatasource,
SqlLabRootState,
} from 'src/SqlLab/types';
import { exploreChart } from 'src/explore/exploreUtils';
import { mountExploreUrl } from 'src/explore/exploreUtils';
import { postFormData } from 'src/explore/exploreUtils/formData';
import { URL_PARAMS } from 'src/constants';
interface SaveDatasetModalProps {
visible: boolean;
@@ -115,6 +118,9 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
modalDescription,
datasource,
}) => {
const defaultVizType = useSelector<SqlLabRootState, string>(
state => state.common?.conf?.DEFAULT_VIZ_TYPE || 'table',
);
const query = datasource as QueryResponse;
const getDefaultDatasetName = () =>
`${query.tab} ${moment().format('MM/DD/YYYY HH:mm:ss')}`;
@@ -137,30 +143,40 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
const dispatch = useDispatch<(dispatch: any) => Promise<JsonObject>>();
const handleOverwriteDataset = async () => {
await updateDataset(
query.dbId,
datasetToOverwrite.datasetId,
query.sql,
query.results.selected_columns.map(
(d: { name: string; type: string; is_dttm: boolean }) => ({
column_name: d.name,
type: d.type,
is_dttm: d.is_dttm,
}),
const [, key] = await Promise.all([
updateDataset(
query.dbId,
datasetToOverwrite.datasetId,
query.sql,
query.results.selected_columns.map(
(d: { name: string; type: string; is_dttm: boolean }) => ({
column_name: d.name,
type: d.type,
is_dttm: d.is_dttm,
}),
),
datasetToOverwrite.owners.map((o: DatasetOwner) => o.id),
true,
),
datasetToOverwrite.owners.map((o: DatasetOwner) => o.id),
true,
);
postFormData(datasetToOverwrite.datasetId, 'table', {
...EXPLORE_CHART_DEFAULT,
datasource: `${datasetToOverwrite.datasetId}__table`,
...(defaultVizType === 'table' && {
all_columns: query.results.selected_columns.map(
column => column.name,
),
}),
}),
]);
const url = mountExploreUrl(null, {
[URL_PARAMS.formDataKey.name]: key,
});
window.open(url, '_blank', 'noreferrer');
setShouldOverwriteDataset(false);
setDatasetToOverwrite({});
setDatasetName(getDefaultDatasetName());
exploreChart({
...EXPLORE_CHART_DEFAULT,
datasource: `${datasetToOverwrite.datasetId}__table`,
selected_columns: query.results.selected_columns,
});
};
const getUserDatasets = async (searchText = '') => {
@@ -235,15 +251,20 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
columns: selectedColumns,
}),
)
.then((data: { table_id: number }) => {
exploreChart({
.then((data: { table_id: number }) =>
postFormData(data.table_id, 'table', {
...EXPLORE_CHART_DEFAULT,
datasource: `${data.table_id}__table`,
metrics: [],
groupby: [],
time_range: 'No filter',
selectedColumns,
row_limit: 1000,
...(defaultVizType === 'table' && {
all_columns: selectedColumns.map(column => column.name),
}),
}),
)
.then((key: string) => {
const url = mountExploreUrl(null, {
[URL_PARAMS.formDataKey.name]: key,
});
window.open(url, '_blank', 'noreferrer');
})
.catch(() => {
addDangerToast(t('An error occurred saving dataset'));