Skip to content

fix(sqllab): preserve query history after tab migration #41403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sadpandajoe wants to merge 2 commits into
base: master
Choose a base branch
from
+20 −13
Open

fix(sqllab): preserve query history after tab migration #41403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a51f627
fix(sqllab): preserve query history after tab migration
sadpandajoe Jun 25, 2026
a2241b1
test(sqllab): cover preview query migration
sadpandajoe Jun 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions superset-frontend/src/SqlLab/actions/sqlLab.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1843,14 +1843,26 @@ describe('async actions', () => {
{
...query,
id: 'previewOne',
sqlEditorId: oldQueryEditor.id,
inLocalStorage: true,
sqlEditorId: null,
isDataPreview: true,
},
{
...query,
id: 'previewTwo',
sqlEditorId: null,
isDataPreview: true,
},
{
...query,
id: 'runningQuery',
sqlEditorId: oldQueryEditor.id,
inLocalStorage: true,
state: 'running',
},
{
...query,
id: 'unrelatedQuery',
sqlEditorId: 'other-editor',
state: 'running',
},
];
const store = mockStore({
Expand Down Expand Up @@ -1885,12 +1897,7 @@ describe('async actions', () => {
},
{
type: actions.MIGRATE_QUERY,
queryId: 'previewOne',
queryEditorId: '1',
},
{
type: actions.MIGRATE_QUERY,
queryId: 'previewTwo',
queryId: 'runningQuery',
queryEditorId: '1',
},
];
Expand All @@ -1900,7 +1907,7 @@ describe('async actions', () => {
expect(store.getActions()).toEqual(expectedActions);
expect(
fetchMock.callHistory.calls(updateTabStateEndpoint),
).toHaveLength(3);
).toHaveLength(2);

// query editor has 2 tables loaded in the schema viewer
expect(
Expand Down
6 changes: 3 additions & 3 deletions superset-frontend/src/SqlLab/actions/sqlLab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,8 @@ export function syncQueryEditor(
(table: Table) =>
table.inLocalStorage && table.queryEditorId === queryEditor.id,
);
const localStorageQueries = Object.values(queries).filter(
query => query.inLocalStorage && query.sqlEditorId === queryEditor.id,
const queriesToMigrate = Object.values(queries).filter(
query => query.sqlEditorId === queryEditor.id && !query.isDataPreview,
);
Comment thread
sadpandajoe marked this conversation as resolved.
return SupersetClient.post({
endpoint: '/tabstateview/',
Expand All @@ -712,7 +712,7 @@ export function syncQueryEditor(
...localStorageTables.map((table: Table) =>
migrateTable(table, newQueryEditor.tabViewId!, dispatch),
),
...localStorageQueries.map((query: Query) =>
...queriesToMigrate.map((query: Query) =>
migrateQuery(query.id, newQueryEditor.tabViewId!, dispatch),
),
]);
Expand Down
Loading