Skip to content

Commit 8858edb

Browse files
committed
fix: clearer code
1 parent 61d3af0 commit 8858edb

File tree

5 files changed

+17
-50
lines changed

5 files changed

+17
-50
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@hookform/resolvers": "^3.10.0",
2929
"@reduxjs/toolkit": "^2.5.0",
3030
"@tanstack/react-table": "^8.20.6",
31-
"@ydb-platform/monaco-ghost": "^0.1.12",
31+
"@ydb-platform/monaco-ghost": "^0.1.13",
3232
"axios": "^1.7.9",
3333
"axios-retry": "^4.5.0",
3434
"colord": "^2.9.3",

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import React from 'react';
2-
31
import NiceModal from '@ebay/nice-modal-react';
42
import {useMonacoGhost} from '@ydb-platform/monaco-ghost';
53
import throttle from 'lodash/throttle';
@@ -73,24 +71,17 @@ export function YqlEditor({
7371
window.ydbEditor = undefined;
7472
};
7573

76-
const {
77-
getCodeAssistSuggestions,
78-
onCompletionAccept,
79-
onCompletionDecline,
80-
onCompletionIgnore,
81-
prepareUserQueriesCache,
82-
} = useCodeAssist();
83-
74+
const codeAssist = useCodeAssist();
8475
const {registerMonacoGhost} = useMonacoGhost({
8576
api: {
86-
getCodeAssistSuggestions,
77+
getCodeAssistSuggestions: codeAssist.getCodeAssistSuggestions,
8778
},
8879
config: {
8980
language: YQL_LANGUAGE_ID,
9081
},
91-
onCompletionAccept,
92-
onCompletionDecline,
93-
onCompletionIgnore,
82+
onCompletionAccept: codeAssist.onCompletionAccept,
83+
onCompletionDecline: codeAssist.onCompletionDecline,
84+
onCompletionIgnore: codeAssist.onCompletionIgnore,
9485
});
9586

9687
const editorDidMount = (editor: Monaco.editor.IStandaloneCodeEditor, monaco: typeof Monaco) => {
@@ -108,7 +99,7 @@ export function YqlEditor({
10899

109100
if (window.api.codeAssist) {
110101
registerMonacoGhost(editor);
111-
prepareUserQueriesCache([
102+
codeAssist.prepareUserQueriesCache([
112103
...historyQueries.map((query, index) => ({
113104
name: `query${index}.yql`,
114105
text: query.queryText,

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

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,46 +44,22 @@ export function useCodeAssist() {
4444
const [sendUserQueriesData] = codeAssistApi.useSendUserQueriesDataMutation();
4545

4646
const getCodeAssistSuggestions = React.useCallback(
47-
async (promptFiles: PromptFile[]) => {
48-
try {
49-
return sendCodeAssistPrompt(promptFiles).unwrap();
50-
} catch {
51-
return {items: []};
52-
}
53-
},
47+
async (promptFiles: PromptFile[]) => sendCodeAssistPrompt(promptFiles).unwrap(),
5448
[sendCodeAssistPrompt],
5549
);
5650

5751
const onCompletionAccept = React.useCallback(
58-
async (event: AcceptEvent) => {
59-
try {
60-
return acceptSuggestion(event).unwrap();
61-
} catch {
62-
return {items: []};
63-
}
64-
},
52+
async (event: AcceptEvent) => acceptSuggestion(event).unwrap(),
6553
[acceptSuggestion],
6654
);
6755

6856
const onCompletionDecline = React.useCallback(
69-
async (event: DeclineEvent) => {
70-
try {
71-
return discardSuggestion(event).unwrap();
72-
} catch {
73-
return {items: []};
74-
}
75-
},
57+
async (event: DeclineEvent) => discardSuggestion(event).unwrap(),
7658
[discardSuggestion],
7759
);
7860

7961
const onCompletionIgnore = React.useCallback(
80-
async (event: IgnoreEvent) => {
81-
try {
82-
return ignoreSuggestion(event).unwrap();
83-
} catch {
84-
return {items: []};
85-
}
86-
},
62+
async (event: IgnoreEvent) => ignoreSuggestion(event).unwrap(),
8763
[ignoreSuggestion],
8864
);
8965

src/store/reducers/codeAssist/codeAssist.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ export const codeAssistApi = api.injectEndpoints({
2121
} else {
2222
throw new Error('Method is not implemented.');
2323
}
24-
} catch (error) {
25-
return {error};
24+
} catch {
25+
return {data: {items: []}};
2626
}
2727
},
2828
}),

0 commit comments

Comments
 (0)