Redirect organization auditing page

code-asher · code-asher · commit 933b85afbb4a · 2024-07-25T16:27:43.000-08:00
diff --git a/site/src/modules/navigation.ts b/site/src/modules/navigation.ts
@@ -2,8 +2,10 @@
  * @fileoverview TODO: centralize navigation code here! URL constants, URL formatting, all of it
  */
 
+export function withFilter(path: string, filter: string) {
+  return path + (filter ? `?filter=${encodeURIComponent(filter)}` : "");
+}
+
 export const AUDIT_LINK = "/audit";
 
-export const USERS_LINK = `/users?filter=${encodeURIComponent(
-  "status:active",
-)}`;
+export const USERS_LINK = withFilter("/users", "status:active");
diff --git a/site/src/pages/ManagementSettingsPage/Sidebar.tsx b/site/src/pages/ManagementSettingsPage/Sidebar.tsx
@@ -9,7 +9,7 @@ import { Sidebar as BaseSidebar } from "components/Sidebar/Sidebar";
 import { Stack } from "components/Stack/Stack";
 import { UserAvatar } from "components/UserAvatar/UserAvatar";
 import { type ClassName, useClassName } from "hooks/useClassName";
-import { AUDIT_LINK, USERS_LINK } from "modules/navigation";
+import { AUDIT_LINK, USERS_LINK, withFilter } from "modules/navigation";
 import { useOrganizationSettings } from "./ManagementSettingsLayout";
 
 export const Sidebar: FC = () => {
@@ -129,8 +129,14 @@ export const OrganizationSettingsNavigation: FC<
           <SidebarNavSubItem href={urlForSubpage(organization.name, "groups")}>
             Groups
           </SidebarNavSubItem>
+          {/* For now redirect to the site-wide audit page with the organization
+              pre-filled into the filter.  Based on user feedback we might want
+              to serve a copy of the audit page or even delete this link. */}
           <SidebarNavSubItem
-            href={urlForSubpage(organization.name, "auditing")}
+            href={`/deployment${withFilter(
+              AUDIT_LINK,
+              `organization:${organization.name}`,
+            )}`}
           >
             Auditing
           </SidebarNavSubItem>
