Skip to content

fix(sqllab): autocomplete and delete tabs #34781

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

Merged
justinpark merged 3 commits into from
Sep 3, 2025
Merged

fix(sqllab): autocomplete and delete tabs #34781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80f4a09
fix(sqllab): autocomplete and delete tabs
justinpark Aug 20, 2025
42339a7
eslint
justinpark Aug 21, 2025
9a900c7
fix spec
justinpark Aug 21, 2025
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
6 changes: 1 addition & 5 deletions superset-frontend/src/SqlLab/components/SqlEditor/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ const SqlEditor: FC<Props> = ({

const SqlFormExtension = extensionsRegistry.get('sqleditor.extension.form');

const isTempId = (value: unknown): boolean => Number.isNaN(Number(value));

const startQuery = useCallback(
(ctasArg = false, ctas_method = CtasEnum.Table) => {
if (!database) {
Expand Down Expand Up @@ -934,9 +932,7 @@ const SqlEditor: FC<Props> = ({
{({ height }) =>
isActive && (
<AceEditorWrapper
autocomplete={
autocompleteEnabled && !isTempId(queryEditor.id)
}
autocomplete={autocompleteEnabled}
onBlur={onSqlChanged}
onChange={onSqlChanged}
queryEditorId={queryEditor.id}
Expand Down
16 changes: 11 additions & 5 deletions superset-frontend/src/SqlLab/reducers/getInitialState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ export default function getInitialState({
if (localStorageData && sqlLabCacheData?.sqlLab) {
const { sqlLab } = sqlLabCacheData;

if (sqlLab.queryEditors.length === 0) {
if (
sqlLab.queryEditors.length === 0 &&
Object.keys(sqlLab.destroyedQueryEditors ?? {}).length === 0
) {
// migration was successful
localStorage.removeItem('redux');
} else {
Expand Down Expand Up @@ -221,18 +224,21 @@ export default function getInitialState({
});
}
if (sqlLab.tabHistory) {
tabHistory.push(...sqlLab.tabHistory);
tabHistory.push(
...sqlLab.tabHistory.filter(
tabId => !sqlLab.destroyedQueryEditors?.[tabId],
),
);
}
lastUpdatedActiveTab = tabHistory.slice(tabHistory.length - 1)[0] || '';

if (sqlLab.destroyedQueryEditors) {
Object.entries(sqlLab.destroyedQueryEditors).forEach(([id, ts]) => {
destroyedQueryEditors[id] = ts;
if (queryEditors[id]) {
destroyedQueryEditors[id] = ts;
delete queryEditors[id];
}
});
}
lastUpdatedActiveTab = tabHistory.slice(tabHistory.length - 1)[0] || '';

This comment was marked as resolved.

Sign in to view

}
}
} catch (error) {
Expand Down
9 changes: 6 additions & 3 deletions superset-frontend/src/SqlLab/reducers/sqlLab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export default function sqlLabReducer(state = {}, action) {
};
let newState = removeFromArr(state, 'queryEditors', queryEditor);
// List of remaining queryEditor ids
const qeIds = newState.queryEditors.map(qe => qe.id);
const qeIds = newState.queryEditors.map(qe => qe.tabViewId ?? qe.id);

const queries = {};
Object.keys(state.queries).forEach(k => {
Expand All @@ -150,7 +150,8 @@ export default function sqlLabReducer(state = {}, action) {

// Remove associated table schemas
const tables = state.tables.filter(
table => table.queryEditorId !== queryEditor.id,
table =>
table.queryEditorId !== (queryEditor.tabViewId ?? queryEditor.id),
);

newState = {
Expand All @@ -167,7 +168,9 @@ export default function sqlLabReducer(state = {}, action) {
},
destroyedQueryEditors: {
...newState.destroyedQueryEditors,
...(!queryEditor.inLocalStorage && { [queryEditor.id]: Date.now() }),
...(!queryEditor.inLocalStorage && {
[queryEditor.tabViewId ?? queryEditor.id]: Date.now(),
}),
},
};
return newState;
Expand Down
16 changes: 14 additions & 2 deletions superset-frontend/src/SqlLab/reducers/sqlLab.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,20 +240,32 @@ describe('sqlLabReducer', () => {
);
});
it('should migrate query editor by new query editor id', () => {
const { length } = newState.queryEditors;
const index = newState.queryEditors.findIndex(({ id }) => id === qe.id);
const newQueryEditor = {
...qe,
id: 'updatedNewId',
tabViewId: 'updatedNewId',
schema: 'updatedSchema',
inLocalStorage: false,
};
const action = {
type: actions.MIGRATE_QUERY_EDITOR,
oldQueryEditor: qe,
newQueryEditor,
};
newState = sqlLabReducer(newState, action);
expect(newState.queryEditors[index].id).toEqual('updatedNewId');
expect(newState.queryEditors[index].id).toEqual(qe.id);
expect(newState.queryEditors[index].tabViewId).toEqual('updatedNewId');
expect(newState.queryEditors[index]).toEqual(newQueryEditor);
const removeAction = {
type: actions.REMOVE_QUERY_EDITOR,
queryEditor: newQueryEditor,
};
newState = sqlLabReducer(newState, removeAction);
expect(newState.queryEditors).toHaveLength(length - 1);
expect(Object.keys(newState.destroyedQueryEditors)).toContain(
newQueryEditor.tabViewId,
);
});
it('should clear the destroyed query editors', () => {
const expectedQEId = '1233289';
Expand Down
Loading