Skip to content

fix: refactor useSavedQueries #3023

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
merged 1 commit into from
Oct 28, 2025
Merged

fix: refactor useSavedQueries #3023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions src/containers/Tenant/Query/QueryEditor/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@ import type Monaco from 'monaco-editor';
import {codeAssistApi} from '../../../../store/reducers/codeAssist/codeAssist';
import {selectQueriesHistory} from '../../../../store/reducers/query/query';
import type {TelemetryOpenTabs} from '../../../../types/api/codeAssist';
import type {SavedQuery} from '../../../../types/store/query';
import {
AUTOCOMPLETE_ON_ENTER,
ENABLE_AUTOCOMPLETE,
SAVED_QUERIES_KEY,
} from '../../../../utils/constants';
import {AUTOCOMPLETE_ON_ENTER, ENABLE_AUTOCOMPLETE} from '../../../../utils/constants';
import {useSetting, useTypedSelector} from '../../../../utils/hooks';
import {YQL_LANGUAGE_ID} from '../../../../utils/monaco/constats';
import {useSavedQueries} from '../utils/useSavedQueries';

export type EditorOptions = Monaco.editor.IEditorOptions & Monaco.editor.IGlobalEditorOptions;

Expand Down Expand Up @@ -50,7 +46,7 @@ export function useCodeAssistHelpers() {
const [ignoreSuggestion] = codeAssistApi.useIgnoreSuggestionMutation();
const [sendUserQueriesData] = codeAssistApi.useSendUserQueriesDataMutation();
const historyQueries = useTypedSelector(selectQueriesHistory);
const [savedQueries] = useSetting<SavedQuery[]>(SAVED_QUERIES_KEY, []);
const savedQueries = useSavedQueries();

const getCodeAssistSuggestions = React.useCallback(
async (promptFiles: PromptFile[]) => sendCodeAssistPrompt(promptFiles).unwrap(),
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Tenant/Query/SavedQueries/SavedQueries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {useTypedDispatch, useTypedSelector} from '../../../../utils/hooks';
import {useChangeInputWithConfirmation} from '../../../../utils/hooks/withConfirmation/useChangeInputWithConfirmation';
import {MAX_QUERY_HEIGHT, QUERY_TABLE_SETTINGS} from '../../utils/constants';
import i18n from '../i18n';
import {useSavedQueries} from '../utils/useSavedQueries';
import {useFilteredSavedQueries} from '../utils/useSavedQueries';

import './SavedQueries.scss';

Expand Down Expand Up @@ -68,7 +68,7 @@ interface SavedQueriesProps {
}

export const SavedQueries = ({changeUserInput}: SavedQueriesProps) => {
const savedQueries = useSavedQueries();
const savedQueries = useFilteredSavedQueries();
const dispatch = useTypedDispatch();
const filter = useTypedSelector(selectSavedQueriesFilter);

Expand Down
6 changes: 6 additions & 0 deletions src/containers/Tenant/Query/utils/useSavedQueries.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ import {useSetting, useTypedSelector} from '../../../../utils/hooks';

export function useSavedQueries() {
const [savedQueries] = useSetting<SavedQuery[]>(SAVED_QUERIES_KEY, []);

return savedQueries;
}

export function useFilteredSavedQueries() {
const savedQueries = useSavedQueries();
const filter = useTypedSelector(selectSavedQueriesFilter).trim().toLowerCase();

const filteredSavedQueries = React.useMemo(() => {
Expand Down
Loading