changed bbuild string

coder · Kira-Pilot · Feb 8, 2023 · Feb 7, 2023 · Feb 7, 2023 · Feb 7, 2023
commit f9d28b0f8b9c02658f14392d9537ae08a9af55fe
diff --git a/site/src/components/AuditLogRow/AuditLogDescription.test.tsx b/site/src/components/AuditLogRow/AuditLogDescription.test.tsx
@@ -33,9 +33,7 @@ describe("AuditLogDescription", () => {
   it("renders the correct string for a workspace_build stop audit log", async () => {
     render(<AuditLogDescription auditLog={MockAuditLogWithWorkspaceBuild} />)
 
-    expect(
-      getByTextContent("TestUser stopped build for workspace test2"),
-    ).toBeDefined()
+    expect(getByTextContent("TestUser stopped workspace test2")).toBeDefined()
   })
 
   it("renders the correct string for a workspace_build audit log with a duplicate word", async () => {
@@ -48,7 +46,7 @@ describe("AuditLogDescription", () => {
     render(<AuditLogDescription auditLog={AuditLogWithRepeat} />)
 
     expect(
-      getByTextContent("TestUser stopped build for workspace workspace"),
+      getByTextContent("TestUser stopped workspace workspace"),
     ).toBeDefined()
   })
   it("renders the correct string for a workspace created for a different owner", async () => {

diff --git a/site/src/components/AuditLogRow/AuditLogDescription.tsx b/site/src/components/AuditLogRow/AuditLogDescription.tsx
@@ -5,26 +5,56 @@ import Link from "@material-ui/core/Link"
 import { makeStyles } from "@material-ui/core/styles"
 import i18next from "i18next"
 
+const BuildAuditDescription: FC<{ auditLog: AuditLog }> = ({
+  auditLog,
+}): JSX.Element => {
+  const { t } = i18next
+
+  // audit logs with a resource_type of workspace build use workspace name as a target
+  const target = auditLog.additional_fields?.workspace_name?.trim()
+  // workspaces can be started/stopped by a user, or kicked off automatically by Coder
+  const user =
+    auditLog.additional_fields?.build_reason &&
+    auditLog.additional_fields?.build_reason !== "initiator"
+      ? t("auditLog:table.logRow.buildReason")
+      : auditLog.user?.username.trim()
+
+  const actionVerb =
+    auditLog.action === "start"
+      ? t("auditLog:table.logRow.started")
+      : t("auditLog:table.logRow.stopped")
+
+  return (
+    <span>
+      <>
+        {user}{" "}
+        {auditLog.resource_link ? (
+          <Link component={RouterLink} to={auditLog.resource_link}>
+            <strong>{actionVerb}</strong>
+          </Link>
+        ) : (
+          { actionVerb }
+        )}{" "}
+        {t("auditLog:table.logRow.workspace")}
+        <strong>{target}</strong>
+      </>
+    </span>
+  )
+}
+
 export const AuditLogDescription: FC<{ auditLog: AuditLog }> = ({
   auditLog,
 }): JSX.Element => {
   const classes = useStyles()
   const { t } = i18next
 
-  let target = auditLog.resource_target.trim()
-  let user = auditLog.user
+  const target = auditLog.resource_target.trim()
+  const user = auditLog.user
     ? auditLog.user.username.trim()
     : t("auditLog:table.logRow.unknownUser")
 
   if (auditLog.resource_type === "workspace_build") {
-    // audit logs with a resource_type of workspace build use workspace name as a target
-    target = auditLog.additional_fields?.workspace_name?.trim()
-    // workspaces can be started/stopped by a user, or kicked off automatically by Coder
-    user =
-      auditLog.additional_fields?.build_reason &&
-      auditLog.additional_fields?.build_reason !== "initiator"
-        ? t("auditLog:table.logRow.buildReason")
-        : user
+    return <BuildAuditDescription auditLog={auditLog} />
   }
 
   // SSH key entries have no links
@@ -59,7 +89,9 @@ export const AuditLogDescription: FC<{ auditLog: AuditLog }> = ({
       )}
       {/* logs for workspaces created on behalf of other users indicate ownership in the description */}
       {auditLog.additional_fields.workspace_owner &&
-        auditLog.additional_fields.workspace_owner !== "unknown" && (
+        auditLog.additional_fields.workspace_owner !== "unknown" &&
+        auditLog.additional_fields.workspace_owner !==
+          auditLog.user?.username && (
           <span>
             <>
               {t("auditLog:table.logRow.onBehalfOf", {

diff --git a/site/src/i18n/en/auditLog.json b/site/src/i18n/en/auditLog.json
@@ -14,7 +14,10 @@
       "browser": "Browser: ",
       "onBehalfOf": " on behalf of {{owner}}",
       "buildReason": "Coder automatically",
-      "unknownUser": "an unknown user"
+      "unknownUser": "an unknown user",
+      "started": "started",
+      "stopped": "stopped",
+      "workspace": " workspace "
     }
   },
   "paywall": {