Skip to content

Commit 44af58a

Browse files
author
Roman M
committed
add saving editor mode state
1 parent 141d470 commit 44af58a

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/views/QueryEditor/components/QueryHeader/QueryHeader.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export const QueryHeader = ({
2121

2222
const onEditorModeChange = (editorMode: EditorMode) => {
2323
setEditorMode(editorMode);
24+
onChange({ ...query, editorMode });
2425
};
2526

2627
useEffect(() => {
@@ -58,7 +59,7 @@ export const QueryHeader = ({
5859
size={'sm'}
5960
icon="arrow-right"
6061
style={{ marginLeft: '10px' }}
61-
onClick={() => setEditorMode(EditorMode.SQL)}
62+
onClick={() => onEditorModeChange(EditorMode.SQL)}
6263
>
6364
Go to Query
6465
</Button>

src/views/QueryEditor/helpers/initializeQueryDefaults.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export const initializeQueryDefaults = (
2222
adHocFilters: query.adHocFilters || [],
2323
query: query.query || defaultQuery,
2424
formattedQuery: query.formattedQuery || query.query,
25-
editorMode: query.database && query.table ? EditorMode.SQL : EditorMode.Builder,
25+
editorMode: query.editorMode ?? (query.database && query.table ? EditorMode.SQL : EditorMode.Builder),
2626
contextWindowSize: query.contextWindowSize || '10',
2727
adHocValuesQuery: query.adHocValuesQuery || '',
2828
};
@@ -133,7 +133,7 @@ export const initializeQueryDefaultsForVariables = (
133133
adHocFilters: query.adHocFilters || [],
134134
query: query.query || defaultQuery,
135135
formattedQuery: query.formattedQuery || query.query,
136-
editorMode: query.database && query.table ? EditorMode.SQL : EditorMode.Builder,
136+
editorMode: query.editorMode ?? (query.database && query.table ? EditorMode.SQL : EditorMode.Builder),
137137
contextWindowSize: query.contextWindowSize || '10',
138138
adHocValuesQuery: query.adHocValuesQuery || '',
139139
};

src/views/QueryEditor/hooks/useQueryState.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const useQueryState = (query, onChange, datasource) => {
4040
interval: '',
4141
query: defaultQuery,
4242
formattedQuery: query.query,
43-
editorMode: EditorMode.Builder,
43+
editorMode: query.editorMode ?? EditorMode.Builder,
4444
database: undefined,
4545
table: undefined,
4646
dateColDataType: undefined,

0 commit comments

Comments
 (0)