Files
faunosteo/apps/app/tests/unit/editor-navigation.test.ts
T
bchanot cd794f3c39 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)
2026-11-17 22:01:57 +01:00

385 lines
13 KiB
TypeScript

import { describe, expect, it } from 'vitest'
import type { ElementKey } from '@faunosteo/core-wasm/types'
import {
citationsOfView,
initialNavigation,
navigationReducer,
targetOfKey,
viewOf,
type EditorTarget,
type NavigationState,
} from '../../src/editor/navigation'
const view: ElementKey = { kind: 'view', id: 'v1' }
const finding: ElementKey = { kind: 'finding', zone_id: 'z1', path: ['a'] }
const node: ElementKey = { kind: 'finding', zone_id: 'z1', path: ['a', 'b'] }
function run(
state: NavigationState,
...actions: Parameters<typeof navigationReducer>[1][]
) {
return actions.reduce(navigationReducer, state)
}
describe('targetOfKey', () => {
const tab = (t: string, section: string | null, key: ElementKey) => ({
place: 'tab',
tab: t,
section,
key,
})
const cases: [ElementKey, EditorTarget][] = [
[
{ kind: 'sheet' },
tab('general', null, { kind: 'sheet' }) as EditorTarget,
],
[
{ kind: 'zone', id: 'z' },
tab('findings', null, { kind: 'zone', id: 'z' }) as EditorTarget,
],
[finding, tab('findings', null, finding) as EditorTarget],
[
{ kind: 'annotation', id: 'a' },
tab('annotations', 'drawing', {
kind: 'annotation',
id: 'a',
}) as EditorTarget,
],
[view, tab('annotations', 'views', view) as EditorTarget],
[
{ kind: 'category', id: 'c' },
tab('annotations', 'categories', {
kind: 'category',
id: 'c',
}) as EditorTarget,
],
[
{ kind: 'region', code: 'r' },
tab('annotations', 'regions', {
kind: 'region',
code: 'r',
}) as EditorTarget,
],
[
{ kind: 'reference', id: 'x' },
tab('references', null, { kind: 'reference', id: 'x' }) as EditorTarget,
],
]
it.each(cases)('maps %j', (key, expected) => {
expect(targetOfKey(key)).toEqual(expected)
})
})
describe('navigationReducer', () => {
it('starts on the given tab with the drawing section', () => {
const state = initialNavigation('annotations')
expect(state.visitedTabs).toEqual(['annotations'])
expect(state.visitedSections).toEqual(['drawing'])
expect(initialNavigation('general').visitedSections).toEqual([])
expect(state.finding).toBeNull()
expect(state.libraryReset).toBe(0)
})
it('go_to sets the place and increments the serial', () => {
const first = run(initialNavigation('general'), {
type: 'go_to',
target: targetOfKey(view),
})
expect(first).toMatchObject({ tab: 'annotations', section: 'views' })
expect(first.focus).toEqual({ target: targetOfKey(view), serial: 1 })
const again = run(first, { type: 'go_to', target: targetOfKey(finding) })
expect(again.tab).toBe('findings')
expect(again.section).toBe('views')
expect(again.focus?.serial).toBe(2)
})
it('go_to a reference shows the Références tab with its element', () => {
const key: ElementKey = { kind: 'reference', id: 'x' }
const state = run(initialNavigation('general'), {
type: 'go_to',
target: targetOfKey(key),
})
expect(state).toMatchObject({ tab: 'references', finding: null })
expect(state.visitedTabs).toEqual(['general', 'references'])
expect(state.focus?.target).toEqual(targetOfKey(key))
})
it('go_to a place that is no finding closes the finding layers', () => {
const state = run(
initialNavigation('general'),
{ type: 'open_citations', citedBy: node },
{ type: 'go_to', target: targetOfKey(view) },
)
expect(state.finding).toBeNull()
})
it('select_tab closes the layers and keeps the section, no request', () => {
const state = run(
initialNavigation('annotations'),
{ type: 'open_section', section: 'regions' },
{ type: 'open_citations', citedBy: node },
{ type: 'select_tab', tab: 'findings' },
)
expect(state).toMatchObject({
tab: 'findings',
section: 'regions',
finding: null,
focus: undefined,
})
})
it('open_citations opens for a family or a finding node only', () => {
const base = initialNavigation('findings')
for (const citable of [node, finding]) {
const opened = run(base, { type: 'open_citations', citedBy: citable })
expect(citationsOfView(opened)).toBe(citable)
expect(opened.finding).toEqual({ key: citable, citations: true })
}
for (const refused of [view, { kind: 'zone', id: 'z1' } as const]) {
const state = run(base, { type: 'open_citations', citedBy: refused })
expect(state).toBe(base)
}
})
it('show_all_references closes the layers, shows the tab and bumps the reset', () => {
const state = run(
initialNavigation('findings'),
{ type: 'open_citations', citedBy: node },
{ type: 'show_all_references', filter: node },
)
expect(state).toMatchObject({
tab: 'references',
finding: null,
referenceFilter: node,
libraryReset: 1,
focus: undefined,
})
expect(state.visitedTabs).toEqual(['findings', 'references'])
const again = run(state, { type: 'show_all_references', filter: node })
expect(again.libraryReset).toBe(2)
})
it('the reference dialog is a layer above the place and the sheet', () => {
const open = run(
initialNavigation('findings'),
{ type: 'open_citations', citedBy: node },
{ type: 'open_reference', id: 'ref-a' },
)
expect(open).toMatchObject({
tab: 'findings',
finding: { key: node, citations: true },
reference: { edit: 'ref-a' },
})
expect(run(open, { type: 'close_reference' }).reference).toBeNull()
const created = run(initialNavigation('general'), {
type: 'create_reference',
})
expect(created).toMatchObject({
tab: 'references',
reference: { create: true },
})
})
it('a creation over the citations dialog keeps the tab and both dialogs under it', () => {
const created = run(
initialNavigation('findings'),
{ type: 'open_finding', key: node },
{ type: 'open_citations', citedBy: node },
{ type: 'create_reference' },
)
expect(created).toMatchObject({
tab: 'findings',
finding: { key: node, citations: true },
reference: { create: true },
})
})
it('the filter belongs to the References tab: any move to another tab drops it', () => {
const filtered = run(initialNavigation('findings'), {
type: 'show_all_references',
filter: node,
})
expect(
run(filtered, { type: 'select_tab', tab: 'references' }),
).toMatchObject({
referenceFilter: node,
})
expect(run(filtered, { type: 'select_tab', tab: 'general' })).toMatchObject(
{
referenceFilter: null,
},
)
expect(run(filtered, { type: 'open_finding', key: node })).toMatchObject({
tab: 'findings',
referenceFilter: null,
finding: { key: node, citations: false },
})
const toReference = run(filtered, {
type: 'go_to',
target: targetOfKey({ kind: 'reference', id: 'x' }),
})
expect(toReference.referenceFilter).toBeNull()
expect(
run(filtered, { type: 'clear_reference_filter' }).referenceFilter,
).toBeNull()
})
it('a plain go_to a reference leaves the library reset alone', () => {
const state = run(initialNavigation('findings'), {
type: 'go_to',
target: targetOfKey({ kind: 'reference', id: 'x' }),
})
expect(state.libraryReset).toBe(0)
})
it('opens a section and goes back to the drawing', () => {
const state = run(initialNavigation('annotations'), {
type: 'open_section',
section: 'views',
})
expect(state.section).toBe('views')
const back = run(state, { type: 'back_to_drawing' })
expect(back.section).toBe('drawing')
expect(back.visitedSections).toEqual(['drawing', 'views'])
})
it('open and close citations keep tab and section', () => {
const opened = run(
initialNavigation('annotations'),
{ type: 'open_section', section: 'views' },
{ type: 'open_citations', citedBy: node },
)
expect(opened).toMatchObject({ tab: 'annotations', section: 'views' })
expect(citationsOfView(opened)).toBe(node)
const closed = run(opened, { type: 'close_citations' })
expect(closed).toMatchObject({ tab: 'annotations', section: 'views' })
expect(citationsOfView(closed)).toBeNull()
// the sheet closes alone: the finding dialog under it stays
expect(closed.finding).toEqual({ key: node, citations: false })
})
it('open_finding shows the dialog of a key on Constats, close_finding takes both layers', () => {
const opened = run(initialNavigation('general'), {
type: 'open_finding',
key: finding,
})
expect(opened).toMatchObject({ tab: 'findings' })
expect(opened.finding).toEqual({ key: finding, citations: false })
const sheet = run(opened, { type: 'open_citations', citedBy: node })
expect(sheet.finding).toEqual({ key: node, citations: true })
expect(run(sheet, { type: 'close_finding' }).finding).toBeNull()
})
it('create_finding holds the kind and the parent, a creation has no sheet', () => {
const state = run(initialNavigation('findings'), {
type: 'create_finding',
kind: 'node',
parent: finding,
})
expect(state.finding).toEqual({ create: { kind: 'node', parent: finding } })
expect(citationsOfView(state)).toBeNull()
expect(run(state, { type: 'close_citations' })).toBe(state)
})
it('restore_view puts back the layers of the view it is given', () => {
const base = initialNavigation('findings')
const restored = run(base, {
type: 'restore_view',
view: { ...viewOf(base), finding: { key: node, citations: true } },
})
expect(citationsOfView(restored)).toBe(node)
expect(restored.focus).toBeUndefined()
})
it('focus_consumed clears only its serial and serials are not reused', () => {
const asked = run(initialNavigation('general'), {
type: 'go_to',
target: targetOfKey(view),
})
expect(
run(asked, { type: 'focus_consumed', serial: 9 }).focus,
).toBeDefined()
const cleared = run(asked, { type: 'focus_consumed', serial: 1 })
expect(cleared.focus).toBeUndefined()
const next = run(cleared, { type: 'go_to', target: targetOfKey(view) })
expect(next.focus?.serial).toBe(2)
})
it('visited lists only grow and record places as they are shown', () => {
const state = run(
initialNavigation('general'),
{ type: 'select_tab', tab: 'annotations' },
{ type: 'open_section', section: 'categories' },
{ type: 'select_tab', tab: 'findings' },
{ type: 'select_tab', tab: 'general' },
{ type: 'back_to_drawing' },
)
expect(state.visitedTabs).toEqual(['general', 'annotations', 'findings'])
expect(state.visitedSections).toEqual(['drawing', 'categories'])
})
})
describe('final review', () => {
it('a go_to a finding or a zone opens its dialog in the same move (I-2)', () => {
const state = run(
initialNavigation('general'),
{ type: 'open_citations', citedBy: node },
{ type: 'go_to', target: targetOfKey(finding) },
)
expect(state.finding).toEqual({ key: finding, citations: false })
const zone: ElementKey = { kind: 'zone', id: 'z1' }
const onZone = run(state, { type: 'go_to', target: targetOfKey(zone) })
expect(onZone.finding).toEqual({ key: zone, citations: false })
})
it('close_finding takes the reference dialog over the sheet with it (M-2)', () => {
const state = run(
initialNavigation('findings'),
{ type: 'open_citations', citedBy: node },
{ type: 'open_reference', id: 'r1' },
{ type: 'close_finding' },
)
expect(state.finding).toBeNull()
expect(state.reference).toBeNull()
})
})
/** U2 Task 6: the annotation properties dialog is a layer of the drawing. */
describe('the annotation layer', () => {
it('open_annotation shows the dialog over the drawing, close_annotation takes it away', () => {
const base = run(initialNavigation('general'), {
type: 'open_section',
section: 'views',
})
const opened = run(base, { type: 'open_annotation', id: 'a1' })
expect(opened.tab).toBe('annotations')
expect(opened.section).toBe('drawing')
expect(opened.annotation).toEqual({ id: 'a1' })
expect(viewOf(opened).annotation).toEqual({ id: 'a1' })
expect(run(opened, { type: 'close_annotation' }).annotation).toBeNull()
})
it('every move away from the drawing leaves it: a tab, a section, « Aller à »', () => {
const opened = run(initialNavigation('annotations'), {
type: 'open_annotation',
id: 'a1',
})
const moves = [
{ type: 'select_tab', tab: 'general' },
{ type: 'open_section', section: 'views' },
{ type: 'go_to', target: targetOfKey({ kind: 'sheet' }) },
{ type: 'open_finding', key: finding },
{ type: 'show_all_references', filter: finding },
] as const
for (const move of moves) expect(run(opened, move).annotation).toBeNull()
})
it('restore_view puts it back', () => {
const base = initialNavigation('annotations')
const view = { ...viewOf(base), annotation: { id: 'a2' } }
expect(run(base, { type: 'restore_view', view }).annotation).toEqual({
id: 'a2',
})
})
})