diff --git a/packages/web_ui/src/components/InstanceViewPage.jsx b/packages/web_ui/src/components/InstanceViewPage.jsx index 3b3e26c0..e544bb60 100644 --- a/packages/web_ui/src/components/InstanceViewPage.jsx +++ b/packages/web_ui/src/components/InstanceViewPage.jsx @@ -92,7 +92,35 @@ export default function InstanceViewPage(props) { ; } + let instanceButtonMenuItems = []; + if (account.hasPermission("core.instance.export_data")) { + instanceButtonMenuItems.push({ + disabled: exportingData || instance.status !== "stopped", + key: "export", + label: "Export data", + }); + } + if (account.hasPermission("core.instance.kill")) { + instanceButtonMenuItems.push({ + disabled: ["unknown", "unassigned", "stopped"].includes(instance["status"]), + key: "kill", + label: "Kill process", + }); + } + if (account.hasPermission("core.instance.delete")) { + if (instanceButtonMenuItems.length) { + instanceButtonMenuItems.push({ type: "divider" }); + } + instanceButtonMenuItems.push({ + disabled: !["unknown", "unassigned", "stopped"].includes(instance["status"]), + danger: true, + key: "delete", + icon: , + label: "Delete", + }); + } let instanceButtonsMenu = { if (key === "export") { setExportingData(true); @@ -125,25 +153,7 @@ export default function InstanceViewPage(props) { }); } }} - > - {account.hasPermission("core.instance.export_data") && Export data} - {account.hasPermission("core.instance.kill") && Kill process} - {account.hasPermission("core.instance.delete") && <> - - } - >Delete - } - ; + />; let instanceButtons = { account.hasAnyPermission("core.instance.start", "core.instance.stop") diff --git a/packages/web_ui/src/components/SiteLayout.jsx b/packages/web_ui/src/components/SiteLayout.jsx index 5a547205..f6c192fa 100644 --- a/packages/web_ui/src/components/SiteLayout.jsx +++ b/packages/web_ui/src/components/SiteLayout.jsx @@ -26,11 +26,20 @@ export default function SiteLayout(props) { return null; } - let accountMenu = - { history.push(`/users/${account.name}/view`); }}>{account.name} - - { account.logOut(); }}>Log out - ; + let accountMenu = { + if (key === "user") { + history.push(`/users/${account.name}/view`); + } else if (key === "logout") { + account.logout(); + } + }} + items={[ + { label: account.name, key: "user" }, + { type: "divider" }, + { label: "Log out", danger: true, key: "logout" }, + ]} + />; let combinedPages = [...pages]; for (let plugin of plugins.values()) { @@ -49,13 +58,13 @@ export default function SiteLayout(props) { group = []; menuGroups.set(sidebarGroup, group); } - group.push({sidebarName}); + group.push({ label: sidebarName, key: path }); } else { - menuItems.push({sidebarName}); + menuItems.push({ label: sidebarName, key: path }); } } for (let [name, group] of menuGroups) { - menuItems.push({group}); + menuItems.push({ type: "group", label: name, children: group, key: name }); } return @@ -63,9 +72,12 @@ export default function SiteLayout(props) {
Clusterio { webUiPackage.version } - - Dashboard - + history.push(key)} - > - {menuItems} - + items={menuItems} + />