QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 16:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sqllab): inconsistent addNewQueryEditor behavior (#21999)

Browse Source
This commit is contained in:
JUST.in DO IT
2023-01-30 15:54:03 -08:00
committed by GitHub
parent f2b61fca15
commit 19779d7517
5 changed files with 95 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
superset-frontend/src/SqlLab/actions/sqlLab.js
View File

@@ -598,16 +598,44 @@ export function addQueryEditor(queryEditor) {
};
}
export function addNewQueryEditor(queryEditor) {
export function addNewQueryEditor() {
return function (dispatch, getState) {
const {
sqlLab: { queryEditors },
sqlLab: {
queryEditors,
tabHistory,
unsavedQueryEditor,
defaultDbId,
databases,
},
common,
} = getState();
const activeQueryEditor = queryEditors.find(
qe => qe.id === tabHistory[tabHistory.length - 1],
);
const dbIds = Object.values(databases).map(database => database.id);
const firstDbId = dbIds.length > 0 ? Math.min(...dbIds) : undefined;
const { dbId, schema, queryLimit, autorun } = {
...queryEditors[0],
...activeQueryEditor,
...(unsavedQueryEditor.id === activeQueryEditor?.id &&
unsavedQueryEditor),
};
const warning = isFeatureEnabled(FeatureFlag.SQLLAB_BACKEND_PERSISTENCE)
? ''
: t(
'-- Note: Unless you save your query, these tabs will NOT persist if you clear your cookies or change browsers.\n\n',
);
const name = newQueryTabName(queryEditors || []);
return dispatch(
addQueryEditor({
...queryEditor,
dbId: dbId || defaultDbId || firstDbId,
schema: schema ?? null,
autorun: autorun ?? false,
sql: `${warning}SELECT ...`,
queryLimit: queryLimit || common.conf.DEFAULT_SQLLAB_LIMIT,
name,
}),
);