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

+74 -99
View File
@@ -25,6 +25,7 @@ import {
shapeWith,
standardShape,
UNSAVED_LINE,
openProperties,
} from '../support/editor'
import { expectNoShift, keepNativeFrames } from '../support/layout'
@@ -35,7 +36,9 @@ const dict = fr
const isPhone = (info: TestInfo) => info.project.name === 'chromium-375'
const creation = (page: Page) => page.getByTestId('annotation-creation')
const properties = (page: Page) => page.getByTestId('annotation-properties')
/** The selection's commands in the strip (U2 Task 6: the properties are a dialog). */
const properties = (page: Page) =>
page.locator('[data-testid="edit-strip"]:has([data-properties-button])')
const list = (page: Page) =>
page.getByRole('list', { name: dict['editor.annotations.list'] })
@@ -144,7 +147,9 @@ test.describe('editor annotations (A3)', () => {
// A keyboard edit on the point's handle (two steps of 5 units), then undo and redo.
await tool(page, 'select').click()
await pickAnnotation(page, dict, /Point un/)
await page.getByRole('button', { name: 'Point Point un' }).focus()
await page
.getByRole('button', { name: 'Point Point un', exact: true })
.focus()
await page.keyboard.press('ArrowRight')
await page.keyboard.press('ArrowRight')
await page.keyboard.press('Enter')
@@ -195,6 +200,10 @@ test.describe('editor annotations (A3)', () => {
await page.mouse.up()
await expect(shownShape(page)).toHaveAttribute('cx', x0)
await expect(shownShape(page)).toHaveAttribute('cy', y0)
// A1: a click on the selected point opens its properties (U2 Task 6); closed again.
await expect(page.getByRole('dialog')).toBeVisible()
await page.keyboard.press('Escape')
await expect(page.getByRole('dialog')).toHaveCount(0)
// A real drag: the point follows to (400, 360) in drawing units.
const to = await clientOf(page, 400, 360)
@@ -240,7 +249,9 @@ test.describe('editor annotations (A3)', () => {
// The handle keys (U2 Task 5): two steps of 5 units down, one commit on Enter.
const cy0 = await shownNumber(page, 'cy')
await page.getByRole('button', { name: 'Point Clavier' }).focus()
await page
.getByRole('button', { name: 'Point Clavier', exact: true })
.focus()
await page.keyboard.press('ArrowDown')
await page.keyboard.press('ArrowDown')
await page.keyboard.press('Enter')
@@ -282,21 +293,24 @@ test.describe('editor annotations (A3)', () => {
await fillCreation(page, { fr: 'A relire', en: 'To review' })
await createFromPanel(page)
await properties(page)
const sheet = await openProperties(page, dict)
await sheet
.getByRole('button', { name: dict['editor.annotations.mark_reviewed'] })
.click()
await expect(
properties(page).getByRole('button', {
sheet.getByRole('button', {
name: dict['editor.annotations.to_confirm'],
}),
).toBeVisible()
await properties(page)
await sheet
.getByRole('button', { name: dict['editor.action.delete'] })
.click()
await page
.getByRole('dialog')
.locator('dialog[open]')
.last()
.getByRole('button', { name: dict['editor.delete.confirm'] })
.click()
await expect(page.locator('dialog[open]')).toHaveCount(0)
await expect(list(page)).toHaveCount(0)
await expect(
page.getByText(dict['editor.annotations.list_empty']),
@@ -340,30 +354,18 @@ test.describe('editor annotations (A3)', () => {
}) => {
const actor = await openWithPoint(page, width)
requests.forbid(actor.account.email, actor.account.password)
// shortcut: the side panel still swaps the overview for the properties or the
// creation panel until Tasks 6 and 7 (dialogs); its height is exempt there only.
const swaps = ['aside-content'] as const
await expectNoShift(
page,
async () => {
await clickDrawing(page, 500, 300)
await expect(selectionTag(page)).toContainText('Pt A')
},
swaps,
)
// The first commit: the save line changes, the message shows (the properties panel
// rewrites its review badge: aside content until Task 6).
await expectNoShift(
page,
async () => {
await dragPoint(page, { x: 560, y: 330 })
await expect(line(page)).toContainText(
dict['editor.annotations.message.moved.point'],
)
await expect(saveLine(page)).toHaveText(UNSAVED_LINE)
},
swaps,
)
await expectNoShift(page, async () => {
await clickDrawing(page, 500, 300)
await expect(selectionTag(page)).toContainText('Pt A')
})
// The first commit: the save line changes, the message shows.
await expectNoShift(page, async () => {
await dragPoint(page, { x: 560, y: 330 })
await expect(line(page)).toContainText(
dict['editor.annotations.message.moved.point'],
)
await expect(saveLine(page)).toHaveText(UNSAVED_LINE)
})
// Its own row, the column's width: the message is read whole.
const cut = await line(page)
.locator('span')
@@ -377,14 +379,10 @@ test.describe('editor annotations (A3)', () => {
dict['editor.annotations.message.moved.point'],
)
})
await expectNoShift(
page,
async () => {
await clickDrawing(page, 20, 20)
await expect(selectionTag(page)).toHaveCount(0)
},
swaps,
)
await expectNoShift(page, async () => {
await clickDrawing(page, 20, 20)
await expect(selectionTag(page)).toHaveCount(0)
})
await expectNoShift(page, () => tool(page, 'zone').click())
await expectNoShift(page, () => clickDrawing(page, 600, 150))
for (const [x, y] of [
@@ -396,14 +394,11 @@ test.describe('editor annotations (A3)', () => {
button(page, 'editor.annotations.trace_pop').click(),
)
await expectNoShift(page, () => clickDrawing(page, 700, 400))
await expectNoShift(
page,
async () => {
await button(page, 'editor.annotations.trace_close').click()
await expect(creation(page)).toBeVisible()
},
swaps,
)
// shortcut: the creation panel still replaces the overview in the side column until
// Task 7 (the creation dialog), so the close is checked out of the no-shift probe.
// Upgrade path: wrap it in expectNoShift again once the creation is a dialog.
await button(page, 'editor.annotations.trace_close').click()
await expect(creation(page)).toBeVisible()
})
}
@@ -413,80 +408,60 @@ test.describe('editor annotations (A3)', () => {
}) => {
const actor = await openWithPoint(page, 1280)
requests.forbid(actor.account.email, actor.account.password)
const swaps = ['aside-content'] as const
await expectNoShift(
page,
async () => {
await clickDrawing(page, 500, 300)
await expect(selectionTag(page)).toContainText('Pt A')
},
swaps,
)
const handle = page.getByRole('button', { name: 'Point Pt A' })
await expectNoShift(page, async () => {
await clickDrawing(page, 500, 300)
await expect(selectionTag(page)).toContainText('Pt A')
})
const handle = page.getByRole('button', {
name: 'Point Pt A',
exact: true,
})
await expect(handle).toHaveAttribute('tabindex', '0')
const slider = page.getByTestId('size-slider').getByRole('slider')
await expect(slider).toHaveValue('40')
await expectAccessible(page, 'a selected point: handle, slider, move')
// The handle follows the pointer; the drop is one commit.
await expectNoShift(
page,
async () => {
await dragPoint(page, { x: 560, y: 330 })
await expect(line(page)).toContainText(
dict['editor.annotations.message.moved.point'],
)
},
swaps,
)
await expectNoShift(page, async () => {
await dragPoint(page, { x: 560, y: 330 })
await expect(line(page)).toContainText(
dict['editor.annotations.message.moved.point'],
)
})
expect(Math.abs((await shownNumber(page, 'cx')) - 560)).toBeLessThan(2)
// A click on the track, no drag (WCAG 2.5.7): one commit at the release.
const track = (await slider.boundingBox())!
await expectNoShift(
page,
async () => {
await page.mouse.click(
track.x + track.width * 0.8,
track.y + track.height / 2,
)
await expect(line(page)).toContainText(
dict['editor.annotations.message.resized'],
)
},
swaps,
)
await expectNoShift(page, async () => {
await page.mouse.click(
track.x + track.width * 0.8,
track.y + track.height / 2,
)
await expect(line(page)).toContainText(
dict['editor.annotations.message.resized'],
)
})
expect(await shownNumber(page, 'r')).toBeGreaterThan(40)
await page.keyboard.press('Control+z')
await expect(shownShape(page)).toHaveAttribute('r', '40')
// The move mode: three steps (5 units each on a 1 000 px wide frame), validated once.
const x0 = await shownNumber(page, 'cx')
await expectNoShift(
page,
() => button(page, 'editor.annotations.move.point').click(),
swaps,
await expectNoShift(page, () =>
button(page, 'editor.annotations.move.point').click(),
)
const right = button(page, 'editor.annotations.move.right')
await expect(right).toBeVisible()
await expectAccessible(page, 'the move mode')
await expectNoShift(
page,
async () => {
for (let step = 0; step < 3; step++) await right.click()
},
swaps,
)
await expectNoShift(page, async () => {
for (let step = 0; step < 3; step++) await right.click()
})
// Nothing committed yet: the stored place stays, drawn as the old place.
await expect(storedShape(page)).toHaveAttribute('cx', String(x0))
await expectNoShift(
page,
async () => {
await button(page, 'editor.annotations.move.confirm').click()
await expect(right).toHaveCount(0)
},
swaps,
)
await expectNoShift(page, async () => {
await button(page, 'editor.annotations.move.confirm').click()
await expect(right).toHaveCount(0)
})
await expect(shownShape(page)).toHaveAttribute('cx', String(x0 + 15))
await expect(storedShape(page)).toHaveCount(0)
await expect(button(page, 'editor.annotations.move.point')).toBeFocused()
+52 -40
View File
@@ -37,11 +37,18 @@ import {
const dict = fr
const isPhone = (info: TestInfo) => info.project.name === 'chromium-375'
const properties = (page: Page) => page.getByTestId('annotation-properties')
const nameField = (page: Page) =>
properties(page).getByLabel(dict['editor.annotations.name_fr'], {
exact: true,
})
/**
* The selection's commands (U2 Task 6: the properties left the side column): the strip
* that offers « Propriétés », or the phone twin's inline read body.
*/
const properties = (page: Page) =>
page.locator(
'[data-testid="edit-strip"]:has([data-properties-button]), [data-annotation-aside] [data-testid="annotation-read"]',
)
/** A text field of the workspace, outside any dialog: the overview's filter. */
const filterField = (page: Page) =>
page.getByRole('searchbox', { name: dict['editor.overview.filter'] })
const pointHandle = (page: Page) => page.getByTestId('point-handle')
const overview = (page: Page) => page.getByTestId('annotation-overview')
const box = (page: Page) => page.getByTestId('annotation-canvas')
const liveRegion = (page: Page) =>
@@ -214,20 +221,30 @@ test.describe('deselect and D6b (editor, mouse and keyboard)', () => {
// A field focused: nothing happens, the field keeps the focus.
await select(page, POINT)
const name = nameField(page)
const name = filterField(page)
await name.focus()
await page.keyboard.press('Escape')
await expectKept(page, POINT)
await expect(name).toBeFocused()
// The delete dialog: only it closes (LRN-111: wait until it is gone).
// The delete dialog over the properties dialog: only it closes (LRN-111: wait until
// it is gone), then the properties dialog; the selection stays.
await properties(page)
.getByRole('button', { name: dict['editor.annotations.properties'] })
.click()
const sheet = page.getByRole('dialog', { name: POINT })
await sheet
.getByRole('button', { name: dict['editor.action.delete'] })
.click()
const dialog = page.getByRole('dialog')
await expect(dialog).toBeVisible()
const ask = page.getByRole('dialog', {
name: new RegExp(dict['editor.action.delete']),
})
await expect(ask).toBeVisible()
await page.keyboard.press('Escape')
await expect(dialog).toHaveCount(0)
await expect(ask).toHaveCount(0)
await expect(sheet).toBeVisible()
await page.keyboard.press('Escape')
await expect(sheet).toHaveCount(0)
await expectKept(page, POINT)
// The references dialog (over the finding dialog over Constats): Escape closes it
@@ -260,7 +277,7 @@ test.describe('deselect and D6b (editor, mouse and keyboard)', () => {
expect(saves).toEqual([])
})
test('mouse: empty clicks deselect, annotations select, the selected one stays', async ({
test('mouse: empty clicks deselect, annotations select, the selected one opens and stays', async ({
page,
requests,
}) => {
@@ -300,17 +317,24 @@ test.describe('deselect and D6b (editor, mouse and keyboard)', () => {
await expectSelected(page, name)
}
// The selected point and zone: click, double click and a 2 px jitter keep them.
// The selected point and zone: a click, a double click and a 2 px jitter keep them
// and open their properties (A1, U2 Task 6); Escape closes the dialog only.
const closeProperties = async (name: string) => {
await expect(page.getByRole('dialog', { name })).toBeVisible()
await page.keyboard.press('Escape')
await expect(page.getByRole('dialog')).toHaveCount(0)
await expectKept(page, name)
}
for (const [name, at] of targets.slice(0, 2)) {
await clickAt(page, at)
await expectSelected(page, name)
await clickAt(page, at)
await expectKept(page, name)
await closeProperties(name)
const now = await clientOf(page, at.x, at.y)
await page.mouse.dblclick(now.x, now.y)
await expectKept(page, name)
await closeProperties(name)
await mouseJitter(page, at.x, at.y)
await expectKept(page, name)
await closeProperties(name)
}
await expect(saveLine(page)).not.toHaveText(UNSAVED_LINE)
expect(saves).toEqual([])
@@ -386,47 +410,35 @@ test.describe('deselect and D6b (editor, mouse and keyboard)', () => {
expect(saves).toEqual([])
})
test('a typed value is applied by the click that deselects; « Désélectionner » commits in one click', async ({
test('a pending key series is applied by the click that deselects; « Désélectionner » commits it in one click', async ({
page,
requests,
}) => {
const { actor, saves } = await open(page)
requests.forbid(actor.account.email, actor.account.password)
// U2 Task 5: the coordinate fields left the panel; the name field carries the typing.
const name = nameField(page)
// U2 Task 6: the annotation's fields left the side column (one dialog save); the point
// handle's key series is the pending typing a deselect must not lose.
// Valid value, no blur, ONE click on the drawing.
// A step, no Enter, ONE click on the drawing.
await select(page, POINT)
await expect(name).toHaveValue(POINT)
await name.fill('Pt Delta')
await pointHandle(page).focus()
await page.keyboard.press('ArrowRight')
await clickAt(page, IN_CIRCLE)
await expectDeselected(page)
await expect(saveLine(page)).toHaveText(/1 modification non enregistrée/)
// Undo reverts the value.
// Undo reverts it.
await historyButton(page, dict, 'undo').click()
await expect(saveLine(page)).not.toHaveText(UNSAVED_LINE)
await select(page, POINT)
await expect(name).toHaveValue(POINT)
// « Désélectionner » with an unblurred refused value: closed at once, unchanged.
// A blank name is refused (both names are required).
const deselect = properties(page).getByRole('button', {
name: dict['editor.annotations.deselect'],
})
await name.fill('')
await deselect.click()
await expectDeselected(page)
await expect(saveLine(page)).not.toHaveText(UNSAVED_LINE)
// « Désélectionner » with a pending step: committed and closed.
await select(page, POINT)
await expect(name).toHaveValue(POINT)
// « Désélectionner » with an unblurred valid value: committed and closed.
await name.fill('Pt Epsilon')
await deselect.click()
await pointHandle(page).focus()
await page.keyboard.press('ArrowRight')
await properties(page)
.getByRole('button', { name: dict['editor.annotations.deselect'] })
.click()
await expectDeselected(page)
await expect(saveLine(page)).toHaveText(/1 modification non enregistrée/)
await select(page, 'Pt Epsilon')
await expect(name).toHaveValue('Pt Epsilon')
expect(saves).toEqual([])
})
})
+27 -27
View File
@@ -21,6 +21,7 @@ import {
serverDocument,
shapeWith,
standardShape,
openProperties,
} from '../support/editor'
// V1-2.6 geometry and adversarial cases (contract C7, C8, C21; owner 2026-11-04): a click
@@ -182,8 +183,19 @@ test.describe('editor geometry (adversarial)', () => {
requests.forbid(actor.account.email, actor.account.password)
await viewChip(page, 'Détail A').click()
await pickAnnotation(page, dict, /Hors cadre/)
const issues = page.getByTestId('annotation-geometry-issues')
await expect(issues).toBeVisible()
// The issue: an alert in the properties dialog's read mode, its text in the strip.
const properties = await openProperties(page, dict)
const issue = (
await properties
.getByTestId('annotation-geometry-issues')
.locator('li')
.first()
.innerText()
).trim()
await page.keyboard.press('Escape')
await expect(page.getByRole('dialog')).toHaveCount(0)
const notice = page.getByTestId('edit-strip-notice')
await expect(notice).toContainText(issue)
const verification = page.getByRole('tab', {
name: dict['editor.tab.verification'],
})
@@ -199,40 +211,28 @@ test.describe('editor geometry (adversarial)', () => {
})
// A partial move (still out of the frame): refused by the core, the point restored.
// Nothing around the drawing moves (A14); the side panel's content may (Task 6).
const swaps = ['aside-content'] as const
// NOT a Playwright artefact: at the page's end, the issue list leaving the panel shortens
// the page by 11 px and the scroll clamp moves the canvas (reported, U2 Task 5 fix round
// 1; Task 6 moves the panel out of the page). The check starts from the top.
await page.evaluate(() => window.scrollTo(0, 0))
await expectNoShift(page, () => move.click(), swaps)
// Nothing around the drawing moves (A14), wherever the page is scrolled: the issue
// lives in the strip and the dialog, the side column keeps the overview (U2 Task 6).
await expectNoShift(page, () => move.click())
await dragInMode(page, { x: 250, y: 250 }, { x: 260, y: 260 })
await expectNoShift(
page,
async () => {
await confirm.click()
await expect(page.getByTestId('gesture-message')).toBeVisible()
},
swaps,
)
await expectNoShift(page, async () => {
await confirm.click()
await expect(page.getByTestId('gesture-message')).toBeVisible()
})
await expect(page.getByTestId('gesture-message')).toContainText(
dict['editor.annotations.message.move_refused'].split(' :')[0],
)
await expect(page.getByTestId('overlay-refused-place')).toBeAttached()
await expect(shownShape(page)).toHaveAttribute('cx', '110')
await expect(issues).toBeVisible()
await expect(verification).toContainText(String(errorsBefore))
// Far enough inside: kept, the issue gone, one error less.
await expectNoShift(page, () => move.click(), swaps)
await expectNoShift(page, () => move.click())
await dragInMode(page, { x: 250, y: 250 }, { x: 290, y: 290 })
await expectNoShift(
page,
async () => {
await confirm.click()
await expect(issues).toHaveCount(0)
},
swaps,
)
await expectNoShift(page, async () => {
await confirm.click()
await expect(notice).not.toContainText(issue)
})
expect(Math.abs((await shownNumber(page, 'cx')) - 150)).toBeLessThan(2)
const after = (await verification.innerText()).replace(/\D/g, '')
expect(Number(after || 0)).toBeLessThan(errorsBefore)
+18 -5
View File
@@ -34,6 +34,7 @@ import {
showDrawing,
toolButton,
UNSAVED_LINE,
openProperties,
} from '../support/editor'
import { signIn } from '../support/shell'
@@ -225,9 +226,23 @@ async function modifyAnnotations(page: Page) {
const vertex = await stepRight(page, first, start, MODIFIED.vertex)
await expect.poll(async () => (await shownPoints(page))[0][0]).toBe(vertex)
await pickAnnotation(page, dict, /Accès essai/)
await commitText(page.locator('#annotation-name-fr'), 'Accès modifié')
await page.locator('#annotation-laterality').selectOption('bilateral')
await expect(page.locator('#annotation-name-fr')).toHaveValue('Accès modifié')
// U2 Task 6: the properties dialog's form, one save for both fields.
const properties = await openProperties(page, dict)
await properties
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
.click()
await properties.locator('#annotation-edit-fr').fill('Accès modifié')
await properties
.locator('#annotation-edit-laterality')
.selectOption('bilateral')
await properties
.getByRole('button', { name: dict['editor.findings.save'] })
.click()
await expect(properties.getByTestId('annotation-read')).toContainText(
'Accès modifié',
)
await page.keyboard.press('Escape')
await expect(page.getByRole('dialog')).toHaveCount(0)
return { point, vertex }
}
@@ -316,8 +331,6 @@ test.describe('editor journey (owner trial steps)', () => {
await historyButton(page, dict, 'undo').click()
await historyButton(page, dict, 'redo').click()
const modified = await modifyAnnotations(page)
// Playwright's auto-scroll to the last list row left « Enregistrer » under the top bar.
await page.evaluate(() => window.scrollTo(0, 0))
await expectAccessible(page, 'the editor with annotations')
await saveDraft(page, dict, 1)
const draftId = await sql(
@@ -0,0 +1,264 @@
import { fr } from '@/i18n/fr'
import type { CDPSession, Page, TestInfo } from '@playwright/test'
import { expect, expectAccessible, test } from '../support/browser'
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
import {
clickDrawing,
clientOf,
editorActor,
openEditor,
openProperties,
pickAnnotation,
pointOf,
seedDraft,
selectionTag,
shapeWith,
shownPoints,
toolButton,
} from '../support/editor'
import { expectNoShift, keepNativeFrames } from '../support/layout'
// U2 Task 6 (A1, A2, A3, R-6, R-14, Review Focus 3 and 5): the properties dialog over the
// right column, never over the drawing; opened by « Propriétés », a second click or a
// double click; a typed form survives a Back question and a width crossing.
const dict = fr
const isPhone = (info: TestInfo) => info.project.name === 'chromium-375'
const POINT = 'Pt Alpha'
const ZONE = 'Zone Beta'
const zone = {
...pointOf('zone-b', 'main', { cx: 0, cy: 0, r: 1 }, ZONE),
kind: 'zone',
geometry: {
type: 'polygon',
points: [
[100, 100],
[400, 100],
[400, 400],
[100, 400],
],
},
}
async function open(page: Page, width = 1280) {
await page.setViewportSize({ width, height: 800 })
const actor = await editorActor('fr')
const seed = await seedDraft(actor, {
shape: shapeWith(
pointOf('pt-a', 'main', { cx: 700, cy: 250, r: 30 }, POINT),
zone,
),
})
await openEditor(page, dict, actor, seed.sheetId)
await expect(toolButton(page, dict, 'point')).toBeEnabled()
return actor
}
const strip = (page: Page) => page.getByTestId('edit-strip')
const dialog = (page: Page) => page.getByRole('dialog')
const box = async (page: Page, selector: string) =>
(await page.locator(selector).locator('visible=true').first().boundingBox())!
type TouchPoint = { x: number; y: number }
const touch = (
cdp: CDPSession,
type: 'touchStart' | 'touchEnd',
points: TouchPoint[],
) =>
cdp.send('Input.dispatchTouchEvent', {
type,
touchPoints: points.map((p, id) => ({ x: p.x, y: p.y, id })),
})
test.describe('the properties dialog (U2 Task 6)', () => {
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)
})
for (const width of [1024, 1180, 1280]) {
test(`at ${width} px: over the column, never over the drawing; nothing moves`, async ({
page,
requests,
}) => {
await keepNativeFrames(page)
const actor = await open(page, width)
requests.forbid(actor.account.email, actor.account.password)
// The strip's commands fit (A6): for a point (its slider) and for a zone, the last
// one lies whole inside the strip.
for (const name of [POINT, ZONE]) {
await pickAnnotation(page, dict, name)
await expect(selectionTag(page)).toContainText(name)
const fence = (await strip(page).boundingBox())!
const last = (await strip(page)
.getByRole('button', { name: dict['editor.annotations.deselect'] })
.boundingBox())!
expect(last.x + last.width).toBeLessThanOrEqual(fence.x + fence.width)
}
await page.evaluate(() => window.scrollTo(0, 0))
await expectNoShift(page, async () => {
await strip(page)
.getByRole('button', { name: dict['editor.annotations.properties'] })
.click()
await expect(dialog(page)).toBeVisible()
})
const aside = await box(page, '[data-annotation-aside="edit"]')
const canvas = await box(page, '[data-testid="annotation-canvas"]')
const panelBox = page.getByTestId('dialog-panel')
// Once its opening scale (0.96 to 1) is over: its box is then its place.
const top = Math.max(12, aside.y)
await expect
.poll(async () => Math.abs((await panelBox.boundingBox())!.y - top))
.toBeLessThan(1)
const panel = (await panelBox.boundingBox())!
expect(panel.x).toBeGreaterThanOrEqual(aside.x - 1)
expect(panel.x + panel.width).toBeLessThanOrEqual(
aside.x + aside.width + 1,
)
expect(panel.x).toBeGreaterThanOrEqual(canvas.x + canvas.width)
await expectNoShift(page, async () => {
await page.keyboard.press('Escape')
await expect(dialog(page)).toHaveCount(0)
})
})
}
test('axe in read and edit modes; a click on the veil does nothing (R-6)', async ({
page,
requests,
}) => {
const actor = await open(page)
requests.forbid(actor.account.email, actor.account.password)
await pickAnnotation(page, dict, POINT)
const sheet = await openProperties(page, dict)
await expectAccessible(page, 'the properties dialog, read mode')
await page.mouse.click(20, 400)
await expect(sheet).toBeVisible()
await sheet
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
.click()
await expect(sheet.locator('#annotation-edit-fr')).toBeFocused()
await expectAccessible(page, 'the properties dialog, edit mode')
})
test('a typed form, then Back: it asks; « Abandonner » writes nothing', async ({
page,
requests,
}) => {
const actor = await open(page)
requests.forbid(actor.account.email, actor.account.password)
await pickAnnotation(page, dict, POINT)
const sheet = await openProperties(page, dict)
await sheet
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
.click()
const name = sheet.locator('#annotation-edit-fr')
await name.fill('Pt brouillon')
await page.goBack()
await expect(
sheet.getByText(dict['editor.findings.discard_ask']),
).toBeVisible()
await expect(name).toHaveValue('Pt brouillon')
await sheet
.getByRole('button', { name: dict['editor.findings.discard'] })
.click()
await expect(dialog(page)).toHaveCount(0)
await expect(selectionTag(page)).toContainText(POINT)
await expect(
page.getByTestId('history-buttons').getByRole('button', {
name: dict['editor.history.undo_title'],
}),
).toHaveAttribute('aria-disabled', 'true')
})
test('a double click on the selected zone opens it, no vertex added (R-8)', async ({
page,
requests,
}) => {
const actor = await open(page)
requests.forbid(actor.account.email, actor.account.password)
await pickAnnotation(page, dict, ZONE)
const before = await shownPoints(page)
const inside = await clientOf(page, 250, 250)
await page.mouse.dblclick(inside.x, inside.y)
await expect(dialog(page)).toBeVisible()
await page.waitForTimeout(500)
await expect(dialog(page)).toBeVisible()
await page.keyboard.press('Escape')
await expect(dialog(page)).toHaveCount(0)
expect(await shownPoints(page)).toEqual(before)
})
test('a width crossing below 1 024 px with a typed form, and back: the draft is intact', async ({
page,
requests,
}) => {
const actor = await open(page)
requests.forbid(actor.account.email, actor.account.password)
await pickAnnotation(page, dict, POINT)
const sheet = await openProperties(page, dict)
await sheet
.getByRole('button', { name: dict['editor.findings.edit'], exact: true })
.click()
const name = sheet.locator('#annotation-edit-fr')
await name.fill('Pt traversée')
await page.setViewportSize({ width: 800, height: 800 })
await expect(sheet).toBeVisible()
await expect(name).toHaveValue('Pt traversée')
await expect(
sheet.getByRole('button', { name: dict['editor.findings.save'] }),
).toBeDisabled()
await page.setViewportSize({ width: 1280, height: 800 })
await expect(name).toHaveValue('Pt traversée')
await expect(
sheet.getByRole('button', { name: dict['editor.findings.save'] }),
).toBeEnabled()
await sheet
.getByRole('button', { name: dict['editor.findings.save'] })
.click()
await expect(sheet.getByTestId('annotation-read')).toContainText(
'Pt traversée',
)
})
})
test.describe('the properties dialog by touch (U2 Task 6, Review Focus 5)', () => {
test.use({
locale: 'fr-FR',
actionTimeout: 15_000,
hasTouch: true,
viewport: { width: 1280, height: 800 },
})
test.beforeEach(async ({ context }, info) => {
test.skip(isPhone(info), 'touch at 1 280 px runs on desktop') // 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('a tap on the selected shape opens the dialog, and it stays open', async ({
page,
context,
requests,
}) => {
const actor = await open(page)
requests.forbid(actor.account.email, actor.account.password)
await pickAnnotation(page, dict, ZONE)
const cdp = await context.newCDPSession(page)
const inside = await clientOf(page, 250, 250)
await touch(cdp, 'touchStart', [inside])
await touch(cdp, 'touchEnd', [])
await expect(dialog(page)).toBeVisible()
await page.waitForTimeout(500)
await expect(dialog(page)).toBeVisible()
await expect(selectionTag(page)).toContainText(ZONE)
await clickDrawing(page, 900, 600).catch(() => undefined)
await expect(dialog(page)).toBeVisible()
})
})
@@ -235,10 +235,13 @@ test.describe('editor shell journeys (H)', () => {
await selectTab(page, dict, 'verification')
await goTo('Point libre')
await expect(place(page, 'annotations.drawing')).toBeVisible()
// R-5: the annotation's row takes the focus, no dialog opens (U2 Task 6).
await expect(active(page)).toHaveAttribute(
'data-properties-heading',
'true',
'data-focus-key',
/"kind":"annotation"/,
)
await expect(active(page)).toHaveAttribute('aria-current', 'true')
await expect(page.getByRole('dialog')).toHaveCount(0)
await selectTab(page, dict, 'verification')
await goTo('Constat A')
@@ -326,7 +326,6 @@ function focusKind(page: Page): Promise<Kind> {
if (el.closest('[role="toolbar"]')) return 'tools'
if (el.closest('[data-testid="annotation-canvas"]')) return 'canvas'
if (el.closest('[data-testid="annotation-overview"]')) return 'side'
if (el.closest('[data-testid="annotation-properties"]')) return 'side'
return 'other'
}, dict['editor.history.undo_title'])
}
+5 -2
View File
@@ -172,10 +172,13 @@ test.describe('editor shell, kept places (B2a)', () => {
.first()
.click()
await expect(place(page, 'annotations.drawing')).toBeVisible()
// R-5: the annotation's row takes the focus, no dialog opens (U2 Task 6).
await expect(active(page)).toHaveAttribute(
'data-properties-heading',
'true',
'data-focus-key',
/"kind":"annotation"/,
)
await expect(active(page)).toHaveAttribute('aria-current', 'true')
await expect(page.getByRole('dialog')).toHaveCount(0)
})
test('arrowing back onto a tab keeps the focus on the tab', async ({
+6 -3
View File
@@ -24,6 +24,7 @@ import {
serverRevision,
shapeWith,
showDrawing,
openProperties,
} from '../support/editor'
// V1-2.6 A4 (contract C9 to C12, C19): the structures around the drawing. Annotation
@@ -324,13 +325,15 @@ test.describe('editor structures (A4)', () => {
// The point goes first; the zone then deletes with its descendants named.
await showDrawing(page, dict)
await pickAnnotation(page, dict, /Point lié/)
await page
.getByTestId('annotation-properties')
// U2 Task 6: « Supprimer » sits in the properties dialog; its confirmation lies over it.
const properties = await openProperties(page, dict)
await properties
.getByRole('button', { name: dict['editor.action.delete'] })
.click()
await dialog(page)
await deleteDialog(page)
.getByRole('button', { name: dict['editor.delete.confirm'] })
.click()
await expect(page.locator('dialog[open]')).toHaveCount(0)
await selectTab(page, dict, 'findings')
await zone.first().click()
await findingDialog(page)
+55 -96
View File
@@ -28,7 +28,6 @@ const DRAFT = join(
)
const THORACIC = /Vertèbres thoraciques/
// The side panel's content may change (U2 Task 6 moves it into a dialog).
const SWAPS = ['aside-content'] as const
interface Draft {
vertebral_config: unknown
@@ -84,14 +83,10 @@ async function undoTo(
points: () => Promise<unknown>,
expected: unknown,
) {
await expectNoShift(
page,
async () => {
await undo(page)
await expect.poll(points).toEqual(expected)
},
SWAPS,
)
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. */
@@ -144,37 +139,27 @@ test.describe('editor zones on the drawing (U2 Task 5)', () => {
await expect(page.getByTestId('edit-strip-notice')).toContainText(
dict['editor.annotations.strip.zoom_hint'],
)
// Playwright's auto-scroll to the list row left the header under the sticky top bar.
await page.evaluate(() => window.scrollTo(0, 0))
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'],
)
},
SWAPS,
)
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'],
)
},
SWAPS,
)
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',
@@ -182,40 +167,28 @@ test.describe('editor zones on the drawing (U2 Task 5)', () => {
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',
)
},
SWAPS,
)
await expectNoShift(
page,
async () => {
await pressHandle(page, 'Retirer le sommet 3')
await expect(line(page)).toContainText(
dict['editor.annotations.message.vertex_removed'],
)
},
SWAPS,
)
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'],
)
},
SWAPS,
)
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)
@@ -234,7 +207,7 @@ test.describe('editor zones on the drawing (U2 Task 5)', () => {
// Not under expectNoShift: the button returns the focus to the list row, which
// scrolls it into view by design.
await page
.getByTestId('annotation-properties')
.getByTestId('edit-strip')
.getByRole('button', { name: dict['editor.annotations.deselect'] })
.click()
await expect(line(page)).toContainText(
@@ -255,10 +228,8 @@ test.describe('editor zones on the drawing (U2 Task 5)', () => {
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(),
SWAPS,
await expectNoShift(page, () =>
button(page, 'editor.annotations.redraw').click(),
)
for (const [x, y] of [
[850, 440],
@@ -266,49 +237,37 @@ test.describe('editor zones on the drawing (U2 Task 5)', () => {
[1100, 560],
[850, 545],
])
await expectNoShift(page, () => clickAt(page, x, y), SWAPS)
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'],
)
},
SWAPS,
)
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(),
SWAPS,
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), SWAPS)
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'],
)
},
SWAPS,
)
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(),
SWAPS,
await expectNoShift(page, () =>
button(page, 'editor.annotations.trace_cancel').click(),
)
await expect.poll(() => shownPoints(page)).toEqual(stored)
})