Minor fix to timeout cleanup

Author: zonia3000

src/lib/components/jobs/JobsList.svelte

@@ -121,14 +121,15 @@
 	const updateJobsInterval = env.PUBLIC_UPDATE_JOBS_INTERVAL
 		? parseInt(env.PUBLIC_UPDATE_JOBS_INTERVAL)
 		: 3000;
-	let updateJobsTimeout = null;
+	let updateJobsTimeout = undefined;
 
 	async function updateJobsInBackground() {
 		const jobsToCheck = jobs.filter((j) => j.status === 'running' || j.status === 'submitted');
 		if (jobsToCheck.length > 0) {
 			jobs = await jobUpdater();
 			tableHandler.setRows(jobs);
 		}
+		clearTimeout(updateJobsTimeout);
 		updateJobsTimeout = setTimeout(updateJobsInBackground, updateJobsInterval);
 	}
 
@@ -137,9 +138,7 @@
 	});
 
 	onDestroy(() => {
-		if (updateJobsTimeout) {
-			clearTimeout(updateJobsTimeout);
-		}
+		clearTimeout(updateJobsTimeout);
 	});
 </script>
 

src/routes/projects/[projectId]/workflows/experimental/[workflowId]/+page.svelte

@@ -1,6 +1,6 @@
 <script>
 	import { env } from '$env/dynamic/public';
-	import { onMount } from 'svelte';
+	import { onDestroy, onMount } from 'svelte';
 	import { writable } from 'svelte/store';
 	import { beforeNavigate } from '$app/navigation';
 	import { page } from '$app/stores';
@@ -498,15 +498,15 @@
 		const runningOrSubmitted = Object.values(statuses).filter(
 			(s) => s === 'running' || s === 'submitted'
 		);
-		if (statusWatcherTimer) {
-			if (runningOrSubmitted.length === 0) {
-				clearTimeout(statusWatcherTimer);
-				statusWatcherTimer = undefined;
-			}
-		} else if (runningOrSubmitted.length > 0) {
-			statusWatcherTimer = setInterval(loadJobsStatus, updateJobsInterval);
+		if (runningOrSubmitted.length > 0) {
+			clearTimeout(statusWatcherTimer);
+			statusWatcherTimer = setTimeout(loadJobsStatus, updateJobsInterval);
 		}
 	}
+
+	onDestroy(() => {
+		clearTimeout(statusWatcherTimer);
+	});
 </script>
 
 <div class="row">