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)
265 lines
9.3 KiB
TypeScript
265 lines
9.3 KiB
TypeScript
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()
|
|
})
|
|
})
|