diff --git a/admin/src/lib/api.ts b/admin/src/lib/api.ts index 4cab84b..eb5a5c8 100644 --- a/admin/src/lib/api.ts +++ b/admin/src/lib/api.ts @@ -63,11 +63,14 @@ export interface QueueItem { last_error: string next_attempt: string created_at: string + /** Given up for good: never retried, kept for a week so the admin can see it. */ + failed: boolean } export interface Queue { pending: number retrying: number + failed: number oldest: string | null items: QueueItem[] } diff --git a/admin/src/pages/QueuePage.test.tsx b/admin/src/pages/QueuePage.test.tsx index 9922026..0e56c46 100644 --- a/admin/src/pages/QueuePage.test.tsx +++ b/admin/src/pages/QueuePage.test.tsx @@ -11,6 +11,7 @@ const item = (id: number, over: Partial = {}): QueueItem => ({ last_error: '', next_attempt: '2030-01-02T03:04:05Z', created_at: '2030-01-01T00:00:00Z', + failed: false, ...over, }) @@ -51,7 +52,7 @@ describe('queue page', () => { expect(within(fresh).getByText('—')).toBeInTheDocument() expect(screen.getByText('Pending').nextElementSibling).toHaveTextContent('2') - expect(screen.getByText('Retrying').nextElementSibling).toHaveTextContent('1') + expect(screen.getByText('Retrying', { selector: 'div' }).nextElementSibling).toHaveTextContent('1') expect(screen.getByText('Oldest').nextElementSibling).toHaveTextContent('2030-01-01 00:00 UTC') }) @@ -68,6 +69,26 @@ describe('queue page', () => { expect(screen.queryByText(/showing/i)).not.toBeInTheDocument() }) + it('shows failed deliveries apart from pending ones, with the reason', async () => { + await setup([ + item(1), + item(2, { attempts: 2, last_error: 'connection refused' }), + item(3, { attempts: 1, failed: true, last_error: 'refused by the relay: 554 policy rejection' }), + ]) + const failed = (await screen.findByText('user3@example.com')).closest('tr')! + expect(within(failed).getByText('Failed')).toBeInTheDocument() + expect(within(failed).getByText(/refused by the relay: 554 policy rejection/)).toBeInTheDocument() + expect(within(failed).getByText('—', { selector: 'td' })).toBeInTheDocument() // never retried: no next attempt + expect(within(screen.getByText('user2@example.com').closest('tr')!).getByText('Retrying')).toBeInTheDocument() + expect(within(screen.getByText('user1@example.com').closest('tr')!).getByText('Waiting')).toBeInTheDocument() + + expect(screen.getByText('Pending').nextElementSibling).toHaveTextContent('2') + expect(screen.getByText('Retrying', { selector: 'div' }).nextElementSibling).toHaveTextContent('1') + expect(screen.getByText('Failed', { selector: 'div' }).nextElementSibling).toHaveTextContent('1') + const rows = screen.getAllByRole('row').slice(1).map((r) => r.textContent ?? '') + expect(rows[0]).toContain('user3@example.com') // failed first + }) + it('refreshes on demand', async () => { const { user, state } = await setup([item(1)]) await screen.findByText('user1@example.com') diff --git a/admin/src/pages/QueuePage.tsx b/admin/src/pages/QueuePage.tsx index b5d6967..be0cc1d 100644 --- a/admin/src/pages/QueuePage.tsx +++ b/admin/src/pages/QueuePage.tsx @@ -10,6 +10,7 @@ import { AlertDialogHeader, AlertDialogTitle, } from '@/components/ui/alert-dialog' +import { Badge } from '@/components/ui/badge' import { Button } from '@/components/ui/button' import { Card, CardContent } from '@/components/ui/card' import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table' @@ -38,9 +39,10 @@ export function QueuePage() { {q && ( <> -
+
+
{q.items.length === 0 ? ( @@ -50,6 +52,7 @@ export function QueuePage() { Recipient + State Attempts Last error Next attempt @@ -60,9 +63,18 @@ export function QueuePage() { {q.items.map((i) => ( {i.recipient} + + {i.failed ? ( + Failed + ) : i.attempts > 0 ? ( + Retrying + ) : ( + Waiting + )} + {i.attempts} - {i.last_error || '—'} - {formatDate(i.next_attempt)} + {i.last_error || '—'} + {i.failed ? '—' : formatDate(i.next_attempt)}