diff --git a/.claude/audits/2026-11-06-v1-2-6-u1-label-proposals.md b/.claude/audits/2026-11-06-v1-2-6-u1-label-proposals.md
new file mode 100644
index 00000000..34d3f079
--- /dev/null
+++ b/.claude/audits/2026-11-06-v1-2-6-u1-label-proposals.md
@@ -0,0 +1,35 @@
+# V1-2.6 U1 new FR/EN labels: proposals
+
+Everything below is a proposal (C44), not ratified: it goes to the owner's separate review. Each lot
+appends its rows to its own section (key, FR, EN, where it shows). Removed keys are listed with their lot.
+
+## Lot B1 (four tabs, Annotations sections, references from the header)
+
+| Key | FR | EN | Where | Status |
+|---|---|---|---|---|
+| `editor.tab.errors_one` / `_other` | {count} erreur / {count} erreurs | {count} error / {count} errors | Vérification tab badge, in its accessible name | board text, plural form proposed |
+| `editor.place.drawing` | Dessin | Drawing | Live region, « Annotations · Dessin » | proposal |
+| `editor.place.views` | Vues | Views | Section heading, live region, « Aller à » fallback, hint link | proposal |
+| `editor.place.categories` | Catégories | Categories | Same | proposal |
+| `editor.place.regions` | Régions vertébrales | Vertebral regions | Same | T17 name |
+| `editor.place.references` | Références | References | Panel heading, live region | proposal |
+| `editor.section.back` | Retour au dessin | Back to the drawing | First control of each section | plan wording |
+| `editor.references.open` | Références | References | Header button | board text |
+| `editor.references.close` | Fermer les références | Close the references | Panel close button | proposal |
+| `editor.live.references_closed` | Références fermées | References closed | Live region on panel close | proposal |
+| `editor.live.creation_kept` | Une création est en cours : terminez-la ou abandonnez-la pour atteindre cette annotation. | A creation is in progress: finish or abandon it to reach this annotation. | Live region, « Aller à » kept | proposal |
+| `editor.live.tracing_kept` | Un tracé est en cours : terminez-le ou annulez-le pour atteindre cette annotation. | A tracing is in progress: finish or cancel it to reach this annotation. | Same | proposal |
+| `editor.overview.label` | Aperçu de la fiche | Sheet overview | Overview panel region name | proposal |
+| `editor.overview.views` | Vues | Views | Overview card | board text |
+| `editor.overview.view_main` / `view_detail` | Vue principale / Vue détaillée | Main view / Detail view | Overview rows | board text |
+| `editor.overview.annotations_one` / `_other` | {count} annotation / {count} annotations | same | Overview rows | board text |
+| `editor.overview.manage_views` / `see_views` | Gérer les vues / Voir les vues | Manage views / See the views | Overview entry, edit / read-only | board text |
+| `editor.overview.categories` | Catégories | Categories | Overview card | board text |
+| `editor.overview.categories_empty` | Aucune catégorie pour l'instant. | No category yet. | Overview card | proposal |
+| `editor.overview.edit_categories` / `see_categories` | Modifier les catégories / Voir les catégories | Edit categories / See the categories | Overview entry | board text |
+| `editor.overview.regions_one` / `_other` | Régions vertébrales ({count} région) / ({count} régions) | Vertebral regions ({count} region) / ({count} regions) | Overview entry (T17) | proposal |
+
+Reworded prose (no new key): `admin.failure.view.asset.unknown`, `editor.annotations.unmeasured.hint`,
+`editor.annotations.no_category`, `editor.annotations.no_child_view`, `editor.views.frame.newly_invalid`
+(they named the removed tabs). Removed keys: `editor.tab.views`, `editor.tab.references`,
+`editor.tab.vertebrae` (renamed to `editor.place.*`), `editor.annotations.select_hint` (the overview replaces it).
diff --git a/apps/app/e2e/lan/trial-lan.spec.ts b/apps/app/e2e/lan/trial-lan.spec.ts
index 352990f0..03b00967 100644
--- a/apps/app/e2e/lan/trial-lan.spec.ts
+++ b/apps/app/e2e/lan/trial-lan.spec.ts
@@ -99,6 +99,14 @@ async function createNonEquineSheet(page: Page, tag: string) {
await expect(page).toHaveURL(/\/app\/admin\/sheets\/[0-9a-f-]{36}\/draft$/)
}
+/** The views section: the Annotations tab, then the overview entry (U1 moved the views). */
+async function openViews(page: Page) {
+ await page
+ .getByRole('tab', { name: dict['editor.tab.annotations'], exact: true })
+ .click()
+ await page.locator('[data-section-entry="views"]').click()
+}
+
test('trial through the LAN origin: MFA, new sheet, SVG import, save, reload', async ({
page,
}) => {
@@ -121,9 +129,7 @@ test('trial through the LAN origin: MFA, new sheet, SVG import, save, reload', a
await signIn(page)
await challenge(page, secret)
await createNonEquineSheet(page, tag)
- await page
- .getByRole('tab', { name: dict['editor.tab.views'], exact: true })
- .click()
+ await openViews(page)
await page
.locator('[data-testid$="-file"]')
.first()
@@ -144,9 +150,7 @@ test('trial through the LAN origin: MFA, new sheet, SVG import, save, reload', a
await page.getByRole('button', { name: dict['common.save'] }).click()
await expect(revisionLine(page)).toHaveText(`Révision ${before + 1}`)
await page.reload()
- await page
- .getByRole('tab', { name: dict['editor.tab.views'], exact: true })
- .click()
+ await openViews(page)
await expect(
page.getByRole('tabpanel').getByText(dict['editor.views.drawing.ok']),
).toBeVisible()
diff --git a/apps/app/e2e/shell/editor-access.spec.ts b/apps/app/e2e/shell/editor-access.spec.ts
index 6a9704c2..01761643 100644
--- a/apps/app/e2e/shell/editor-access.spec.ts
+++ b/apps/app/e2e/shell/editor-access.spec.ts
@@ -9,15 +9,21 @@ import {
import { stepUpAdmin } from '../support/admin'
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
import {
+ SECTIONS,
+ TABS,
+ closeReferences,
draftPath,
draftTitle,
editorActor,
makeActor,
openEditor,
+ openReferences,
+ openSection,
pointOf,
seedDraft,
selectTab,
shapeWith,
+ showDrawing,
type Actor,
} from '../support/editor'
import { signIn } from '../support/shell'
@@ -31,15 +37,6 @@ import { signIn } from '../support/shell'
const dict = fr
const isPhone = (info: TestInfo) => info.project.name === 'chromium-375'
-const TABS = [
- 'general',
- 'views',
- 'annotations',
- 'findings',
- 'references',
- 'vertebrae',
- 'verification',
-] as const
const seedShape = shapeWith(
pointOf('p1', 'main', { cx: 500, cy: 400, r: 40 }, 'Point un'),
@@ -150,6 +147,9 @@ test.describe('editor access, narrow screens and axe', () => {
).toHaveCount(0)
await expectNoHorizontalOverflow(page, `the draft at ${width} px`)
await expectAccessible(page, `the draft at ${width} px`)
+ await openReferences(page, dict)
+ await expectNoHorizontalOverflow(page, `the panel at ${width} px`)
+ await expectAccessible(page, `the references panel at ${width} px`)
})
}
@@ -178,6 +178,20 @@ test.describe('editor access, narrow screens and axe', () => {
await expectNoHorizontalOverflow(page, `the ${tab} tab at 1 024 px`)
await expectAccessible(page, `the ${tab} tab (edit)`)
}
+ for (const section of SECTIONS) {
+ await openSection(page, dict, section)
+ await page.waitForLoadState('networkidle')
+ await expectNoHorizontalOverflow(
+ page,
+ `the ${section} section at 1 024 px`,
+ )
+ await expectAccessible(page, `the ${section} section (edit)`)
+ }
+ await showDrawing(page, dict)
+ await openReferences(page, dict)
+ await expectNoHorizontalOverflow(page, 'the references panel at 1 024 px')
+ await expectAccessible(page, 'the references panel (edit)')
+ await closeReferences(page, dict)
})
test('axe on every tab of a read-only draft', async ({ page, requests }) => {
@@ -197,5 +211,12 @@ test.describe('editor access, narrow screens and axe', () => {
await page.waitForLoadState('networkidle')
await expectAccessible(page, `the ${tab} tab (read-only)`)
}
+ for (const section of SECTIONS) {
+ await openSection(page, dict, section)
+ await expectAccessible(page, `the ${section} section (read-only)`)
+ }
+ await showDrawing(page, dict)
+ await openReferences(page, dict)
+ await expectAccessible(page, 'the references panel (read-only)')
})
})
diff --git a/apps/app/e2e/shell/editor-drawings.spec.ts b/apps/app/e2e/shell/editor-drawings.spec.ts
index 084b3b8e..89eeda22 100644
--- a/apps/app/e2e/shell/editor-drawings.spec.ts
+++ b/apps/app/e2e/shell/editor-drawings.spec.ts
@@ -4,14 +4,15 @@ import { expect, expectAccessible, test } from '../support/browser'
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
import {
DRAWING_SVG,
- INKSCAPE_EXPORT,
editorActor,
+ INKSCAPE_EXPORT,
openEditor,
- seedDraft,
- selectTab,
- standardShape,
- serverDocument,
+ openSection,
saveDraft,
+ seedDraft,
+ serverDocument,
+ showDrawing,
+ standardShape,
} from '../support/editor'
// V1-2.6 A2 (contract C16, C20): a drawing imported into a view. A hostile file is
@@ -54,7 +55,7 @@ test.describe('editor drawings (A2)', () => {
requests.forbid(actor.account.email, actor.account.password)
const seed = await seedDraft(actor, { drawing: null })
await openEditor(page, dict, actor, seed.sheetId)
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
await expect(
mainDrawing(page).getByText(dict['editor.views.drawing.none']),
).toBeVisible()
@@ -81,7 +82,7 @@ test.describe('editor drawings (A2)', () => {
requests.forbid(actor.account.email, actor.account.password)
const seed = await seedDraft(actor, { drawing: null })
await openEditor(page, dict, actor, seed.sheetId)
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
await mainFile(page).setInputFiles(
file(INKSCAPE_EXPORT, 'inkscape-1.4.3.svg'),
@@ -130,7 +131,7 @@ test.describe('editor drawings (A2)', () => {
requests.forbid(actor.account.email, actor.account.password)
const seed = await seedDraft(actor, { drawing: null, shape: standardShape })
await openEditor(page, dict, actor, seed.sheetId)
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
await mainFile(page).setInputFiles(file(DRAWING_SVG, 'valide.svg'))
await expect(page.getByText(dict['editor.upload.done'])).toBeVisible()
@@ -164,7 +165,7 @@ test.describe('editor drawings (A2)', () => {
detail.getByText(dict['editor.views.drawing.inherited']),
).toBeVisible()
- await selectTab(page, dict, 'annotations')
+ await showDrawing(page, dict)
await page
.getByRole('group', { name: dict['editor.annotations.views'] })
.getByRole('button', { name: 'Détail A' })
diff --git a/apps/app/e2e/shell/editor-equine.spec.ts b/apps/app/e2e/shell/editor-equine.spec.ts
index 6522ff18..6ec2675d 100644
--- a/apps/app/e2e/shell/editor-equine.spec.ts
+++ b/apps/app/e2e/shell/editor-equine.spec.ts
@@ -11,14 +11,19 @@ import { stepUpAdmin } from '../support/admin'
import { expect, expectAccessible, test } from '../support/browser'
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
import {
+ type Actor,
+ closeReferences,
editorActor,
openEditor,
+ openReferences,
+ openSection,
+ SECTIONS,
seedDraft,
selectTab,
serverDocument,
+ showDrawing,
standardShape,
toolButton,
- type Actor,
} from '../support/editor'
import { signIn } from '../support/shell'
@@ -121,7 +126,7 @@ async function measureRenames(page: Page, label: string) {
}
async function measureAdditions(page: Page, label: string) {
- await selectTab(page, dict, 'general')
+ await openSection(page, dict, 'categories')
await startProbe(page)
for (let round = 0; round <= SAMPLES; round++) {
await page.locator('#category-new-fr').fill(`Catégorie ${round}`)
@@ -287,14 +292,11 @@ test.describe('equine working copy and commit latency', () => {
// once blanked the page on nodes that omit their defaulted fields).
await selectTab(page, dict, 'findings')
await expect(page.getByTestId('finding-item').first()).toBeVisible()
- for (const tab of [
- 'general',
- 'views',
- 'references',
- 'vertebrae',
- 'verification',
- ])
+ for (const tab of ['general', 'verification'])
await selectTab(page, dict, tab)
+ for (const section of SECTIONS) await openSection(page, dict, section)
+ await openReferences(page, dict)
+ await closeReferences(page, dict)
expect(errors, 'page errors on the equine copy').toEqual([])
})
@@ -314,7 +316,7 @@ test.describe('equine working copy and commit latency', () => {
'equine: add category (insert)',
)
// A geometry edit: the first annotation's centre, through the geometry group.
- await selectTab(page, dict, 'annotations')
+ await showDrawing(page, dict)
await page
.getByRole('list', { name: dict['editor.annotations.list'] })
.getByRole('button')
diff --git a/apps/app/e2e/shell/editor-geometry.spec.ts b/apps/app/e2e/shell/editor-geometry.spec.ts
index 08ac3410..b3f4438e 100644
--- a/apps/app/e2e/shell/editor-geometry.spec.ts
+++ b/apps/app/e2e/shell/editor-geometry.spec.ts
@@ -8,11 +8,12 @@ import {
editorActor,
geometryField,
openEditor,
+ openSection,
pointOf,
saveDraft,
seedDraft,
- serverDocument,
selectTab,
+ serverDocument,
shapeWith,
standardShape,
} from '../support/editor'
@@ -201,7 +202,7 @@ test.describe('editor geometry (adversarial)', () => {
),
)
requests.forbid(actor.account.email, actor.account.password)
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
const detail = page.getByRole('listitem', { name: 'Détail A' })
await detail
.getByRole('button', { name: dict['editor.views.crop.toggle'] })
@@ -257,7 +258,7 @@ test.describe('editor geometry (adversarial)', () => {
},
})
await openEditor(page, dict, actor, seed.sheetId)
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
await page.getByTestId('view-main-file').setInputFiles({
name: 'petit.svg',
mimeType: 'image/svg+xml',
@@ -344,7 +345,7 @@ test.describe('editor geometry (adversarial)', () => {
},
})
await openEditor(page, dict, actor, seed.sheetId)
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
await page.getByTestId('view-main-file').setInputFiles({
name: 'petit.svg',
mimeType: 'image/svg+xml',
diff --git a/apps/app/e2e/shell/editor-journey.spec.ts b/apps/app/e2e/shell/editor-journey.spec.ts
index 29ebcd70..a3876206 100644
--- a/apps/app/e2e/shell/editor-journey.spec.ts
+++ b/apps/app/e2e/shell/editor-journey.spec.ts
@@ -9,16 +9,18 @@ import {
clickDrawing,
createFromPanel,
creationPanel,
- INKSCAPE_EXPORT,
editorActor,
fillCreation,
geometryField,
+ INKSCAPE_EXPORT,
+ openDraft,
+ openSection,
saveDraft,
- serverDocument,
secondSession,
selectTab,
+ serverDocument,
+ showDrawing,
toolButton,
- openDraft,
} from '../support/editor'
import { signIn } from '../support/shell'
@@ -79,7 +81,7 @@ async function createSheetFromAdmin(page: Page, tag: string): Promise {
}
async function importDrawing(page: Page) {
- await selectTab(page, dict, 'views')
+ await openSection(page, dict, 'views')
// The real Inkscape 1.4.3 export, cleaned by the core in the page (viewBox 0 0 200 150).
await page.getByTestId('view-view-main-file').setInputFiles({
name: 'inkscape-1.4.3.svg',
@@ -105,7 +107,7 @@ async function importDrawing(page: Page) {
}
async function createFindings(page: Page) {
- await selectTab(page, dict, 'general')
+ await openSection(page, dict, 'categories')
await page.locator('#category-new-fr').fill('Catégorie essai')
await page.locator('#category-new-en').fill('Trial category')
await clickButton(page, dict['editor.general.category_add'])
@@ -132,7 +134,7 @@ async function createFindings(page: Page) {
}
async function createAnnotations(page: Page) {
- await selectTab(page, dict, 'annotations')
+ await showDrawing(page, dict)
const trace = async (points: number[][]) => {
for (const [x, y] of points) await clickDrawing(page, x, y)
await clickButton(page, dict['editor.annotations.trace_close'])
@@ -420,6 +422,11 @@ test.describe('editor journey (owner trial steps)', () => {
`select status from public.anatomical_sheet_reviews where version_id = '${draftId}'`,
),
).toBe('verifying')
+ // The submit button sits at the page's end: back at the header, whose « Références »
+ // button the sticky top bar covers while the page is scrolled.
+ await page
+ .getByRole('heading', { level: 1, name: 'Brouillon, version 1' })
+ .evaluate((heading) => heading.scrollIntoView({ block: 'center' }))
await expectAccessible(page, 'the frozen draft')
})
})
diff --git a/apps/app/e2e/shell/editor-structures.spec.ts b/apps/app/e2e/shell/editor-structures.spec.ts
index e03217bb..1c1cae47 100644
--- a/apps/app/e2e/shell/editor-structures.spec.ts
+++ b/apps/app/e2e/shell/editor-structures.spec.ts
@@ -4,8 +4,11 @@ import { expect, expectAccessible, test } from '../support/browser'
import { dropLateReplays, routeToSandbox } from '../support/sandbox'
import {
bareShape,
+ closeReferences,
editorActor,
openEditor,
+ openReferences,
+ openSection,
pointOf,
saveDraft,
seedDraft,
@@ -13,6 +16,7 @@ import {
serverDocument,
serverRevision,
shapeWith,
+ showDrawing,
} from '../support/editor'
// V1-2.6 A4 (contract C9 to C12, C19): the structures around the drawing. Annotation
@@ -56,7 +60,7 @@ test.describe('editor structures (A4)', () => {
requests.forbid(actor.account.email, actor.account.password)
// A category added, then renamed in place.
- await selectTab(page, dict, 'general')
+ await openSection(page, dict, 'categories')
await page.locator('#category-new-fr').fill('Catégorie B')
await page.locator('#category-new-en').fill('Category B')
await page
@@ -67,10 +71,10 @@ test.describe('editor structures (A4)', () => {
await expect(names).toHaveCount(2)
await commitText(names.nth(1), 'Catégorie B bis')
await expect(names.nth(1)).toHaveValue('Catégorie B bis')
- await expectAccessible(page, 'the general tab')
+ await expectAccessible(page, 'the categories section')
// Two references, the second moved up.
- await selectTab(page, dict, 'references')
+ await openReferences(page, dict)
for (const citation of ['Première référence', 'Seconde référence']) {
await page.locator('#reference-new-type').selectOption('book')
await page.locator('#reference-new-citation').fill(citation)
@@ -100,7 +104,8 @@ test.describe('editor structures (A4)', () => {
await expect(citations).toHaveCount(1)
// A region with its count.
- await selectTab(page, dict, 'vertebrae')
+ await closeReferences(page, dict)
+ await openSection(page, dict, 'regions')
await page.locator('#region-new-code').fill('T')
await page.locator('#region-new-fr').fill('Thoracique')
await page.locator('#region-new-en').fill('Thoracic')
@@ -245,7 +250,7 @@ test.describe('editor structures (A4)', () => {
requests.forbid(actor.account.email, actor.account.password)
// The category is used by the point: the dialog lists it and offers no deletion.
- await selectTab(page, dict, 'general')
+ await openSection(page, dict, 'categories')
await page
.getByRole('listitem')
.filter({ has: page.locator('#category-cat-a-name-fr') })
@@ -283,7 +288,7 @@ test.describe('editor structures (A4)', () => {
.click()
// The point goes first; the zone then deletes with its descendants named.
- await selectTab(page, dict, 'annotations')
+ await showDrawing(page, dict)
await page
.getByRole('list', { name: dict['editor.annotations.list'] })
.getByRole('button', { name: /Point lié/ })
diff --git a/apps/app/e2e/support/editor.ts b/apps/app/e2e/support/editor.ts
index 2d942dcb..fce3c63b 100644
--- a/apps/app/e2e/support/editor.ts
+++ b/apps/app/e2e/support/editor.ts
@@ -9,7 +9,7 @@ import { createHash, randomUUID } from 'node:crypto'
import { readFileSync } from 'node:fs'
import { join } from 'node:path'
import type { Dict } from '@/i18n/types'
-import type { Browser, BrowserContext, Page } from '@playwright/test'
+import type { Browser, BrowserContext, Locator, Page } from '@playwright/test'
import {
enrolTotp,
refusal,
@@ -323,10 +323,72 @@ export async function openDraft(page: Page, dict: Dict, sheetId: string) {
await expect(page.getByRole('tablist')).toBeVisible()
}
+/** The four tabs of the editor (U1): the references moved to a panel, the rest to Annotations. */
+export const TABS = [
+ 'general',
+ 'annotations',
+ 'findings',
+ 'verification',
+] as const
+
+/** The Annotations sections and the panel, in the order the overview offers them. */
+export const SECTIONS = ['views', 'categories', 'regions'] as const
+
+/**
+ * Clicks a tab by role. The name is a pattern: the Vérification tab adds « n erreur(s) »
+ * to its name while the in-page check has errors.
+ */
export async function selectTab(page: Page, dict: Dict, tab: string) {
+ const name = dict[`editor.tab.${tab}`]
+ await page.getByRole('tab', { name: new RegExp(`^${name}( |$)`) }).click()
+}
+
+/** The visible place with this `data-place` name; a hidden copy never answers. */
+export function place(page: Page, name: string): Locator {
+ return page.locator(`[data-place="${name}"]:visible`)
+}
+
+/** « Retour au dessin »: leaves an Annotations section for the drawing. */
+export async function backToDrawing(page: Page, dict: Dict) {
+ await page.getByRole('button', { name: dict['editor.section.back'] }).click()
+ await expect(place(page, 'annotations.drawing')).toBeVisible()
+}
+
+/** The Annotations tab on its drawing, whatever section it was left on. */
+export async function showDrawing(page: Page, dict: Dict) {
+ await selectTab(page, dict, 'annotations')
+ const back = page.getByRole('button', { name: dict['editor.section.back'] })
+ if (await back.isVisible()) await backToDrawing(page, dict)
+ await expect(place(page, 'annotations.drawing')).toBeVisible()
+}
+
+/** Opens an Annotations section through its overview entry. */
+export async function openSection(
+ page: Page,
+ dict: Dict,
+ section: (typeof SECTIONS)[number],
+) {
+ await showDrawing(page, dict)
+ await page.locator(`[data-section-entry="${section}"]`).click()
+ await expect(place(page, `annotations.${section}`)).toBeVisible()
+}
+
+/** Opens the references panel from the header button. */
+export async function openReferences(page: Page, dict: Dict) {
+ const toggle = page.getByRole('button', {
+ name: dict['editor.references.open'],
+ exact: true,
+ })
+ if ((await toggle.getAttribute('aria-expanded')) !== 'true')
+ await toggle.click()
+ await expect(place(page, 'references')).toBeVisible()
+}
+
+export async function closeReferences(page: Page, dict: Dict) {
await page
- .getByRole('tab', { name: dict[`editor.tab.${tab}`], exact: true })
+ .getByRole('button', { name: dict['editor.references.close'] })
.click()
+ await expect(place(page, 'references')).toHaveCount(0)
}
/** The revision the server holds for the draft. */
diff --git a/apps/app/e2e/support/warm-up.ts b/apps/app/e2e/support/warm-up.ts
index c686d897..c244e674 100644
--- a/apps/app/e2e/support/warm-up.ts
+++ b/apps/app/e2e/support/warm-up.ts
@@ -2,31 +2,26 @@
* Global setup of the shell suite (V1-2.6): the Vite dev server discovers some
* dependencies only when a route first loads them and answers with a full page
* reload, which wiped a form a test had begun to fill. One throwaway session
- * visits the editor routes and every tab once before the tests start, so the
+ * visits the editor routes, every tab, every Annotations section and the references panel once before the tests start, so the
* reload happens here and not in a test.
*/
import { chromium, type FullConfig } from '@playwright/test'
import { fr } from '@/i18n/fr'
import { stepUpAdmin } from './admin'
import {
+ TABS,
+ closeReferences,
draftPath,
editorActor,
+ openReferences,
+ openSection,
secondSession,
seedDraft,
+ SECTIONS,
standardShape,
} from './editor'
import { signIn } from './shell'
-const TABS = [
- 'general',
- 'views',
- 'annotations',
- 'findings',
- 'references',
- 'vertebrae',
- 'verification',
-] as const
-
export default async function warmUp(config: FullConfig): Promise {
const baseURL = config.projects[0].use.baseURL ?? ''
const actor = await editorActor('fr')
@@ -42,10 +37,18 @@ export default async function warmUp(config: FullConfig): Promise {
}
for (const tab of TABS) {
await page
- .getByRole('tab', { name: fr[`editor.tab.${tab}`], exact: true })
+ .getByRole('tab', {
+ name: new RegExp(`^${fr[`editor.tab.${tab}`]}( |$)`),
+ })
.click()
await page.waitForLoadState('networkidle')
}
+ for (const section of SECTIONS) {
+ await openSection(page, fr, section)
+ await page.waitForLoadState('networkidle')
+ }
+ await openReferences(page, fr)
+ await closeReferences(page, fr)
await page.goto('/app/admin/sheets/new')
await page.waitForLoadState('networkidle')
await browser.close()
diff --git a/apps/app/src/app/routes/app/admin/AdminSheetDraftRoute.tsx b/apps/app/src/app/routes/app/admin/AdminSheetDraftRoute.tsx
index 7a7710d4..d6f5aa6d 100644
--- a/apps/app/src/app/routes/app/admin/AdminSheetDraftRoute.tsx
+++ b/apps/app/src/app/routes/app/admin/AdminSheetDraftRoute.tsx
@@ -1,16 +1,10 @@
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef } from 'react'
import { useParams } from 'react-router-dom'
import {
getOfficialSheetAdmin,
type OfficialSheetAdmin,
} from '@faunosteo/supabase'
-import ConflictDialog from '@/components/editor/ConflictDialog'
-import CopyIssueNotice from '@/components/editor/CopyIssueNotice'
-import DraftHeader from '@/components/editor/DraftHeader'
-import EditorTabBody from '@/components/editor/EditorTabBody'
-import EditorTabs, { PANEL_ID } from '@/components/editor/EditorTabs'
-import ModeNotice from '@/components/editor/ModeNotice'
-import RecoveryNotice from '@/components/editor/RecoveryNotice'
+import EditorWorkspace from '@/components/editor/EditorWorkspace'
import CatalogueFailureNotice from '@/components/catalogue/CatalogueFailureNotice'
import AccessDenied from '@/components/shell/AccessDenied'
import PermissionsUnavailable from '@/components/shell/PermissionsUnavailable'
@@ -22,7 +16,6 @@ import { failureMessage } from '@/admin/labels'
import { useAdminPermissions } from '@/admin/permissions'
import { isRightsRefusal, useAdminQuery } from '@/admin/useAdminQuery'
import { useLeaveGuard } from '@/app/useLeaveGuard'
-import { saveFailureMessage } from '@/editor/messages'
import {
editorMode,
hasEditRight,
@@ -30,12 +23,6 @@ import {
storeCanEdit,
} from '@/editor/mode'
import { leaveGuardArmed, useEditorStore } from '@/editor/state/editorStore'
-import { FocusConsumedContext, type FocusRequest } from '@/editor/focusRequest'
-import {
- initialTab,
- type EditorTabId,
- type EditorTabProps,
-} from '@/editor/tabs'
import { useUndoShortcuts } from '@/editor/useUndoShortcuts'
import { useTabTier } from '@/editor/useViewport'
import { useAuthStore } from '@/state/authStore'
@@ -50,22 +37,6 @@ interface DraftEditorProps {
reloadSheet: () => void
}
-/** A refused save under the header, phrased from the closed kind and the copy's real flag. */
-function SaveFailureNotice() {
- const t = useT()
- const failure = useEditorStore((s) => s.saveFailure)
- const unsaved = useEditorStore((s) => s.unsaved)
- const copyWritten = useEditorStore((s) => s.copyWritten)
- const conflictOpen = useEditorStore((s) => s.conflict !== null)
- if (failure === null || (failure === 'draft_conflict' && conflictOpen))
- return null
- return (
-
- {saveFailureMessage(t, failure, { unsaved, copyWritten })}
-
- )
-}
-
/**
* The draft page once the sheet is read: opens the store session for this version, derives
* the mode, and renders what the store holds. Components only render and call actions.
@@ -79,31 +50,17 @@ function DraftEditor({
}: DraftEditorProps) {
const t = useT()
const tier = useTabTier()
- const [chosen, setTab] = useState(null)
- const [focus, setFocus] = useState()
- const clearFocus = (serial: number) =>
- setFocus((prev) => (prev?.serial === serial ? undefined : prev))
- const goTo: EditorTabProps['onGoTo'] = (next, key) => {
- setTab(next)
- setFocus((prev) => ({ key, serial: (prev?.serial ?? 0) + 1 }))
- }
const saveFailure = useEditorStore((s) => s.saveFailure)
const status = useEditorStore((s) => s.status)
const sessionVersion = useEditorStore((s) => s.versionId)
const failure = useEditorStore((s) => s.failure)
const recovery = useEditorStore((s) => s.recovery)
- const previewState = useEditorStore((s) => s.previewState)
- const opened = status === 'ready' && sessionVersion === versionId
- // Chosen once per opened version: later edits never move the user off their tab.
- if (chosen === null && opened && previewState) {
- setTab(initialTab(previewState, tier))
- }
- const tab = chosen ?? 'annotations'
const mode = modeAfterSave(
editorMode({ hasRight, sheet, wide: tier === 'wide' }),
saveFailure,
)
const canEdit = storeCanEdit(mode)
+ const readOnly = mode !== 'edit' || recovery !== 'none'
const firstCanEdit = useRef(canEdit)
useEffect(() => {
@@ -114,7 +71,7 @@ function DraftEditor({
}, [versionId, userId])
useEffect(() => useEditorStore.getState().setCanEdit(canEdit), [canEdit])
useLeaveGuard(useEditorStore(leaveGuardArmed))
- useUndoShortcuts(mode === 'edit' && recovery === 'none')
+ useUndoShortcuts(!readOnly)
if (status === 'failed' && failure !== null) {
if (failure === 'denied') return
@@ -129,29 +86,14 @@ function DraftEditor({
)
}
- const readOnly = mode !== 'edit' || recovery !== 'none'
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
)
}
diff --git a/apps/app/src/components/editor/DraftHeader.tsx b/apps/app/src/components/editor/DraftHeader.tsx
index abc79e3c..7acc596c 100644
--- a/apps/app/src/components/editor/DraftHeader.tsx
+++ b/apps/app/src/components/editor/DraftHeader.tsx
@@ -2,40 +2,14 @@ import { useState } from 'react'
import { Link } from 'react-router-dom'
import type { OfficialSheetAdmin } from '@faunosteo/supabase'
import Badge from '@/components/ui/Badge'
-import Button from '@/components/ui/Button'
import Icon from '@/components/ui/Icon'
import Notice from '@/components/ui/Notice'
import { localized } from '@/admin/labels'
-import { loadFailureMessage } from '@/editor/messages'
import type { EditorMode } from '@/editor/mode'
-import { useEditorStore } from '@/editor/state/editorStore'
import { usePageHeading } from '@/app/usePageHeading'
import { useLocaleStore } from '@/state/localeStore'
import { useT } from '@/i18n/useT'
-import ConfirmDialog from './ConfirmDialog'
-
-type Translate = ReturnType
-
-interface Status {
- copyIssue: 'cap' | 'quota' | null
- saving: boolean
- unsaved: boolean
- revision: number
-}
-
-/** Board 04's line; only the copy failures replace it (the copy is temporary, this tab's). */
-function statusText(t: Translate, status: Status): string {
- if (status.copyIssue !== null)
- return t(`editor.draft.status.copy_${status.copyIssue}`)
- if (status.saving) return t('editor.draft.status.saving')
- const revision = t('editor.draft.status.revision').replace(
- '{revision}',
- String(status.revision),
- )
- return status.unsaved
- ? `${revision} · ${t('editor.draft.status.unsaved')}`
- : revision
-}
+import HeaderActions from './HeaderActions'
/** Breadcrumb of board 04: Administration › Fiches officielles › the sheet › the draft. */
function Breadcrumb({
@@ -71,42 +45,27 @@ function Breadcrumb({
}
/**
- * The draft's header: title and badges, the revision line with the unsaved state, and in
- * edit mode « Annuler les modifications » (confirmed) and « Enregistrer ». « Annuler les
- * modifications » is the store's `discardChanges`; with an older base it reloads.
+ * The draft's header: breadcrumb, title and badges, then the actions (references, the
+ * save line, « Abandonner les modifications » and « Enregistrer » in edit mode).
*/
export default function DraftHeader({
sheet,
mode,
+ referencesOpen,
+ onToggleReferences,
}: {
sheet: OfficialSheetAdmin
mode: EditorMode
+ referencesOpen: boolean
+ onToggleReferences: (opener: HTMLElement) => void
}) {
const t = useT()
const heading = usePageHeading()
- const unsaved = useEditorStore((s) => s.unsaved)
- const saving = useEditorStore((s) => s.saving)
- const blocked = useEditorStore((s) => s.recovery !== 'none')
- const revision = useEditorStore((s) => s.savedRevision)
- const copyIssue = useEditorStore((s) => s.copyIssue)
- const [asking, setAsking] = useState(false)
const [failure, setFailure] = useState(null)
const title = t('editor.draft.title').replace(
'{number}',
String(sheet.draft_version?.version_number ?? ''),
)
-
- const discard = async () => {
- setAsking(false)
- const result = await useEditorStore
- .getState()
- .discardChanges({ confirmed: true })
- setFailure(
- !result.ok && result.reason === 'load'
- ? loadFailureMessage(t, result.failure)
- : null,
- )
- }
return (
@@ -126,42 +85,14 @@ export default function DraftHeader({
{t('editor.draft.read_only')}
)}
-
- {statusText(t, { copyIssue, saving, unsaved, revision })}
-
- {mode === 'edit' && (
-
- setAsking(true)}
- >
- {t('editor.draft.discard')}
-
- void useEditorStore.getState().save()}
- >
- {t('common.save')}
-
-
- )}
+
{failure && {failure} }
- void discard()}
- onCancel={() => setAsking(false)}
- />
)
}
diff --git a/apps/app/src/components/editor/EditorTabBody.tsx b/apps/app/src/components/editor/EditorTabBody.tsx
index e1feed58..008cdd8f 100644
--- a/apps/app/src/components/editor/EditorTabBody.tsx
+++ b/apps/app/src/components/editor/EditorTabBody.tsx
@@ -1,28 +1,53 @@
import type { ComponentType } from 'react'
-import type { EditorTabId, EditorTabProps } from '@/editor/tabs'
+import type { AnnotationSection } from '@/editor/navigation'
+import {
+ panelDomId,
+ type EditorPlaceProps,
+ type EditorTabId,
+} from '@/editor/tabs'
+import { useT } from '@/i18n/useT'
import AnnotationsTab from './tabs/AnnotationsTab'
import FindingsTab from './tabs/FindingsTab'
import GeneralTab from './tabs/GeneralTab'
-import ReferencesTab from './tabs/ReferencesTab'
import VerificationTab from './tabs/VerificationTab'
-import VertebraeTab from './tabs/VertebraeTab'
-import ViewsTab from './tabs/ViewsTab'
-/** One component per tab (Lots F-J fill them); only the active one is mounted. */
-const BODIES: Record> = {
+const BODIES: Record<
+ Exclude,
+ ComponentType
+> = {
general: GeneralTab,
- views: ViewsTab,
- annotations: AnnotationsTab,
findings: FindingsTab,
- references: ReferencesTab,
- vertebrae: VertebraeTab,
verification: VerificationTab,
}
-export default function EditorTabBody({
- tab,
- ...props
-}: EditorTabProps & { tab: EditorTabId }) {
- const Body = BODIES[tab]
- return
+/** What only the Annotations tab needs beyond the common place props. */
+export interface AnnotationNav {
+ section: AnnotationSection
+ onOpenSection: (section: AnnotationSection, opener: HTMLElement) => void
+ onBack: () => void
+}
+
+interface Props extends EditorPlaceProps {
+ tab: EditorTabId
+ annotations: AnnotationNav
+}
+
+/** The panel of the active tab; a place unmounts when left (kept alive in Lot B2). */
+export default function EditorTabBody({ tab, annotations, ...props }: Props) {
+ const t = useT()
+ const Body = tab === 'annotations' ? null : BODIES[tab]
+ return (
+
+ {Body ? (
+
+ ) : (
+
+ )}
+
+ )
}
diff --git a/apps/app/src/components/editor/EditorTabs.tsx b/apps/app/src/components/editor/EditorTabs.tsx
index 35659f01..d79c7a07 100644
--- a/apps/app/src/components/editor/EditorTabs.tsx
+++ b/apps/app/src/components/editor/EditorTabs.tsx
@@ -1,12 +1,16 @@
import { useState, type KeyboardEvent } from 'react'
import { useEditorStore } from '@/editor/state/editorStore'
-import { tabsFor, type EditorTabId } from '@/editor/tabs'
+import { usePlural } from '@/editor/plural'
+import {
+ MORE_BUTTON_ID,
+ panelDomId,
+ tabDomId,
+ tabsFor,
+ type EditorTabId,
+} from '@/editor/tabs'
import type { TabTier } from '@/editor/useViewport'
import { useT } from '@/i18n/useT'
-export const PANEL_ID = 'editor-panel'
-export const tabDomId = (tab: EditorTabId) => `editor-tab-${tab}`
-
const BASE =
'min-h-11 whitespace-nowrap border-b-2 px-3 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]'
const ACTIVE =
@@ -14,8 +18,9 @@ const ACTIVE =
const IDLE =
'border-transparent text-[var(--color-ink-muted)] hover:text-[var(--color-ink)]'
-/** The blocking-error count on the Vérification tab; absent at zero. */
+/** The blocking-error count on the Vérification tab, as text; absent at zero. */
function ErrorCount({ tab }: { tab: EditorTabId }) {
+ const plural = usePlural()
const count = useEditorStore(
(s) =>
s.previewState?.report.issues.filter((i) => i.severity === 'error')
@@ -23,35 +28,24 @@ function ErrorCount({ tab }: { tab: EditorTabId }) {
)
if (tab !== 'verification' || count === 0) return null
return (
-
- {count}
-
+ <>
+ {' '}
+
+ {plural('editor.tab.errors', count)}
+
+ >
)
}
-interface EditorTabsProps {
+interface TabListProps {
+ shown: readonly EditorTabId[]
active: EditorTabId
- tier: TabTier
onSelect: (tab: EditorTabId) => void
}
-/**
- * The draft's tabs (boards 04 and 05): all seven wide, the static lists of 640 px and over
- * and below it narrow, with « Plus » opening a disclosure of the others (no measurement).
- */
-export default function EditorTabs({
- active,
- tier,
- onSelect,
-}: EditorTabsProps) {
+/** The tablist proper: the shown tabs only, arrows move between them. */
+function TabList({ shown, active, onSelect }: TabListProps) {
const t = useT()
- const { shown, more } = tabsFor(tier)
- const [open, setOpen] = useState(false)
- const moreActive = more.includes(active)
-
const onKeyDown = (event: KeyboardEvent) => {
const at = shown.indexOf(active)
const step =
@@ -62,53 +56,63 @@ export default function EditorTabs({
onSelect(next)
document.getElementById(tabDomId(next))?.focus()
}
+ return (
+
+ {shown.map((tab) => (
+ onSelect(tab)}
+ className={`-mb-px ${BASE} ${tab === active ? ACTIVE : IDLE}`}
+ >
+ {t(`editor.tab.${tab}`)}
+
+
+ ))}
+
+ )
+}
+
+interface MoreTabsProps {
+ more: readonly EditorTabId[]
+ active: EditorTabId
+ onSelect: (tab: EditorTabId) => void
+}
+
+/** Below 640 px: « Plus » and its disclosure of the tabs that do not fit. */
+function MoreTabs({ more, active, onSelect }: MoreTabsProps) {
+ const t = useT()
+ const [open, setOpen] = useState(false)
const pick = (tab: EditorTabId) => {
onSelect(tab)
setOpen(false)
}
-
return (
-
-
-
- {shown.map((tab) => (
- onSelect(tab)}
- className={`-mb-px ${BASE} ${tab === active ? ACTIVE : IDLE}`}
- >
- {t(`editor.tab.${tab}`)}
-
-
- ))}
-
- {more.length > 0 && (
-
setOpen((value) => !value)}
- className={`-mb-px ${BASE} ${moreActive ? ACTIVE : IDLE}`}
- >
- {t('editor.tab.more')}
-
- )}
-
+ <>
+
setOpen((value) => !value)}
+ className={`-mb-px ${BASE} ${more.includes(active) ? ACTIVE : IDLE}`}
+ >
+ {t('editor.tab.more')}
+
{open && (
{more.map((tab) => (
@@ -126,6 +130,32 @@ export default function EditorTabs({
))}
)}
+ >
+ )
+}
+
+interface EditorTabsProps {
+ active: EditorTabId
+ tier: TabTier
+ onSelect: (tab: EditorTabId) => void
+}
+
+/**
+ * The draft's tab row (boards 04 and 05): the four tabs from 640 px, Annotations and
+ * Vérification below it with « Plus » opening a disclosure of the others (no measurement).
+ */
+export default function EditorTabs({
+ active,
+ tier,
+ onSelect,
+}: EditorTabsProps) {
+ const { shown, more } = tabsFor(tier)
+ return (
+
+
+ {more.length > 0 && (
+
+ )}
)
}
diff --git a/apps/app/src/components/editor/EditorWorkspace.tsx b/apps/app/src/components/editor/EditorWorkspace.tsx
new file mode 100644
index 00000000..9974be92
--- /dev/null
+++ b/apps/app/src/components/editor/EditorWorkspace.tsx
@@ -0,0 +1,115 @@
+import type { OfficialSheetAdmin } from '@faunosteo/supabase'
+import Notice from '@/components/ui/Notice'
+import {
+ AnnounceContext,
+ FocusConsumedContext,
+ ownedBy,
+ type PlaceName,
+} from '@/editor/focusRequest'
+import { saveFailureMessage } from '@/editor/messages'
+import type { EditorMode } from '@/editor/mode'
+import type { NavigationState } from '@/editor/navigation'
+import { useEditorStore } from '@/editor/state/editorStore'
+import { initialTab } from '@/editor/tabs'
+import { useEditorNavigation } from '@/editor/useEditorNavigation'
+import type { TabTier } from '@/editor/useViewport'
+import { useT } from '@/i18n/useT'
+import ConflictDialog from './ConflictDialog'
+import CopyIssueNotice from './CopyIssueNotice'
+import DraftHeader from './DraftHeader'
+import EditorTabBody from './EditorTabBody'
+import EditorTabs from './EditorTabs'
+import ModeNotice from './ModeNotice'
+import RecoveryNotice from './RecoveryNotice'
+import ReferencesPanel from './references/ReferencesPanel'
+
+interface Props {
+ sheet: OfficialSheetAdmin
+ mode: EditorMode
+ /** Not editable now: a mode that cannot save, or a recovery offer not answered yet. */
+ readOnly: boolean
+ tier: TabTier
+ reloadSheet: () => void
+}
+
+/** A refused save under the header, phrased from the closed kind and the copy's real flag. */
+function SaveFailureNotice() {
+ const t = useT()
+ const failure = useEditorStore((s) => s.saveFailure)
+ const unsaved = useEditorStore((s) => s.unsaved)
+ const copyWritten = useEditorStore((s) => s.copyWritten)
+ const conflictOpen = useEditorStore((s) => s.conflict !== null)
+ if (failure === null || (failure === 'draft_conflict' && conflictOpen))
+ return null
+ return (
+
+ {saveFailureMessage(t, failure, { unsaved, copyWritten })}
+
+ )
+}
+
+/** The `data-place` the shown tab and section name. */
+function shownPlace({ tab, section }: NavigationState): PlaceName {
+ return tab === 'annotations' ? `annotations.${section}` : tab
+}
+
+/**
+ * The draft page once the version is ready: header, notices, tab row, the references
+ * panel and the shown place. Owns the navigation state, so the first tab is known at
+ * mount (`initialTab`) and later edits never move the user off their tab.
+ */
+export default function EditorWorkspace(props: Props) {
+ const { sheet, mode, readOnly, tier, reloadSheet } = props
+ const previewState = useEditorStore((s) => s.previewState)
+ const nav = useEditorNavigation(
+ previewState ? initialTab(previewState, tier) : 'annotations',
+ )
+ const { state } = nav
+ const toggleReferences = (opener: HTMLElement) =>
+ state.references.open
+ ? nav.closeReferences()
+ : nav.openReferences(null, opener)
+ return (
+
+
+
+
+
+
+
+
+
+ {state.referencesMounted && (
+
+ )}
+
+
+
+
+ {nav.live}
+
+
+
+ )
+}
diff --git a/apps/app/src/components/editor/HeaderActions.tsx b/apps/app/src/components/editor/HeaderActions.tsx
new file mode 100644
index 00000000..c83b3104
--- /dev/null
+++ b/apps/app/src/components/editor/HeaderActions.tsx
@@ -0,0 +1,106 @@
+import { useState } from 'react'
+import Button from '@/components/ui/Button'
+import Icon from '@/components/ui/Icon'
+import { loadFailureMessage } from '@/editor/messages'
+import { useEditorStore } from '@/editor/state/editorStore'
+import { REFERENCES_BUTTON_ID } from '@/editor/tabs'
+import { useT } from '@/i18n/useT'
+import ConfirmDialog from './ConfirmDialog'
+import SaveLine from './SaveLine'
+
+interface Props {
+ /** Edit mode: « Abandonner » and « Enregistrer » are offered. */
+ editable: boolean
+ referencesOpen: boolean
+ onToggleReferences: (opener: HTMLElement) => void
+ /** A failed reload after a discard, worded for the notice under the header. */
+ onFailure: (message: string | null) => void
+}
+
+/** « Abandonner les modifications »: asks first, then the store reloads the server draft. */
+function DiscardButton({ onFailure }: Pick
) {
+ const t = useT()
+ const unsaved = useEditorStore((s) => s.unsaved)
+ const saving = useEditorStore((s) => s.saving)
+ const blocked = useEditorStore((s) => s.recovery !== 'none')
+ const [asking, setAsking] = useState(false)
+ const discard = async () => {
+ setAsking(false)
+ const result = await useEditorStore
+ .getState()
+ .discardChanges({ confirmed: true })
+ onFailure(
+ !result.ok && result.reason === 'load'
+ ? loadFailureMessage(t, result.failure)
+ : null,
+ )
+ }
+ return (
+ <>
+ setAsking(true)}
+ >
+ {t('editor.draft.discard')}
+
+ void discard()}
+ onCancel={() => setAsking(false)}
+ />
+ >
+ )
+}
+
+function SaveButton() {
+ const t = useT()
+ const unsaved = useEditorStore((s) => s.unsaved)
+ const saving = useEditorStore((s) => s.saving)
+ const blocked = useEditorStore((s) => s.recovery !== 'none')
+ return (
+ void useEditorStore.getState().save()}
+ >
+ {t('common.save')}
+
+ )
+}
+
+/** The right group of the header: references, the save line, discard and save. */
+export default function HeaderActions(props: Props) {
+ const t = useT()
+ return (
+
+ props.onToggleReferences(event.currentTarget)}
+ >
+
+ {t('editor.references.open')}
+
+
+
+ {props.editable && (
+ <>
+
+
+ >
+ )}
+
+ )
+}
diff --git a/apps/app/src/components/editor/SaveLine.tsx b/apps/app/src/components/editor/SaveLine.tsx
new file mode 100644
index 00000000..92104538
--- /dev/null
+++ b/apps/app/src/components/editor/SaveLine.tsx
@@ -0,0 +1,39 @@
+import { useEditorStore } from '@/editor/state/editorStore'
+import { useT } from '@/i18n/useT'
+
+type Translate = ReturnType
+
+interface Status {
+ copyIssue: 'cap' | 'quota' | null
+ saving: boolean
+ unsaved: boolean
+ revision: number
+}
+
+/** Board 04's line; only the copy failures replace it (the copy is temporary, this tab's). */
+function statusText(t: Translate, status: Status): string {
+ if (status.copyIssue !== null)
+ return t(`editor.draft.status.copy_${status.copyIssue}`)
+ if (status.saving) return t('editor.draft.status.saving')
+ const revision = t('editor.draft.status.revision').replace(
+ '{revision}',
+ String(status.revision),
+ )
+ return status.unsaved
+ ? `${revision} · ${t('editor.draft.status.unsaved')}`
+ : revision
+}
+
+/** The revision line with its unsaved state, announced politely when it changes. */
+export default function SaveLine() {
+ const t = useT()
+ const unsaved = useEditorStore((s) => s.unsaved)
+ const saving = useEditorStore((s) => s.saving)
+ const revision = useEditorStore((s) => s.savedRevision)
+ const copyIssue = useEditorStore((s) => s.copyIssue)
+ return (
+
+ {statusText(t, { copyIssue, saving, unsaved, revision })}
+
+ )
+}
diff --git a/apps/app/src/components/editor/annotations/CreationPanel.tsx b/apps/app/src/components/editor/annotations/CreationPanel.tsx
index eb1932f8..f68c1858 100644
--- a/apps/app/src/components/editor/annotations/CreationPanel.tsx
+++ b/apps/app/src/components/editor/annotations/CreationPanel.tsx
@@ -87,7 +87,13 @@ export default function CreationPanel(props: CreationPanelProps) {
data-testid="annotation-creation"
className="space-y-3 rounded-xl border border-[var(--color-border)] p-4"
>
- {title}
+
+ {title}
+
void
+ focus: EditorPlaceProps['focus']
}
/** What both columns read: the tab's state, the view, its frame and its selection. */
@@ -52,21 +54,46 @@ interface Scene {
frame: Frame | null
selected: Annotation | undefined
setRoot: (root: RootAttributes | null) => void
- onSelectTab: EditorTabProps['onSelectTab']
+ navigate: EditorPlaceProps['navigate']
+ onOpenSection: Props['onOpenSection']
}
-function useScene({ doc, onSelectTab, focus }: Props): Scene {
+/**
+ * The shown view no longer exists (an undo, a deletion in the views section): the full
+ * reset to the main view drops the pending creation, the tracing and the selection, so
+ * nothing pending is inserted on another view. It fires only for a view absent from the
+ * document, since `view` always returns a new state.
+ */
+function useViewFallback(
+ doc: AnatomicalSheetDocument,
+ shown: string | null,
+ dispatch: Dispatch,
+) {
+ useEffect(() => {
+ if (shown === null || doc.views.some((view) => view.id === shown)) return
+ const main = mainViewId(doc)
+ if (doc.views.some((view) => view.id === main)) {
+ dispatch({ type: 'view', viewId: main })
+ }
+ }, [doc, shown, dispatch])
+}
+
+function useScene({ doc, navigate, onOpenSection, focus }: Props): Scene {
const [ui, dispatch] = useReducer(uiReducer, initialUi)
- useFocusRequest(focus, (key) => {
- const target = annotationFocus(doc, key)
- if (!target) return
- dispatch({ type: 'view', viewId: target.viewId })
- dispatch({ type: 'select', id: target.annotationId })
- })
const [root, setRoot] = useState(null)
const viewId = ui.viewId ?? mainViewId(doc)
const model = useViewModel(doc, viewId)
const own = model.measured && root?.viewId === viewId
+ useViewFallback(doc, ui.viewId, dispatch)
+ useAnnotationRequest(focus, doc, {
+ viewId,
+ selectedId: ui.selectedId,
+ busy: ui.pending ? 'creation' : ui.tracing ? 'tracing' : null,
+ show: (view, id) => {
+ dispatch({ type: 'view', viewId: view })
+ dispatch({ type: 'select', id })
+ },
+ })
return {
doc,
ui,
@@ -76,7 +103,8 @@ function useScene({ doc, onSelectTab, focus }: Props): Scene {
frame: own ? parseFrame(root.viewBox) : null,
selected: model.annotations.find((a) => a.id === ui.selectedId),
setRoot,
- onSelectTab,
+ navigate,
+ onOpenSection,
}
}
@@ -123,7 +151,8 @@ function CanvasColumn({
hint={ui.hint}
model={model}
noCategory={noCategory}
- onSelectTab={scene.onSelectTab}
+ viewId={scene.viewId}
+ navigate={scene.navigate}
/>
{selected && }
@@ -217,7 +246,6 @@ function SidePanel({
scene: Scene
context: CommitContext
}) {
- const t = useT()
const { doc, ui, dispatch, model, frame, selected } = scene
if (ui.pending) {
return (
@@ -234,9 +262,13 @@ function SidePanel({
}
if (!selected) {
return (
-
- {t('editor.annotations.select_hint')}
-
+ dispatch({ type: 'view', viewId: id })}
+ onOpenSection={scene.onOpenSection}
+ />
)
}
return (
@@ -248,7 +280,7 @@ function SidePanel({
geometryLocked={!model.measured}
dispatch={dispatch}
context={context}
- onSelectTab={scene.onSelectTab}
+ navigate={scene.navigate}
/>
)
}
@@ -284,20 +316,24 @@ function ToolNotes({
hint,
model,
noCategory,
- onSelectTab,
+ viewId,
+ navigate,
}: {
tool: ToolId
hint: string | null
model: ViewModel
noCategory: boolean
- onSelectTab: EditorTabProps['onSelectTab']
+ viewId: string
+ navigate: EditorPlaceProps['navigate']
}) {
const t = useT()
const linkBlocked = tool === 'link' && model.children.length === 0
return (
{t(`editor.annotations.tool_hint.${tool}`)}
- {!model.measured &&
}
+ {!model.measured && (
+
+ )}
{noCategory &&
{t('editor.annotations.no_category')}
}
{linkBlocked &&
{t('editor.annotations.no_child_view')}
}
{hint && (
diff --git a/apps/app/src/components/editor/annotations/OverviewPanel.tsx b/apps/app/src/components/editor/annotations/OverviewPanel.tsx
new file mode 100644
index 00000000..d689afdc
--- /dev/null
+++ b/apps/app/src/components/editor/annotations/OverviewPanel.tsx
@@ -0,0 +1,190 @@
+import type {
+ AnatomicalSheetDocument,
+ SheetView,
+} from '@faunosteo/core-wasm/types'
+import { useOverviewCounts } from '@/editor/annotations/overview'
+import type { AnnotationSection } from '@/editor/navigation'
+import { usePlural } from '@/editor/plural'
+import { useT } from '@/i18n/useT'
+import { useLocaleStore } from '@/state/localeStore'
+
+const CARD = 'space-y-2 rounded-xl border border-[var(--color-border)] p-4'
+const TITLE = 'text-sm font-semibold'
+const ROW =
+ 'flex w-full items-center justify-between gap-2 rounded-lg px-3 py-2 text-left text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]'
+const ENTRY =
+ 'inline-flex min-h-11 items-center rounded-lg border border-[var(--color-border)] px-3 text-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]'
+
+export interface OverviewPanelProps {
+ doc: AnatomicalSheetDocument
+ /** The view the canvas shows. */
+ viewId: string
+ /** Read-only modes only consult: the entries read « Voir … ». */
+ readOnly: boolean
+ onSelectView: (viewId: string) => void
+ onOpenSection: (section: AnnotationSection, opener: HTMLElement) => void
+}
+
+function SectionEntry({
+ section,
+ label,
+ onOpen,
+}: {
+ section: AnnotationSection
+ label: string
+ onOpen: OverviewPanelProps['onOpenSection']
+}) {
+ return (
+
onOpen(section, event.currentTarget)}
+ className={ENTRY}
+ >
+ {label}
+
+ )
+}
+
+function ViewRow({
+ view,
+ current,
+ count,
+ onSelect,
+}: {
+ view: SheetView
+ current: boolean
+ count: number
+ onSelect: () => void
+}) {
+ const t = useT()
+ const plural = usePlural()
+ const locale = useLocaleStore((s) => s.locale)
+ return (
+
+
+
+
+ {view.name[locale]}
+
+
+ {t(
+ view.kind === 'main'
+ ? 'editor.overview.view_main'
+ : 'editor.overview.view_detail',
+ )}
+
+
+
+ {plural('editor.overview.annotations', count)}
+
+
+
+ )
+}
+
+function ViewsCard(props: OverviewPanelProps) {
+ const t = useT()
+ const { doc, viewId, readOnly, onSelectView, onOpenSection } = props
+ const counts = useOverviewCounts(doc)
+ return (
+
+
+ {t('editor.overview.views')}
+
+
+ {doc.views.map((view) => (
+ onSelectView(view.id)}
+ />
+ ))}
+
+
+
+ )
+}
+
+function CategoriesCard(props: OverviewPanelProps) {
+ const t = useT()
+ const plural = usePlural()
+ const locale = useLocaleStore((s) => s.locale)
+ const { doc, readOnly, onOpenSection } = props
+ const counts = useOverviewCounts(doc)
+ return (
+
+
+ {t('editor.overview.categories')}
+
+ {doc.categories.length === 0 && (
+
+ {t('editor.overview.categories_empty')}
+
+ )}
+
+ {doc.categories.map((category) => (
+
+
+ {category.name[locale]}
+
+ ))}
+
+
+
+ {/* T17 / BDR-102: no vertebra role exists before U6, so this entry is always shown. */}
+
+
+
+ )
+}
+
+/** Board 01's overview: the views and the categories, with the entries to their sections. */
+export default function OverviewPanel(props: OverviewPanelProps) {
+ const t = useT()
+ return (
+
+
+
+
+ )
+}
diff --git a/apps/app/src/components/editor/annotations/PropertiesPanel.tsx b/apps/app/src/components/editor/annotations/PropertiesPanel.tsx
index 929f0057..bc09e00f 100644
--- a/apps/app/src/components/editor/annotations/PropertiesPanel.tsx
+++ b/apps/app/src/components/editor/annotations/PropertiesPanel.tsx
@@ -15,7 +15,8 @@ import {
import { isEditable } from '@/editor/annotations/geometryEdit'
import type { UiAction } from '@/editor/annotations/uiState'
import { geometryErrorsById } from '@/editor/issues'
-import type { EditorTabId } from '@/editor/tabs'
+import { targetOfKey } from '@/editor/navigation'
+import type { EditorPlaceProps } from '@/editor/tabs'
import { useEditCommand } from '@/editor/useEditCommand'
import { useEditorStore } from '@/editor/state/editorStore'
import { useT } from '@/i18n/useT'
@@ -35,7 +36,7 @@ export interface PropertiesPanelProps {
geometryLocked: boolean
dispatch: Dispatch
context: CommitContext
- onSelectTab: (tab: EditorTabId) => void
+ navigate: EditorPlaceProps['navigate']
}
/** What still names this annotation as invalid: never hidden, never shown as valid. */
@@ -58,7 +59,11 @@ export default function PropertiesPanel(props: PropertiesPanelProps) {
className="space-y-4 rounded-xl border border-[var(--color-border)] p-4"
>
-
+
{t(`editor.annotations.kind.${annotation.kind}`)}
@@ -83,7 +88,9 @@ function GeometrySection(props: PropertiesPanelProps) {
const { geometry } = annotation
return (
- {geometryLocked && !readOnly &&
}
+ {geometryLocked && !readOnly && (
+
+ )}
{isEditable(geometry) ? (
) {
+ navigate,
+ viewId,
+}: Pick & { viewId: string }) {
const t = useT()
return (
@@ -166,9 +175,14 @@ export function UnmeasuredHint({
onSelectTab('views')}
+ onClick={(event) =>
+ navigate(
+ targetOfKey({ kind: 'view', id: viewId }),
+ event.currentTarget,
+ )
+ }
>
- {t('editor.tab.views')}
+ {t('editor.place.views')}
)
diff --git a/apps/app/src/components/editor/annotations/TracingBar.tsx b/apps/app/src/components/editor/annotations/TracingBar.tsx
index 68d97b31..ce9f28c1 100644
--- a/apps/app/src/components/editor/annotations/TracingBar.tsx
+++ b/apps/app/src/components/editor/annotations/TracingBar.tsx
@@ -15,7 +15,11 @@ export default function TracingBar({
const t = useT()
const plural = usePlural()
return (
-
+
{plural('editor.annotations.tracing', count)}
diff --git a/apps/app/src/components/editor/annotations/sections/AnnotationSection.tsx b/apps/app/src/components/editor/annotations/sections/AnnotationSection.tsx
new file mode 100644
index 00000000..6e304d20
--- /dev/null
+++ b/apps/app/src/components/editor/annotations/sections/AnnotationSection.tsx
@@ -0,0 +1,51 @@
+import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
+import Button from '@/components/ui/Button'
+import type { FocusRequest } from '@/editor/focusRequest'
+import type { AnnotationSection as SectionId } from '@/editor/navigation'
+import { useT } from '@/i18n/useT'
+import { ANNOTATION_SECTION_BODIES } from './registry'
+
+interface Props {
+ section: Exclude
+ doc: AnatomicalSheetDocument
+ readOnly: boolean
+ focus?: FocusRequest
+ onBack: () => void
+}
+
+/**
+ * A full-width Annotations section: « Retour au dessin » first, then its heading, then
+ * the body. The registry names the body, so a section is replaced without touching this
+ * frame or the navigation.
+ */
+export default function AnnotationSection({
+ section,
+ doc,
+ readOnly,
+ focus,
+ onBack,
+}: Props) {
+ const t = useT()
+ const { titleKey, Body } = ANNOTATION_SECTION_BODIES[section]
+ const headingId = `annotation-section-${section}-title`
+ return (
+
+
+ {t('editor.section.back')}
+
+
+ {t(titleKey)}
+
+
+
+ )
+}
diff --git a/apps/app/src/components/editor/tabs/VertebraeTab.tsx b/apps/app/src/components/editor/annotations/sections/RegionsSection.tsx
similarity index 77%
rename from apps/app/src/components/editor/tabs/VertebraeTab.tsx
rename to apps/app/src/components/editor/annotations/sections/RegionsSection.tsx
index 5c1c5cec..b7a8dc72 100644
--- a/apps/app/src/components/editor/tabs/VertebraeTab.tsx
+++ b/apps/app/src/components/editor/annotations/sections/RegionsSection.tsx
@@ -5,13 +5,19 @@ import DeleteDialog, {
import RegionForm from '@/components/editor/vertebrae/RegionForm'
import RegionRow from '@/components/editor/vertebrae/RegionRow'
import { useRowFocus } from '@/editor/focusRequest'
+import type { SectionBodyProps } from './registry'
import { useSheetDocument } from '@/editor/sheetDocument'
-import type { EditorTabProps } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
-/** Vertèbres: the vertebral regions (code, names, count, optional range), ordered. */
-export default function VertebraeTab({ readOnly, focus }: EditorTabProps) {
+/**
+ * Annotations, section Régions vertébrales: the regions (code, names, count, optional
+ * range), ordered. The level-1 editor, until the vertebra role replaces it (U6).
+ */
+export default function RegionsSection({
+ readOnly,
+ focus,
+}: Pick) {
const t = useT()
useRowFocus(focus)
const locale = useLocaleStore((s) => s.locale)
@@ -19,11 +25,7 @@ export default function VertebraeTab({ readOnly, focus }: EditorTabProps) {
const [deleting, setDeleting] = useState(null)
const regions = doc?.vertebral_config.regions ?? []
return (
-
+
{doc && regions.length === 0 && (
{t('editor.vertebra.empty')}
@@ -48,6 +50,6 @@ export default function VertebraeTab({ readOnly, focus }: EditorTabProps) {
{doc && !readOnly && }
setDeleting(null)} />
-
+
)
}
diff --git a/apps/app/src/components/editor/tabs/ViewsTab.tsx b/apps/app/src/components/editor/annotations/sections/ViewsSection.tsx
similarity index 82%
rename from apps/app/src/components/editor/tabs/ViewsTab.tsx
rename to apps/app/src/components/editor/annotations/sections/ViewsSection.tsx
index 33fabe7f..49d595f5 100644
--- a/apps/app/src/components/editor/tabs/ViewsTab.tsx
+++ b/apps/app/src/components/editor/annotations/sections/ViewsSection.tsx
@@ -6,16 +6,19 @@ import DetailViewForm from '@/components/editor/views/DetailViewForm'
import DetailViewRow from '@/components/editor/views/DetailViewRow'
import MainViewCard from '@/components/editor/views/MainViewCard'
import { useRowFocus } from '@/editor/focusRequest'
+import type { SectionBodyProps } from './registry'
import { useSheetDocument } from '@/editor/sheetDocument'
-import type { EditorTabProps } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
/**
- * Vues et illustrations: the main view and its drawing, the detail views (parent, own
- * drawing or crop), the upload of a drawing and the frame changes it brings.
+ * Annotations, section Vues: the main view and its drawing, the detail views (parent,
+ * own drawing or crop), the upload of a drawing and the frame changes it brings.
*/
-export default function ViewsTab({ readOnly, focus }: EditorTabProps) {
+export default function ViewsSection({
+ readOnly,
+ focus,
+}: Pick) {
const t = useT()
useRowFocus(focus)
const locale = useLocaleStore((s) => s.locale)
@@ -26,11 +29,7 @@ export default function ViewsTab({ readOnly, focus }: EditorTabProps) {
const main = views.find((view) => view.kind === 'main')
const details = views.filter((view) => view.kind === 'detail')
return (
-
+
{main?.kind === 'main' && (
)}
@@ -64,6 +63,6 @@ export default function ViewsTab({ readOnly, focus }: EditorTabProps) {
{doc && !readOnly && }
setDeleting(null)} />
-
+
)
}
diff --git a/apps/app/src/components/editor/annotations/sections/registry.ts b/apps/app/src/components/editor/annotations/sections/registry.ts
new file mode 100644
index 00000000..00d7c9b3
--- /dev/null
+++ b/apps/app/src/components/editor/annotations/sections/registry.ts
@@ -0,0 +1,29 @@
+import type { ComponentType } from 'react'
+import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
+import CategoriesSection from '@/components/editor/general/CategoriesSection'
+import type { FocusRequest } from '@/editor/focusRequest'
+import type { AnnotationSection } from '@/editor/navigation'
+import RegionsSection from './RegionsSection'
+import ViewsSection from './ViewsSection'
+
+/** What every section body receives from its frame. */
+export interface SectionBodyProps {
+ doc: AnatomicalSheetDocument
+ readOnly: boolean
+ focus?: FocusRequest
+}
+
+type SectionName = Exclude
+
+/**
+ * The one place later steps edit: U3 replaces `categories`, U4 replaces `views`, U6 adds
+ * the vertebra-role path and removes `regions` once the role exists.
+ */
+export const ANNOTATION_SECTION_BODIES: Record<
+ SectionName,
+ { titleKey: string; Body: ComponentType }
+> = {
+ views: { titleKey: 'editor.place.views', Body: ViewsSection },
+ categories: { titleKey: 'editor.place.categories', Body: CategoriesSection },
+ regions: { titleKey: 'editor.place.regions', Body: RegionsSection },
+}
diff --git a/apps/app/src/components/editor/findings/FindingTree.tsx b/apps/app/src/components/editor/findings/FindingTree.tsx
index c7ce8f20..a0848200 100644
--- a/apps/app/src/components/editor/findings/FindingTree.tsx
+++ b/apps/app/src/components/editor/findings/FindingTree.tsx
@@ -12,6 +12,8 @@ export interface FindingTreeProps {
onToggle: (id: string, open: boolean) => void
/** Moves focus to this item (after a deletion); null leaves focus alone. */
focusId: { id: string } | null
+ /** Called once the request has been applied, so it never replays on a later visit. */
+ onFocused: () => void
}
/**
@@ -23,14 +25,17 @@ export default function FindingTree(props: FindingTreeProps) {
const t = useT()
const refs = useRef(new Map())
const focusAfter = useRef(null)
- const { visible, selectedId, expanded, onSelect, onToggle, focusId } = props
+ const { visible, selectedId, expanded, onSelect, onToggle } = props
+ const { focusId, onFocused } = props
useEffect(() => {
if (focusAfter.current) refs.current.get(focusAfter.current)?.focus()
focusAfter.current = null
})
useEffect(() => {
- if (focusId) refs.current.get(focusId.id)?.focus()
- }, [focusId])
+ if (!focusId) return
+ refs.current.get(focusId.id)?.focus()
+ onFocused()
+ }, [focusId, onFocused])
const current = visible.find((item) => item.id === selectedId) ?? visible[0]
const onKeyDown = (event: KeyboardEvent, item: FindingItem) => {
const move = keyMove(visible, item, expanded, event.key)
diff --git a/apps/app/src/components/editor/general/CategoriesSection.tsx b/apps/app/src/components/editor/general/CategoriesSection.tsx
index 26952b2b..6160eb1e 100644
--- a/apps/app/src/components/editor/general/CategoriesSection.tsx
+++ b/apps/app/src/components/editor/general/CategoriesSection.tsx
@@ -9,7 +9,8 @@ import TextField from '@/components/editor/fields/TextField'
import DeleteDialog, {
type DeleteTarget,
} from '@/components/editor/DeleteDialog'
-import { FOCUS_CLASS, focusAttrs } from '@/editor/focusRequest'
+import { FOCUS_CLASS, focusAttrs, useRowFocus } from '@/editor/focusRequest'
+import type { FocusRequest } from '@/editor/navigation'
import { isBlank, nullable } from '@/editor/sheetDocument'
import { useEditCommand } from '@/editor/useEditCommand'
import type { Locale } from '@/i18n/types'
@@ -22,11 +23,14 @@ const CARD = 'rounded-lg border border-[var(--color-border)] p-3'
export default function CategoriesSection({
doc,
readOnly,
+ focus,
}: {
doc: AnatomicalSheetDocument
readOnly: boolean
+ focus?: FocusRequest
}) {
const t = useT()
+ useRowFocus(focus)
const locale = useLocaleStore((s) => s.locale)
const [deleting, setDeleting] = useState(null)
return (
diff --git a/apps/app/src/components/editor/references/ReferencesPanel.tsx b/apps/app/src/components/editor/references/ReferencesPanel.tsx
new file mode 100644
index 00000000..7fdbb56d
--- /dev/null
+++ b/apps/app/src/components/editor/references/ReferencesPanel.tsx
@@ -0,0 +1,93 @@
+import { useState, type KeyboardEvent } from 'react'
+import DeleteDialog, {
+ type DeleteTarget,
+} from '@/components/editor/DeleteDialog'
+import ReferenceForm from '@/components/editor/references/ReferenceForm'
+import ReferenceRow from '@/components/editor/references/ReferenceRow'
+import Icon from '@/components/ui/Icon'
+import { useRowFocus } from '@/editor/focusRequest'
+import { useSheetDocument } from '@/editor/sheetDocument'
+import type { EditorPlaceProps } from '@/editor/tabs'
+import { useT } from '@/i18n/useT'
+
+interface Props extends Pick {
+ open: boolean
+ onClose: () => void
+}
+
+/**
+ * The references side panel, minimal until Lot D: the sheet's bibliography, cited by id
+ * from the findings, opened by the header button. Not a dialog: it keeps the page usable.
+ * Mounted at the first opening and kept (hidden) afterwards.
+ */
+export default function ReferencesPanel({
+ readOnly,
+ focus,
+ open,
+ onClose,
+}: Props) {
+ const t = useT()
+ useRowFocus(focus)
+ const doc = useSheetDocument()
+ const [deleting, setDeleting] = useState(null)
+ const references = doc?.references ?? []
+ const onKeyDown = (event: KeyboardEvent) => {
+ if (event.key !== 'Escape' || event.defaultPrevented) return
+ event.stopPropagation()
+ onClose()
+ }
+ return (
+
+
+
+ {t('editor.place.references')}
+
+
+
+
+
+ {doc && references.length === 0 && (
+
+ {t('editor.reference.empty')}
+
+ )}
+
+ {references.map((reference, index) => (
+
+ setDeleting({
+ key: { kind: 'reference', id: reference.id },
+ label: reference.citation,
+ })
+ }
+ />
+ ))}
+
+ {doc && !readOnly && }
+ setDeleting(null)} />
+
+ )
+}
diff --git a/apps/app/src/components/editor/tabs/AnnotationsTab.tsx b/apps/app/src/components/editor/tabs/AnnotationsTab.tsx
index 8310918c..32ca9603 100644
--- a/apps/app/src/components/editor/tabs/AnnotationsTab.tsx
+++ b/apps/app/src/components/editor/tabs/AnnotationsTab.tsx
@@ -1,74 +1,112 @@
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
import CatalogueCanvas from '@/components/catalogue/CatalogueCanvas'
import AnnotationList, {
annotationName,
} from '@/components/editor/annotations/AnnotationList'
import EditableAnnotations from '@/components/editor/annotations/EditableAnnotations'
+import OverviewPanel from '@/components/editor/annotations/OverviewPanel'
import PropertiesPanel from '@/components/editor/annotations/PropertiesPanel'
+import AnnotationSection from '@/components/editor/annotations/sections/AnnotationSection'
import ViewSwitcher from '@/components/editor/annotations/ViewSwitcher'
import SelectionTag from '@/components/editor/annotations/SelectionTag'
-import { annotationFocus } from '@/editor/annotations/focusTarget'
+import { useAnnotationRequest } from '@/editor/annotations/focusTarget'
import { mainViewId, useViewModel } from '@/editor/annotations/useViewModel'
-import { useFocusRequest } from '@/editor/focusRequest'
+import type { AnnotationSection as SectionId } from '@/editor/navigation'
import { useSheetDocument } from '@/editor/sheetDocument'
import { useEditorStore } from '@/editor/state/editorStore'
-import type { EditorTabProps } from '@/editor/tabs'
+import type { EditorPlaceProps } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
+export interface AnnotationsTabProps extends EditorPlaceProps {
+ /** The section shown: the drawing workspace, or a full-width section. */
+ section: SectionId
+ onOpenSection: (section: SectionId, opener: HTMLElement) => void
+ onBack: () => void
+}
+
/**
- * Annotations: the canvas with its tools, the list of the view, the creation and
- * properties panels. Read-only, the same view is browsable (canvas, list, properties as
- * text) with no tool and no action.
+ * Annotations: the drawing workspace (canvas with its tools, the overview or the
+ * properties and creation panels), or one of its full-width sections. Read-only, the
+ * same view is browsable (canvas, list, properties as text) with no tool and no action.
*/
-export default function AnnotationsTab(props: EditorTabProps) {
+export default function AnnotationsTab(props: AnnotationsTabProps) {
const t = useT()
const doc = useSheetDocument()
const preview = useEditorStore((s) => s.preview)
+ const { section, readOnly, focus, navigate, onOpenSection, onBack } = props
+ if (section !== 'drawing') {
+ if (!doc) return null
+ return (
+
+ )
+ }
+ const body = { doc, navigate, onOpenSection, focus }
return (
- {doc && preview && props.readOnly && (
-
+ {doc && preview && readOnly && (
+
)}
- {doc && preview && !props.readOnly && (
-
+ {doc && preview && !readOnly && (
+
)}
)
}
+/** The shown view is gone (an undo elsewhere): back to the main view, selection cleared. */
+function useViewFallback(
+ doc: AnatomicalSheetDocument,
+ shown: string,
+ setViewId: (id: string) => void,
+ setSelectedId: (id: string | null) => void,
+) {
+ useEffect(() => {
+ if (doc.views.some((view) => view.id === shown)) return
+ const main = mainViewId(doc)
+ if (!doc.views.some((view) => view.id === main)) return
+ setViewId(main)
+ setSelectedId(null)
+ }, [doc, shown, setViewId, setSelectedId])
+}
+
function ReadOnlyAnnotations({
doc,
- onSelectTab,
+ navigate,
+ onOpenSection,
focus,
}: {
doc: AnatomicalSheetDocument
- onSelectTab: EditorTabProps['onSelectTab']
- focus: EditorTabProps['focus']
+ navigate: EditorPlaceProps['navigate']
+ onOpenSection: AnnotationsTabProps['onOpenSection']
+ focus: EditorPlaceProps['focus']
}) {
const locale = useLocaleStore((s) => s.locale)
const preview = useEditorStore((s) => s.preview)
const handleVersion = useEditorStore((s) => s.handleVersion)
const [viewId, setViewId] = useState(mainViewId(doc))
const [selectedId, setSelectedId] = useState(null)
- useFocusRequest(focus, (key) => {
- const target = annotationFocus(doc, key)
- if (!target) return
- setViewId(target.viewId)
- setSelectedId(target.annotationId)
+ useViewFallback(doc, viewId, setViewId, setSelectedId)
+ useAnnotationRequest(focus, doc, {
+ viewId,
+ selectedId,
+ busy: null,
+ show: (view, id) => {
+ setViewId(view)
+ setSelectedId(id)
+ },
})
const model = useViewModel(doc, viewId)
const view = doc.views.find((v) => v.id === viewId)
@@ -106,7 +144,7 @@ function ReadOnlyAnnotations({
onSelect={setSelectedId}
/>
- {selected && (
+ {selected ? (
undefined}
context={{ t: (key) => key, locale }}
- onSelectTab={onSelectTab}
+ navigate={navigate}
+ />
+ ) : (
+ {
+ setViewId(id)
+ setSelectedId(null)
+ }}
+ onOpenSection={onOpenSection}
/>
)}
diff --git a/apps/app/src/components/editor/tabs/FindingsTab.tsx b/apps/app/src/components/editor/tabs/FindingsTab.tsx
index 265c880b..27953616 100644
--- a/apps/app/src/components/editor/tabs/FindingsTab.tsx
+++ b/apps/app/src/components/editor/tabs/FindingsTab.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
import DeleteDialog, {
type DeleteTarget,
} from '@/components/editor/DeleteDialog'
@@ -20,7 +20,7 @@ import {
import { useFocusRequest } from '@/editor/focusRequest'
import { useEditorStore } from '@/editor/state/editorStore'
import { useSheetDocument } from '@/editor/sheetDocument'
-import type { EditorTabProps } from '@/editor/tabs'
+import type { EditorPlaceProps } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
@@ -34,18 +34,41 @@ function currentItems(): FindingItem[] {
}
}
-/** Constats: the tree zones → categories → nodes, edited one command at a time. */
-export default function FindingsTab({ readOnly, focus }: EditorTabProps) {
- const t = useT()
+/** The deletion flow: the target, the item to select after it, and the focus left behind. */
+function useFindingDeletion(
+ items: readonly FindingItem[],
+ selectedId: string | null,
+ select: (id: string | null) => void,
+ focusItem: (id: string | null) => void,
+) {
const locale = useLocaleStore((s) => s.locale)
+ const [deleting, setDeleting] = useState(null)
+ const [fallback, setFallback] = useState(null)
+ const askDelete = (item: FindingItem) => {
+ setFallback(fallbackAfterRemoval(items, item))
+ setDeleting({ key: item.key, label: item.name[locale] })
+ }
+ const closeDelete = () => {
+ setDeleting(null)
+ const gone = !currentItems().some((item) => item.id === selectedId)
+ if (gone) {
+ select(fallback)
+ focusItem(fallback)
+ }
+ }
+ return { deleting, askDelete, closeDelete }
+}
+
+/** Constats: the tree zones → categories → nodes, edited one command at a time. */
+export default function FindingsTab({ readOnly, focus }: EditorPlaceProps) {
+ const t = useT()
const doc = useSheetDocument()
const [selectedId, setSelectedId] = useState(null)
const [expanded, setExpanded] = useState>(new Set())
const [seeded, setSeeded] = useState(false)
const [pending, setPending] = useState(null)
- const [fallback, setFallback] = useState(null)
const [focusId, setFocusId] = useState<{ id: string } | null>(null)
- const [deleting, setDeleting] = useState(null)
+ const clearFocusId = useCallback(() => setFocusId(null), [])
const items = useMemo(() => (doc ? buildItems(doc) : []), [doc])
if (doc && !seeded) {
setSeeded(true)
@@ -65,12 +88,13 @@ export default function FindingsTab({ readOnly, focus }: EditorTabProps) {
return next
})
}
- useFocusRequest(focus, (key) => {
- const found = itemForKey(items, key)
- if (!found) return
+ useFocusRequest(focus, (target) => {
+ const found = target.key && itemForKey(items, target.key)
+ if (!found) return 'none'
setExpanded((prev) => new Set([...prev, ...found.ancestors]))
setSelectedId(found.item.id)
setFocusId({ id: found.item.id })
+ return 'found'
})
const created = (id: string, parent: FindingItem | null) => {
if (!pending) return
@@ -78,18 +102,12 @@ export default function FindingsTab({ readOnly, focus }: EditorTabProps) {
setSelectedId(createdItemId(pending.kind, parent, id))
setPending(null)
}
- const askDelete = (item: FindingItem) => {
- setFallback(fallbackAfterRemoval(items, item))
- setDeleting({ key: item.key, label: item.name[locale] })
- }
- const closeDelete = () => {
- setDeleting(null)
- const gone = !currentItems().some((item) => item.id === selectedId)
- if (gone) {
- setSelectedId(fallback)
- setFocusId(fallback ? { id: fallback } : null)
- }
- }
+ const { deleting, askDelete, closeDelete } = useFindingDeletion(
+ items,
+ selectedId,
+ setSelectedId,
+ (id) => setFocusId(id ? { id } : null),
+ )
return (
{selected && (
-
>
)}
diff --git a/apps/app/src/components/editor/tabs/ReferencesTab.tsx b/apps/app/src/components/editor/tabs/ReferencesTab.tsx
deleted file mode 100644
index 832b9561..00000000
--- a/apps/app/src/components/editor/tabs/ReferencesTab.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { useState } from 'react'
-import DeleteDialog, {
- type DeleteTarget,
-} from '@/components/editor/DeleteDialog'
-import ReferenceForm from '@/components/editor/references/ReferenceForm'
-import ReferenceRow from '@/components/editor/references/ReferenceRow'
-import { useRowFocus } from '@/editor/focusRequest'
-import { useSheetDocument } from '@/editor/sheetDocument'
-import type { EditorTabProps } from '@/editor/tabs'
-import { useT } from '@/i18n/useT'
-
-/** Références: the sheet's bibliography, cited by id from the findings. */
-export default function ReferencesTab({ readOnly, focus }: EditorTabProps) {
- const t = useT()
- useRowFocus(focus)
- const doc = useSheetDocument()
- const [deleting, setDeleting] = useState(null)
- const references = doc?.references ?? []
- return (
-
- {doc && references.length === 0 && (
-
- {t('editor.reference.empty')}
-
- )}
-
- {references.map((reference, index) => (
-
- setDeleting({
- key: { kind: 'reference', id: reference.id },
- label: reference.citation,
- })
- }
- />
- ))}
-
- {doc && !readOnly && }
- setDeleting(null)} />
-
- )
-}
diff --git a/apps/app/src/components/editor/tabs/VerificationTab.tsx b/apps/app/src/components/editor/tabs/VerificationTab.tsx
index ca435571..782faae2 100644
--- a/apps/app/src/components/editor/tabs/VerificationTab.tsx
+++ b/apps/app/src/components/editor/tabs/VerificationTab.tsx
@@ -13,23 +13,16 @@ import VerificationSummary from '@/components/editor/verification/VerificationSu
import Notice from '@/components/ui/Notice'
import { useEditorStore } from '@/editor/state/editorStore'
import { useSheetDocument } from '@/editor/sheetDocument'
-import type { EditorTabProps } from '@/editor/tabs'
+import type { EditorPlaceProps } from '@/editor/tabs'
import { splitIssues } from '@/editor/verification'
import { useT } from '@/i18n/useT'
-interface PanelProps extends EditorTabProps {
+interface PanelProps extends EditorPlaceProps {
report: SheetReport
doc: AnatomicalSheetDocument
}
-function Panel({
- report,
- doc,
- readOnly,
- onSelectTab,
- onGoTo,
- reloadSheet,
-}: PanelProps) {
+function Panel({ report, doc, readOnly, navigate, reloadSheet }: PanelProps) {
const t = useT()
const { errors, warnings } = splitIssues(report)
const { to_confirm } = report.completeness.statuses
@@ -43,25 +36,13 @@ function Panel({
{errors.length + warnings.length === 0 && (
{t('editor.verification.none')}
)}
-
+
{warnings.length > 0 && (
{t('editor.verification.warnings_title')}
)}
-
+
{to_confirm > 0 && (
{t('editor.verification.to_confirm_info')}
)}
@@ -76,7 +57,7 @@ function Panel({
}
/** Vérification: the in-page check of the draft (not the server's verdict) and its submission. */
-export default function VerificationTab(props: EditorTabProps) {
+export default function VerificationTab(props: EditorPlaceProps) {
const t = useT()
const report = useEditorStore((s) => s.previewState?.report)
const doc = useSheetDocument()
diff --git a/apps/app/src/components/editor/verification/IssueList.tsx b/apps/app/src/components/editor/verification/IssueList.tsx
index cdd716a7..8aabc60b 100644
--- a/apps/app/src/components/editor/verification/IssueList.tsx
+++ b/apps/app/src/components/editor/verification/IssueList.tsx
@@ -1,12 +1,11 @@
import type {
AnatomicalSheetDocument,
- ElementKey,
SheetIssue,
} from '@faunosteo/core-wasm/types'
import Button from '@/components/ui/Button'
import Notice from '@/components/ui/Notice'
-import { issueMessageKey, issueTarget } from '@/editor/verification'
-import type { EditorTabId } from '@/editor/tabs'
+import { issueMessageKey, issueTarget, placeKey } from '@/editor/verification'
+import type { EditorPlaceProps } from '@/editor/tabs'
import { useT } from '@/i18n/useT'
import { useLocaleStore } from '@/state/localeStore'
@@ -14,8 +13,7 @@ interface IssueListProps {
issues: readonly SheetIssue[]
tone: 'error' | 'info'
doc: AnatomicalSheetDocument
- onSelectTab: (tab: EditorTabId) => void
- onGoTo?: (tab: EditorTabId, key: ElementKey) => void
+ navigate: EditorPlaceProps['navigate']
}
/** One notice per issue: the page's own message, the element's name, « Aller à … ». */
@@ -23,8 +21,7 @@ export default function IssueList({
issues,
tone,
doc,
- onSelectTab,
- onGoTo,
+ navigate,
}: IssueListProps) {
const t = useT()
const locale = useLocaleStore((s) => s.locale)
@@ -47,15 +44,13 @@ export default function IssueList({
size="sm"
variant="secondary"
className="mt-2"
- onClick={() =>
- target.key && onGoTo
- ? onGoTo(target.tab, target.key)
- : onSelectTab(target.tab)
+ onClick={(event) =>
+ navigate(target.target, event.currentTarget)
}
>
{t('editor.verification.goto').replace(
'{tab}',
- target.name ?? t(`editor.tab.${target.tab}`),
+ target.name ?? t(placeKey(target.target)),
)}
)}
diff --git a/apps/app/src/editor/annotations/focusTarget.ts b/apps/app/src/editor/annotations/focusTarget.ts
index c0367234..e098a086 100644
--- a/apps/app/src/editor/annotations/focusTarget.ts
+++ b/apps/app/src/editor/annotations/focusTarget.ts
@@ -1,20 +1,81 @@
+import { useContext, useEffect, useRef } from 'react'
import type {
AnatomicalSheetDocument,
ElementKey,
} from '@faunosteo/core-wasm/types'
+import {
+ AnnounceContext,
+ useFocusRequest,
+ visibleElement,
+ type FocusRequest,
+} from '../focusRequest'
+import { useT } from '@/i18n/useT'
-/** What « Aller à … » seeds in the Annotations tab: a view, and maybe an annotation. */
+/** What « Aller à … » seeds on the drawing: the view and the annotation a key names. */
export function annotationFocus(
doc: AnatomicalSheetDocument,
key: ElementKey,
-): { viewId: string; annotationId: string | null } | null {
- if (key.kind === 'view') {
- const view = doc.views.find((v) => v.id === key.id)
- return view ? { viewId: view.id, annotationId: null } : null
- }
+): { viewId: string; annotationId: string } | null {
if (key.kind !== 'annotation') return null
const annotation = doc.annotations.find((a) => a.id === key.id)
return annotation
? { viewId: annotation.view_id, annotationId: annotation.id }
: null
}
+
+/** What the request needs to know of the drawing, and the one thing it may do to it. */
+export interface DrawingState {
+ viewId: string
+ selectedId: string | null
+ /** A creation or a tracing in progress: the request is kept, not served. */
+ busy: 'creation' | 'tracing' | null
+ show: (viewId: string, annotationId: string) => void
+}
+
+const BUSY_TARGET = {
+ creation: '[data-creation-heading]',
+ tracing: '[data-testid="tracing-bar"]',
+} as const
+
+const focusFirst = (selector: string) => visibleElement(selector)?.focus()
+
+/**
+ * « Aller à » an annotation on the drawing: shows its view, selects it, then focuses the
+ * properties heading once it has rendered. While a creation or a tracing is in progress
+ * the request is kept: nothing is dispatched (it would drop the work), the panel or bar
+ * takes the focus and the live region says why.
+ */
+export function useAnnotationRequest(
+ focus: FocusRequest | undefined,
+ doc: AnatomicalSheetDocument,
+ drawing: DrawingState,
+): void {
+ const t = useT()
+ const announce = useContext(AnnounceContext)
+ const awaiting = useRef(null)
+ useFocusRequest(focus, (target) => {
+ const found = target.key ? annotationFocus(doc, target.key) : null
+ if (!found) return 'none'
+ if (drawing.busy) {
+ announce(t(`editor.live.${drawing.busy}_kept`))
+ focusFirst(BUSY_TARGET[drawing.busy])
+ return 'kept'
+ }
+ const same =
+ drawing.selectedId === found.annotationId &&
+ drawing.viewId === found.viewId
+ if (same) focusFirst('[data-properties-heading]')
+ else {
+ awaiting.current = found.annotationId
+ drawing.show(found.viewId, found.annotationId)
+ }
+ return 'found'
+ })
+ useEffect(() => {
+ if (awaiting.current === null || drawing.selectedId !== awaiting.current) {
+ return
+ }
+ awaiting.current = null
+ focusFirst('[data-properties-heading]')
+ })
+}
diff --git a/apps/app/src/editor/annotations/overview.ts b/apps/app/src/editor/annotations/overview.ts
new file mode 100644
index 00000000..5a8a5d9e
--- /dev/null
+++ b/apps/app/src/editor/annotations/overview.ts
@@ -0,0 +1,26 @@
+import { useMemo } from 'react'
+import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
+
+/**
+ * What the overview panel counts, read once per parsed document: the annotations of each
+ * view and the vertebral regions. A display count, no rule: no core call, no network.
+ */
+export interface OverviewCounts {
+ annotationsByView: ReadonlyMap
+ regions: number
+}
+
+export function overviewCounts(doc: AnatomicalSheetDocument): OverviewCounts {
+ const annotationsByView = new Map()
+ for (const annotation of doc.annotations) {
+ const count = annotationsByView.get(annotation.view_id) ?? 0
+ annotationsByView.set(annotation.view_id, count + 1)
+ }
+ return { annotationsByView, regions: doc.vertebral_config.regions.length }
+}
+
+export function useOverviewCounts(
+ doc: AnatomicalSheetDocument,
+): OverviewCounts {
+ return useMemo(() => overviewCounts(doc), [doc])
+}
diff --git a/apps/app/src/editor/focusRequest.ts b/apps/app/src/editor/focusRequest.ts
index 17ad3fad..666cfbd9 100644
--- a/apps/app/src/editor/focusRequest.ts
+++ b/apps/app/src/editor/focusRequest.ts
@@ -1,10 +1,38 @@
import { createContext, useContext, useEffect, useRef } from 'react'
import type { ElementKey } from '@faunosteo/core-wasm/types'
+import type {
+ AnnotationSection,
+ EditorTarget,
+ FocusRequest,
+} from './navigation'
+import type { EditorTabId } from './tabs'
-/** « Aller à … »: the element to show and a serial so each request is consumed once. */
-export interface FocusRequest {
- key: ElementKey
- serial: number
+export type { FocusRequest }
+
+/**
+ * What a place did with a request: `found` the element and focused it, `kept` a creation
+ * or tracing in progress instead of jumping, `none` when it holds no such element.
+ */
+export type FocusOutcome = 'found' | 'kept' | 'none'
+
+/** The `data-place` name of the place a target shows. */
+export type PlaceName =
+ | EditorTabId
+ | `annotations.${AnnotationSection}`
+ | 'references'
+
+export function placeOf(target: EditorTarget): PlaceName {
+ if (target.place === 'references') return 'references'
+ if (target.tab !== 'annotations') return target.tab
+ return `annotations.${target.section ?? 'drawing'}`
+}
+
+/** The request, only when `place` is the one its target names (a hidden place never answers). */
+export function ownedBy(
+ focus: FocusRequest | undefined,
+ place: PlaceName,
+): FocusRequest | undefined {
+ return focus && placeOf(focus.target) === place ? focus : undefined
}
/** The attributes that make a row of a list reachable by a focus request. */
@@ -19,37 +47,73 @@ export function focusAttrs(key: ElementKey) {
export const FOCUS_CLASS =
'focus:outline focus:outline-2 focus:outline-[var(--color-accent)]'
-/** The route's answer to a consumed request: it clears it, so a remounted tab never replays. */
-export const FocusConsumedContext = createContext<(serial: number) => void>(
+/** The workspace's answer to a handled request: it clears it, so a remount never replays. */
+export const FocusConsumedContext = createContext<
+ (serial: number, outcome: FocusOutcome) => void
+>(() => undefined)
+
+/** Says something to the polite live region of the workspace. */
+export const AnnounceContext = createContext<(text: string) => void>(
() => undefined,
)
-/** Runs `apply` once per request, after the tab has rendered, then reports it consumed. */
+/**
+ * Runs `apply` once per request, after the place has rendered, then reports the outcome.
+ * The workspace passes a request only to the place its target names.
+ */
export function useFocusRequest(
focus: FocusRequest | undefined,
- apply: (key: ElementKey) => void,
+ apply: (target: EditorTarget) => FocusOutcome,
): void {
const handled = useRef(null)
const consumed = useContext(FocusConsumedContext)
useEffect(() => {
if (!focus || handled.current === focus.serial) return
handled.current = focus.serial
- apply(focus.key)
- consumed(focus.serial)
+ consumed(focus.serial, apply(focus.target))
}, [focus, apply, consumed])
}
-/** Scrolls to and focuses the row tagged with `key`. */
-export function focusRow(key: ElementKey): void {
+/** The first element matching `selector` that no hidden place contains. */
+export function visibleElement(selector: string): HTMLElement | null {
+ const found = [...document.querySelectorAll(selector)]
+ return found.find((element) => !element.closest('[hidden]')) ?? null
+}
+
+/** Scrolls to and focuses the visible row tagged with `key`; false when there is none. */
+export function focusRow(key: ElementKey): boolean {
const wanted = JSON.stringify(key)
const row = [
...document.querySelectorAll('[data-focus-key]'),
- ].find((candidate) => candidate.dataset.focusKey === wanted)
- row?.scrollIntoView?.({ block: 'center' })
- row?.focus()
+ ].find(
+ (candidate) =>
+ candidate.dataset.focusKey === wanted && !candidate.closest('[hidden]'),
+ )
+ if (!row) return false
+ row.scrollIntoView?.({ block: 'center' })
+ row.focus()
+ return true
}
-/** Row-based tabs (Général, Vues, Références, Vertèbres): focus the named row. */
+/** Row-based places (Général, Vues, Catégories, Régions, Références): focus the named row. */
export function useRowFocus(focus: FocusRequest | undefined): void {
- useFocusRequest(focus, focusRow)
+ useFocusRequest(focus, (target) =>
+ target.key && focusRow(target.key) ? 'found' : 'none',
+ )
+}
+
+/**
+ * Commits the text being typed before a place is left: blurs the focused field, so its
+ * `TextField` commits on blur. Safari and iPadOS do not move the focus to a tapped button,
+ * so the blur is forced rather than assumed.
+ */
+export function commitFocusedField(): void {
+ const active = document.activeElement
+ if (
+ active instanceof HTMLInputElement ||
+ active instanceof HTMLTextAreaElement ||
+ active instanceof HTMLSelectElement
+ ) {
+ active.blur()
+ }
}
diff --git a/apps/app/src/editor/tabs.ts b/apps/app/src/editor/tabs.ts
index 1387d333..9dfd271e 100644
--- a/apps/app/src/editor/tabs.ts
+++ b/apps/app/src/editor/tabs.ts
@@ -1,15 +1,12 @@
-import type { ElementKey, PreviewState } from '@faunosteo/core-wasm/types'
-import type { FocusRequest } from './focusRequest'
+import type { PreviewState } from '@faunosteo/core-wasm/types'
+import type { EditorTarget, FocusRequest } from './navigation'
import { unmeasuredViews } from './issues'
import type { TabTier } from './useViewport'
export const EDITOR_TABS = [
'general',
- 'views',
'annotations',
'findings',
- 'references',
- 'vertebrae',
'verification',
] as const
export type EditorTabId = (typeof EDITOR_TABS)[number]
@@ -17,7 +14,7 @@ export type EditorTabId = (typeof EDITOR_TABS)[number]
/** Board 05: the tabs shown beside « Plus » at each width; the rest sit under « Plus ». */
const SHOWN: Record = {
wide: EDITOR_TABS,
- medium: ['general', 'annotations', 'findings', 'verification'],
+ medium: EDITOR_TABS,
small: ['annotations', 'verification'],
}
@@ -40,16 +37,21 @@ export function initialTab(state: PreviewState, tier: TabTier): EditorTabId {
return SHOWN[tier].includes(wanted) ? wanted : 'annotations'
}
-/** Props of every tab body (Lots F-J fill them): read-only flag, tab jump, sheet reload. */
-export interface EditorTabProps {
+/** Props of every place (tab body, Annotations section, references panel). */
+export interface EditorPlaceProps {
/** Not editable now: a mode that cannot save, or a recovery offer not answered yet. */
readOnly: boolean
- /** « Aller à … » and any link between tabs. */
- onSelectTab: (tab: EditorTabId) => void
- /** « Aller à … » with an element: the tab seeds its own selection from it once. */
+ /** « Aller à … » and any link between places; `opener` takes the focus back on return. */
+ navigate: (target: EditorTarget, opener?: HTMLElement | null) => void
+ /** « Aller à … » with an element: the place seeds its own selection from it once. */
focus?: FocusRequest
- /** Switches tab and asks it to show the element. */
- onGoTo?: (tab: EditorTabId, key: ElementKey) => void
/** Reads the sheet's overview again (after a submission: the round freezes the draft). */
reloadSheet: () => void
}
+
+export const tabDomId = (tab: EditorTabId) => `editor-tab-${tab}`
+export const panelDomId = (tab: EditorTabId) => `editor-panel-${tab}`
+/** The « Plus » disclosure button, focused when the active tab sits under it. */
+export const MORE_BUTTON_ID = 'editor-tabs-more-button'
+/** The header button that toggles the references panel. */
+export const REFERENCES_BUTTON_ID = 'editor-references-button'
diff --git a/apps/app/src/editor/useEditorNavigation.ts b/apps/app/src/editor/useEditorNavigation.ts
new file mode 100644
index 00000000..5d9b6daa
--- /dev/null
+++ b/apps/app/src/editor/useEditorNavigation.ts
@@ -0,0 +1,246 @@
+import {
+ useCallback,
+ useEffect,
+ useReducer,
+ useRef,
+ useState,
+ type Dispatch,
+ type RefObject,
+} from 'react'
+import type { ElementKey } from '@faunosteo/core-wasm/types'
+import { useT } from '@/i18n/useT'
+import {
+ commitFocusedField,
+ placeOf,
+ visibleElement,
+ type FocusOutcome,
+ type PlaceName,
+} from './focusRequest'
+import {
+ initialNavigation,
+ navigationReducer,
+ type AnnotationSection,
+ type EditorTarget,
+ type NavigationAction,
+ type NavigationState,
+} from './navigation'
+import {
+ MORE_BUTTON_ID,
+ REFERENCES_BUTTON_ID,
+ tabDomId,
+ type EditorTabId,
+} from './tabs'
+
+type MoveKind =
+ | 'go_to'
+ | 'section'
+ | 'back'
+ | 'references'
+ | 'references_closed'
+
+/** A programmatic move: a new object per move, so the effect after it runs once. */
+interface Move {
+ kind: MoveKind
+}
+
+type Opener = HTMLElement | null | undefined
+
+export interface EditorNavigation {
+ state: NavigationState
+ /** The polite live region's text; a repeat alternates a trailing no-break space. */
+ live: string
+ navigate: (target: EditorTarget, opener?: Opener) => void
+ selectTab: (tab: EditorTabId) => void
+ openSection: (section: AnnotationSection, opener?: Opener) => void
+ backToDrawing: () => void
+ openReferences: (citedBy: ElementKey | null, opener?: Opener) => void
+ closeReferences: () => void
+ consumed: (serial: number, outcome: FocusOutcome) => void
+ announce: (text: string) => void
+}
+
+const isShown = (element: HTMLElement | null): boolean =>
+ element !== null && element.isConnected && !element.closest('[hidden]')
+
+const headingOf = (place: PlaceName) =>
+ visibleElement(`[data-place="${place}"] [data-place-heading]`)
+
+const CANVAS_BOX =
+ '[data-place="annotations.drawing"] [role="group"][tabindex="0"]'
+
+/** The tab's button, or « Plus » while the tab sits in the closed list. */
+const tabButton = (tab: EditorTabId) =>
+ document.getElementById(tabDomId(tab)) ??
+ document.getElementById(MORE_BUTTON_ID)
+
+/** The place the shown tab and section name. */
+function shownPlace(state: NavigationState): PlaceName {
+ return state.tab === 'annotations'
+ ? `annotations.${state.section}`
+ : state.tab
+}
+
+/** The text the live region says for a move to `target`. */
+function useMoveText(): (target: EditorTarget) => string {
+ const t = useT()
+ return useCallback(
+ (target) => {
+ if (target.place === 'references') return t('editor.place.references')
+ const tab = t(`editor.tab.${target.tab}`)
+ if (!target.section) return tab
+ return `${tab} · ${t(`editor.place.${target.section}`)}`
+ },
+ [t],
+ )
+}
+
+function useLiveRegion() {
+ const [live, setLive] = useState('')
+ const announce = useCallback((text: string) => {
+ setLive((previous) => (previous === text ? `${text} ` : text))
+ }, [])
+ return { live, announce }
+}
+
+interface Openers {
+ references: RefObject
+ section: RefObject
+}
+
+/** The commands of the workspace: each commits the typed text, then moves. */
+function useMoves(
+ dispatch: Dispatch,
+ announce: (text: string) => void,
+ openers: Openers,
+) {
+ const t = useT()
+ const moveText = useMoveText()
+ const [move, setMove] = useState(null)
+ const go = useCallback(
+ (action: NavigationAction, kind: MoveKind, text: string) => {
+ commitFocusedField()
+ announce(text)
+ dispatch(action)
+ setMove({ kind })
+ },
+ [announce, dispatch],
+ )
+ const navigate = useCallback(
+ (target: EditorTarget, opener?: Opener) => {
+ if (target.place === 'references') {
+ openers.references.current = opener ?? null
+ }
+ go({ type: 'go_to', target }, 'go_to', moveText(target))
+ },
+ [go, moveText, openers],
+ )
+ const openSection = useCallback(
+ (section: AnnotationSection, opener?: Opener) => {
+ openers.section.current = opener ?? null
+ const text = `${t('editor.tab.annotations')} · ${t(`editor.place.${section}`)}`
+ go({ type: 'open_section', section }, 'section', text)
+ },
+ [go, openers, t],
+ )
+ const backToDrawing = useCallback(() => {
+ const text = `${t('editor.tab.annotations')} · ${t('editor.place.drawing')}`
+ go({ type: 'back_to_drawing' }, 'back', text)
+ }, [go, t])
+ const openReferences = useCallback(
+ (citedBy: ElementKey | null, opener?: Opener) => {
+ openers.references.current = opener ?? null
+ const action = { type: 'open_references', citedBy } as const
+ go(action, 'references', t('editor.place.references'))
+ },
+ [go, openers, t],
+ )
+ const closeReferences = useCallback(() => {
+ const text = t('editor.live.references_closed')
+ go({ type: 'close_references' }, 'references_closed', text)
+ }, [go, t])
+ return {
+ move,
+ navigate,
+ openSection,
+ backToDrawing,
+ openReferences,
+ closeReferences,
+ }
+}
+
+/** « Retour au dessin »: the entry that opened the section, else the canvas box. */
+function backTarget(opener: HTMLElement | null): HTMLElement | null {
+ if (opener && isShown(opener)) return opener
+ const entry = opener?.dataset.sectionEntry
+ const again = entry && visibleElement(`[data-section-entry="${entry}"]`)
+ return again || visibleElement(CANVAS_BOX)
+}
+
+/** Where the focus lands after a programmatic move; never `body`. */
+function landingOf(move: Move, state: NavigationState): HTMLElement | null {
+ if (move.kind === 'references') return headingOf('references')
+ const place = state.focus ? placeOf(state.focus.target) : shownPlace(state)
+ return headingOf(place) ?? tabButton(state.tab)
+}
+
+/**
+ * After each move: a request an element answered is done; else (no owner answered, or
+ * the move had no request) the focus goes to the heading or the tab button.
+ */
+function useMoveFocus(
+ move: Move | null,
+ state: NavigationState,
+ outcomes: RefObject>,
+ dispatch: Dispatch,
+ openers: Openers,
+) {
+ const handled = useRef(null)
+ useEffect(() => {
+ if (!move || handled.current === move) return
+ handled.current = move
+ if (move.kind === 'references_closed') {
+ const opener = openers.references.current
+ const target =
+ opener && isShown(opener)
+ ? opener
+ : document.getElementById(REFERENCES_BUTTON_ID)
+ target?.focus()
+ return
+ }
+ const serial = state.focus?.serial
+ if (move.kind === 'go_to' && serial !== undefined) {
+ const outcome = outcomes.current.get(serial)
+ outcomes.current.delete(serial)
+ if (outcome === 'found' || outcome === 'kept') return
+ dispatch({ type: 'focus_consumed', serial })
+ }
+ if (move.kind === 'back') backTarget(openers.section.current)?.focus()
+ else landingOf(move, state)?.focus()
+ }, [move, state, outcomes, dispatch, openers])
+}
+
+/** Navigation of the draft editor: the reducer plus the DOM side (focus, live region). */
+export function useEditorNavigation(initialTab: EditorTabId): EditorNavigation {
+ const [state, dispatch] = useReducer(
+ navigationReducer,
+ initialTab,
+ initialNavigation,
+ )
+ const { live, announce } = useLiveRegion()
+ const outcomes = useRef(new Map())
+ const openers = useRef({
+ references: { current: null },
+ section: { current: null },
+ }).current
+ const moves = useMoves(dispatch, announce, openers)
+ const consumed = useCallback((serial: number, outcome: FocusOutcome) => {
+ outcomes.current.set(serial, outcome)
+ dispatch({ type: 'focus_consumed', serial })
+ }, [])
+ const selectTab = useCallback((tab: EditorTabId) => {
+ commitFocusedField()
+ dispatch({ type: 'select_tab', tab })
+ }, [])
+ useMoveFocus(moves.move, state, outcomes, dispatch, openers)
+ return { state, live, selectTab, consumed, announce, ...moves }
+}
diff --git a/apps/app/src/editor/verification.ts b/apps/app/src/editor/verification.ts
index bb219c3e..2ebb9e8b 100644
--- a/apps/app/src/editor/verification.ts
+++ b/apps/app/src/editor/verification.ts
@@ -6,7 +6,7 @@ import type {
} from '@faunosteo/core-wasm/types'
import type { Locale } from '@/i18n/types'
import { elementLabel } from './sheetDocument'
-import type { EditorTabId } from './tabs'
+import { targetOfKey, type EditorTarget } from './navigation'
/** The server's cap on the document text (contract §12.2), shown beside the measure. */
export const DOCUMENT_BYTES_CAP = 2_097_152
@@ -61,24 +61,26 @@ export function splitIssues(report: SheetReport): {
}
}
-const ROOT_TAB: Record = {
- views: 'views',
- annotations: 'annotations',
- finding_zones: 'findings',
- categories: 'general',
- references: 'references',
-}
const REGION_PATH = /^vertebral_config\.regions\[(\d+)\]/
const ROOT_PATH = /^(\w+)\[(\d+)\]/
export interface IssueTarget {
- tab: EditorTabId
- /** The element the path names, when it resolves in the document. */
- key: ElementKey | null
- /** Its label. */
+ /** The place to show, carrying the element when the path resolves in the document. */
+ target: EditorTarget
+ /** The element's label, when it resolves. */
name: string | null
}
+/** One key per list a path root names: `targetOfKey` is the only key-to-place table. */
+const ROOT_SAMPLE: Record = {
+ views: { kind: 'view', id: '' },
+ annotations: { kind: 'annotation', id: '' },
+ finding_zones: { kind: 'zone', id: '' },
+ categories: { kind: 'category', id: '' },
+ references: { kind: 'reference', id: '' },
+}
+const REGION_SAMPLE: ElementKey = { kind: 'region', code: '' }
+
type Kind = 'view' | 'annotation' | 'category' | 'zone' | 'reference'
const ROOT_KIND: Record = {
views: 'view',
@@ -127,22 +129,39 @@ function keyOf(doc: AnatomicalSheetDocument, path: string): ElementKey | null {
return { kind: ROOT_KIND[match[1]], id: item.id } as ElementKey
}
-function tabOf(path: string): EditorTabId | null {
- if (REGION_PATH.test(path)) return 'vertebrae'
+const placeAlone = (sample: ElementKey): EditorTarget => ({
+ ...targetOfKey(sample),
+ key: null,
+})
+
+/** The place a path root names, without an element (the key does not resolve). */
+function rootPlace(path: string): EditorTarget | null {
+ if (REGION_PATH.test(path)) return placeAlone(REGION_SAMPLE)
const root = ROOT_PATH.exec(path)?.[1]
- return root ? (ROOT_TAB[root] ?? null) : null
+ const sample = root ? ROOT_SAMPLE[root] : undefined
+ return sample ? placeAlone(sample) : null
}
-/** The tab and element an issue path names (« Aller à … »); null when it names none. */
+/** The place and element an issue path names (« Aller à … »); null when it names none. */
export function issueTarget(
doc: AnatomicalSheetDocument,
path: string,
locale: Locale,
): IssueTarget | null {
- const tab = tabOf(path)
- if (!tab) return null
+ const place = rootPlace(path)
+ if (!place) return null
const key = keyOf(doc, path)
- return { tab, key, name: key ? elementLabel(doc, key, locale) : null }
+ if (!key) return { target: place, name: null }
+ return { target: targetOfKey(key), name: elementLabel(doc, key, locale) }
+}
+
+/** The i18n key of the name of the place a target shows. */
+export function placeKey(target: EditorTarget): string {
+ if (target.place === 'references') return 'editor.place.references'
+ if (target.section && target.section !== 'drawing') {
+ return `editor.place.${target.section}`
+ }
+ return `editor.tab.${target.tab}`
}
/** « 2 097 152 » with plain spaces, as the plan words the size. */
diff --git a/apps/app/src/i18n/en.ts b/apps/app/src/i18n/en.ts
index c736abc2..0ddf5c15 100644
--- a/apps/app/src/i18n/en.ts
+++ b/apps/app/src/i18n/en.ts
@@ -1184,7 +1184,7 @@ export const en: Dict = {
'admin.overview.open_draft': 'Open the draft',
'admin.overview.view_draft': 'View the draft',
'admin.failure.round.open': 'A review is already under way on this draft: it cannot be submitted again.',
- 'admin.failure.view.asset.unknown': "A drawing of the draft is not registered for this sheet: choose it again in the Views and drawings tab.",
+ 'admin.failure.view.asset.unknown': "A drawing of the draft is not registered for this sheet: choose it again in Annotations, Views section.",
'admin.failure.draft.frozen': 'A review is under way on this draft: it can no longer be edited.',
'admin.failure.draft.not_a_draft': 'This version is no longer a draft.',
'admin.failure.sheet.inactive': 'This sheet is archived: its draft can no longer be edited.',
@@ -1192,13 +1192,37 @@ export const en: Dict = {
'admin.failure.sheet.historical_read_only': 'The historical sheet cannot be edited: create a working copy.',
'editor.tab.list': 'Draft sections',
'editor.tab.general': 'General',
- 'editor.tab.views': 'Views and drawings',
'editor.tab.annotations': 'Annotations',
'editor.tab.findings': 'Findings',
- 'editor.tab.references': 'References',
- 'editor.tab.vertebrae': 'Vertebrae',
'editor.tab.verification': 'Verification',
'editor.tab.more': 'More',
+ 'editor.tab.errors_one': '{count} error',
+ 'editor.tab.errors_other': '{count} errors',
+ 'editor.place.drawing': 'Drawing',
+ 'editor.place.views': 'Views',
+ 'editor.place.categories': 'Categories',
+ 'editor.place.regions': 'Vertebral regions',
+ 'editor.place.references': 'References',
+ 'editor.section.back': 'Back to the drawing',
+ 'editor.live.creation_kept': "A creation is in progress: finish or abandon it to reach this annotation.",
+ 'editor.live.tracing_kept': "A tracing is in progress: finish or cancel it to reach this annotation.",
+ 'editor.live.references_closed': 'References closed',
+ 'editor.overview.label': 'Sheet overview',
+ 'editor.overview.views': 'Views',
+ 'editor.overview.view_main': 'Main view',
+ 'editor.overview.view_detail': 'Detail view',
+ 'editor.overview.annotations_one': '{count} annotation',
+ 'editor.overview.annotations_other': '{count} annotations',
+ 'editor.overview.manage_views': 'Manage views',
+ 'editor.overview.see_views': 'See the views',
+ 'editor.overview.categories': 'Categories',
+ 'editor.overview.categories_empty': 'No category yet.',
+ 'editor.overview.edit_categories': 'Edit categories',
+ 'editor.overview.see_categories': 'See the categories',
+ 'editor.overview.regions_one': 'Vertebral regions ({count} region)',
+ 'editor.overview.regions_other': 'Vertebral regions ({count} regions)',
+ 'editor.references.open': 'References',
+ 'editor.references.close': 'Close the references',
'editor.draft.loading': 'Loading the draft…',
'editor.draft.none': 'This sheet has no draft.',
'editor.draft.overview_link': 'View the sheet',
@@ -1386,7 +1410,7 @@ export const en: Dict = {
'editor.views.new_hint': 'Fill in the crop for a cropped view; leave it empty for a view that will have its own drawing (chosen once the view is added).',
'editor.views.add': 'Add the view',
'editor.views.required': 'Fill in the French and English names of the view.',
- 'editor.views.frame.newly_invalid': 'This frame change would put the geometry of these elements in error: {names}. Move them first (Annotations tab).',
+ 'editor.views.frame.newly_invalid': 'This frame change would put the geometry of these elements in error: {names}. Move them first (Annotations, drawing).',
'editor.views.frame.view_unmeasured': 'This change would make a view that holds annotations unmeasurable: {names}.',
'editor.views.frame.kept': 'The drawing stays uploaded; the view keeps its previous drawing.',
'editor.views.frame.newly_invalid_repairable': 'These elements fall outside the new frame: {names}. Choose the drawing again to repair them as you attach it.',
@@ -1476,13 +1500,13 @@ export const en: Dict = {
'editor.annotations.tool_hint.zone': 'Tool: zone · click to place the vertices; Enter or « Close the tracing » finishes, Esc cancels.',
'editor.annotations.tool_hint.link': 'Tool: link to a detail view · trace the outline that opens the view; Enter finishes, Esc cancels.',
'editor.annotations.views': 'Views',
- 'editor.annotations.unmeasured.hint': 'This drawing cannot be measured: add or fix its illustration (tab Views and drawings) before placing or moving elements.',
+ 'editor.annotations.unmeasured.hint': 'This drawing cannot be measured: add or fix its illustration (Annotations, Views section) before placing or moving elements.',
'editor.annotations.outside': 'Click inside the drawing.',
'editor.annotations.correction': 'The point does not fit where you clicked. Corrected position proposed: x = {x}, y = {y}.',
'editor.annotations.correction_use': 'Use this position',
'editor.annotations.correction_cancel': 'Cancel',
- 'editor.annotations.no_category': 'Create an annotation category first (tab General).',
- 'editor.annotations.no_child_view': 'No detail view opens from this view: create one in the Views and drawings tab.',
+ 'editor.annotations.no_category': 'Create an annotation category first (Annotations, Categories section).',
+ 'editor.annotations.no_child_view': 'No detail view opens from this view: create one in Annotations, Views section.',
'editor.annotations.add.point': 'Add a point',
'editor.annotations.add.zone': 'Add a zone',
'editor.annotations.add.detail_trigger': 'Add a link',
@@ -1518,7 +1542,6 @@ export const en: Dict = {
'editor.annotations.list': 'Annotations of the view',
'editor.annotations.list_empty': 'No annotation in this view.',
'editor.annotations.selection': 'Selection: {kind} « {name} »',
- 'editor.annotations.select_hint': 'Select an annotation on the drawing or in the list to see its properties.',
'editor.annotations.properties': 'Annotation properties',
'editor.annotations.tracing_one': '{count} vertex placed.',
'editor.annotations.tracing_other': '{count} vertices placed.',
diff --git a/apps/app/src/i18n/fr.ts b/apps/app/src/i18n/fr.ts
index df9018f1..e9e006ea 100644
--- a/apps/app/src/i18n/fr.ts
+++ b/apps/app/src/i18n/fr.ts
@@ -1215,7 +1215,7 @@ export const fr: Dict = {
'admin.overview.open_draft': 'Ouvrir le brouillon',
'admin.overview.view_draft': 'Consulter le brouillon',
'admin.failure.round.open': "Une revue est déjà en cours sur ce brouillon : il ne peut pas être soumis de nouveau.",
- 'admin.failure.view.asset.unknown': "Une illustration du brouillon n'est pas enregistrée pour cette fiche : choisissez-la de nouveau dans l'onglet Vues et illustrations.",
+ 'admin.failure.view.asset.unknown': "Une illustration du brouillon n'est pas enregistrée pour cette fiche : choisissez-la de nouveau dans Annotations, section Vues.",
'admin.failure.draft.frozen': 'Une revue est en cours sur ce brouillon : il ne peut plus être modifié.',
'admin.failure.draft.not_a_draft': "Cette version n'est plus un brouillon.",
'admin.failure.sheet.inactive': 'Cette fiche est archivée : son brouillon ne peut plus être modifié.',
@@ -1223,13 +1223,37 @@ export const fr: Dict = {
'admin.failure.sheet.historical_read_only': 'La fiche historique ne se modifie pas : créez une copie de travail.',
'editor.tab.list': 'Sections du brouillon',
'editor.tab.general': 'Général',
- 'editor.tab.views': 'Vues et illustrations',
'editor.tab.annotations': 'Annotations',
'editor.tab.findings': 'Constats',
- 'editor.tab.references': 'Références',
- 'editor.tab.vertebrae': 'Vertèbres',
'editor.tab.verification': 'Vérification',
'editor.tab.more': 'Plus',
+ 'editor.tab.errors_one': '{count} erreur',
+ 'editor.tab.errors_other': '{count} erreurs',
+ 'editor.place.drawing': 'Dessin',
+ 'editor.place.views': 'Vues',
+ 'editor.place.categories': 'Catégories',
+ 'editor.place.regions': 'Régions vertébrales',
+ 'editor.place.references': 'Références',
+ 'editor.section.back': 'Retour au dessin',
+ 'editor.live.creation_kept': "Une création est en cours : terminez-la ou abandonnez-la pour atteindre cette annotation.",
+ 'editor.live.tracing_kept': "Un tracé est en cours : terminez-le ou annulez-le pour atteindre cette annotation.",
+ 'editor.live.references_closed': 'Références fermées',
+ 'editor.overview.label': 'Aperçu de la fiche',
+ 'editor.overview.views': 'Vues',
+ 'editor.overview.view_main': 'Vue principale',
+ 'editor.overview.view_detail': 'Vue détaillée',
+ 'editor.overview.annotations_one': '{count} annotation',
+ 'editor.overview.annotations_other': '{count} annotations',
+ 'editor.overview.manage_views': 'Gérer les vues',
+ 'editor.overview.see_views': 'Voir les vues',
+ 'editor.overview.categories': 'Catégories',
+ 'editor.overview.categories_empty': 'Aucune catégorie pour l\'instant.',
+ 'editor.overview.edit_categories': 'Modifier les catégories',
+ 'editor.overview.see_categories': 'Voir les catégories',
+ 'editor.overview.regions_one': 'Régions vertébrales ({count} région)',
+ 'editor.overview.regions_other': 'Régions vertébrales ({count} régions)',
+ 'editor.references.open': 'Références',
+ 'editor.references.close': 'Fermer les références',
'editor.draft.loading': 'Chargement du brouillon…',
'editor.draft.none': "Cette fiche n'a pas de brouillon.",
'editor.draft.overview_link': 'Voir la fiche',
@@ -1417,7 +1441,7 @@ export const fr: Dict = {
'editor.views.new_hint': 'Saisissez le recadrage pour une vue recadrée ; laissez-le vide pour une vue qui aura sa propre illustration (à choisir une fois la vue ajoutée).',
'editor.views.add': 'Ajouter la vue',
'editor.views.required': 'Renseignez les noms français et anglais de la vue.',
- 'editor.views.frame.newly_invalid': "Ce changement de cadre mettrait en erreur la géométrie de : {names}. Déplacez d'abord ces éléments (onglet Annotations).",
+ 'editor.views.frame.newly_invalid': "Ce changement de cadre mettrait en erreur la géométrie de : {names}. Déplacez d'abord ces éléments (Annotations, dessin).",
'editor.views.frame.view_unmeasured': 'Ce changement rendrait non mesurable une vue qui porte des annotations : {names}.',
'editor.views.frame.kept': "L'illustration reste téléversée ; la vue garde son illustration précédente.",
'editor.views.frame.newly_invalid_repairable': "Ces éléments sortent du nouveau cadre : {names}. Choisissez de nouveau l'illustration pour les réparer en l'attachant.",
@@ -1507,13 +1531,13 @@ export const fr: Dict = {
'editor.annotations.tool_hint.zone': 'Outil : zone · cliquez pour poser les sommets ; Entrée ou « Fermer le tracé » termine, Échap annule.',
'editor.annotations.tool_hint.link': 'Outil : accès à une vue détaillée · tracez le contour qui ouvre la vue ; Entrée termine, Échap annule.',
'editor.annotations.views': 'Vues',
- 'editor.annotations.unmeasured.hint': "Ce dessin n'est pas mesurable : ajoutez ou corrigez son illustration (onglet Vues et illustrations) avant de placer ou de déplacer des éléments.",
+ 'editor.annotations.unmeasured.hint': "Ce dessin n'est pas mesurable : ajoutez ou corrigez son illustration (Annotations, section Vues) avant de placer ou de déplacer des éléments.",
'editor.annotations.outside': "Cliquez à l'intérieur du dessin.",
'editor.annotations.correction': "Le point ne tient pas à l'endroit choisi. Position corrigée proposée : x = {x}, y = {y}.",
'editor.annotations.correction_use': 'Utiliser cette position',
'editor.annotations.correction_cancel': 'Annuler',
- 'editor.annotations.no_category': "Créez d'abord une catégorie d'annotation (onglet Général).",
- 'editor.annotations.no_child_view': "Aucune vue détaillée ne s'ouvre depuis cette vue : créez-en une dans l'onglet Vues et illustrations.",
+ 'editor.annotations.no_category': "Créez d'abord une catégorie d'annotation (Annotations, section Catégories).",
+ 'editor.annotations.no_child_view': "Aucune vue détaillée ne s'ouvre depuis cette vue : créez-en une dans Annotations, section Vues.",
'editor.annotations.add.point': 'Ajouter un point',
'editor.annotations.add.zone': 'Ajouter une zone',
'editor.annotations.add.detail_trigger': 'Ajouter un accès',
@@ -1549,7 +1573,6 @@ export const fr: Dict = {
'editor.annotations.list': 'Annotations de la vue',
'editor.annotations.list_empty': 'Aucune annotation dans cette vue.',
'editor.annotations.selection': 'Sélection : {kind} « {name} »',
- 'editor.annotations.select_hint': 'Sélectionnez une annotation sur le dessin ou dans la liste pour voir ses propriétés.',
'editor.annotations.properties': "Propriétés de l'annotation",
'editor.annotations.tracing_one': '{count} sommet posé.',
'editor.annotations.tracing_other': '{count} sommets posés.',
diff --git a/apps/app/tests/unit/editor-annotations-tab.test.tsx b/apps/app/tests/unit/editor-annotations-tab.test.tsx
index a0b5fd86..2f977a8d 100644
--- a/apps/app/tests/unit/editor-annotations-tab.test.tsx
+++ b/apps/app/tests/unit/editor-annotations-tab.test.tsx
@@ -41,7 +41,14 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = {
+ readOnly: false,
+ navigate: vi.fn(),
+ reloadSheet: vi.fn(),
+ section: 'drawing' as const,
+ onOpenSection: vi.fn(),
+ onBack: vi.fn(),
+}
const named = (id: string, cx: number, cy: number, r: number) =>
point(id, cx, cy, r)
const annotations = () => store.getState().previewState!.document.annotations
@@ -484,7 +491,7 @@ describe('tools and categories', () => {
expect(screen.getByRole('button', { name: 'Point' })).toBeDisabled()
expect(
screen.getByText(
- "Créez d'abord une catégorie d'annotation (onglet Général).",
+ "Créez d'abord une catégorie d'annotation (Annotations, section Catégories).",
),
).toBeInTheDocument()
})
diff --git a/apps/app/tests/unit/editor-drawing-upload.test.tsx b/apps/app/tests/unit/editor-drawing-upload.test.tsx
index 607eef16..ce91ad5e 100644
--- a/apps/app/tests/unit/editor-drawing-upload.test.tsx
+++ b/apps/app/tests/unit/editor-drawing-upload.test.tsx
@@ -10,7 +10,7 @@ import {
import userEvent from '@testing-library/user-event'
import { SheetFailure } from '@faunosteo/supabase'
import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
-import ViewsTab from '@/components/editor/tabs/ViewsTab'
+import ViewsSection from '@/components/editor/annotations/sections/ViewsSection'
import { cleanSvg } from '@/editor/core/cleaning'
import { createHash } from 'node:crypto'
import { getDict } from '@/i18n'
@@ -35,7 +35,7 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
confirmSheetAssetUpload: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
const NEW_ASSET = '22222222-2222-4222-8222-222222222222'
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
@@ -91,7 +91,7 @@ async function pick(text: string, name = 'dessin.svg') {
beforeEach(async () => {
useLocaleStore.setState({ locale: 'fr' })
await openReady()
- render( )
+ render( )
})
afterEach(() => {
cleanup()
diff --git a/apps/app/tests/unit/editor-findings.test.tsx b/apps/app/tests/unit/editor-findings.test.tsx
index 77b61d7a..7485752f 100644
--- a/apps/app/tests/unit/editor-findings.test.tsx
+++ b/apps/app/tests/unit/editor-findings.test.tsx
@@ -29,7 +29,7 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
const name = (n: string) => ({ fr: n, en: n })
diff --git a/apps/app/tests/unit/editor-focus-request.test.tsx b/apps/app/tests/unit/editor-focus-request.test.tsx
index 1084f272..d0b5e220 100644
--- a/apps/app/tests/unit/editor-focus-request.test.tsx
+++ b/apps/app/tests/unit/editor-focus-request.test.tsx
@@ -1,17 +1,25 @@
-/** Lot J fix: « Aller à … » seeds each tab's own selection once. */
+/** « 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 } from '@testing-library/react'
+import { cleanup, render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import type {
AnatomicalSheetDocument,
ElementKey,
} from '@faunosteo/core-wasm/types'
import FindingsTab from '@/components/editor/tabs/FindingsTab'
-import ReferencesTab from '@/components/editor/tabs/ReferencesTab'
-import VertebraeTab from '@/components/editor/tabs/VertebraeTab'
+import RegionsSection from '@/components/editor/annotations/sections/RegionsSection'
+import EditorTabBody from '@/components/editor/EditorTabBody'
+import EditorTabs from '@/components/editor/EditorTabs'
+import ReferencesPanel from '@/components/editor/references/ReferencesPanel'
import AnnotationsTab from '@/components/editor/tabs/AnnotationsTab'
-import { FocusConsumedContext, type FocusRequest } from '@/editor/focusRequest'
+import {
+ FocusConsumedContext,
+ ownedBy,
+ type FocusRequest,
+} from '@/editor/focusRequest'
+import { targetOfKey, type EditorTarget } from '@/editor/navigation'
+import { useEditorNavigation } from '@/editor/useEditorNavigation'
import { issueTarget } from '@/editor/verification'
import { useLocaleStore } from '@/state/localeStore'
import { edit, insert, point } from '../helpers/editorFixtures'
@@ -32,7 +40,17 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const base = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const base = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
+const section = {
+ section: 'drawing' as const,
+ onOpenSection: vi.fn(),
+ onBack: vi.fn(),
+}
+const panel = { open: true, onClose: vi.fn() }
+const request = (key: ElementKey, serial = 1): FocusRequest => ({
+ target: targetOfKey(key),
+ serial,
+})
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
const name = (n: string) => ({ fr: n, en: n })
@@ -90,24 +108,29 @@ describe('focus requests', () => {
zone_id: 'zone-a',
path: ['fcat-a', 'node-a'],
}
- render( )
+ render( )
const item = await screen.findByRole('treeitem', { name: /Nœud A/ })
expect(item.getAttribute('aria-selected')).toBe('true')
+ await waitFor(() => expect(document.activeElement).toBe(item))
})
- it('Annotations: selects the annotation of the request', async () => {
+ it('Annotations: selects the annotation and focuses the properties heading', async () => {
const text = insert(baseText(), point('anno-b', 20, 20, 3))
await openReady({ text })
render(
,
)
expect(await screen.findAllByText(/anno-b|Sélection/)).not.toHaveLength(0)
+ await waitFor(() =>
+ expect(document.activeElement).toHaveAttribute('data-properties-heading'),
+ )
})
- it('Références and Vertèbres: focus the named row', async () => {
+ it('Références and Régions: focus the named row', async () => {
let text = insert(baseText(), {
kind: 'reference',
value: {
@@ -129,9 +152,10 @@ describe('focus requests', () => {
})
await openReady({ text })
render(
- ,
)
expect(document.activeElement?.getAttribute('data-focus-key')).toContain(
@@ -139,9 +163,9 @@ describe('focus requests', () => {
)
cleanup()
render(
- ,
)
expect(document.activeElement?.getAttribute('data-focus-key')).toContain(
@@ -161,15 +185,37 @@ describe('focus requests', () => {
},
})
await openReady({ text })
- const focus = {
- key: { kind: 'reference', id: 'ref-a' } as ElementKey,
- serial: 1,
- }
- const view = render( )
+ const focus = request({ kind: 'reference', id: 'ref-a' })
+ const view = render( )
;(document.activeElement as HTMLElement).blur()
- view.rerender( )
+ view.rerender( )
expect(document.activeElement?.getAttribute('data-focus-key')).toBeNull()
})
+
+ it('reports found, or none when the place holds no such element', async () => {
+ await openReady({ text: findingsText() })
+ const consumed = vi.fn()
+ const gone: ElementKey = { kind: 'zone', id: 'zone-gone' }
+ render(
+
+
+ ,
+ )
+ await waitFor(() => expect(consumed).toHaveBeenCalledWith(4, 'none'))
+ })
+})
+
+describe('ownedBy', () => {
+ it('passes a request only to the place its target names', () => {
+ const view = request({ kind: 'view', id: 'view-main' })
+ expect(ownedBy(view, 'annotations.views')).toBe(view)
+ expect(ownedBy(view, 'annotations.drawing')).toBeUndefined()
+ expect(ownedBy(view, 'general')).toBeUndefined()
+ const ref = request({ kind: 'reference', id: 'ref-a' })
+ expect(ownedBy(ref, 'references')).toBe(ref)
+ expect(ownedBy(ref, 'findings')).toBeUndefined()
+ expect(ownedBy(undefined, 'general')).toBeUndefined()
+ })
})
describe('issueTarget', () => {
@@ -178,50 +224,122 @@ describe('issueTarget', () => {
const d = doc()
const path = 'finding_zones[0].categories[0].children[0].reference_ids[1]'
expect(issueTarget(d, path, 'fr')).toMatchObject({
- tab: 'findings',
- key: { kind: 'finding', zone_id: 'zone-a', path: ['fcat-a', 'node-a'] },
+ target: {
+ place: 'tab',
+ tab: 'findings',
+ key: { kind: 'finding', zone_id: 'zone-a', path: ['fcat-a', 'node-a'] },
+ },
name: 'Nœud A',
})
- expect(issueTarget(d, 'finding_zones[0]', 'fr')?.key).toEqual({
- kind: 'zone',
- id: 'zone-a',
+ expect(issueTarget(d, 'finding_zones[0]', 'fr')?.target).toMatchObject({
+ key: { kind: 'zone', id: 'zone-a' },
})
expect(
issueTarget(d, 'vertebral_config.regions[3].count_range', 'fr'),
).toMatchObject({
- tab: 'vertebrae',
- key: null,
+ target: { tab: 'annotations', section: 'regions', key: null },
})
expect(issueTarget(d, 'nothing', 'fr')).toBeNull()
})
})
-/** The route's contract: one tab mounted at a time, the request cleared once consumed. */
-function Harness() {
- const [tab, setTab] = useState<'references' | 'vertebrae'>('references')
- const [focus, setFocus] = useState({
- key: { kind: 'reference', id: 'ref-a' },
- serial: 1,
+/** The workspace's wiring in miniature: the hook, the tab row, the shown body. */
+function Probe({ go, tier }: { go: EditorTarget; tier: 'wide' | 'small' }) {
+ const nav = useEditorNavigation('verification')
+ const { state } = nav
+ return (
+
+
+ nav.navigate(go)}>go
+
+
+ )
+}
+
+describe('a request that finds nothing', () => {
+ const missing: EditorTarget = {
+ place: 'tab',
+ tab: 'findings',
+ section: null,
+ key: { kind: 'zone', id: 'zone-gone' },
+ }
+
+ it('lands on the tab button, never on body', async () => {
+ await openReady({ text: findingsText() })
+ const user = userEvent.setup()
+ render( )
+ await user.click(screen.getByText('go'))
+ await waitFor(() =>
+ expect(document.activeElement).toBe(
+ screen.getByRole('tab', { name: 'Constats' }),
+ ),
+ )
})
+
+ it('below 640 px lands on « Plus » while the tab sits in its closed list', async () => {
+ await openReady({ text: findingsText() })
+ const user = userEvent.setup()
+ render( )
+ await user.click(screen.getByText('go'))
+ await waitFor(() =>
+ expect(document.activeElement).toBe(
+ screen.getByRole('button', { name: 'Plus' }),
+ ),
+ )
+ })
+
+ it('a found element keeps the focus it took', async () => {
+ await openReady({ text: findingsText() })
+ const user = userEvent.setup()
+ const key: ElementKey = { kind: 'zone', id: 'zone-a' }
+ render( )
+ await user.click(screen.getByText('go'))
+ await waitFor(() =>
+ expect(document.activeElement).toBe(
+ screen.getByRole('treeitem', { name: /Zone A/ }),
+ ),
+ )
+ })
+})
+
+/** The route's contract: one place mounted at a time, the request cleared once consumed. */
+function Harness() {
+ const [shown, setShown] = useState<'references' | 'regions'>('references')
+ const [focus, setFocus] = useState(
+ request({ kind: 'reference', id: 'ref-a' }),
+ )
const clear = (serial: number) =>
setFocus((prev) => (prev?.serial === serial ? undefined : prev))
- const Body = tab === 'references' ? ReferencesTab : VertebraeTab
return (
- setTab(tab === 'references' ? 'vertebrae' : 'references')
+ setShown(shown === 'references' ? 'regions' : 'references')
}
>
switch
-
+ {shown === 'references' ? (
+
+ ) : (
+
+ )}
)
}
describe('a consumed request', () => {
- it('is not replayed when the tab is left and reopened', async () => {
+ it('is not replayed when the place is left and reopened', async () => {
const text = insert(baseText(), {
kind: 'reference',
value: {
diff --git a/apps/app/tests/unit/editor-mode.test.ts b/apps/app/tests/unit/editor-mode.test.ts
index 7d8af7b4..21478457 100644
--- a/apps/app/tests/unit/editor-mode.test.ts
+++ b/apps/app/tests/unit/editor-mode.test.ts
@@ -97,7 +97,7 @@ describe('modeAfterSave', () => {
})
describe('tabsFor', () => {
- it('the static lists of board 05', () => {
+ it('the static lists of board 05, four tabs', () => {
expect(tabsFor('wide').more).toEqual([])
expect(tabsFor('medium').shown).toEqual([
'general',
@@ -106,12 +106,6 @@ describe('tabsFor', () => {
'verification',
])
expect(tabsFor('small').shown).toEqual(['annotations', 'verification'])
- expect(tabsFor('small').more).toEqual([
- 'general',
- 'views',
- 'findings',
- 'references',
- 'vertebrae',
- ])
+ expect(tabsFor('small').more).toEqual(['general', 'findings'])
})
})
diff --git a/apps/app/tests/unit/editor-repair.test.tsx b/apps/app/tests/unit/editor-repair.test.tsx
index d01bcfab..052970a8 100644
--- a/apps/app/tests/unit/editor-repair.test.tsx
+++ b/apps/app/tests/unit/editor-repair.test.tsx
@@ -13,7 +13,7 @@ import type {
Annotation,
Geometry,
} from '@faunosteo/core-wasm/types'
-import ViewsTab from '@/components/editor/tabs/ViewsTab'
+import ViewsSection from '@/components/editor/annotations/sections/ViewsSection'
import { cleanSvg } from '@/editor/core/cleaning'
import { attachToView } from '@/editor/drawingUpload'
import { applyRepair, proposeGeometry } from '@/editor/repair'
@@ -36,7 +36,7 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
confirmSheetAssetUpload: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
const NEW_ASSET = '22222222-2222-4222-8222-222222222222'
const t = (key: string) => getDict('fr')[key as never] as string
const doc = (): AnatomicalSheetDocument =>
@@ -297,7 +297,7 @@ const COMPLEX_PATH =
async function pickAndOpenDialog(text = unmeasuredText()) {
await openReady({ text })
serverGets(SVG)
- render( )
+ render( )
const user = userEvent.setup()
const input = screen.getByTestId('view-view-main-file') as HTMLInputElement
await user.upload(input, new File([SVG], 'd.svg', { type: 'image/svg+xml' }))
diff --git a/apps/app/tests/unit/editor-route-recovery.test.tsx b/apps/app/tests/unit/editor-route-recovery.test.tsx
index 18e270eb..f0ba5d92 100644
--- a/apps/app/tests/unit/editor-route-recovery.test.tsx
+++ b/apps/app/tests/unit/editor-route-recovery.test.tsx
@@ -90,10 +90,10 @@ describe('the blocking offer', () => {
).toBeEnabled()
expect(useLeaveGuardStore.getState().armed).toBe(true)
// consultation: tabs still switch
- await user.click(screen.getByRole('tab', { name: 'Références' }))
- expect(screen.getByTestId('editor-tab-references')).toHaveAttribute(
- 'aria-label',
- 'Références',
+ await user.click(screen.getByRole('button', { name: 'Références' }))
+ expect(screen.getByTestId('editor-references-panel')).toHaveAttribute(
+ 'aria-labelledby',
+ 'editor-references-title',
)
// editing: refused by the store, no save offered
expect(commitMove(40)).toMatchObject({
diff --git a/apps/app/tests/unit/editor-route.test.tsx b/apps/app/tests/unit/editor-route.test.tsx
index 06dec3d3..ffa839ca 100644
--- a/apps/app/tests/unit/editor-route.test.tsx
+++ b/apps/app/tests/unit/editor-route.test.tsx
@@ -43,18 +43,10 @@ afterEach(() => {
const ready = () =>
screen.findByRole('heading', { level: 1, name: 'Brouillon, version 4' })
-const TABS = [
- 'Général',
- 'Vues et illustrations',
- 'Annotations',
- 'Constats',
- 'Références',
- 'Vertèbres',
- 'Vérification',
-]
+const TABS = ['Général', 'Annotations', 'Constats', 'Vérification']
describe('edit mode', () => {
- it('header, badges, the seven tabs, nothing read-only', async () => {
+ it('header, badges, the four tabs, nothing read-only', async () => {
mountDraft()
await ready()
expect(screen.getByText('Brouillon')).toBeInTheDocument()
@@ -136,8 +128,7 @@ describe('tabs', () => {
expect(screen.getByRole('tabpanel')).toHaveAccessibleName('Constats')
})
- it('640 to 1 023 px: four tabs and « Plus »; the others sit under the disclosure', async () => {
- const user = userEvent.setup()
+ it('640 to 1 023 px: the four tabs, no « Plus »', async () => {
mountDraft({ width: 800 })
await ready()
const shown = within(screen.getByRole('tablist')).getAllByRole('tab')
@@ -147,17 +138,10 @@ describe('tabs', () => {
'Constats',
'Vérification',
])
- const more = screen.getByRole('button', { name: 'Plus' })
- expect(more).toHaveAttribute('aria-expanded', 'false')
- expect(screen.queryByRole('button', { name: 'Références' })).toBeNull()
- await user.click(more)
- expect(more).toHaveAttribute('aria-expanded', 'true')
- await user.click(screen.getByRole('button', { name: 'Références' }))
- expect(screen.getByTestId('editor-tab-references')).toBeInTheDocument()
- expect(more).toHaveAttribute('aria-expanded', 'false')
+ expect(screen.queryByRole('button', { name: 'Plus' })).toBeNull()
})
- it('below 640 px: two tabs and « Plus » listing the five others', async () => {
+ it('below 640 px: two tabs and « Plus » listing Général and Constats', async () => {
const user = userEvent.setup()
mountDraft({ width: 375 })
await ready()
@@ -169,13 +153,63 @@ describe('tabs', () => {
await user.click(screen.getByRole('button', { name: 'Plus' }))
const more = document.getElementById('editor-tabs-more') as HTMLElement
const rest = within(more).getAllByRole('button')
- expect(rest.map((b) => b.textContent)).toEqual([
- 'Général',
- 'Vues et illustrations',
- 'Constats',
- 'Références',
- 'Vertèbres',
- ])
+ expect(rest.map((b) => b.textContent)).toEqual(['Général', 'Constats'])
+ await user.click(rest[1])
+ expect(screen.getByTestId('editor-tab-findings')).toBeInTheDocument()
+ expect(document.getElementById('editor-tabs-more')).toBeNull()
+ })
+})
+
+describe('references panel', () => {
+ const button = () => screen.getByRole('button', { name: 'Références' })
+
+ it('the header button opens it on its heading and ✕ returns the focus', async () => {
+ const user = userEvent.setup()
+ mountDraft()
+ await ready()
+ expect(button()).toHaveAttribute('aria-expanded', 'false')
+ expect(screen.queryByTestId('editor-references-panel')).toBeNull()
+ await user.click(button())
+ const panel = screen.getByTestId('editor-references-panel')
+ expect(panel).toBeVisible()
+ expect(button()).toHaveAttribute('aria-expanded', 'true')
+ expect(document.activeElement).toBe(
+ within(panel).getByRole('heading', { name: 'Références' }),
+ )
+ expect(screen.getByRole('tab', { name: 'Annotations' })).toHaveAttribute(
+ 'aria-selected',
+ 'true',
+ )
+ await user.click(
+ within(panel).getByRole('button', { name: 'Fermer les références' }),
+ )
+ expect(panel).not.toBeVisible()
+ expect(document.activeElement).toBe(button())
+ })
+
+ it('Escape inside the panel closes it, the content is kept for the next opening', async () => {
+ const user = userEvent.setup()
+ mountDraft()
+ await ready()
+ await user.click(button())
+ const panel = screen.getByTestId('editor-references-panel')
+ await user.keyboard('{Escape}')
+ expect(panel).not.toBeVisible()
+ await user.click(button())
+ expect(screen.getByTestId('editor-references-panel')).toBe(panel)
+ expect(panel).toBeVisible()
+ })
+
+ it('read-only: the panel lists the references with no edit control', async () => {
+ const user = userEvent.setup()
+ mountDraft({ width: 800 })
+ await ready()
+ await user.click(button())
+ const panel = screen.getByTestId('editor-references-panel')
+ expect(within(panel).queryByRole('textbox')).toBeNull()
+ expect(
+ within(panel).queryByRole('button', { name: 'Ajouter la référence' }),
+ ).toBeNull()
})
})
diff --git a/apps/app/tests/unit/editor-sections.test.tsx b/apps/app/tests/unit/editor-sections.test.tsx
new file mode 100644
index 00000000..7a41ef9e
--- /dev/null
+++ b/apps/app/tests/unit/editor-sections.test.tsx
@@ -0,0 +1,277 @@
+/** 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,
+ fireEvent,
+ 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,
+} from '../helpers/editorHarness'
+import { mountDraft, setWidth } from '../helpers/editorRoute'
+
+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' })
+ 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(`[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')).toBeNull()
+ 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 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,
+ 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 }) => (
+
+
+
+
+
+)
+
+async function mountDrawing(text = drawnText()) {
+ consumed.mockReset()
+ announce.mockReset()
+ await openReady({ text })
+ const user = userEvent.setup()
+ const view = render( )
+ await waitFor(() =>
+ expect(
+ screen.getByTestId('annotation-canvas-drawing').querySelector('svg'),
+ ).not.toBeNull(),
+ )
+ return { user, view }
+}
+
+const addPoint = async (user: ReturnType) => {
+ 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' }))
+ fireEvent.click(screen.getByTestId('annotation-canvas'), {
+ clientX: 20,
+ clientY: 30,
+ })
+ expect(screen.getByTestId('tracing-bar')).toBeInTheDocument()
+ act(() => void store.getState().undoStep())
+ await waitFor(() => expect(screen.queryByTestId('tracing-bar')).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) => Promise,
+ ) {
+ const text = insert(drawnText(), point('anno-a', 50, 50, 5))
+ const { user, view } = await mountDrawing(text)
+ await start(user)
+ view.rerender( )
+ return { consumed, announce }
+ }
+
+ it('a pending creation is kept: its panel 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-heading')
+ expect(announce).toHaveBeenCalledWith(
+ expect.stringContaining('création est en cours'),
+ )
+ expect(screen.queryByTestId('annotation-properties')).toBeNull()
+ })
+
+ it('an open zone tracing is kept: the bar takes 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' }))
+ fireEvent.click(screen.getByTestId('annotation-canvas'), {
+ clientX: 20,
+ clientY: 20,
+ })
+ })
+ await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'kept'))
+ expect(document.activeElement).toBe(screen.getByTestId('tracing-bar'))
+ expect(announce).toHaveBeenCalledWith(
+ expect.stringContaining('tracé est en cours'),
+ )
+ })
+
+ it('with nothing in progress the annotation is selected and its heading focused', async () => {
+ const { consumed } = await withProgress(async () => undefined)
+ await waitFor(() => expect(consumed).toHaveBeenCalledWith(7, 'found'))
+ await waitFor(() =>
+ expect(document.activeElement).toHaveAttribute('data-properties-heading'),
+ )
+ })
+})
diff --git a/apps/app/tests/unit/editor-tabs-general.test.tsx b/apps/app/tests/unit/editor-tabs-general.test.tsx
index e2196dc8..e13a5613 100644
--- a/apps/app/tests/unit/editor-tabs-general.test.tsx
+++ b/apps/app/tests/unit/editor-tabs-general.test.tsx
@@ -4,6 +4,7 @@ import { cleanup, render, screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
import DeleteDialog from '@/components/editor/DeleteDialog'
+import CategoriesSection from '@/components/editor/general/CategoriesSection'
import GeneralTab from '@/components/editor/tabs/GeneralTab'
import { useLocaleStore } from '@/state/localeStore'
import { edit, insert } from '../helpers/editorFixtures'
@@ -24,7 +25,7 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
@@ -102,11 +103,17 @@ describe('Général: texts and attribution', () => {
})
})
-describe('Général: annotation categories', () => {
+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()
+ })
+
it('renames, recolours and adds a category', async () => {
await openReady()
const user = userEvent.setup()
- render( )
+ render( )
const row = screen.getByLabelText('Nom de la catégorie (FR)', {
selector: '#category-cat-a-name-fr',
})
@@ -140,7 +147,7 @@ describe('Général: annotation categories', () => {
it('a new category needs both names', async () => {
await openReady()
const user = userEvent.setup()
- render( )
+ render( )
await user.click(
screen.getByRole('button', { name: 'Ajouter la catégorie' }),
)
@@ -151,7 +158,7 @@ describe('Général: annotation categories', () => {
it('a used category cannot be deleted: the dialog lists the dependents', async () => {
await openReady()
const user = userEvent.setup()
- render( )
+ render( )
await user.click(screen.getByRole('button', { name: 'Supprimer' }))
const dialog = await screen.findByRole('dialog')
expect(within(dialog).getByText(/utilise cette catégorie/)).toBeTruthy()
@@ -171,7 +178,7 @@ describe('Général: annotation categories', () => {
})
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
const buttons = screen.getAllByRole('button', { name: 'Supprimer' })
await user.click(buttons[1])
const dialog = await screen.findByRole('dialog')
diff --git a/apps/app/tests/unit/editor-tabs-lists.test.tsx b/apps/app/tests/unit/editor-tabs-lists.test.tsx
index 528b8da7..77bb8066 100644
--- a/apps/app/tests/unit/editor-tabs-lists.test.tsx
+++ b/apps/app/tests/unit/editor-tabs-lists.test.tsx
@@ -3,8 +3,8 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { cleanup, render, screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import type { AnatomicalSheetDocument } from '@faunosteo/core-wasm/types'
-import ReferencesTab from '@/components/editor/tabs/ReferencesTab'
-import VertebraeTab from '@/components/editor/tabs/VertebraeTab'
+import ReferencesPanel from '@/components/editor/references/ReferencesPanel'
+import RegionsSection from '@/components/editor/annotations/sections/RegionsSection'
import { useLocaleStore } from '@/state/localeStore'
import { edit, insert, point } from '../helpers/editorFixtures'
import {
@@ -24,7 +24,7 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
@@ -44,7 +44,7 @@ describe('Références', () => {
it('adds a reference only with a type and a citation', async () => {
await openReady()
const user = userEvent.setup()
- render( )
+ render( )
await user.click(
screen.getByRole('button', { name: 'Ajouter la référence' }),
)
@@ -72,7 +72,7 @@ describe('Références', () => {
)
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
const url = screen.getByLabelText('Adresse web (URL)', {
selector: '#reference-ref-a-url',
})
@@ -111,7 +111,7 @@ describe('Références', () => {
})
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
await user.click(screen.getAllByRole('button', { name: 'Supprimer' })[0])
const refused = await screen.findByRole('dialog')
expect(within(refused).getByText(/cite cette référence/)).toBeTruthy()
@@ -127,10 +127,12 @@ describe('Références', () => {
it('read-only shows the citations as text', async () => {
await openReady({ text: insert(baseText(), reference('ref-a', 'Alpha')) })
- render( )
+ render( )
expect(screen.getByText('Alpha')).toBeTruthy()
expect(screen.queryByRole('textbox')).toBeNull()
- expect(screen.queryByRole('button')).toBeNull()
+ expect(
+ screen.getAllByRole('button').map((b) => b.getAttribute('aria-label')),
+ ).toEqual(['Fermer les références'])
})
})
@@ -149,7 +151,7 @@ describe('Vertèbres', () => {
it('adds a region with a typed code; a bad count or half range never reaches the core', async () => {
await openReady()
const user = userEvent.setup()
- render( )
+ render( )
await user.type(screen.getByLabelText('Code'), 'C')
await user.type(screen.getByLabelText('Nom (FR)'), 'Cervicales')
await user.type(screen.getByLabelText('Nom (EN)'), 'Cervical')
@@ -178,7 +180,7 @@ describe('Vertèbres', () => {
const text = insert(insert(baseText(), region('C', 7)), region('T', 18))
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
const count = screen.getByLabelText('Nombre de vertèbres', {
selector: '#region-T-count',
})
@@ -238,7 +240,7 @@ describe('Vertèbres', () => {
})
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
await user.click(screen.getByRole('button', { name: 'Supprimer' }))
const dialog = await screen.findByRole('dialog')
expect(
@@ -249,7 +251,7 @@ describe('Vertèbres', () => {
it('read-only has no control', async () => {
await openReady({ text: insert(baseText(), region('C', 7)) })
- render( )
+ render( )
expect(screen.queryByRole('textbox')).toBeNull()
expect(screen.queryByRole('button')).toBeNull()
})
diff --git a/apps/app/tests/unit/editor-tabs-views.test.tsx b/apps/app/tests/unit/editor-tabs-views.test.tsx
index d54f5836..68b6ced4 100644
--- a/apps/app/tests/unit/editor-tabs-views.test.tsx
+++ b/apps/app/tests/unit/editor-tabs-views.test.tsx
@@ -7,7 +7,7 @@ import type {
AnatomicalSheetDocument,
NewElement,
} from '@faunosteo/core-wasm/types'
-import ViewsTab from '@/components/editor/tabs/ViewsTab'
+import ViewsSection from '@/components/editor/annotations/sections/ViewsSection'
import { useLocaleStore } from '@/state/localeStore'
import { ASSET, emptyText, insert, point } from '../helpers/editorFixtures'
import {
@@ -29,7 +29,7 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const props = { readOnly: false, onSelectTab: vi.fn(), reloadSheet: vi.fn() }
+const props = { readOnly: false, navigate: vi.fn(), reloadSheet: vi.fn() }
const doc = (): AnatomicalSheetDocument =>
JSON.parse(store.getState().documentText)
const detail = (
@@ -56,7 +56,7 @@ afterEach(() => {
async function openCrop(text: string) {
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
await user.click(
screen.getByRole('button', { name: 'Modifier le recadrage' }),
)
@@ -77,7 +77,7 @@ const cropField = (name: string) =>
describe('Vues et illustrations: drawing states', () => {
it('a valid main drawing shows its state and no hint', async () => {
await openReady()
- render( )
+ render( )
expect(screen.getByText('Illustration valide')).toBeTruthy()
expect(
screen.queryByText(/Utilisez « Choisir une illustration »/),
@@ -86,7 +86,7 @@ describe('Vues et illustrations: drawing states', () => {
it('a main view without drawing shows the hint pointing at the button', async () => {
await openReady({ text: emptyText() })
- render( )
+ render( )
expect(screen.getByText('Aucune illustration')).toBeTruthy()
expect(
screen.getByText(/Utilisez « Choisir une illustration »/),
@@ -104,7 +104,7 @@ describe('Vues et illustrations: drawing states', () => {
)
store.getState().open('ver-1', 'user-1', { canEdit: true })
await vi.waitFor(() => expect(store.getState().status).toBe('ready'))
- render( )
+ render( )
expect(screen.getByText(/Illustration introuvable/)).toBeTruthy()
expect(
screen.getByText(/Utilisez « Choisir une illustration »/),
@@ -124,7 +124,7 @@ describe('Vues et illustrations: drawing states', () => {
sb.downloadSheetDrawing.mockResolvedValue(bytes)
store.getState().open('ver-1', 'user-1', { canEdit: true })
await vi.waitFor(() => expect(store.getState().status).toBe('ready'))
- render( )
+ render( )
expect(
screen.getByText(
/Illustration refusée : elle n'est pas sous la forme enregistrée/,
@@ -143,7 +143,7 @@ describe('Vues et illustrations: drawing states', () => {
)
store.getState().open('ver-1', 'user-1', { canEdit: true })
await vi.waitFor(() => expect(store.getState().status).toBe('ready'))
- render( )
+ render( )
expect(
screen.getByText(/ne correspond pas à son empreinte SHA-256 enregistrée/),
).toBeTruthy()
@@ -155,7 +155,7 @@ describe('Vues et illustrations: drawing states', () => {
;(own.value as { svg_asset_id: string | null }).svg_asset_id = ASSET
await openReady({ text: insert(baseText(), own) })
const user = userEvent.setup()
- render( )
+ render( )
const open = () =>
user.click(
screen.getByRole('button', {
@@ -182,7 +182,7 @@ describe('Vues et illustrations: drawing states', () => {
it('read-only shows states as text and no action', async () => {
await openReady({ text: insert(baseText(), detail()) })
- render( )
+ render( )
expect(screen.getByText('Illustration valide')).toBeTruthy()
expect(screen.queryByRole('button')).toBeNull()
expect(screen.queryByRole('textbox')).toBeNull()
@@ -193,7 +193,7 @@ describe('Vues et illustrations: detail views', () => {
it('adds a detail view with names and a crop, in one insert', async () => {
await openReady()
const user = userEvent.setup()
- render( )
+ render( )
await user.click(screen.getByRole('button', { name: 'Ajouter la vue' }))
expect(screen.getByRole('alert')).toHaveTextContent('Renseignez les noms')
await user.type(document.getElementById('view-new-fr')!, 'Tête')
@@ -224,7 +224,7 @@ describe('Vues et illustrations: detail views', () => {
it('renames on blur and refuses a blank name locally', async () => {
await openReady({ text: insert(baseText(), detail()) })
const user = userEvent.setup()
- render( )
+ render( )
const name = document.getElementById('view-view-d-name-en')!
await user.clear(name)
await user.type(name, 'Lower leg')
@@ -243,7 +243,7 @@ describe('Vues et illustrations: detail views', () => {
)
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
await user.click(screen.getByRole('button', { name: 'Supprimer' }))
const dialog = await screen.findByRole('dialog')
expect(within(dialog).getByText(/ne peut pas être supprimé/)).toBeTruthy()
@@ -359,7 +359,7 @@ describe('Vues et illustrations: crop group under the frame check', () => {
const text = insert(insert(baseText(), detail()), detail2())
await openReady({ text })
const user = userEvent.setup()
- render( )
+ render( )
await user.selectOptions(
document.getElementById('view-view-d-parent')!,
'view-e',
diff --git a/apps/app/tests/unit/editor-verification.test.tsx b/apps/app/tests/unit/editor-verification.test.tsx
index aca3e74c..9134bd7b 100644
--- a/apps/app/tests/unit/editor-verification.test.tsx
+++ b/apps/app/tests/unit/editor-verification.test.tsx
@@ -4,7 +4,12 @@ import { act, cleanup, render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { SheetFailure } from '@faunosteo/supabase'
import VerificationTab from '@/components/editor/tabs/VerificationTab'
-import { ISSUE_CODES, issueMessageKey } from '@/editor/verification'
+import {
+ ISSUE_CODES,
+ issueMessageKey,
+ issueTarget,
+ placeKey,
+} from '@/editor/verification'
import { getDict } from '@/i18n'
import { useLocaleStore } from '@/state/localeStore'
import { insert, point } from '../helpers/editorFixtures'
@@ -27,10 +32,9 @@ vi.mock('@faunosteo/supabase', async (orig) => ({
submitSheetReview: vi.fn(),
}))
-const onSelectTab = vi.fn()
+const navigate = vi.fn()
const reloadSheet = vi.fn()
-const onGoTo = vi.fn()
-const props = { readOnly: false, onSelectTab, onGoTo, reloadSheet }
+const props = { readOnly: false, navigate, reloadSheet }
const SUBMIT = 'Soumettre à la revue'
/** An annotation without geometry: a blocking error of the core. */
@@ -48,8 +52,7 @@ beforeEach(() => useLocaleStore.setState({ locale: 'fr' }))
afterEach(() => {
cleanup()
resetStore()
- onSelectTab.mockReset()
- onGoTo.mockReset()
+ navigate.mockReset()
reloadSheet.mockReset()
})
@@ -81,10 +84,15 @@ describe('Vérification panel', () => {
await user.click(
screen.getAllByRole('button', { name: 'Aller à Sans tracé' })[0],
)
- expect(onGoTo).toHaveBeenCalledWith('annotations', {
- kind: 'annotation',
- id: 'anno-bare',
- })
+ expect(navigate).toHaveBeenCalledWith(
+ {
+ place: 'tab',
+ tab: 'annotations',
+ section: 'drawing',
+ key: { kind: 'annotation', id: 'anno-bare' },
+ },
+ expect.any(HTMLElement),
+ )
expect(screen.queryByText('Aucun problème détecté')).toBeNull()
})
@@ -204,6 +212,62 @@ describe('Submission', () => {
})
})
+describe('issueTarget', () => {
+ const at = (path: string) => issueTarget(doc(), path, 'fr')?.target
+ const doc = () => JSON.parse(store.getState().documentText)
+
+ it('each issue root names its place and the element it resolves to', async () => {
+ await openReady({ text: textWithError() })
+ expect(at('views[0].frame')).toMatchObject({
+ place: 'tab',
+ tab: 'annotations',
+ section: 'views',
+ key: { kind: 'view', id: 'view-main' },
+ })
+ expect(at('categories[0].name')).toMatchObject({
+ place: 'tab',
+ tab: 'annotations',
+ section: 'categories',
+ key: { kind: 'category', id: 'cat-a' },
+ })
+ expect(at('vertebral_config.regions[0].count')).toMatchObject({
+ place: 'tab',
+ tab: 'annotations',
+ section: 'regions',
+ })
+ expect(at('references[0].citation')).toMatchObject({
+ place: 'references',
+ citedBy: null,
+ })
+ expect(at('finding_zones[0].name')).toMatchObject({
+ place: 'tab',
+ tab: 'findings',
+ })
+ expect(at('annotations[0].geometry')).toMatchObject({
+ tab: 'annotations',
+ section: 'drawing',
+ })
+ })
+
+ it('a path whose element is gone names the place alone, and the label names it', async () => {
+ await openReady({ text: textWithError() })
+ const gone = at('views[9].frame')
+ expect(gone).toEqual({
+ place: 'tab',
+ tab: 'annotations',
+ section: 'views',
+ key: null,
+ })
+ expect(placeKey(gone!)).toBe('editor.place.views')
+ expect(placeKey(at('references[9].citation')!)).toBe(
+ 'editor.place.references',
+ )
+ expect(placeKey(at('annotations[9].geometry')!)).toBe(
+ 'editor.tab.annotations',
+ )
+ })
+})
+
describe('Issue messages', () => {
it('has an FR and an EN message for every known code', () => {
for (const code of ISSUE_CODES) {