mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
feat: add 'impending deletion' badges to workspaces page (#7530)
* update deleting logic
* added status badge on workspaces page
* licensing and feature flagging
* preset filter for failed workspaces
* remove comment
* PR feedback
* Revert "PR feedback"
This reverts commit 2dfbb50acd.
* PR feedback 2
This commit is contained in:
@@ -72,7 +72,7 @@ export const WorkspaceStats: FC<WorkspaceStatsProps> = ({
|
||||
<StatsItem
|
||||
className={styles.statsItem}
|
||||
label="Status"
|
||||
value={<WorkspaceStatusText build={workspace.latest_build} />}
|
||||
value={<WorkspaceStatusText workspace={workspace} />}
|
||||
/>
|
||||
<StatsItem
|
||||
className={styles.statsItem}
|
||||
|
||||
@@ -27,50 +27,50 @@ const Template: Story<WorkspaceStatusBadgeProps> = (args) => (
|
||||
|
||||
export const Running = Template.bind({})
|
||||
Running.args = {
|
||||
build: MockWorkspace.latest_build,
|
||||
workspace: MockWorkspace,
|
||||
}
|
||||
|
||||
export const Starting = Template.bind({})
|
||||
Starting.args = {
|
||||
build: MockStartingWorkspace.latest_build,
|
||||
workspace: MockStartingWorkspace,
|
||||
}
|
||||
|
||||
export const Stopped = Template.bind({})
|
||||
Stopped.args = {
|
||||
build: MockStoppedWorkspace.latest_build,
|
||||
workspace: MockStoppedWorkspace,
|
||||
}
|
||||
|
||||
export const Stopping = Template.bind({})
|
||||
Stopping.args = {
|
||||
build: MockStoppingWorkspace.latest_build,
|
||||
workspace: MockStoppingWorkspace,
|
||||
}
|
||||
|
||||
export const Deleting = Template.bind({})
|
||||
Deleting.args = {
|
||||
build: MockDeletingWorkspace.latest_build,
|
||||
workspace: MockDeletingWorkspace,
|
||||
}
|
||||
|
||||
export const Deleted = Template.bind({})
|
||||
Deleted.args = {
|
||||
build: MockDeletedWorkspace.latest_build,
|
||||
workspace: MockDeletedWorkspace,
|
||||
}
|
||||
|
||||
export const Canceling = Template.bind({})
|
||||
Canceling.args = {
|
||||
build: MockCancelingWorkspace.latest_build,
|
||||
workspace: MockCancelingWorkspace,
|
||||
}
|
||||
|
||||
export const Canceled = Template.bind({})
|
||||
Canceled.args = {
|
||||
build: MockCanceledWorkspace.latest_build,
|
||||
workspace: MockCanceledWorkspace,
|
||||
}
|
||||
|
||||
export const Failed = Template.bind({})
|
||||
Failed.args = {
|
||||
build: MockFailedWorkspace.latest_build,
|
||||
workspace: MockFailedWorkspace,
|
||||
}
|
||||
|
||||
export const Pending = Template.bind({})
|
||||
Pending.args = {
|
||||
build: MockPendingWorkspace.latest_build,
|
||||
workspace: MockPendingWorkspace,
|
||||
}
|
||||
|
||||
@@ -3,12 +3,14 @@ import ErrorIcon from "@mui/icons-material/ErrorOutline"
|
||||
import StopIcon from "@mui/icons-material/StopOutlined"
|
||||
import PlayIcon from "@mui/icons-material/PlayArrowOutlined"
|
||||
import QueuedIcon from "@mui/icons-material/HourglassEmpty"
|
||||
import { WorkspaceBuild } from "api/typesGenerated"
|
||||
import { Workspace, WorkspaceBuild } from "api/typesGenerated"
|
||||
import { Pill } from "components/Pill/Pill"
|
||||
import i18next from "i18next"
|
||||
import { FC, PropsWithChildren } from "react"
|
||||
import { makeStyles } from "@mui/styles"
|
||||
import { combineClasses } from "utils/combineClasses"
|
||||
import { displayImpendingDeletion } from "utils/workspace"
|
||||
import { useDashboard } from "components/Dashboard/DashboardProvider"
|
||||
|
||||
const LoadingIcon: FC = () => {
|
||||
return <CircularProgress size={10} style={{ color: "#FFF" }} />
|
||||
@@ -87,22 +89,52 @@ export const getStatus = (buildStatus: WorkspaceBuild["status"]) => {
|
||||
}
|
||||
|
||||
export type WorkspaceStatusBadgeProps = {
|
||||
build: WorkspaceBuild
|
||||
workspace: Workspace
|
||||
className?: string
|
||||
}
|
||||
|
||||
const ImpendingDeletionBadge: FC<Partial<WorkspaceStatusBadgeProps>> = ({
|
||||
className,
|
||||
}) => {
|
||||
const { entitlements, experiments } = useDashboard()
|
||||
const allowAdvancedScheduling =
|
||||
entitlements.features["advanced_template_scheduling"].enabled
|
||||
// This check can be removed when https://github.com/coder/coder/milestone/19
|
||||
// is merged up
|
||||
const allowWorkspaceActions = experiments.includes("workspace_actions")
|
||||
|
||||
if (!allowAdvancedScheduling || !allowWorkspaceActions) {
|
||||
return null
|
||||
}
|
||||
return (
|
||||
<Pill
|
||||
className={className}
|
||||
icon={<ErrorIcon />}
|
||||
text="Impending deletion"
|
||||
type="error"
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export const WorkspaceStatusBadge: FC<
|
||||
PropsWithChildren<WorkspaceStatusBadgeProps>
|
||||
> = ({ build, className }) => {
|
||||
const { text, icon, type } = getStatus(build.status)
|
||||
> = ({ workspace, className }) => {
|
||||
// The ImpendingDeletionBadge component itself checks to see if the
|
||||
// Advanced Scheduling feature is turned on and if the
|
||||
// Workspace Actions flag is turned on.
|
||||
if (displayImpendingDeletion(workspace)) {
|
||||
return <ImpendingDeletionBadge className={className} />
|
||||
}
|
||||
|
||||
const { text, icon, type } = getStatus(workspace.latest_build.status)
|
||||
return <Pill className={className} icon={icon} text={text} type={type} />
|
||||
}
|
||||
|
||||
export const WorkspaceStatusText: FC<
|
||||
PropsWithChildren<WorkspaceStatusBadgeProps>
|
||||
> = ({ build, className }) => {
|
||||
> = ({ workspace, className }) => {
|
||||
const styles = useStyles()
|
||||
const { text, type } = getStatus(build.status)
|
||||
const { text, type } = getStatus(workspace.latest_build.status)
|
||||
return (
|
||||
<span
|
||||
role="status"
|
||||
|
||||
@@ -62,7 +62,7 @@ export const WorkspacesRow: FC<{
|
||||
</TableCell>
|
||||
|
||||
<TableCell>
|
||||
<WorkspaceStatusBadge build={workspace.latest_build} />
|
||||
<WorkspaceStatusBadge workspace={workspace} />
|
||||
</TableCell>
|
||||
|
||||
<TableCell>
|
||||
|
||||
@@ -58,6 +58,10 @@ export const WorkspacesPageView: FC<
|
||||
query: workspaceFilterQuery.running,
|
||||
name: Language.runningWorkspacesButton,
|
||||
},
|
||||
{
|
||||
query: workspaceFilterQuery.failed,
|
||||
name: "Failed workspaces",
|
||||
},
|
||||
]
|
||||
|
||||
return (
|
||||
|
||||
@@ -762,7 +762,6 @@ export const MockWorkspace: TypesGen.Workspace = {
|
||||
ttl_ms: 2 * 60 * 60 * 1000,
|
||||
latest_build: MockWorkspaceBuild,
|
||||
last_used_at: "2022-05-16T15:29:10.302441433Z",
|
||||
deleting_at: "0001-01-01T00:00:00Z",
|
||||
}
|
||||
|
||||
export const MockStoppedWorkspace: TypesGen.Workspace = {
|
||||
|
||||
@@ -13,6 +13,7 @@ describe("queryToFilter", () => {
|
||||
["me/dev", { q: "me/dev" }],
|
||||
["me/", { q: "me/" }],
|
||||
[" key:val owner:me ", { q: "key:val owner:me" }],
|
||||
["status:failed", { q: "status:failed" }],
|
||||
])(`query=%p, filter=%p`, (query, filter) => {
|
||||
expect(queryToFilter(query)).toEqual(filter)
|
||||
})
|
||||
|
||||
@@ -13,6 +13,7 @@ export const workspaceFilterQuery = {
|
||||
me: "owner:me",
|
||||
all: "",
|
||||
running: "status:running",
|
||||
failed: "status:failed",
|
||||
}
|
||||
|
||||
export const userFilterQuery = {
|
||||
|
||||
@@ -6,6 +6,7 @@ import {
|
||||
getDisplayVersionStatus,
|
||||
getDisplayWorkspaceBuildInitiatedBy,
|
||||
getDisplayWorkspaceTemplateName,
|
||||
displayImpendingDeletion,
|
||||
isWorkspaceOn,
|
||||
} from "./workspace"
|
||||
|
||||
@@ -139,4 +140,21 @@ describe("util > workspace", () => {
|
||||
expect(displayed).toEqual(workspace.template_display_name)
|
||||
})
|
||||
})
|
||||
|
||||
describe("displayImpendingDeletion", () => {
|
||||
const today = new Date()
|
||||
it.each<[string, boolean]>([
|
||||
[new Date(new Date().setDate(today.getDate() + 15)).toISOString(), false], // today + 15 days out
|
||||
[new Date(new Date().setDate(today.getDate() + 14)).toISOString(), true], // today + 14
|
||||
[new Date(new Date().setDate(today.getDate() + 13)).toISOString(), true], // today + 13
|
||||
[new Date(new Date().setDate(today.getDate() + 1)).toISOString(), true], // today + 1
|
||||
[new Date().toISOString(), true], // today + 0
|
||||
])(`deleting_at=%p, isWorkspaceOn=%p`, (deleting_at, shouldDisplay) => {
|
||||
const workspace: TypesGen.Workspace = {
|
||||
...Mocks.MockWorkspace,
|
||||
deleting_at,
|
||||
}
|
||||
expect(displayImpendingDeletion(workspace)).toBe(shouldDisplay)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -185,3 +185,27 @@ export const getDisplayWorkspaceTemplateName = (
|
||||
? workspace.template_display_name
|
||||
: workspace.template_name
|
||||
}
|
||||
|
||||
// This const dictates how far out we alert the user that a workspace
|
||||
// has an impending deletion (due to template.InactivityTTL being set)
|
||||
const IMPENDING_DELETION_DISPLAY_THRESHOLD = 14 // 14 days
|
||||
|
||||
/**
|
||||
* Returns a boolean indicating if an impending deletion indicator should be
|
||||
* displayed in the UI. Impending deletions are configured by setting the
|
||||
* Template.InactivityTTL
|
||||
* @param {TypesGen.Workspace} workspace
|
||||
* @returns {boolean}
|
||||
*/
|
||||
export const displayImpendingDeletion = (workspace: TypesGen.Workspace) => {
|
||||
const today = new Date()
|
||||
if (!workspace.deleting_at) {
|
||||
return false
|
||||
}
|
||||
return (
|
||||
new Date(workspace.deleting_at) <=
|
||||
new Date(
|
||||
today.setDate(today.getDate() + IMPENDING_DELETION_DISPLAY_THRESHOLD),
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user