From 59eb2a55660653e0f67c2eaa3bd8ff24f2140adb Mon Sep 17 00:00:00 2001 From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com> Date: Thu, 27 Apr 2023 15:25:00 -0700 Subject: [PATCH] UI: Exclude 'Manage users' menu item in sandbox mode (#11403) ## Addresses #10819 Exclude the "Manage users" menu option in sandbox mode. - [x] Manual QA for all new/changed functionality Co-authored-by: Jacob Shandling --- frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx | 2 ++ frontend/components/top_nav/UserMenu/UserMenu.tsx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx b/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx index 405441d024..34f2769be5 100644 --- a/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx +++ b/frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx @@ -87,6 +87,7 @@ const SiteTopNav = ({ isAnyTeamMaintainer, isNoAccess, isMdmEnabledAndConfigured, // TODO: confirm + isSandboxMode, } = useContext(AppContext); const isActiveDetailPage = isDetailPage(currentPath); @@ -213,6 +214,7 @@ const SiteTopNav = ({ currentUser={currentUser} isAnyTeamAdmin={isAnyTeamAdmin} isGlobalAdmin={isGlobalAdmin} + isSandboxMode={isSandboxMode} /> ); diff --git a/frontend/components/top_nav/UserMenu/UserMenu.tsx b/frontend/components/top_nav/UserMenu/UserMenu.tsx index ffa7be9e15..7e312aa1db 100644 --- a/frontend/components/top_nav/UserMenu/UserMenu.tsx +++ b/frontend/components/top_nav/UserMenu/UserMenu.tsx @@ -17,6 +17,7 @@ interface IUserMenuProps { isAnyTeamAdmin: boolean | undefined; isGlobalAdmin: boolean | undefined; currentUser: IUser; + isSandboxMode?: boolean; } const UserMenu = ({ @@ -25,6 +26,7 @@ const UserMenu = ({ isAnyTeamAdmin, isGlobalAdmin, currentUser, + isSandboxMode = false, }: IUserMenuProps): JSX.Element => { const accountNavigate = onNavItemClick(PATHS.USER_SETTINGS); const dropdownItems = [ @@ -42,7 +44,7 @@ const UserMenu = ({ }, ]; - if (isGlobalAdmin) { + if (isGlobalAdmin && !isSandboxMode) { const manageUsersNavigate = onNavItemClick(PATHS.ADMIN_USERS); const manageUserNavItem = {