From ed81f4442c433b2d313cf1d80dd01cf0b84bc727 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 21 Sep 2022 03:50:44 +0000 Subject: [PATCH 1/2] chore: sync autostart helpers+values when toggled --- .../WorkspaceScheduleForm.tsx | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx index 49f9aec931975..d2f34dc6714ca 100644 --- a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx +++ b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx @@ -17,7 +17,7 @@ import relativeTime from "dayjs/plugin/relativeTime" import timezone from "dayjs/plugin/timezone" import utc from "dayjs/plugin/utc" import { FormikTouched, useFormik } from "formik" -import { defaultSchedule } from "pages/WorkspaceSchedulePage/schedule" +import { defaultSchedule, emptySchedule } from "pages/WorkspaceSchedulePage/schedule" import { defaultTTL } from "pages/WorkspaceSchedulePage/ttl" import { ChangeEvent, FC } from "react" import * as Yup from "yup" @@ -52,6 +52,7 @@ export const Language = { daySaturdayLabel: "Saturday", startTimeLabel: "Start time", startTimeHelperText: "Your workspace will automatically start at this time.", + noStartTimeHelperText: "Your workspace will not automatically start.", timezoneLabel: "Timezone", ttlLabel: "Time until shutdown (hours)", ttlCausesShutdownHelperText: "Your workspace will shut down", @@ -205,16 +206,22 @@ export const WorkspaceScheduleForm: FC { form.handleChange(e) - // if enabling from empty values, fill with defaults - if (!form.values.autoStartEnabled && !form.values.startTime) { + if (form.values.autoStartEnabled) { + // disable autostart, clear values + await form.setValues({ ...form.values, autoStartEnabled: false, ...emptySchedule }) + } else { + // enable autostart, fill with defaults await form.setValues({ ...form.values, autoStartEnabled: true, ...defaultSchedule() }) } } const handleToggleAutoStop = async (e: ChangeEvent) => { form.handleChange(e) - // if enabling from empty values, fill with defaults - if (!form.values.autoStopEnabled && !form.values.ttl) { + if (form.values.autoStopEnabled) { + // disable autostop, set TTL 0 + await form.setFieldValue("ttl", 0) + } else { + // enable autostop, fill with default TTL await form.setFieldValue("ttl", defaultTTL) } } @@ -237,7 +244,12 @@ export const WorkspaceScheduleForm: FC Date: Wed, 21 Sep 2022 03:55:57 +0000 Subject: [PATCH 2/2] respect autoStopEnabled --- .../WorkspaceScheduleForm/WorkspaceScheduleForm.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx index d2f34dc6714ca..d94c06c3fbe8e 100644 --- a/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx +++ b/site/src/components/WorkspaceScheduleForm/WorkspaceScheduleForm.tsx @@ -219,10 +219,10 @@ export const WorkspaceScheduleForm: FC pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy