1 parent
adb7578998
commit
9af98c2db2
14 files changed
+72
No files matched your search
@@ -85,6 +85,7 @@ import {
|
|||||||
isSendSelectionToAiShortcut,
|
isSendSelectionToAiShortcut,
|
||||||
isSwitchToNextTabShortcut,
|
isSwitchToNextTabShortcut,
|
||||||
isSwitchToPreviousTabShortcut,
|
isSwitchToPreviousTabShortcut,
|
||||||
|
isToggleResultsPaneShortcut,
|
||||||
isToggleSidebarShortcut,
|
isToggleSidebarShortcut,
|
||||||
isZoomInShortcut,
|
isZoomInShortcut,
|
||||||
isZoomOutShortcut,
|
isZoomOutShortcut,
|
||||||
@@ -2507,6 +2508,11 @@ async function handleKeydown(e: KeyboardEvent) {
|
|||||||
contentAreaRef.value?.refreshData();
|
contentAreaRef.value?.refreshData();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (isToggleResultsPaneShortcut(e, shortcuts) && contentAreaRef.value?.toggleResultsPane()) {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (isNewQueryShortcut(e, shortcuts)) {
|
if (isNewQueryShortcut(e, shortcuts)) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|||||||
@@ -651,6 +651,12 @@ const resultsPaneSize = ref(Number(safeLocalStorageGet("dbx-results-pane-size"))
|
|||||||
const editorPaneSize = computed(() => (resultsPaneOpen.value ? 100 - resultsPaneSize.value : 100));
|
const editorPaneSize = computed(() => (resultsPaneOpen.value ? 100 - resultsPaneSize.value : 100));
|
||||||
const queryRunningElapsed = ref(0);
|
const queryRunningElapsed = ref(0);
|
||||||
|
|
||||||
|
function toggleResultsPane(): boolean {
|
||||||
|
if (props.activeTab.mode !== "query" || !hasQueryOutput.value) return false;
|
||||||
|
resultsPaneOpen.value = !resultsPaneOpen.value;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
function onResultsResized(payload: { panes: { size: number }[] }) {
|
function onResultsResized(payload: { panes: { size: number }[] }) {
|
||||||
const resultsPane = payload.panes[1];
|
const resultsPane = payload.panes[1];
|
||||||
if (resultsPane?.size != null && resultsPane.size >= 20 && resultsPane.size <= 85) {
|
if (resultsPane?.size != null && resultsPane.size >= 20 && resultsPane.size <= 85) {
|
||||||
@@ -1153,6 +1159,7 @@ async function executeRedisCommand(command: string): Promise<boolean> {
|
|||||||
defineExpose({
|
defineExpose({
|
||||||
focusSearch,
|
focusSearch,
|
||||||
refreshData,
|
refreshData,
|
||||||
|
toggleResultsPane,
|
||||||
refreshQueryEditorCompletionCache,
|
refreshQueryEditorCompletionCache,
|
||||||
handleModRTarget,
|
handleModRTarget,
|
||||||
requestQueryEditorExecute,
|
requestQueryEditorExecute,
|
||||||
|
|||||||
@@ -6539,6 +6539,7 @@ export default {
|
|||||||
shortcutZoomOutUi: "Zoom out UI",
|
shortcutZoomOutUi: "Zoom out UI",
|
||||||
shortcutResetUiZoom: "Reset UI zoom",
|
shortcutResetUiZoom: "Reset UI zoom",
|
||||||
shortcutRefreshData: "Refresh data",
|
shortcutRefreshData: "Refresh data",
|
||||||
|
shortcutToggleResultsPane: "Toggle results pane",
|
||||||
shortcutToggleTranspose: "Toggle transpose view",
|
shortcutToggleTranspose: "Toggle transpose view",
|
||||||
shortcutCancelSearch: "Cancel search",
|
shortcutCancelSearch: "Cancel search",
|
||||||
shortcutToggleSidebar: "Toggle sidebar",
|
shortcutToggleSidebar: "Toggle sidebar",
|
||||||
|
|||||||
@@ -6211,6 +6211,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "Reducir interfaz",
|
shortcutZoomOutUi: "Reducir interfaz",
|
||||||
shortcutResetUiZoom: "Restablecer zoom de interfaz",
|
shortcutResetUiZoom: "Restablecer zoom de interfaz",
|
||||||
shortcutRefreshData: "Actualizar datos",
|
shortcutRefreshData: "Actualizar datos",
|
||||||
|
shortcutToggleResultsPane: "Alternar panel de resultados",
|
||||||
shortcutToggleTranspose: "Alternar vista transpuesta",
|
shortcutToggleTranspose: "Alternar vista transpuesta",
|
||||||
shortcutCancelSearch: "Cancelar búsqueda",
|
shortcutCancelSearch: "Cancelar búsqueda",
|
||||||
shortcutCopySidebarSelection: "Copiar selección de la barra lateral",
|
shortcutCopySidebarSelection: "Copiar selección de la barra lateral",
|
||||||
|
|||||||
@@ -6210,6 +6210,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "Rimpicciolisci UI",
|
shortcutZoomOutUi: "Rimpicciolisci UI",
|
||||||
shortcutResetUiZoom: "Reimposta zoom UI",
|
shortcutResetUiZoom: "Reimposta zoom UI",
|
||||||
shortcutRefreshData: "Aggiorna dati",
|
shortcutRefreshData: "Aggiorna dati",
|
||||||
|
shortcutToggleResultsPane: "Attiva/disattiva pannello risultati",
|
||||||
shortcutToggleTranspose: "Attiva/disattiva vista trasposta",
|
shortcutToggleTranspose: "Attiva/disattiva vista trasposta",
|
||||||
shortcutCancelSearch: "Annulla ricerca",
|
shortcutCancelSearch: "Annulla ricerca",
|
||||||
shortcutToggleSidebar: "Attiva/disattiva barra laterale",
|
shortcutToggleSidebar: "Attiva/disattiva barra laterale",
|
||||||
|
|||||||
@@ -6224,6 +6224,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "UIを縮小",
|
shortcutZoomOutUi: "UIを縮小",
|
||||||
shortcutResetUiZoom: "UIズームをリセット",
|
shortcutResetUiZoom: "UIズームをリセット",
|
||||||
shortcutRefreshData: "データを更新",
|
shortcutRefreshData: "データを更新",
|
||||||
|
shortcutToggleResultsPane: "結果ペインを切替",
|
||||||
shortcutToggleTranspose: "転置ビューを切替",
|
shortcutToggleTranspose: "転置ビューを切替",
|
||||||
shortcutCancelSearch: "検索をキャンセル",
|
shortcutCancelSearch: "検索をキャンセル",
|
||||||
shortcutToggleSidebar: "サイドバーを切替",
|
shortcutToggleSidebar: "サイドバーを切替",
|
||||||
|
|||||||
@@ -5921,6 +5921,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "UI 축소",
|
shortcutZoomOutUi: "UI 축소",
|
||||||
shortcutResetUiZoom: "UI 확대/축소 재설정",
|
shortcutResetUiZoom: "UI 확대/축소 재설정",
|
||||||
shortcutRefreshData: "데이터 새로고침",
|
shortcutRefreshData: "데이터 새로고침",
|
||||||
|
shortcutToggleResultsPane: "결과 창 전환",
|
||||||
shortcutToggleTranspose: "전치 보기 전환",
|
shortcutToggleTranspose: "전치 보기 전환",
|
||||||
shortcutCancelSearch: "검색 취소",
|
shortcutCancelSearch: "검색 취소",
|
||||||
shortcutToggleSidebar: "사이드바 전환",
|
shortcutToggleSidebar: "사이드바 전환",
|
||||||
|
|||||||
@@ -6213,6 +6213,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "Diminuir zoom da UI",
|
shortcutZoomOutUi: "Diminuir zoom da UI",
|
||||||
shortcutResetUiZoom: "Redefinir zoom da UI",
|
shortcutResetUiZoom: "Redefinir zoom da UI",
|
||||||
shortcutRefreshData: "Atualizar dados",
|
shortcutRefreshData: "Atualizar dados",
|
||||||
|
shortcutToggleResultsPane: "Alternar painel de resultados",
|
||||||
shortcutToggleTranspose: "Alternar visualização transposta",
|
shortcutToggleTranspose: "Alternar visualização transposta",
|
||||||
shortcutCancelSearch: "Cancelar pesquisa",
|
shortcutCancelSearch: "Cancelar pesquisa",
|
||||||
shortcutCopySidebarSelection: "Copiar seleção da barra lateral",
|
shortcutCopySidebarSelection: "Copiar seleção da barra lateral",
|
||||||
|
|||||||
@@ -6526,6 +6526,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "缩小全局界面",
|
shortcutZoomOutUi: "缩小全局界面",
|
||||||
shortcutResetUiZoom: "重置全局界面缩放",
|
shortcutResetUiZoom: "重置全局界面缩放",
|
||||||
shortcutRefreshData: "刷新数据",
|
shortcutRefreshData: "刷新数据",
|
||||||
|
shortcutToggleResultsPane: "切换结果面板",
|
||||||
shortcutToggleTranspose: "切换转置视图",
|
shortcutToggleTranspose: "切换转置视图",
|
||||||
shortcutCancelSearch: "取消搜索",
|
shortcutCancelSearch: "取消搜索",
|
||||||
shortcutCopySidebarSelection: "复制侧边栏选中项",
|
shortcutCopySidebarSelection: "复制侧边栏选中项",
|
||||||
|
|||||||
@@ -5518,6 +5518,7 @@ export default withEnglishFallback({
|
|||||||
shortcutZoomOutUi: "縮小全域介面",
|
shortcutZoomOutUi: "縮小全域介面",
|
||||||
shortcutResetUiZoom: "重設全域介面縮放",
|
shortcutResetUiZoom: "重設全域介面縮放",
|
||||||
shortcutRefreshData: "重新整理資料",
|
shortcutRefreshData: "重新整理資料",
|
||||||
|
shortcutToggleResultsPane: "切換結果面板",
|
||||||
shortcutToggleTranspose: "切換轉置檢視",
|
shortcutToggleTranspose: "切換轉置檢視",
|
||||||
shortcutCancelSearch: "取消搜尋",
|
shortcutCancelSearch: "取消搜尋",
|
||||||
shortcutCopySidebarSelection: "複製側邊欄選取項",
|
shortcutCopySidebarSelection: "複製側邊欄選取項",
|
||||||
|
|||||||
@@ -154,6 +154,10 @@ export function isRefreshDataShortcut(event: ShortcutLikeEvent, shortcuts?: Part
|
|||||||
return matchesShortcut(event, actionShortcut("refreshData", shortcuts));
|
return matchesShortcut(event, actionShortcut("refreshData", shortcuts));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isToggleResultsPaneShortcut(event: ShortcutLikeEvent, shortcuts?: Partial<ShortcutSettings>): boolean {
|
||||||
|
return matchesShortcut(event, actionShortcut("toggleResultsPane", shortcuts));
|
||||||
|
}
|
||||||
|
|
||||||
export function isModRShortcut(event: ShortcutLikeEvent): boolean {
|
export function isModRShortcut(event: ShortcutLikeEvent): boolean {
|
||||||
return matchesShortcut(event, "Mod+R");
|
return matchesShortcut(event, "Mod+R");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ export type ShortcutActionId =
|
|||||||
| "find"
|
| "find"
|
||||||
| "replace"
|
| "replace"
|
||||||
| "refreshData"
|
| "refreshData"
|
||||||
|
| "toggleResultsPane"
|
||||||
| "toggleTranspose"
|
| "toggleTranspose"
|
||||||
| "cancelSearch"
|
| "cancelSearch"
|
||||||
| "toggleSidebar"
|
| "toggleSidebar"
|
||||||
@@ -435,6 +436,12 @@ export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
|
|||||||
scope: "global",
|
scope: "global",
|
||||||
defaultShortcut: "F5",
|
defaultShortcut: "F5",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: "toggleResultsPane",
|
||||||
|
labelKey: "settings.shortcutToggleResultsPane",
|
||||||
|
scope: "global",
|
||||||
|
defaultShortcut: "",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
id: "toggleTranspose",
|
id: "toggleTranspose",
|
||||||
labelKey: "settings.shortcutToggleTranspose",
|
labelKey: "settings.shortcutToggleTranspose",
|
||||||
|
|||||||
+18
@@ -25,6 +25,7 @@ import {
|
|||||||
isSwitchToPreviousTabShortcut,
|
isSwitchToPreviousTabShortcut,
|
||||||
isCopyCurrentRowShortcut,
|
isCopyCurrentRowShortcut,
|
||||||
isDeleteCurrentRowShortcut,
|
isDeleteCurrentRowShortcut,
|
||||||
|
isToggleResultsPaneShortcut,
|
||||||
isToggleTransposeShortcut,
|
isToggleTransposeShortcut,
|
||||||
isZoomInShortcut,
|
isZoomInShortcut,
|
||||||
isZoomOutShortcut,
|
isZoomOutShortcut,
|
||||||
@@ -315,6 +316,23 @@ test("matches F5 for refreshing data", () => {
|
|||||||
assert.equal(isRefreshDataShortcut({ key: "F5" }), true);
|
assert.equal(isRefreshDataShortcut({ key: "F5" }), true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("keeps the results pane shortcut unbound until the user configures it", () => {
|
||||||
|
const configured = { toggleResultsPane: "Mod+G" } as any;
|
||||||
|
|
||||||
|
assert.equal(DEFAULT_SHORTCUT_SETTINGS.toggleResultsPane, "");
|
||||||
|
assert.equal(normalizeShortcutSettings({}).toggleResultsPane, "");
|
||||||
|
assert.equal(isToggleResultsPaneShortcut({ key: "g", ctrlKey: true }), false);
|
||||||
|
assert.equal(isToggleResultsPaneShortcut({ key: "g", ctrlKey: true }, configured), true);
|
||||||
|
assert.equal(isToggleResultsPaneShortcut({ key: "g", ctrlKey: true, isComposing: true }, configured), false);
|
||||||
|
assert.equal(isToggleResultsPaneShortcut({ key: "g", ctrlKey: true }, { toggleResultsPane: "" } as any), false);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("reports conflicts for a configured global results pane shortcut", () => {
|
||||||
|
const shortcuts = { ...DEFAULT_SHORTCUT_SETTINGS, toggleResultsPane: "Mod+F" };
|
||||||
|
|
||||||
|
assert.equal(findShortcutConflict("toggleResultsPane", "Mod+F", shortcuts), "focusSearch");
|
||||||
|
});
|
||||||
|
|
||||||
test("matches configurable shortcut for toggling transpose view", () => {
|
test("matches configurable shortcut for toggling transpose view", () => {
|
||||||
assert.equal(isToggleTransposeShortcut({ key: "Tab" }), true);
|
assert.equal(isToggleTransposeShortcut({ key: "Tab" }), true);
|
||||||
assert.equal(isToggleTransposeShortcut({ key: "Tab" }, { toggleTranspose: "Alt+T" } as any), false);
|
assert.equal(isToggleTransposeShortcut({ key: "Tab" }, { toggleTranspose: "Alt+T" } as any), false);
|
||||||
|
|||||||
+22
@@ -106,6 +106,28 @@ test("the close-tab shortcut clears query results before closing the tab", () =>
|
|||||||
assert.ok(closeShortcut.indexOf("await queryStore.clearQueryResults(queryStore.activeTabId)") < closeShortcut.indexOf("queryStore.closeTab(queryStore.activeTabId)"));
|
assert.ok(closeShortcut.indexOf("await queryStore.clearQueryResults(queryStore.activeTabId)") < closeShortcut.indexOf("queryStore.closeTab(queryStore.activeTabId)"));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("the configurable results pane shortcut only toggles existing output", () => {
|
||||||
|
const contentArea = source(contentAreaPath);
|
||||||
|
const app = source(appPath);
|
||||||
|
const toggleStart = contentArea.indexOf("function toggleResultsPane()");
|
||||||
|
const toggleEnd = contentArea.indexOf("function onResultsResized", toggleStart);
|
||||||
|
const toggle = contentArea.slice(toggleStart, toggleEnd);
|
||||||
|
const shortcutStart = app.indexOf("if (isToggleResultsPaneShortcut(e, shortcuts)");
|
||||||
|
const shortcutEnd = app.indexOf("if (isNewQueryShortcut", shortcutStart);
|
||||||
|
const shortcut = app.slice(shortcutStart, shortcutEnd);
|
||||||
|
|
||||||
|
assert.ok(toggleStart >= 0);
|
||||||
|
assert.match(toggle, /if \(props\.activeTab\.mode !== "query" \|\| !hasQueryOutput\.value\) return false/);
|
||||||
|
assert.match(toggle, /resultsPaneOpen\.value = !resultsPaneOpen\.value/);
|
||||||
|
assert.match(toggle, /return true/);
|
||||||
|
assert.doesNotMatch(toggle, /closeQueryResult|clearQueryResults|closeResultSession/);
|
||||||
|
assert.match(contentArea, /defineExpose\(\{[\s\S]*toggleResultsPane/);
|
||||||
|
assert.ok(shortcutStart >= 0);
|
||||||
|
assert.match(shortcut, /contentAreaRef\.value\?\.toggleResultsPane\(\)/);
|
||||||
|
assert.match(shortcut, /e\.preventDefault\(\)/);
|
||||||
|
assert.match(shortcut, /e\.stopPropagation\(\)/);
|
||||||
|
});
|
||||||
|
|
||||||
test("ContentArea keeps MySQL standard explain results available in the shared toolbar", () => {
|
test("ContentArea keeps MySQL standard explain results available in the shared toolbar", () => {
|
||||||
const contentArea = source(contentAreaPath);
|
const contentArea = source(contentAreaPath);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user