diff --git a/frontend/src/routes/admin/system/+page.svelte b/frontend/src/routes/admin/system/+page.svelte index f7a61332..81779e64 100644 --- a/frontend/src/routes/admin/system/+page.svelte +++ b/frontend/src/routes/admin/system/+page.svelte @@ -11,7 +11,6 @@ let backfillHashesLoading = $state(false); type ImportStatus = { state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED'; statusCode: string; - message: string; processed: number; startedAt: string | null; }; diff --git a/frontend/src/routes/admin/system/ImportStatusCard.svelte b/frontend/src/routes/admin/system/ImportStatusCard.svelte index ae075d97..ac6d23f5 100644 --- a/frontend/src/routes/admin/system/ImportStatusCard.svelte +++ b/frontend/src/routes/admin/system/ImportStatusCard.svelte @@ -4,7 +4,6 @@ import { m } from '$lib/paraglide/messages.js'; type ImportStatus = { state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED'; statusCode: string; - message: string; processed: number; startedAt: string | null; }; @@ -16,6 +15,12 @@ let { importStatus: ImportStatus | null; ontrigger: () => void; } = $props(); + +const failureMessage = $derived( + importStatus?.statusCode === 'IMPORT_FAILED_NO_SPREADSHEET' + ? m.admin_system_import_failed_no_spreadsheet() + : m.admin_system_import_failed_internal() +);
{importStatus.processed}
@@ -40,28 +45,26 @@ let { {:else if importStatus?.state === 'DONE'}{importStatus.processed}
-+
{m.admin_system_import_status_done_label()}
-{m.admin_system_import_status_done()}
+{m.admin_system_import_status_done()}
- {importStatus.statusCode === 'IMPORT_FAILED_NO_SPREADSHEET' - ? m.admin_system_import_failed_no_spreadsheet() - : m.admin_system_import_failed_internal()} + {failureMessage}
@@ -72,7 +75,7 @@ let { diff --git a/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts b/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts index 1c98fe99..0c47d0ec 100644 --- a/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts +++ b/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts @@ -1,4 +1,4 @@ -import { describe, it } from 'vitest'; +import { describe, it, vi } from 'vitest'; import { render } from 'vitest-browser-svelte'; import { expect } from '@vitest/browser/context'; import ImportStatusCard from './ImportStatusCard.svelte'; @@ -6,7 +6,6 @@ import ImportStatusCard from './ImportStatusCard.svelte'; type ImportStatus = { state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED'; statusCode: string; - message: string; processed: number; startedAt: string | null; }; @@ -14,7 +13,6 @@ type ImportStatus = { const makeStatus = (overrides: Partial