PR feedback

coder · Kira-Pilot · Jun 12, 2023 · Jun 1, 2023 · Jun 2, 2023 · Jun 5, 2023
commit ef6be22cd79528754fd9d1a276d1fae4cd7653fb
diff --git a/...s/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx b/...s/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
@@ -17,7 +17,7 @@ import Checkbox from "@mui/material/Checkbox"
 import FormControlLabel from "@mui/material/FormControlLabel"
 import Switch from "@mui/material/Switch"
 import { InactivityDialog } from "./InactivityDialog"
-import { useWorkspacesData } from "./useWorkspacesData"
+import { useWorkspacesToBeDeleted } from "./useWorkspacesToBeDeleted"
 import { TemplateScheduleFormValues, getValidationSchema } from "./formHelpers"
 import { TTLHelperText } from "./TTLHelperText"
 
@@ -94,7 +94,7 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
   const { t } = useTranslation("templateSettingsPage")
   const styles = useStyles()
 
-  const workspacesToBeDeletedToday = useWorkspacesData(form.values)
+  const workspacesToBeDeletedToday = useWorkspacesToBeDeleted(form.values)
 
   const [isInactivityDialogOpen, setIsInactivityDialogOpen] =
     useState<boolean>(false)

diff --git a/...pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/useWorkspacesData.ts b/...pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/useWorkspacesData.ts
diff --git a/...emplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/useWorkspacesToBeDeleted.ts b/...emplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/useWorkspacesToBeDeleted.ts
@@ -0,0 +1,33 @@
+import { useQuery } from "@tanstack/react-query"
+import { getWorkspaces } from "api/api"
+import { compareAsc, add, endOfToday } from "date-fns"
+import { WorkspaceStatus, Workspace } from "api/typesGenerated"
+import { TemplateScheduleFormValues } from "./formHelpers"
+
+const inactiveStatuses: WorkspaceStatus[] = [
+  "stopped",
+  "canceled",
+  "failed",
+  "deleted",
+]
+
+export const useWorkspacesToBeDeleted = (
+  formValues: TemplateScheduleFormValues,
+) => {
+  const { data: workspacesData } = useQuery({
+    queryKey: ["workspaces"],
+    queryFn: () => getWorkspaces({}),
+    enabled: formValues.inactivity_cleanup_enabled,
+  })
+  return workspacesData?.workspaces?.filter((workspace: Workspace) => {
+    const isInactive = inactiveStatuses.includes(workspace.latest_build.status)
+
+    const proposedDeletion = add(new Date(workspace.last_used_at), {
+      days: formValues.inactivity_ttl_ms,
+    })
+
+    if (isInactive && compareAsc(proposedDeletion, endOfToday()) < 1) {
+      return workspace
+    }
+  })
+}