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)
219 lines
6.6 KiB
TypeScript
219 lines
6.6 KiB
TypeScript
/** Rev 5 Task 12: the citations layer's guard (Back, refusal, close, order, creation). */
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import { act, cleanup, render } from '@testing-library/react'
|
|
import type { ElementKey } from '@faunosteo/core-wasm/types'
|
|
import {
|
|
MemoryRouter,
|
|
useLocation,
|
|
useNavigate,
|
|
type Location,
|
|
type NavigateFunction,
|
|
} from 'react-router-dom'
|
|
import { ENTRY_KEY, type HistoryEntry } from '@/editor/history/entry'
|
|
import useEditorHistory from '@/editor/history/useEditorHistory'
|
|
import { LAYERS_TOP_DOWN, topDirtyLayer } from '@/editor/leftDraft'
|
|
import { defaultView } from '@/editor/navigation'
|
|
import {
|
|
useEditorNavigation,
|
|
type EditorNavigation,
|
|
type LayerName,
|
|
} from '@/editor/useEditorNavigation'
|
|
|
|
afterEach(cleanup)
|
|
|
|
const owner = { sheetId: 'S', tag: 'T' }
|
|
const node: ElementKey = {
|
|
kind: 'finding',
|
|
zone_id: 'zone',
|
|
path: ['family', 'node'],
|
|
}
|
|
|
|
let nav: EditorNavigation
|
|
let navigate: NavigateFunction
|
|
let location: Location
|
|
const entry = () => (location.state as Record<string, HistoryEntry>)[ENTRY_KEY]
|
|
|
|
function Page() {
|
|
nav = useEditorNavigation('findings')
|
|
navigate = useNavigate()
|
|
location = useLocation()
|
|
useEditorHistory(nav, owner, defaultView('findings'))
|
|
return null
|
|
}
|
|
|
|
function mount() {
|
|
render(
|
|
<MemoryRouter initialEntries={['/x']}>
|
|
<Page />
|
|
</MemoryRouter>,
|
|
)
|
|
}
|
|
|
|
/** A layer whose form holds changes: a user ask refuses, a forced one says the note. */
|
|
const dirty = vi.fn((forced: boolean) =>
|
|
forced ? { allowed: true, note: 'dropped' } : { allowed: false },
|
|
)
|
|
const register = (layer: LayerName) =>
|
|
act(() => nav.guards.register(layer, dirty))
|
|
|
|
/** Node's finding dialog, then its citations dialog: two entries. */
|
|
function cited() {
|
|
mount()
|
|
act(() => nav.openFinding(node))
|
|
act(() => nav.openCitations(node))
|
|
}
|
|
|
|
describe('the layer order', () => {
|
|
it('reference, citations, finding: asked top down', () => {
|
|
expect(LAYERS_TOP_DOWN).toEqual([
|
|
'reference',
|
|
'citations',
|
|
'finding',
|
|
'annotation',
|
|
])
|
|
mount()
|
|
const order: string[] = []
|
|
for (const layer of ['finding', 'citations', 'reference'] as const) {
|
|
nav.guards.register(layer, () => {
|
|
order.push(layer)
|
|
return { allowed: true }
|
|
})
|
|
}
|
|
nav.guards.askAll(false)
|
|
expect(order).toEqual(['reference', 'citations', 'finding'])
|
|
})
|
|
|
|
it('topDirtyLayer: citations over finding, reference over both', () => {
|
|
mount()
|
|
register('finding')
|
|
register('citations')
|
|
expect(topDirtyLayer(nav.guards)).toBe('citations')
|
|
expect(topDirtyLayer(nav.guards, 'citations')).toBe('finding')
|
|
register('reference')
|
|
expect(topDirtyLayer(nav.guards)).toBe('reference')
|
|
expect(topDirtyLayer(nav.guards, 'reference')).toBe('citations')
|
|
})
|
|
})
|
|
|
|
describe('a Back over a citations draft', () => {
|
|
it('closing only the citations dialog asks; the view and the entry stay', () => {
|
|
cited()
|
|
register('citations')
|
|
dirty.mockClear()
|
|
act(() => navigate(-1))
|
|
expect(dirty).toHaveBeenCalledWith(false)
|
|
expect(nav.state.finding).toMatchObject({ citations: true })
|
|
expect(entry().view.finding).toMatchObject({ citations: true })
|
|
})
|
|
|
|
it('a clean citations layer lets it close', () => {
|
|
cited()
|
|
act(() => nav.guards.register('citations', () => ({ allowed: true })))
|
|
act(() => navigate(-1))
|
|
expect(nav.state.finding).toMatchObject({ citations: false })
|
|
})
|
|
|
|
it('under a clean reference dialog: the reference closes, the draft asks', () => {
|
|
cited()
|
|
act(() => nav.references.open('ref-a'))
|
|
register('citations')
|
|
dirty.mockClear()
|
|
act(() => navigate(-2))
|
|
expect(dirty).toHaveBeenCalledWith(false)
|
|
expect(nav.state.reference).toBeNull()
|
|
expect(nav.state.finding).toMatchObject({ citations: true })
|
|
expect(entry().view).toMatchObject({
|
|
reference: null,
|
|
finding: { citations: true },
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('closeCitations', () => {
|
|
it('a user close is refused by a draft; a forced one goes', () => {
|
|
cited()
|
|
register('citations')
|
|
let closed = true
|
|
act(() => {
|
|
closed = nav.closeCitations()
|
|
})
|
|
expect(closed).toBe(false)
|
|
expect(nav.state.finding).toMatchObject({ citations: true })
|
|
act(() => {
|
|
closed = nav.closeCitations(true)
|
|
})
|
|
expect(closed).toBe(true)
|
|
expect(nav.state.finding).toMatchObject({ citations: false })
|
|
})
|
|
|
|
it('a forced close of a draft says it was dropped', async () => {
|
|
cited()
|
|
register('citations')
|
|
act(() => {
|
|
nav.closeCitations(true)
|
|
})
|
|
await act(async () => undefined)
|
|
expect(nav.live).toContain('dropped')
|
|
})
|
|
})
|
|
|
|
describe('a creation started over the citations dialog (Rev 6: a draft creation)', () => {
|
|
const pending = {
|
|
id: 'ref-p',
|
|
type: 'book',
|
|
citation: 'Neuf',
|
|
doi: null,
|
|
url: null,
|
|
} as const
|
|
|
|
it('holds its citing form and the pending value; created() never cites', async () => {
|
|
cited()
|
|
const cite = vi.fn()
|
|
act(() => nav.references.start(null, cite, pending))
|
|
expect(nav.state).toMatchObject({
|
|
tab: 'findings',
|
|
reference: { create: true },
|
|
})
|
|
expect(nav.references.drafting()).toEqual({ initial: pending, cite })
|
|
act(() => nav.references.close(true))
|
|
expect(nav.references.drafting()).toBeNull()
|
|
expect(nav.state.reference).toBeNull()
|
|
expect(nav.state.finding).toMatchObject({ citations: true })
|
|
expect(cite).not.toHaveBeenCalled()
|
|
expect(nav.references.added).toBeNull()
|
|
})
|
|
|
|
it('a new one has no initial value', () => {
|
|
cited()
|
|
const cite = vi.fn()
|
|
act(() => nav.references.start(null, cite))
|
|
expect(nav.references.drafting()).toEqual({ initial: null, cite })
|
|
})
|
|
|
|
it('a creation replaced forgets its citing form', () => {
|
|
cited()
|
|
act(() => nav.references.start(null, vi.fn(), pending))
|
|
act(() => nav.references.replace(null))
|
|
expect(nav.references.drafting()).toBeNull()
|
|
})
|
|
|
|
it('a Back that removes the creation dialog forgets its citing form', () => {
|
|
cited()
|
|
act(() => nav.references.start(null, vi.fn(), pending))
|
|
act(() => navigate(-1))
|
|
expect(nav.state.reference).toBeNull()
|
|
expect(nav.references.drafting()).toBeNull()
|
|
})
|
|
|
|
it('a creation from the library is no draft; created() sets the notice', async () => {
|
|
cited()
|
|
act(() => nav.references.start(null, vi.fn()))
|
|
act(() => nav.references.close(true))
|
|
act(() => nav.selectTab('references'))
|
|
act(() => nav.references.start(null))
|
|
expect(nav.references.drafting()).toBeNull()
|
|
await act(async () => nav.references.created('ref-lib'))
|
|
expect(nav.references.added).toMatchObject({ id: 'ref-lib' })
|
|
})
|
|
})
|