mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-13 07:40:59 +00:00
Maurice
6a3d4b1281
Attaching a receipt no longer lets the budget domain delete one. Trashing the file was reachable from the REST route, the MCP tool and the plugin RPC, none of which check file_delete, and a receipt id is any file on the trip, so anyone who could edit an expense could trash a document they were not allowed to touch. A concurrent edit could do it by accident: the client sends the full set of receipt ids from a snapshot taken when the form opened, so saving an expense someone else had just attached a file to moved that file to the trash. Removing a receipt now removes the link and nothing else. The link row is treated as shared, because it is. One row can tie a file to a place and to an expense at once, so the sync clears only the receipt half and leaves the rest, the foreign key is SET NULL rather than CASCADE, and a receipt already in the trash keeps its link so restoring it comes back attached. The upload and its rollback moved into one module both shells call. It was copied into six places, and all six rolled back with the permanent-delete route, which only accepts a file that is already in the trash and therefore answered 404 every time: a failed save left every uploaded file on the trip, attached to the expense, and the next attempt uploaded another copy. It now trashes first, keeps the pending files for the retry, and says so when a file could not be removed instead of swallowing it. Escape in the receipt viewer no longer closes the expense form behind it, the download fallback uses a real accent class rather than a utility that does not exist, and the upload indicator is actually switched on. Tests: the receipt link behaviour on both service paths, the four new branches in the files service, the upload module, and the viewer.
100 lines
4.6 KiB
TypeScript
100 lines
4.6 KiB
TypeScript
// FE-BUDGET-PREVIEW-001 to FE-BUDGET-PREVIEW-008: the receipt viewer that opens
|
|
// on top of the expense form.
|
|
import { vi } from 'vitest'
|
|
import { render, screen, waitFor, fireEvent } from '../../../tests/helpers/render'
|
|
import { ReceiptPreviewModal } from './ReceiptPreviewModal'
|
|
import type { BudgetItemReceipt } from '../../types'
|
|
|
|
const authUrl = vi.hoisted(() => ({ get: vi.fn() }))
|
|
vi.mock('../../api/authUrl', () => ({ getAuthUrl: (...a: unknown[]) => authUrl.get(...a) }))
|
|
|
|
function receipt(over: Partial<BudgetItemReceipt> = {}): BudgetItemReceipt {
|
|
return {
|
|
id: 1,
|
|
filename: 'stored.jpg',
|
|
original_name: 'lunch.jpg',
|
|
mime_type: 'image/jpeg',
|
|
file_size: 100,
|
|
url: '/uploads/files/stored.jpg',
|
|
...over,
|
|
} as BudgetItemReceipt
|
|
}
|
|
|
|
beforeEach(() => {
|
|
authUrl.get.mockReset().mockResolvedValue('/signed/stored.jpg')
|
|
})
|
|
|
|
describe('ReceiptPreviewModal', () => {
|
|
it('FE-BUDGET-PREVIEW-001: renders an image receipt once the signed url is in', async () => {
|
|
render(<ReceiptPreviewModal receipts={[receipt()]} onClose={vi.fn()} />)
|
|
await waitFor(() => expect(screen.getByRole('img')).toHaveAttribute('src', '/signed/stored.jpg'))
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-002: renders a PDF in a frame rather than an image', async () => {
|
|
render(<ReceiptPreviewModal receipts={[receipt({ mime_type: 'application/pdf', original_name: 'bill.pdf' })]} onClose={vi.fn()} />)
|
|
// The viewer renders through a portal, so it lives on document.body.
|
|
await waitFor(() => expect(document.body.querySelector('object[type="application/pdf"]')).not.toBeNull())
|
|
expect(screen.queryByRole('img')).toBeNull()
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-003: a type it cannot show falls back instead of rendering an empty frame', async () => {
|
|
render(<ReceiptPreviewModal receipts={[receipt({ mime_type: 'application/zip', original_name: 'receipts.zip' })]} onClose={vi.fn()} />)
|
|
await waitFor(() => expect(authUrl.get).toHaveBeenCalled())
|
|
expect(document.body.querySelector('object')).toBeNull()
|
|
expect(screen.queryByRole('img')).toBeNull()
|
|
expect(screen.getAllByText('receipts.zip').length).toBeGreaterThan(0)
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-004: a rejected signed url leaves the viewer up rather than blank-screening', async () => {
|
|
authUrl.get.mockRejectedValue(new Error('403'))
|
|
render(<ReceiptPreviewModal receipts={[receipt()]} onClose={vi.fn()} />)
|
|
await waitFor(() => expect(authUrl.get).toHaveBeenCalled())
|
|
expect(screen.getAllByText('lunch.jpg').length).toBeGreaterThan(0)
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-005: arrows walk the list and stop at both ends', async () => {
|
|
const two = [receipt({ id: 1, original_name: 'one.jpg' }), receipt({ id: 2, original_name: 'two.jpg' })]
|
|
render(<ReceiptPreviewModal receipts={two} onClose={vi.fn()} />)
|
|
await waitFor(() => expect(screen.getAllByText('one.jpg').length).toBeGreaterThan(0))
|
|
|
|
fireEvent.keyDown(window, { key: 'ArrowLeft' })
|
|
expect(screen.getAllByText('one.jpg').length).toBeGreaterThan(0)
|
|
|
|
fireEvent.keyDown(window, { key: 'ArrowRight' })
|
|
await waitFor(() => expect(screen.getAllByText('two.jpg').length).toBeGreaterThan(0))
|
|
|
|
fireEvent.keyDown(window, { key: 'ArrowRight' })
|
|
expect(screen.getAllByText('two.jpg').length).toBeGreaterThan(0)
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-006: an out-of-range initialIndex is clamped instead of rendering nothing', async () => {
|
|
const two = [receipt({ id: 1, original_name: 'one.jpg' }), receipt({ id: 2, original_name: 'two.jpg' })]
|
|
render(<ReceiptPreviewModal receipts={two} initialIndex={99} onClose={vi.fn()} />)
|
|
await waitFor(() => expect(screen.getAllByText('two.jpg').length).toBeGreaterThan(0))
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-007: Escape closes the viewer and is stopped before the form behind it sees it', async () => {
|
|
const onClose = vi.fn()
|
|
const parent = vi.fn()
|
|
document.addEventListener('keydown', parent)
|
|
try {
|
|
render(<ReceiptPreviewModal receipts={[receipt()]} onClose={onClose} />)
|
|
await waitFor(() => expect(authUrl.get).toHaveBeenCalled())
|
|
|
|
fireEvent.keyDown(window, { key: 'Escape' })
|
|
expect(onClose).toHaveBeenCalledTimes(1)
|
|
// The expense form registers its own Escape handler on `document`; one
|
|
// keypress must not close both and throw away the user's edits.
|
|
expect(parent).not.toHaveBeenCalled()
|
|
} finally {
|
|
document.removeEventListener('keydown', parent)
|
|
}
|
|
})
|
|
|
|
it('FE-BUDGET-PREVIEW-008: an empty list renders nothing at all', () => {
|
|
render(<ReceiptPreviewModal receipts={[]} onClose={vi.fn()} />)
|
|
expect(document.body.querySelector('object')).toBeNull()
|
|
expect(screen.queryByRole('img')).toBeNull()
|
|
})
|
|
})
|