Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions src/store/reducers/query/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import {settingsManager} from '../../../services/settings';
import {TracingLevelNumber} from '../../../types/api/query';
import type {QueryAction, QueryRequestParams, QuerySettings} from '../../../types/store/query';
import type {StreamDataChunk} from '../../../types/store/streaming';
import {QUERIES_HISTORY_KEY} from '../../../utils/constants';
import {loadFromSessionStorage, saveToSessionStorage} from '../../../utils';
import {
QUERIES_HISTORY_KEY,
QUERY_EDITOR_CURRENT_QUERY_KEY,
QUERY_EDITOR_DIRTY_KEY,
} from '../../../utils/constants';
import {isQueryErrorResponse} from '../../../utils/query';
import {isNumeric} from '../../../utils/utils';
import type {RootState} from '../../defaultStore';
Expand All @@ -29,9 +34,14 @@ const queriesHistoryInitial = settingsManager.readUserSettingsValue(

const sliceLimit = queriesHistoryInitial.length - MAXIMUM_QUERIES_IN_HISTORY;

const rawQuery = loadFromSessionStorage(QUERY_EDITOR_CURRENT_QUERY_KEY);
const input = typeof rawQuery === 'string' ? rawQuery : '';

const isDirty = Boolean(loadFromSessionStorage(QUERY_EDITOR_DIRTY_KEY));

const initialState: QueryState = {
input: '',
isDirty: false,
input,
isDirty,
history: {
queries: queriesHistoryInitial
.slice(sliceLimit < 0 ? 0 : sliceLimit)
Expand All @@ -50,9 +60,11 @@ const slice = createSlice({
reducers: {
changeUserInput: (state, action: PayloadAction<{input: string}>) => {
state.input = action.payload.input;
saveToSessionStorage(QUERY_EDITOR_CURRENT_QUERY_KEY, action.payload.input);
},
setIsDirty: (state, action: PayloadAction<boolean>) => {
state.isDirty = action.payload;
saveToSessionStorage(QUERY_EDITOR_DIRTY_KEY, action.payload);
},
setQueryResult: (state, action: PayloadAction<QueryResult | undefined>) => {
state.result = action.payload;
Expand Down
4 changes: 4 additions & 0 deletions src/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ export const INVERTED_DISKS_KEY = SETTING_KEYS.INVERTED_DISKS;
export const SAVED_QUERIES_KEY = SETTING_KEYS.SAVED_QUERIES;
export const ASIDE_HEADER_COMPACT_KEY = SETTING_KEYS.ASIDE_HEADER_COMPACT;
export const QUERIES_HISTORY_KEY = 'queries_history';

export const QUERY_EDITOR_CURRENT_QUERY_KEY = 'query_editor_current_query';
export const QUERY_EDITOR_DIRTY_KEY = 'query_editor_dirty';

export const BINARY_DATA_IN_PLAIN_TEXT_DISPLAY = SETTING_KEYS.BINARY_DATA_IN_PLAIN_TEXT_DISPLAY;
export const AUTO_REFRESH_INTERVAL = SETTING_KEYS.AUTO_REFRESH_INTERVAL;

Expand Down
21 changes: 21 additions & 0 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,24 @@ export function normalizePathSlashes(path: string) {
// (?<!:) - negative lookbehind - ignore parts that start with :
return path.replaceAll(/(?<!:)\/\/+/g, '/');
}

export function saveToSessionStorage(key: string, value: unknown): void {
try {
sessionStorage.setItem(key, JSON.stringify(value));
} catch (error) {
console.warn('Failed to save to session storage:', error);
}
}

export function loadFromSessionStorage(key: string): unknown {
try {
const stored = sessionStorage.getItem(key);
if (!stored) {
return null;
}
return JSON.parse(stored);
} catch (error) {
console.warn('Failed to load from session storage:', error);
return null;
}
}
Loading