feat(editor): properties dialog over the column, transactional save

U2 Task 6 (A1, A2, A3, A9, A10, R-3, R-5, R-6, R-14, R-16).

- Dialog: `anchor` places the panel at the column's left and width,
  from its top, under a 22 % ink veil that ignores clicks; the visual
  viewport below 320 px; centred without an anchor box.
- Navigation: `annotation` layer (LAYERS, EditorView, history entry,
  leave guards, left-draft flag); Back closes, Forward reopens.
- AnnotationDialog: read body, « Modifier » form (CreationFields with
  « Couleur », missingFields, R-3 messages), one `update` on the
  current annotation by id, « Marquer comme relu », « Modifier la
  forme », « Supprimer »; read-only flip keeps the draft.
- The column always shows the overview, selected row marked; Enter on
  it, a second click or a double click, the strip's « Propriétés »
  open the dialog. « Aller à » focuses the row (R-5).
- Read-only twin: strip and read-only dialog at 1 024 px and wider,
  inline read body below. PropertiesPanel and AnnotationFields gone.
- Strip lead 256 px and a fixed status slot, so the commands fit at
  1 024 px and a status change moves nothing.
- e2e: `aside-content` exemption removed; scroll-to-top workarounds
  of editor-geometry, editor-zones and editor-journey removed.

