Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 60

Fleet UI: Navigate between no teams tabs (#20969)

Browse source
This commit is contained in:
RachelElysia 2024-08-02 09:42:49 -04:00 committed by GitHub
parent 13eb8f384e
commit 695801bff6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/components/top_nav/SiteTopNav/SiteTopNav.tsx
View file

@ -56,6 +56,7 @@ const REGEX_GLOBAL_PAGES = {
const REGEX_EXCLUDE_NO_TEAM_PAGES = {
MANAGE_POLICIES: /\/policies\/manage/i,
MANAGE_QUERIES: /\/queries\/manage/i,
};
const testDetailPage = (path: string, re: RegExp) => {
@ -96,7 +97,6 @@ const SiteTopNav = ({
isGlobalMaintainer,
isAnyTeamMaintainer,
isNoAccess,
isSandboxMode,
} = useContext(AppContext);
const isActiveDetailPage = isDetailPage(currentPath);
@ -187,7 +187,7 @@ const SiteTopNav = ({
<LinkWithContext
className={`${navItemBaseClass}__link`}
withParams={withParams}
currentQueryParams={currentQueryParams}
currentQueryParams={{ team_id: currentQueryParams.team_id }}
to={navItem.location.pathname}
>
<span
@ -220,8 +220,7 @@ const SiteTopNav = ({
isAnyTeamAdmin,
isAnyTeamMaintainer,
isGlobalMaintainer,
isNoAccess,
isSandboxMode
isNoAccess
);
const renderNavItems = () => {
@ -238,7 +237,6 @@ const SiteTopNav = ({
currentUser={currentUser}
isAnyTeamAdmin={isAnyTeamAdmin}
isGlobalAdmin={isGlobalAdmin}
isSandboxMode={isSandboxMode}
/>
</div>
);

5
frontend/components/top_nav/SiteTopNav/navItems.ts
View file

@ -27,8 +27,7 @@ export default (
isAnyTeamAdmin = false,
isAnyTeamMaintainer = false,
isGlobalMaintainer = false,
isNoAccess = false,
isSandboxMode = false
isNoAccess = false
): INavItem[] => {
if (!user) {
return [];
@ -67,7 +66,7 @@ export default (
regex: new RegExp(`^${URL_PREFIX}/controls/`),
pathname: PATHS.CONTROLS,
},
exclude: isSandboxMode || !isMaintainerOrAdmin,
exclude: !isMaintainerOrAdmin,
withParams: { type: "query", names: ["team_id"] },
},
{

4
frontend/components/top_nav/UserMenu/UserMenu.tsx
View file

@ -17,7 +17,6 @@ interface IUserMenuProps {
isAnyTeamAdmin: boolean | undefined;
isGlobalAdmin: boolean | undefined;
currentUser: IUser;
isSandboxMode?: boolean;
}
const UserMenu = ({
@ -26,7 +25,6 @@ const UserMenu = ({
isAnyTeamAdmin,
isGlobalAdmin,
currentUser,
isSandboxMode = false,
}: IUserMenuProps): JSX.Element => {
const accountNavigate = onNavItemClick(PATHS.ACCOUNT);
const dropdownItems = [
@ -44,7 +42,7 @@ const UserMenu = ({
},
];
if (isGlobalAdmin && !isSandboxMode) {
if (isGlobalAdmin) {
const manageUsersNavigate = onNavItemClick(PATHS.ADMIN_USERS);
const manageUserNavItem = {