Commit28b2bbd

authored

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

1 parentc6fb469 commit28b2bbdCopy full SHA for 28b2bbd

File tree

-5

lines changed

site/src/components
- NavbarView
  - NavbarView.tsx
- UsersLayout
  - UsersLayout.tsx

-5

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ import { navHeight } from "../../theme/constants"`
`13`	`13`	`import{combineClasses}from"../../util/combineClasses"`
`14`	`14`	`import{UserDropdown}from"../UserDropdown/UsersDropdown"`
`15`	`15`
	`16`	+exportconstUSERS_LINK=`/users?filter=${encodeURIComponent("status:active")}`
	`17`	`+`
`16`	`18`	`exportinterfaceNavbarViewProps{`
`17`	`19`	`logo_url?:string`
`18`	`20`	`user?:TypesGen.User`
`@@ -59,10 +61,7 @@ const NavItems: React.FC<`
`59`	`61`	`</NavLink>`
`60`	`62`	`</ListItem>`
`61`	`63`	`<ListItembuttonclassName={styles.item}>`
`62`		`-<NavLink`
`63`		`-className={styles.link}`
`64`		-to={`/users?filter=${encodeURIComponent("status:active")}`}
`65`		`->`
	`64`	`+<NavLinkclassName={styles.link}to={USERS_LINK}>`
`66`	`65`	`{Language.users}`
`67`	`66`	`</NavLink>`
`68`	`67`	`</ListItem>`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ import Link from "@material-ui/core/Link"`
`3`	`3`	`import{makeStyles}from"@material-ui/core/styles"`
`4`	`4`	`importGroupAddfrom"@material-ui/icons/GroupAddOutlined"`
`5`	`5`	`importPersonAddfrom"@material-ui/icons/PersonAddOutlined"`
	`6`	`+import{USERS_LINK}from"components/NavbarView/NavbarView"`
`6`	`7`	`import{PageHeader,PageHeaderTitle}from"components/PageHeader/PageHeader"`
`7`	`8`	`import{useFeatureVisibility}from"hooks/useFeatureVisibility"`
`8`	`9`	`import{usePermissions}from"hooks/usePermissions"`
`@@ -61,7 +62,7 @@ export const UsersLayout: FC = () => {`
`61`	`62`	`<Stackdirection="row"spacing={0.25}>`
`62`	`63`	`<NavLink`
`63`	`64`	`end`
`64`		`-to="/users"`
	`65`	`+to={USERS_LINK}`
`65`	`66`	`className={({ isActive})=>`
`66`	`67`	`combineClasses([`
`67`	`68`	`styles.tabItem,`

Comments

(0)