synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-18 14:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Make navbar and users tab href consistent (#5754)

Browse Source
This commit is contained in:
Bruno Quaresma
2023-01-17 19:05:54 -03:00
committed by GitHub
parent c6fb469655
commit 28b2bbd095
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
site/src/components/NavbarView/NavbarView.tsx
View File

@ -13,6 +13,8 @@ import { navHeight } from "../../theme/constants"
import { combineClasses } from "../../util/combineClasses" import { combineClasses } from "../../util/combineClasses"
import { UserDropdown } from "../UserDropdown/UsersDropdown" import { UserDropdown } from "../UserDropdown/UsersDropdown"
export const USERS_LINK = `/users?filter=${encodeURIComponent("status:active")}`
export interface NavbarViewProps { export interface NavbarViewProps {
logo_url?: string logo_url?: string
user?: TypesGen.User user?: TypesGen.User
@ -59,10 +61,7 @@ const NavItems: React.FC<
</NavLink> </NavLink>
</ListItem> </ListItem>
<ListItem button className={styles.item}> <ListItem button className={styles.item}>
<NavLink <NavLink className={styles.link} to={USERS_LINK}>
className={styles.link}
to={`/users?filter=${encodeURIComponent("status:active")}`}
>
{Language.users} {Language.users}
</NavLink> </NavLink>
</ListItem> </ListItem>

3
site/src/components/UsersLayout/UsersLayout.tsx
View File

@ -3,6 +3,7 @@ import Link from "@material-ui/core/Link"
import { makeStyles } from "@material-ui/core/styles" import { makeStyles } from "@material-ui/core/styles"
import GroupAdd from "@material-ui/icons/GroupAddOutlined" import GroupAdd from "@material-ui/icons/GroupAddOutlined"
import PersonAdd from "@material-ui/icons/PersonAddOutlined" import PersonAdd from "@material-ui/icons/PersonAddOutlined"
import { USERS_LINK } from "components/NavbarView/NavbarView"
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader" import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader"
import { useFeatureVisibility } from "hooks/useFeatureVisibility" import { useFeatureVisibility } from "hooks/useFeatureVisibility"
import { usePermissions } from "hooks/usePermissions" import { usePermissions } from "hooks/usePermissions"
@ -61,7 +62,7 @@ export const UsersLayout: FC = () => {
<Stack direction="row" spacing={0.25}> <Stack direction="row" spacing={0.25}>
<NavLink <NavLink
end end
to="/users" to={USERS_LINK}
className={({ isActive }) => className={({ isActive }) =>
combineClasses([ combineClasses([
styles.tabItem, styles.tabItem,