From 19eaea2e155e61761b6e33daf9185187eda8c169 Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Wed, 23 Jul 2025 18:27:38 +0300 Subject: [PATCH 1/2] fix: remove keybindings for history traversing --- src/containers/AsideNavigation/hooks/useHotkeysPanel.tsx | 8 -------- src/containers/AsideNavigation/i18n/en.json | 2 -- src/containers/AsideNavigation/i18n/ru.json | 2 -- src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx | 2 -- 4 files changed, 14 deletions(-) diff --git a/src/containers/AsideNavigation/hooks/useHotkeysPanel.tsx b/src/containers/AsideNavigation/hooks/useHotkeysPanel.tsx index b24e9b767a..a0dff29028 100644 --- a/src/containers/AsideNavigation/hooks/useHotkeysPanel.tsx +++ b/src/containers/AsideNavigation/hooks/useHotkeysPanel.tsx @@ -26,14 +26,6 @@ export const DEFAULT_HOTKEY_GROUPS: HotkeysGroup[] = [ title: i18n('hotkeys.execute-selected-query'), value: isMac() ? 'cmd+shift+enter' : 'ctrl+shift+enter', }, - { - title: i18n('hotkeys.previous-query'), - value: isMac() ? 'cmd+arrowUp' : 'ctrl+arrowUp', - }, - { - title: i18n('hotkeys.next-query'), - value: isMac() ? 'cmd+arrowDown' : 'ctrl+arrowDown', - }, { title: i18n('hotkeys.save-query'), value: isMac() ? 'cmd+s' : 'ctrl+s', diff --git a/src/containers/AsideNavigation/i18n/en.json b/src/containers/AsideNavigation/i18n/en.json index 93e70b8506..2431551dfb 100644 --- a/src/containers/AsideNavigation/i18n/en.json +++ b/src/containers/AsideNavigation/i18n/en.json @@ -15,8 +15,6 @@ "hotkeys.title": "Keyboard shortcuts", "hotkeys.execute-query": "Execute query", "hotkeys.execute-selected-query": "Execute selected query", - "hotkeys.previous-query": "Previous query", - "hotkeys.next-query": "Next query", "hotkeys.save-query": "Save query", "hotkeys.save-selected-query": "Save selected query" } diff --git a/src/containers/AsideNavigation/i18n/ru.json b/src/containers/AsideNavigation/i18n/ru.json index 11fc72f84e..580386c4b0 100644 --- a/src/containers/AsideNavigation/i18n/ru.json +++ b/src/containers/AsideNavigation/i18n/ru.json @@ -15,8 +15,6 @@ "hotkeys.title": "Быстрые клавиши", "hotkeys.execute-query": "Выполнить запрос", "hotkeys.execute-selected-query": "Выполнить выбранный запрос", - "hotkeys.previous-query": "Предыдущий запрос", - "hotkeys.next-query": "Следующий запрос", "hotkeys.save-query": "Сохранить запрос", "hotkeys.save-selected-query": "Сохранить выбранный запрос" } diff --git a/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx b/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx index 1c4771f300..8de2ba1b54 100644 --- a/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx +++ b/src/containers/Tenant/Query/QueryEditor/YqlEditor.tsx @@ -157,7 +157,6 @@ export function YqlEditor({ editor.addAction({ id: 'previous-query', label: i18n('action.previous-query'), - keybindings: [keybindings.selectPreviousQuery], contextMenuGroupId: CONTEXT_MENU_GROUP_ID, contextMenuOrder: 2, run: () => { @@ -167,7 +166,6 @@ export function YqlEditor({ editor.addAction({ id: 'next-query', label: i18n('action.next-query'), - keybindings: [keybindings.selectNextQuery], contextMenuGroupId: CONTEXT_MENU_GROUP_ID, contextMenuOrder: 3, run: () => { From cb8836dbe73635744ba4f5a914e9a830dea39daf Mon Sep 17 00:00:00 2001 From: Elena Makarova Date: Wed, 23 Jul 2025 18:28:36 +0300 Subject: [PATCH 2/2] fix --- src/containers/Tenant/Query/QueryEditor/keybindings.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/containers/Tenant/Query/QueryEditor/keybindings.ts b/src/containers/Tenant/Query/QueryEditor/keybindings.ts index c2088d7381..ec088c8fa3 100644 --- a/src/containers/Tenant/Query/QueryEditor/keybindings.ts +++ b/src/containers/Tenant/Query/QueryEditor/keybindings.ts @@ -9,8 +9,6 @@ export function getKeyBindings(monaco: typeof Monaco) { return { sendQuery: ctrlKey | KeyCode.Enter, sendSelectedQuery: ctrlKey | KeyMod.Shift | monaco.KeyCode.Enter, - selectPreviousQuery: ctrlKey | KeyCode.UpArrow, - selectNextQuery: ctrlKey | KeyCode.DownArrow, saveQuery: ctrlKey | KeyCode.KeyS, saveSelectedQuery: ctrlKey | KeyMod.Shift | KeyCode.KeyS, shortcutsHotkey: ctrlKey | KeyCode.KeyK,