diff --git a/frontend/src/routes/admin/system/+page.svelte b/frontend/src/routes/admin/system/+page.svelte index 81779e64..0f09b24f 100644 --- a/frontend/src/routes/admin/system/+page.svelte +++ b/frontend/src/routes/admin/system/+page.svelte @@ -2,19 +2,13 @@ import { onDestroy } from 'svelte'; import { m } from '$lib/paraglide/messages.js'; import ImportStatusCard from './ImportStatusCard.svelte'; +import type { ImportStatus } from './types.js'; let backfillResult: number | null = $state(null); let backfillLoading = $state(false); let backfillHashesResult: number | null = $state(null); let backfillHashesLoading = $state(false); -type ImportStatus = { - state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED'; - statusCode: string; - processed: number; - startedAt: string | null; -}; - type ThumbnailStatus = { state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED'; message: string; diff --git a/frontend/src/routes/admin/system/ImportStatusCard.svelte b/frontend/src/routes/admin/system/ImportStatusCard.svelte index ac6d23f5..01b565c4 100644 --- a/frontend/src/routes/admin/system/ImportStatusCard.svelte +++ b/frontend/src/routes/admin/system/ImportStatusCard.svelte @@ -1,12 +1,6 @@
{m.admin_system_import_description()}
{#if importStatus?.state === 'RUNNING'} @@ -36,16 +32,18 @@ const failureMessage = $derived( class="inline-block h-5 w-5 animate-spin rounded-full border-2 border-ink-3 border-t-brand-mint motion-reduce:animate-none" >{importStatus.processed}
-+
+ {importStatus.processed} +
+{m.admin_system_import_status_running()}
{importStatus.processed}
-+
{importStatus.processed}
+{m.admin_system_import_status_done_label()}
{m.admin_system_import_status_done()}
diff --git a/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts b/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts index b347f5ef..ec37d46c 100644 --- a/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts +++ b/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts @@ -2,13 +2,7 @@ import { describe, expect, it, vi } from 'vitest'; import { render } from 'vitest-browser-svelte'; import { m } from '$lib/paraglide/messages.js'; import ImportStatusCard from './ImportStatusCard.svelte'; - -type ImportStatus = { - state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED'; - statusCode: string; - processed: number; - startedAt: string | null; -}; +import type { ImportStatus } from './types.js'; const makeStatus = (overrides: Partial