From 28b2bbd09529469245a6308cb0ee88e991ff1a37 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Tue, 17 Jan 2023 19:05:54 -0300 Subject: [PATCH] refactor: Make navbar and users tab href consistent (#5754) --- site/src/components/NavbarView/NavbarView.tsx | 7 +++---- site/src/components/UsersLayout/UsersLayout.tsx | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/src/components/NavbarView/NavbarView.tsx b/site/src/components/NavbarView/NavbarView.tsx index fbbf81e9d1..8e67fac506 100644 --- a/site/src/components/NavbarView/NavbarView.tsx +++ b/site/src/components/NavbarView/NavbarView.tsx @@ -13,6 +13,8 @@ import { navHeight } from "../../theme/constants" import { combineClasses } from "../../util/combineClasses" import { UserDropdown } from "../UserDropdown/UsersDropdown" +export const USERS_LINK = `/users?filter=${encodeURIComponent("status:active")}` + export interface NavbarViewProps { logo_url?: string user?: TypesGen.User @@ -59,10 +61,7 @@ const NavItems: React.FC< - + {Language.users} diff --git a/site/src/components/UsersLayout/UsersLayout.tsx b/site/src/components/UsersLayout/UsersLayout.tsx index 33218b4d6e..e57f24f841 100644 --- a/site/src/components/UsersLayout/UsersLayout.tsx +++ b/site/src/components/UsersLayout/UsersLayout.tsx @@ -3,6 +3,7 @@ import Link from "@material-ui/core/Link" import { makeStyles } from "@material-ui/core/styles" import GroupAdd from "@material-ui/icons/GroupAddOutlined" import PersonAdd from "@material-ui/icons/PersonAddOutlined" +import { USERS_LINK } from "components/NavbarView/NavbarView" import { PageHeader, PageHeaderTitle } from "components/PageHeader/PageHeader" import { useFeatureVisibility } from "hooks/useFeatureVisibility" import { usePermissions } from "hooks/usePermissions" @@ -61,7 +62,7 @@ export const UsersLayout: FC = () => { combineClasses([ styles.tabItem,