Fix audit log row to match the new API types

BrunoQuaresma · BrunoQuaresma · commit a0ce84edc1f8 · 2022-08-31T23:24:35.000Z
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -667,27 +667,3 @@ export type WorkspaceAgentStatus = "connected" | "connecting" | "disconnected"
 
 // From codersdk/workspacebuilds.go
 export type WorkspaceTransition = "delete" | "start" | "stop"
-
-// TODO: Remove this when the generated types work for AuditLogs
-export interface AuditLog {
-  readonly id: string
-  readonly request_id: string
-  readonly time: string
-  readonly organization_id: string
-  // Named type "net/netip.Addr" unknown, using "any"
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  readonly ip: any
-  readonly user_agent: string
-  readonly resource_type: "organization" | "template" | "template_version" | "user" | "workspace"
-  readonly resource_id: string
-  readonly resource_target: string
-  readonly action: "write" | "create" | "delete"
-  readonly diff: Record<string, { old: number | string | boolean; new: number | string | boolean }>
-  readonly status_code: number
-  // This is likely an enum in an external package ("encoding/json.RawMessage")
-  readonly additional_fields: Record<string, string>
-  readonly description: string
-  readonly user?: User
-  // This is likely an enum in an external package ("encoding/json.RawMessage")
-  readonly resource: Organization | Template | TemplateVersion | User | Workspace
-}
diff --git a/site/src/components/AuditLogRow/AuditLogRow.tsx b/site/src/components/AuditLogRow/AuditLogRow.tsx
@@ -1,16 +1,14 @@
 import Collapse from "@material-ui/core/Collapse"
-import Link from "@material-ui/core/Link"
 import { makeStyles } from "@material-ui/core/styles"
 import TableCell from "@material-ui/core/TableCell"
 import TableRow from "@material-ui/core/TableRow"
-import { AuditLog, Template, Workspace } from "api/typesGenerated"
+import { AuditLog } from "api/typesGenerated"
 import { CloseDropdown, OpenDropdown } from "components/DropdownArrows/DropdownArrows"
 import { Pill } from "components/Pill/Pill"
 import { Stack } from "components/Stack/Stack"
 import { UserAvatar } from "components/UserAvatar/UserAvatar"
 import { t } from "i18next"
 import { ComponentProps, useState } from "react"
-import { Link as RouterLink } from "react-router-dom"
 import { createDayString } from "util/createDayString"
 import { AuditLogDiff } from "./AuditLogDiff"
 
@@ -26,48 +24,6 @@ const pillTypeByHttpStatus = (httpStatus: number): ComponentProps<typeof Pill>["
   return "success"
 }
 
-const getResourceLabel = (resource: AuditLog["resource"]): string => {
-  if ("name" in resource) {
-    return resource.name
-  }
-
-  return resource.username
-}
-
-const getResourceHref = (
-  resource: AuditLog["resource"],
-  resourceType: AuditLog["resource_type"],
-): string | undefined => {
-  switch (resourceType) {
-    case "user":
-      return `/users`
-    case "template":
-      return `/templates/${(resource as Template).name}`
-    case "workspace":
-      return `/workspaces/@${(resource as Workspace).owner_name}/${(resource as Workspace).name}`
-    case "organization":
-      return
-  }
-}
-
-const ResourceLink: React.FC<{
-  resource: AuditLog["resource"]
-  resourceType: AuditLog["resource_type"]
-}> = ({ resource, resourceType }) => {
-  const href = getResourceHref(resource, resourceType)
-  const label = <strong>{getResourceLabel(resource)}</strong>
-
-  if (!href) {
-    return label
-  }
-
-  return (
-    <Link component={RouterLink} to={href}>
-      {label}
-    </Link>
-  )
-}
-
 const actionLabelByAction: Record<AuditLog["action"], string> = {
   create: t("actions.create", { ns: "auditLog" }),
   write: t("actions.write", { ns: "auditLog" }),
@@ -140,10 +96,7 @@ export const AuditLogRow: React.FC<AuditLogRowProps> = ({
               <div>
                 <span className={styles.auditLogResume}>
                   <strong>{auditLog.user?.username}</strong> {readableActionMessage(auditLog)}{" "}
-                  <ResourceLink
-                    resource={auditLog.resource}
-                    resourceType={auditLog.resource_type}
-                  />
+                  <strong>{auditLog.resource_target}</strong>
                 </span>
                 <span className={styles.auditLogTime}>{createDayString(auditLog.time)}</span>
               </div>
