Skip to content

chore: embed audit log in deployment settings page #14023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 26, 2024
Merged

chore: embed audit log in deployment settings page #14023

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c49c58
Move audit page to /deployment/audit with multi-org
code-asher Jul 25, 2024
933b85a
Redirect organization auditing page
code-asher Jul 25, 2024
dc29183
Use wrapping for audit log when in deployment settings
code-asher Jul 25, 2024
2ed12e1
Show audit log details in a tooltip
code-asher Jul 25, 2024
b8fa2ae
if a can could should, should a can could?
code-asher Jul 26, 2024
cb7a084
Merge remote-tracking branch 'github/main' into asher/move-audit
code-asher Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Redirect organization auditing page
  • Loading branch information
@code-asher
code-asher committed Jul 26, 2024
commit 933b85afbb4a1cae146c792e0760ce2e99a1c412
8 changes: 5 additions & 3 deletions site/src/modules/navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}` : "");
}
Comment on lines +5 to +7
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:chefskiss:


export const AUDIT_LINK = "/audit";

export const USERS_LINK = `/users?filter=${encodeURIComponent(
"status:active",
)}`;
export const USERS_LINK = withFilter("/users", "status:active");
10 changes: 8 additions & 2 deletions site/src/pages/ManagementSettingsPage/Sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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>
Expand Down