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)
579 lines
20 KiB
TypeScript
579 lines
20 KiB
TypeScript
/** U1 Lot B2a: tabs, Annotations sections and the Références tab stay mounted. */
|
|
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 EditorTabBody from '@/components/editor/EditorTabBody'
|
|
import KeptPlace from '@/components/editor/KeptPlace'
|
|
import { useSheetDocument } from '@/editor/sheetDocument'
|
|
import { usePlaceVisible } from '@/lib/placeVisibility'
|
|
import { FocusConsumedContext } from '@/editor/focusRequest'
|
|
import { targetOfKey } from '@/editor/navigation'
|
|
import { useLocaleStore } from '@/state/localeStore'
|
|
import { useAnnotationWork } from '@/editor/annotations/workStore'
|
|
import { cleanSvg } from '@/editor/core/cleaning'
|
|
import {
|
|
ASSET,
|
|
drawnText,
|
|
edit,
|
|
emptyText,
|
|
insert,
|
|
point,
|
|
} from '../helpers/editorFixtures'
|
|
import {
|
|
baseText,
|
|
resetStore,
|
|
sb,
|
|
serverHas,
|
|
store,
|
|
versionAnswer,
|
|
pressAt,
|
|
} from '../helpers/editorHarness'
|
|
import { testLayer } from '../helpers/findingsHost'
|
|
import { mountDraft, setWidth } from '../helpers/editorRoute'
|
|
|
|
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(),
|
|
}))
|
|
|
|
beforeEach(() => {
|
|
useLocaleStore.setState({ locale: 'fr' })
|
|
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 }),
|
|
})
|
|
})
|
|
afterEach(() => {
|
|
cleanup()
|
|
resetStore()
|
|
setWidth(1024)
|
|
})
|
|
|
|
const ready = () =>
|
|
screen.findByRole('heading', { level: 1, name: 'Brouillon, version 4' })
|
|
const tab = (name: string | RegExp) => screen.getByRole('tab', { name })
|
|
const entry = (name: string | RegExp) => screen.getByRole('button', { name })
|
|
const place = (name: string) =>
|
|
document.querySelector<HTMLElement>(`[data-place="${name}"]`)!
|
|
const inPlace = (name: string) => within(place(name))
|
|
const name = (n: string) => ({ fr: n, en: n })
|
|
|
|
function findingsText(from = baseText(), nodeRefs?: string[]): string {
|
|
const text = insert(from, {
|
|
kind: 'zone',
|
|
value: { id: 'zone-a', name: name('Zone A'), categories: [] },
|
|
})
|
|
const family = edit(text, {
|
|
op: 'insert',
|
|
parent: { kind: 'zone', id: 'zone-a' },
|
|
element: {
|
|
kind: 'finding_category',
|
|
value: {
|
|
id: 'fcat-a',
|
|
kind: 'dysfunction',
|
|
name: name('Cat A'),
|
|
description: {},
|
|
reference_ids: [],
|
|
review_status: 'to_confirm',
|
|
children: [],
|
|
},
|
|
},
|
|
})
|
|
if (!nodeRefs) return family
|
|
return edit(family, {
|
|
op: 'insert',
|
|
parent: { kind: 'finding', zone_id: 'zone-a', path: ['fcat-a'] },
|
|
element: {
|
|
kind: 'finding_node',
|
|
value: {
|
|
id: 'fnode-a',
|
|
name: name('Node A'),
|
|
description: {},
|
|
reference_ids: nodeRefs,
|
|
requires_vet_referral: false,
|
|
review_status: 'to_confirm',
|
|
children: [],
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
async function mount(text = baseText()) {
|
|
serverHas(text, 3)
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
return user
|
|
}
|
|
|
|
describe('KeptPlace', () => {
|
|
function Probe() {
|
|
return <p>{usePlaceVisible() ? 'yes' : 'no'}</p>
|
|
}
|
|
|
|
it('hides its children and composes with the places around it', () => {
|
|
render(
|
|
<KeptPlace name="outer" visible>
|
|
<KeptPlace name="inner" visible={false}>
|
|
<Probe />
|
|
</KeptPlace>
|
|
<KeptPlace name="other" visible>
|
|
<Probe />
|
|
</KeptPlace>
|
|
</KeptPlace>,
|
|
)
|
|
expect(place('inner')).not.toBeVisible()
|
|
expect(place('other')).toBeVisible()
|
|
expect(screen.getAllByText('yes')).toHaveLength(1)
|
|
})
|
|
|
|
it('an own visible place inside a hidden one is not visible', () => {
|
|
render(
|
|
<KeptPlace name="outer" visible={false}>
|
|
<KeptPlace name="inner" visible>
|
|
<Probe />
|
|
</KeptPlace>
|
|
</KeptPlace>,
|
|
)
|
|
expect(screen.getByText('no')).toBeInTheDocument()
|
|
})
|
|
|
|
it('is visible outside any place', () => {
|
|
render(<Probe />)
|
|
expect(screen.getByText('yes')).toBeInTheDocument()
|
|
})
|
|
})
|
|
|
|
describe('text typed in a place that is left', () => {
|
|
it('the category add form survives Général ↔ Annotations and a section round trip', async () => {
|
|
const user = await mount()
|
|
await user.click(tab('Annotations'))
|
|
await user.click(entry('Modifier les catégories'))
|
|
const field = inPlace('annotations.categories').getByLabelText(
|
|
'Nom de la catégorie (FR)',
|
|
{ selector: '#category-new-fr' },
|
|
)
|
|
await user.type(field, 'Brouillon')
|
|
await user.click(tab('Général'))
|
|
expect(place('annotations.categories')).not.toBeVisible()
|
|
await user.click(tab('Annotations'))
|
|
expect(place('annotations.categories')).toBeVisible()
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
await user.click(entry('Modifier les catégories'))
|
|
expect(document.querySelector('#category-new-fr')).toBe(field)
|
|
expect(field).toHaveValue('Brouillon')
|
|
expect(store.getState().unsaved).toBe(false)
|
|
})
|
|
|
|
it('the references search survives leaving and returning to the Références tab', async () => {
|
|
const user = await mount()
|
|
await user.click(tab('Références'))
|
|
const box = inPlace('references').getByRole('searchbox', {
|
|
name: 'Rechercher une référence',
|
|
})
|
|
await user.type(box, 'Smith 1999')
|
|
await user.click(tab('Annotations'))
|
|
expect(place('references')).not.toBeVisible()
|
|
await user.click(tab('Références'))
|
|
expect(box).toHaveValue('Smith 1999')
|
|
expect(store.getState().unsaved).toBe(false)
|
|
})
|
|
})
|
|
|
|
describe('findings and canvas state across a tab change', () => {
|
|
it('the findings selection and expansion survive', async () => {
|
|
const user = await mount(findingsText())
|
|
await user.click(tab('Constats'))
|
|
const zone = inPlace('findings').getByRole('treeitem', { name: /Zone A/ })
|
|
const cat = inPlace('findings').getByRole('treeitem', { name: /Cat A/ })
|
|
await user.click(cat)
|
|
expect(zone).toHaveAttribute('aria-expanded', 'true')
|
|
await user.click(tab('Général'))
|
|
await user.click(tab('Constats'))
|
|
expect(inPlace('findings').getByRole('treeitem', { name: /Cat A/ })).toBe(
|
|
cat,
|
|
)
|
|
expect(cat).toHaveAttribute('aria-selected', 'true')
|
|
expect(zone).toHaveAttribute('aria-expanded', 'true')
|
|
})
|
|
|
|
it('the canvas tool, selection and zoom survive a tab change and a section round trip', async () => {
|
|
const text = insert(drawnText(), point('anno-a', 50, 50, 5))
|
|
const user = await mount(text)
|
|
await waitFor(() =>
|
|
expect(
|
|
inPlace('annotations.drawing').getByRole('button', { name: 'Zone' }),
|
|
).toBeEnabled(),
|
|
)
|
|
const drawing = inPlace('annotations.drawing')
|
|
await user.click(drawing.getByRole('button', { name: 'Zone' }))
|
|
await user.click(drawing.getByRole('button', { name: 'Zoom avant' }))
|
|
const layer = () =>
|
|
drawing.getByTestId('annotation-canvas').firstElementChild as HTMLElement
|
|
const zoomed = layer().style.transform
|
|
expect(zoomed).not.toContain('scale(1)')
|
|
await user.click(tab('Général'))
|
|
await user.click(tab('Annotations'))
|
|
await user.click(entry('Gérer les vues'))
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
expect(drawing.getByRole('button', { name: 'Zone' })).toHaveAttribute(
|
|
'aria-pressed',
|
|
'true',
|
|
)
|
|
expect(layer().style.transform).toBe(zoomed)
|
|
const list = drawing.getByRole('list', { name: 'Annotations de la vue' })
|
|
await user.click(within(list).getAllByRole('button')[0])
|
|
const marker = () =>
|
|
drawing
|
|
.getByTestId('annotation-canvas-drawing')
|
|
.querySelector('[data-anno-id="anno-a"]')
|
|
const stillSelected = () =>
|
|
waitFor(() => expect(marker()).toHaveAttribute('data-state', 'current'))
|
|
await stillSelected()
|
|
await user.click(tab('Général'))
|
|
await user.click(tab('Annotations'))
|
|
await stillSelected()
|
|
// U2 Task 6: the selection's strip offers its properties (the panel left the column).
|
|
expect(drawing.getByRole('button', { name: 'Propriétés' })).toBeVisible()
|
|
})
|
|
|
|
it('the unmeasured hint opens the views section and « Retour au dessin » restores the same canvas', async () => {
|
|
serverHas(emptyText(), 3, false)
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(tab('Annotations'))
|
|
const drawing = inPlace('annotations.drawing')
|
|
const canvas = drawing.getByTestId('annotation-canvas')
|
|
await user.click(drawing.getByRole('button', { name: 'Vues' }))
|
|
expect(place('annotations.views')).toBeVisible()
|
|
expect(place('annotations.drawing')).not.toBeVisible()
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
expect(place('annotations.drawing')).toBeVisible()
|
|
expect(drawing.getByTestId('annotation-canvas')).toBe(canvas)
|
|
})
|
|
})
|
|
|
|
describe('a field still focused while a place is left', () => {
|
|
async function generalNameField(user: ReturnType<typeof userEvent.setup>) {
|
|
await user.click(tab('Général'))
|
|
const field = inPlace('general').getByLabelText('Nom (FR)', {
|
|
exact: true,
|
|
selector: '#general-name-fr',
|
|
})
|
|
await user.click(field)
|
|
fireEvent.change(field, { target: { value: 'Nom saisi' } })
|
|
return field
|
|
}
|
|
|
|
it('a click that moves no focus (Safari) still commits it, as one undo entry', async () => {
|
|
const user = await mount()
|
|
const before = store.getState().documentText
|
|
const field = await generalNameField(user)
|
|
expect(document.activeElement).toBe(field)
|
|
fireEvent.click(tab('Annotations'))
|
|
expect(JSON.parse(store.getState().documentText).name.fr).toBe('Nom saisi')
|
|
expect(store.getState().unsaved).toBe(true)
|
|
act(() => void store.getState().undoStep())
|
|
expect(store.getState().documentText).toBe(before)
|
|
})
|
|
|
|
it('an arrow key on the tab list commits it first, as one undo entry', async () => {
|
|
const user = await mount()
|
|
const before = store.getState().documentText
|
|
const field = await generalNameField(user)
|
|
fireEvent.keyDown(tab('Général'), { key: 'ArrowRight' })
|
|
expect(tab('Annotations')).toHaveAttribute('aria-selected', 'true')
|
|
expect(JSON.parse(store.getState().documentText).name.fr).toBe('Nom saisi')
|
|
expect(field).toHaveValue('Nom saisi')
|
|
expect(store.getState().unsaved).toBe(true)
|
|
act(() => void store.getState().undoStep())
|
|
expect(store.getState().documentText).toBe(before)
|
|
})
|
|
})
|
|
|
|
describe('ids and parses', () => {
|
|
const detail = {
|
|
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: 20, width: 40, height: 60 },
|
|
parent_view_id: 'view-main',
|
|
},
|
|
} as const
|
|
|
|
/** A drawing whose own elements carry ids, so a second composed copy would repeat them. */
|
|
function serveDrawingWithIds(text: string): void {
|
|
const svg =
|
|
'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">' +
|
|
'<defs><linearGradient id="fade"><stop offset="0"/></linearGradient></defs>' +
|
|
'<rect id="body" width="4" height="4" fill="url(#fade)"/></svg>'
|
|
const cleaned = cleanSvg(new TextEncoder().encode(svg))
|
|
if (!cleaned.ok || !cleaned.value.stored) throw new Error('uncleanable')
|
|
const bytes = new TextEncoder().encode(cleaned.value.stored)
|
|
const answer = versionAnswer(text, 3)
|
|
answer.drawings = [{ asset_id: ASSET, sha256: cleaned.value.sha256! }]
|
|
sb.getSheetVersion.mockResolvedValue(answer as never)
|
|
sb.downloadSheetDrawing.mockResolvedValue(bytes)
|
|
}
|
|
|
|
const composedHosts = () =>
|
|
[
|
|
...document.querySelectorAll(
|
|
'[data-testid="annotation-canvas-drawing"], [data-testid="crop-canvas-drawing"]',
|
|
),
|
|
].filter((host) => host.querySelector('svg'))
|
|
|
|
it('every place visited, a crop group open: one composed copy, no id repeats', async () => {
|
|
serveDrawingWithIds(insert(drawnText(), detail))
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await waitFor(() => expect(composedHosts()).toHaveLength(1))
|
|
await user.click(entry('Gérer les vues'))
|
|
await user.click(
|
|
inPlace('annotations.views').getByRole('button', {
|
|
name: 'Modifier le recadrage',
|
|
}),
|
|
)
|
|
await waitFor(() => expect(composedHosts()).toHaveLength(1))
|
|
expect(composedHosts()[0]).toHaveAttribute(
|
|
'data-testid',
|
|
'crop-canvas-drawing',
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
await user.click(entry('Modifier les catégories'))
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
await user.click(entry(/^Régions vertébrales/))
|
|
for (const name of ['Général', 'Constats', 'Références', /Vérification/]) {
|
|
await user.click(tab(name))
|
|
}
|
|
expect(composedHosts()).toHaveLength(0)
|
|
await user.click(tab('Annotations'))
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
await waitFor(() => expect(composedHosts()).toHaveLength(1))
|
|
const ids = [...document.querySelectorAll('[id]')].map((e) => e.id)
|
|
expect(ids.filter((id, i) => ids.indexOf(id) !== i)).toEqual([])
|
|
expect(ids.some((id) => id.includes('body'))).toBe(true)
|
|
})
|
|
|
|
it('every place reads the same parsed document per text', async () => {
|
|
await mount()
|
|
const seen: unknown[] = []
|
|
function Probe() {
|
|
seen.push(useSheetDocument())
|
|
return null
|
|
}
|
|
const first = render(
|
|
<>
|
|
<Probe />
|
|
<Probe />
|
|
</>,
|
|
)
|
|
expect(seen[0]).not.toBeNull()
|
|
expect(seen[1]).toBe(seen[0])
|
|
first.unmount()
|
|
act(() => {
|
|
store.getState().commit({
|
|
op: 'insert',
|
|
element: {
|
|
kind: 'category',
|
|
value: { id: 'cat-z', name: name('Z'), color: null },
|
|
},
|
|
})
|
|
})
|
|
seen.length = 0
|
|
render(
|
|
<>
|
|
<Probe />
|
|
<Probe />
|
|
</>,
|
|
)
|
|
expect(seen[1]).toBe(seen[0])
|
|
expect(seen[0]).toMatchObject({
|
|
categories: expect.arrayContaining([
|
|
expect.objectContaining({ id: 'cat-z' }),
|
|
]),
|
|
})
|
|
})
|
|
})
|
|
|
|
describe('a request reaches only its owner', () => {
|
|
it('a finding request focuses the findings place while others are mounted', async () => {
|
|
await mount(findingsText())
|
|
await userEvent.setup().click(tab('Constats'))
|
|
await userEvent.setup().click(tab('Général'))
|
|
const consumed = vi.fn()
|
|
const { unmount } = render(
|
|
<FocusConsumedContext value={consumed}>
|
|
<EditorTabBody
|
|
tab="findings"
|
|
visited={['general', 'annotations', 'findings']}
|
|
readOnly={false}
|
|
navigate={vi.fn()}
|
|
reloadSheet={vi.fn()}
|
|
layer={testLayer}
|
|
focus={{
|
|
target: targetOfKey({
|
|
kind: 'finding',
|
|
zone_id: 'zone-a',
|
|
path: ['fcat-a'],
|
|
}),
|
|
serial: 9,
|
|
}}
|
|
annotations={{
|
|
section: 'drawing',
|
|
visited: ['drawing'],
|
|
onOpenSection: vi.fn(),
|
|
onBack: vi.fn(),
|
|
}}
|
|
/>
|
|
</FocusConsumedContext>,
|
|
)
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledTimes(1))
|
|
expect(consumed).toHaveBeenCalledWith(9, 'found')
|
|
unmount()
|
|
})
|
|
|
|
it('after « Aller à » a finding, arrowing back onto Constats keeps the focus on the tab', async () => {
|
|
const text = insert(findingsText(), {
|
|
...point('anno-bare', 10, 10, 2),
|
|
})
|
|
const user = await mount(text)
|
|
await user.click(tab('Constats'))
|
|
await user.click(
|
|
inPlace('findings').getByRole('treeitem', { name: /Cat A/ }),
|
|
)
|
|
await user.click(tab('Annotations'))
|
|
tab('Annotations').focus()
|
|
await user.keyboard('{ArrowRight}')
|
|
expect(tab('Constats')).toHaveAttribute('aria-selected', 'true')
|
|
expect(document.activeElement).toBe(tab('Constats'))
|
|
})
|
|
})
|
|
|
|
describe('« Aller à » while a creation or a tracing is in progress', () => {
|
|
const liveText = () =>
|
|
document.querySelector('p[aria-live="polite"]')?.textContent ?? ''
|
|
|
|
function bareAnnotationText(): string {
|
|
const bare = point('anno-bare', 10, 10, 2)
|
|
const value = { ...bare.value, geometry: null, name: name('Sans tracé') }
|
|
return insert(drawnText(), { kind: 'annotation', value } as typeof bare)
|
|
}
|
|
|
|
async function gotoBare(
|
|
user: ReturnType<typeof userEvent.setup>,
|
|
start: () => Promise<void>,
|
|
) {
|
|
await waitFor(() =>
|
|
expect(
|
|
inPlace('annotations.drawing').getByRole('button', { name: 'Zone' }),
|
|
).toBeEnabled(),
|
|
)
|
|
await start()
|
|
await user.click(tab(/Vérification/))
|
|
await user.click(
|
|
inPlace('verification').getAllByRole('button', {
|
|
name: 'Aller à Sans tracé',
|
|
})[0],
|
|
)
|
|
}
|
|
|
|
it('a tracing from the Zone tool is kept and focused', async () => {
|
|
const user = await mount(bareAnnotationText())
|
|
await gotoBare(user, async () => {
|
|
await user.click(
|
|
inPlace('annotations.drawing').getByRole('button', { name: 'Zone' }),
|
|
)
|
|
pressAt(screen.getByTestId('annotation-canvas'), 20, 20)
|
|
})
|
|
expect(tab('Annotations')).toHaveAttribute('aria-selected', 'true')
|
|
const bar = within(place('annotations.drawing')).getByTestId(
|
|
'tracing-commands',
|
|
)
|
|
expect(bar).toBeVisible()
|
|
await waitFor(() => expect(document.activeElement).toBe(bar))
|
|
expect(liveText()).toContain('tracé est en cours')
|
|
})
|
|
|
|
// U2 Task 5 (R-12): « Remplacer par un polygone » is a redraw mode. With nothing placed a
|
|
// tab ends it at once; with a vertex placed the tab asks first and « Continuer » keeps it.
|
|
it('a « Remplacer par un polygone » redraw: ended by a tab when empty, asked once a vertex is placed', async () => {
|
|
const zone = point('zone-a', 0, 0, 1)
|
|
const zoneValue = {
|
|
...zone.value,
|
|
kind: 'zone',
|
|
geometry: { type: 'path', d: 'M 20 20 L 80 20 L 50 80 Z' },
|
|
}
|
|
const text = insert(bareAnnotationText(), {
|
|
kind: 'annotation',
|
|
value: zoneValue,
|
|
} as typeof zone)
|
|
const user = await mount(text)
|
|
const drawing = inPlace('annotations.drawing')
|
|
const replace = async () => {
|
|
await user.click(
|
|
await drawing.findByRole('button', {
|
|
name: 'Remplacer par un polygone',
|
|
}),
|
|
)
|
|
expect(drawing.getByTestId('tracing-commands')).toBeVisible()
|
|
}
|
|
const list = drawing.getByRole('list', { name: 'Annotations de la vue' })
|
|
await user.click(within(list).getAllByRole('button')[0])
|
|
await replace()
|
|
await user.click(tab(/Vérification/))
|
|
expect(tab(/Vérification/)).toHaveAttribute('aria-selected', 'true')
|
|
expect(useAnnotationWork.getState().mode).toBeNull()
|
|
await user.click(tab('Annotations'))
|
|
await replace()
|
|
pressAt(screen.getByTestId('annotation-canvas'), 20, 20)
|
|
await user.click(tab(/Vérification/))
|
|
expect(
|
|
await screen.findByRole('dialog', {
|
|
name: 'Abandonner le nouveau tracé ?',
|
|
}),
|
|
).toBeInTheDocument()
|
|
await user.click(screen.getByRole('button', { name: 'Continuer' }))
|
|
expect(tab('Annotations')).toHaveAttribute('aria-selected', 'true')
|
|
expect(drawing.getByTestId('tracing-commands')).toBeVisible()
|
|
})
|
|
|
|
it('a pending creation is kept and focused', async () => {
|
|
const user = await mount(bareAnnotationText())
|
|
await gotoBare(user, async () => {
|
|
await user.click(
|
|
inPlace('annotations.drawing').getByRole('button', {
|
|
name: 'Ajouter un point',
|
|
}),
|
|
)
|
|
})
|
|
const panel = within(place('annotations.drawing')).getByTestId(
|
|
'annotation-creation',
|
|
)
|
|
expect(panel).toBeVisible()
|
|
await waitFor(() =>
|
|
expect(document.activeElement).toHaveAttribute('data-creation-heading'),
|
|
)
|
|
expect(liveText()).toContain('création est en cours')
|
|
})
|
|
})
|