added banner filter

Kira-Pilot · Kira-Pilot · commit e7b6f899ab71 · 2023-06-05T21:40:59.000Z
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -186,7 +186,7 @@ func (api *API) workspaces(rw http.ResponseWriter, r *http.Request) {
 	} else {
 		for _, v := range wss {
 			if v.DeletingAt == nil {
-				break
+				continue
 			}
 			// get the beginning of the day on which deletion is scheduled
 			truncatedDeletionAt := v.DeletingAt.Truncate(24 * time.Hour)
diff --git a/site/src/components/WorkspaceDeletion/ImpendingDeletionBanner.tsx b/site/src/components/WorkspaceDeletion/ImpendingDeletionBanner.tsx
@@ -2,7 +2,9 @@ import { Workspace } from "api/typesGenerated"
 import { displayImpendingDeletion } from "./utils"
 import { useDashboard } from "components/Dashboard/DashboardProvider"
 import { Alert } from "components/Alert/Alert"
-import { formatDistanceToNow, differenceInDays } from "date-fns"
+import { formatDistanceToNow, differenceInDays, add, format } from "date-fns"
+import Link from "@mui/material/Link"
+import { Link as RouterLink } from "react-router-dom"
 
 export enum Count {
   Singular,
@@ -46,17 +48,34 @@ export const ImpendingDeletionBanner = ({
     new Date(),
   )
 
+  const plusFourteen = add(new Date(), { days: 14 })
+
   return (
     <Alert
       severity={daysUntilDelete <= 7 ? "warning" : "info"}
       onDismiss={onDismiss}
       dismissible
     >
-      {count === Count.Singular
-        ? `This workspace has been unused for ${formatDistanceToNow(
-            Date.parse(workspace.last_used_at),
-          )} and is scheduled for deletion. To keep it, connect via SSH or the web terminal.`
-        : "You have workspaces that will be deleted soon due to inactivity. To keep these workspaces, connect to them via SSH or the web terminal."}
+      {count === Count.Singular ? (
+        `This workspace has been unused for ${formatDistanceToNow(
+          Date.parse(workspace.last_used_at),
+        )} and is scheduled for deletion. To keep it, connect via SSH or the web terminal.`
+      ) : (
+        <>
+          <span>There are</span>{" "}
+          <Link
+            component={RouterLink}
+            to={`/workspaces?filter=deleting_by:${format(
+              plusFourteen,
+              "y-MM-dd",
+            )}`}
+          >
+            workspaces
+          </Link>{" "}
+          that will be deleted soon due to inactivity. To keep these workspaces,
+          connect to them via SSH or the web terminal.
+        </>
+      )}
     </Alert>
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ func (api API) workspaces(rw http.ResponseWriter, r http.Request) {`
`186`	`186`	`} else {`
`187`	`187`	`for _, v := range wss {`
`188`	`188`	`if v.DeletingAt == nil {`
`189`		`- break`
	`189`	`+ continue`
`190`	`190`	`}`
`191`	`191`	`// get the beginning of the day on which deletion is scheduled`
`192`	`192`	`truncatedDeletionAt := v.DeletingAt.Truncate(24 * time.Hour)`