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

Display the 'No menu available for this object' message if the selected tree node does not have any options. #5775

Browse Source
This commit is contained in:
Anil Sahoo 2023-03-02 11:02:15 +05:30 committed by GitHub
parent ff3555cf1d
commit 5abb748c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/browser/static/js/MainMenuFactory.js
View File

@ -113,4 +113,16 @@ export default class MainMenuFactory {
Menu.sortMenus(menuList);
return menuList;
}
}
static checkNoMenuOptionForNode(d){
let selectedNodeFromNodes=pgAdmin.Browser.Nodes[d._type];
let selectedNode=pgAdmin.Browser.tree.selected();
let flag=!_.isUndefined(selectedNodeFromNodes.showMenu);
if(flag){
var showMenu = selectedNodeFromNodes.showMenu(d, selectedNode);
return {flag:showMenu?false:flag,showMenu};
} else{
return {flag,showMenu:undefined};
}
}
}

152
web/pgadmin/browser/static/js/browser.js
View File

@ -378,77 +378,91 @@ define('pgadmin.browser', [
masterpass_callback_queue: [],
getMenuList: function(name, item, d, skipDisabled=false) {
let obj = this;
let category = {
'common': []
};
const nodeTypeMenus = obj.all_menus_cache[name][d._type];
for(let key of Object.keys(nodeTypeMenus)) {
let menuItem = nodeTypeMenus[key];
let menuCategory = menuItem.category ?? 'common';
category[menuCategory] = category[menuCategory] ?? [];
category[menuCategory].push(menuItem);
}
let menuItemList = [];
for(let c in category) {
if((c in obj.menu_categories || category[c].length > 1) && c != 'common' ) {
let allMenuItemsDisabled = true;
category[c].forEach((mi)=> {
mi.checkAndSetDisabled(d, item);
if(allMenuItemsDisabled) {
allMenuItemsDisabled = mi.isDisabled;
}
});
const categoryMenuOptions = obj.menu_categories[c];
let label = categoryMenuOptions?.label ?? c;
let priority = categoryMenuOptions?.priority ?? 10;
if(categoryMenuOptions?.above) {
menuItemList.push(MainMenuFactory.getSeparator(label, priority));
}
if(!allMenuItemsDisabled && skipDisabled) {
let _menuItem = MainMenuFactory.createMenuItem({
name: c,
label: label,
module: c,
category: c,
menu_items: category[c],
priority: priority
});
menuItemList.push(_menuItem);
} else if(!skipDisabled){
let _menuItem = MainMenuFactory.createMenuItem({
name: c,
label: label,
module:c,
category: c,
menu_items: category[c],
priority: priority
});
menuItemList.push(_menuItem);
}
if(categoryMenuOptions?.below) {
menuItemList.push(MainMenuFactory.getSeparator(label, priority));
}
} else {
category[c].forEach((c)=> {
c.checkAndSetDisabled(d, item);
});
category[c].forEach((m)=> {
if(!skipDisabled) {
menuItemList.push(m);
} else if(skipDisabled && !m.isDisabled){
menuItemList.push(m);
}
});
//This 'checkNoMenuOptionForNode' function will check if showMenu flag is present or not for selected node
let {flag,showMenu}=MainMenuFactory.checkNoMenuOptionForNode(d);
if(flag){
if(showMenu===false){
return [MainMenuFactory.createMenuItem({
enable : false,
label: gettext('No menu available for this object.'),
name:'',
priority: 1,
category: 'create',
})];
}
}
}else{
let category = {
'common': []
};
const nodeTypeMenus = obj.all_menus_cache[name][d._type];
for(let key of Object.keys(nodeTypeMenus)) {
let menuItem = nodeTypeMenus[key];
let menuCategory = menuItem.category ?? 'common';
category[menuCategory] = category[menuCategory] ?? [];
category[menuCategory].push(menuItem);
}
let menuItemList = [];
return menuItemList;
for(let c in category) {
if((c in obj.menu_categories || category[c].length > 1) && c != 'common' ) {
let allMenuItemsDisabled = true;
category[c].forEach((mi)=> {
mi.checkAndSetDisabled(d, item);
if(allMenuItemsDisabled) {
allMenuItemsDisabled = mi.isDisabled;
}
});
const categoryMenuOptions = obj.menu_categories[c];
let label = categoryMenuOptions?.label ?? c;
let priority = categoryMenuOptions?.priority ?? 10;
if(categoryMenuOptions?.above) {
menuItemList.push(MainMenuFactory.getSeparator(label, priority));
}
if(!allMenuItemsDisabled && skipDisabled) {
let _menuItem = MainMenuFactory.createMenuItem({
name: c,
label: label,
module: c,
category: c,
menu_items: category[c],
priority: priority
});
menuItemList.push(_menuItem);
} else if(!skipDisabled){
let _menuItem = MainMenuFactory.createMenuItem({
name: c,
label: label,
module:c,
category: c,
menu_items: category[c],
priority: priority
});
menuItemList.push(_menuItem);
}
if(categoryMenuOptions?.below) {
menuItemList.push(MainMenuFactory.getSeparator(label, priority));
}
} else {
category[c].forEach((c)=> {
c.checkAndSetDisabled(d, item);
});
category[c].forEach((m)=> {
if(!skipDisabled) {
menuItemList.push(m);
} else if(skipDisabled && !m.isDisabled){
menuItemList.push(m);
}
});
}
}
return menuItemList;
}
},
// Enable/disable menu options
enable_disable_menus: function(item) {

2
web/pgadmin/static/js/tree/tree_init.tsx
View File

@ -108,7 +108,7 @@ function BrowserTree(props) {
return <PgMenuDivider key={i}/>;
}
if(menuItem.isDisabled) {
return <React.Fragment key={i}></React.Fragment>;
return <React.Fragment key={i}><div style={{padding: '0 0.7rem',opacity: '0.5'}}>{menuItem.label}</div></React.Fragment>;
}
const hasCheck = typeof menuItem.checked == 'boolean';