From 6fde537f9cfc272de8f8c5c8c658dde1c24ba1ec Mon Sep 17 00:00:00 2001 From: Ammar Bandukwala Date: Mon, 22 Aug 2022 15:35:17 -0500 Subject: [PATCH] web: use seconds in max TTL input (#3576) Milliseconds are more difficult to deal with due to all of the zeros. Also, describe this feature as "auto-stop" to be consistent with our Workspace page UI and CLI. "ttl" is our backend lingo which should eventually be updated. --- .../TemplateSettingsPage/TemplateSettingsForm.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx b/site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx index a1f569f91a..ed8feedaf2 100644 --- a/site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx +++ b/site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx @@ -18,10 +18,10 @@ import * as Yup from "yup" export const Language = { nameLabel: "Name", descriptionLabel: "Description", + maxTtlLabel: "Auto-stop limit", iconLabel: "Icon", - maxTtlLabel: "Max TTL", // This is the same from the CLI on https://github.com/coder/coder/blob/546157b63ef9204658acf58cb653aa9936b70c49/cli/templateedit.go#L59 - maxTtlHelperText: "Edit the template maximum time before shutdown in milliseconds", + maxTtlHelperText: "Edit the template maximum time before shutdown in seconds", formAriaLabel: "Template settings form", selectEmoji: "Select emoji", } @@ -59,9 +59,7 @@ export const TemplateSettingsForm: FC = ({ icon: template.icon, }, validationSchema, - onSubmit: (data) => { - onSubmit(data) - }, + onSubmit, initialTouched, }) const getFieldHelpers = getFormHelpersWithError(form, error) @@ -156,6 +154,12 @@ export const TemplateSettingsForm: FC = ({ inputProps={{ min: 0, step: 1 }} label={Language.maxTtlLabel} variant="outlined" + // Display seconds from ms + value={form.values.max_ttl_ms ? form.values.max_ttl_ms / 1000 : ""} + // Convert ms to seconds + onChange={(event) => + form.setFieldValue("max_ttl_ms", Number(event.currentTarget.value) * 1000) + } />