Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 28b2bbd

Browse files
refactor: Make navbar and users tab href consistent (#5754)
1 parent c6fb469 commit 28b2bbd

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

site/src/components/NavbarView/NavbarView.tsx

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import { navHeight } from "../../theme/constants"
1313
import { combineClasses } from "../../util/combineClasses"
1414
import { UserDropdown } from "../UserDropdown/UsersDropdown"
1515

16+
export const USERS_LINK = `/users?filter=${encodeURIComponent("status:active")}`
17+
1618
export interface NavbarViewProps {
1719
logo_url?: string
1820
user?: TypesGen.User
@@ -59,10 +61,7 @@ const NavItems: React.FC<
5961
</NavLink>
6062
</ListItem>
6163
<ListItem button className={styles.item}>
62-
<NavLink
63-
className={styles.link}
64-
to={`/users?filter=${encodeURIComponent("status:active")}`}
65-
>
64+
<NavLink className={styles.link} to={USERS_LINK}>
6665
{Language.users}
6766
</NavLink>
6867
</ListItem>

site/src/components/UsersLayout/UsersLayout.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Link from "@material-ui/core/Link"
33
import { makeStyles } from "@material-ui/core/styles"
44
import GroupAdd from "@material-ui/icons/GroupAddOutlined"
55
import PersonAdd from "@material-ui/icons/PersonAddOutlined"
6+
import { USERS_LINK } from "components/NavbarView/NavbarView"
67
import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader"
78
import { useFeatureVisibility } from "hooks/useFeatureVisibility"
89
import { usePermissions } from "hooks/usePermissions"
@@ -61,7 +62,7 @@ export const UsersLayout: FC = () => {
6162
<Stack direction="row" spacing={0.25}>
6263
<NavLink
6364
end
64-
to="/users"
65+
to={USERS_LINK}
6566
className={({ isActive }) =>
6667
combineClasses([
6768
styles.tabItem,

0 commit comments

Comments
 (0)