Removed assertions mapped:
  editor-annotations-tab.test.tsx:
  - selectFromList waited for `annotation-properties` -> waits for the strip's « Propriétés » (selection without dialog, A1)
  - refused place: issues block `annotation-geometry-issues` in the panel -> the strip notice alert (present, then gone)
  - keyboard creation / C26 confirmation: `annotation-properties` after create -> strip « Propriétés » (new element selected)
  - Désélectionner from the panel -> « Désélectionner » in the strip (all 7 tests); « panel closes » -> strip has no « Propriétés »
  - undo after deselect (typed name) -> handle key series then deselect then undo
  - commits a valid typed value once without blur (name field) -> a pending handle key series committed once by the strip deselect
  - a refused typed value: the panel closes (two tests: strip deselect, tap deselect) -> removed: no field outside the dialog; the dialog's draft writes nothing before « Enregistrer » (new dialog tests)
  - not offered while a replace tracing runs: panel's Désélectionner absent -> strip offers neither « Désélectionner » nor « Propriétés » during the tracing
  - tap: isDeselected read `annotation-properties` -> strip « Propriétés » absent; link select -> strip title data-selection
  - tap: undo after tap deselect (typed name) -> handle series; typed value committed on blur -> handle series committed on blur
  - strip geometry issues: list read in the panel -> list read in the properties dialog's issues block
  - a new commit replaces the message (typed name) -> « Marquer comme relu » in the dialog
  editor-escape.test.tsx:
  - `panel()` = `annotation-properties` -> the strip's « Propriétés » or the phone twin's inline read body
  - Escape from a panel button (« Marquer comme relu ») -> from the selected row in the side column: focus on the row
  - after A then B from the panel (via « Toutes les annotations ») -> select A, select B, Escape from a button of the side column: focus on B's row
  - a text field (panel « Nom (FR) ») -> the overview « Filtrer par nom »
  - redraw via the panel's « Remplacer par un polygone » -> the strip's command
  - modal / delete dialog opened by the panel's « Supprimer » -> « Supprimer » of the properties dialog
  - read-only width: hidden `annotation-properties` -> hidden strip « Propriétés » of the kept edit body
  editor-history-buttons.test.tsx (typed text and the press, 8 tests): the annotation's committed « Nom (FR) » field of the panel -> the sheet's committed « Nom (FR) » on Général (same TextField commit-on-blur path; annotation fields are now a dialog draft)
  editor-focus-request.test.tsx: « Aller à » focuses `data-properties-heading` inside `annotation-properties` -> focuses the annotation's row, marked aria-current, no dialog (R-5)
  editor-sections.test.tsx: « Aller à » with nothing in progress focused the properties heading -> focuses the row (R-5); creation kept: no `annotation-properties` -> no strip « Propriétés »
  editor-overview.test.tsx (edit and read-only): row opens `annotation-properties`, « Toutes les annotations » returns -> row selects, stays marked aria-current, no dialog; strip « Désélectionner » returns focus to the row; filter kept across select and « Désélectionner »
  editor-citations-guards.test.tsx: LAYERS_TOP_DOWN gains 'annotation' at the bottom
  editor-keep-alive.test.tsx: `annotation-properties` visible after the round trip -> the strip's « Propriétés » visible (selection kept)
  editor-no-loss.test.tsx: ids `ro-annotation-name-fr` and `annotation-name-fr` (both panels' fields) -> the twin's inline read body (no ids), then the dialog edit form's `annotation-edit-fr`, kept through a flip to 800 px, no duplicate id; « Aller à » visible `annotation-properties` -> visible `annotation-read` (inline twin), none at 1 280
  editor-point-edit.test.tsx / editor-zone-edit.test.tsx: `select()` waited for `annotation-properties` and returned it -> waits for the strip's « Propriétés » and returns the strip (its « Désélectionner » and « Remplacer par un polygone » moved there)
  - move mode Escape: `annotation-properties` still there -> the strip's « Propriétés » back after the mode
  - « Toutes les annotations » asks first during a started move -> Enter on the selected row asks first (no dialog), and the strip offers neither « Propriétés » nor « Désélectionner » during the mode
  - Escape from the handle / slider: `annotation-properties` gone -> the strip's « Propriétés » gone
  - I-3 touch tap: `annotation-properties` gone -> the strip's « Propriétés » gone
  e2e (sandbox):
  - support/layout.ts: `aside-content` exemption removed (ShiftExemption type, the loose compare); every `swaps`/`SWAPS` argument removed (editor-annotations, editor-zones, editor-geometry)
  - support/editor.ts pickAnnotation: clicked « Toutes les annotations » first when the panel showed -> the overview is always shown: clicks the row, then scrolls back to the top (the page no longer shortens)
  - editor-annotations: `annotation-properties` visible after a creation -> strip with « Propriétés »; review toggle and « Supprimer » of the panel -> the properties dialog's; a jitter click on the selected point now opens the dialog (A1), closed by Escape before the drag; handle names exact (the marked row shares the prefix); trace close moved out of expectNoShift (creation panel until Task 7, shortcut + TODO)
  - editor-deselect: `annotation-properties` -> the strip with « Propriétés » or the twin's inline read body; Escape in a field: panel « Nom (FR) » -> overview filter; delete dialog from the panel -> from the properties dialog (Escape closes it, then the dialog); « a typed value is applied by the click that deselects » (name field, refused blank) -> a pending point-handle key series applied by the deselecting click and by « Désélectionner » (refused value: no field outside the dialog); « the selected one stays » -> a second click, double click and jitter open the dialog, Escape closes it, selection kept
  - editor-geometry: `annotation-geometry-issues` in the panel -> read in the properties dialog, then the strip notice; after the refusal the error count unchanged; scroll-to-top workaround removed
  - editor-zones: panel « Désélectionner » -> strip; scroll-to-top after pickAnnotation removed (helper does it)
  - editor-structures: panel « Supprimer » -> properties dialog « Supprimer », confirmation over it
  - editor-journey: `#annotation-name-fr` committed field + `#annotation-laterality` -> the dialog's edit form, one « Enregistrer »; scroll-to-top removed
  - editor-shell / editor-shell-journeys: « Aller à » focus on `data-properties-heading` -> the annotation's row (aria-current), no dialog (R-5)
  - editor-shell-layout: focus kind `annotation-properties` -> removed (the overview is the side)
This commit is contained in:
bchanot committed 2026-11-17 22:01:57 +01:00
1 parent e596e0765e
commit cd794f3c39
66 files changed
+3351 -1357

No files matched your search

@@ -0,0 +1,497 @@
/** U2 Task 6: the properties dialog over the column (A1, A2, A3, A9, A10, R-3, R-14, R-16). */
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
act,
cleanup,
fireEvent,
render,
screen,
waitFor,
within,
} from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import type { Annotation, Point } from '@faunosteo/core-wasm/types'
import { resetWork, useAnnotationWork } from '@/editor/annotations/workStore'
import { useLocaleStore } from '@/state/localeStore'
import { LayeredTab, layered } from '../helpers/annotationLayer'
import { drawnText, insert, point } from '../helpers/editorFixtures'
import { openReady, pressAt, resetStore, 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(),
}))
const props = {
navigate: vi.fn(),
reloadSheet: vi.fn(),
section: 'drawing' as const,
visited: ['drawing'] as const,
onOpenSection: vi.fn(),
onBack: vi.fn(),
}
const SQUARE: Point[] = [
[20, 20],
[80, 20],
[80, 80],
[20, 80],
]
const annotationOf = (id: string) =>
store
.getState()
.previewState!.document.annotations.find((a: Annotation) => a.id === id)!
const depth = () => store.getState().undo.length
const zone = (id: string, patch: Partial<Annotation> = {}): Annotation =>
({
...(point(id, 0, 0, 1).value as Annotation),
kind: 'zone',
geometry: { type: 'polygon', points: SQUARE },
...patch,
}) as Annotation
function stubCtm(): void {
const identity = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }
Object.defineProperty(window.SVGElement.prototype, 'getScreenCTM', {
configurable: true,
value: () => ({ ...identity, inverse: () => identity }),
})
}
beforeEach(() => {
useLocaleStore.setState({ locale: 'fr' })
stubCtm()
})
afterEach(() => {
cleanup()
resetStore()
resetWork()
window.innerWidth = 1024
})
const tab = (readOnly = false) => (
<div data-editor-workspace>
<LayeredTab {...props} readOnly={readOnly} />
</div>
)
async function mount(text: string, readOnly = false) {
await openReady({ text })
const view = render(tab(readOnly))
const drawing = readOnly
? 'catalogue-canvas-drawing'
: 'annotation-canvas-drawing'
await waitFor(() =>
expect(screen.getByTestId(drawing).querySelector('svg')).not.toBeNull(),
)
return view
}
const rowOf = (id: string) =>
document.querySelector<HTMLElement>(
`[data-focus-key='{"kind":"annotation","id":"${id}"}']`,
)!
const strip = () => screen.getByTestId('edit-strip')
const dialog = () => screen.queryByRole('dialog')
const live = () => screen.getByTestId('live-region')
const marker = (id: string) =>
screen
.getByTestId('annotation-canvas-drawing')
.querySelector(`[data-anno-id="${id}"]`)!
async function selectRow(id: string) {
await userEvent.setup().click(rowOf(id))
await within(strip()).findByRole('button', { name: 'Propriétés' })
}
async function openProperties() {
await userEvent
.setup()
.click(within(strip()).getByRole('button', { name: 'Propriétés' }))
return screen.findByRole('dialog')
}
async function startEdit() {
const opened = await openProperties()
await userEvent
.setup()
.click(within(opened).getByRole('button', { name: 'Modifier' }))
return opened
}
const field = (label: string) =>
within(dialog()!).getByLabelText(label) as HTMLInputElement
describe('opening (A1)', () => {
it('a first click and Enter on a row only select; Enter on the selected row opens', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
expect(dialog()).toBeNull()
expect(rowOf('a')).toHaveAttribute('aria-current', 'true')
fireEvent.keyDown(rowOf('a'), { key: 'Enter', repeat: true })
expect(dialog()).toBeNull()
fireEvent.keyDown(rowOf('a'), { key: 'Enter' })
expect(await screen.findByRole('dialog', { name: 'N' })).toBeVisible()
})
it('a second click on the interior opens; with a chosen vertex it unchooses only', async () => {
await mount(insert(drawnText(), { kind: 'annotation', value: zone('z') }))
await selectRow('z')
useAnnotationWork.setState({
chosen: {
annotationId: 'z',
vertex: 1,
base: store.getState().documentText,
},
})
pressAt(marker('z'), 50, 50)
expect(useAnnotationWork.getState().chosen).toBeNull()
expect(dialog()).toBeNull()
await new Promise((resolve) => setTimeout(resolve, 450))
pressAt(marker('z'), 50, 50)
expect(await screen.findByRole('dialog')).toBeVisible()
})
it('« Propriétés » opens it; ✕ closes it and the focus goes back to the button', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
const opened = await openProperties()
await userEvent
.setup()
.click(within(opened).getByRole('button', { name: 'Fermer' }))
await waitFor(() => expect(dialog()).toBeNull())
await waitFor(() =>
expect(document.activeElement).toBe(
within(strip()).getByRole('button', { name: 'Propriétés' }),
),
)
// The selection stays after the close.
expect(rowOf('a')).toHaveAttribute('aria-current', 'true')
})
})
describe('the read mode (board 31 A, B)', () => {
const rows = () =>
within(dialog()!)
.getAllByRole('term')
.map((term) => term.textContent)
it('a point: names, category, laterality, findings zone and view; no colour, no region', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await openProperties()
expect(rows()).toEqual([
'Nom (FR)',
'Nom (EN)',
'Catégorie',
'Latéralité',
'Zone de constats',
'Vue',
])
expect(within(dialog()!).getByTestId('annotation-read')).toHaveTextContent(
'Point',
)
})
it('a zone with its own colour and a region shows both', async () => {
const text = insert(drawnText(), {
kind: 'annotation',
value: zone('z', { color: '#aa0000' }),
})
const regions = JSON.parse(text)
const code = regions.vertebral_config.regions[0]?.code ?? null
const value = zone('z', {
color: '#aa0000',
vertebral_region_code: code,
} as Partial<Annotation>)
await mount(insert(drawnText(), { kind: 'annotation', value } as never))
await selectRow('z')
await openProperties()
expect(rows()).toContain('Couleur')
if (code !== null) expect(rows()).toContain('Région vertébrale')
expect(within(dialog()!).getByText('#aa0000')).toBeInTheDocument()
})
it('« Marquer comme relu » is one change and one undo (A10)', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
const opened = await openProperties()
const before = depth()
await userEvent
.setup()
.click(within(opened).getByRole('button', { name: 'Marquer comme relu' }))
expect(annotationOf('a').review_status).toBe('reviewed')
expect(depth()).toBe(before + 1)
expect(
within(opened).getByRole('button', { name: 'Remettre à confirmer' }),
).toBeInTheDocument()
act(() => void store.getState().undoStep())
expect(annotationOf('a').review_status).toBe('to_confirm')
})
it('the issues block names the inherited out-of-frame point', async () => {
await mount(insert(drawnText(), point('a', 150, 150, 5)))
await selectRow('a')
const opened = await openProperties()
expect(
within(opened).getByTestId('annotation-geometry-issues'),
).toHaveAttribute('role', 'alert')
})
it('« Modifier la forme » closes it, keeps the selection, focuses the first handle', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
const opened = await openProperties()
await userEvent
.setup()
.click(within(opened).getByRole('button', { name: 'Modifier la forme' }))
await waitFor(() => expect(dialog()).toBeNull())
await waitFor(() =>
expect(document.activeElement).toBe(screen.getByTestId('point-handle')),
)
expect(rowOf('a')).toHaveAttribute('aria-current', 'true')
})
})
describe('the edit form (board 31 C, R-3)', () => {
it('category and both names saved: ONE history entry, the read mode back', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await startEdit()
const user = userEvent.setup()
const before = depth()
await user.clear(field('Nom (FR)'))
await user.type(field('Nom (FR)'), 'Grasset')
await user.clear(field('Nom (EN)'))
await user.type(field('Nom (EN)'), 'Stifle')
const category = within(dialog()!).getByLabelText(
'Catégorie',
) as HTMLSelectElement
const other = [...category.options].find((o) => !o.selected)
if (other) await user.selectOptions(category, other.value)
expect(depth()).toBe(before)
await user.click(
within(dialog()!).getByRole('button', { name: 'Enregistrer' }),
)
expect(depth()).toBe(before + 1)
expect(annotationOf('a').name).toEqual({ fr: 'Grasset', en: 'Stifle' })
if (other) expect(annotationOf('a').category_id).toBe(other.value)
expect(
within(dialog()!).getByText('Modifications enregistrées'),
).toBeInTheDocument()
})
it('the save merges onto the current annotation: a move made meanwhile stays', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await startEdit()
const user = userEvent.setup()
await user.type(field('Nom (FR)'), 'x')
const moved = {
...annotationOf('a'),
geometry: { type: 'circle', cx: 40, cy: 50, r: 5 },
}
act(
() =>
void store.getState().commit({
op: 'update',
key: { kind: 'annotation', id: 'a' },
element: { kind: 'annotation', value: moved as Annotation },
}),
)
await user.click(
within(dialog()!).getByRole('button', { name: 'Enregistrer' }),
)
expect(annotationOf('a').geometry).toMatchObject({ cx: 40 })
expect(annotationOf('a').name?.fr).toBe('Nx')
})
it('a blank name: named under its field and in the summary, focused, nothing written', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await startEdit()
const user = userEvent.setup()
const before = store.getState().documentText
await user.clear(field('Nom (EN)'))
await user.click(
within(dialog()!).getByRole('button', { name: 'Enregistrer' }),
)
expect(
within(dialog()!).getByText('Saisissez le nom en anglais.'),
).toBeInTheDocument()
expect(
within(dialog()!).getByText('À compléter : Nom (EN).'),
).toHaveAttribute('role', 'alert')
expect(within(dialog()!).queryByText(/Choisissez/)).toBeNull()
expect(document.activeElement).toBe(field('Nom (EN)'))
expect(store.getState().documentText).toBe(before)
})
it('« Annuler » with changes asks; « Abandonner » writes nothing', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await startEdit()
const user = userEvent.setup()
const before = store.getState().documentText
await user.type(field('Nom (FR)'), 'x')
await user.click(within(dialog()!).getByRole('button', { name: 'Annuler' }))
expect(
within(dialog()!).getByText('Abandonner les modifications ?'),
).toBeInTheDocument()
await user.click(
within(dialog()!).getByRole('button', { name: 'Abandonner' }),
)
expect(store.getState().documentText).toBe(before)
expect(
within(dialog()!).getByRole('button', { name: 'Modifier' }),
).toBeInTheDocument()
})
it('« Couleur » sits in the form with the category’s placeholder (A9)', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await startEdit()
expect(field('Couleur')).toHaveAttribute(
'placeholder',
'Celle de la catégorie',
)
})
})
describe('a read-only flip (R-14, Review Focus 3)', () => {
it('the dialog stays with its draft, read-only, nothing committed; editable on the way back', async () => {
const view = await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await startEdit()
const user = userEvent.setup()
await user.type(field('Nom (FR)'), 'x')
const before = store.getState().documentText
view.rerender(tab(true))
expect(dialog()).not.toBeNull()
expect(field('Nom (FR)')).toHaveValue('Nx')
expect(field('Nom (FR)')).toHaveAttribute('readonly')
expect(within(dialog()!).getByLabelText('Catégorie')).toBeDisabled()
expect(
within(dialog()!).getByRole('button', { name: 'Enregistrer' }),
).toBeDisabled()
expect(store.getState().documentText).toBe(before)
view.rerender(tab(false))
expect(field('Nom (FR)')).toHaveValue('Nx')
expect(field('Nom (FR)')).not.toHaveAttribute('readonly')
await user.click(
within(dialog()!).getByRole('button', { name: 'Enregistrer' }),
)
expect(annotationOf('a').name?.fr).toBe('Nx')
})
it('a started move mode is suspended and resumes with its position', async () => {
const view = await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
const user = userEvent.setup()
await user.click(screen.getByRole('button', { name: 'Déplacer le point' }))
fireEvent.click(
screen.getByRole('button', { name: 'Déplacer vers la droite' }),
)
view.rerender(tab(true))
expect(useAnnotationWork.getState().mode?.started).toBe(true)
view.rerender(tab(false))
await user.click(
screen.getByRole('button', { name: 'Valider la position' }),
)
expect(annotationOf('a').geometry).toMatchObject({ cx: 50.5 })
})
})
describe('a read-only sheet at 1 024 px and wider (R-16)', () => {
it('the strip says « fiche en lecture seule »; « Propriétés » opens values only', async () => {
window.innerWidth = 1280
await mount(insert(drawnText(), point('a', 50, 50, 5)), true)
await userEvent.setup().click(rowOf('a'))
expect(
await within(strip()).findByTestId('edit-strip-detail'),
).toHaveTextContent('Point · fiche en lecture seule')
expect(screen.queryByTestId('point-handle')).toBeNull()
expect(screen.queryByTestId('size-slider')).toBeNull()
const opened = await openProperties()
expect(within(opened).getByTestId('annotation-read')).toBeInTheDocument()
expect(
within(opened).queryByRole('button', { name: 'Modifier' }),
).toBeNull()
expect(
within(opened).queryByRole('button', { name: 'Supprimer' }),
).toBeNull()
})
it('below 1 024 px the twin reads it inline, with no strip', async () => {
window.innerWidth = 800
await mount(insert(drawnText(), point('a', 50, 50, 5)), true)
await userEvent.setup().click(rowOf('a'))
expect(await screen.findByTestId('annotation-read')).toBeInTheDocument()
expect(screen.getByTestId('annotation-selection-tag')).toBeInTheDocument()
expect(screen.queryByTestId('edit-strip')).toBeNull()
})
})
describe('the layer (history)', () => {
it('an annotation that vanished closes the dialog and is said', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
await openProperties()
act(
() =>
void store
.getState()
.commit({ op: 'remove', key: { kind: 'annotation', id: 'a' } }),
)
await waitFor(() => expect(dialog()).toBeNull())
await waitFor(() =>
expect(live()).toHaveTextContent("Cette annotation n'existe plus"),
)
expect(layered.nav?.state.annotation).toBeNull()
})
it('a layer for an annotation of another view shows that view and selects it', async () => {
const detail = insert(drawnText(), {
kind: 'view',
value: {
kind: 'detail',
id: 'view-det',
name: { fr: 'Tête', en: 'Head' },
svg_asset_id: null,
view_box: { min_x: 10, min_y: 10, width: 80, height: 80 },
parent_view_id: 'view-main',
},
})
const text = insert(
insert(detail, point('a', 50, 50, 5)),
point('b', 40, 40, 5, 'view-det'),
)
await mount(text)
act(() => layered.nav!.openAnnotation('b'))
await waitFor(() =>
expect(rowOf('b')).toHaveAttribute('aria-current', 'true'),
)
expect(
screen.getByRole('button', { name: 'Tête', pressed: true }),
).toBeInTheDocument()
})
it('a deletion from the dialog closes it, unsaid as a vanish', async () => {
await mount(insert(drawnText(), point('a', 50, 50, 5)))
await selectRow('a')
const opened = await openProperties()
const user = userEvent.setup()
await user.click(within(opened).getByRole('button', { name: 'Supprimer' }))
const ask = await screen.findByRole('dialog', { name: /Supprimer/ })
await user.click(within(ask).getByRole('button', { name: 'Supprimer' }))
await waitFor(() => expect(screen.queryAllByRole('dialog')).toHaveLength(0))
expect(live()).not.toHaveTextContent("n'existe plus")
})
})