Skip to content

feat: add template activity_bump property #11734

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 10 commits into from
Feb 13, 2024
Merged

feat: add template activity_bump property #11734

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
359d188
feat: add template activity_bump property
deansheather Jan 22, 2024
ae39e40
Tests for zero bump
deansheather Jan 22, 2024
f770ce0
Dashboard
deansheather Jan 22, 2024
74d2789
Merge branch 'main' into dean/template-activity-bump-dur
deansheather Feb 8, 2024
85880ac
PR comments
deansheather Feb 8, 2024
6163df5
Merge branch 'main' into dean/template-activity-bump-dur
deansheather Feb 9, 2024
21f9838
Fix comment in activitybump.sql
deansheather Feb 9, 2024
7211b7a
fixup! Fix comment in activitybump.sql
deansheather Feb 10, 2024
dd7647e
Merge branch 'main' into dean/template-activity-bump-dur
deansheather Feb 13, 2024
ca00bad
Fix frontend validations
deansheather Feb 13, 2024
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
Prev Previous commit
Fix frontend validations
  • Loading branch information
@deansheather
deansheather committed Feb 13, 2024
commit ca00bad76ed3900422813e7f23a21c194fda4ff3
0 ..._template_activity_bump_duration.down.sql → ..._template_activity_bump_duration.down.sql
View file
Open in desktop
File renamed without changes.
0 ...89_template_activity_bump_duration.up.sql → ...90_template_activity_bump_duration.up.sql
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions site/src/pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import TemplateSchedulePage from "./TemplateSchedulePage";

const validFormValues: TemplateScheduleFormValues = {
default_ttl_ms: 1,
activity_bump_ms: 1,
use_max_ttl: true,
max_ttl_ms: 2,
failure_ttl_ms: 7,
Expand Down
9 changes: 9 additions & 0 deletions site/src/pages/TemplateSettingsPage/TemplateSchedulePage/formHelpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,31 @@ export const getValidationSchema = (): Yup.AnyObjectSchema =>
Yup.object({
default_ttl_ms: Yup.number()
.integer()
.required()
.min(0, "Default time until autostop must not be less than 0.")
.max(
24 * MAX_TTL_DAYS /* 30 days in hours */,
"Please enter a limit that is less than or equal to 720 hours (30 days).",
),
activity_bump_ms: Yup.number()
.integer()
.required()
.min(0, "Activity bump must not be less than 0.")
.max(
24 * MAX_TTL_DAYS /* 30 days in hours */,
"Please enter an activity bump duration that is less than or equal to 720 hours (30 days).",
),
max_ttl_ms: Yup.number()
.integer()
.required()
.min(0, "Maximum time until autostop must not be less than 0.")
.max(
24 * MAX_TTL_DAYS /* 30 days in hours */,
"Please enter a limit that is less than or equal to 720 hours (30 days).",
),
failure_ttl_ms: Yup.number()
.integer()
.required()
.min(0, "Failure cleanup days must not be less than 0.")
.test(
"positive-if-enabled",
Expand All @@ -59,6 +64,8 @@ export const getValidationSchema = (): Yup.AnyObjectSchema =>
},
),
time_til_dormant_ms: Yup.number()
.integer()
.required()
.min(0, "Dormancy threshold days must not be less than 0.")
.test(
"positive-if-enabled",
Expand All @@ -73,6 +80,8 @@ export const getValidationSchema = (): Yup.AnyObjectSchema =>
},
),
time_til_dormant_autodelete_ms: Yup.number()
.integer()
.required()
.min(0, "Dormancy auto-deletion days must not be less than 0.")
.test(
"positive-if-enabled",
Expand Down