U2 Task 5. A selected polygon gets its vertex, « + » and « − » handles (R-9, hidden « + » under two hit radii, R-18 zoom hint in the strip), the handle cap at 40 (R-7), vertex drag and keys, the move mode on the zone or the chosen vertex, « Redessiner » as a redraw mode kept in step with its tracing (R-12 guard, R-13 drop), close radius in CSS px (R-11). The numeric group leaves the properties panel (D1). Removed or rewritten assertions (numeric group -> replacement): - tab « shows its exact stored numbers » (Centre x field) -> the overlay selection circle's cx attribute, same exact value. - tab « a numeric edit » x3 -> « an edit on the drawing »: Enter on the handle without a step commits nothing, a step + Enter commits once; a refused handle drag keeps the stored shape then a drag inside the frame repairs it (issues gone); Escape drops a pending series. - tab C26 « Centre x 15 » -> overlay cx 15. - tab C32 unmeasured « Centre x as text » -> no handle, no field. - tab « adds and removes a vertex as part of the whole group » -> « + » then « − » on the drawing; « never offers to remove below three » -> « − » aria-disabled at 3. - tab H8 « refused Remplacer drops the tracing » -> keeps it open with « Fermeture refusée » (board 33 A); « refused vertex add/remove stay non appliqué » -> a refused vertex drag restores the shape exactly. - tab Désélectionner and D6b (typed Centre x committed, refused, undone) x6 and strip « a new commit replaces the message » -> the same with the Nom (FR) field (a blank name is the refused value). - focus-request « Centre x 20 » -> overlay cx 20. - escape « strip commands keep their Escape » -> a redraw: Escape on the strip or the box cancels it (R-12 row 4); kept for a new zone tracing. - keep-alive « Remplacer tracing kept across Aller à » -> ended by a tab when empty, asked once a vertex is placed (R-12). - e2e annotations: numeric cx edit + undo/redo -> handle keys + undo/ redo; jitter/drag and Task 4 point reads -> overlay attributes (the stored place during the mode -> overlay-old-place); keyboard-only cy and vertex x typed -> handle and vertex keys. - e2e deselect: Centre x typed/refused/committed -> Nom (FR). - e2e geometry, shell-crossing: Centre x/cy reads -> overlay attributes. - e2e journey: cx +3 and vertex x +4 typed -> 3 and 4 arrow steps + Enter; a far typed value + revert -> a far handle drag refused. - e2e equine latency: typed cx rounds -> handle arrow + Enter rounds.
293 lines
10 KiB
TypeScript
293 lines
10 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).
|
||
const SWAPS = ['aside-content'] as const
|
||
|
||
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')
|
||
|
||
/** 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'],
|
||
)
|
||
// The list row scrolled the page: the shell's top bar would cover the header's buttons.
|
||
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,
|
||
)
|
||
const [, moved] = await shownPoints(page)
|
||
expect(Math.abs(moved[1] - 620)).toBeLessThan(3)
|
||
await undo(page)
|
||
await expect.poll(() => shownPoints(page)).toEqual(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,
|
||
)
|
||
expect(await count(page)).toBe(10)
|
||
await expect(page.getByTestId('edit-strip-detail')).toContainText(
|
||
'sommet 3 choisi',
|
||
)
|
||
await undo(page)
|
||
await expect.poll(() => count(page)).toBe(9)
|
||
|
||
// « − » on the chosen vertex 3, then undone.
|
||
await pressHandle(page, 'Sommet 3')
|
||
await expectNoShift(
|
||
page,
|
||
async () => {
|
||
await pressHandle(page, 'Retirer le sommet 3')
|
||
await expect(line(page)).toContainText(
|
||
dict['editor.annotations.message.vertex_removed'],
|
||
)
|
||
},
|
||
SWAPS,
|
||
)
|
||
expect(await count(page)).toBe(8)
|
||
await undo(page)
|
||
await expect.poll(() => shownPoints(page)).toEqual(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,
|
||
)
|
||
const [first] = await shownPoints(page)
|
||
expect(Math.abs(first[0] - (stored[0][0] + 40))).toBeLessThan(3)
|
||
await undo(page)
|
||
await expect.poll(() => shownPoints(page)).toEqual(stored)
|
||
})
|
||
|
||
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(),
|
||
SWAPS,
|
||
)
|
||
for (const [x, y] of [
|
||
[850, 440],
|
||
[1100, 470],
|
||
[1100, 560],
|
||
[850, 545],
|
||
])
|
||
await expectNoShift(page, () => clickAt(page, x, y), SWAPS)
|
||
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 expect(selectionTag(page)).toContainText('Vertèbres thoraciques')
|
||
expect(await count(page)).toBe(4)
|
||
await undo(page)
|
||
await expect.poll(() => shownPoints(page)).toEqual(stored)
|
||
|
||
// Refused: a sliver; the tracing stays open with the core's message, then cancelled.
|
||
await button(page, 'editor.annotations.redraw').click()
|
||
for (const [x, y] of [
|
||
[900, 450],
|
||
[1100, 452],
|
||
[1300, 455],
|
||
])
|
||
await 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'],
|
||
)
|
||
},
|
||
SWAPS,
|
||
)
|
||
await expect(button(page, 'editor.annotations.trace_close')).toBeVisible()
|
||
await expectNoShift(
|
||
page,
|
||
() => button(page, 'editor.annotations.trace_cancel').click(),
|
||
SWAPS,
|
||
)
|
||
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')
|
||
})
|
||
})
|