diff --git a/app/(protected)/hse/capa/[id]/page.tsx b/app/(protected)/hse/capa/[id]/page.tsx
index 2589752..d2086f1 100644
--- a/app/(protected)/hse/capa/[id]/page.tsx
+++ b/app/(protected)/hse/capa/[id]/page.tsx
@@ -61,7 +61,7 @@ export default async function CapaDetailPage({ params }: Props) {
if (!capa) notFound()
const photos = await asAdmin(db =>
- db.select({ id: evidenceFiles.id, fileUrl: evidenceFiles.fileUrl, fileType: evidenceFiles.fileType })
+ db.select({ id: evidenceFiles.id, fileUrl: evidenceFiles.fileUrl })
.from(evidenceFiles)
.where(and(eq(evidenceFiles.capaId, id), eq(evidenceFiles.deleted, false)))
.orderBy(asc(evidenceFiles.uploadedAt))
@@ -122,11 +122,11 @@ export default async function CapaDetailPage({ params }: Props) {
)}
{photos.length > 0 && (
- {photos.map(p => (
+ {photos.map((p, i) => (
-
{/* eslint-disable-next-line @next/next/no-img-element */}
-
+
))}
diff --git a/components/capa/submit-verification-form.tsx b/components/capa/submit-verification-form.tsx
index fe041a5..6fa10f0 100644
--- a/components/capa/submit-verification-form.tsx
+++ b/components/capa/submit-verification-form.tsx
@@ -38,12 +38,15 @@ export function SubmitVerificationForm({ capaId }: Props) {
if (!res.ok) {
const data = await res.json().catch(() => ({}))
setError(Array.isArray(data.details) ? data.details.join('. ') : (data.error ?? 'Submit failed. Please try again.'))
+ setLoading(false)
return
}
router.refresh()
- } finally {
- setLoading(false)
+ return
+ } catch {
+ setError('Network error. Please try again.')
}
+ setLoading(false)
}
return (
diff --git a/tests/components/capa/submit-verification-form.test.tsx b/tests/components/capa/submit-verification-form.test.tsx
index 08a6f08..c60efd8 100644
--- a/tests/components/capa/submit-verification-form.test.tsx
+++ b/tests/components/capa/submit-verification-form.test.tsx
@@ -1,11 +1,26 @@
-import { describe, it, expect, vi } from 'vitest'
-import { render, screen, fireEvent } from '@testing-library/react'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { render, screen, fireEvent, waitFor } from '@testing-library/react'
import { SubmitVerificationForm } from '@/components/capa/submit-verification-form'
+const { refresh } = vi.hoisted(() => ({ refresh: vi.fn() }))
vi.mock('next/navigation', () => ({
- useRouter: () => ({ refresh: vi.fn() }),
+ useRouter: () => ({ refresh }),
}))
+const fetchMock = vi.fn()
+beforeEach(() => {
+ refresh.mockClear()
+ fetchMock.mockReset()
+ vi.stubGlobal('fetch', fetchMock)
+})
+
+function fill(container: HTMLElement, names: string[] = ['proof.jpg']) {
+ fireEvent.change(screen.getByLabelText('Completion note'), { target: { value: 'Rack fixed' } })
+ const input = container.querySelector('input[type="file"]') as HTMLInputElement
+ const files = names.map(n => new File(['x'], n, { type: 'image/jpeg' }))
+ fireEvent.change(input, { target: { files } })
+}
+
function button() {
return screen.getByRole('button', { name: 'Submit for Verification' }) as HTMLButtonElement
}
@@ -24,4 +39,53 @@ describe('SubmitVerificationForm', () => {
expect(button().disabled).toBe(false)
expect(screen.getByText('proof.jpg')).toBeTruthy()
})
+
+ it('posts FormData on success, refreshes and stays disabled', async () => {
+ fetchMock.mockResolvedValue({ ok: true, json: async () => ({ ok: true }) })
+ const { container } = render()
+ fill(container)
+ fireEvent.click(button())
+ await waitFor(() => expect(refresh).toHaveBeenCalledTimes(1))
+ const [url, init] = fetchMock.mock.calls[0]
+ expect(url).toBe('/api/capa/abc/submit')
+ expect(init.method).toBe('POST')
+ const fd = init.body as FormData
+ expect(fd.get('note')).toBe('Rack fixed')
+ expect((fd.getAll('files') as File[]).map(f => f.name)).toEqual(['proof.jpg'])
+ expect((screen.getByRole('button', { name: 'Submitting…' }) as HTMLButtonElement).disabled).toBe(true)
+ })
+
+ it('shows server details and re-enables on 422', async () => {
+ fetchMock.mockResolvedValue({ ok: false, json: async () => ({ error: 'bad', details: ['Note too short', 'Bad photo'] }) })
+ const { container } = render()
+ fill(container)
+ fireEvent.click(button())
+ expect((await screen.findByRole('alert')).textContent).toBe('Note too short. Bad photo')
+ expect(button().disabled).toBe(false)
+ expect(refresh).not.toHaveBeenCalled()
+ })
+
+ it('shows a network error and re-enables when fetch rejects', async () => {
+ fetchMock.mockRejectedValue(new Error('offline'))
+ const { container } = render()
+ fill(container)
+ fireEvent.click(button())
+ expect((await screen.findByRole('alert')).textContent).toBe('Network error. Please try again.')
+ expect(button().disabled).toBe(false)
+ })
+
+ it('disables submit again after removing the only file', () => {
+ const { container } = render()
+ fill(container)
+ expect(button().disabled).toBe(false)
+ fireEvent.click(screen.getByLabelText('Remove proof.jpg'))
+ expect(button().disabled).toBe(true)
+ })
+
+ it('caps the list at 5 photos', () => {
+ const { container } = render()
+ fill(container, ['1.jpg', '2.jpg', '3.jpg', '4.jpg', '5.jpg', '6.jpg'])
+ expect(screen.getAllByText(/^\d\.jpg$/)).toHaveLength(5)
+ expect(screen.queryByText('6.jpg')).toBeNull()
+ })
})