Skip to content

Commit f784bf7

Browse files
committed
fix: add usage
1 parent ae97fda commit f784bf7

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
selectUserInput,
1212
} from '../../../../store/reducers/query/query';
1313
import type {QueryAction} from '../../../../types/store/query';
14-
import {LAST_USED_QUERY_ACTION_KEY} from '../../../../utils/constants';
14+
import {ENABLE_CODE_ASSISTANT, LAST_USED_QUERY_ACTION_KEY} from '../../../../utils/constants';
1515
import {
1616
useEventHandler,
1717
useSetting,
@@ -44,6 +44,7 @@ export function YqlEditor({
4444
handleGetExplainQueryClick,
4545
}: YqlEditorProps) {
4646
const input = useTypedSelector(selectUserInput);
47+
const isCodeAssistEnabled = useSetting(ENABLE_CODE_ASSISTANT);
4748
const dispatch = useTypedDispatch();
4849
const historyQueries = useTypedSelector(selectQueriesHistory);
4950
const savedQueries = useSavedQueries();
@@ -99,7 +100,7 @@ export function YqlEditor({
99100
}
100101
});
101102

102-
if (window.api.codeAssist) {
103+
if (window.api.codeAssist && isCodeAssistEnabled) {
103104
registerMonacoGhost(editor);
104105
codeAssist.prepareUserQueriesCache([
105106
...historyQueries.map((query, index) => ({

src/containers/UserSettings/settings.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
AUTOCOMPLETE_ON_ENTER,
77
BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
88
ENABLE_AUTOCOMPLETE,
9+
ENABLE_CODE_ASSISTANT,
910
ENABLE_NETWORK_TABLE_KEY,
1011
INVERTED_DISKS_KEY,
1112
LANGUAGE_KEY,
@@ -121,7 +122,7 @@ export const enableAutocompleteSetting: SettingProps = {
121122
};
122123

123124
export const enableCodeAssistantSetting: SettingProps = {
124-
settingKey: ENABLE_AUTOCOMPLETE,
125+
settingKey: ENABLE_CODE_ASSISTANT,
125126
title: i18n('settings.editor.codeAssistant.title'),
126127
description: i18n('settings.editor.codeAssistant.description'),
127128
};
@@ -214,7 +215,7 @@ export function getUserSettings({
214215
const editor = inlineCompletionsConfigured
215216
? editorPage
216217
: createNextState(editorPage, (draft) => {
217-
draft.sections[0].settings.push(enableAutocompleteSetting);
218+
draft.sections[0].settings.push(enableCodeAssistantSetting);
218219
});
219220

220221
const settings: YDBEmbeddedUISettings = [generalPage, editor, experiments, aboutPage];

src/services/settings.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
BINARY_DATA_IN_PLAIN_TEXT_DISPLAY,
77
CASE_SENSITIVE_JSON_SEARCH,
88
ENABLE_AUTOCOMPLETE,
9+
ENABLE_CODE_ASSISTANT,
910
ENABLE_NETWORK_TABLE_KEY,
1011
INVERTED_DISKS_KEY,
1112
IS_HOTKEYS_HELP_HIDDEN_KEY,
@@ -42,6 +43,7 @@ export const DEFAULT_USER_SETTINGS = {
4243
[USE_SHOW_PLAN_SVG_KEY]: false,
4344
[USE_CLUSTER_BALANCER_AS_BACKEND_KEY]: true,
4445
[ENABLE_AUTOCOMPLETE]: true,
46+
[ENABLE_CODE_ASSISTANT]: false,
4547
[AUTOCOMPLETE_ON_ENTER]: true,
4648
[IS_HOTKEYS_HELP_HIDDEN_KEY]: false,
4749
[AUTO_REFRESH_INTERVAL]: 0,

src/utils/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ export const USE_CLUSTER_BALANCER_AS_BACKEND_KEY = 'useClusterBalancerAsBacked';
117117

118118
export const ENABLE_AUTOCOMPLETE = 'enableAutocomplete';
119119

120+
export const ENABLE_CODE_ASSISTANT = 'enableCodeAssistant';
121+
120122
export const AUTOCOMPLETE_ON_ENTER = 'autocompleteOnEnter';
121123

122124
export const IS_HOTKEYS_HELP_HIDDEN_KEY = 'isHotKeysHelpHidden';

0 commit comments

Comments
 (0)