diff --git a/frontend/src/lib/components/runs/useJobsLoader.svelte.ts b/frontend/src/lib/components/runs/useJobsLoader.svelte.ts index 9c0abb2015..de100937fc 100644 --- a/frontend/src/lib/components/runs/useJobsLoader.svelte.ts +++ b/frontend/src/lib/components/runs/useJobsLoader.svelte.ts @@ -133,7 +133,7 @@ export function useJobsLoader(args: () => UseJobLoaderArgs) { ]) }) } - promise = CancelablePromiseUtils.pipe(promise, () => { + promise = CancelablePromiseUtils.finallyDo(promise, () => { if (slowStreamIntervalId) { clearInterval(slowStreamIntervalId) slowStreamIntervalId = undefined @@ -161,7 +161,7 @@ export function useJobsLoader(args: () => UseJobLoaderArgs) { ) }, 15000) paramChangePromise = loadJobsIntern(false, size) - paramChangePromise = CancelablePromiseUtils.pipe(paramChangePromise, () => { + paramChangePromise = CancelablePromiseUtils.finallyDo(paramChangePromise, () => { if (slowStreamIntervalId) { clearInterval(slowStreamIntervalId) slowStreamIntervalId = undefined @@ -687,6 +687,10 @@ export function useJobsLoader(args: () => UseJobLoaderArgs) { return () => { clearTimeout(paramChangeTimeout) paramChangePromise?.cancel() + if (slowStreamIntervalId) { + clearInterval(slowStreamIntervalId) + slowStreamIntervalId = undefined + } } }) $effect(() => {