feat(app): editor views tab, drawing upload and cleaning, guarded crops

This commit is contained in:
bchanot committed 2026-11-04 13:02:30 +01:00
1 parent d163b2ce9a
commit 8343528be9
22 files changed
+2164 -4

No files matched your search

@@ -0,0 +1,268 @@
/** Lot G: the upload flow of a drawing (check, clean, register, upload, confirm, attach). */
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
cleanup,
render,
screen,
waitFor,
within,
} from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { SheetFailure } from '@faunosteo/supabase'
import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
import ViewsTab from '@/components/editor/tabs/ViewsTab'
import { cleanSvg } from '@/editor/core/cleaning'
import { MAX_DRAWING_BYTES } from '@/editor/drawingUpload'
import { useLocaleStore } from '@/state/localeStore'
import { ASSET } from '../helpers/editorFixtures'
import { openReady, resetStore, sb, store } from '../helpers/editorHarness'
vi.mock('@/lib/supabase', () => ({ getSupabaseClient: () => ({}) }))
vi.mock('@faunosteo/supabase', async (orig) => ({
...(await orig<typeof import('@faunosteo/supabase')>()),
getSheetVersion: vi.fn(),
downloadSheetDrawing: vi.fn(),
saveSheetDraft: vi.fn(),
getOfficialSheetAdmin: vi.fn(),
submitSheetReview: vi.fn(),
registerSheetAsset: vi.fn(),
listSheetAssets: vi.fn(),
uploadSheetDrawing: vi.fn(),
confirmSheetAssetUpload: vi.fn(),
}))
const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
const NEW_ASSET = '22222222-2222-4222-8222-222222222222'
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
const mainAsset = () => doc().views[0].svg_asset_id
const svg = (viewBox: string, inner = '<rect width="4" height="4"/>') =>
`<svg xmlns="http://www.w3.org/2000/svg" viewBox="${viewBox}">${inner}</svg>`
/** The stored form the core would keep for a file, as the server would serve it. */
function storedOf(text: string) {
const cleaned = cleanSvg(new TextEncoder().encode(text))
if (!cleaned.ok || !cleaned.value.stored || !cleaned.value.sha256)
throw new Error('bad')
return {
...cleaned.value,
bytes: new TextEncoder().encode(cleaned.value.stored),
}
}
function serverGets(text: string, uploadedAt: string | null = null) {
const stored = storedOf(text)
sb.registerSheetAsset.mockResolvedValue(NEW_ASSET)
sb.listSheetAssets.mockResolvedValue([
{
id: NEW_ASSET,
sha256: stored.sha256!,
byte_size: stored.byte_size!,
uploaded_at: uploadedAt,
},
])
sb.uploadSheetDrawing.mockResolvedValue('uploaded')
sb.confirmSheetAssetUpload.mockResolvedValue(NEW_ASSET)
const fresh = (hash: string) =>
hash === stored.sha256 ? stored.bytes : undefined
sb.downloadSheetDrawing.mockImplementation(
async (_c, hash) => fresh(hash) ?? (await baseBytes()),
)
return stored
}
async function baseBytes() {
const { svgBytes } = await import('../helpers/editorFixtures')
return svgBytes().bytes
}
async function pick(text: string, name = 'dessin.svg') {
const user = userEvent.setup()
const input = screen.getByTestId('view-view-main-file') as HTMLInputElement
await user.upload(input, new File([text], name, { type: 'image/svg+xml' }))
return user
}
beforeEach(async () => {
useLocaleStore.setState({ locale: 'fr' })
await openReady()
render(<ViewsTab {...props} />)
})
afterEach(() => {
cleanup()
resetStore()
})
describe('drawing upload flow', () => {
it('a clean file goes register, upload, confirm, hold, attach with no dialog', async () => {
const stored = serverGets(svg('0 0 200 100'))
await pick(svg('0 0 200 100'))
await waitFor(() => expect(mainAsset()).toBe(NEW_ASSET))
expect(screen.queryByRole('dialog')).toBeNull()
expect(sb.registerSheetAsset).toHaveBeenCalledWith(
{},
{
sheet_id: 'sheet-1',
sha256: stored.sha256,
byte_size: stored.byte_size,
file_name: 'dessin.svg',
},
)
expect(sb.uploadSheetDrawing).toHaveBeenCalledWith(
{},
stored.sha256,
stored.bytes,
)
expect(sb.confirmSheetAssetUpload).toHaveBeenCalledWith({}, NEW_ASSET)
expect(store.getState().drawings.map((d) => d.asset_id)).toContain(
NEW_ASSET,
)
expect(
await screen.findByText("L'illustration est ajoutée à la vue."),
).toBeTruthy()
})
it('a cleanable file shows the dialog with the core-composed drawing, then uploads on accept', async () => {
const dirty = svg(
'0 0 200 100',
'<style>.a{fill:red}</style><rect class="a" width="4" height="4"/>',
)
serverGets(dirty)
await pick(dirty)
const dialog = await screen.findByRole('dialog')
expect(sb.registerSheetAsset).not.toHaveBeenCalled()
expect(
within(dialog).getByText(/L'élément <style> a été retiré/),
).toBeTruthy()
expect(within(dialog).getByText('style')).toBeTruthy()
expect(
within(dialog).getByTestId('cleaning-preview').querySelector('svg'),
).not.toBeNull()
await userEvent
.setup()
.click(
within(dialog).getByRole('button', {
name: 'Nettoyer et utiliser cette version',
}),
)
await waitFor(() => expect(mainAsset()).toBe(NEW_ASSET))
expect(sb.uploadSheetDrawing).toHaveBeenCalledTimes(1)
})
it('cancelling the cleaning dialog sends nothing', async () => {
const dirty = svg(
'0 0 200 100',
'<style>.a{fill:red}</style><rect class="a" width="4" height="4"/>',
)
serverGets(dirty)
const user = await pick(dirty)
const dialog = await screen.findByRole('dialog')
await user.click(within(dialog).getByRole('button', { name: 'Annuler' }))
expect(sb.registerSheetAsset).not.toHaveBeenCalled()
expect(mainAsset()).toBe(ASSET)
})
it('a rejected file shows its reason and nothing else happens', async () => {
await pick(
'<svg xmlns="http://www.w3.org/2000/svg"><script>alert(1)</script></svg>',
)
expect(await screen.findByText(/contenu actif ou externe/)).toBeTruthy()
await pick('pas un svg')
expect(
await screen.findByText(/n'est pas un dessin SVG utilisable/),
).toBeTruthy()
expect(sb.registerSheetAsset).not.toHaveBeenCalled()
expect(screen.queryByRole('dialog')).toBeNull()
})
it('a file over 2 MiB is refused before it is read', async () => {
const user = userEvent.setup()
const big = new File([new Uint8Array(MAX_DRAWING_BYTES + 1)], 'big.svg', {
type: 'image/svg+xml',
})
await user.upload(
screen.getByTestId('view-view-main-file') as HTMLInputElement,
big,
)
expect(await screen.findByText('Ce fichier dépasse 2 Mio.')).toBeTruthy()
expect(sb.registerSheetAsset).not.toHaveBeenCalled()
})
it('an object already present is confirmed without a second upload', async () => {
serverGets(svg('0 0 200 100'))
sb.uploadSheetDrawing.mockResolvedValue('present')
await pick(svg('0 0 200 100'))
await waitFor(() => expect(mainAsset()).toBe(NEW_ASSET))
expect(sb.confirmSheetAssetUpload).toHaveBeenCalledTimes(1)
})
it('a confirmed row is neither uploaded nor confirmed again', async () => {
serverGets(svg('0 0 200 100'), '2026-11-04T10:00:00Z')
await pick(svg('0 0 200 100'))
await waitFor(() => expect(mainAsset()).toBe(NEW_ASSET))
expect(sb.uploadSheetDrawing).not.toHaveBeenCalled()
expect(sb.confirmSheetAssetUpload).not.toHaveBeenCalled()
})
it('a policy refusal then a confirm that finds the object goes on', async () => {
serverGets(svg('0 0 200 100'))
sb.uploadSheetDrawing.mockRejectedValue(
new SheetFailure('upload.pending_other'),
)
await pick(svg('0 0 200 100'))
await waitFor(() => expect(mainAsset()).toBe(NEW_ASSET))
expect(sb.confirmSheetAssetUpload).toHaveBeenCalledTimes(1)
})
it('a policy refusal then upload_missing is upload.pending_other, view unchanged', async () => {
serverGets(svg('0 0 200 100'))
sb.uploadSheetDrawing.mockRejectedValue(
new SheetFailure('upload.pending_other'),
)
sb.confirmSheetAssetUpload.mockRejectedValue(
new SheetFailure('upload_missing'),
)
await pick(svg('0 0 200 100'))
expect(
await screen.findByText(/en cours d'envoi par un autre compte/),
).toBeTruthy()
expect(mainAsset()).toBe(ASSET)
expect(store.getState().drawings.map((d) => d.asset_id)).not.toContain(
NEW_ASSET,
)
})
it('server kinds are phrased, size_mismatch with its own wording', async () => {
serverGets(svg('0 0 200 100'))
sb.confirmSheetAssetUpload.mockRejectedValue(
new SheetFailure('size_mismatch'),
)
await pick(svg('0 0 200 100'))
expect(
await screen.findByText(/ne correspond pas à celle annoncée/),
).toBeTruthy()
expect(mainAsset()).toBe(ASSET)
})
it('a downloaded object that does not match its hash is an object conflict', async () => {
serverGets(svg('0 0 200 100'))
sb.downloadSheetDrawing.mockResolvedValue(new TextEncoder().encode('autre'))
await pick(svg('0 0 200 100'))
expect(
await screen.findByText(/Un fichier différent existe déjà/),
).toBeTruthy()
expect(mainAsset()).toBe(ASSET)
})
it('a refused frame change leaves the drawing uploaded and held, the view unchanged', async () => {
serverGets(svg('0 0 20 20'))
await pick(svg('0 0 20 20'))
expect(await screen.findByText(/géométrie de : N\./)).toBeTruthy()
expect(screen.getByText(/L'illustration reste téléversée/)).toBeTruthy()
expect(mainAsset()).toBe(ASSET)
expect(store.getState().drawings.map((d) => d.asset_id)).toContain(
NEW_ASSET,
)
})
})
@@ -0,0 +1,332 @@
/** Lot G: Vues et illustrations (states, detail views, crop group under the frame check). */
import { createHash } from 'node:crypto'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { cleanup, render, screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import type {
AnatomicalSheetDocument,
NewElement,
} from '@faunosteo/core-wasm/types'
import ViewsTab from '@/components/editor/tabs/ViewsTab'
import { useLocaleStore } from '@/state/localeStore'
import { ASSET, emptyText, insert, point } from '../helpers/editorFixtures'
import {
baseText,
openReady,
resetStore,
sb,
store,
versionAnswer,
} from '../helpers/editorHarness'
vi.mock('@/lib/supabase', () => ({ getSupabaseClient: () => ({}) }))
vi.mock('@faunosteo/supabase', async (orig) => ({
...(await orig<typeof import('@faunosteo/supabase')>()),
getSheetVersion: vi.fn(),
downloadSheetDrawing: vi.fn(),
saveSheetDraft: vi.fn(),
getOfficialSheetAdmin: vi.fn(),
submitSheetReview: vi.fn(),
}))
const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
const detail = (
viewBox: object | null = { min_x: 0, min_y: 0, width: 100, height: 100 },
) =>
({
kind: 'view',
value: {
kind: 'detail',
id: 'view-d',
name: { fr: 'Détail', en: 'Detail' },
svg_asset_id: null,
view_box: viewBox,
parent_view_id: 'view-main',
},
}) as NewElement
beforeEach(() => useLocaleStore.setState({ locale: 'fr' }))
afterEach(() => {
cleanup()
resetStore()
})
async function openCrop(text: string) {
await openReady({ text })
const user = userEvent.setup()
render(<ViewsTab {...props} />)
await user.click(
screen.getByRole('button', { name: 'Modifier le recadrage' }),
)
return user
}
const CROP_IDS: Record<string, string> = {
'x minimum': 'min_x',
'y minimum': 'min_y',
largeur: 'width',
hauteur: 'height',
}
const cropField = (name: string) =>
document.getElementById(
`view-view-d-crop-${CROP_IDS[name]}`,
) as HTMLInputElement
describe('Vues et illustrations: drawing states', () => {
it('a valid main drawing shows its state and no hint', async () => {
await openReady()
render(<ViewsTab {...props} />)
expect(screen.getByText('Illustration valide')).toBeTruthy()
expect(
screen.queryByText(/Utilisez « Choisir une illustration »/),
).toBeNull()
})
it('a main view without drawing shows the hint pointing at the button', async () => {
await openReady({ text: emptyText() })
render(<ViewsTab {...props} />)
expect(screen.getByText('Aucune illustration')).toBeTruthy()
expect(
screen.getByText(/Utilisez « Choisir une illustration »/),
).toBeTruthy()
expect(screen.getByText(/n'est pas mesurable/)).toBeTruthy()
expect(
screen.getByRole('button', { name: 'Choisir une illustration' }),
).toBeTruthy()
})
it('a drawing the handle lacks reads as not found', async () => {
store.getState().close()
sb.getSheetVersion.mockResolvedValue(
versionAnswer(baseText(), 3, false) as never,
)
store.getState().open('ver-1', 'user-1', { canEdit: true })
await vi.waitFor(() => expect(store.getState().status).toBe('ready'))
render(<ViewsTab {...props} />)
expect(screen.getByText(/Illustration introuvable/)).toBeTruthy()
expect(
screen.getByText(/Utilisez « Choisir une illustration »/),
).toBeTruthy()
})
it('a rejected drawing shows the core detail', async () => {
const bytes = new TextEncoder().encode(
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"> <rect width="4" height="4"/></svg>',
)
const sha256 = createHash('sha256').update(bytes).digest('hex')
store.getState().close()
sb.getSheetVersion.mockResolvedValue({
...versionAnswer(baseText(), 3, false),
drawings: [{ asset_id: ASSET, sha256 }],
} as never)
sb.downloadSheetDrawing.mockResolvedValue(bytes)
store.getState().open('ver-1', 'user-1', { canEdit: true })
await vi.waitFor(() => expect(store.getState().status).toBe('ready'))
render(<ViewsTab {...props} />)
expect(screen.getByText(/Illustration refusée/)).toBeTruthy()
expect(screen.getByText(/Détail : not_canonical/)).toBeTruthy()
})
it('read-only shows states as text and no action', async () => {
await openReady({ text: insert(baseText(), detail()) })
render(<ViewsTab {...props} readOnly />)
expect(screen.getByText('Illustration valide')).toBeTruthy()
expect(screen.queryByRole('button')).toBeNull()
expect(screen.queryByRole('textbox')).toBeNull()
})
})
describe('Vues et illustrations: detail views', () => {
it('adds a detail view with names and a crop, in one insert', async () => {
await openReady()
const user = userEvent.setup()
render(<ViewsTab {...props} />)
await user.click(screen.getByRole('button', { name: 'Ajouter la vue' }))
expect(screen.getByRole('alert')).toHaveTextContent('Renseignez les noms')
await user.type(document.getElementById('view-new-fr')!, 'Tête')
await user.type(document.getElementById('view-new-en')!, 'Head')
await user.type(document.getElementById('view-new-crop-min_x')!, '10')
await user.click(screen.getByRole('button', { name: 'Ajouter la vue' }))
expect(screen.getByRole('alert')).toHaveTextContent('quatre valeurs')
expect(doc().views).toHaveLength(1)
for (const [key, value] of [
['min_y', '20'],
['width', '30'],
['height', '40'],
]) {
await user.type(document.getElementById(`view-new-crop-${key}`)!, value)
}
await user.click(screen.getByRole('button', { name: 'Ajouter la vue' }))
expect(doc().views).toHaveLength(2)
expect(doc().views[1]).toMatchObject({
kind: 'detail',
name: { fr: 'Tête', en: 'Head' },
parent_view_id: 'view-main',
svg_asset_id: null,
view_box: { min_x: 10, min_y: 20, width: 30, height: 40 },
})
expect(doc().views[1].id).toMatch(/^view-[a-z2-7]{10}$/)
})
it('renames on blur and refuses a blank name locally', async () => {
await openReady({ text: insert(baseText(), detail()) })
const user = userEvent.setup()
render(<ViewsTab {...props} />)
const name = document.getElementById('view-view-d-name-en')!
await user.clear(name)
await user.type(name, 'Lower leg')
await user.tab()
expect(doc().views[1].name).toEqual({ fr: 'Détail', en: 'Lower leg' })
await user.clear(document.getElementById('view-view-d-name-fr')!)
await user.tab()
expect(screen.getByText('Ce champ est obligatoire.')).toBeTruthy()
expect(doc().views[1].name.fr).toBe('Détail')
})
it('deleting a view that holds an annotation lists the dependents', async () => {
const text = insert(
insert(baseText(), detail()),
point('anno-d', 50, 50, 5, 'view-d'),
)
await openReady({ text })
const user = userEvent.setup()
render(<ViewsTab {...props} />)
await user.click(screen.getByRole('button', { name: 'Supprimer' }))
const dialog = await screen.findByRole('dialog')
expect(within(dialog).getByText(/ne peut pas être supprimé/)).toBeTruthy()
expect(doc().views).toHaveLength(2)
})
})
describe('Vues et illustrations: crop group under the frame check', () => {
it('refuses a crop that pushes a point out and keeps the typed values', async () => {
const text = insert(
insert(baseText(), detail()),
point('anno-d', 50, 50, 5, 'view-d'),
)
const user = await openCrop(text)
const before = store.getState().documentText
await user.clear(cropField('x minimum'))
await user.type(cropField('x minimum'), '60{Enter}')
const alert = screen.getByRole('alert')
expect(alert).toHaveTextContent('Non appliqué')
expect(alert).toHaveTextContent(/géométrie de : N/)
expect(store.getState().documentText).toBe(before)
expect(store.getState().undo).toHaveLength(0)
expect(cropField('x minimum')).toHaveValue('60')
await user.click(
screen.getByRole('button', { name: 'Revenir aux valeurs enregistrées' }),
)
expect(cropField('x minimum')).toHaveValue('0')
expect(screen.queryByText('Non appliqué')).toBeNull()
})
it('applies the four fields as one group when they fit', async () => {
const text = insert(
insert(baseText(), detail()),
point('anno-d', 50, 50, 5, 'view-d'),
)
const user = await openCrop(text)
await user.clear(cropField('x minimum'))
await user.type(cropField('x minimum'), '20')
await user.clear(cropField('largeur'))
await user.type(cropField('largeur'), '60{Enter}')
expect(doc().views[1]).toMatchObject({
view_box: { min_x: 20, width: 60, height: 100 },
})
expect(screen.queryByText('Non appliqué')).toBeNull()
})
it('accepts a crop change when only an already invalid point is affected', async () => {
const text = insert(
insert(baseText(), detail()),
point('anno-bad', 150, 50, 5, 'view-d'),
)
const user = await openCrop(text)
expect(
store
.getState()
.previewState?.report.issues.some((i) => i.path.endsWith('.geometry')),
).toBe(true)
await user.clear(cropField('largeur'))
await user.type(cropField('largeur'), '90{Enter}')
expect(doc().views[1]).toMatchObject({ view_box: { width: 90 } })
expect(screen.queryByText('Non appliqué')).toBeNull()
})
it('refuses a crop span the core cannot measure while the view holds annotations', async () => {
const text = insert(
insert(baseText(), detail()),
point('anno-d', 50, 50, 5, 'view-d'),
)
const user = await openCrop(text)
await user.clear(cropField('largeur'))
await user.type(cropField('largeur'), '0.5')
await user.clear(cropField('hauteur'))
await user.type(cropField('hauteur'), '0.5{Enter}')
expect(screen.getByRole('alert')).toHaveTextContent('Non appliqué')
expect(screen.getByRole('alert')).toHaveTextContent(
/non mesurable|géométrie de/,
)
expect(doc().views[1]).toMatchObject({ view_box: { width: 100 } })
})
it('a partial group is not applied and says so; an unchanged number commits nothing', async () => {
const user = await openCrop(insert(baseText(), detail()))
await user.clear(cropField('hauteur'))
await user.type(cropField('hauteur'), '{Enter}')
expect(screen.getByRole('alert')).toHaveTextContent(
'Indiquez les quatre valeurs',
)
await user.click(
screen.getByRole('button', { name: 'Revenir aux valeurs enregistrées' }),
)
await user.clear(cropField('largeur'))
await user.type(cropField('largeur'), '100.0{Enter}')
expect(store.getState().undo).toHaveLength(0)
expect(screen.queryByText('Non appliqué')).toBeNull()
})
it('draws the crop rectangle over the parent canvas, numbers only', async () => {
await openCrop(
insert(
baseText(),
detail({ min_x: 10, min_y: 20, width: 30, height: 40 }),
),
)
const rect = screen.getByTestId('crop-overlay').querySelector('rect')!
expect(rect.getAttribute('x')).toBe('10')
expect(rect.getAttribute('height')).toBe('40')
expect(
screen.getByTestId('crop-canvas-drawing').querySelector('svg'),
).not.toBeNull()
})
it('a parent change commits through the frame check', async () => {
const text = insert(insert(baseText(), detail()), detail2())
await openReady({ text })
const user = userEvent.setup()
render(<ViewsTab {...props} />)
await user.selectOptions(
document.getElementById('view-view-d-parent')!,
'view-e',
)
expect(doc().views[1]).toMatchObject({ parent_view_id: 'view-e' })
})
})
function detail2(): NewElement {
return {
kind: 'view',
value: {
kind: 'detail',
id: 'view-e',
name: { fr: 'Autre', en: 'Other' },
svg_asset_id: null,
view_box: { min_x: 0, min_y: 0, width: 50, height: 50 },
parent_view_id: 'view-main',
},
}
}