From f3f3678843bfd7f8014e02b0a161c59a626df7c6 Mon Sep 17 00:00:00 2001 From: Guilhem Date: Wed, 26 Feb 2025 11:54:31 +0000 Subject: [PATCH] fix(frontend) load primary schedule args in detail trigger page (#5388) * load primary schedule args in detail trigger page * nit --- .../lib/components/RunPageSchedules.svelte | 4 ++- .../src/lib/components/flows/scheduleUtils.ts | 30 +++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/frontend/src/lib/components/RunPageSchedules.svelte b/frontend/src/lib/components/RunPageSchedules.svelte index 4b721fd8a5..135fd823b5 100644 --- a/frontend/src/lib/components/RunPageSchedules.svelte +++ b/frontend/src/lib/components/RunPageSchedules.svelte @@ -29,6 +29,7 @@ let initialPrimarySchedule: Writable = writable(undefined) async function updateSchedules(forceRefresh: boolean) { + const loadPrimarySchedule = true loadSchedules( forceRefresh, path, @@ -37,7 +38,8 @@ primarySchedule, initialPrimarySchedule, $workspaceStore ?? '', - triggersCount + triggersCount, + loadPrimarySchedule ) } diff --git a/frontend/src/lib/components/flows/scheduleUtils.ts b/frontend/src/lib/components/flows/scheduleUtils.ts index d68ed215e6..bc81db7483 100644 --- a/frontend/src/lib/components/flows/scheduleUtils.ts +++ b/frontend/src/lib/components/flows/scheduleUtils.ts @@ -5,7 +5,7 @@ import { get } from 'svelte/store' import { sendUserToast } from '$lib/utils' // Load the schedule of a flow given its path and the workspace -export async function loadFlowSchedule(path: string, workspace: string): Promise { +export async function loadSchedule(path: string, workspace: string): Promise { const existsSchedule = await ScheduleService.existsSchedule({ workspace, path @@ -37,16 +37,15 @@ export async function loadSchedules( primarySchedule: Writable, initialPrimarySchedule: Writable, workspace: string, - triggersCount: Writable + triggersCount: Writable, + loadPrimarySchedule: boolean = false ) { - console.log('loading schedules for path', path) if (!path || path == '') { schedules.set([]) primarySchedule.update((ps) => (ps === undefined ? false : ps)) initialPrimarySchedule.set(structuredClone(get(primarySchedule))) return } - console.log('loading schedules for path', path) try { const allSchedules = await ScheduleService.listSchedules({ workspace, @@ -54,15 +53,20 @@ export async function loadSchedules( isFlow }) const primary = allSchedules.find((s) => s.path == path) - let remotePrimarySchedule: ScheduleTrigger | false | undefined = primary - ? { - summary: primary.summary, - args: primary.args ?? {}, - cron: primary.schedule, - timezone: primary.timezone, - enabled: primary.enabled - } - : false + let remotePrimarySchedule: ScheduleTrigger | false | undefined = undefined + if (loadPrimarySchedule && primary) { + remotePrimarySchedule = await loadSchedule(path, workspace) + } else { + remotePrimarySchedule = primary + ? { + summary: primary.summary, + args: primary.args ?? {}, + cron: primary.schedule, + timezone: primary.timezone, + enabled: primary.enabled + } + : false + } primarySchedule.update((ps) => (ps === undefined || forceRefresh ? remotePrimarySchedule : ps)) initialPrimarySchedule.set(structuredClone(remotePrimarySchedule))