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)
300 lines
11 KiB
TypeScript
300 lines
11 KiB
TypeScript
import { readFileSync } from 'node:fs'
|
||
import { join } from 'node:path'
|
||
import { fr } from '@/i18n/fr'
|
||
import type { Page, TestInfo } from '@playwright/test'
|
||
import { expect, expectAccessible, test } from '../support/browser'
|
||
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
|
||
import {
|
||
clientOf,
|
||
editorActor,
|
||
openEditor,
|
||
pickAnnotation,
|
||
seedDraft,
|
||
selectionTag,
|
||
shownPoints,
|
||
toolButton,
|
||
} from '../support/editor'
|
||
import { expectNoShift } from '../support/layout'
|
||
|
||
// V1-2.6 U2 Task 5: a zone edited on the drawing, « Vertèbres thoraciques » of the equine
|
||
// draft on its own drawing: vertex drag, « + », « − », zone drag, redraw accepted and
|
||
// refused, each undone, nothing around the drawing moving (A14); the topmost rule.
|
||
|
||
const dict = fr
|
||
const isPhone = (info: TestInfo) => info.project.name === 'chromium-375'
|
||
const DRAFT = join(
|
||
__dirname,
|
||
'../../../../supabase/seed/anatomical-sheets/equine/draft',
|
||
)
|
||
const THORACIC = /Vertèbres thoraciques/
|
||
// The side panel's content may change (U2 Task 6 moves it into a dialog).
|
||
|
||
interface Draft {
|
||
vertebral_config: unknown
|
||
references: unknown
|
||
categories: unknown
|
||
finding_zones: unknown
|
||
views: { id: string; svg_asset_id: string | null }[]
|
||
annotations: { view_id: string; kind: string }[]
|
||
}
|
||
|
||
/** The equine draft's main view, its annotations and structures, on the seeded drawing. */
|
||
function equineShape(document: Record<string, unknown>) {
|
||
const draft = JSON.parse(
|
||
readFileSync(join(DRAFT, 'document.json'), 'utf8'),
|
||
) as Draft
|
||
const [seeded] = document.views as Draft['views']
|
||
const main = draft.views.find((view) => view.id === 'main')!
|
||
Object.assign(document, {
|
||
vertebral_config: draft.vertebral_config,
|
||
references: draft.references,
|
||
categories: draft.categories,
|
||
finding_zones: draft.finding_zones,
|
||
views: [{ ...main, svg_asset_id: seeded.svg_asset_id }],
|
||
// The detail view is left out, so is the link that opens it.
|
||
annotations: draft.annotations.filter(
|
||
(a) => a.view_id === 'main' && a.kind !== 'detail_trigger',
|
||
),
|
||
})
|
||
}
|
||
|
||
async function openThoracic(page: Page) {
|
||
await page.setViewportSize({ width: 1280, height: 800 })
|
||
const actor = await editorActor('fr')
|
||
const seed = await seedDraft(actor, {
|
||
drawing: readFileSync(join(DRAFT, 'assets/horse.svg'), 'utf8'),
|
||
shape: equineShape,
|
||
})
|
||
await openEditor(page, dict, actor, seed.sheetId)
|
||
await expect(toolButton(page, dict, 'point')).toBeEnabled()
|
||
return actor
|
||
}
|
||
|
||
const handle = (page: Page, name: string) =>
|
||
page.getByRole('button', { name, exact: true })
|
||
const line = (page: Page) => page.getByTestId('gesture-line')
|
||
const button = (page: Page, key: string) =>
|
||
page.getByRole('button', { name: dict[key], exact: true })
|
||
const undo = (page: Page) => page.keyboard.press('Control+z')
|
||
|
||
/** An undo back to `points`, nothing around the drawing moving (A14). */
|
||
async function undoTo(
|
||
page: Page,
|
||
points: () => Promise<unknown>,
|
||
expected: unknown,
|
||
) {
|
||
await expectNoShift(page, async () => {
|
||
await undo(page)
|
||
await expect.poll(points).toEqual(expected)
|
||
})
|
||
}
|
||
|
||
/** A press and release at the centre of a handle's hit shape. */
|
||
async function pressHandle(page: Page, name: string) {
|
||
const box = (await handle(page, name).locator('[data-handle]').boundingBox())!
|
||
await page.mouse.click(box.x + box.width / 2, box.y + box.height / 2)
|
||
}
|
||
|
||
/** A mouse drag between two drawing points, past the slop. */
|
||
async function dragDrawing(
|
||
page: Page,
|
||
from: { x: number; y: number },
|
||
to: { x: number; y: number },
|
||
) {
|
||
const start = await clientOf(page, from.x, from.y)
|
||
const end = await clientOf(page, to.x, to.y)
|
||
await page.mouse.move(start.x, start.y)
|
||
await page.mouse.down()
|
||
await page.mouse.move(end.x, end.y, { steps: 6 })
|
||
await page.mouse.up()
|
||
}
|
||
|
||
async function clickAt(page: Page, x: number, y: number) {
|
||
const at = await clientOf(page, x, y)
|
||
await page.mouse.click(at.x, at.y)
|
||
}
|
||
|
||
const count = async (page: Page) => (await shownPoints(page)).length
|
||
|
||
test.describe('editor zones on the drawing (U2 Task 5)', () => {
|
||
test.use({ locale: 'fr-FR', actionTimeout: 15_000 })
|
||
test.beforeEach(async ({ context }, info) => {
|
||
test.skip(isPhone(info), 'editing needs 1 024 px') // floor-guard: allow C16 editing needs >= 1024 px; phone read-only covered in editor-access
|
||
await routeToSandbox(context)
|
||
})
|
||
test.afterEach(async ({ context }) => {
|
||
await dropLateReplays(context)
|
||
})
|
||
|
||
test('Thoraciques: vertex drag, « + », « − », zone drag, each undone', async ({
|
||
page,
|
||
requests,
|
||
}) => {
|
||
const actor = await openThoracic(page)
|
||
requests.forbid(actor.account.email, actor.account.password)
|
||
await pickAnnotation(page, dict, THORACIC)
|
||
await expect(selectionTag(page)).toContainText('Vertèbres thoraciques')
|
||
await expect(handle(page, 'Sommet 9')).toBeAttached()
|
||
// R-18: at fit zoom some segments are too short for their « + ».
|
||
await expect(page.getByTestId('edit-strip-notice')).toContainText(
|
||
dict['editor.annotations.strip.zoom_hint'],
|
||
)
|
||
await expectAccessible(page, 'a selected zone: vertices and « + »')
|
||
const stored = await shownPoints(page)
|
||
|
||
// A vertex dragged: one commit, the vertex chosen, then undone.
|
||
await expectNoShift(page, async () => {
|
||
await dragDrawing(page, { x: 1103, y: 558.9 }, { x: 1103, y: 620 })
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.vertex_moved'],
|
||
)
|
||
})
|
||
const [, moved] = await shownPoints(page)
|
||
expect(Math.abs(moved[1] - 620)).toBeLessThan(3)
|
||
await undoTo(page, () => shownPoints(page), stored)
|
||
|
||
// « + » on the segment from vertex 2: a vertex added and chosen, then undone.
|
||
await expectNoShift(page, async () => {
|
||
await pressHandle(page, 'Ajouter un sommet après le sommet 2')
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.vertex_added'],
|
||
)
|
||
})
|
||
expect(await count(page)).toBe(10)
|
||
await expect(page.getByTestId('edit-strip-detail')).toContainText(
|
||
'sommet 3 choisi',
|
||
)
|
||
await undoTo(page, () => count(page), 9)
|
||
|
||
// « − » on the chosen vertex 3, then undone.
|
||
await expectNoShift(page, async () => {
|
||
await pressHandle(page, 'Sommet 3')
|
||
await expect(page.getByTestId('edit-strip-detail')).toContainText(
|
||
'sommet 3 choisi',
|
||
)
|
||
})
|
||
await expectNoShift(page, async () => {
|
||
await pressHandle(page, 'Retirer le sommet 3')
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.vertex_removed'],
|
||
)
|
||
})
|
||
expect(await count(page)).toBe(8)
|
||
await undoTo(page, () => shownPoints(page), stored)
|
||
|
||
// The interior dragged by the mouse moves the zone as a block, then undone.
|
||
await expectNoShift(page, async () => {
|
||
await dragDrawing(page, { x: 914, y: 498 }, { x: 954, y: 538 })
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.moved.zone'],
|
||
)
|
||
})
|
||
const [first] = await shownPoints(page)
|
||
expect(Math.abs(first[0] - (stored[0][0] + 40))).toBeLessThan(3)
|
||
await undoTo(page, () => shownPoints(page), stored)
|
||
})
|
||
|
||
test('Thoraciques: « Désélectionner » commits the arrow steps pending on a vertex', async ({
|
||
page,
|
||
requests,
|
||
}) => {
|
||
const actor = await openThoracic(page)
|
||
requests.forbid(actor.account.email, actor.account.password)
|
||
await pickAnnotation(page, dict, THORACIC)
|
||
const [, second] = await shownPoints(page)
|
||
await handle(page, 'Sommet 2').focus()
|
||
await page.keyboard.press('ArrowDown')
|
||
// Not under expectNoShift: the button returns the focus to the list row, which
|
||
// scrolls it into view by design.
|
||
await page
|
||
.getByTestId('edit-strip')
|
||
.getByRole('button', { name: dict['editor.annotations.deselect'] })
|
||
.click()
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.vertex_moved'],
|
||
)
|
||
await pickAnnotation(page, dict, THORACIC)
|
||
const [, after] = await shownPoints(page)
|
||
expect(after[1]).toBeGreaterThan(second[1])
|
||
})
|
||
|
||
test('Thoraciques: redraw accepted, then refused, the old outline kept meanwhile', async ({
|
||
page,
|
||
requests,
|
||
}) => {
|
||
const actor = await openThoracic(page)
|
||
requests.forbid(actor.account.email, actor.account.password)
|
||
await pickAnnotation(page, dict, THORACIC)
|
||
const stored = await shownPoints(page)
|
||
|
||
// Accepted: four clicks, « Fermer le tracé », one commit, every property kept.
|
||
await expectNoShift(page, () =>
|
||
button(page, 'editor.annotations.redraw').click(),
|
||
)
|
||
for (const [x, y] of [
|
||
[850, 440],
|
||
[1100, 470],
|
||
[1100, 560],
|
||
[850, 545],
|
||
])
|
||
await expectNoShift(page, () => clickAt(page, x, y))
|
||
await expect(page.getByTestId('overlay-old-place')).toBeAttached()
|
||
await expectNoShift(page, async () => {
|
||
await button(page, 'editor.annotations.trace_close').click()
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.redrawn.zone'],
|
||
)
|
||
})
|
||
await expect(selectionTag(page)).toContainText('Vertèbres thoraciques')
|
||
expect(await count(page)).toBe(4)
|
||
await undoTo(page, () => shownPoints(page), stored)
|
||
|
||
// Refused: a sliver; the tracing stays open with the core's message, then cancelled.
|
||
await expectNoShift(page, () =>
|
||
button(page, 'editor.annotations.redraw').click(),
|
||
)
|
||
for (const [x, y] of [
|
||
[900, 450],
|
||
[1100, 452],
|
||
[1300, 455],
|
||
])
|
||
await expectNoShift(page, () => clickAt(page, x, y))
|
||
await expectNoShift(page, async () => {
|
||
await button(page, 'editor.annotations.trace_close').click()
|
||
await expect(page.getByTestId('edit-strip-title')).toHaveText(
|
||
dict['editor.annotations.strip.close_refused'],
|
||
)
|
||
})
|
||
await expect(button(page, 'editor.annotations.trace_close')).toBeVisible()
|
||
await expectNoShift(page, () =>
|
||
button(page, 'editor.annotations.trace_cancel').click(),
|
||
)
|
||
await expect.poll(() => shownPoints(page)).toEqual(stored)
|
||
})
|
||
|
||
test('a click inside Thoraciques on C7-T1 selects the point drawn on top', async ({
|
||
page,
|
||
requests,
|
||
}) => {
|
||
const actor = await openThoracic(page)
|
||
requests.forbid(actor.account.email, actor.account.password)
|
||
await clickAt(page, 865, 528)
|
||
await expect(selectionTag(page)).toContainText('C7-T1')
|
||
|
||
// Thoraciques selected: zoomed at C7-T1 so that its vertex handles leave room, a click
|
||
// inside both shapes still selects the point (the selection's interior comes after).
|
||
await pickAnnotation(page, dict, THORACIC)
|
||
const at = await clientOf(page, 870, 515)
|
||
await page.mouse.move(at.x, at.y)
|
||
await page.keyboard.down('Control')
|
||
for (let notch = 0; notch < 14; notch++) await page.mouse.wheel(0, -100)
|
||
await page.keyboard.up('Control')
|
||
// R-18: zoomed enough, every « + » shows and the zoom line is gone.
|
||
await expect(page.getByTestId('edit-strip-notice')).not.toContainText(
|
||
dict['editor.annotations.strip.zoom_hint'],
|
||
)
|
||
await clickAt(page, 870, 515)
|
||
await expect(selectionTag(page)).toContainText('C7-T1')
|
||
})
|
||
})
|