Skip to content

Commit 34e5aec

Browse files
fix(clients): save live intervals and effective task models
1 parent 5efdcb2 commit 34e5aec

2 files changed

Lines changed: 18 additions & 15 deletions

File tree

‎apps/mobile/src/features/settings/scheduledTaskDraft.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,18 +257,20 @@ export function buildScheduledTaskUpdateInput(
257257
)
258258
patch.modelSelection = draft.modelSelection;
259259
const schedule = scheduleFromDraft(draft.schedule);
260-
if (
261-
schedule !== null &&
262-
(JSON.stringify(schedule) !== JSON.stringify(scheduleFromDraft(baseline.schedule)) ||
263-
(schedule.type === "interval" &&
264-
liveTask.schedule.type === "interval" &&
265-
liveTask.schedule.everyMs < MIN_SCHEDULED_TASK_INTERVAL_MS))
266-
) {
260+
const scheduleChanged =
261+
JSON.stringify(schedule) !== JSON.stringify(scheduleFromDraft(baseline.schedule));
262+
if (scheduleChanged && schedule !== null) {
267263
// Mobile cannot edit signing credentials; preserve the current web/desktop choice.
268264
patch.schedule =
269265
schedule.type === "webhook" && liveTask.schedule.type === "webhook"
270266
? { ...schedule, signature: liveTask.schedule.signature }
271267
: schedule;
268+
} else if (
269+
!scheduleChanged &&
270+
liveTask.schedule.type === "interval" &&
271+
liveTask.schedule.everyMs < MIN_SCHEDULED_TASK_INTERVAL_MS
272+
) {
273+
patch.schedule = { ...liveTask.schedule, everyMs: MIN_SCHEDULED_TASK_INTERVAL_MS };
272274
}
273275
const workspace = workspaceStrategyFromDraft(draft);
274276
const openingWorkspace = workspaceStrategyFromDraft(baseline);

‎apps/web/src/components/settings/scheduledTasksSettings.logic.ts‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,16 +231,17 @@ export function buildScheduledTaskUpdateInput(
231231
if (draft.runtimeMode !== baseline.runtimeMode) patch.runtimeMode = draft.runtimeMode;
232232
if (draft.interactionMode !== baseline.interactionMode)
233233
patch.interactionMode = draft.interactionMode;
234-
if (draft.modelKey !== baseline.modelKey) patch.modelSelection = modelSelection;
234+
if (`${modelSelection.instanceId}:${modelSelection.model}` !== baseline.modelKey)
235+
patch.modelSelection = modelSelection;
235236
const schedule = scheduleFromDraft(draft);
236-
if (
237-
schedule !== null &&
238-
(JSON.stringify(schedule) !== JSON.stringify(scheduleFromDraft(baseline)) ||
239-
(schedule.type === "interval" &&
240-
task.schedule.type === "interval" &&
241-
task.schedule.everyMs < MIN_SCHEDULED_TASK_INTERVAL_MS))
237+
const scheduleChanged = JSON.stringify(schedule) !== JSON.stringify(scheduleFromDraft(baseline));
238+
if (scheduleChanged && schedule !== null) patch.schedule = schedule;
239+
else if (
240+
!scheduleChanged &&
241+
task.schedule.type === "interval" &&
242+
task.schedule.everyMs < MIN_SCHEDULED_TASK_INTERVAL_MS
242243
)
243-
patch.schedule = schedule;
244+
patch.schedule = { ...task.schedule, everyMs: MIN_SCHEDULED_TASK_INTERVAL_MS };
244245
const workspace = workspaceStrategyFromDraft(draft);
245246
const openingWorkspace = workspaceStrategyFromDraft(baseline);
246247
if (workspace.type !== openingWorkspace.type) patch.workspaceStrategy = workspace;

0 commit comments

Comments
 (0)