Update getDisplayStatus to getDisplayBuildStatus

BrunoQuaresma · BrunoQuaresma · commit 874ffad33cdb · 2022-06-06T15:01:12.000Z
diff --git a/site/src/components/BuildsTable/BuildsTable.tsx b/site/src/components/BuildsTable/BuildsTable.tsx
@@ -9,7 +9,7 @@ import useTheme from "@material-ui/styles/useTheme"
 import { FC } from "react"
 import { useNavigate } from "react-router-dom"
 import * as TypesGen from "../../api/typesGenerated"
-import { displayWorkspaceBuildDuration, getDisplayStatus } from "../../util/workspace"
+import { displayWorkspaceBuildDuration, getDisplayBuildStatus } from "../../util/workspace"
 import { EmptyState } from "../EmptyState/EmptyState"
 import { TableLoader } from "../TableLoader/TableLoader"
 
@@ -47,7 +47,7 @@ export const BuildsTable: FC<BuildsTableProps> = ({ builds, className }) => {
         {isLoading && <TableLoader />}
         {builds &&
           builds.map((build) => {
-            const status = getDisplayStatus(theme, build)
+            const status = getDisplayBuildStatus(theme, build)
 
             const navigateToBuildPage = () => {
               navigate(`/builds/${build.id}`)
diff --git a/site/src/components/WorkspaceBuildStats/WorkspaceBuildStats.tsx b/site/src/components/WorkspaceBuildStats/WorkspaceBuildStats.tsx
@@ -5,7 +5,7 @@ import { Link as RouterLink } from "react-router-dom"
 import { WorkspaceBuild } from "../../api/typesGenerated"
 import { CardRadius, MONOSPACE_FONT_FAMILY } from "../../theme/constants"
 import { combineClasses } from "../../util/combineClasses"
-import { displayWorkspaceBuildDuration, getDisplayStatus } from "../../util/workspace"
+import { displayWorkspaceBuildDuration, getDisplayBuildStatus } from "../../util/workspace"
 
 export interface WorkspaceBuildStatsProps {
   build: WorkspaceBuild
@@ -14,7 +14,7 @@ export interface WorkspaceBuildStatsProps {
 export const WorkspaceBuildStats: FC<WorkspaceBuildStatsProps> = ({ build }) => {
   const styles = useStyles()
   const theme = useTheme()
-  const status = getDisplayStatus(theme, build)
+  const status = getDisplayBuildStatus(theme, build)
 
   return (
     <div className={styles.stats}>
diff --git a/site/src/components/WorkspaceStats/WorkspaceStats.tsx b/site/src/components/WorkspaceStats/WorkspaceStats.tsx
@@ -6,7 +6,7 @@ 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 { displayBuildStatus } from "../../util/workspace"
+import { getDisplayBuildStatus } from "../../util/workspace"
 
 const Language = {
   templateLabel: "Template",
@@ -24,7 +24,7 @@ export interface WorkspaceStatsProps {
 export const WorkspaceStats: FC<WorkspaceStatsProps> = ({ workspace }) => {
   const styles = useStyles()
   const theme = useTheme()
-  const status = displayBuildStatus(theme, workspace.latest_build)
+  const status = getDisplayBuildStatus(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 { displayBuildStatus } from "../../util/workspace"
+import { getDisplayBuildStatus } from "../../util/workspace"
 
 dayjs.extend(relativeTime)
 
@@ -67,7 +67,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
           )}
           {workspaces &&
             workspaces.map((workspace) => {
-              const status = displayBuildStatus(theme, workspace.latest_build)
+              const status = getDisplayBuildStatus(theme, workspace.latest_build)
               return (
                 <TableRow key={workspace.id}>
                   <TableCell>
diff --git a/site/src/util/workspace.ts b/site/src/util/workspace.ts
@@ -68,72 +68,45 @@ export const DisplayStatusLanguage = {
 }
 
 // Localize workspace status and provide corresponding color from theme
-export const getDisplayStatus = (
+export const getDisplayBuildStatus = (
   theme: Theme,
   build: TypesGen.WorkspaceBuild,
 ): {
   color: string
   status: string
 } => {
-  const status = getWorkspaceStatus(build)
-  switch (status) {
-    case undefined:
-      return {
-        color: theme.palette.text.secondary,
-        status: DisplayStatusLanguage.loading,
-      }
-    case "started":
-      return {
-        color: theme.palette.success.main,
-        status: `⦿ ${DisplayStatusLanguage.started}`,
-      }
-    case "starting":
-      return {
-        color: theme.palette.primary.main,
-        status: `⦿ ${DisplayStatusLanguage.starting}`,
-      }
-    case "stopping":
-      return {
-        color: theme.palette.primary.main,
-        status: `◍ ${DisplayStatusLanguage.stopping}`,
-      }
-    case "stopped":
-      return {
-        color: theme.palette.text.secondary,
-        status: `◍ ${DisplayStatusLanguage.stopped}`,
-      }
-    case "deleting":
+  switch (build.job.status) {
+    case "canceled":
       return {
         color: theme.palette.text.secondary,
-        status: `⦸ ${DisplayStatusLanguage.deleting}`,
+        status: "ⓧ Canceled",
       }
-    case "deleted":
+    case "canceling":
       return {
         color: theme.palette.text.secondary,
-        status: `⦸ ${DisplayStatusLanguage.deleted}`,
+        status: "◍ Canceling",
       }
-    case "canceling":
+    case "failed":
       return {
-        color: theme.palette.warning.light,
-        status: `◍ ${DisplayStatusLanguage.canceling}`,
+        color: theme.palette.error.main,
+        status: "ⓧ Failed",
       }
-    case "canceled":
+    case "pending":
       return {
         color: theme.palette.text.secondary,
-        status: `◍ ${DisplayStatusLanguage.canceled}`,
+        status: "⦿ Pending",
       }
-    case "error":
+    case "running":
       return {
-        color: theme.palette.error.main,
-        status: `ⓧ ${DisplayStatusLanguage.failed}`,
+        color: theme.palette.primary.main,
+        status: "⦿ Running",
       }
-    case "queued":
+    case "succeeded":
       return {
-        color: theme.palette.text.secondary,
-        status: `◍ ${DisplayStatusLanguage.queued}`,
+        color: theme.palette.success.main,
+        status: "⦿ Succeeded",
       }
   }
-  throw new Error("unknown status " + status)
 }
 
 export const getWorkspaceBuildDurationInSeconds = (build: TypesGen.WorkspaceBuild): number | undefined => {
@@ -156,41 +129,6 @@ 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",
