Skip to content

Commit dde782c

Browse files
Kira-PilotKira-Pilot
committed
added story
1 parent 7eb45e5 commit dde782c

File tree

3 files changed

+38
-23
lines changed

3 files changed

+38
-23
lines changed

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/InactivityDialog.stories.tsx

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import type { Meta, StoryObj } from "@storybook/react"
2+
import { InactivityDialog } from "./InactivityDialog"
3+
4+
const meta: Meta<typeof InactivityDialog> = {
5+
title: "InactivityDialog",
6+
component: InactivityDialog,
7+
}
8+
9+
export default meta
10+
type Story = StoryObj<typeof InactivityDialog>
11+
12+
export const OpenDialog: Story = {
13+
args: {
14+
submitValues: () => null,
15+
isInactivityDialogOpen: true,
16+
setIsInactivityDialogOpen: () => null,
17+
workspacesToBeDeletedToday: 2,
18+
},
19+
}

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/InactivityDialog.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
11
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"
2-
import { useWorkspacesData } from "./useWorkspacesData"
3-
import { TemplateScheduleFormValues } from "./formHelpers"
42

53
export const InactivityDialog = ({
6-
formValues,
74
submitValues,
85
isInactivityDialogOpen,
96
setIsInactivityDialogOpen,
7+
workspacesToBeDeletedToday,
108
}: {
11-
formValues: TemplateScheduleFormValues
12-
submitValues: (arg0: TemplateScheduleFormValues) => void
9+
submitValues: () => void
1310
isInactivityDialogOpen: boolean
1411
setIsInactivityDialogOpen: (arg0: boolean) => void
12+
workspacesToBeDeletedToday: number
1513
}) => {
16-
const workspacesToBeDeletedToday = useWorkspacesData(formValues)
17-
1814
return (
1915
<ConfirmDialog
2016
type="delete"
2117
open={isInactivityDialogOpen}
2218
onConfirm={() => {
23-
submitValues(formValues)
19+
submitValues()
2420
setIsInactivityDialogOpen(false)
2521
}}
2622
onClose={() => setIsInactivityDialogOpen(false)}
2723
title="Delete inactive workspaces"
2824
confirmText="Delete Workspaces"
2925
description={`There are ${
30-
workspacesToBeDeletedToday?.length ?? ""
26+
workspacesToBeDeletedToday ? workspacesToBeDeletedToday : ""
3127
} workspaces that already match this filter and will be deleted upon form submission. Are you sure you want to proceed?`}
3228
/>
3329
)

‎site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateScheduleForm/TemplateScheduleForm.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
7474
allowAdvancedScheduling && Boolean(template.inactivity_ttl_ms),
7575
},
7676
validationSchema,
77-
onSubmit: (formData) => {
77+
onSubmit: () => {
7878
if (
7979
form.values.inactivity_cleanup_enabled &&
8080
workspacesToBeDeletedToday &&
8181
workspacesToBeDeletedToday.length > 0
8282
) {
8383
setIsInactivityDialogOpen(true)
8484
} else {
85-
submitValues(formData)
85+
submitValues()
8686
}
8787
},
8888
initialTouched,
@@ -99,24 +99,24 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
9999
const [isInactivityDialogOpen, setIsInactivityDialogOpen] =
100100
useState<boolean>(false)
101101

102-
const submitValues = (formData: TemplateScheduleFormValues) => {
102+
const submitValues = () => {
103103
// on submit, convert from hours => ms
104104
onSubmit({
105-
default_ttl_ms: formData.default_ttl_ms
106-
? formData.default_ttl_ms * MS_HOUR_CONVERSION
105+
default_ttl_ms: form.values.default_ttl_ms
106+
? form.values.default_ttl_ms * MS_HOUR_CONVERSION
107107
: undefined,
108-
max_ttl_ms: formData.max_ttl_ms
109-
? formData.max_ttl_ms * MS_HOUR_CONVERSION
108+
max_ttl_ms: form.values.max_ttl_ms
109+
? form.values.max_ttl_ms * MS_HOUR_CONVERSION
110110
: undefined,
111-
failure_ttl_ms: formData.failure_ttl_ms
112-
? formData.failure_ttl_ms * MS_DAY_CONVERSION
111+
failure_ttl_ms: form.values.failure_ttl_ms
112+
? form.values.failure_ttl_ms * MS_DAY_CONVERSION
113113
: undefined,
114-
inactivity_ttl_ms: formData.inactivity_ttl_ms
115-
? formData.inactivity_ttl_ms * MS_DAY_CONVERSION
114+
inactivity_ttl_ms: form.values.inactivity_ttl_ms
115+
? form.values.inactivity_ttl_ms * MS_DAY_CONVERSION
116116
: undefined,
117117

118-
allow_user_autostart: formData.allow_user_autostart,
119-
allow_user_autostop: formData.allow_user_autostop,
118+
allow_user_autostart: form.values.allow_user_autostart,
119+
allow_user_autostop: form.values.allow_user_autostop,
120120
})
121121
}
122122

@@ -333,10 +333,10 @@ export const TemplateScheduleForm: FC<TemplateScheduleForm> = ({
333333
</>
334334
)}
335335
<InactivityDialog
336-
formValues={form.values}
337336
submitValues={submitValues}
338337
isInactivityDialogOpen={isInactivityDialogOpen}
339338
setIsInactivityDialogOpen={setIsInactivityDialogOpen}
339+
workspacesToBeDeletedToday={workspacesToBeDeletedToday?.length ?? 0}
340340
/>
341341
<FormFooter
342342
onCancel={onCancel}

0 commit comments

Comments
 (0)