From: Stephen Smith Date: Tue, 29 Mar 2022 12:56:33 +0000 (-0400) Subject: 18559: Add adminOnly context menu item flag X-Git-Tag: 2.4.0~1^2~14 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/08f915990ffe4588c076efce4d01e0b3bed2b398 18559: Add adminOnly context menu item flag Arvados-DCO-1.1-Signed-off-by: Stephen Smith --- diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx index 36f0903d..cb53edbc 100644 --- a/src/components/context-menu/context-menu.tsx +++ b/src/components/context-menu/context-menu.tsx @@ -10,6 +10,7 @@ export interface ContextMenuItem { name?: string | React.ComponentType; icon?: IconType; component?: React.ComponentType; + adminOnly?: boolean; } export type ContextMenuItemGroup = ContextMenuItem[]; diff --git a/src/views-components/context-menu/action-sets/user-action-set.ts b/src/views-components/context-menu/action-sets/user-action-set.ts index 987eb1c8..18426a0d 100644 --- a/src/views-components/context-menu/action-sets/user-action-set.ts +++ b/src/views-components/context-menu/action-sets/user-action-set.ts @@ -37,24 +37,28 @@ export const userActionSet: ContextMenuActionSet = [[{ } }, { name: "Account Settings", + adminOnly: true, icon: UserPanelIcon, execute: (dispatch, { uuid }) => { dispatch(navigateToUserProfile(uuid)); } }, { name: "Setup User", + adminOnly: true, icon: AdminMenuIcon, execute: (dispatch, { uuid }) => { dispatch(openSetupDialog(uuid)); } }, { name: "Deactivate User", + adminOnly: true, icon: DeactivateUserIcon, execute: (dispatch, { uuid }) => { dispatch(openDeactivateDialog(uuid)); } }, { name: "Login As User", + adminOnly: true, icon: LoginAsIcon, execute: (dispatch, { uuid }) => { dispatch(loginAs(uuid)); diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx index f2c43ced..09f6e19c 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -14,9 +14,10 @@ import { sortByProperty } from "common/array-utils"; type DataProps = Pick & { resource?: ContextMenuResource }; const mapStateToProps = (state: RootState): DataProps => { const { open, position, resource } = state.contextMenu; + const isAdmin = state.auth.user!.isAdmin; return { anchorEl: resource ? createAnchorAt(position) : undefined, - items: getMenuActionSet(resource), + items: getMenuActionSet(resource, isAdmin), open, resource }; @@ -59,8 +60,15 @@ export const addMenuActionSet = (name: string, itemSet: ContextMenuActionSet) => }; const emptyActionSet: ContextMenuActionSet = []; -const getMenuActionSet = (resource?: ContextMenuResource): ContextMenuActionSet => { - return resource ? menuActionSets.get(resource.menuKind) || emptyActionSet : emptyActionSet; +const getMenuActionSet = (resource?: ContextMenuResource, isAdmin?: boolean): ContextMenuActionSet => { + if (resource) { + return menuActionSets + .get(resource.menuKind)! + .map((group) => (group.filter((item) => (item.adminOnly ? isAdmin : true)))) + || emptyActionSet + } else { + return emptyActionSet; + } }; export enum ContextMenuKind {