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:
@@ -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