diff --git a/apps/app/e2e/lan/trial-lan.spec.ts b/apps/app/e2e/lan/trial-lan.spec.ts index bb0496dc..e1083141 100644 --- a/apps/app/e2e/lan/trial-lan.spec.ts +++ b/apps/app/e2e/lan/trial-lan.spec.ts @@ -3,6 +3,7 @@ import { fr } from '@/i18n/fr' import type { Page } from '@playwright/test' import { totpCode } from '../../../../packages/supabase/tests/sandbox/totp' import { expect, test } from '../support/browser' +import { shownRevision } from '../support/saveLineText' // Owner trial through its LAN origin (C47): sign-in, TOTP enrolment and challenge, the // catalogue, a non-equine sheet, an SVG import, save and reload. The request guard of @@ -23,11 +24,9 @@ const SVG = const saveLine = (page: Page) => page.getByTestId('save-line') +// Read while the line says « Révision n »: a pending change shows no revision. async function revisionShown(page: Page): Promise { - const text = (await saveLine(page).textContent()) ?? '' - return Number( - /révision (\d+)|Révision (\d+)/.exec(text)?.slice(1).find(Boolean), - ) + return shownRevision((await saveLine(page).textContent()) ?? '') } async function nextCode(secret: string): Promise { @@ -131,6 +130,8 @@ test('trial through the LAN origin: MFA, new sheet, SVG import, save, reload', a await challenge(page, secret) await createNonEquineSheet(page, tag) await openViews(page) + await expect(saveLine(page)).toHaveText(/^Révision \d+$/) + const before = await revisionShown(page) await page .locator('[data-testid$="-file"]') .first() @@ -147,7 +148,6 @@ test('trial through the LAN origin: MFA, new sheet, SVG import, save, reload', a .getByRole('button', { name: dict['editor.cleaning.confirm'] }) .click() await expect(page.getByText(dict['editor.upload.done'])).toBeVisible() - const before = await revisionShown(page) await page.getByRole('button', { name: dict['common.save'] }).click() await expect(saveLine(page)).toHaveText( new RegExp(`^Enregistré( à \\d\\d:\\d\\d)? · révision ${before + 1}$`), diff --git a/apps/app/e2e/shell/editor-shell-layout.spec.ts b/apps/app/e2e/shell/editor-shell-layout.spec.ts index 16054f0f..8e373224 100644 --- a/apps/app/e2e/shell/editor-shell-layout.spec.ts +++ b/apps/app/e2e/shell/editor-shell-layout.spec.ts @@ -308,5 +308,6 @@ test.describe('editor shell keyboard order (H)', () => { const after = await walk(page, 'side') expect(after.slice(0, 4)).toEqual(['header', 'tab', 'undo', 'redo']) expect(after).not.toContain('panel') + expect(after.at(-1)).toBe('side') }) }) diff --git a/apps/app/e2e/support/saveLineText.ts b/apps/app/e2e/support/saveLineText.ts new file mode 100644 index 00000000..9d6643e7 --- /dev/null +++ b/apps/app/e2e/support/saveLineText.ts @@ -0,0 +1,10 @@ +/** + * The revision a save line text names: « Révision n » or « Enregistré · révision n ». The + * unsaved forms name none, so a reading taken while changes are pending throws instead of + * answering NaN. + */ +export function shownRevision(text: string): number { + const found = /révision (\d+)/i.exec(text) + if (!found) throw new Error(`The save line shows no revision: « ${text} »`) + return Number(found[1]) +} diff --git a/apps/app/src/components/editor/HistoryButtons.tsx b/apps/app/src/components/editor/HistoryButtons.tsx index 2d8dfdd8..acf509ca 100644 --- a/apps/app/src/components/editor/HistoryButtons.tsx +++ b/apps/app/src/components/editor/HistoryButtons.tsx @@ -1,4 +1,9 @@ -import { useRef, type FocusEvent, type RefObject } from 'react' +import { + useRef, + type FocusEvent, + type PointerEvent, + type RefObject, +} from 'react' import { useEditorReadOnly } from '@/editor/editingContext' import { commitFocusedField } from '@/editor/focusRequest' import { canRedo, canUndo, useEditorStore } from '@/editor/state/editorStore' @@ -33,7 +38,9 @@ function asField(element: Element | EventTarget | null): HTMLElement | null { * pointer-down, natural when Tab reaches the button), the click or key then reads the * store, so the typed text is the last change the undo reverts. A field whose commit was * refused keeps its error: the step is skipped and focus goes back to it. The field is - * remembered across the pair: from a field, « Annuler » is two Shift+Tab away. + * remembered across the pair: from a field, « Annuler » is two Shift+Tab away. A touch + * press fires pointer leave between its up and its click, so only a mouse leaving the + * button forgets the field (a hovering pointer that left meant no press), or a cancel. */ function usePress( direction: Direction, @@ -48,6 +55,9 @@ function usePress( const pair = event.currentTarget.parentElement if (!pair?.contains(event.relatedTarget as Node | null)) forget() } + const onPointerLeave = (event: PointerEvent) => { + if (event.pointerType === 'mouse') forget() + } const onPointerDown = () => { left.current = asField(document.activeElement) ?? left.current commitFocusedField() @@ -72,7 +82,8 @@ function usePress( onPointerDown, onFocus, onBlur, - onPointerLeave: forget, + onPointerLeave, + onPointerCancel: forget, onClick, } } diff --git a/apps/app/src/components/editor/annotations/EditableAnnotations.tsx b/apps/app/src/components/editor/annotations/EditableAnnotations.tsx index acb956e6..2df57e43 100644 --- a/apps/app/src/components/editor/annotations/EditableAnnotations.tsx +++ b/apps/app/src/components/editor/annotations/EditableAnnotations.tsx @@ -274,6 +274,8 @@ function SidePanel({ doc={doc} viewId={scene.viewId} readOnly={false} + filter={ui.filter} + onFilter={(term) => dispatch({ type: 'filter', term })} onSelectView={(id) => dispatch({ type: 'view', viewId: id })} onSelectAnnotation={(id) => dispatch({ type: 'select', id })} onOpenSection={scene.onOpenSection} diff --git a/apps/app/src/components/editor/annotations/OverviewPanel.tsx b/apps/app/src/components/editor/annotations/OverviewPanel.tsx index b1d30f8d..af40ec64 100644 --- a/apps/app/src/components/editor/annotations/OverviewPanel.tsx +++ b/apps/app/src/components/editor/annotations/OverviewPanel.tsx @@ -1,4 +1,4 @@ -import { useMemo, useState } from 'react' +import { useMemo } from 'react' import type { AnatomicalSheetDocument, SheetView, @@ -29,6 +29,9 @@ export interface OverviewPanelProps { readOnly: boolean /** Put before every id (the read-only twin beside the kept edit panel). */ idPrefix?: string + /** The « Filtrer par nom » term, held by the parent so a selection does not lose it. */ + filter: string + onFilter: (term: string) => void onSelectView: (viewId: string) => void onSelectAnnotation: (annotationId: string) => void onOpenSection: (section: AnnotationSection, opener: HTMLElement) => void @@ -193,8 +196,7 @@ function CategoriesCard(props: OverviewPanelProps) { function AnnotationsCard(props: OverviewPanelProps) { const t = useT() const locale = useLocaleStore((s) => s.locale) - const { doc, viewId, onSelectAnnotation } = props - const [term, setTerm] = useState('') + const { doc, viewId, filter: term, onFilter, onSelectAnnotation } = props const prefix = props.idPrefix ?? '' const total = useOverviewCounts(doc).annotationsByView.get(viewId) ?? 0 const groups = useMemo( @@ -221,7 +223,7 @@ function AnnotationsCard(props: OverviewPanelProps) { aria-label={t('editor.overview.filter')} placeholder={t('editor.overview.filter')} value={term} - onChange={(event) => setTerm(event.target.value)} + onChange={(event) => onFilter(event.target.value)} /> {groups.length > 0 ? ( s.locale) const [deleting, setDeleting] = useState(null) return ( -
-

