From dc1f4a59b09c4f1cef2eb2d7d01612e6f7e598f3 Mon Sep 17 00:00:00 2001 From: Denozordec Date: Wed, 8 Apr 2026 15:59:17 +0700 Subject: [PATCH] refactor: update job kind display logic in schedule page Replaced the job kind filter with a new function to improve the display of job kinds in the schedule page. Introduced a derived map for module names to enhance job information presentation. This change streamlines the rendering of job details, improving clarity and user experience. --- web/src/routes/schedule/+page.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/src/routes/schedule/+page.svelte b/web/src/routes/schedule/+page.svelte index f94d822..13ffde6 100644 --- a/web/src/routes/schedule/+page.svelte +++ b/web/src/routes/schedule/+page.svelte @@ -16,7 +16,8 @@ import { toast } from 'svelte-sonner'; import RefreshCw from '@lucide/svelte/icons/refresh-cw'; import CalendarClock from '@lucide/svelte/icons/calendar-clock'; - import { jobKindFilterRu, jobStatusRu, moduleTypeRu } from '$lib/ui-labels.js'; + import { jobStatusRu, moduleTypeRu } from '$lib/ui-labels.js'; + import { jobKindTitle } from '$lib/operations/job-kind-label.js'; let modules = $state([]); let jobs = $state([]); @@ -74,6 +75,7 @@ } const refreshJobs = $derived(jobs.filter((j) => j.kind === 'module_refresh')); + const moduleNameById = $derived(new Map(modules.map((m) => [m.id, m.name]))); const runningJobsCount = $derived(jobs.filter((j) => j.status === 'running' || j.status === 'queued').length); const failedJobsCount = $derived(jobs.filter((j) => j.status === 'failed').length); @@ -175,7 +177,7 @@ {#each jobs as j (j.job_id)} - {jobKindFilterRu(j.kind)} + {jobKindTitle(j, moduleNameById)} {jobStatusRu(j.status)} {j.created_at ? new Date(j.created_at).toLocaleString('ru') : '—'} {j.error ?? ''}