Skip to content

fix(site): remove hard-coded activity bump label #15583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2024
Merged

fix(site): remove hard-coded activity bump label #15583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(site): remove hard-coded activity bump label
  • Loading branch information
@ethanndickson
ethanndickson committed Nov 19, 2024
commit 16d377616f461495daf291f14e67ecfe6a937a2e
16 changes: 8 additions & 8 deletions site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,42 +203,42 @@ describe("ttlShutdownAt", () => {
[
"One hour --> helper text shows shutdown after 1 hour",
1,
"Your workspace will shut down 1 hour after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 1 hour after its next start.",
],
[
"Two hours --> helper text shows shutdown after 2 hours",
2,
"Your workspace will shut down 2 hours after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 2 hours after its next start.",
],
[
"24 hours --> helper text shows shutdown after 1 day",
24,
"Your workspace will shut down 1 day after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 1 day after its next start.",
],
[
"48 hours --> helper text shows shutdown after 2 days",
48,
"Your workspace will shut down 2 days after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 2 days after its next start.",
],
[
"1.2 hours --> helper text shows shutdown after 1 hour and 12 minutes",
1.2,
"Your workspace will shut down 1 hour and 12 minutes after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 1 hour and 12 minutes after its next start.",
],
[
"24.2 hours --> helper text shows shutdown after 1 day and 12 minutes",
24.2,
"Your workspace will shut down 1 day and 12 minutes after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 1 day and 12 minutes after its next start.",
],
[
"0.2 hours --> helper text shows shutdown after 12 minutes",
0.2,
"Your workspace will shut down 12 minutes after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 12 minutes after its next start.",
],
[
"48.258 hours --> helper text shows shutdown after 2 days and 15 minutes and 28 seconds",
48.258,
"Your workspace will shut down 2 days and 15 minutes and 28 seconds after its next start. We delay shutdown by 1 hour whenever we detect activity.",
"Your workspace will shut down 2 days and 15 minutes and 28 seconds after its next start.",
],
])("%p", (_, ttlHours, expected) => {
expect(ttlShutdownAt(ttlHours)).toEqual(expected);
Expand Down
2 changes: 1 addition & 1 deletion site/src/pages/WorkspaceSettingsPage/WorkspaceSchedulePage/WorkspaceScheduleForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ export const ttlShutdownAt = (formTTL: number): string => {
return `Your workspace will shut down ${formatDuration(
intervalToDuration({ start: 0, end: formTTL * 60 * 60 * 1000 }),
{ delimiter: " and " },
)} after its next start. We delay shutdown by 1 hour whenever we detect activity.`;
)} after its next start.`;
} catch (e) {
if (e instanceof RangeError) {
return Language.errorTtlMax;
Expand Down
Loading