added support for group, template, user links

Kira-Pilot · Kira-Pilot · commit ddc0dc04b90e · 2022-11-28T19:21:32.000Z
diff --git a/coderd/audit.go b/coderd/audit.go
@@ -212,14 +212,12 @@ type AdditionalFields struct {
 
 func (api *API) auditLogResourceLink(ctx context.Context, alog database.GetAuditLogsOffsetRow) string {
 	switch alog.ResourceType {
-	case database.ResourceTypeOrganization:
-		return ""
 	case database.ResourceTypeTemplate:
-		return ""
-	case database.ResourceTypeTemplateVersion:
-		return ""
+		return fmt.Sprintf("/templates/%s",
+			alog.ResourceTarget)
 	case database.ResourceTypeUser:
-		return ""
+		return fmt.Sprintf("/users?filter=%s",
+			alog.ResourceTarget)
 	case database.ResourceTypeWorkspace:
 		return fmt.Sprintf("/@%s/%s",
 			alog.UserUsername.String, alog.ResourceTarget)
@@ -232,12 +230,9 @@ func (api *API) auditLogResourceLink(ctx context.Context, alog database.GetAudit
 		}
 		return fmt.Sprintf("/@%s/%s/builds/%s",
 			alog.UserUsername.String, additionalFields.WorkspaceName, additionalFields.BuildNumber)
-	case database.ResourceTypeGitSshKey:
-		return ""
-	case database.ResourceTypeApiKey:
-		return ""
 	case database.ResourceTypeGroup:
-		return ""
+		return fmt.Sprintf("/groups/%s",
+			alog.ResourceID)
 	default:
 		return ""
 	}
diff --git a/site/src/components/AuditLogRow/AuditLogRow.tsx b/site/src/components/AuditLogRow/AuditLogRow.tsx
@@ -19,15 +19,17 @@ import { Link as RouterLink } from "react-router-dom"
 import i18next from "i18next"
 import Link from "@material-ui/core/Link"
 
-const determineResourceLink = (auditLog: AuditLog): string => {
+const determineResourceLink = (auditLog: AuditLog): JSX.Element | undefined => {
   const { t } = i18next
-  let linkTarget = auditLog.resource_target.trim()
+  const linkTarget = auditLog.resource_target.trim()
 
   if (auditLog.resource_type === "workspace_build") {
-    linkTarget = t("auditLog:table.logRow.buildTarget")
+    return <>{t("auditLog:table.logRow.buildTarget")}</>
+  } else if (auditLog.resource_type === "git_ssh_key") {
+    return
+  } else {
+    return <strong>{linkTarget}</strong>
   }
-
-  return linkTarget
 }
 
 export const readableActionMessage = (auditLog: AuditLog): string => {
@@ -125,16 +127,20 @@ export const AuditLogRow: React.FC<AuditLogRowProps> = ({
                 >
                   <span>
                     {readableActionMessage(auditLog)}{" "}
-                    {auditLog.resource_link && (
+                    {auditLog.resource_link ? (
                       <Link component={RouterLink} to={auditLog.resource_link}>
                         {determineResourceLink(auditLog)}
                       </Link>
+                    ) : (
+                      <strong>{determineResourceLink(auditLog)}</strong>
                     )}
                     {auditLog.resource_type === "workspace_build" &&
                       auditLog.additional_fields.workspaceName && (
                         <>
                           {t("auditLog:table.logRow.buildFriendlyString")}
-                          {auditLog.additional_fields.workspaceName}
+                          <strong>
+                            {auditLog.additional_fields.workspaceName}
+                          </strong>
                         </>
                       )}
                   </span>
