added story

coder · Kira-Pilot · Jun 12, 2023 · Jun 1, 2023 · Jun 2, 2023 · Jun 5, 2023
commit dde782c7351f03bd275196543c5e76711967d2f3
diff --git a/...mplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/InactivityDialog.stories.tsx b/...mplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/InactivityDialog.stories.tsx
@@ -0,0 +1,19 @@
+import type { Meta, StoryObj } from "@storybook/react"
+import { InactivityDialog } from "./InactivityDialog"
+
+const meta: Meta<typeof InactivityDialog> = {
+  title: "InactivityDialog",
+  component: InactivityDialog,
+}
+
+export default meta
+type Story = StoryObj<typeof InactivityDialog>
+
+export const OpenDialog: Story = {
+  args: {
+    submitValues: () => null,
+    isInactivityDialogOpen: true,
+    setIsInactivityDialogOpen: () => null,
+    workspacesToBeDeletedToday: 2,
+  },
+}
diff --git a/...pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/InactivityDialog.tsx b/...pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/InactivityDialog.tsx
@@ -1,33 +1,29 @@
 import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
-import { useWorkspacesData } from "./useWorkspacesData"
-import { TemplateScheduleFormValues } from "./formHelpers"
 
 export const InactivityDialog = ({
-  formValues,
   submitValues,
   isInactivityDialogOpen,
   setIsInactivityDialogOpen,
+  workspacesToBeDeletedToday,
 }: {
-  formValues: TemplateScheduleFormValues
-  submitValues: (arg0: TemplateScheduleFormValues) => void
+  submitValues: () => void
   isInactivityDialogOpen: boolean
   setIsInactivityDialogOpen: (arg0: boolean) => void
+  workspacesToBeDeletedToday: number
 }) => {
-  const workspacesToBeDeletedToday = useWorkspacesData(formValues)
-
   return (
     <ConfirmDialog
       type="delete"
       open={isInactivityDialogOpen}
       onConfirm={() => {
-        submitValues(formValues)
+        submitValues()
         setIsInactivityDialogOpen(false)
       }}
       onClose={() => setIsInactivityDialogOpen(false)}
       title="Delete inactive workspaces"
       confirmText="Delete Workspaces"
       description={`There are ${
-        workspacesToBeDeletedToday?.length ?? ""
+        workspacesToBeDeletedToday ? workspacesToBeDeletedToday : ""
       } workspaces that already match this filter and will be deleted upon form submission. Are you sure you want to proceed?`}
     />
   )

diff --git a/...s/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx b/...s/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx
@@ -74,15 +74,15 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
         allowAdvancedScheduling && Boolean(template.inactivity_ttl_ms),
     },
     validationSchema,
-    onSubmit: (formData) => {
+    onSubmit: () => {
       if (
         form.values.inactivity_cleanup_enabled &&
         workspacesToBeDeletedToday &&
         workspacesToBeDeletedToday.length > 0
       ) {
         setIsInactivityDialogOpen(true)
       } else {
-        submitValues(formData)
+        submitValues()
       }
     },
     initialTouched,
@@ -99,24 +99,24 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
   const [isInactivityDialogOpen, setIsInactivityDialogOpen] =
     useState<boolean>(false)
 
-  const submitValues = (formData: TemplateScheduleFormValues) => {
+  const submitValues = () => {
     // on submit, convert from hours => ms
     onSubmit({
-      default_ttl_ms: formData.default_ttl_ms
-        ? formData.default_ttl_ms * MS_HOUR_CONVERSION
+      default_ttl_ms: form.values.default_ttl_ms
+        ? form.values.default_ttl_ms * MS_HOUR_CONVERSION
         : undefined,
-      max_ttl_ms: formData.max_ttl_ms
-        ? formData.max_ttl_ms * MS_HOUR_CONVERSION
+      max_ttl_ms: form.values.max_ttl_ms
+        ? form.values.max_ttl_ms * MS_HOUR_CONVERSION
         : undefined,
-      failure_ttl_ms: formData.failure_ttl_ms
-        ? formData.failure_ttl_ms * MS_DAY_CONVERSION
+      failure_ttl_ms: form.values.failure_ttl_ms
+        ? form.values.failure_ttl_ms * MS_DAY_CONVERSION
         : undefined,
-      inactivity_ttl_ms: formData.inactivity_ttl_ms
-        ? formData.inactivity_ttl_ms * MS_DAY_CONVERSION
+      inactivity_ttl_ms: form.values.inactivity_ttl_ms
+        ? form.values.inactivity_ttl_ms * MS_DAY_CONVERSION
         : undefined,
 
-      allow_user_autostart: formData.allow_user_autostart,
-      allow_user_autostop: formData.allow_user_autostop,
+      allow_user_autostart: form.values.allow_user_autostart,
+      allow_user_autostop: form.values.allow_user_autostop,
     })
   }
 
@@ -333,10 +333,10 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
         </>
       )}
       <InactivityDialog
-        formValues={form.values}
         submitValues={submitValues}
         isInactivityDialogOpen={isInactivityDialogOpen}
         setIsInactivityDialogOpen={setIsInactivityDialogOpen}
+        workspacesToBeDeletedToday={workspacesToBeDeletedToday?.length ?? 0}
       />
       <FormFooter
         onCancel={onCancel}