From cf15ef5795eec797569e665ef23e1bb50f5a5cbb Mon Sep 17 00:00:00 2001 From: Guilhem Date: Thu, 8 Jan 2026 06:29:49 +0000 Subject: [PATCH] improve job preview popover layout (#7485) --- .../src/lib/components/jobs/JobPreview.svelte | 87 ++++++++++--------- .../(root)/(logged)/schedules/+page.svelte | 2 +- 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/frontend/src/lib/components/jobs/JobPreview.svelte b/frontend/src/lib/components/jobs/JobPreview.svelte index 75ff539ddb..972cff6799 100644 --- a/frontend/src/lib/components/jobs/JobPreview.svelte +++ b/frontend/src/lib/components/jobs/JobPreview.svelte @@ -16,15 +16,18 @@ import { forLater } from '$lib/forLater' import DurationMs from '../DurationMs.svelte' import { workspaceStore } from '$lib/stores' + import { twMerge } from 'tailwind-merge' const POPUP_HEIGHT = 320 as const interface Props { id: string children?: import('svelte').Snippet<[any]> + class?: string } - let { id, children }: Props = $props() + let { id, children, class: clazz }: Props = $props() + let job: Job | undefined = $state(undefined) let hovered = $state(false) let timeout: number | undefined @@ -101,11 +104,51 @@ {#if open}
-
+
+
+ Arguments + +
+
+ {#if job && 'scheduled_for' in job && !job.running && job.scheduled_for && forLater(job.scheduled_for)} +
+
Job is scheduled for
+
{new Date(job?.['scheduled_for']).toLocaleString()}
+
+ {/if} + {#if job?.type === 'CompletedJob'} + Result + + {:else if job && `running` in job ? job.running : false} +
Job is still running
+ + {/if} +
+
+
{#if job?.started_at} {new Date(job?.['started_at']).toLocaleString()} {/if} @@ -125,40 +168,6 @@ {/each} {/if}
-
- -
-
- {#if job && 'scheduled_for' in job && !job.running && job.scheduled_for && forLater(job.scheduled_for)} -
-
Job is scheduled for
-
{new Date(job?.['scheduled_for']).toLocaleString()}
-
- {/if} - {#if job?.type === 'CompletedJob'} - - {:else if job && `running` in job ? job.running : false} -
Job is still running
- - {/if} -
{/if}
diff --git a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte index 5420fe36f8..61e498a58b 100644 --- a/frontend/src/routes/(root)/(logged)/schedules/+page.svelte +++ b/frontend/src/routes/(root)/(logged)/schedules/+page.svelte @@ -520,7 +520,7 @@ {#each jobs ?? [] as job} {@const h = (avg_s ? job.duration_ms / avg_s : 1) * 7 + 3} - +