refactor: Update workspace status to be the latest job status

BrunoQuaresma · BrunoQuaresma · commit afb66ebebf43 · 2022-06-06T14:57:47.000Z
diff --git a/site/src/components/WorkspaceStats/WorkspaceStats.tsx b/site/src/components/WorkspaceStats/WorkspaceStats.tsx
@@ -6,11 +6,11 @@ import { Link as RouterLink } from "react-router-dom"
 import { Workspace } from "../../api/typesGenerated"
 import { CardRadius, MONOSPACE_FONT_FAMILY } from "../../theme/constants"
 import { combineClasses } from "../../util/combineClasses"
-import { getDisplayStatus } from "../../util/workspace"
+import { displayBuildStatus } from "../../util/workspace"
 
 const Language = {
   templateLabel: "Template",
-  statusLabel: "Status",
+  statusLabel: "Last job status",
   versionLabel: "Version",
   lastBuiltLabel: "Last Built",
   outdated: "Outdated",
@@ -24,7 +24,7 @@ export interface WorkspaceStatsProps {
 export const WorkspaceStats: FC<WorkspaceStatsProps> = ({ workspace }) => {
   const styles = useStyles()
   const theme = useTheme()
-  const status = getDisplayStatus(theme, workspace.latest_build)
+  const status = displayBuildStatus(theme, workspace.latest_build)
 
   return (
     <div className={styles.stats}>
diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -17,7 +17,7 @@ import { AvatarData } from "../../components/AvatarData/AvatarData"
 import { EmptyState } from "../../components/EmptyState/EmptyState"
 import { Stack } from "../../components/Stack/Stack"
 import { TableLoader } from "../../components/TableLoader/TableLoader"
-import { getDisplayStatus } from "../../util/workspace"
+import { displayBuildStatus } from "../../util/workspace"
 
 dayjs.extend(relativeTime)
 
@@ -45,7 +45,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
             <TableCell>Template</TableCell>
             <TableCell>Version</TableCell>
             <TableCell>Last Built</TableCell>
-            <TableCell>Status</TableCell>
+            <TableCell>Last Job Status</TableCell>
           </TableRow>
         </TableHead>
         <TableBody>
@@ -67,7 +67,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
           )}
           {workspaces &&
             workspaces.map((workspace) => {
-              const status = getDisplayStatus(theme, workspace.latest_build)
+              const status = displayBuildStatus(theme, workspace.latest_build)
               return (
                 <TableRow key={workspace.id}>
                   <TableCell>
diff --git a/site/src/util/workspace.ts b/site/src/util/workspace.ts
@@ -156,6 +156,41 @@ export const displayWorkspaceBuildDuration = (
   return duration ? `${duration} seconds` : inProgressLabel
 }
 
+export const displayBuildStatus = (theme: Theme, build: TypesGen.WorkspaceBuild): { color: string; status: string } => {
+  switch (build.job.status) {
+    case "canceled":
+      return {
+        color: theme.palette.text.secondary,
+        status: "ⓧ Canceled",
+      }
+    case "canceling":
+      return {
+        color: theme.palette.text.secondary,
+        status: "◍ Canceling",
+      }
+    case "failed":
+      return {
+        color: theme.palette.error.main,
+        status: "ⓧ Failed",
+      }
+    case "pending":
+      return {
+        color: theme.palette.text.secondary,
+        status: "⦿ Pending",
+      }
+    case "running":
+      return {
+        color: theme.palette.primary.main,
+        status: "⦿ Running",
+      }
+    case "succeeded":
+      return {
+        color: theme.palette.success.main,
+        status: "⦿ Succeeded",
+      }
+  }
+}
+
 export const DisplayAgentStatusLanguage = {
   connected: "⦿ Connected",
   connecting: "⦿ Connecting",