- {t('editor.general.categories')} -

+
    {doc.categories.map((category) => ( setDeleting(null)} /> -
+ ) } diff --git a/apps/app/src/components/editor/tabs/AnnotationsTab.tsx b/apps/app/src/components/editor/tabs/AnnotationsTab.tsx index ccdd8851..4d938388 100644 --- a/apps/app/src/components/editor/tabs/AnnotationsTab.tsx +++ b/apps/app/src/components/editor/tabs/AnnotationsTab.tsx @@ -149,6 +149,7 @@ function ReadOnlyAnnotations({ const handleVersion = useEditorStore((s) => s.handleVersion) const [viewId, setViewId] = useState(mainViewId(doc)) const [selectedId, setSelectedId] = useState(null) + const [filter, setFilter] = useState('') useViewFallback(doc, viewId, setViewId, setSelectedId) useAnnotationRequest(focus, doc, { viewId, @@ -162,6 +163,12 @@ function ReadOnlyAnnotations({ const model = useViewModel(doc, viewId) const view = doc.views.find((v) => v.id === viewId) const selected = model.annotations.find((a) => a.id === selectedId) + // A view of its own has its own list: the filter and the selection start over. + const showView = (id: string) => { + setViewId(id) + setSelectedId(null) + setFilter('') + } if (!preview || !view) return null return (
@@ -169,10 +176,7 @@ function ReadOnlyAnnotations({ { - setViewId(id) - setSelectedId(null) - }} + onSelect={showView} /> {selected && ( { - setViewId(id) - setSelectedId(null) - }} + filter={filter} + onFilter={setFilter} + onSelectView={showView} onSelectAnnotation={setSelectedId} onOpenSection={onOpenSection} /> diff --git a/apps/app/src/editor/annotations/uiState.ts b/apps/app/src/editor/annotations/uiState.ts index 542fe970..7fb83750 100644 --- a/apps/app/src/editor/annotations/uiState.ts +++ b/apps/app/src/editor/annotations/uiState.ts @@ -20,6 +20,8 @@ export interface UiState { serial: number tracing: Tracing | null hint: string | null + /** The overview's « Filtrer par nom » term: it outlives a selection, not a view. */ + filter: string } export type UiAction = @@ -33,6 +35,7 @@ export type UiAction = | { type: 'trace_add'; point: Point } | { type: 'trace_cancel' } | { type: 'hint'; hint: string | null } + | { type: 'filter'; term: string } export const initialUi: UiState = { viewId: null, @@ -42,6 +45,7 @@ export const initialUi: UiState = { serial: 0, tracing: null, hint: null, + filter: '', } const TOOL_OF: Record = { @@ -108,5 +112,7 @@ export function uiReducer(state: UiState, action: UiAction): UiState { return { ...state, tracing: null, hint: null } case 'hint': return { ...state, hint: action.hint } + case 'filter': + return { ...state, filter: action.term } } } diff --git a/apps/app/src/editor/focusRequest.ts b/apps/app/src/editor/focusRequest.ts index a29c15fe..517a2f6a 100644 --- a/apps/app/src/editor/focusRequest.ts +++ b/apps/app/src/editor/focusRequest.ts @@ -140,10 +140,14 @@ export function heldElement(): HTMLElement | null { /** * After the render that hides parts: `held` (taken before) that left the page or sits in a - * hidden part hands its focus to the shown tab. An element still visible keeps its place. + * hidden part hands its focus to the shown tab; one still shown gets its focus back when + * the commit blurred it (never `body`), and the tab takes it if the element refuses. */ export function refocusIfHidden(held: HTMLElement | null): void { - if (held && (!held.isConnected || held.closest('[hidden]'))) focusActiveTab() + if (!held) return + const gone = !held.isConnected || held.closest('[hidden]') + if (!gone && document.activeElement !== held) held.focus() + if (gone || document.activeElement !== held) focusActiveTab() } /** diff --git a/apps/app/src/editor/state/editorLoad.ts b/apps/app/src/editor/state/editorLoad.ts index 838265c9..90cf73ae 100644 --- a/apps/app/src/editor/state/editorLoad.ts +++ b/apps/app/src/editor/state/editorLoad.ts @@ -208,8 +208,9 @@ function applyReload( } /** - * « Annuler les modifications » (confirmed): back to the saved text; with `staleBase` the - * server draft is reloaded instead (the saved text is an older revision's). + * « Abandonner les modifications » (confirmed): back to the saved text, which is the save + * `lastSave` describes, so the save line keeps it; with `staleBase` the server draft is + * reloaded instead (the saved text is an older revision's). */ export async function discardChanges( api: StoreApi, @@ -228,6 +229,9 @@ export async function discardChanges( : { ok: false, reason: 'blocked', kind: 'not_ready' } } removeCopy(state.userId ?? '', state.versionId ?? '') - api.set(reloadPatch(state, state.savedText, replaced.state, state.savedRevision)) + api.set({ + ...reloadPatch(state, state.savedText, replaced.state, state.savedRevision), + lastSave: state.lastSave, + }) return { ok: true } } diff --git a/apps/app/src/i18n/en.ts b/apps/app/src/i18n/en.ts index fbf115ef..de2069f2 100644 --- a/apps/app/src/i18n/en.ts +++ b/apps/app/src/i18n/en.ts @@ -1356,7 +1356,6 @@ export const en: Dict = { 'editor.general.author_remove': 'Remove {name}', 'editor.general.license': 'Licence', 'editor.general.notes': 'Notes', - 'editor.general.categories': 'Annotation categories', 'editor.general.category_name_fr': 'Category name (FR)', 'editor.general.category_name_en': 'Category name (EN)', 'editor.general.category_color': 'Colour', diff --git a/apps/app/src/i18n/fr.ts b/apps/app/src/i18n/fr.ts index 2c6bb892..e2485ae4 100644 --- a/apps/app/src/i18n/fr.ts +++ b/apps/app/src/i18n/fr.ts @@ -1387,7 +1387,6 @@ export const fr: Dict = { 'editor.general.author_remove': 'Retirer {name}', 'editor.general.license': 'Licence', 'editor.general.notes': 'Notes', - 'editor.general.categories': 'Catégories d\'annotation', 'editor.general.category_name_fr': 'Nom de la catégorie (FR)', 'editor.general.category_name_en': 'Nom de la catégorie (EN)', 'editor.general.category_color': 'Couleur', diff --git a/apps/app/tests/unit/e2e-save-line-text.test.ts b/apps/app/tests/unit/e2e-save-line-text.test.ts new file mode 100644 index 00000000..c02c44e1 --- /dev/null +++ b/apps/app/tests/unit/e2e-save-line-text.test.ts @@ -0,0 +1,39 @@ +/** The LAN spec's revision reading, run on the strings the save line really shows. */ +import { describe, expect, it } from 'vitest' +import { fr } from '@/i18n/fr' +import { shownRevision } from '../../e2e/support/saveLineText' + +const line = (key: keyof typeof fr, values: Record = {}) => + Object.entries(values).reduce( + (text, [name, value]) => text.replace(`{${name}}`, value), + fr[key], + ) + +describe('shownRevision', () => { + it('reads the revision of the « Révision n » line', () => { + expect( + shownRevision(line('editor.draft.status.revision', { revision: '7' })), + ).toBe(7) + }) + + it('reads it from both saved forms', () => { + const saved = line('editor.draft.status.saved', { revision: '8' }) + const savedAt = line('editor.draft.status.saved_at', { + revision: '12', + time: '14:02', + }) + expect([shownRevision(saved), shownRevision(savedAt)]).toEqual([8, 12]) + }) + + it('throws on the forms that carry none, never answers NaN', () => { + const texts = [ + fr['editor.draft.status.unsaved'], + line('editor.draft.status.unsaved_count_one', { count: '1' }), + fr['editor.draft.status.saving'], + '', + ] + for (const text of texts) { + expect(() => shownRevision(text)).toThrow('shows no revision') + } + }) +}) diff --git a/apps/app/tests/unit/editor-focus-request.test.tsx b/apps/app/tests/unit/editor-focus-request.test.tsx index 80e6cbb6..a233264f 100644 --- a/apps/app/tests/unit/editor-focus-request.test.tsx +++ b/apps/app/tests/unit/editor-focus-request.test.tsx @@ -1,7 +1,13 @@ /** « Aller à … »: each request reaches the place its target names, once, and never lands on body. */ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { useState } from 'react' -import { cleanup, render, screen, waitFor } from '@testing-library/react' +import { + cleanup, + render, + screen, + waitFor, + within, +} from '@testing-library/react' import userEvent from '@testing-library/user-event' import type { AnatomicalSheetDocument, @@ -125,10 +131,13 @@ describe('focus requests', () => { focus={request({ kind: 'annotation', id: 'anno-b' })} />, ) - expect(await screen.findAllByText(/anno-b|Sélection/)).not.toHaveLength(0) + // anno-b and anno-a share a name: the circle's centre tells which one is selected. + const properties = await screen.findByTestId('annotation-properties') + expect(within(properties).getByLabelText('Centre x')).toHaveValue('20') await waitFor(() => expect(document.activeElement).toHaveAttribute('data-properties-heading'), ) + expect(properties).toContainElement(document.activeElement as HTMLElement) }) it('Références and Régions: focus the named row', async () => { diff --git a/apps/app/tests/unit/editor-history-buttons.test.tsx b/apps/app/tests/unit/editor-history-buttons.test.tsx index 6084646e..836a0489 100644 --- a/apps/app/tests/unit/editor-history-buttons.test.tsx +++ b/apps/app/tests/unit/editor-history-buttons.test.tsx @@ -252,6 +252,52 @@ describe('typed text and the press', () => { expect(geometry()).toMatchObject({ cx: 40 }) }) + async function refusedField() { + const user = userEvent.setup() + mountDraft() + await ready() + act(() => void commitMove(40)) + const field = await selectAnnotation(user) + await user.clear(field) + return field + } + + /** A press as a touch sends it: down, up, the leave it fires, then the click. */ + function touchPress() { + const init = { pointerType: 'touch' } + fireEvent.pointerDown(undoButton(), init) + fireEvent.pointerUp(undoButton(), init) + fireEvent.pointerLeave(undoButton(), init) + fireEvent.click(undoButton()) + } + + it('a touch press keeps the refused field across pointer leave and click', async () => { + const field = await refusedField() + touchPress() + expect(field).toHaveAttribute('aria-invalid', 'true') + expect(field).toHaveFocus() + expect(geometry()).toMatchObject({ cx: 40 }) + expect(store.getState().undo).toHaveLength(1) + }) + + it('a touch press cancelled by the browser forgets the field', async () => { + const field = await refusedField() + fireEvent.pointerDown(undoButton(), { pointerType: 'touch' }) + fireEvent.pointerCancel(undoButton(), { pointerType: 'touch' }) + fireEvent.click(undoButton()) + expect(field).not.toHaveFocus() + expect(geometry()).toMatchObject({ cx: 50 }) + }) + + it('a mouse leaving the button forgets the field', async () => { + const field = await refusedField() + fireEvent.pointerDown(undoButton(), { pointerType: 'mouse' }) + fireEvent.pointerLeave(undoButton(), { pointerType: 'mouse' }) + fireEvent.click(undoButton()) + expect(field).not.toHaveFocus() + expect(geometry()).toMatchObject({ cx: 50 }) + }) + it('a keyboard activation after a refused blur commit skips the undo too', async () => { const user = userEvent.setup() mountDraft() @@ -443,6 +489,29 @@ describe('« Abandonner les modifications »', () => { ).toBeInTheDocument() }) + it('keeps the session\'s save in the save line, and the save line says it', async () => { + const user = userEvent.setup() + sb.saveSheetDraft.mockResolvedValue({ revision: 4 } as never) + sb.getOfficialSheetAdmin.mockRejectedValue(new Error('offline')) + mountDraft() + await ready() + act(() => void commitMove(40)) + await user.click(screen.getByRole('button', { name: 'Enregistrer' })) + const line = screen.getByTestId('save-line') + await waitFor(() => + expect(line).toHaveTextContent(/^Enregistré · révision 4$/), + ) + act(() => void commitMove(41)) + expect(line).toHaveTextContent(/^1 modification non enregistrée$/) + const dialog = await open(user) + await user.click( + dialog.getByRole('button', { name: fr['editor.draft.discard_confirm'] }), + ) + expect(store.getState().unsaved).toBe(false) + expect(geometry()).toMatchObject({ cx: 40 }) + expect(line).toHaveTextContent(/^Enregistré · révision 4$/) + }) + it('does not mention a copy when none is stored', async () => { const user = userEvent.setup() vi.spyOn(console, 'warn').mockImplementation(() => {}) diff --git a/apps/app/tests/unit/editor-no-loss.test.tsx b/apps/app/tests/unit/editor-no-loss.test.tsx index 8f17f727..ee3f4d75 100644 --- a/apps/app/tests/unit/editor-no-loss.test.tsx +++ b/apps/app/tests/unit/editor-no-loss.test.tsx @@ -290,6 +290,22 @@ describe('the guards of a width change', () => { expect(document.activeElement).toBe(refs) }) + it('the references search, shown in both modes, keeps its focus and its text', async () => { + const user = await mount() + await user.click(button('Références')) + const panel = screen.getByTestId('editor-references-panel') + const search = within(panel).getByRole('searchbox', { + name: 'Rechercher une référence', + }) + await user.type(search, 'code') + expect(document.activeElement).toBe(search) + cross(800) + expect(document.activeElement).toBe(search) + expect(search).toHaveValue('code') + cross(1280) + expect(document.activeElement).toBe(search) + }) + it('a crossing with the focus on no field leaves the focus alone', async () => { const user = await mount() await user.click(tab('Général')) diff --git a/apps/app/tests/unit/editor-overview.test.tsx b/apps/app/tests/unit/editor-overview.test.tsx index 754b2ecb..131bfead 100644 --- a/apps/app/tests/unit/editor-overview.test.tsx +++ b/apps/app/tests/unit/editor-overview.test.tsx @@ -143,6 +143,21 @@ describe.each([ await waitFor(() => expect(document.activeElement).toBe(rows()[1])) }) + it('keeps the « Filtrer par nom » term across a selection and back', async () => { + await mount(readOnly) + const user = userEvent.setup() + const field = () => + within(overview()).getByRole('searchbox', { name: 'Filtrer par nom' }) + await user.type(field(), 'epaule') + await user.click(rows()[0]) + await user.click( + screen.getByRole('button', { name: 'Toutes les annotations' }), + ) + expect(field()).toHaveValue('epaule') + expect(rows()).toHaveLength(1) + expect(rows()[0]).toHaveTextContent('Épaule') + }) + it('a view row switches the canvas view', async () => { await mount(readOnly) const user = userEvent.setup() diff --git a/apps/app/tests/unit/editor-recovery.test.ts b/apps/app/tests/unit/editor-recovery.test.ts index 0e06c490..def932d3 100644 --- a/apps/app/tests/unit/editor-recovery.test.ts +++ b/apps/app/tests/unit/editor-recovery.test.ts @@ -171,7 +171,7 @@ describe('restore', () => { expect(node).toMatchObject({ reference_ids: [], children: [], review_status: 'inherited' }) }) - it('takes the reload path for « Annuler les modifications » under staleBase', async () => { + it('takes the reload path for « Abandonner les modifications » under staleBase', async () => { seed(movedText(10), 2) await openReady({ revision: 5 }) await store.getState().restoreCopy() @@ -182,6 +182,19 @@ describe('restore', () => { expect(storedCopy()).toBeNull() }) + it('keeps `lastSave` on a plain discard, drops it on the reload path', async () => { + await openReady({ revision: 3 }) + const saved = { revision: 3, savedAt: '2026-11-04T13:32:00Z' } + store.setState({ lastSave: saved }) + commitMove(40) + expect(await store.getState().discardChanges({ confirmed: true })).toEqual({ ok: true }) + expect(store.getState().lastSave).toBe(saved) + store.setState({ staleBase: true }) + serverHas(baseText(), 6) + await store.getState().discardChanges({ confirmed: true }) + expect(store.getState().lastSave).toBeNull() + }) + it('reports a copy the core refuses, keeps it, blocks editing until ignored', async () => { sessionStorage.setItem( copyKeyOf(), diff --git a/apps/app/tests/unit/editor-sections.test.tsx b/apps/app/tests/unit/editor-sections.test.tsx index c757bad2..a0091a80 100644 --- a/apps/app/tests/unit/editor-sections.test.tsx +++ b/apps/app/tests/unit/editor-sections.test.tsx @@ -91,6 +91,19 @@ describe('the overview entries', () => { }, ) + 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() diff --git a/apps/app/tests/unit/editor-tabs-badge.test.tsx b/apps/app/tests/unit/editor-tabs-badge.test.tsx new file mode 100644 index 00000000..ef55b7bb --- /dev/null +++ b/apps/app/tests/unit/editor-tabs-badge.test.tsx @@ -0,0 +1,78 @@ +/** AC8: the Vérification tab carries the blocking-error count as text, and nothing at zero. */ +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' +import { act, cleanup, render, screen } from '@testing-library/react' +import type { SheetIssue } from '@faunosteo/core-wasm/types' +import EditorTabs from '@/components/editor/EditorTabs' +import { useLocaleStore } from '@/state/localeStore' +import { openReady, resetStore, store } from '../helpers/editorHarness' + +vi.mock('@/lib/supabase', () => ({ getSupabaseClient: () => ({}) })) +vi.mock('@faunosteo/supabase', async (orig) => ({ + ...(await orig()), + getSheetVersion: vi.fn(), + downloadSheetDrawing: vi.fn(), + saveSheetDraft: vi.fn(), + getOfficialSheetAdmin: vi.fn(), + submitSheetReview: vi.fn(), +})) + +beforeEach(() => useLocaleStore.setState({ locale: 'fr' })) +afterEach(() => { + cleanup() + resetStore() +}) + +const issue = (severity: SheetIssue['severity'], at: number): SheetIssue => ({ + code: 'x.y', + severity, + path: `annotations[${at}]`, + message: 'm', +}) + +function reportIssues(issues: SheetIssue[]) { + const previewState = store.getState().previewState + if (!previewState) throw new Error('the editor is not ready') + act(() => + store.setState({ + previewState: { + ...previewState, + report: { ...previewState.report, issues }, + }, + }), + ) +} + +const verificationTab = () => screen.getByRole('tab', { name: /^Vérification/ }) + +describe('the Vérification tab badge', () => { + it.each([ + [1, 'Vérification 1 erreur'], + [2, 'Vérification 2 erreurs'], + ])('says « n erreur(s) » for %i blocking error(s)', async (count, name) => { + await openReady() + render() + reportIssues( + Array.from({ length: count }, (_, at) => issue('error', at)), + ) + expect(verificationTab()).toHaveTextContent(new RegExp(`^${name}$`)) + }) + + it('shows nothing at zero, and warnings do not count', async () => { + await openReady() + render() + reportIssues([]) + expect(verificationTab()).toHaveTextContent(/^Vérification$/) + reportIssues([issue('warning', 0), issue('warning', 1)]) + expect(verificationTab()).toHaveTextContent(/^Vérification$/) + expect(screen.queryByText(/erreur/)).toBeNull() + }) + + it('the other tabs never carry the count', async () => { + await openReady() + render() + reportIssues([issue('error', 0)]) + expect(screen.getByRole('tab', { name: 'Général' })).toHaveTextContent( + /^Général$/, + ) + }) +}) diff --git a/apps/app/tests/unit/editor-tabs-general.test.tsx b/apps/app/tests/unit/editor-tabs-general.test.tsx index e13a5613..88fe18fc 100644 --- a/apps/app/tests/unit/editor-tabs-general.test.tsx +++ b/apps/app/tests/unit/editor-tabs-general.test.tsx @@ -107,7 +107,7 @@ describe('Annotations, section Catégories', () => { it('Général no longer holds the categories editor', async () => { await openReady() render() - expect(screen.queryByText("Catégories d'annotation")).toBeNull() + expect(screen.queryByLabelText(/Nom de la catégorie/)).toBeNull() }) it('renames, recolours and adds a category', async () => {