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

fix(sqllab): wiped out unsaved changes by delayed actions (#21877)

Browse Source
This commit is contained in:
JUST.in DO IT
2022-10-27 13:20:34 -07:00
committed by GitHub
parent 06da7bf65c
commit fb8231b50c
2 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
superset-frontend/src/SqlLab/reducers/sqlLab.js
View File

@@ -32,9 +32,22 @@ import {
} from '../../reduxUtils';
function alterUnsavedQueryEditorState(state, updatedState, id) {
if (state.tabHistory[state.tabHistory.length - 1] !== id) {
const { queryEditors } = alterInArr(
state,
'queryEditors',
{ id },
updatedState,
);
return {
queryEditors,
};
}
return {
...(state.unsavedQueryEditor.id === id && state.unsavedQueryEditor),
...(id ? { id, ...updatedState } : state.unsavedQueryEditor),
unsavedQueryEditor: {
...(state.unsavedQueryEditor.id === id && state.unsavedQueryEditor),
...(id ? { id, ...updatedState } : state.unsavedQueryEditor),
},
};
}
@@ -227,7 +240,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.START_QUERY_VALIDATION]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
validationResult: {
@@ -259,7 +272,7 @@ export default function sqlLabReducer(state = {}, action) {
// Otherwise, persist the results on the queryEditor state
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
validationResult: {
@@ -367,7 +380,7 @@ export default function sqlLabReducer(state = {}, action) {
return {
...newState,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
latestQueryId: action.query.id,
@@ -538,7 +551,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SETDB]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
dbId: action.dbId,
@@ -550,7 +563,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_FUNCTION_NAMES]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
functionNames: action.functionNames,
@@ -562,7 +575,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_SCHEMA]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
schema: action.schema,
@@ -574,7 +587,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_SCHEMA_OPTIONS]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
schemaOptions: action.options,
@@ -586,7 +599,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_TABLE_OPTIONS]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
tableOptions: action.options,
@@ -598,7 +611,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_TITLE]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
name: action.name,
@@ -610,7 +623,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_SQL]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
sql: action.sql,
@@ -622,7 +635,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_QUERY_LIMIT]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
queryLimit: action.queryLimit,
@@ -634,7 +647,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_TEMPLATE_PARAMS]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
templateParams: action.templateParams,
@@ -646,7 +659,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_SELECTED_TEXT]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
selectedText: action.sql,
@@ -658,7 +671,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_SET_AUTORUN]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
autorun: action.autorun,
@@ -670,7 +683,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_PERSIST_HEIGHT]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
northPercent: action.northPercent,
@@ -683,7 +696,7 @@ export default function sqlLabReducer(state = {}, action) {
[actions.QUERY_EDITOR_TOGGLE_LEFT_BAR]() {
return {
...state,
unsavedQueryEditor: alterUnsavedQueryEditorState(
...alterUnsavedQueryEditorState(
state,
{
hideLeftBar: action.hideLeftBar,