Skip to content

Commit ef2ea57

Browse files
f0sself0ssel
committed
change to default naing in fe
1 parent 323bddd commit ef2ea57

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

‎site/src/pages/TemplateSettingsPage/TemplateSettingsForm.tsx

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import * as Yup from "yup"
1919
export const Language = {
2020
nameLabel: "Name",
2121
descriptionLabel: "Description",
22-
maxTtlLabel: "Auto-stop limit",
22+
defaultTtlLabel: "Auto-stop default",
2323
iconLabel: "Icon",
2424
formAriaLabel: "Template settings form",
2525
selectEmoji: "Select emoji",
@@ -28,7 +28,7 @@ export const Language = {
2828
descriptionMaxError:
2929
"Please enter a description that is less than or equal to 128 characters.",
3030
ttlHelperText: (ttl: number): string =>
31-
`Workspaces created from this template may not remain running longer than ${ttl} hours.`,
31+
`Workspaces created from this template will default to stopping after ${ttl} hours.`,
3232
}
3333

3434
const MAX_DESCRIPTION_CHAR_LIMIT = 128
@@ -41,7 +41,7 @@ export const validationSchema = Yup.object({
4141
MAX_DESCRIPTION_CHAR_LIMIT,
4242
Language.descriptionMaxError,
4343
),
44-
max_ttl_ms: Yup.number()
44+
default_ttl_ms: Yup.number()
4545
.integer()
4646
.min(0)
4747
.max(24 * MAX_TTL_DAYS /* 7 days in hours */, Language.ttlMaxError),
@@ -72,16 +72,16 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
7272
name: template.name,
7373
description: template.description,
7474
// on display, convert from ms => hours
75-
max_ttl_ms: template.max_ttl_ms / MS_HOUR_CONVERSION,
75+
default_ttl_ms: template.default_ttl_ms / MS_HOUR_CONVERSION,
7676
icon: template.icon,
7777
},
7878
validationSchema,
7979
onSubmit: (formData) => {
8080
// on submit, convert from hours => ms
8181
onSubmit({
8282
...formData,
83-
max_ttl_ms: formData.max_ttl_ms
84-
? formData.max_ttl_ms * MS_HOUR_CONVERSION
83+
default_ttl_ms: formData.default_ttl_ms
84+
? formData.default_ttl_ms * MS_HOUR_CONVERSION
8585
: undefined,
8686
})
8787
},
@@ -176,20 +176,20 @@ export const TemplateSettingsForm: FC<TemplateSettingsForm> = ({
176176
</div>
177177

178178
<TextField
179-
{...getFieldHelpers("max_ttl_ms")}
179+
{...getFieldHelpers("default_ttl_ms")}
180180
disabled={isSubmitting}
181181
fullWidth
182182
inputProps={{ min: 0, step: 1 }}
183-
label={Language.maxTtlLabel}
183+
label={Language.defaultTtlLabel}
184184
variant="outlined"
185185
type="number"
186186
/>
187-
{/* If a value for max_ttl_ms has been entered and
187+
{/* If a value for default_ttl_ms has been entered and
188188
there are no validation errors for that field, display helper text.
189189
We do not use the MUI helper-text prop because it overrides the validation error */}
190-
{form.values.max_ttl_ms && !form.errors.max_ttl_ms && (
190+
{form.values.default_ttl_ms && !form.errors.default_ttl_ms && (
191191
<Typography variant="subtitle2">
192-
{Language.ttlHelperText(form.values.max_ttl_ms)}
192+
{Language.ttlHelperText(form.values.default_ttl_ms)}
193193
</Typography>
194194
)}
195195
</Stack>

‎site/src/pages/TemplateSettingsPage/TemplateSettingsPage.test.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ const validFormValues = {
2626
name: "Name",
2727
description: "A description",
2828
icon: "A string",
29-
max_ttl_ms: 1,
29+
default_ttl_ms: 1,
3030
}
3131

3232
const fillAndSubmitForm = async ({
3333
name,
3434
description,
35-
max_ttl_ms,
35+
default_ttl_ms,
3636
icon,
3737
}: Omit<Required<UpdateTemplateMeta>, "min_autostart_interval_ms">) => {
3838
const nameField = await screen.findByLabelText(FormLanguage.nameLabel)
@@ -49,9 +49,9 @@ const fillAndSubmitForm = async ({
4949
await userEvent.clear(iconField)
5050
await userEvent.type(iconField, icon)
5151

52-
const maxTtlField = await screen.findByLabelText(FormLanguage.maxTtlLabel)
52+
const maxTtlField = await screen.findByLabelText(FormLanguage.defaultTtlLabel)
5353
await userEvent.clear(maxTtlField)
54-
await userEvent.type(maxTtlField, max_ttl_ms.toString())
54+
await userEvent.type(maxTtlField, default_ttl_ms.toString())
5555

5656
const submitButton = await screen.findByText(
5757
FooterFormLanguage.defaultSubmitLabel,
@@ -87,15 +87,15 @@ describe("TemplateSettingsPage", () => {
8787
})
8888

8989
await fillAndSubmitForm(validFormValues)
90-
expect(screen.getByDisplayValue(1)).toBeInTheDocument() // the max_ttl_ms
90+
expect(screen.getByDisplayValue(1)).toBeInTheDocument() // the default_ttl_ms
9191
await waitFor(() => expect(API.updateTemplateMeta).toBeCalledTimes(1))
9292

9393
await waitFor(() =>
9494
expect(API.updateTemplateMeta).toBeCalledWith(
9595
"test-template",
9696
expect.objectContaining({
9797
...validFormValues,
98-
max_ttl_ms: 3600000, // the max_ttl_ms to ms
98+
default_ttl_ms: 3600000, // the default_ttl_ms to ms
9999
}),
100100
),
101101
)
@@ -104,7 +104,7 @@ describe("TemplateSettingsPage", () => {
104104
it("allows a ttl of 7 days", () => {
105105
const values: UpdateTemplateMeta = {
106106
...validFormValues,
107-
max_ttl_ms: 24 * 7,
107+
default_ttl_ms: 24 * 7,
108108
}
109109
const validate = () => validationSchema.validateSync(values)
110110
expect(validate).not.toThrowError()
@@ -113,7 +113,7 @@ describe("TemplateSettingsPage", () => {
113113
it("allows ttl of 0", () => {
114114
const values: UpdateTemplateMeta = {
115115
...validFormValues,
116-
max_ttl_ms: 0,
116+
default_ttl_ms: 0,
117117
}
118118
const validate = () => validationSchema.validateSync(values)
119119
expect(validate).not.toThrowError()
@@ -122,7 +122,7 @@ describe("TemplateSettingsPage", () => {
122122
it("disallows a ttl of 7 days + 1 hour", () => {
123123
const values: UpdateTemplateMeta = {
124124
...validFormValues,
125-
max_ttl_ms: 24 * 7 + 1,
125+
default_ttl_ms: 24 * 7 + 1,
126126
}
127127
const validate = () => validationSchema.validateSync(values)
128128
expect(validate).toThrowError(FormLanguage.ttlMaxError)

‎site/src/testHelpers/entities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ export const MockTemplate: TypesGen.Template = {
198198
delete_ms: 3000,
199199
},
200200
description: "This is a test description.",
201-
max_ttl_ms: 24 * 60 * 60 * 1000,
201+
default_ttl_ms: 24 * 60 * 60 * 1000,
202202
min_autostart_interval_ms: 60 * 60 * 1000,
203203
created_by_id: "test-creator-id",
204204
created_by_name: "test_creator",

‎site/src/util/schedule.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe("maxDeadline", () => {
5252
it("should be never be greater than global max deadline", () => {
5353
const template: Template = {
5454
...Mocks.MockTemplate,
55-
max_ttl_ms: 25 * 60 * 60 * 1000,
55+
default_ttl_ms: 25 * 60 * 60 * 1000,
5656
}
5757

5858
// Then: deadlineMinusDisabled should be falsy
@@ -65,7 +65,7 @@ describe("maxDeadline", () => {
6565
it("should be never be greater than global max deadline", () => {
6666
const template: Template = {
6767
...Mocks.MockTemplate,
68-
max_ttl_ms: 4 * 60 * 60 * 1000,
68+
default_ttl_ms: 4 * 60 * 60 * 1000,
6969
}
7070

7171
// Then: deadlineMinusDisabled should be falsy
@@ -95,7 +95,7 @@ describe("canExtendDeadline", () => {
9595

9696
it("should be falsy if the deadline is more than the template max_ttl", () => {
9797
const tooFarAhead = dayjs().add(
98-
dayjs.duration(Mocks.MockTemplate.max_ttl_ms, "milliseconds"),
98+
dayjs.duration(Mocks.MockTemplate.default_ttl_ms, "milliseconds"),
9999
)
100100
expect(
101101
canExtendDeadline(tooFarAhead, Mocks.MockWorkspace, Mocks.MockTemplate),
@@ -104,7 +104,7 @@ describe("canExtendDeadline", () => {
104104

105105
it("should be truth if the deadline is within the template max_ttl", () => {
106106
const okDeadline = dayjs().add(
107-
dayjs.duration(Mocks.MockTemplate.max_ttl_ms / 2, "milliseconds"),
107+
dayjs.duration(Mocks.MockTemplate.default_ttl_ms / 2, "milliseconds"),
108108
)
109109
expect(
110110
canExtendDeadline(okDeadline, Mocks.MockWorkspace, Mocks.MockTemplate),

‎site/src/util/schedule.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export function getMaxDeadline(
139139
}
140140
const startedAt = dayjs(ws.latest_build.updated_at)
141141
const maxTemplateDeadline = startedAt.add(
142-
dayjs.duration(tpl.max_ttl_ms, "milliseconds"),
142+
dayjs.duration(tpl.default_ttl_ms, "milliseconds"),
143143
)
144144
const maxGlobalDeadline = startedAt.add(deadlineExtensionMax)
145145
return dayjs.min(maxTemplateDeadline, maxGlobalDeadline)

0 commit comments

Comments
 (0)