From 1c705cf9be8aa63eaa76fa5392b883bbea478ecc Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Mon, 9 Jan 2023 18:41:23 +0530
Subject: [PATCH] Fix issues related to menu rewrite. #5615

---
 .../static/js/quick_search/menuitems_help.js  | 35 +++++++------------
 .../static/js/quick_search/trigger_search.js  | 20 ++---------
 web/pgadmin/static/js/components/Menu.jsx     |  2 +-
 web/pgadmin/static/js/tree/tree_init.tsx      |  3 ++
 4 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/web/pgadmin/browser/static/js/quick_search/menuitems_help.js b/web/pgadmin/browser/static/js/quick_search/menuitems_help.js
index 4d3bb095e..0ce47cc18 100644
--- a/web/pgadmin/browser/static/js/quick_search/menuitems_help.js
+++ b/web/pgadmin/browser/static/js/quick_search/menuitems_help.js
@@ -7,9 +7,7 @@
 //
 //////////////////////////////////////////////////////////////
 import {MenuItem as NewMenuItem} from '../../../../static/js/helpers/Menu';
-import { MainMenus } from '../MainMenuFactory';
 import pgAdmin from 'sources/pgadmin';
-import { getBrowser } from '../../../../static/js/utils';
 
 
 //  Allow us to
@@ -53,28 +51,19 @@ export function menuSearch(param, props) {
     });
   };
 
-  // Starting Point
-  let {name: browser} = getBrowser();
-  const mainMenus = browser == 'Nwjs' ? pgAdmin.Browser.MainMenus : MainMenus;
-  if(browser == 'Nwjs') {
-    mainMenus.forEach((menu) => {
-      let subMenus = menu.menuItems;
-      iterItem(subMenus, getMenuName(menu));
-    });
-  } else {
-    mainMenus.forEach((menu) => {
-      let subMenus = [];
-      if(menu.name == 'object') {
-        let selectedNode = pgAdmin.Browser.tree.selected();
-        if(selectedNode) {
-          subMenus = pgAdmin.Browser.all_menus_cache[menu.name][selectedNode._metadata.data._type];
-        }
-      } else {
-        subMenus = pgAdmin.Browser.all_menus_cache[menu.name];
+  const mainMenus = pgAdmin.Browser.MainMenus;
+  mainMenus.forEach((menu) => {
+    let subMenus = [];
+    if(menu.name == 'object') {
+      let selectedNode = pgAdmin.Browser.tree.selected();
+      if(selectedNode) {
+        subMenus = pgAdmin.Browser.all_menus_cache[menu.name][selectedNode._metadata.data._type];
       }
-      iterItem(Object.values(subMenus), getMenuName(menu));
-    });
-  }
+    } else {
+      subMenus = pgAdmin.Browser.all_menus_cache[menu.name];
+    }
+    iterItem(Object.values(subMenus), getMenuName(menu));
+  });
 
   setState(state => ({
     ...state,
diff --git a/web/pgadmin/browser/static/js/quick_search/trigger_search.js b/web/pgadmin/browser/static/js/quick_search/trigger_search.js
index ac251d119..cb9154990 100644
--- a/web/pgadmin/browser/static/js/quick_search/trigger_search.js
+++ b/web/pgadmin/browser/static/js/quick_search/trigger_search.js
@@ -15,8 +15,6 @@ import {menuSearch} from './menuitems_help';
 import $ from 'jquery';
 import gettext from 'sources/gettext';
 import PropTypes from 'prop-types';
-import pgAdmin from 'sources/pgadmin';
-import { getBrowser } from '../../../../static/js/utils';
 
 function HelpArticleContents({isHelpLoading, isMenuLoading, helpSearchResult}) {
   return (isHelpLoading && !(isMenuLoading??true)) ? (
@@ -50,7 +48,6 @@ const useModalStyles = makeStyles(() => ({
 }));
 
 export function Search({closeModal}) {
-  let {name: browser} = getBrowser();
   const classes = useModalStyles();
   const wrapperRef = useRef(null);
   const firstEleRef = useRef();
@@ -136,23 +133,10 @@ export function Search({closeModal}) {
       let menuItemsHtmlElement = [];
       items.forEach((i) => {
         menuItemsHtmlElement.push(
-          <li key={ 'li-menu-' + i }><a tabIndex='0' id={ 'li-menu-' + i.label } href={'#'} className={ (i.is_disabled ? 'dropdown-item menu-groups-a disabled':'dropdown-item menu-groups-a')} key={ 'menu-' + i.label } onClick={
+          <li key={ 'li-menu-' + i }><a tabIndex='0' id={ 'li-menu-' + i.label } href={'#'} className={ (i.isDisabled ? 'dropdown-item menu-groups-a disabled':'dropdown-item menu-groups-a')} key={ 'menu-' + i.label } onClick={
             () => {
               closeModal();
-              if(browser == 'Nwjs') {
-                i.callback();
-              } else {
-                // Some callbacks registered in 'callbacks' check and call specifiec callback function
-                if (i.module && 'callbacks' in i.module && i.module.callbacks[i.callback]) {
-                  i.module.callbacks[i.callback].apply(i.module, [i.data, pgAdmin.Browser.tree.selected()]);
-                } else if (i.module && i.module[i.callback]) {
-                  i.module[i.callback].apply(i.module, [i.data, pgAdmin.Browser.tree.selected()]);
-                } else if (i.callback) {
-                  i.callback(i);
-                } else {
-                  window.open(i.url);
-                }
-              }
+              i.callback();
             }
           }>
             {i.label}
diff --git a/web/pgadmin/static/js/components/Menu.jsx b/web/pgadmin/static/js/components/Menu.jsx
index cada75d1b..e4c3a0b59 100644
--- a/web/pgadmin/static/js/components/Menu.jsx
+++ b/web/pgadmin/static/js/components/Menu.jsx
@@ -19,7 +19,7 @@ const useStyles = makeStyles((theme)=>({
   menu: {
     '& .szh-menu': {
       padding: '4px 0px',
-      zIndex: 1000,
+      zIndex: 1005,
       backgroundColor: theme.palette.background.default,
       color: theme.palette.text.primary,
       border: `1px solid ${theme.otherVars.borderColor}`
diff --git a/web/pgadmin/static/js/tree/tree_init.tsx b/web/pgadmin/static/js/tree/tree_init.tsx
index 4c505d4fb..cbe6ff313 100644
--- a/web/pgadmin/static/js/tree/tree_init.tsx
+++ b/web/pgadmin/static/js/tree/tree_init.tsx
@@ -107,6 +107,9 @@ function BrowserTree(props) {
     if(menuItem.type == 'separator') {
         return <PgMenuDivider key={i}/>;
     }
+    if(menuItem.isDisabled) {
+      return <></>;
+    }
     const hasCheck = typeof menuItem.checked == 'boolean';
 
     return <PgMenuItem