github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(ui): fix users teams missing from menu for teamlead EE-3761 (#7381) 

* fix users & teams missing from menu for teamlead
pull/7406/head^2
Richard Wei 2022-08-04 09:23:38 +12:00 committed by GitHub
parent a46002502f
commit 31d3fd730c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/react/sidebar/SettingsSidebar.tsx
View File

@ -14,15 +14,16 @@ import { SidebarSection } from './SidebarSection';
interface Props { interface Props {
isAdmin: boolean; isAdmin: boolean;
isTeamLeader?: boolean;
} }
export function SettingsSidebar({ isAdmin }: Props) { export function SettingsSidebar({ isAdmin, isTeamLeader }: Props) {
const teamSyncQuery = usePublicSettings<boolean>({ const teamSyncQuery = usePublicSettings<boolean>({
select: (settings) => settings.TeamSync, select: (settings) => settings.TeamSync,
}); });
const showUsersSection = const showUsersSection =
!window.ddExtension && (isAdmin || teamSyncQuery.data); !window.ddExtension && (isAdmin || (isTeamLeader && !teamSyncQuery.data));
return ( return (
<SidebarSection title="Settings"> <SidebarSection title="Settings">

6
app/react/sidebar/Sidebar.tsx
View File

@ -16,7 +16,7 @@ import { SidebarProvider } from './useSidebarState';
export function Sidebar() { export function Sidebar() {
const { isAdmin, user } = useUser(); const { isAdmin, user } = useUser();
const isTeamLeader = useIsTeamLeader(user); const isTeamLeader = useIsTeamLeader(user) as boolean;
const settingsQuery = usePublicSettings(); const settingsQuery = usePublicSettings();
@ -52,7 +52,9 @@ export function Sidebar() {
{isAdmin && EnableEdgeComputeFeatures && <EdgeComputeSidebar />} {isAdmin && EnableEdgeComputeFeatures && <EdgeComputeSidebar />}
{(isAdmin || isTeamLeader) && <SettingsSidebar isAdmin={isAdmin} />} {(isAdmin || isTeamLeader) && (
<SettingsSidebar isAdmin={isAdmin} isTeamLeader={isTeamLeader} />
)}
</ul> </ul>
</div> </div>