fix: copilot review

Author: artemmufazalov

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -77,8 +77,14 @@ export default function QueryEditor(props: QueryEditorProps) {
     const result = useTypedSelector(selectResult);
     const showPreview = useTypedSelector(selectShowPreview);
 
-    const {historyQueries, historyCurrentIndex, saveQueryToHistory, updateQueryInHistory} =
-        useQueriesHistory();
+    const {
+        historyQueries,
+        historyCurrentIndex,
+        saveQueryToHistory,
+        updateQueryInHistory,
+        goToPreviousQuery,
+        goToNextQuery,
+    } = useQueriesHistory();
 
     const isResultLoaded = Boolean(result);
 
@@ -188,6 +194,7 @@ export default function QueryEditor(props: QueryEditorProps) {
                     }
                 })
                 .catch((error) => {
+                    // Do not add query stats for failed query
                     console.error('Failed to update query history:', error);
                 });
 
@@ -288,6 +295,9 @@ export default function QueryEditor(props: QueryEditorProps) {
                                 theme={theme}
                                 handleSendExecuteClick={handleSendExecuteClick}
                                 handleGetExplainQueryClick={handleGetExplainQueryClick}
+                                historyQueries={historyQueries}
+                                goToPreviousQuery={goToPreviousQuery}
+                                goToNextQuery={goToNextQuery}
                             />
                         </div>
                     </div>

src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx

@@ -7,7 +7,7 @@ import type Monaco from 'monaco-editor';
 
 import {MonacoEditor} from '../../../../components/MonacoEditor/MonacoEditor';
 import {selectUserInput, setIsDirty} from '../../../../store/reducers/query/query';
-import {useQueriesHistory} from '../../../../store/reducers/query/useQueriesHistory';
+import type {QueryInHistory} from '../../../../store/reducers/query/types';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
 import type {QueryAction} from '../../../../types/store/query';
 import {
@@ -32,19 +32,24 @@ interface YqlEditorProps {
     theme: string;
     handleGetExplainQueryClick: (text: string) => void;
     handleSendExecuteClick: (text: string, partial?: boolean) => void;
+    historyQueries: QueryInHistory[];
+    goToPreviousQuery: () => void;
+    goToNextQuery: () => void;
 }
 
 export function YqlEditor({
     changeUserInput,
     theme,
     handleSendExecuteClick,
     handleGetExplainQueryClick,
+    historyQueries,
+    goToPreviousQuery,
+    goToNextQuery,
 }: YqlEditorProps) {
     const input = useTypedSelector(selectUserInput);
     const dispatch = useTypedDispatch();
     const [monacoGhostInstance, setMonacoGhostInstance] =
         React.useState<ReturnType<typeof createMonacoGhostInstance>>();
-    const {historyQueries, goToPreviousQuery, goToNextQuery} = useQueriesHistory();
     const [isCodeAssistEnabled] = useSetting(SETTING_KEYS.ENABLE_CODE_ASSISTANT);
 
     const editorOptions = useEditorOptions();
@@ -71,7 +76,7 @@ export function YqlEditor({
         window.ydbEditor = undefined;
     };
 
-    const {monacoGhostConfig, prepareUserQueriesCache} = useCodeAssistHelpers();
+    const {monacoGhostConfig, prepareUserQueriesCache} = useCodeAssistHelpers(historyQueries);
 
     React.useEffect(() => {
         if (monacoGhostInstance && isCodeAssistEnabled) {

src/containers/Tenant/Query/QueryEditor/helpers.ts

@@ -4,7 +4,7 @@ import type {AcceptEvent, DeclineEvent, IgnoreEvent, PromptFile} from '@ydb-plat
 import type Monaco from 'monaco-editor';
 
 import {codeAssistApi} from '../../../../store/reducers/codeAssist/codeAssist';
-import {useQueriesHistory} from '../../../../store/reducers/query/useQueriesHistory';
+import type {QueryInHistory} from '../../../../store/reducers/query/types';
 import {SETTING_KEYS} from '../../../../store/reducers/settings/constants';
 import type {TelemetryOpenTabs} from '../../../../types/api/codeAssist';
 import {useSetting} from '../../../../utils/hooks';
@@ -39,13 +39,12 @@ export function useEditorOptions() {
     return options;
 }
 
-export function useCodeAssistHelpers() {
+export function useCodeAssistHelpers(historyQueries: QueryInHistory[]) {
     const [sendCodeAssistPrompt] = codeAssistApi.useLazyGetCodeAssistSuggestionsQuery();
     const [acceptSuggestion] = codeAssistApi.useAcceptSuggestionMutation();
     const [discardSuggestion] = codeAssistApi.useDiscardSuggestionMutation();
     const [ignoreSuggestion] = codeAssistApi.useIgnoreSuggestionMutation();
     const [sendUserQueriesData] = codeAssistApi.useSendUserQueriesDataMutation();
-    const {historyQueries} = useQueriesHistory();
     const {savedQueries} = useSavedQueries();
 
     const getCodeAssistSuggestions = React.useCallback(

src/store/reducers/query/useQueriesHistory.ts

@@ -83,34 +83,45 @@ export function useQueriesHistory() {
     });
 
     const saveQueryToHistory = useEventHandler((queryText: string, queryId: string) => {
-        const newQueries = [...historyQueries, {queryText, queryId}].slice(
-            historyQueries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0,
-        );
-        saveHistoryQueries(newQueries);
-        setQueries(newQueries);
-        // Update currentIndex to point to the newly added query
-        const newCurrentIndex = newQueries.length - 1;
-        setCurrentIndex(newCurrentIndex);
+        setQueries((currentQueries) => {
+            const newQueries = [...currentQueries, {queryText, queryId}].slice(
+                historyQueries.length >= MAXIMUM_QUERIES_IN_HISTORY ? 1 : 0,
+            );
+            saveHistoryQueries(newQueries);
+
+            // Update currentIndex to point to the newly added query
+            const newCurrentIndex = newQueries.length - 1;
+            setCurrentIndex(newCurrentIndex);
+
+            return newQueries;
+        });
     });
 
     const updateQueryInHistory = useEventHandler((queryId: string, stats: QueryStats) => {
-        if (!stats || !historyQueries.length) {
+        if (!stats) {
             return;
         }
 
-        const index = historyQueries.findIndex((item) => item.queryId === queryId);
+        setQueries((currentQueries) => {
+            if (!currentQueries.length) {
+                return currentQueries;
+            }
 
-        if (index !== -1) {
-            const newQueries = [...historyQueries];
-            const {durationUs, endTime} = stats;
-            newQueries.splice(index, 1, {
-                ...historyQueries[index],
-                durationUs,
-                endTime,
-            });
-            saveHistoryQueries(newQueries);
-            setQueries(newQueries);
-        }
+            const index = currentQueries.findIndex((item) => item.queryId === queryId);
+
+            if (index !== -1) {
+                const newQueries = [...currentQueries];
+                const {durationUs, endTime} = stats;
+                newQueries.splice(index, 1, {
+                    ...currentQueries[index],
+                    durationUs,
+                    endTime,
+                });
+                saveHistoryQueries(newQueries);
+                return newQueries;
+            }
+            return currentQueries;
+        });
     });
 
     return {