Skip to content

refactor: Update workspace status to be the latest job status #2087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 7, 2022
Merged

refactor: Update workspace status to be the latest job status #2087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions site/src/components/BuildsTable/BuildsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, getDisplayWorkspaceBuildStatus } from "../../util/workspace"
import { EmptyState } from "../EmptyState/EmptyState"
import { TableLoader } from "../TableLoader/TableLoader"

Expand Down Expand Up @@ -47,7 +47,7 @@ export const BuildsTable: FC<BuildsTableProps> = ({ builds, className }) => {
{isLoading && <TableLoader />}
{builds &&
builds.map((build) => {
const status = getDisplayStatus(theme, build)
const status = getDisplayWorkspaceBuildStatus(theme, build)

const navigateToBuildPage = () => {
navigate(`/builds/${build.id}`)
Expand Down
4 changes: 2 additions & 2 deletions site/src/components/WorkspaceBuildStats/WorkspaceBuildStats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, getDisplayWorkspaceBuildStatus } from "../../util/workspace"

export interface WorkspaceBuildStatsProps {
build: WorkspaceBuild
Expand All @@ -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 = getDisplayWorkspaceBuildStatus(theme, build)

return (
<div className={styles.stats}>
Expand Down
50 changes: 50 additions & 0 deletions site/src/util/workspace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,56 @@ export const getDisplayStatus = (
throw new Error("unknown status " + status)
}

export const DisplayWorkspaceBuildStatusLanguage = {
succeeded: "Succeeded",
pending: "Pending",
running: "Running",
canceling: "Canceling",
canceled: "Canceled",
failed: "Failed",
}

export const getDisplayWorkspaceBuildStatus = (
theme: Theme,
build: TypesGen.WorkspaceBuild,
): {
color: string
status: string
} => {
switch (build.job.status) {
case "succeeded":
return {
color: theme.palette.success.main,
status: `⦿ ${DisplayWorkspaceBuildStatusLanguage.succeeded}`,
}
case "pending":
return {
color: theme.palette.text.secondary,
status: `⦿ ${DisplayWorkspaceBuildStatusLanguage.pending}`,
}
case "running":
return {
color: theme.palette.primary.main,
status: `⦿ ${DisplayWorkspaceBuildStatusLanguage.running}`,
}
case "failed":
return {
color: theme.palette.text.secondary,
status: `⦸ ${DisplayWorkspaceBuildStatusLanguage.failed}`,
}
case "canceling":
return {
color: theme.palette.warning.light,
status: `◍ ${DisplayWorkspaceBuildStatusLanguage.canceling}`,
}
case "canceled":
return {
color: theme.palette.text.secondary,
status: `◍ ${DisplayWorkspaceBuildStatusLanguage.canceled}`,
}
}
}

export const getWorkspaceBuildDurationInSeconds = (build: TypesGen.WorkspaceBuild): number | undefined => {
const isCompleted = build.job.started_at && build.job.completed_at

Expand Down