IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure nested menu items are shown in quick search result. #5796

Browse Source
This commit is contained in:
Nikhil Mohite 2023-01-31 13:04:49 +05:30 committed by GitHub
parent ec86152396
commit b02f81505b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/pgadmin/browser/static/js/keyboard.js
View File

@ -26,10 +26,10 @@ _.extend(pgBrowser.keyboardNavigation, {
Mousetrap.reset(); Mousetrap.reset();
if (pgBrowser.preferences_cache.length > 0) { if (pgBrowser.preferences_cache.length > 0) {
this.keyboardShortcut = { this.keyboardShortcut = {
'file_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_file').value), ...(pgBrowser.get_preference('browser', 'main_menu_file')?.value) && {'file_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_file')?.value)},
'object_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_object').value), ...(pgBrowser.get_preference('browser', 'main_menu_object')?.value) && {'object_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_object')?.value)},
'tools_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_tools').value), ...(pgBrowser.get_preference('browser', 'main_menu_tools')?.value) && {'tools_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_tools')?.value)},
'help_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_help').value), ...(pgBrowser.get_preference('browser', 'main_menu_help')?.value) && {'help_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'main_menu_help')?.value)},
'left_tree_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'browser_tree').value), 'left_tree_shortcut': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'browser_tree').value),
'tabbed_panel_backward': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'tabbed_panel_backward').value), 'tabbed_panel_backward': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'tabbed_panel_backward').value),
'tabbed_panel_forward': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'tabbed_panel_forward').value), 'tabbed_panel_forward': commonUtils.parseShortcutValue(pgBrowser.get_preference('browser', 'tabbed_panel_forward').value),
@ -49,11 +49,11 @@ _.extend(pgBrowser.keyboardNavigation, {
}; };
this.shortcutMethods = { this.shortcutMethods = {
'bindMainMenu': { ...(pgBrowser.get_preference('browser', 'main_menu_file')?.value) && {'bindMainMenu': {
'shortcuts': [this.keyboardShortcut.file_shortcut, 'shortcuts': [this.keyboardShortcut.file_shortcut,
this.keyboardShortcut.object_shortcut, this.keyboardShortcut.tools_shortcut, this.keyboardShortcut.object_shortcut, this.keyboardShortcut.tools_shortcut,
this.keyboardShortcut.help_shortcut], this.keyboardShortcut.help_shortcut],
}, // Main menu }}, // Main menu
'bindRightPanel': {'shortcuts': [this.keyboardShortcut.tabbed_panel_backward, this.keyboardShortcut.tabbed_panel_forward]}, // Main window panels 'bindRightPanel': {'shortcuts': [this.keyboardShortcut.tabbed_panel_backward, this.keyboardShortcut.tabbed_panel_forward]}, // Main window panels
'bindLeftTree': {'shortcuts': this.keyboardShortcut.left_tree_shortcut}, // Main menu, 'bindLeftTree': {'shortcuts': this.keyboardShortcut.left_tree_shortcut}, // Main menu,
'bindSubMenuQueryTool': {'shortcuts': this.keyboardShortcut.sub_menu_query_tool}, // Sub menu - Open Query Tool, 'bindSubMenuQueryTool': {'shortcuts': this.keyboardShortcut.sub_menu_query_tool}, // Sub menu - Open Query Tool,
@ -108,7 +108,7 @@ _.extend(pgBrowser.keyboardNavigation, {
}, },
_bindWithMousetrap: function(shortcuts, callback, bindElem) { _bindWithMousetrap: function(shortcuts, callback, bindElem) {
const self = this; const self = this;
Mousetrap.unbind(shortcuts); shortcuts ?? Mousetrap.unbind(shortcuts);
if (bindElem) { if (bindElem) {
const elem = document.querySelector(bindElem); const elem = document.querySelector(bindElem);
Mousetrap(elem).bind(shortcuts, function() { Mousetrap(elem).bind(shortcuts, function() {
@ -403,7 +403,7 @@ _.extend(pgBrowser.keyboardNavigation, {
return new dialogTabNavigator.dialogTabNavigator(dialogContainer, backward_shortcut, forward_shortcut); return new dialogTabNavigator.dialogTabNavigator(dialogContainer, backward_shortcut, forward_shortcut);
}, },
bindOpenQuickSearch: function() { bindOpenQuickSearch: function() {
$('#search_icon').trigger('click'); pgWindow.pgAdmin.Browser.all_menus_cache.help.mnu_quick_search_help.callback();
}, },
}); });

2
web/pgadmin/browser/static/js/quick_search/menuitems_help.js
View File

@ -57,7 +57,7 @@ export function menuSearch(param, props) {
if(menu.name == 'object') { if(menu.name == 'object') {
let selectedNode = pgAdmin.Browser.tree.selected(); let selectedNode = pgAdmin.Browser.tree.selected();
if(selectedNode) { if(selectedNode) {
subMenus = pgAdmin.Browser.all_menus_cache[menu.name][selectedNode._metadata.data._type]; subMenus = menu.getMenuItems();
} }
} else { } else {
subMenus = pgAdmin.Browser.all_menus_cache[menu.name]; subMenus = pgAdmin.Browser.all_menus_cache[menu.name];