Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ import { SettingsSection } from "./components/SettingsSection";
import { useSettingsEnvironmentFilter, type SettingsTarget } from "./settings-environment-filter";
import {
editDraft,
parseIntervalMinutes,
scheduledTaskDefaultModel,
scheduleFromDraft,
type ScheduledTaskDraft as Draft,
Expand Down Expand Up @@ -1127,7 +1128,7 @@ function TaskForm({
setDraft({ ...draft, schedule: { ...draft.schedule, intervalMinutes } })
}
/>
{Number(draft.schedule.intervalMinutes) < 1 ? (
{!(parseIntervalMinutes(draft.schedule.intervalMinutes) >= 1) ? (
<Text className="px-4 pb-3 text-sm text-danger-foreground">
Intervals must be at least 1 minute. Update this interval before saving.
</Text>
Expand Down
11 changes: 11 additions & 0 deletions apps/mobile/src/features/settings/scheduledTaskDraft.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,24 @@ describe("scheduleFromDraft", () => {

it.each([
["1.5", 90_000],
["2,5", 150_000],
[" 2,5 ", 150_000],
[String(60_001 / 60_000), 60_001],
])("preserves a valid %s minute interval when saving", (intervalMinutes, everyMs) => {
expect(scheduleFromDraft({ ...DEFAULT_SCHEDULE, mode: "interval", intervalMinutes })).toEqual({
type: "interval",
everyMs,
});
});

it.each(["0,5", "2,5,0", "Infinity", "150119987580", ""])(
"rejects invalid interval minutes: %s",
(intervalMinutes) => {
expect(
scheduleFromDraft({ ...DEFAULT_SCHEDULE, mode: "interval", intervalMinutes }),
).toBeNull();
},
);
});

describe("scheduled task model defaults", () => {
Expand Down
6 changes: 5 additions & 1 deletion apps/mobile/src/features/settings/scheduledTaskDraft.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ export function scheduleDraftForTask(task: Pick<ScheduledTask, "schedule">): Sch
}
}

export function parseIntervalMinutes(value: string): number {
return Number(value.trim().replace(",", "."));
}

export function scheduleFromDraft(draft: ScheduleDraft): ScheduledTaskUpsertSchedule | null {
if (draft.mode === "webhook") {
const maxDeliveryAgeMinutes = parseMaxDeliveryAge(draft.maxDeliveryAgeMinutes);
Expand Down Expand Up @@ -163,7 +167,7 @@ export function scheduleFromDraft(draft: ScheduleDraft): ScheduledTaskUpsertSche
};
}
if (draft.mode === "interval") {
const minutes = Number(draft.intervalMinutes);
const minutes = parseIntervalMinutes(draft.intervalMinutes);
const everyMs = Math.round(minutes * 60_000);
return minutes >= 1 && Number.isSafeInteger(everyMs) ? { type: "interval", everyMs } : null;
}
Expand Down
Loading