U2 Task 7 (A2, A4, A5, A7, A12, A15; R-3, R-4, R-12, R-13, R-14). The work store's `creation` owns the new shape, its form, its view and F: a click with the point tool, a closed tracing or a keyboard « Ajouter … » opens « Nouveau point / zone / accès », a modal without a history layer over the right column, mounted beside EditOnly so a read-only flip keeps it (« Créer », « Replacer », « Reprendre » off). A new zone or link is a creation from its first vertex. The ghost takes the form's category colour; the point tool previews under a mouse; the canvas carries data-creating (other markers dimmed, unselectable). « Replacer le point » / « Reprendre le tracé » hide the dialog and keep the form; the strip offers « Revenir aux propriétés », « Retirer le dernier sommet », « Abandonner ». « Créer »: one insert, tool back to « Sélectionner », the new element selected, « Point créé · Défaire », focus on its row. ✕, Échap, « Abandonner » and Back always ask « Abandonner la création ? » (DiscardConfirm inside the dialog; DrawingGuardDialog elsewhere); answerDrawing drops the creation. Undo, its shortcuts and the line's « Défaire » are inactive during a creation. missingFields replaces formProblem (MissingSummary shared with the edit form); the C26 notice has no numbers. CreationPanel, formProblem, withGeometry and the keys required.fields, required.names and create_cancel are gone; GeometryGroup is imported by RepairDialog only. Removed or rewritten assertions: - tab « holds a point at the frame centre »: « Centre x » = 50 -> the ghost circle cx = 50; plus tool back to Sélectionner, « Point créé », one undo step. - tab « refuses a creation without laterality »: the general line « Choisissez la catégorie et la latéralité » -> only « Choisissez une latéralité. » and « À compléter : Latéralité. », focus on it. - tab « applies the geometry group to a pending zone »: removed (A8, no coordinate field) -> « places a triangle at the centre: the ghost shows it, Créer inserts it »; vertex edits after Créer are the e2e keyboard test. - tab C26 « proposes C »: « x = 15, y = 15 » in the notice -> the R-4 text, the notice inside the dialog; cancel test « Centre x » = 0 -> ghost cx = 0. - tab « offers the correction when the core refuses a pending point » (typed cx 98): removed, no typed coordinate is possible; the verdict path stays covered by the C26 click tests and correctionFor units. - tab H5 « a typed radius shows the core issue »: removed (A8); the size refusal is the slider's (Task 4 tests). - tab H6 « a second click moves the pending point »: -> « Replacer le point », then the click moves the ghost, the form kept. - tab H7 « Centre x/y » = 30/50 -> ghost cx/cy. - tab tracing Enter: « x du sommet 3 » -> ghost points; « drops the tracing on Escape » -> Escape asks first (board 32 row 3), Continuer keeps, Abandonner drops; new « Annuler le tracé acts at once ». - keep-alive « a pending creation is kept and focused » and « a tracing … is kept and focused »: the tab now asks first (R-12) -> « Continuer » keeps the tracing / the form, « Abandonner » goes. - sections « its panel takes the focus » -> its dialog's [data-creation-focus] takes it. - no-loss « pending creation with its name » (hidden with the body) -> the dialog stays across the crossing, read-only, Créer off (R-14). - point-edit A5 « Rayon » = 7 / 9 -> ghost r = 7 / 9. - e2e editor-annotations keyboard test « numeric position » (cx field 250) -> UX_TESTS Keyboard: zone added, vertex added and removed, moved by the move mode, validated, saved. The « Fermer le tracé » step runs under expectNoShift again (shortcut removed). - e2e editor-geometry C26: the proposed x, y read from the notice text -> from the overlay's correction circle; the R-4 text checked in the dialog. - e2e editor-deselect « Escape cancels the tracing only » -> Escape asks, « Abandonner » cancels it, the selection kept. - e2e editor-shell-crossing « keeps its tool and its pending creation » (field hidden) -> the dialog stays read-only, Créer off, then editable on widening.
299 lines
10 KiB
TypeScript
299 lines
10 KiB
TypeScript
/** U1 Lot B1: the Annotations sections, their entries, the view fallback, « Aller à » kept. */
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import {
|
|
act,
|
|
cleanup,
|
|
render,
|
|
screen,
|
|
waitFor,
|
|
within,
|
|
} from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import AnnotationsTab from '@/components/editor/tabs/AnnotationsTab'
|
|
import {
|
|
AnnounceContext,
|
|
FocusConsumedContext,
|
|
type FocusRequest,
|
|
} from '@/editor/focusRequest'
|
|
import { targetOfKey } from '@/editor/navigation'
|
|
import { useLocaleStore } from '@/state/localeStore'
|
|
import { drawnText, insert, point } from '../helpers/editorFixtures'
|
|
import {
|
|
baseText,
|
|
openReady,
|
|
resetStore,
|
|
serverHas,
|
|
store,
|
|
pressAt,
|
|
} from '../helpers/editorHarness'
|
|
import { mountDraft, setWidth } from '../helpers/editorRoute'
|
|
|
|
vi.mock('@/lib/supabase', () => ({ getSupabaseClient: () => ({}) }))
|
|
vi.mock('@faunosteo/supabase', async (orig) => ({
|
|
...(await orig<typeof import('@faunosteo/supabase')>()),
|
|
getSheetVersion: vi.fn(),
|
|
downloadSheetDrawing: vi.fn(),
|
|
saveSheetDraft: vi.fn(),
|
|
getOfficialSheetAdmin: vi.fn(),
|
|
submitSheetReview: vi.fn(),
|
|
}))
|
|
|
|
beforeEach(() => {
|
|
useLocaleStore.setState({ locale: 'fr' })
|
|
const identity = { a: 1, b: 0, c: 0, d: 1, e: 0, f: 0 }
|
|
Object.defineProperty(window.SVGElement.prototype, 'getScreenCTM', {
|
|
configurable: true,
|
|
value: () => ({ ...identity, inverse: () => identity }),
|
|
})
|
|
})
|
|
afterEach(() => {
|
|
cleanup()
|
|
resetStore()
|
|
setWidth(1024)
|
|
})
|
|
|
|
const ready = () =>
|
|
screen.findByRole('heading', { level: 1, name: 'Brouillon, version 4' })
|
|
const entry = (name: string | RegExp) => screen.getByRole('button', { name })
|
|
const place = (name: string) =>
|
|
document.querySelector<HTMLElement>(`[data-place="${name}"]`)
|
|
|
|
describe('the overview entries', () => {
|
|
beforeEach(() => serverHas(baseText(), 3))
|
|
|
|
it.each([
|
|
['Gérer les vues', 'views', 'Vues'],
|
|
['Modifier les catégories', 'categories', 'Catégories'],
|
|
[/^Régions vertébrales/, 'regions', 'Régions vertébrales'],
|
|
] as const)(
|
|
'%s opens its section on the heading; « Retour au dessin » refocuses the entry',
|
|
async (label, section, title) => {
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(entry(label))
|
|
const shown = place(`annotations.${section}`)!
|
|
expect(shown).toBeVisible()
|
|
expect(document.activeElement).toBe(
|
|
within(shown).getByRole('heading', { level: 2, name: title }),
|
|
)
|
|
expect(screen.getByRole('tab', { name: 'Annotations' })).toHaveAttribute(
|
|
'aria-selected',
|
|
'true',
|
|
)
|
|
expect(place('annotations.drawing')).not.toBeVisible()
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
expect(place('annotations.drawing')).toBeVisible()
|
|
expect(document.activeElement).toHaveAttribute(
|
|
'data-section-entry',
|
|
section,
|
|
)
|
|
},
|
|
)
|
|
|
|
it('the categories section shows its own heading once, as the other sections', async () => {
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(entry('Modifier les catégories'))
|
|
const headings = within(place('annotations.categories')!).getAllByRole(
|
|
'heading',
|
|
)
|
|
expect(headings.map((h) => [h.tagName, h.textContent])).toEqual([
|
|
['H2', 'Catégories'],
|
|
])
|
|
})
|
|
|
|
it('the Catégories card header shows the number of categories', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
expect(screen.getByTestId('overview-categories-count')).toHaveTextContent(
|
|
'1',
|
|
)
|
|
})
|
|
|
|
it('the regions entry is there with no role code, counting the regions', async () => {
|
|
mountDraft()
|
|
await ready()
|
|
expect(entry('Régions vertébrales (0 région)')).toBeVisible()
|
|
})
|
|
|
|
it('announces the section reached, politely', async () => {
|
|
const user = userEvent.setup()
|
|
mountDraft()
|
|
await ready()
|
|
await user.click(entry('Gérer les vues'))
|
|
const live = document.querySelector('p[aria-live="polite"]')!
|
|
expect(live).toHaveTextContent('Annotations · Vues')
|
|
})
|
|
|
|
it('read-only: the entries read « Voir … » and still open the sections', async () => {
|
|
const user = userEvent.setup()
|
|
mountDraft({ width: 800 })
|
|
await ready()
|
|
expect(screen.queryByRole('button', { name: 'Gérer les vues' })).toBeNull()
|
|
await user.click(entry('Voir les catégories'))
|
|
expect(place('annotations.categories')).toBeVisible()
|
|
expect(
|
|
within(place('annotations.categories')!).queryByRole('textbox'),
|
|
).toBeNull()
|
|
await user.click(screen.getByRole('button', { name: 'Retour au dessin' }))
|
|
await user.click(entry('Voir les vues'))
|
|
expect(place('annotations.views')).toBeVisible()
|
|
})
|
|
})
|
|
|
|
const props = {
|
|
readOnly: false,
|
|
navigate: vi.fn(),
|
|
reloadSheet: vi.fn(),
|
|
section: 'drawing' as const,
|
|
visited: ['drawing'] as const,
|
|
onOpenSection: vi.fn(),
|
|
onBack: vi.fn(),
|
|
}
|
|
|
|
const detailView = {
|
|
kind: 'view',
|
|
value: {
|
|
kind: 'detail',
|
|
id: 'view-det',
|
|
name: { fr: 'Tête', en: 'Head' },
|
|
svg_asset_id: null,
|
|
view_box: { min_x: 10, min_y: 20, width: 40, height: 60 },
|
|
parent_view_id: 'view-main',
|
|
},
|
|
} as const
|
|
|
|
const consumed = vi.fn()
|
|
const announce = vi.fn()
|
|
const Drawing = ({ focus }: { focus?: FocusRequest }) => (
|
|
<FocusConsumedContext value={consumed}>
|
|
<AnnounceContext value={announce}>
|
|
<AnnotationsTab {...props} focus={focus} />
|
|
</AnnounceContext>
|
|
</FocusConsumedContext>
|
|
)
|
|
|
|
async function mountDrawing(text = drawnText()) {
|
|
consumed.mockReset()
|
|
announce.mockReset()
|
|
await openReady({ text })
|
|
const user = userEvent.setup()
|
|
const view = render(<Drawing />)
|
|
await waitFor(() =>
|
|
expect(
|
|
screen.getByTestId('annotation-canvas-drawing').querySelector('svg'),
|
|
).not.toBeNull(),
|
|
)
|
|
return { user, view }
|
|
}
|
|
|
|
const addPoint = async (user: ReturnType<typeof userEvent.setup>) => {
|
|
await waitFor(() =>
|
|
expect(
|
|
screen.getByRole('button', { name: 'Ajouter un point' }),
|
|
).toBeEnabled(),
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Ajouter un point' }))
|
|
}
|
|
|
|
describe('the shown view disappears (undo)', () => {
|
|
async function onDetailView() {
|
|
const base = await mountDrawing()
|
|
act(
|
|
() => void store.getState().commit({ op: 'insert', element: detailView }),
|
|
)
|
|
await base.user.click(await screen.findByRole('button', { name: 'Tête' }))
|
|
return base
|
|
}
|
|
|
|
it('a pending point on it: back to the main view, the creation cleared', async () => {
|
|
const { user } = await onDetailView()
|
|
await addPoint(user)
|
|
expect(await screen.findByTestId('annotation-creation')).toBeInTheDocument()
|
|
act(() => void store.getState().undoStep())
|
|
await waitFor(() =>
|
|
expect(screen.queryByTestId('annotation-creation')).toBeNull(),
|
|
)
|
|
expect(screen.queryByRole('button', { name: 'Tête' })).toBeNull()
|
|
expect(screen.getByTestId('annotation-overview')).toBeInTheDocument()
|
|
expect(store.getState().previewState!.document.annotations).toHaveLength(0)
|
|
})
|
|
|
|
it('a tracing on it: the tracing is cleared too', async () => {
|
|
const { user } = await onDetailView()
|
|
await waitFor(() =>
|
|
expect(screen.getByRole('button', { name: 'Zone' })).toBeEnabled(),
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Zone' }))
|
|
pressAt(screen.getByTestId('annotation-canvas'), 20, 30)
|
|
expect(screen.getByTestId('tracing-commands')).toBeInTheDocument()
|
|
act(() => void store.getState().undoStep())
|
|
await waitFor(() =>
|
|
expect(screen.queryByTestId('tracing-commands')).toBeNull(),
|
|
)
|
|
})
|
|
|
|
it('dispatches nothing while the shown view still exists', async () => {
|
|
const { user } = await onDetailView()
|
|
await addPoint(user)
|
|
const panel = await screen.findByTestId('annotation-creation')
|
|
const element = point('anno-x', 30, 40, 2, 'view-det')
|
|
act(() => void store.getState().commit({ op: 'insert', element }))
|
|
expect(screen.getByTestId('annotation-creation')).toBe(panel)
|
|
})
|
|
})
|
|
|
|
describe('« Aller à » an annotation while something is in progress', () => {
|
|
const key = { kind: 'annotation', id: 'anno-a' } as const
|
|
const request = { target: targetOfKey(key), serial: 7 }
|
|
|
|
async function withProgress(
|
|
start: (user: ReturnType<typeof userEvent.setup>) => Promise<void>,
|
|
) {
|
|
const text = insert(drawnText(), point('anno-a', 50, 50, 5))
|
|
const { user, view } = await mountDrawing(text)
|
|
await start(user)
|
|
view.rerender(<Drawing focus={request} />)
|
|
return { consumed, announce }
|
|
}
|
|
|
|
it('a pending creation is kept: its dialog takes the focus, the live region says why', async () => {
|
|
const { consumed, announce } = await withProgress(addPoint)
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'kept'))
|
|
expect(screen.getByTestId('annotation-creation')).toBeInTheDocument()
|
|
expect(document.activeElement).toHaveAttribute('data-creation-focus')
|
|
expect(announce).toHaveBeenCalledWith(
|
|
expect.stringContaining('création est en cours'),
|
|
)
|
|
expect(screen.queryByRole('button', { name: 'Propriétés' })).toBeNull()
|
|
})
|
|
|
|
it('an open zone tracing is kept: the strip tracing commands take the focus', async () => {
|
|
const { consumed, announce } = await withProgress(async (user) => {
|
|
await waitFor(() =>
|
|
expect(screen.getByRole('button', { name: 'Zone' })).toBeEnabled(),
|
|
)
|
|
await user.click(screen.getByRole('button', { name: 'Zone' }))
|
|
pressAt(screen.getByTestId('annotation-canvas'), 20, 20)
|
|
})
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'kept'))
|
|
expect(document.activeElement).toBe(screen.getByTestId('tracing-commands'))
|
|
expect(announce).toHaveBeenCalledWith(
|
|
expect.stringContaining('tracé est en cours'),
|
|
)
|
|
})
|
|
|
|
it('with nothing in progress the annotation is selected and its row focused (R-5)', async () => {
|
|
const { consumed } = await withProgress(async () => undefined)
|
|
await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'found'))
|
|
await waitFor(() =>
|
|
expect(document.activeElement).toHaveAttribute(
|
|
'data-focus-key',
|
|
JSON.stringify({ kind: 'annotation', id: 'anno-a' }),
|
|
),
|
|
)
|
|
})
|
|
})
|