Commitfb1b8f0

committed

Redirect organization auditing page

1 parent883353d commitfb1b8f0Copy full SHA for fb1b8f0

File tree

+13

-5

lines changed

site/src
- modules
  - navigation.ts
- pages/ManagementSettingsPage
  - Sidebar.tsx

+13

-5

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,10 @@`
`2`	`2`	`*@fileoverview TODO: centralize navigation code here! URL constants, URL formatting, all of it`
`3`	`3`	`*/`
`4`	`4`
	`5`	`+exportfunctionwithFilter(path:string,filter:string){`
	`6`	+returnpath+(filter ?`?filter=${encodeURIComponent(filter)}` :"");
	`7`	`+}`
	`8`	`+`
`5`	`9`	`exportconstAUDIT_LINK="/audit";`
`6`	`10`
`7`		-exportconstUSERS_LINK=`/users?filter=${encodeURIComponent(
`8`		`-"status:active",`
`9`		-)}`;
	`11`	`+exportconstUSERS_LINK=withFilter("/users","status:active");`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import { Sidebar as BaseSidebar } from "components/Sidebar/Sidebar";`
`9`	`9`	`import{Stack}from"components/Stack/Stack";`
`10`	`10`	`import{UserAvatar}from"components/UserAvatar/UserAvatar";`
`11`	`11`	`import{typeClassName,useClassName}from"hooks/useClassName";`
`12`		`-import{AUDIT_LINK,USERS_LINK}from"modules/navigation";`
	`12`	`+import{AUDIT_LINK,USERS_LINK,withFilter}from"modules/navigation";`
`13`	`13`	`import{useOrganizationSettings}from"./ManagementSettingsLayout";`
`14`	`14`
`15`	`15`	`exportconstSidebar:FC=()=>{`
`@@ -129,8 +129,14 @@ export const OrganizationSettingsNavigation: FC<`
`129`	`129`	`<SidebarNavSubItemhref={urlForSubpage(organization.name,"groups")}>`
`130`	`130`	`Groups`
`131`	`131`	`</SidebarNavSubItem>`
	`132`	`+{/* For now redirect to the site-wide audit page with the organization`
	`133`	`+ pre-filled into the filter. Based on user feedback we might want`
	`134`	`+ to serve a copy of the audit page or even delete this link. */}`
`132`	`135`	`<SidebarNavSubItem`
`133`		`-href={urlForSubpage(organization.name,"auditing")}`
	`136`	+href={`/deployment${withFilter(
	`137`	`+AUDIT_LINK,`
	`138`	+`organization:${organization.name}`,
	`139`	+)}`}
`134`	`140`	`>`
`135`	`141`	`Auditing`
`136`	`142`	`</SidebarNavSubItem>`

Comments

(0)