From ce2ec26112268dabd631a5a3c6d4f404079073d5 Mon Sep 17 00:00:00 2001 From: bchanot Date: Sat, 10 Oct 2026 11:36:14 +0200 Subject: [PATCH] =?UTF-8?q?feat(app):=20application=20on=20the=20canonical?= =?UTF-8?q?=20sheet=20=E2=80=94=20report=20v3=20store=20with=20v2=20draft?= =?UTF-8?q?=20migration,=20bundled=20SheetProvider=20(SHEET=5FBUNDLE),=20a?= =?UTF-8?q?nnotation=20layer=20rendered=20from=20the=20document,=20zone=20?= =?UTF-8?q?interaction=20service,=20pickers=20and=20cards=20on=20the=20she?= =?UTF-8?q?et=20index,=20PDF=20v3=20export=20with=20v2=20archive=20import;?= =?UTF-8?q?=20legacy=20registry,=20matchers,=20editors=20and=20assets=20re?= =?UTF-8?q?moved?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 7 +- apps/app/package.json | 3 +- apps/app/public/pathology-editor.html | 1700 ------ apps/app/scripts/scaffold-species.mjs | 238 - apps/app/src/anatomy/drawing.ts | 97 + apps/app/src/anatomy/labels.ts | 19 - apps/app/src/anatomy/svgConvention.ts | 107 - apps/app/src/anatomy/svgLoader.ts | 17 - apps/app/src/anatomy/types.ts | 55 - apps/app/src/app/App.tsx | 9 +- apps/app/src/app/routes/EditorRoute.tsx | 590 +-- apps/app/src/app/routes/EditorsRoute.tsx | 42 - apps/app/src/app/routes/HomeRoute.tsx | 74 +- apps/app/src/app/routes/NewReportRoute.tsx | 95 +- apps/app/src/app/routes/NotFoundRoute.tsx | 8 +- apps/app/src/app/routes/SvgEditorRoute.tsx | 1858 ------- apps/app/src/components/brand/Footer.tsx | 10 +- .../src/components/canvas/AnatomyCanvas.tsx | 148 +- .../app/src/components/canvas/DetailModal.tsx | 25 +- .../observation/FindingsTreePicker.tsx | 185 +- .../observation/LateralityPicker.tsx | 2 +- .../observation/ObservationCard.tsx | 295 +- .../observation/ObservationList.tsx | 14 +- .../observation/SeveritySelector.tsx | 22 +- .../components/observation/VertebraPicker.tsx | 123 +- apps/app/src/components/report/AnimalForm.tsx | 53 +- .../src/components/report/ConclusionPanel.tsx | 23 +- .../report/NextAppointmentPicker.tsx | 2 +- .../components/report/PractitionerForm.tsx | 32 +- .../src/components/report/ReportHeader.tsx | 7 +- apps/app/src/components/ui/Card.tsx | 6 +- apps/app/src/components/ui/Chip.tsx | 5 +- apps/app/src/components/ui/Dialog.tsx | 12 +- apps/app/src/components/ui/Input.tsx | 25 +- apps/app/src/components/ui/Select.tsx | 29 +- apps/app/src/components/ui/Textarea.tsx | 25 +- apps/app/src/domain/schema/animal.ts | 17 - apps/app/src/domain/schema/findings.ts | 67 - apps/app/src/domain/schema/observation.ts | 61 - apps/app/src/domain/schema/practitioner.ts | 11 - apps/app/src/domain/schema/report.ts | 33 - apps/app/src/domain/species/equine/index.ts | 18 - .../domain/species/equine/pathologies.json | 4616 ----------------- .../src/domain/species/equine/pathologies.ts | 13 - apps/app/src/domain/species/registry.ts | 57 - apps/app/src/domain/species/types.ts | 32 - apps/app/src/i18n/en.ts | 136 +- apps/app/src/i18n/fr.ts | 144 +- apps/app/src/lib/dates.ts | 3 +- apps/app/src/lib/spineZones.ts | 131 - apps/app/src/lib/zoneMatch.ts | 130 - apps/app/src/pdf/attachment.ts | 114 +- apps/app/src/pdf/export.ts | 108 +- apps/app/src/pdf/import.ts | 22 +- apps/app/src/pdf/render/conclusionPage.ts | 18 +- apps/app/src/pdf/render/footer.ts | 13 +- apps/app/src/pdf/render/header.ts | 2 +- apps/app/src/pdf/render/observationPage.ts | 372 +- apps/app/src/pdf/render/svgToPng.ts | 7 +- apps/app/src/services/sheetIndex.ts | 113 + apps/app/src/services/zoneInteraction.ts | 213 + apps/app/src/sheets/provider.ts | 83 + apps/app/src/sheets/useSheet.ts | 54 + apps/app/src/sheets/virtual-sheet.d.ts | 3 + apps/app/src/state/persistence.ts | 41 + apps/app/src/state/practitionerCache.ts | 5 +- apps/app/src/state/reportStore.ts | 262 +- apps/app/src/styles/svg-editor.css | 528 -- apps/app/tests/helpers/sheet.ts | 39 + apps/app/tests/unit/anatomy.horse.test.ts | 72 - .../tests/unit/anatomy.svgConvention.test.ts | 99 - apps/app/tests/unit/anatomy.svgLoader.test.ts | 23 - apps/app/tests/unit/char.catalog.test.ts | 169 - apps/app/tests/unit/char.clickChain.test.tsx | 293 -- apps/app/tests/unit/char.i18nSpecies.test.tsx | 127 - .../tests/unit/char.pathologyEditor.test.ts | 146 - apps/app/tests/unit/char.pdfFull.test.ts | 250 - .../tests/unit/char.schemaPersistence.test.ts | 115 - .../tests/unit/char.svgCatalogLink.test.ts | 222 - .../unit/components.AnatomyCanvas.test.tsx | 131 +- .../components.FindingsTreePicker.test.tsx | 344 +- .../unit/components.LanguageSwitcher.test.tsx | 10 +- .../unit/components.VertebraPicker.test.tsx | 157 +- apps/app/tests/unit/lib.spineZones.test.ts | 120 - apps/app/tests/unit/lib.zoneMatch.test.ts | 154 - .../tests/unit/pdf.attachment.inflate.test.ts | 4 +- apps/app/tests/unit/pdf.attachment.test.ts | 41 +- apps/app/tests/unit/pdf.roundtrip.test.ts | 404 +- apps/app/tests/unit/pdf.svgToPng.test.ts | 23 +- apps/app/tests/unit/pdf.zoneLabels.test.ts | 96 - .../tests/unit/routes.EditorRoute.test.tsx | 198 + .../app/tests/unit/schema.observation.test.ts | 157 - apps/app/tests/unit/schema.report.test.ts | 53 - .../unit/services.zoneInteraction.test.ts | 214 + apps/app/tests/unit/sheets.provider.test.ts | 113 + apps/app/tests/unit/smoke.test.ts | 23 +- .../tests/unit/species.equineFindings.test.ts | 52 - apps/app/tests/unit/species.registry.test.ts | 24 - apps/app/tests/unit/state.draftMirror.test.ts | 35 - .../unit/state.reportStore.restore.test.ts | 58 - .../unit/state.reportStore.setters.test.ts | 56 - apps/app/tests/unit/state.reportStore.test.ts | 223 +- apps/app/tsconfig.node.json | 16 +- apps/app/vite.config.ts | 23 +- apps/app/vite/sheet-bundle.ts | 95 + apps/app/vitest.config.ts | 8 + docs/ADDING-A-SPECIES.md | 230 - docs/ANATOMY-SVG-CONVENTION.md | 179 - package.json | 4 +- packages/anatomy/src/legacy/sources.ts | 8 +- .../equine/legacy-sources}/Horse.svg | 0 .../equine/legacy-sources}/Horse_head.svg | 0 .../equine/legacy-sources}/pathologies.json | 0 .../equine/legacy-sources}/vertebrae.ts | 0 114 files changed, 3560 insertions(+), 14637 deletions(-) delete mode 100644 apps/app/public/pathology-editor.html delete mode 100755 apps/app/scripts/scaffold-species.mjs create mode 100644 apps/app/src/anatomy/drawing.ts delete mode 100644 apps/app/src/anatomy/labels.ts delete mode 100644 apps/app/src/anatomy/svgConvention.ts delete mode 100644 apps/app/src/anatomy/svgLoader.ts delete mode 100644 apps/app/src/anatomy/types.ts delete mode 100644 apps/app/src/app/routes/EditorsRoute.tsx delete mode 100644 apps/app/src/app/routes/SvgEditorRoute.tsx delete mode 100644 apps/app/src/domain/schema/animal.ts delete mode 100644 apps/app/src/domain/schema/findings.ts delete mode 100644 apps/app/src/domain/schema/observation.ts delete mode 100644 apps/app/src/domain/schema/practitioner.ts delete mode 100644 apps/app/src/domain/schema/report.ts delete mode 100644 apps/app/src/domain/species/equine/index.ts delete mode 100644 apps/app/src/domain/species/equine/pathologies.json delete mode 100644 apps/app/src/domain/species/equine/pathologies.ts delete mode 100644 apps/app/src/domain/species/registry.ts delete mode 100644 apps/app/src/domain/species/types.ts delete mode 100644 apps/app/src/lib/spineZones.ts delete mode 100644 apps/app/src/lib/zoneMatch.ts create mode 100644 apps/app/src/services/sheetIndex.ts create mode 100644 apps/app/src/services/zoneInteraction.ts create mode 100644 apps/app/src/sheets/provider.ts create mode 100644 apps/app/src/sheets/useSheet.ts create mode 100644 apps/app/src/sheets/virtual-sheet.d.ts create mode 100644 apps/app/src/state/persistence.ts delete mode 100644 apps/app/src/styles/svg-editor.css create mode 100644 apps/app/tests/helpers/sheet.ts delete mode 100644 apps/app/tests/unit/anatomy.horse.test.ts delete mode 100644 apps/app/tests/unit/anatomy.svgConvention.test.ts delete mode 100644 apps/app/tests/unit/anatomy.svgLoader.test.ts delete mode 100644 apps/app/tests/unit/char.catalog.test.ts delete mode 100644 apps/app/tests/unit/char.clickChain.test.tsx delete mode 100644 apps/app/tests/unit/char.i18nSpecies.test.tsx delete mode 100644 apps/app/tests/unit/char.pathologyEditor.test.ts delete mode 100644 apps/app/tests/unit/char.pdfFull.test.ts delete mode 100644 apps/app/tests/unit/char.schemaPersistence.test.ts delete mode 100644 apps/app/tests/unit/char.svgCatalogLink.test.ts delete mode 100644 apps/app/tests/unit/lib.spineZones.test.ts delete mode 100644 apps/app/tests/unit/lib.zoneMatch.test.ts delete mode 100644 apps/app/tests/unit/pdf.zoneLabels.test.ts create mode 100644 apps/app/tests/unit/routes.EditorRoute.test.tsx delete mode 100644 apps/app/tests/unit/schema.observation.test.ts delete mode 100644 apps/app/tests/unit/schema.report.test.ts create mode 100644 apps/app/tests/unit/services.zoneInteraction.test.ts create mode 100644 apps/app/tests/unit/sheets.provider.test.ts delete mode 100644 apps/app/tests/unit/species.equineFindings.test.ts delete mode 100644 apps/app/tests/unit/species.registry.test.ts delete mode 100644 apps/app/tests/unit/state.draftMirror.test.ts delete mode 100644 apps/app/tests/unit/state.reportStore.restore.test.ts delete mode 100644 apps/app/tests/unit/state.reportStore.setters.test.ts create mode 100644 apps/app/vite/sheet-bundle.ts delete mode 100644 docs/ADDING-A-SPECIES.md delete mode 100644 docs/ANATOMY-SVG-CONVENTION.md rename {apps/app/public/species/equine => supabase/seed/anatomical-sheets/equine/legacy-sources}/Horse.svg (100%) rename {apps/app/public/species/equine => supabase/seed/anatomical-sheets/equine/legacy-sources}/Horse_head.svg (100%) rename {apps/app/public/species/equine => supabase/seed/anatomical-sheets/equine/legacy-sources}/pathologies.json (100%) rename {apps/app/src/domain/species/equine => supabase/seed/anatomical-sheets/equine/legacy-sources}/vertebrae.ts (100%) diff --git a/Dockerfile b/Dockerfile index 27e293d4..e5ae5525 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,12 @@ COPY packages/supabase/package.json packages/supabase/ RUN pnpm install --frozen-lockfile -# Copy source and build the private app only +# Copy source and build the private app only. +# SHEET_BUNDLE=draft embeds the reference equine DRAFT (medically unvalidated) +# into the bundle for a preview deployment; the default image carries no sheet +# (BDR-037, Step 5 D2): `docker build --build-arg SHEET_BUNDLE=draft .` +ARG SHEET_BUNDLE=none +ENV SHEET_BUNDLE=$SHEET_BUNDLE COPY . . RUN pnpm --filter @faunosteo/app build diff --git a/apps/app/package.json b/apps/app/package.json index 32ae0698..6e9b44a5 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -11,8 +11,7 @@ "typecheck": "tsc -p tsconfig.json --noEmit", "test": "vitest", "test:run": "vitest run", - "lint": "eslint . --max-warnings 0", - "scaffold:species": "node scripts/scaffold-species.mjs" + "lint": "eslint . --max-warnings 0" }, "dependencies": { "@faunosteo/anatomy": "workspace:*", diff --git a/apps/app/public/pathology-editor.html b/apps/app/public/pathology-editor.html deleted file mode 100644 index adb79e21..00000000 --- a/apps/app/public/pathology-editor.html +++ /dev/null @@ -1,1700 +0,0 @@ - - - - - - - Faunosteo — Éditeur de pathologies - - - -
-
- Faunosteo - -
-
- - -
-
- -
-
-
-
-
- -
-
-

-
-
- -
- - -
-
- - - - diff --git a/apps/app/scripts/scaffold-species.mjs b/apps/app/scripts/scaffold-species.mjs deleted file mode 100755 index c6f03e51..00000000 --- a/apps/app/scripts/scaffold-species.mjs +++ /dev/null @@ -1,238 +0,0 @@ -#!/usr/bin/env node -/** - * Scaffolds a new species: prompts for the few required values then - * writes the boilerplate that the auto-discovery registry expects. - * - * Run via: pnpm scaffold:species - * or: node scripts/scaffold-species.mjs - * - * The script never touches existing files — it refuses to write if any - * of the targets already exist, so you can rerun it after fixing typos - * without losing work. SVG assets are NOT created; drop them in - * `public/species//` yourself after the script finishes. - */ - -import { existsSync } from 'node:fs' -import { mkdir, writeFile } from 'node:fs/promises' -import { dirname, resolve } from 'node:path' -import { fileURLToPath } from 'node:url' -import readline from 'node:readline/promises' -import { stdin as input, stdout as output } from 'node:process' - -const HERE = dirname(fileURLToPath(import.meta.url)) -const PROJECT_ROOT = resolve(HERE, '..') - -const rl = readline.createInterface({ input, output }) - -async function ask(question, fallback) { - const suffix = fallback === undefined ? '' : ` [${fallback}]` - const raw = (await rl.question(`${question}${suffix}: `)).trim() - return raw || (fallback ?? '') -} - -async function askRequired(question, validate) { - while (true) { - const v = (await rl.question(`${question}: `)).trim() - if (!v) { - console.log(' (required)') - continue - } - if (validate) { - const err = validate(v) - if (err) { - console.log(` ${err}`) - continue - } - } - return v - } -} - -async function askPositiveInt(question, fallback) { - while (true) { - const v = await ask(question, String(fallback)) - const n = Number(v) - if (Number.isInteger(n) && n > 0) return n - console.log(' enter a positive integer') - } -} - -function isKebab(s) { - return /^[a-z][a-z0-9-]*$/.test(s) -} - -function capitalize(s) { - return s.charAt(0).toUpperCase() + s.slice(1) -} - -function indexTs({ id, labelFr, labelEn, mainSvgPath, details, formulaConstName }) { - const detailLines = details - .map((d) => ` ${d.key}: '${d.path}',`) - .join('\n') - return `import type { SpeciesManifest } from '@/domain/species/types' -import { ${formulaConstName} } from './vertebrae' - -const ${id}: SpeciesManifest = { - id: '${id}', - labelFr: '${labelFr.replace(/'/g, "\\'")}', - labelEn: '${labelEn.replace(/'/g, "\\'")}', - mainSvg: '${mainSvgPath}', - details: { -${detailLines} - }, - vertebralFormula: ${formulaConstName}, - findings: () => import('./pathologies'), -} - -// Default export is the convention picked up by the registry's -// import.meta.glob() auto-discovery. -export default ${id} -` -} - -function vertebraeTs({ formulaConstName, labelFr, formula }) { - return `import type { VertebralFormula } from '@/domain/species/types' - -/** Vertebral formula for ${labelFr}. Adjust to species-specific anatomy. */ -export const ${formulaConstName}: VertebralFormula = { - C: ${formula.C}, - T: ${formula.T}, - L: ${formula.L}, - S: ${formula.S}, - Cd: ${formula.Cd}, -} -` -} - -function pathologiesTs() { - return `import { - SpeciesFindingsSchema, - type SpeciesFindings, -} from '@/domain/schema/findings' -import data from './pathologies.json' - -const FINDINGS: SpeciesFindings = SpeciesFindingsSchema.parse(data) - -export default FINDINGS -` -} - -function pathologiesJsonTemplate({ id, labelFr, labelEn }) { - return JSON.stringify( - { - schema_version: '1.1', - scope_disclaimer: - "Les éléments listés correspondent au périmètre légal de l'ostéopathie animale : dysfonctions ostéopathiques palpées, observations cliniques et motifs de consultation. Aucun diagnostic médical n'est posé. Toute pathologie organique relève du vétérinaire.", - species: { - id, - name_fr: labelFr, - name_en: labelEn, - }, - zones: {}, - }, - null, - 2, - ) -} - -async function collectDetails() { - const details = [] - console.log('\nDetail popup SVGs (optional — leave key blank to stop).') - console.log(' Each "key" must match a data-anno-opens-detail value on a hitbox in the main SVG.') - for (;;) { - const key = (await rl.question(' detail key (e.g. head, patte): ')).trim() - if (!key) return details - if (!isKebab(key)) { - console.log(' → key must be kebab-case (lowercase, hyphen-separated). Try again.') - continue - } - const path = await askRequired( - ` detail SVG path for "${key}" (e.g. /species/canine/Dog_head.svg)`, - (v) => (v.startsWith('/species/') ? '' : ' path must start with /species/'), - ) - details.push({ key, path }) - } -} - -async function main() { - console.log('\nZoosteo — new species scaffold') - console.log('-----------------------------------\n') - - const id = await askRequired( - 'species id (kebab-case, e.g. canine, feline, bovine)', - (v) => (isKebab(v) ? '' : 'must be kebab-case (lowercase letters / digits / hyphens; start with a letter)'), - ) - const labelFr = await askRequired('display label (FR), e.g. "Chien"') - const labelEn = await ask('display label (EN), e.g. "Dog"', capitalize(id)) - const assetFolder = await ask( - 'public asset folder under /species/', - id, - ) - const mainSvgFile = await askRequired( - `main SVG filename in /public/species/${assetFolder}/ (e.g. Dog.svg)`, - ) - const mainSvgPath = `/species/${assetFolder}/${mainSvgFile}` - - const details = await collectDetails() - - console.log('\nVertebral formula (counts per region):') - const formula = { - C: await askPositiveInt(' cervical (C)', 7), - T: await askPositiveInt(' thoracic (T)', 13), - L: await askPositiveInt(' lumbar (L)', 6), - S: await askPositiveInt(' sacral (S)', 5), - Cd: await askPositiveInt(' caudal (Cd)', 18), - } - - const formulaConstName = `${id.replace(/-/g, '_').toUpperCase()}_VERTEBRAL_FORMULA` - const speciesDir = resolve(PROJECT_ROOT, 'src/domain/species', id) - const targets = { - 'index.ts': indexTs({ id, labelFr, labelEn, mainSvgPath, details, formulaConstName }), - 'vertebrae.ts': vertebraeTs({ formulaConstName, labelFr, formula }), - 'pathologies.ts': pathologiesTs(), - 'pathologies.json': pathologiesJsonTemplate({ id, labelFr, labelEn }), - } - - // Refuse to clobber. - for (const file of Object.keys(targets)) { - const p = resolve(speciesDir, file) - if (existsSync(p)) { - console.error(`\n✖ ${p} already exists. Aborting to protect existing work.`) - process.exit(1) - } - } - - await mkdir(speciesDir, { recursive: true }) - for (const [file, body] of Object.entries(targets)) { - await writeFile(resolve(speciesDir, file), body) - } - - const publicDir = resolve(PROJECT_ROOT, 'public/species', assetFolder) - await mkdir(publicDir, { recursive: true }) - - console.log(`\n✓ Created src/domain/species/${id}/`) - for (const file of Object.keys(targets)) console.log(` - ${file}`) - console.log(`✓ Ensured public/species/${assetFolder}/ exists`) - - console.log('\nNext steps:') - console.log(` 1. Drop your SVG assets into public/species/${assetFolder}/`) - console.log(` - main: ${mainSvgFile}`) - for (const d of details) { - const file = d.path.split('/').pop() - console.log(` - detail "${d.key}": ${file}`) - } - console.log(` 2. Author the findings tree in src/domain/species/${id}/pathologies.json`) - console.log(` (schema documented in src/domain/schema/findings.ts).`) - console.log(` 3. Adjust the vertebral counts in vertebrae.ts if needed.`) - console.log(` 4. Run: pnpm typecheck && pnpm test:run && pnpm dev`) - console.log(' The new species will appear automatically in the animal picker.\n') -} - -main() - .catch((err) => { - console.error('Scaffold failed:', err) - process.exit(1) - }) - .finally(() => { - rl.close() - }) diff --git a/apps/app/src/anatomy/drawing.ts b/apps/app/src/anatomy/drawing.ts new file mode 100644 index 00000000..cbee6683 --- /dev/null +++ b/apps/app/src/anatomy/drawing.ts @@ -0,0 +1,97 @@ +import { + createLayerElement, + renderAnnotationLayer, + viewBoxOf, +} from '@faunosteo/anatomy/render' +import type { SheetView } from '@faunosteo/domain' +import type { SheetIndex } from '@/services/sheetIndex' + +/** + * Builds the inline SVG of one view: the sheet's drawing (sanitised asset + * text) framed on the view's box, plus the annotation layer generated from + * the document. The drawing is parsed once per asset and cloned per view. + */ + +const SVG_NS = 'http://www.w3.org/2000/svg' +const FORBIDDEN_TAGS = ['script', 'foreignObject', 'iframe', 'object', 'embed'] + +export type ViewStates = ReadonlyMap + +/** Drops scripts, embedded documents, event handlers and script URLs (LRN-025). */ +export function sanitizeSvg(root: Element): void { + for (const tag of FORBIDDEN_TAGS) { + for (const el of Array.from(root.getElementsByTagName(tag))) el.remove() + } + for (const el of Array.from(root.querySelectorAll('*'))) { + for (const attr of Array.from(el.attributes)) { + const name = attr.name.toLowerCase() + const value = attr.value.trim().toLowerCase() + if (name.startsWith('on') || value.startsWith('javascript:')) { + el.removeAttribute(attr.name) + } + } + } +} + +export function parseDrawing(svgText: string): SVGSVGElement { + const doc = new DOMParser().parseFromString(svgText, 'image/svg+xml') + if (doc.querySelector('parsererror')) throw new Error('invalid SVG asset') + const root = doc.documentElement + if (root.tagName.toLowerCase() !== 'svg') + throw new Error('asset root is not ') + sanitizeSvg(root) + return root as unknown as SVGSVGElement +} + +const parsed = new Map() + +function drawingOf(index: SheetIndex, assetId: string): SVGSVGElement { + const key = `${index.sheet.ref.documentSha256}:${assetId}` + let root = parsed.get(key) + if (!root) { + const text = index.sheet.assets[assetId] + if (text === undefined) throw new Error(`asset ${assetId} not bundled`) + root = parseDrawing(text) + parsed.set(key, root) + } + return root +} + +/** The asset a view draws: its own, else its parent's (a crop). */ +export function assetOfView(index: SheetIndex, view: SheetView): string { + if (view.svg_asset_id) return view.svg_asset_id + if (view.kind === 'detail') { + const parent = index.view(view.parent_view_id) + if (parent) return assetOfView(index, parent) + } + throw new Error(`view ${view.id} has no asset`) +} + +export function buildViewSvg( + index: SheetIndex, + viewId: string, + states: ViewStates, +): SVGSVGElement { + const view = index.view(viewId) + if (!view) throw new Error(`unknown view ${viewId}`) + const source = drawingOf(index, assetOfView(index, view)) + const svg = document.createElementNS(SVG_NS, 'svg') + for (const attr of Array.from(source.attributes)) { + if (attr.name === 'width' || attr.name === 'height') continue + svg.setAttribute(attr.name, attr.value) + } + svg.setAttribute( + 'viewBox', + viewBoxOf(view) ?? source.getAttribute('viewBox') ?? '0 0 100 100', + ) + for (const child of Array.from(source.childNodes)) { + svg.appendChild(document.importNode(child, true)) + } + const layer = renderAnnotationLayer({ + document: index.sheet.document, + viewId, + states, + }) + svg.appendChild(createLayerElement(document, layer) as unknown as Node) + return svg +} diff --git a/apps/app/src/anatomy/labels.ts b/apps/app/src/anatomy/labels.ts deleted file mode 100644 index fe2f0fed..00000000 --- a/apps/app/src/anatomy/labels.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { Locale } from '@/i18n/types' -import { pickLocaleLabel } from '@/i18n/pickLocaleLabel' -import type { Bone } from './types' - -/** - * Resolves the user-facing label for an anatomical zone given the active - * locale. Falls back to the opposite language when the requested one is - * missing (some SVG hitboxes carry only `data-anno-name-fr`), then to the - * provided fallback (typically the raw boneId) so the UI never renders - * an empty label. - */ -export function boneLabel( - bone: Bone | undefined, - locale: Locale, - fallback: string, -): string { - if (!bone) return fallback - return pickLocaleLabel(bone.fr, bone.en, locale, fallback) -} diff --git a/apps/app/src/anatomy/svgConvention.ts b/apps/app/src/anatomy/svgConvention.ts deleted file mode 100644 index 67c0c3cc..00000000 --- a/apps/app/src/anatomy/svgConvention.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { SvgConventionError } from './types' -import type { Bone, BoneCategory } from './types' - -/** - * Validates that an annotated SVG element carries the two attributes the - * application needs to wire it up: a stable id (`data-anno-id`) and a - * category bucket (`data-anno-category`). Labels (`data-anno-name-fr/en`) - * and the popup trigger (`data-anno-opens-detail`) are optional and - * checked only at use-site. - * - * The category value itself is opaque to the application — any non-empty - * string is accepted. New SVGs are free to introduce new categories - * without touching this parser. - */ -function validateBoneElement(el: Element): void { - const boneId = el.getAttribute('data-anno-id') ?? '' - if (!boneId) { - throw new SvgConventionError( - 'Element with missing data-anno-id', - boneId, - 'data-anno-id', - ) - } - const cat = el.getAttribute('data-anno-category') ?? '' - if (!cat) { - throw new SvgConventionError( - `Element data-anno-id="${boneId}" missing attribute data-anno-category`, - boneId, - 'data-anno-category', - ) - } -} - -/** - * Parses an SVG document and returns a map of `data-anno-id` → Bone. - * - * Every element carrying `data-anno-id` is collected. Multiple elements - * may share the same id (e.g. hitbox + visible layer); they all end up - * grouped under the same Bone with all elements in `els`. - * - * Throws `SvgConventionError` only on the two required attributes - * (`data-anno-id`, `data-anno-category`). Labels are optional. - */ -export function parseSvgBones(svgRoot: SVGSVGElement): Map { - const map = new Map() - const all = svgRoot.querySelectorAll('[data-anno-id]') - all.forEach((el) => { - validateBoneElement(el) - const id = el.getAttribute('data-anno-id') as string - const fr = el.getAttribute('data-anno-name-fr') ?? '' - const en = el.getAttribute('data-anno-name-en') ?? '' - const category = el.getAttribute('data-anno-category') as BoneCategory - const opensDetail = - el.getAttribute('data-anno-opens-detail') ?? undefined - const special = el.getAttribute('data-anno-special') ?? undefined - const lateral = (el.getAttribute('data-anno-lateral') ?? undefined) as - | 'bilateral' - | 'unpaired' - | undefined - - const existing = map.get(id) - if (existing) { - existing.els.push(el) - if (opensDetail && !existing.opensDetail) { - existing.opensDetail = opensDetail - } - if (special && !existing.special) { - existing.special = special - } - if (lateral && !existing.lateral) { - existing.lateral = lateral - } - if (!existing.fr && fr) existing.fr = fr - if (!existing.en && en) existing.en = en - } else { - map.set(id, { - id, - fr, - en, - category, - opensDetail, - special, - lateral, - els: [el], - }) - } - }) - return map -} - -/** - * Walks up from `event.target` to find the nearest element carrying - * `data-anno-id`. Returns null when the click did not land on an - * annotated element. - */ -export function getBoneIdFromEvent(event: Event): string | null { - return getAnnotatedElement(event)?.getAttribute('data-anno-id') || null -} - -export function getAnnotatedElement(event: Event): Element | null { - let node = event.target as Element | null - while (node && node.nodeType === 1) { - if (node.hasAttribute('data-anno-id')) return node - node = node.parentElement - } - return null -} diff --git a/apps/app/src/anatomy/svgLoader.ts b/apps/app/src/anatomy/svgLoader.ts deleted file mode 100644 index 2084f78b..00000000 --- a/apps/app/src/anatomy/svgLoader.ts +++ /dev/null @@ -1,17 +0,0 @@ -export async function loadSvg(publicPath: string): Promise { - const resp = await fetch(publicPath) - if (!resp.ok) { - throw new Error(`Failed to load SVG ${publicPath}: HTTP ${resp.status}`) - } - const text = await resp.text() - const doc = new DOMParser().parseFromString(text, 'image/svg+xml') - const parseErr = doc.querySelector('parsererror') - if (parseErr) { - throw new Error(`Invalid SVG at ${publicPath}: ${parseErr.textContent}`) - } - const root = doc.documentElement - if (root.tagName.toLowerCase() !== 'svg') { - throw new Error(`Root element of ${publicPath} is not `) - } - return root as unknown as SVGSVGElement -} diff --git a/apps/app/src/anatomy/types.ts b/apps/app/src/anatomy/types.ts deleted file mode 100644 index f0c3c03c..00000000 --- a/apps/app/src/anatomy/types.ts +++ /dev/null @@ -1,55 +0,0 @@ -/** - * `data-anno-category` is a free-form string supplied by the SVG. - * - * The application never branches on category values — it treats every - * annotation the same way. Categories are kept around because they're - * useful for grouping and future filtering, but no code path here may - * rely on a closed set. - */ -export type BoneCategory = string - -/** - * Logical annotation as parsed from an SVG. All DOM elements sharing the - * same `data-anno-id` are grouped into one Bone. `id` is the persisted - * identifier surfaced in the report JSON contract - * (`ObservationZone.boneId`); keep it stable across SVG renames. - */ -export interface Bone { - id: string - /** French label from data-anno-name-fr — may be empty for opens-detail-only triggers */ - fr: string - /** English label from data-anno-name-en — may be empty */ - en: string - /** Raw value from data-anno-category — opaque to the application */ - category: BoneCategory - /** Detail popup id from data-anno-opens-detail, if present */ - opensDetail?: string - /** - * Free-form behavior hint from `data-anno-special`. - * - * Known values consumed by the application: - * - `vertebral-precision`: clicking the zone opens VertebraPicker. - * - * Opaque to the parser; new values are accepted without code changes. - */ - special?: string - /** Laterality hint from data-anno-lateral — bilateral or unpaired */ - lateral?: 'bilateral' | 'unpaired' - /** All DOM elements carrying this annotation (used for colorization) */ - els: Element[] -} - -/** Visual state applied to SVG elements (active-observation highlight). */ -export type BoneState = 'current' | 'default' - -/** Error thrown when SVG violates the convention. */ -export class SvgConventionError extends Error { - constructor( - message: string, - public readonly boneId: string, - public readonly missingAttribute: string, - ) { - super(message) - this.name = 'SvgConventionError' - } -} diff --git a/apps/app/src/app/App.tsx b/apps/app/src/app/App.tsx index 706094d9..349d4e24 100644 --- a/apps/app/src/app/App.tsx +++ b/apps/app/src/app/App.tsx @@ -1,15 +1,12 @@ -import { BrowserRouter, Routes, Route, useLocation } from 'react-router-dom' +import { BrowserRouter, Routes, Route } from 'react-router-dom' import { ConfigProvider } from './providers/ConfigProvider' import Footer from '@/components/brand/Footer' import HomeRoute from './routes/HomeRoute' import NewReportRoute from './routes/NewReportRoute' import EditorRoute from './routes/EditorRoute' -import SvgEditorRoute from './routes/SvgEditorRoute' -import EditorsRoute from './routes/EditorsRoute' import NotFoundRoute from './routes/NotFoundRoute' function AppShell() { - const hideFooter = useLocation().pathname === '/svg-editor' return (
@@ -17,12 +14,10 @@ function AppShell() { } /> } /> } /> - } /> - } /> } />
- {!hideFooter &&
} +
) } diff --git a/apps/app/src/app/routes/EditorRoute.tsx b/apps/app/src/app/routes/EditorRoute.tsx index d1d6d4c1..e5617411 100644 --- a/apps/app/src/app/routes/EditorRoute.tsx +++ b/apps/app/src/app/routes/EditorRoute.tsx @@ -1,12 +1,16 @@ -import { useEffect, useMemo, useState } from 'react' +import { useCallback, useEffect, useMemo, useState } from 'react' import { useNavigate } from 'react-router-dom' +import type { + Animal, + LateralSide, + Owner, + Practitioner, +} from '@faunosteo/domain' import AnatomyCanvas from '@/components/canvas/AnatomyCanvas' import DetailModal from '@/components/canvas/DetailModal' import ObservationList from '@/components/observation/ObservationList' import VertebraPicker from '@/components/observation/VertebraPicker' -import { regionFromLabel } from '@/lib/spineZones' import LateralityPicker from '@/components/observation/LateralityPicker' -import type { LateralSide } from '@/domain/schema/observation' import ConclusionPanel from '@/components/report/ConclusionPanel' import ReportHeader from '@/components/report/ReportHeader' import PractitionerForm from '@/components/report/PractitionerForm' @@ -15,315 +19,155 @@ import Button from '@/components/ui/Button' import Dialog from '@/components/ui/Dialog' import { useReportStore } from '@/state/reportStore' import { writeCachedPractitioner } from '@/state/practitionerCache' -import { getSpecies } from '@/domain/species/registry' -import { loadSvg } from '@/anatomy/svgLoader' -import { parseSvgBones } from '@/anatomy/svgConvention' -import { collectSpineVertebrae, syncSpineZones } from '@/lib/spineZones' -import type { Bone, BoneState } from '@/anatomy/types' -import type { Observation, ObservationZone } from '@/domain/schema/observation' -import type { Report } from '@/domain/schema/report' -import type { SpeciesFindings } from '@/domain/schema/findings' -import type { Practitioner } from '@/domain/schema/practitioner' -import type { Animal, Owner } from '@/domain/schema/animal' +import { useLocaleStore } from '@/state/localeStore' +import { useSheet } from '@/sheets/useSheet' +import { isObservable, pickLabel, type SheetIndex } from '@/services/sheetIndex' +import { + addSides, + collectVertebrae, + decideZoneClick, + ensureZone, + refOf, + removeAllSides, + removeZoneAt, + sidesPresent, + syncVertebrae, + toggleZone, + type ZoneRef, +} from '@/services/zoneInteraction' +import type { ViewStates } from '@/anatomy/drawing' import { exportReportToPdf } from '@/pdf/export' import { useT } from '@/i18n/useT' -import { useLocaleStore } from '@/state/localeStore' -import { boneLabel } from '@/anatomy/labels' +import { DEFAULT_SPECIES_ID } from './NewReportRoute' const DISCLAIMER_FLAG = 'osteo:disclaimer-shown' -/** Merges newly parsed bones into the accumulated map without overwriting. */ -function mergeBones(prev: Map, parsed: Map) { - const merged = new Map(prev) - parsed.forEach((b, id) => { - if (!merged.has(id)) merged.set(id, b) - }) - return merged +interface Identity { + practitioner: Practitioner + animal: Animal + owner: Owner } +/** Editor on the reference sheet: wires the canvas, the pickers and the store. */ export default function EditorRoute() { const navigate = useNavigate() const t = useT() const locale = useLocaleStore((s) => s.locale) - const report = useReportStore((s) => s.report) - const activeIndex = useReportStore((s) => s.activeObservationIndex) - const addObservation = useReportStore((s) => s.addObservation) - const updateObservation = useReportStore((s) => s.updateObservation) - const removeObservation = useReportStore((s) => s.removeObservation) - const moveObservationUp = useReportStore((s) => s.moveObservationUp) - const moveObservationDown = useReportStore((s) => s.moveObservationDown) - const setActiveObservation = useReportStore((s) => s.setActiveObservation) - const setConclusion = useReportStore((s) => s.setConclusion) - const setRecommendations = useReportStore((s) => s.setRecommendations) - const setNextAppointment = useReportStore((s) => s.setNextAppointment) - const setPractitioner = useReportStore((s) => s.setPractitioner) - const setAnimal = useReportStore((s) => s.setAnimal) - const setOwner = useReportStore((s) => s.setOwner) + const store = useReportStore() + const { report, activeObservationIndex: activeIndex } = store + // Without a report yet (draft restore), the default species' sheet carries the migration map. + const sheet = useSheet(report?.animal.speciesId ?? DEFAULT_SPECIES_ID) - const [bones, setBones] = useState>(new Map()) - const [detailBones, setDetailBones] = useState>(new Map()) - const [findings, setFindings] = useState(null) - const [disclaimer, setDisclaimer] = useState(null) - const [detail, setDetail] = useState<{ - id: string - src: string - title: string - } | null>(null) + const [detailViewId, setDetailViewId] = useState(null) const [vertebraTarget, setVertebraTarget] = useState(null) - const [lateralTarget, setLateralTarget] = useState<{ - boneId: string - detailSourceId?: string - } | null>(null) + const [lateralTarget, setLateralTarget] = useState(null) + const [disclaimer, setDisclaimer] = useState(null) const [exporting, setExporting] = useState(false) - const [editOpen, setEditOpen] = useState(false) - const [editDraft, setEditDraft] = useState<{ - practitioner: Practitioner - animal: Animal - owner: Owner - } | null>(null) - - function openEditInfos() { - if (!report) return - setEditDraft({ - practitioner: report.practitioner, - animal: report.animal, - owner: report.owner, - }) - setEditOpen(true) - } - - function closeEditInfos() { - setEditOpen(false) - setEditDraft(null) - } - - function saveEditInfos() { - if (!editDraft) return closeEditInfos() - const name = editDraft.practitioner.name.trim() - const animalName = editDraft.animal.name.trim() - const ownerName = editDraft.owner.name.trim() - if (!name || !animalName || !ownerName) return - setPractitioner(editDraft.practitioner) - setAnimal(editDraft.animal) - setOwner(editDraft.owner) - writeCachedPractitioner(editDraft.practitioner) - closeEditInfos() - } - - function acknowledgeDisclaimer() { - if (typeof sessionStorage !== 'undefined') { - sessionStorage.setItem(DISCLAIMER_FLAG, '1') - } - setDisclaimer(null) - } - - useEffect(() => { - if (!report) navigate('/') - }, [report, navigate]) + const [editDraft, setEditDraft] = useState(null) useEffect(() => { window.scrollTo({ top: 0, left: 0, behavior: 'auto' }) }, []) - const species = useMemo( - () => (report ? getSpecies(report.animal.speciesId) : undefined), - [report], - ) + // No report in memory: restore the per-tab draft once the sheet is known. + useEffect(() => { + if (report) return + if (sheet.status === 'ready') + store.restoreDraft(sheet.index.sheet.migrationMap) + if (sheet.status !== 'loading' && !useReportStore.getState().report) + navigate('/') + }, [report, sheet, store, navigate]) useEffect(() => { - if (!species) return - loadSvg(species.mainSvg).then((root) => setBones(parseSvgBones(root))) - species.findings().then((m) => setFindings(m.default)) - - // Eagerly preload every detail SVG so observation zones imported - // from a PDF (which can carry detail-popup boneIds without the user - // ever re-opening the popup) resolve their labels and findings - // pickers immediately on mount. Each fetch is independent — a 404 - // on one detail asset must not prevent the others from loading. - Object.values(species.details).forEach((path) => { - loadSvg(path) - .then((root) => { - const parsed = parseSvgBones(root) - setDetailBones((prev) => mergeBones(prev, parsed)) - }) - .catch((err) => { - console.warn(`EditorRoute: failed to preload detail SVG ${path}`, err) - }) - }) - }, [species]) - - useEffect(() => { - if (!findings) return - if (typeof sessionStorage === 'undefined') return + if (sheet.status !== 'ready' || typeof sessionStorage === 'undefined') + return if (sessionStorage.getItem(DISCLAIMER_FLAG)) return - setDisclaimer(findings.scope_disclaimer) - }, [findings]) - - useEffect(() => { - if (!detail) return - let cancelled = false - loadSvg(detail.src).then((root) => { - if (cancelled) return - const parsed = parseSvgBones(root) - setDetailBones((prev) => mergeBones(prev, parsed)) - }) - return () => { - cancelled = true - } - }, [detail]) - - const allBones = useMemo(() => { - const m = new Map(bones) - detailBones.forEach((b, id) => { - if (!m.has(id)) m.set(id, b) - }) - return m - }, [bones, detailBones]) + const text = sheet.index.sheet.document.scope_disclaimer + setDisclaimer( + pickLabel({ fr: text.fr ?? '', en: text.en ?? '' }, locale) || null, + ) + }, [sheet, locale]) const activeObs = activeIndex >= 0 ? report?.observations[activeIndex] : undefined - const boneStates = useMemo>(() => { - const map = new Map() - if (!report || activeIndex < 0) return map - const active = report.observations[activeIndex] - if (!active) return map - active.zones.forEach((z) => { - map.set(z.boneId, 'current') - }) + const states = useMemo(() => { + const map = new Map() + activeObs?.zones.forEach((z) => map.set(z.annotationId, 'current')) return map - }, [report, activeIndex]) + }, [activeObs]) - function onToggleCard(index: number) { - setActiveObservation(activeIndex === index ? -1 : index) - } - - /** Opens the detail-popup modal for a bone that carries data-anno-opens-detail. */ - function handleDetailOpen(bone: Bone, detailId: string, detailSrc: string) { - setDetail({ - id: detailId, - src: detailSrc, - title: boneLabel(bone, locale, detailId), - }) - } - - /** - * No expanded observation — auto-expand the most recent one (or the - * first if no rows yet) so the click lands somewhere. Defers the actual - * zone add to the next render where activeObs is set. - */ - function activateFallbackObservation(report: Report) { - const fallbackIndex = - report.observations.length > 0 ? report.observations.length - 1 : -1 - if (fallbackIndex < 0) return - setActiveObservation(fallbackIndex) - } - - /** - * Spine-zone behavior: always open VertebraPicker on click. Adds the - * zone if missing; never toggles it off here (use the ✕ button). - */ - function handleSpineZone( - activeObs: Observation, - boneId: string, - detailSourceId: string | undefined, - existingIndex: number, - ) { - let targetIndex = existingIndex - if (existingIndex < 0) { - const newZone: ObservationZone = { - boneId, - ...(detailSourceId ? { detailSourceId } : {}), + const onZoneClick = useCallback( + (annotationId: string) => { + // Fresh state: two clicks may land before React re-renders the handler. + const { report, activeObservationIndex: activeIndex } = + useReportStore.getState() + if (sheet.status !== 'ready' || !report) return + const activeObs = + activeIndex >= 0 ? report.observations[activeIndex] : undefined + const index = sheet.index + const annotation = index.annotation(annotationId) + const decision = decideZoneClick(annotation, activeObs) + if (!annotation) return + switch (decision.kind) { + case 'ignore': + return + case 'open_view': + return setDetailViewId(decision.viewId) + case 'activate_fallback': + return store.setActiveObservation(report.observations.length - 1) + case 'open_vertebra_picker': { + const { observation, index: zoneIndex } = ensureZone( + activeObs!, + annotation, + ) + store.updateObservation(activeIndex, observation) + return setVertebraTarget(zoneIndex) + } + case 'open_laterality_picker': + return setLateralTarget(refOf(annotation)) + case 'remove_both_sides': + return store.updateObservation( + activeIndex, + removeAllSides(activeObs!, refOf(annotation)), + ) + case 'toggle': + return store.updateObservation( + activeIndex, + toggleZone(activeObs!, annotation), + ) } - const nextZones = [...activeObs.zones, newZone] - targetIndex = nextZones.length - 1 - updateObservation(activeIndex, { ...activeObs, zones: nextZones }) - } - setVertebraTarget(targetIndex) + }, + [sheet, store], + ) + + function acknowledgeDisclaimer() { + sessionStorage?.setItem(DISCLAIMER_FLAG, '1') + setDisclaimer(null) } - /** Bilateral zone: adding a side, or clearing both once left+right are set. */ - function handleBilateralZone( - activeObs: Observation, - boneId: string, - detailSourceId: string | undefined, - ) { - const sidesPresent = activeObs.zones - .filter( - (z) => z.boneId === boneId && z.detailSourceId === detailSourceId, - ) - .map((z) => z.side) - .filter(Boolean) as LateralSide[] - - if (sidesPresent.includes('left') && sidesPresent.includes('right')) { - const nextZones = activeObs.zones.filter( - (z) => !(z.boneId === boneId && z.detailSourceId === detailSourceId), - ) - updateObservation(activeIndex, { ...activeObs, zones: nextZones }) + function saveEditInfos() { + if (!editDraft) return + if ( + ![ + editDraft.practitioner.name, + editDraft.animal.name, + editDraft.owner.name, + ].every((v) => v.trim()) + ) return - } - - setLateralTarget({ - boneId, - ...(detailSourceId ? { detailSourceId } : {}), - }) + store.setPractitioner(editDraft.practitioner) + store.setAnimal(editDraft.animal) + store.setOwner(editDraft.owner) + writeCachedPractitioner(editDraft.practitioner) + setEditDraft(null) } - /** Plain zone: toggles it on the active observation. */ - function toggleZone( - activeObs: Observation, - boneId: string, - detailSourceId: string | undefined, - existingIndex: number, - ) { - const newZone: ObservationZone = { - boneId, - ...(detailSourceId ? { detailSourceId } : {}), - } - const nextZones = - existingIndex >= 0 - ? activeObs.zones.filter((_, k) => k !== existingIndex) - : [...activeObs.zones, newZone] - updateObservation(activeIndex, { ...activeObs, zones: nextZones }) - } - - function onZoneClick(boneId: string, detailSourceId?: string) { - if (!report) return - const bone = bones.get(boneId) ?? detailBones.get(boneId) - if (!bone) return - - if (bone.opensDetail && species?.details[bone.opensDetail]) { - handleDetailOpen(bone, bone.opensDetail, species.details[bone.opensDetail]) - return - } - - if (!activeObs || activeIndex < 0) { - activateFallbackObservation(report) - return - } - - const matches = (z: ObservationZone) => - z.boneId === boneId && z.detailSourceId === detailSourceId - const existingIndex = activeObs.zones.findIndex(matches) - - if (bone.special === 'vertebral-precision') { - handleSpineZone(activeObs, boneId, detailSourceId, existingIndex) - return - } - - if (bone.lateral === 'bilateral') { - handleBilateralZone(activeObs, boneId, detailSourceId) - return - } - - toggleZone(activeObs, boneId, detailSourceId, existingIndex) - } - - async function onExport() { + async function onExport(index: SheetIndex) { if (!report) return setExporting(true) try { - const bytes = await exportReportToPdf(report, { locale }) + const bytes = await exportReportToPdf(report, index, { locale }) const blob = new Blob([bytes as BlobPart], { type: 'application/pdf' }) const url = URL.createObjectURL(blob) const a = document.createElement('a') @@ -339,73 +183,109 @@ export default function EditorRoute() { } } - if (!report || !species) return null + if (!report) return null + if (sheet.status === 'loading') { + return ( +

+ {t('sheet.loading')} +

+ ) + } + if (sheet.status === 'none') return null + const index = sheet.index + const vertebraZone = + vertebraTarget !== null ? activeObs?.zones[vertebraTarget] : undefined + const vertebraAnnotation = + vertebraZone && index.annotation(vertebraZone.annotationId) + const lateralAnnotation = + lateralTarget && index.annotation(lateralTarget.annotationId) + const detailView = detailViewId ? index.view(detailViewId) : undefined return (
- + + setEditDraft({ + practitioner: report.practitioner, + animal: report.animal, + owner: report.owner, + }) + } + />
-
+
onZoneClick(id)} + index={index} + viewId={index.mainView.id} + states={states} + onZoneClick={onZoneClick} + className="flex-1" /> +

+ {t( + index.sheet.status === 'draft' + ? 'sheet.status.draft' + : 'sheet.status.published', + )} +

updateObservation(i, next)} + onToggle={(i) => + store.setActiveObservation(activeIndex === i ? -1 : i) + } + onAdd={store.addObservation} + onDelete={store.removeObservation} + onMoveUp={store.moveObservationUp} + onMoveDown={store.moveObservationDown} + sheet={index} + onChange={store.updateObservation} onOpenVertebraPicker={(_i, zoneIndex) => setVertebraTarget(zoneIndex) } onRemoveZone={(i, zoneIndex) => { const obs = report.observations[i] - if (!obs) return - const zones = obs.zones.filter((_, k) => k !== zoneIndex) - updateObservation(i, { ...obs, zones }) + if (obs) store.updateObservation(i, removeZoneAt(obs, zoneIndex)) }} />
-
- {detail && ( + {detailView && ( setDetail(null)} - detailSrc={detail.src} - detailId={detail.id} - title={`${t('editor.detail_title_prefix')}${detail.title}`} - boneStates={boneStates} - onZoneClick={(id, did) => onZoneClick(id, did)} + onClose={() => setDetailViewId(null)} + index={index} + viewId={detailView.id} + title={pickLabel(detailView.name, locale)} + states={states} + onZoneClick={onZoneClick} /> )} {editDraft && ( setEditDraft(null)} title={t('editor.edit_dialog_title')} size="lg" > @@ -419,6 +299,9 @@ export default function EditorRoute() { setEditDraft((d) => (d ? { ...d, animal: next } : d)) } @@ -427,15 +310,17 @@ export default function EditorRoute() { } />
- +
@@ -463,86 +350,45 @@ export default function EditorRoute() { {vertebraTarget !== null && activeObs && - activeObs.zones[vertebraTarget] && ( + vertebraZone && + isObservable(vertebraAnnotation) && ( setVertebraTarget(null)} onConfirm={(vertebrae) => { const fresh = useReportStore.getState().report?.observations[activeIndex] - if (!fresh?.zones[vertebraTarget]) { - setVertebraTarget(null) - return + if (fresh) { + store.updateObservation( + activeIndex, + syncVertebrae(fresh, vertebrae, index, vertebraZone.viewId), + ) } - // Picker edits every region at once: reconcile all spine zones — - // spawn newly picked regions, prune emptied ones, keep the rest. - const next = syncSpineZones(fresh.zones, vertebrae, bones) - updateObservation(activeIndex, { ...fresh, zones: next }) setVertebraTarget(null) }} - initial={collectSpineVertebrae( - activeObs.zones, - bones, - activeObs.zones[vertebraTarget].boneId, - )} - formula={species.vertebralFormula} - title={`${t('vertebra.title_prefix')}${boneLabel( - bones.get(activeObs.zones[vertebraTarget].boneId), - locale, - '', - )}`} - initialRegion={(() => { - const b = bones.get(activeObs.zones[vertebraTarget].boneId) - return regionFromLabel(b?.fr ?? '') ?? regionFromLabel(b?.en ?? '') - })()} + initial={collectVertebrae(activeObs, index, vertebraTarget)} + regions={index.regions()} + title={`${t('vertebra.title_prefix')}${pickLabel(vertebraAnnotation.name, locale)}`} + initialRegion={ + vertebraAnnotation.vertebral_region_code ?? undefined + } /> )} - {lateralTarget && activeObs && ( + {lateralTarget && activeObs && lateralAnnotation && ( setLateralTarget(null)} - title={boneLabel( - allBones.get(lateralTarget.boneId), - locale, - lateralTarget.boneId, - )} - existingSides={ - activeObs.zones - .filter( - (z) => - z.boneId === lateralTarget.boneId && - z.detailSourceId === lateralTarget.detailSourceId && - z.side, - ) - .map((z) => z.side!) as LateralSide[] - } - onSelect={(sides) => { + title={pickLabel(index.name(lateralAnnotation), locale)} + existingSides={sidesPresent(activeObs, lateralTarget)} + onSelect={(sides: LateralSide[]) => { const fresh = useReportStore.getState().report?.observations[activeIndex] - if (!fresh) { - setLateralTarget(null) - return - } - const newSideZones = sides - .filter( - (side) => - !fresh.zones.some( - (z) => - z.boneId === lateralTarget.boneId && - z.detailSourceId === lateralTarget.detailSourceId && - z.side === side, - ), + if (fresh) + store.updateObservation( + activeIndex, + addSides(fresh, lateralAnnotation, sides), ) - .map((side) => ({ - boneId: lateralTarget.boneId, - ...(lateralTarget.detailSourceId - ? { detailSourceId: lateralTarget.detailSourceId } - : {}), - side, - })) - const nextZones = [...fresh.zones, ...newSideZones] - updateObservation(activeIndex, { ...fresh, zones: nextZones }) setLateralTarget(null) }} /> diff --git a/apps/app/src/app/routes/EditorsRoute.tsx b/apps/app/src/app/routes/EditorsRoute.tsx deleted file mode 100644 index b795ddd2..00000000 --- a/apps/app/src/app/routes/EditorsRoute.tsx +++ /dev/null @@ -1,42 +0,0 @@ -import { Link } from 'react-router-dom' -import AppHeader from '@/components/brand/AppHeader' -import Card from '@/components/ui/Card' -import { useT } from '@/i18n/useT' - -export default function EditorsRoute() { - const t = useT() - - return ( -
- -
-
- -

{t('editors.svg.title')}

-

- {t('editors.svg.description')} -

- - {t('editors.svg.cta')} - -
- -

{t('editors.pathology.title')}

-

- {t('editors.pathology.description')} -

- - {t('editors.pathology.cta')} - -
-
-
-
- ) -} diff --git a/apps/app/src/app/routes/HomeRoute.tsx b/apps/app/src/app/routes/HomeRoute.tsx index fa7ace68..0d0e61c6 100644 --- a/apps/app/src/app/routes/HomeRoute.tsx +++ b/apps/app/src/app/routes/HomeRoute.tsx @@ -5,25 +5,42 @@ import Button from '@/components/ui/Button' import Card from '@/components/ui/Card' import { importReportFromPdf, ImportError } from '@/pdf/import' import { useReportStore } from '@/state/reportStore' +import { useSheet } from '@/sheets/useSheet' +import { DEFAULT_SPECIES_ID } from './NewReportRoute' import { useT } from '@/i18n/useT' export default function HomeRoute() { const navigate = useNavigate() const fileRef = useRef(null) const hydrate = useReportStore((s) => s.hydrateReport) + const sheet = useSheet(DEFAULT_SPECIES_ID) const [error, setError] = useState(null) const [busy, setBusy] = useState(false) const t = useT() async function onPickFile(e: React.ChangeEvent) { const file = e.target.files?.[0] - if (!file) return + if (!file || sheet.status !== 'ready') return setBusy(true) setError(null) try { const bytes = new Uint8Array(await file.arrayBuffer()) - const report = await importReportFromPdf(bytes) - hydrate(report) + const outcome = await importReportFromPdf( + bytes, + sheet.index.sheet.migrationMap, + ) + if ( + outcome.migrated && + outcome.unresolvedFindings + outcome.unresolvedZones > 0 + ) { + window.alert( + t('home.import.migrated').replace( + '{count}', + String(outcome.unresolvedFindings + outcome.unresolvedZones), + ), + ) + } + hydrate(outcome.report) navigate('/editor') } catch (err) { if (err instanceof ImportError) { @@ -48,21 +65,58 @@ export default function HomeRoute() { } } + const noSheet = sheet.status === 'none' + return (
+ {noSheet && ( + +

+ {t('home.no_sheet.title')} +

+

+ {t('home.no_sheet.description')} +

+
+ )} -

{t('home.new_report.title')}

-

{t('home.new_report.description')}

- +

+ {t('home.new_report.title')} +

+

+ {t('home.new_report.description')} +

+
-

{t('home.import.title')}

-

{t('home.import.description')}

- - {error &&

{error}

} diff --git a/apps/app/src/app/routes/NewReportRoute.tsx b/apps/app/src/app/routes/NewReportRoute.tsx index 4bd0c003..e4dbdad1 100644 --- a/apps/app/src/app/routes/NewReportRoute.tsx +++ b/apps/app/src/app/routes/NewReportRoute.tsx @@ -1,5 +1,6 @@ import { useEffect, useState } from 'react' import { useNavigate } from 'react-router-dom' +import type { Animal, Owner, Practitioner } from '@faunosteo/domain' import PractitionerForm from '@/components/report/PractitionerForm' import AnimalForm from '@/components/report/AnimalForm' import AppHeader from '@/components/brand/AppHeader' @@ -7,18 +8,29 @@ import Button from '@/components/ui/Button' import Input from '@/components/ui/Input' import Label from '@/components/ui/Label' import { todayIso } from '@/lib/dates' -import { readCachedPractitioner, writeCachedPractitioner } from '@/state/practitionerCache' +import { + readCachedPractitioner, + writeCachedPractitioner, +} from '@/state/practitionerCache' import { useReportStore } from '@/state/reportStore' +import { useSheet } from '@/sheets/useSheet' import { useT } from '@/i18n/useT' +/** The one species this build ships a sheet for. */ +export const DEFAULT_SPECIES_ID = 'equine' + export default function NewReportRoute() { const navigate = useNavigate() const initReport = useReportStore((s) => s.initReport) const t = useT() + const sheet = useSheet(DEFAULT_SPECIES_ID) - const [practitioner, setPractitioner] = useState({ name: '' }) - const [animal, setAnimal] = useState({ speciesId: 'equine', name: '' }) - const [owner, setOwner] = useState({ name: '' }) + const [practitioner, setPractitioner] = useState({ name: '' }) + const [animal, setAnimal] = useState({ + speciesId: DEFAULT_SPECIES_ID, + name: '', + }) + const [owner, setOwner] = useState({ name: '' }) const [date, setDate] = useState(todayIso()) useEffect(() => { @@ -26,20 +38,27 @@ export default function NewReportRoute() { if (cached) setPractitioner(cached) }, []) - const canSubmit = practitioner.name.trim() && animal.name.trim() && owner.name.trim() + const canSubmit = + practitioner.name.trim() && + animal.name.trim() && + owner.name.trim() && + sheet.status === 'ready' function submit() { - if (!canSubmit) return + if (!canSubmit || sheet.status !== 'ready') return writeCachedPractitioner(practitioner) - initReport({ - date, - practitioner, - animal, - owner, - observations: [], - conclusion: '', - recommendations: '', - }) + initReport( + { + date, + practitioner, + animal, + owner, + observations: [], + conclusion: '', + recommendations: '', + }, + sheet.index.sheet.ref, + ) navigate('/editor') } @@ -47,16 +66,52 @@ export default function NewReportRoute() {
-

{t('new_report.title')}

+

+ {t('new_report.title')} +

+ {sheet.status === 'none' && ( +

+ {t('home.no_sheet.description')} +

+ )}
- setDate(e.target.value)} /> + setDate(e.target.value)} + />
- +
- - + +
diff --git a/apps/app/src/app/routes/NotFoundRoute.tsx b/apps/app/src/app/routes/NotFoundRoute.tsx index 7367e553..30e48ada 100644 --- a/apps/app/src/app/routes/NotFoundRoute.tsx +++ b/apps/app/src/app/routes/NotFoundRoute.tsx @@ -9,8 +9,12 @@ export default function NotFoundRoute() {

{t('not_found.title')}

-

{t('not_found.description')}

- +

+ {t('not_found.description')} +

+
) diff --git a/apps/app/src/app/routes/SvgEditorRoute.tsx b/apps/app/src/app/routes/SvgEditorRoute.tsx deleted file mode 100644 index e234961e..00000000 --- a/apps/app/src/app/routes/SvgEditorRoute.tsx +++ /dev/null @@ -1,1858 +0,0 @@ -import { useEffect, useRef } from 'react' -import { Link } from 'react-router-dom' -import AppHeader from '@/components/brand/AppHeader' -import { useT } from '@/i18n/useT' -import { useLocaleStore } from '@/state/localeStore' -import { getDict } from '@/i18n/index' -import type { Locale } from '@/i18n/types' -import { getAllSpecies, speciesLabel } from '@/domain/species/registry' -import '@/styles/svg-editor.css' - -type TFn = (key: string) => string - -export default function SvgEditorRoute() { - const canvasRef = useRef(null) - const canvasInnerRef = useRef(null) - const sidebarRef = useRef(null) - const cleanupRef = useRef<(() => void) | null>(null) - const t = useT() - const locale = useLocaleStore((s) => s.locale) - - useEffect(() => { - const meta = document.createElement('meta') - meta.name = 'robots' - meta.content = 'noindex,nofollow' - document.head.appendChild(meta) - return () => { - document.head.removeChild(meta) - } - }, []) - - useEffect(() => { - const canvas = canvasRef.current - const canvasInner = canvasInnerRef.current - const sidebar = sidebarRef.current - if (!canvas || !canvasInner || !sidebar) return - - const dict = getDict(locale) - const tFn: TFn = (key: string) => dict[key] ?? key - const cleanup = initSvgEditor(canvas, canvasInner, sidebar, tFn, locale) - cleanupRef.current = cleanup - - return () => { - cleanup() - cleanupRef.current = null - } - // Re-init when locale changes so all vanilla JS strings update - }, [locale]) - - return ( -
- - -
-
-
-
-
- -
-
-
- - ← - -
-

{t('svg_editor.title')}

-
{t('svg_editor.subtitle')}
-
-
-
- -
-
-

{t('svg_editor.file')}

- - - -
- -
-

{t('svg_editor.mode')}

- - - -
- - -
- - - - -
-
- -
-

{t('svg_editor.selected_element')}

-
- — -
- -
- -
- - -
-
- -
- - - - - - - - - - -
- - -
-
-
- -
- - -
-
-
-
- {t('svg_editor.polygon_editing')} -
- {t('svg_editor.polygon_drag')} -
- {t('svg_editor.polygon_insert')} -
- {t('svg_editor.polygon_delete')} -
- -
-
- -
-
- -
-

- {t('svg_editor.elements')} (0) -

- -
-
-
-
-
-
- ) -} - -function initSvgEditor( - canvas: HTMLDivElement, - canvasInner: HTMLDivElement, - _sidebar: HTMLDivElement, - t: TFn, - locale: Locale, -): () => void { - const ac = new AbortController() - const sig = { signal: ac.signal } - - let mode = 'select' - let selected: SVGElement | null = null - let polygonPoints: number[][] = [] - let dragging: SVGElement | null = null - let draggingHandle: { - vIdx: number - points: number[][] - originalPoint: number[] - polygon: SVGElement - } | null = null - let dragStart: { - x: number - y: number - snap?: ReturnType - siblingSnaps?: { el: SVGElement; snap: ReturnType }[] - } | null = null - let zoom = 1 - let svgRoot: SVGSVGElement | null = null - - const CATEGORY_TEMPLATES: Record = { - articulation: { color: '#fb5607', name: 'Articulations' }, - charniere: { color: '#d00000', name: 'Charnieres vertebrales' }, - 'cadran-crane': { color: '#06a77d', name: 'Cadrans du crane' }, - 'os-overlay': { color: '#f72585', name: 'Os overlay' }, - 'spine-zone': { color: '#7209b7', name: 'Zones colonne' }, - } - let CATEGORIES: Record< - string, - { color: string; name: string; visible: boolean; special?: string } - > = {} - - const DETAIL_ZONE_STYLE = { - fill: '#808080', - fillOpacity: '0.20', - stroke: '#606060', - strokeWidth: '2', - strokeDasharray: '8,4', - } - - const SPECIAL_BEHAVIORS = [ - { id: 'vertebral-precision', desc: 'Specify which vertebrae are involved' }, - { id: 'joint-detail', desc: 'Detail a joint (mobility, pain, etc.)' }, - ] - - const zoomContainer = document.getElementById('svg-editor-zoom-controls') - if (zoomContainer) { - zoomContainer.textContent = '' - const btnIn = document.createElement('button') - btnIn.textContent = '+' - btnIn.addEventListener('click', () => { - zoom *= 1.2 - applyZoom() - }, sig) - const btnOut = document.createElement('button') - btnOut.textContent = '−' - btnOut.addEventListener('click', () => { - zoom /= 1.2 - applyZoom() - }, sig) - const btnReset = document.createElement('button') - btnReset.textContent = '⌂' - btnReset.addEventListener('click', () => { - zoom = 1 - applyZoom() - }, sig) - zoomContainer.append(btnIn, btnOut, btnReset) - } - - let loadedFileName = 'horse_anatomy_edited.svg' - - const speciesList = getAllSpecies() - - setupGlobalListeners() - setupGlobalDragDrop() - showWelcomeScreen() - - function showWelcomeScreen() { - canvasInner.textContent = '' - const welcome = document.createElement('div') - welcome.className = 'welcome' - welcome.id = 'svg-editor-welcome' - - const icon = document.createElement('div') - icon.className = 'welcome-icon' - icon.textContent = '📐' - - const h2 = document.createElement('h2') - h2.textContent = t('svg_editor.welcome_title') - - const p = document.createElement('p') - p.textContent = t('svg_editor.welcome_text') - const code1 = document.createElement('code') - code1.textContent = 'data-anno-id' - const code2 = document.createElement('code') - code2.textContent = 'data-anno-category' - p.appendChild(code1) - p.appendChild(document.createTextNode(' & ')) - p.appendChild(code2) - p.appendChild(document.createTextNode(t('svg_editor.welcome_text_suffix'))) - - const tabBar = document.createElement('div') - tabBar.className = 'welcome-tabs' - const tabProject = document.createElement('button') - tabProject.className = 'welcome-tab active' - tabProject.textContent = t('svg_editor.source_project') - const tabUpload = document.createElement('button') - tabUpload.className = 'welcome-tab' - tabUpload.textContent = t('svg_editor.source_upload') - tabBar.append(tabProject, tabUpload) - - const tabContent = document.createElement('div') - tabContent.className = 'welcome-tab-content' - - function showProjectTab() { - tabProject.classList.add('active') - tabUpload.classList.remove('active') - tabContent.textContent = '' - buildProjectPicker(tabContent) - } - - function showUploadTab() { - tabUpload.classList.add('active') - tabProject.classList.remove('active') - tabContent.textContent = '' - buildUploadPicker(tabContent) - } - - tabProject.addEventListener('click', showProjectTab) - tabUpload.addEventListener('click', showUploadTab) - - welcome.append(icon, h2, p, tabBar, tabContent) - canvasInner.appendChild(welcome) - - showProjectTab() - - svgRoot = null - CATEGORIES = {} - selected = null - dragging = null - draggingHandle = null - refreshCategoryList() - refreshCategorySelects() - getEl('svg-editor-count').textContent = '0' - getEl('svg-editor-element-list').textContent = '' - getEl('svg-editor-edit-section').style.display = 'none' - getEl('svg-editor-file-btn').textContent = t('svg_editor.choose_file') - } - - function buildProjectPicker(container: HTMLElement) { - const speciesLabelEl = document.createElement('label') - speciesLabelEl.textContent = t('svg_editor.species') - const speciesSel = document.createElement('select') - speciesList.forEach((sp) => { - const opt = document.createElement('option') - opt.value = sp.id - opt.textContent = speciesLabel(sp, locale) - speciesSel.appendChild(opt) - }) - - const viewLabel = document.createElement('label') - viewLabel.textContent = t('svg_editor.view') - const viewSel = document.createElement('select') - - function populateViews() { - viewSel.textContent = '' - const sp = speciesList.find((s) => s.id === speciesSel.value) - if (!sp) return - const mainOpt = document.createElement('option') - mainOpt.value = sp.mainSvg - mainOpt.textContent = t('svg_editor.view_main') - viewSel.appendChild(mainOpt) - for (const [detailId, detailPath] of Object.entries(sp.details)) { - const opt = document.createElement('option') - opt.value = detailPath - opt.textContent = t('svg_editor.view_detail').replace('{name}', detailId) - viewSel.appendChild(opt) - } - } - populateViews() - speciesSel.addEventListener('change', populateViews) - - const loadBtn = document.createElement('button') - loadBtn.className = 'primary welcome-btn' - loadBtn.textContent = t('svg_editor.load') - loadBtn.addEventListener('click', () => { - const svgPath = viewSel.value - if (!svgPath) return - loadBtn.disabled = true - loadBtn.textContent = '...' - fetch(svgPath) - .then((r) => { - if (!r.ok) throw new Error(r.statusText) - return r.text() - }) - .then((svgText) => { - const filename = svgPath.split('/').pop() || 'anatomy_edited.svg' - loadedFileName = filename.replace('.svg', '_edited.svg') - loadSVG(svgText) - getEl('svg-editor-file-btn').textContent = t('svg_editor.change_file') - }) - .catch(() => { - alert(t('svg_editor.alert_invalid_svg')) - loadBtn.disabled = false - loadBtn.textContent = t('svg_editor.load') - }) - }) - - container.append(speciesLabelEl, speciesSel, viewLabel, viewSel, loadBtn) - } - - function buildUploadPicker(container: HTMLElement) { - const btn = document.createElement('button') - btn.className = 'primary welcome-btn' - btn.textContent = t('svg_editor.choose_file') - btn.addEventListener('click', () => { - const fi = document.getElementById('svg-editor-file-import') as HTMLInputElement | null - fi?.click() - }) - - const hint = document.createElement('div') - hint.className = 'welcome-hint' - hint.textContent = t('svg_editor.welcome_drag_hint') - - container.append(btn, hint) - } - - function setupGlobalDragDrop() { - canvas.addEventListener('dragover', (e) => { - e.preventDefault() - canvas.classList.add('dragging-over') - }, sig) - canvas.addEventListener('dragleave', (e) => { - if (e.target === canvas) canvas.classList.remove('dragging-over') - }, sig) - canvas.addEventListener('drop', (e) => { - e.preventDefault() - canvas.classList.remove('dragging-over') - const file = e.dataTransfer?.files[0] - if (file && (file.name.endsWith('.svg') || file.type === 'image/svg+xml')) { - loadedFileName = file.name.replace('.svg', '_edited.svg') - const reader = new FileReader() - reader.onload = (ev) => { - loadSVG(ev.target?.result as string) - getEl('svg-editor-file-btn').textContent = t('svg_editor.change_file') - } - reader.readAsText(file, 'UTF-8') - } else { - alert(t('svg_editor.alert_drop_svg')) - } - }, sig) - } - - /** Strip active content from an untrusted SVG: scripts, foreignObject, - * event-handler attributes (root included) and javascript: hrefs. */ - function sanitizeSvg(root: Element) { - root.querySelectorAll('script, foreignObject').forEach((el) => el.remove()) - for (const el of [root, ...root.querySelectorAll('*')]) { - for (const attr of [...el.attributes]) { - const isHandler = /^on/i.test(attr.name) - const isJsHref = /href$/i.test(attr.name) && /^\s*javascript:/i.test(attr.value) - if (isHandler || isJsHref) el.removeAttribute(attr.name) - } - } - } - - function loadSVG(svgText: string) { - const parser = new DOMParser() - const doc = parser.parseFromString(svgText, 'image/svg+xml') - const parsedSvg = doc.querySelector('svg') - if (!parsedSvg) { - alert(t('svg_editor.alert_invalid_svg')) - showWelcomeScreen() - return - } - - const imported = document.importNode(parsedSvg, true) - sanitizeSvg(imported) - canvasInner.textContent = '' - canvasInner.appendChild(imported) - svgRoot = canvasInner.querySelector('svg') - if (!svgRoot) { - alert(t('svg_editor.alert_invalid_svg')) - showWelcomeScreen() - return - } - - if (!svgRoot.getAttribute('viewBox')) { - const wAttr = svgRoot.getAttribute('width') - const hAttr = svgRoot.getAttribute('height') - const w = wAttr ? parseFloat(wAttr) : 1000 - const h = hAttr ? parseFloat(hAttr) : 1000 - svgRoot.setAttribute('viewBox', `0 0 ${w} ${h}`) - } - - svgRoot.removeAttribute('width') - svgRoot.removeAttribute('height') - - CATEGORIES = {} - selected = null - dragging = null - draggingHandle = null - zoom = 1 - - migrateOldAttributes() - normalizeDetailZones() - fixDuplicateIds() - detectCategories() - applyAllCategoryColors() - - setupSVGListeners() - refreshCategoryList() - refreshCategorySelects() - refreshElementList() - } - - function normalizeDetailZones() { - if (!svgRoot) return - svgRoot.querySelectorAll('[data-anno-opens-detail]').forEach((el) => { - el.classList.add('detail-zone') - if (el.getAttribute('fill') !== 'transparent') { - el.setAttribute('fill', DETAIL_ZONE_STYLE.fill) - if (!el.getAttribute('fill-opacity')) { - el.setAttribute('fill-opacity', DETAIL_ZONE_STYLE.fillOpacity) - } - if (el.tagName.toLowerCase() === 'polygon') { - el.setAttribute('stroke', DETAIL_ZONE_STYLE.stroke) - if (!el.getAttribute('stroke-dasharray')) { - el.setAttribute('stroke-dasharray', DETAIL_ZONE_STYLE.strokeDasharray) - } - } - } - }) - } - - function migrateOldAttributes() { - if (!svgRoot) return - const MIGRATIONS: [string, string][] = [ - ['data-bone-id', 'data-anno-id'], - ['data-bone-fr', 'data-anno-name-fr'], - ['data-bone-en', 'data-anno-name-en'], - ['data-category', 'data-anno-category'], - ['data-opens-detail', 'data-anno-opens-detail'], - ] - MIGRATIONS.forEach(([oldAttr, newAttr]) => { - svgRoot!.querySelectorAll(`[${oldAttr}]`).forEach((el) => { - if (!el.hasAttribute(newAttr)) { - el.setAttribute(newAttr, el.getAttribute(oldAttr)!) - } - el.removeAttribute(oldAttr) - }) - }) - } - - function fixDuplicateIds() { - if (!svgRoot) return - const byId: Record> = {} - svgRoot.querySelectorAll('[data-anno-id]').forEach((el) => { - const id = el.getAttribute('data-anno-id')! - const cat = el.getAttribute('data-anno-category') || 'unknown' - if (!byId[id]) byId[id] = {} - if (!byId[id][cat]) byId[id][cat] = [] - byId[id][cat].push(el) - }) - - for (const [id, byCat] of Object.entries(byId)) { - const cats = Object.keys(byCat) - if (cats.length > 1) { - cats.slice(1).forEach((cat) => { - const newId = id + '-' + cat - byCat[cat].forEach((el) => { - el.setAttribute('data-anno-id', newId) - if (el.getAttribute('id') === id) el.setAttribute('id', newId) - }) - }) - } - } - } - - function detectCategories() { - if (!svgRoot) return - svgRoot.querySelectorAll('[data-anno-category]').forEach((el) => { - const cat = el.getAttribute('data-anno-category')! - const special = el.getAttribute('data-anno-special') || '' - const storedName = el.getAttribute('data-anno-category-name') || '' - - if (CATEGORIES[cat]) { - if (special && !CATEGORIES[cat].special) { - CATEGORIES[cat].special = special - } - if (storedName && CATEGORIES[cat].name === cat) { - CATEGORIES[cat].name = storedName - } - return - } - - if (CATEGORY_TEMPLATES[cat]) { - CATEGORIES[cat] = { ...CATEGORY_TEMPLATES[cat], visible: true } - } else { - const sample = svgRoot!.querySelector( - `[data-anno-category="${cat}"]:not([fill="transparent"])`, - ) - const fill = sample ? sample.getAttribute('fill') : null - const color = fill && fill.startsWith('#') ? fill : '#00aaff' - CATEGORIES[cat] = { color, name: storedName || cat, visible: true } - } - if (special) CATEGORIES[cat].special = special - }) - } - - function applyAllCategoryColors() { - if (!svgRoot) return - for (const [cat, info] of Object.entries(CATEGORIES)) { - svgRoot.querySelectorAll(`[data-anno-category="${cat}"]`).forEach((el) => { - if (el.getAttribute('fill') === 'transparent') return - el.setAttribute('fill', info.color) - if (el.tagName.toLowerCase() === 'polygon') { - el.setAttribute('stroke', info.color) - } - }) - } - } - - function setupSVGListeners() { - if (!svgRoot) return - svgRoot.addEventListener('click', svgClickHandler, sig) - svgRoot.addEventListener('mousedown', svgMousedownHandler, sig) - svgRoot.addEventListener('contextmenu', svgContextMenuHandler, sig) - } - - function svgClickHandler(e: MouseEvent) { - if (mode === 'point') { - const p = getSVGPoint(e) - addCircleAt(p.x, p.y) - e.stopPropagation() - } else if (mode === 'polygon') { - const p = getSVGPoint(e) - polygonPoints.push([p.x, p.y]) - updatePolygonPreview() - e.stopPropagation() - } else if (mode === 'select') { - const target = e.target as Element - const midhandle = target.closest('.polygon-midhandle') - if (midhandle && selected && selected.tagName.toLowerCase() === 'polygon') { - const edgeIdx = parseInt(midhandle.getAttribute('data-edge-idx')!) - const points = parsePoints(selected.getAttribute('points')!) - const p = getSVGPoint(e) - points.splice(edgeIdx + 1, 0, [p.x, p.y]) - selected.setAttribute('points', pointsToStr(points)) - showPolygonHandles(selected) - e.stopPropagation() - return - } - if (target.closest('.polygon-handle')) { - e.stopPropagation() - return - } - const annoTarget = target.closest('[data-anno-id]') as SVGElement | null - if (annoTarget) { - selectElement(annoTarget) - e.stopPropagation() - } else { - deselect() - } - } - } - - function svgContextMenuHandler(e: MouseEvent) { - if ((e.target as Element).closest('.polygon-handle')) { - e.preventDefault() - } - } - - function svgMousedownHandler(e: MouseEvent) { - if (mode !== 'select') return - - const target = e.target as Element - const handle = target.closest('.polygon-handle') - if (handle && selected && selected.tagName.toLowerCase() === 'polygon') { - const vIdx = parseInt(handle.getAttribute('data-vertex-idx')!) - const points = parsePoints(selected.getAttribute('points')!) - - if (e.altKey || e.button === 2) { - if (points.length > 3) { - points.splice(vIdx, 1) - selected.setAttribute('points', pointsToStr(points)) - showPolygonHandles(selected) - } else { - alert(t('svg_editor.alert_min_3_vertices')) - } - e.preventDefault() - e.stopPropagation() - return - } - - const p = getSVGPoint(e) - draggingHandle = { - vIdx, - points, - originalPoint: [...points[vIdx]], - polygon: selected, - } - dragStart = { x: p.x, y: p.y } - e.preventDefault() - e.stopPropagation() - return - } - - if (target.classList.contains('polygon-midhandle')) { - return - } - - const annoTarget = target.closest('[data-anno-id]') as SVGElement | null - if (!annoTarget) return - selectElement(annoTarget) - dragging = annoTarget - const p = getSVGPoint(e) - const id = annoTarget.getAttribute('data-anno-id')! - const cat = annoTarget.getAttribute('data-anno-category') - const parent = annoTarget.parentNode as Element | null - const siblingSnaps: { el: SVGElement; snap: ReturnType }[] = [] - if (parent) { - parent.querySelectorAll(`[data-anno-id="${cssEscape(id)}"]`).forEach((sib) => { - if (sib === annoTarget) return - if (sib.getAttribute('data-anno-category') !== cat) return - const snap = snapshotPosition(sib as SVGElement) - if (snap) siblingSnaps.push({ el: sib as SVGElement, snap }) - }) - } - dragStart = { - x: p.x, - y: p.y, - snap: snapshotPosition(annoTarget), - siblingSnaps, - } - e.preventDefault() - } - - function onMouseMove(e: MouseEvent) { - if (draggingHandle) { - const p = getSVGPoint(e) - const dx = p.x - dragStart!.x - const dy = p.y - dragStart!.y - const newPoint = [ - draggingHandle.originalPoint[0] + dx, - draggingHandle.originalPoint[1] + dy, - ] - draggingHandle.points[draggingHandle.vIdx] = newPoint - draggingHandle.polygon.setAttribute( - 'points', - pointsToStr(draggingHandle.points), - ) - showPolygonHandles(draggingHandle.polygon) - return - } - - if (!dragging) return - const p = getSVGPoint(e) - const dx = p.x - dragStart!.x - const dy = p.y - dragStart!.y - moveElement(dragging, dx, dy, dragStart!.snap!) - dragStart!.siblingSnaps?.forEach(({ el: sibEl, snap }) => { - moveElement(sibEl, dx, dy, snap!) - }) - if (dragging === selected && dragging.tagName.toLowerCase() === 'polygon') { - showPolygonHandles(dragging) - } - updateCoordsDisplay() - } - - function onMouseUp() { - dragging = null - draggingHandle = null - dragStart = null - } - - function onKeyDown(e: KeyboardEvent) { - const tag = (e.target as Element).tagName - if (tag === 'INPUT' || tag === 'SELECT' || tag === 'TEXTAREA') return - if (e.key === 'Enter' && mode === 'polygon') finalizePolygon() - if (e.key === 'Escape') { - if (mode === 'polygon') cancelPolygon() - else deselect() - } - if (e.key === 'Delete' && selected) deleteSelected() - if (e.key === '1') setMode('select') - if (e.key === '2') setMode('point') - if (e.key === '3') setMode('polygon') - } - - function setupGlobalListeners() { - document.addEventListener('mousemove', onMouseMove, sig) - document.addEventListener('mouseup', onMouseUp, sig) - document.addEventListener('keydown', onKeyDown, sig) - - getEl('svg-editor-filter-input').addEventListener('input', refreshElementList, sig) - - ;['svg-editor-edit-fr', 'svg-editor-edit-en', 'svg-editor-edit-category', 'svg-editor-edit-lateral'].forEach( - (id) => { - getEl(id).addEventListener('change', applyEdit, sig) - }, - ) - - function syncSliderNum(rangeId: string, numId: string) { - const range = getEl(rangeId) as HTMLInputElement - const num = getEl(numId) as HTMLInputElement - range.addEventListener('input', () => { - num.value = range.value - if (selected) applyEdit() - }, sig) - num.addEventListener('input', () => { - const v = parseFloat(num.value) - if (!isNaN(v)) { - range.value = String( - Math.max(parseFloat(range.min), Math.min(parseFloat(range.max), v)), - ) - } - if (selected) applyEdit() - }, sig) - } - syncSliderNum('svg-editor-edit-radius', 'svg-editor-edit-radius-num') - syncSliderNum('svg-editor-edit-opacity', 'svg-editor-edit-opacity-num') - - ;(getEl('svg-editor-edit-opens-detail') as HTMLInputElement).addEventListener( - 'change', - () => { - const checked = (getEl('svg-editor-edit-opens-detail') as HTMLInputElement).checked - getEl('svg-editor-detail-target-row').style.display = checked ? 'block' : 'none' - getEl('svg-editor-osteo-fields').style.display = checked ? 'none' : 'block' - applyEdit() - }, - sig, - ) - getEl('svg-editor-edit-detail-target').addEventListener('change', applyEdit, sig) - getEl('svg-editor-edit-detail-target').addEventListener('input', () => { - if (selected) applyEdit() - }, sig) - - ;(getEl('svg-editor-file-import') as HTMLInputElement).addEventListener('change', (e) => { - const file = (e.target as HTMLInputElement).files?.[0] - if (!file) return - loadedFileName = file.name.replace('.svg', '_edited.svg') - const reader = new FileReader() - reader.onload = (ev) => { - loadSVG(ev.target?.result as string) - getEl('svg-editor-file-btn').textContent = t('svg_editor.change_file') - } - reader.readAsText(file, 'UTF-8') - ;(e.target as HTMLInputElement).value = '' - }, sig) - - getEl('svg-editor-file-btn').addEventListener('click', () => { - ;(getEl('svg-editor-file-import') as HTMLInputElement).click() - }, sig) - - getEl('svg-editor-export-btn').addEventListener('click', exportSVG, sig) - - getEl('svg-editor-mode-select').addEventListener('click', () => setMode('select'), sig) - getEl('svg-editor-mode-point').addEventListener('click', () => setMode('point'), sig) - getEl('svg-editor-mode-polygon').addEventListener('click', () => setMode('polygon'), sig) - getEl('svg-editor-finalize-polygon').addEventListener('click', finalizePolygon, sig) - getEl('svg-editor-cancel-polygon').addEventListener('click', cancelPolygon, sig) - getEl('svg-editor-add-cat-btn').addEventListener('click', addCategory, sig) - getEl('svg-editor-delete-btn').addEventListener('click', deleteSelected, sig) - getEl('svg-editor-restart-polygon').addEventListener('click', restartCurrentPolygon, sig) - } - - function getEl(id: string): HTMLElement { - return document.getElementById(id) as HTMLElement - } - - function getSVGPoint(evt: MouseEvent) { - const pt = svgRoot!.createSVGPoint() - pt.x = evt.clientX - pt.y = evt.clientY - return pt.matrixTransform(svgRoot!.getScreenCTM()!.inverse()) - } - - function setMode(m: string) { - if (!svgRoot && m !== 'select') { - alert(t('svg_editor.alert_upload_first')) - return - } - mode = m - canvas.className = 'svg-editor-canvas mode-' + m - document.querySelectorAll('[data-mode]').forEach((b) => { - b.classList.toggle('active', (b as HTMLElement).dataset.mode === m) - }) - getEl('svg-editor-polygon-controls').style.display = m === 'polygon' ? 'block' : 'none' - if (m !== 'polygon') cancelPolygon() - if (m !== 'select') { - deselect() - hidePolygonHandles() - } - } - - function snapshotPosition(svgEl: SVGElement) { - const tag = svgEl.tagName.toLowerCase() - if (tag === 'circle' || tag === 'ellipse') - return { - type: tag, - cx: parseFloat(svgEl.getAttribute('cx')!), - cy: parseFloat(svgEl.getAttribute('cy')!), - points: '', - } - if (tag === 'polygon') - return { type: 'polygon', cx: 0, cy: 0, points: svgEl.getAttribute('points')! } - return null - } - - function moveElement( - svgEl: SVGElement, - dx: number, - dy: number, - snap: NonNullable>, - ) { - if (snap.type === 'circle' || snap.type === 'ellipse') { - svgEl.setAttribute('cx', String(snap.cx + dx)) - svgEl.setAttribute('cy', String(snap.cy + dy)) - } else if (snap.type === 'polygon') { - const pts = snap.points - .split(/\s+/) - .filter((p: string) => p) - .map((p: string) => { - const [x, y] = p.split(',').map(Number) - return [(x + dx).toFixed(1), (y + dy).toFixed(1)] - }) - svgEl.setAttribute('points', pts.map((p: string[]) => p.join(',')).join(' ')) - } - } - - function cssEscape(s: string) { - return CSS.escape ? CSS.escape(s) : s.replace(/[^a-zA-Z0-9_-]/g, '\\$&') - } - - function selectElement(svgEl: SVGElement) { - deselect() - selected = svgEl - svgEl.classList.add('selected') - const id = svgEl.getAttribute('data-anno-id')! - const cat = svgEl.getAttribute('data-anno-category') - const parent = svgEl.parentNode as Element | null - if (parent) { - parent.querySelectorAll(`[data-anno-id="${cssEscape(id)}"]`).forEach((s) => { - if (s.getAttribute('data-anno-category') === cat) { - s.classList.add('selected') - } - }) - } - showEditPanel(svgEl) - if (svgEl.tagName.toLowerCase() === 'polygon') { - showPolygonHandles(svgEl) - } - refreshElementList() - } - - function deselect() { - document.querySelectorAll('.selected').forEach((svgEl) => svgEl.classList.remove('selected')) - hidePolygonHandles() - selected = null - getEl('svg-editor-edit-section').style.display = 'none' - refreshElementList() - } - - function showEditPanel(svgEl: SVGElement) { - getEl('svg-editor-edit-section').style.display = 'block' - ;(getEl('svg-editor-edit-fr') as HTMLInputElement).value = - svgEl.getAttribute('data-anno-name-fr') || '' - ;(getEl('svg-editor-edit-en') as HTMLInputElement).value = - svgEl.getAttribute('data-anno-name-en') || '' - ;(getEl('svg-editor-edit-category') as HTMLSelectElement).value = - svgEl.getAttribute('data-anno-category') || 'custom' - ;(getEl('svg-editor-edit-lateral') as HTMLSelectElement).value = - svgEl.getAttribute('data-anno-lateral') || '' - - const id = svgEl.getAttribute('data-anno-id')! - const cat = svgEl.getAttribute('data-anno-category') - const parent = svgEl.parentNode as Element | null - let visibleEl: SVGElement = svgEl - if (parent && id) { - const sibs = parent.querySelectorAll(`[data-anno-id="${cssEscape(id)}"]`) - sibs.forEach((s) => { - if ( - s.getAttribute('data-anno-category') === cat && - s.getAttribute('fill') !== 'transparent' - ) { - visibleEl = s as SVGElement - } - }) - } - - const opa = parseFloat(visibleEl.getAttribute('fill-opacity') || '0.65') - const opaPct = Math.round(opa * 100) - ;(getEl('svg-editor-edit-opacity') as HTMLInputElement).value = String(opaPct) - ;(getEl('svg-editor-edit-opacity-num') as HTMLInputElement).value = String(opaPct) - - const tag = svgEl.tagName.toLowerCase() - const radBlock = getEl('svg-editor-lbl-radius') - const radRow = getEl('svg-editor-radius-row') - const visibleTag = visibleEl.tagName.toLowerCase() - if (visibleTag === 'circle') { - radBlock.style.display = 'block' - radRow.style.display = 'flex' - const r = parseFloat(visibleEl.getAttribute('r') || '15') - ;(getEl('svg-editor-edit-radius') as HTMLInputElement).value = String(r) - ;(getEl('svg-editor-edit-radius-num') as HTMLInputElement).value = String(r) - } else { - radBlock.style.display = 'none' - radRow.style.display = 'none' - } - - const polyActions = getEl('svg-editor-polygon-edit-actions') - if (polyActions) polyActions.style.display = tag === 'polygon' ? 'block' : 'none' - - const opensDetail = - visibleEl.getAttribute('data-anno-opens-detail') || - svgEl.getAttribute('data-anno-opens-detail') || - '' - const checkbox = getEl('svg-editor-edit-opens-detail') as HTMLInputElement - const detailInput = getEl('svg-editor-edit-detail-target') as HTMLInputElement - const detailRow = getEl('svg-editor-detail-target-row') - const detailBlock = getEl('svg-editor-detail-toggle-block') - - const osteoFields = getEl('svg-editor-osteo-fields') - if (tag === 'polygon') { - detailBlock.style.display = 'block' - checkbox.checked = !!opensDetail - detailInput.value = opensDetail - detailRow.style.display = opensDetail ? 'block' : 'none' - osteoFields.style.display = opensDetail ? 'none' : 'block' - } else { - detailBlock.style.display = 'none' - checkbox.checked = false - detailInput.value = '' - osteoFields.style.display = 'block' - } - - updateCoordsDisplay() - } - - function updateCoordsDisplay() { - if (!selected) return - const tag = selected.tagName.toLowerCase() - let txt = '' - if (tag === 'circle' || tag === 'ellipse') { - txt = `cx=${Math.round(parseFloat(selected.getAttribute('cx')!))}, cy=${Math.round(parseFloat(selected.getAttribute('cy')!))}` - } else if (tag === 'polygon') { - const pts = selected - .getAttribute('points')! - .split(/\s+/) - .filter((p) => p).length - txt = t('svg_editor.polygon_vertices').replace('{count}', String(pts)) - } - getEl('svg-editor-coords-display').textContent = txt - } - - function applyEdit() { - if (!selected) return - const fr = (getEl('svg-editor-edit-fr') as HTMLInputElement).value.trim() - const en = (getEl('svg-editor-edit-en') as HTMLInputElement).value.trim() - const cat = (getEl('svg-editor-edit-category') as HTMLSelectElement).value - const lateral = (getEl('svg-editor-edit-lateral') as HTMLSelectElement).value - const opacityPct = (getEl('svg-editor-edit-opacity') as HTMLInputElement).value - const opacity = (parseFloat(opacityPct) / 100).toString() - const radius = (getEl('svg-editor-edit-radius') as HTMLInputElement).value - - const oldId = selected.getAttribute('data-anno-id')! - const oldCat = selected.getAttribute('data-anno-category') - const parent = selected.parentNode as Element | null - const siblings = parent - ? Array.from(parent.querySelectorAll(`[data-anno-id="${cssEscape(oldId)}"]`)).filter( - (s) => s.getAttribute('data-anno-category') === oldCat, - ) - : [selected] - - const opensDetailEnabled = (getEl('svg-editor-edit-opens-detail') as HTMLInputElement).checked - const detailTarget = (getEl('svg-editor-edit-detail-target') as HTMLInputElement).value.trim() - - siblings.forEach((s) => { - if (opensDetailEnabled && detailTarget) { - s.setAttribute('data-anno-opens-detail', detailTarget) - s.removeAttribute('data-anno-name-fr') - s.removeAttribute('data-anno-name-en') - s.removeAttribute('data-anno-category') - s.removeAttribute('data-anno-category-name') - s.removeAttribute('data-anno-special') - } else { - s.removeAttribute('data-anno-opens-detail') - s.removeAttribute('stroke-dasharray') - if (fr) s.setAttribute('data-anno-name-fr', fr) - if (en) s.setAttribute('data-anno-name-en', en) - if (cat) { - s.setAttribute('data-anno-category', cat) - if (CATEGORIES[cat]?.name) { - s.setAttribute('data-anno-category-name', CATEGORIES[cat].name) - } - const catSpecial = CATEGORIES[cat]?.special - if (catSpecial?.trim()) { - s.setAttribute('data-anno-special', catSpecial.trim()) - } else { - s.removeAttribute('data-anno-special') - } - } - if (lateral) { - s.setAttribute('data-anno-lateral', lateral) - } else { - s.removeAttribute('data-anno-lateral') - } - } - - if (opensDetailEnabled && detailTarget) { - let title = s.querySelector(':scope > title') as SVGTitleElement | null - if (!title) { - title = document.createElementNS('http://www.w3.org/2000/svg', 'title') as SVGTitleElement - s.insertBefore(title, s.firstChild) - } - title.textContent = 'Zoom: ' + detailTarget - if (s.getAttribute('fill') !== 'transparent') { - s.setAttribute('fill', DETAIL_ZONE_STYLE.fill) - s.setAttribute('fill-opacity', opacity || DETAIL_ZONE_STYLE.fillOpacity) - if (s.tagName.toLowerCase() === 'polygon') { - s.setAttribute('stroke', DETAIL_ZONE_STYLE.stroke) - s.setAttribute('stroke-width', DETAIL_ZONE_STYLE.strokeWidth) - s.setAttribute('stroke-dasharray', DETAIL_ZONE_STYLE.strokeDasharray) - } - } - s.classList.add('detail-zone') - } else { - s.classList.remove('detail-zone') - let title = s.querySelector(':scope > title') as SVGTitleElement | null - if (!title) { - title = document.createElementNS('http://www.w3.org/2000/svg', 'title') as SVGTitleElement - s.insertBefore(title, s.firstChild) - } - title.textContent = (fr || '') + (en ? ' / ' + en : '') - - if (s.getAttribute('fill') !== 'transparent' && cat && CATEGORIES[cat]) { - s.setAttribute('fill', CATEGORIES[cat].color) - if (s.tagName.toLowerCase() === 'polygon') { - s.setAttribute('stroke', CATEGORIES[cat].color) - } - } - if (opacity && s.getAttribute('fill') !== 'transparent') - s.setAttribute('fill-opacity', opacity) - - const stag = s.tagName.toLowerCase() - if (stag === 'circle' && radius) { - if (s.getAttribute('fill') === 'transparent') { - s.setAttribute('r', String(Math.max(1, parseFloat(radius) + 12))) - } else { - s.setAttribute('r', radius) - } - } - } - }) - - refreshElementList() - refreshCategoryList() - } - - function deleteSelected() { - if (!selected) return - if (!confirm(t('svg_editor.confirm_delete_element'))) return - const id = selected.getAttribute('data-anno-id')! - const cat = selected.getAttribute('data-anno-category') - const parent = selected.parentNode as Element | null - if (parent) { - parent.querySelectorAll(`[data-anno-id="${cssEscape(id)}"]`).forEach((s) => { - if (s.getAttribute('data-anno-category') === cat) s.parentNode?.removeChild(s) - }) - } - selected = null - getEl('svg-editor-edit-section').style.display = 'none' - refreshElementList() - refreshCategoryList() - } - - function addCircleAt(x: number, y: number) { - if (!svgRoot) return - const cat = (getEl('svg-editor-default-category') as HTMLSelectElement).value || 'custom' - const color = CATEGORIES[cat]?.color || '#00aaff' - - let overlayG = svgRoot.querySelector('#osteo-overlays') - if (!overlayG) { - overlayG = document.createElementNS('http://www.w3.org/2000/svg', 'g') - overlayG.setAttribute('id', 'osteo-overlays') - svgRoot.appendChild(overlayG) - } - - const id = 'point-' + Date.now().toString(36) - const frName = t('svg_editor.new_point_fr') - const enName = t('svg_editor.new_point_en') - - const hit = document.createElementNS('http://www.w3.org/2000/svg', 'circle') - hit.setAttribute('cx', String(Math.round(x))) - hit.setAttribute('cy', String(Math.round(y))) - hit.setAttribute('r', '28') - hit.setAttribute('fill', 'transparent') - hit.setAttribute('pointer-events', 'all') - hit.setAttribute('data-anno-id', id) - hit.setAttribute('data-anno-name-fr', frName) - hit.setAttribute('data-anno-name-en', enName) - hit.setAttribute('data-anno-category', cat) - if (CATEGORIES[cat]?.name) hit.setAttribute('data-anno-category-name', CATEGORIES[cat].name) - if (CATEGORIES[cat]?.special) hit.setAttribute('data-anno-special', CATEGORIES[cat].special!) - hit.setAttribute('style', 'cursor:pointer') - const t1 = document.createElementNS('http://www.w3.org/2000/svg', 'title') - t1.textContent = frName - hit.appendChild(t1) - overlayG.appendChild(hit) - - const vis = document.createElementNS('http://www.w3.org/2000/svg', 'circle') - vis.setAttribute('cx', String(Math.round(x))) - vis.setAttribute('cy', String(Math.round(y))) - vis.setAttribute('r', '16') - vis.setAttribute('fill', color) - vis.setAttribute('fill-opacity', '0.65') - vis.setAttribute('stroke', '#000') - vis.setAttribute('stroke-width', '1.5') - vis.setAttribute('pointer-events', 'none') - vis.setAttribute('id', id) - vis.setAttribute('data-anno-id', id) - vis.setAttribute('data-anno-name-fr', frName) - vis.setAttribute('data-anno-name-en', enName) - vis.setAttribute('data-anno-category', cat) - if (CATEGORIES[cat]?.name) vis.setAttribute('data-anno-category-name', CATEGORIES[cat].name) - if (CATEGORIES[cat]?.special) vis.setAttribute('data-anno-special', CATEGORIES[cat].special!) - const t2 = document.createElementNS('http://www.w3.org/2000/svg', 'title') - t2.textContent = frName - vis.appendChild(t2) - overlayG.appendChild(vis) - - setMode('select') - selectElement(hit as unknown as SVGElement) - refreshElementList() - refreshCategoryList() - setTimeout(() => (getEl('svg-editor-edit-fr') as HTMLInputElement).focus(), 50) - } - - function updatePolygonPreview() { - if (!svgRoot) return - svgRoot - .querySelectorAll('.polygon-preview, .polygon-preview-pt') - .forEach((p) => p.remove()) - if (polygonPoints.length < 1) return - - if (polygonPoints.length >= 2) { - const poly = document.createElementNS('http://www.w3.org/2000/svg', 'polygon') - poly.setAttribute('points', polygonPoints.map((p) => p.join(',')).join(' ')) - poly.classList.add('polygon-preview') - poly.setAttribute('pointer-events', 'none') - svgRoot.appendChild(poly) - } - polygonPoints.forEach(([x, y]) => { - const pt = document.createElementNS('http://www.w3.org/2000/svg', 'circle') - pt.setAttribute('cx', String(x)) - pt.setAttribute('cy', String(y)) - pt.setAttribute('r', '6') - pt.classList.add('polygon-preview-pt') - pt.setAttribute('pointer-events', 'none') - svgRoot!.appendChild(pt) - }) - } - - let _polygonRestartMemo: { - id: string - fr: string - en: string - cat: string - fill: string - fillOpacity: string - stroke: string - strokeWidth: string - } | null = null - - function finalizePolygon() { - if (!svgRoot) return - if (polygonPoints.length < 3) { - alert(t('svg_editor.alert_min_3')) - return - } - - const memo = _polygonRestartMemo - _polygonRestartMemo = null - - const cat = memo - ? memo.cat - : (getEl('svg-editor-default-category') as HTMLSelectElement).value || 'custom' - const color = memo ? memo.fill : CATEGORIES[cat]?.color || '#00aaff' - - let overlayG = svgRoot.querySelector('#osteo-overlays') - if (!overlayG) { - overlayG = document.createElementNS('http://www.w3.org/2000/svg', 'g') - overlayG.setAttribute('id', 'osteo-overlays') - svgRoot.appendChild(overlayG) - } - - const id = memo ? memo.id : 'zone-' + Date.now().toString(36) - const frName = memo ? memo.fr || t('svg_editor.new_zone_fr') : t('svg_editor.new_zone_fr') - const enName = memo ? memo.en || t('svg_editor.new_zone_en') : t('svg_editor.new_zone_en') - const poly = document.createElementNS('http://www.w3.org/2000/svg', 'polygon') - poly.setAttribute( - 'points', - polygonPoints.map((p) => p.map(Math.round).join(',')).join(' '), - ) - poly.setAttribute('fill', color) - poly.setAttribute('fill-opacity', memo ? memo.fillOpacity || '0.30' : '0.30') - poly.setAttribute('stroke', memo ? memo.stroke || color : color) - poly.setAttribute('stroke-width', memo ? memo.strokeWidth || '2' : '2') - poly.setAttribute('pointer-events', 'all') - poly.setAttribute('style', 'cursor:pointer') - poly.setAttribute('id', id) - poly.setAttribute('data-anno-id', id) - poly.setAttribute('data-anno-name-fr', frName) - poly.setAttribute('data-anno-name-en', enName) - poly.setAttribute('data-anno-category', cat) - if (CATEGORIES[cat]?.name) - poly.setAttribute('data-anno-category-name', CATEGORIES[cat].name) - if (CATEGORIES[cat]?.special) - poly.setAttribute('data-anno-special', CATEGORIES[cat].special!) - const titleEl = document.createElementNS('http://www.w3.org/2000/svg', 'title') - titleEl.textContent = - poly.getAttribute('data-anno-name-fr') + ' / ' + poly.getAttribute('data-anno-name-en') - poly.appendChild(titleEl) - overlayG.appendChild(poly) - - cancelPolygon() - setMode('select') - selectElement(poly as unknown as SVGElement) - refreshElementList() - refreshCategoryList() - if (!memo) setTimeout(() => (getEl('svg-editor-edit-fr') as HTMLInputElement).focus(), 50) - } - - function cancelPolygon() { - polygonPoints = [] - svgRoot - ?.querySelectorAll('.polygon-preview, .polygon-preview-pt') - .forEach((p) => p.remove()) - } - - function refreshCategoryList() { - const list = getEl('svg-editor-category-list') - - const activeEl = document.activeElement as HTMLElement | null - if (activeEl && list.contains(activeEl)) { - list.querySelectorAll('.cat-row').forEach((row) => { - const cat = (row as HTMLElement).dataset.cat! - const countEl = row.querySelector('.count') - if (countEl && svgRoot) { - const n = svgRoot.querySelectorAll( - `[data-anno-category="${cat}"]:not([fill="transparent"])`, - ).length - countEl.textContent = String(n) - } - }) - return - } - - list.textContent = '' - - if (Object.keys(CATEGORIES).length === 0) { - const emptyMsg = document.createElement('div') - emptyMsg.style.cssText = 'font-size:12px; color:var(--color-ink-muted); padding:8px; text-align:center;' - emptyMsg.textContent = t('svg_editor.no_categories') - list.appendChild(emptyMsg) - return - } - - for (const [cat, info] of Object.entries(CATEGORIES)) { - const count = svgRoot - ? svgRoot.querySelectorAll(`[data-anno-category="${cat}"]:not([fill="transparent"])`).length - : 0 - - const hasSpecial = !!(info.special?.trim()) - const row = document.createElement('div') - row.className = 'cat-row' - row.dataset.cat = cat - - const chk = document.createElement('input') - chk.type = 'checkbox' - chk.checked = info.visible - chk.title = 'Visibility' - - const colorInput = document.createElement('input') - colorInput.type = 'color' - colorInput.value = info.color - colorInput.title = 'Color' - - const nameSpan = document.createElement('span') - nameSpan.className = 'name' - nameSpan.title = cat - nameSpan.textContent = info.name - - const countSpan = document.createElement('span') - countSpan.className = 'count' - countSpan.textContent = String(count) - - const specialBtn = document.createElement('button') - specialBtn.className = 'special-btn' + (hasSpecial ? ' has-value' : '') - specialBtn.title = 'Special behavior' - specialBtn.textContent = '⚡' - - const delBtn = document.createElement('button') - delBtn.className = 'delete' - delBtn.title = 'Delete category' - delBtn.textContent = '×' - - row.append(chk, colorInput, nameSpan) - if (hasSpecial) { - const badge = document.createElement('span') - badge.className = 'special-badge' - badge.title = 'Behavior: ' + (info.special || '') - badge.textContent = '⚡ ' + (info.special || '') - row.appendChild(badge) - } - row.append(countSpan, specialBtn, delBtn) - - chk.addEventListener('change', () => { - info.visible = chk.checked - canvasInner.classList.toggle('hide-' + cat, !info.visible) - }) - - colorInput.addEventListener('change', () => { - info.color = colorInput.value - svgRoot?.querySelectorAll(`[data-anno-category="${cat}"]`).forEach((svgEl) => { - if (svgEl.getAttribute('fill') === 'transparent') return - svgEl.setAttribute('fill', info.color) - if (svgEl.tagName.toLowerCase() === 'polygon') { - svgEl.setAttribute('stroke', info.color) - } - }) - refreshElementList() - }) - - nameSpan.addEventListener('click', () => { - const newName = prompt('Rename category:', info.name) - if (newName?.trim()) { - info.name = newName.trim() - svgRoot?.querySelectorAll(`[data-anno-category="${cat}"]`).forEach((svgEl) => { - svgEl.setAttribute('data-anno-category-name', info.name) - }) - refreshCategoryList() - refreshCategorySelects() - } - }) - - specialBtn.addEventListener('click', () => openSpecialDialog(cat)) - delBtn.addEventListener('click', () => deleteCategory(cat)) - - list.appendChild(row) - } - } - - function refreshCategorySelects() { - const def = getEl('svg-editor-default-category') as HTMLSelectElement - const editSel = getEl('svg-editor-edit-category') as HTMLSelectElement - const defVal = def.value - const editVal = editSel.value - - def.textContent = '' - editSel.textContent = '' - - for (const [cat, info] of Object.entries(CATEGORIES)) { - const opt1 = document.createElement('option') - opt1.value = cat - opt1.textContent = info.name + ' (' + cat + ')' - def.appendChild(opt1) - - const opt2 = document.createElement('option') - opt2.value = cat - opt2.textContent = info.name + ' (' + cat + ')' - editSel.appendChild(opt2) - } - - if (defVal) def.value = defVal - if (editVal) editSel.value = editVal - } - - function openSpecialDialog(catId: string) { - const info = CATEGORIES[catId] - if (!info) return - const current = info.special || '' - - const lines = SPECIAL_BEHAVIORS.map((b, i) => `${i + 1}. ${b.id} — ${b.desc}`).join('\n') - const txt = `Special behavior for category "${info.name}". - -Suggestions: -${lines} - -Type a name (suggested or custom), or leave empty to remove. -Current: ${current || '(none)'}` - - const result = prompt(txt, current) - if (result === null) return - - const trimmed = result.trim() - info.special = trimmed - - svgRoot?.querySelectorAll(`[data-anno-category="${catId}"]`).forEach((svgEl) => { - if (trimmed) { - svgEl.setAttribute('data-anno-special', trimmed) - } else { - svgEl.removeAttribute('data-anno-special') - } - }) - - refreshCategoryList() - refreshElementList() - } - - function addCategory() { - const name = (getEl('svg-editor-new-cat-name') as HTMLInputElement).value.trim() - const color = (getEl('svg-editor-new-cat-color') as HTMLInputElement).value - if (!name) { - alert(t('svg_editor.alert_cat_name_required')) - return - } - const slug = name - .toLowerCase() - .normalize('NFD') - .replace(/[̀-ͯ]/g, '') - .replace(/[^a-z0-9]+/g, '-') - .replace(/^-|-$/g, '') - if (!slug) { - alert(t('svg_editor.alert_cat_invalid_name')) - return - } - - if (CATEGORIES[slug]) { - alert(t('svg_editor.alert_cat_exists')) - return - } - - CATEGORIES[slug] = { color, name, visible: true } - ;(getEl('svg-editor-new-cat-name') as HTMLInputElement).value = '' - refreshCategoryList() - refreshCategorySelects() - } - - function deleteCategory(cat: string) { - if (!svgRoot) return - const count = svgRoot.querySelectorAll( - `[data-anno-category="${cat}"]:not([fill="transparent"])`, - ).length - let msg = t('svg_editor.confirm_delete_cat').replace('{name}', CATEGORIES[cat].name) - if (count > 0) { - msg += t('svg_editor.confirm_delete_cat_count').replace('{count}', String(count)) - } - if (!confirm(msg)) return - - svgRoot.querySelectorAll(`[data-anno-category="${cat}"]`).forEach((svgEl) => { - svgEl.parentNode?.removeChild(svgEl) - }) - - delete CATEGORIES[cat] - refreshCategoryList() - refreshCategorySelects() - refreshElementList() - } - - function refreshElementList() { - if (!svgRoot) return - const filter = ((getEl('svg-editor-filter-input') as HTMLInputElement).value || '').toLowerCase() - const seen = new Set() - const items: { - id: string - fr: string - cat: string - catName: string - color: string - detail: string - }[] = [] - - svgRoot.querySelectorAll('[data-anno-id]').forEach((svgEl) => { - const id = svgEl.getAttribute('data-anno-id')! - if (seen.has(id)) return - const cat = svgEl.getAttribute('data-anno-category') || '' - seen.add(id) - - const fr = svgEl.getAttribute('data-anno-name-fr') || '' - const catName = CATEGORIES[cat] ? CATEGORIES[cat].name : cat || 'no cat.' - - if ( - filter && - !id.toLowerCase().includes(filter) && - !fr.toLowerCase().includes(filter) && - !catName.toLowerCase().includes(filter) - ) - return - - const visibleEl: Element = - svgRoot!.querySelector(`[data-anno-id="${cssEscape(id)}"]:not([fill="transparent"])`) || - svgEl - const color = visibleEl.getAttribute('fill') || '#888' - const detail = - visibleEl.getAttribute('data-anno-opens-detail') || - svgEl.getAttribute('data-anno-opens-detail') || - '' - - items.push({ id, fr, cat, catName, color, detail }) - }) - - items.sort((a, b) => (a.cat || '').localeCompare(b.cat || '') || a.fr.localeCompare(b.fr)) - - getEl('svg-editor-count').textContent = String(items.length) - - const list = getEl('svg-editor-element-list') - const selId = selected ? selected.getAttribute('data-anno-id') : null - list.textContent = '' - - items.forEach(({ id, fr, catName, color, detail }) => { - const div = document.createElement('div') - div.className = 'element-item' + (id === selId ? ' selected' : '') - div.dataset.id = id - - const swatch = document.createElement('span') - swatch.className = 'swatch' - swatch.style.background = color - - const nameSpan = document.createElement('span') - nameSpan.className = 'name' - nameSpan.textContent = detail ? 'Detail: ' + detail : fr || id - - const catSpan = document.createElement('span') - catSpan.className = 'cat' - catSpan.textContent = detail ? 'detail' : catName - - div.append(swatch, nameSpan, catSpan) - list.appendChild(div) - - div.addEventListener('click', () => { - const candidates = svgRoot!.querySelectorAll( - `[data-anno-id="${cssEscape(id)}"]`, - ) - let target: SVGElement | null = null - candidates.forEach((c) => { - if (target) return - if (c.getAttribute('fill') === 'transparent') return - target = c as SVGElement - }) - if (!target && candidates.length > 0) { - target = candidates[0] as SVGElement - } - if (target) { - setMode('select') - selectElement(target) - scrollSvgElementIntoView(target) - flashSelected(target) - } - }) - }) - } - - function parsePoints(str: string) { - return str - .trim() - .split(/\s+/) - .filter((p) => p) - .map((p) => p.split(',').map(Number)) - } - function pointsToStr(points: number[][]) { - return points.map((p) => p.map((v) => Math.round(v * 10) / 10).join(',')).join(' ') - } - - function showPolygonHandles(polygon: SVGElement) { - hidePolygonHandles() - if (!svgRoot) return - const points = parsePoints(polygon.getAttribute('points')!) - - let handlesG = svgRoot.querySelector('#polygon-handles') - if (!handlesG) { - handlesG = document.createElementNS('http://www.w3.org/2000/svg', 'g') - handlesG.setAttribute('id', 'polygon-handles') - svgRoot.appendChild(handlesG) - } - svgRoot.appendChild(handlesG) - - for (let i = 0; i < points.length; i++) { - const [x1, y1] = points[i] - const [x2, y2] = points[(i + 1) % points.length] - const mx = (x1 + x2) / 2 - const my = (y1 + y2) / 2 - const m = document.createElementNS('http://www.w3.org/2000/svg', 'circle') - m.setAttribute('cx', String(mx)) - m.setAttribute('cy', String(my)) - m.setAttribute('r', '6') - m.classList.add('polygon-midhandle') - m.setAttribute('data-edge-idx', String(i)) - const titleEl = document.createElementNS('http://www.w3.org/2000/svg', 'title') - titleEl.textContent = t('svg_editor.handle_insert') - m.appendChild(titleEl) - handlesG.appendChild(m) - } - - points.forEach(([x, y], i) => { - const h = document.createElementNS('http://www.w3.org/2000/svg', 'circle') - h.setAttribute('cx', String(x)) - h.setAttribute('cy', String(y)) - h.setAttribute('r', '8') - h.classList.add('polygon-handle') - h.setAttribute('data-vertex-idx', String(i)) - const titleEl = document.createElementNS('http://www.w3.org/2000/svg', 'title') - titleEl.textContent = t('svg_editor.handle_drag') - h.appendChild(titleEl) - handlesG!.appendChild(h) - }) - } - - function hidePolygonHandles() { - const g = svgRoot?.querySelector('#polygon-handles') - if (g) g.textContent = '' - } - - function restartCurrentPolygon() { - if (!selected || selected.tagName.toLowerCase() !== 'polygon') return - if (!confirm(t('svg_editor.confirm_redraw'))) return - _polygonRestartMemo = { - id: selected.getAttribute('data-anno-id') || '', - fr: selected.getAttribute('data-anno-name-fr') || '', - en: selected.getAttribute('data-anno-name-en') || '', - cat: selected.getAttribute('data-anno-category') || '', - fill: selected.getAttribute('fill') || '', - fillOpacity: selected.getAttribute('fill-opacity') || '', - stroke: selected.getAttribute('stroke') || '', - strokeWidth: selected.getAttribute('stroke-width') || '', - } - selected.parentNode?.removeChild(selected) - deselect() - setMode('polygon') - } - - function scrollSvgElementIntoView(svgEl: SVGElement) { - const elRect = svgEl.getBoundingClientRect() - const cRect = canvasInner.getBoundingClientRect() - - const visible = - elRect.left >= cRect.left && - elRect.right <= cRect.right && - elRect.top >= cRect.top && - elRect.bottom <= cRect.bottom - if (visible) return - - const dx = elRect.left + elRect.width / 2 - (cRect.left + cRect.width / 2) - const dy = elRect.top + elRect.height / 2 - (cRect.top + cRect.height / 2) - - canvasInner.scrollTo({ - left: canvasInner.scrollLeft + dx, - top: canvasInner.scrollTop + dy, - behavior: 'smooth', - }) - } - - function flashSelected(svgEl: SVGElement) { - const id = svgEl.getAttribute('data-anno-id') - const cat = svgEl.getAttribute('data-anno-category') - if (!id || !svgRoot) return - const all = svgRoot.querySelectorAll(`[data-anno-id="${cssEscape(id)}"]`) - all.forEach((e) => { - if (e.getAttribute('data-anno-category') !== cat) return - e.classList.remove('flashing') - void (e as HTMLElement).getBoundingClientRect() - e.classList.add('flashing') - setTimeout(() => e.classList.remove('flashing'), 1200) - }) - } - - function exportSVG() { - if (!svgRoot) { - alert(t('svg_editor.alert_no_svg_loaded')) - return - } - const clone = svgRoot.cloneNode(true) as SVGSVGElement - clone.querySelectorAll('.polygon-preview, .polygon-preview-pt').forEach((p) => p.remove()) - const handles = clone.querySelector('#polygon-handles') - if (handles) handles.remove() - clone.querySelectorAll('.selected, .flashing').forEach((p) => { - p.classList.remove('selected') - p.classList.remove('flashing') - }) - - const ser = new XMLSerializer() - const txt = `\n` + ser.serializeToString(clone) - - const blob = new Blob([txt], { type: 'image/svg+xml;charset=utf-8' }) - const url = URL.createObjectURL(blob) - const a = document.createElement('a') - a.href = url - a.download = loadedFileName - document.body.appendChild(a) - a.click() - document.body.removeChild(a) - URL.revokeObjectURL(url) - } - - function applyZoom() { - if (!svgRoot) return - svgRoot.style.transform = `scale(${zoom})` - svgRoot.style.transformOrigin = 'top left' - } - - return () => { ac.abort() } -} diff --git a/apps/app/src/components/brand/Footer.tsx b/apps/app/src/components/brand/Footer.tsx index 6d0bb587..84ff2c6b 100644 --- a/apps/app/src/components/brand/Footer.tsx +++ b/apps/app/src/components/brand/Footer.tsx @@ -1,4 +1,3 @@ -import { Link } from 'react-router-dom' import { useConfig } from '@/app/providers/ConfigProvider' import { useT } from '@/i18n/useT' @@ -9,14 +8,7 @@ export default function Footer() { return (

- © {year} {cfg.footerName}. {t('footer.all_rights_reserved')}{' '} - ·{' '} - - {t('footer.editors')} - + © {year} {cfg.footerName}. {t('footer.all_rights_reserved')}

diff --git a/apps/app/src/components/canvas/AnatomyCanvas.tsx b/apps/app/src/components/canvas/AnatomyCanvas.tsx index 17a410f4..791f6403 100644 --- a/apps/app/src/components/canvas/AnatomyCanvas.tsx +++ b/apps/app/src/components/canvas/AnatomyCanvas.tsx @@ -1,77 +1,83 @@ -import { useCallback, useEffect, useRef, useState } from 'react' -import { loadSvg } from '@/anatomy/svgLoader' -import { - getBoneIdFromEvent, - getAnnotatedElement, -} from '@/anatomy/svgConvention' -import type { BoneState } from '@/anatomy/types' +import { useCallback, useEffect, useRef } from 'react' +import { buildViewSvg, type ViewStates } from '@/anatomy/drawing' +import type { SheetIndex } from '@/services/sheetIndex' import { useLocaleStore } from '@/state/localeStore' import { pickLocaleLabel } from '@/i18n/pickLocaleLabel' export interface AnatomyCanvasProps { - src: string - boneStates: Map - onZoneClick: (boneId: string) => void + index: SheetIndex + viewId: string + states: ViewStates + onZoneClick: (annotationId: string, viewId: string) => void className?: string } +const ANNOTATED = '[data-anno-id]' + +function annotatedTarget(event: Event): Element | null { + const target = event.target + return target instanceof Element ? target.closest(ANNOTATED) : null +} + +/** + * One view of the sheet: the drawing plus the annotation layer generated + * from the document, rebuilt when the view changes and restyled in place + * when the selection changes. Clicks are delegated on `data-anno-id`. + */ export default function AnatomyCanvas({ - src, - boneStates, + index, + viewId, + states, onZoneClick, className = '', }: AnatomyCanvasProps) { const wrapperRef = useRef(null) const svgRef = useRef(null) const tooltipRef = useRef(null) - const [loadedSrc, setLoadedSrc] = useState(null) const locale = useLocaleStore((s) => s.locale) useEffect(() => { - let cancelled = false - const c = svgRef.current - if (!c) return - c.replaceChildren() - setLoadedSrc(null) - loadSvg(src).then((root) => { - if (cancelled || !c) return - c.appendChild(root) - setLoadedSrc(src) - }) - return () => { cancelled = true } - }, [src]) + const host = svgRef.current + if (!host) return + host.replaceChildren(buildViewSvg(index, viewId, states)) + // States are applied by the effect below; the build only needs the view. + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [index, viewId]) useEffect(() => { - const c = svgRef.current - if (!c) return - const onClick = (e: Event) => { - const id = getBoneIdFromEvent(e) - if (id) onZoneClick(id) - } - c.addEventListener('click', onClick) - return () => c.removeEventListener('click', onClick) - }, [onZoneClick]) - - useEffect(() => { - const c = svgRef.current - if (!c || loadedSrc !== src) return - const all = c.querySelectorAll('[data-anno-id]') - all.forEach((el) => { - const id = el.getAttribute('data-anno-id') as string - const state = boneStates.get(id) - if (state && state !== 'default') el.setAttribute('data-state', state) + const host = svgRef.current + if (!host) return + host.querySelectorAll(ANNOTATED).forEach((el) => { + const state = states.get(el.getAttribute('data-anno-id') ?? '') + if (state) el.setAttribute('data-state', state) else el.removeAttribute('data-state') }) - }, [boneStates, loadedSrc, src]) + }, [states, index, viewId]) + + useEffect(() => { + const host = svgRef.current + if (!host) return + const onClick = (e: Event) => { + const id = annotatedTarget(e)?.getAttribute('data-anno-id') + if (id) onZoneClick(id, viewId) + } + host.addEventListener('click', onClick) + return () => host.removeEventListener('click', onClick) + }, [onZoneClick, viewId]) const showTooltip = useCallback( (el: Element, x: number, y: number) => { const tip = tooltipRef.current if (!tip) return - const fr = el.getAttribute('data-anno-name-fr') ?? '' - const en = el.getAttribute('data-anno-name-en') ?? '' - const label = pickLocaleLabel(fr, en, locale) - if (!label) { tip.style.opacity = '0'; return } + const label = pickLocaleLabel( + el.getAttribute('data-anno-name-fr') ?? '', + el.getAttribute('data-anno-name-en') ?? '', + locale, + ) + if (!label) { + tip.style.opacity = '0' + return + } tip.textContent = label tip.style.opacity = '1' tip.style.left = `${x + 12}px` @@ -80,46 +86,40 @@ export default function AnatomyCanvas({ [locale], ) - const hideTooltip = useCallback(() => { - const tip = tooltipRef.current - if (tip) tip.style.opacity = '0' - }, []) - useEffect(() => { - const c = svgRef.current - if (!c || loadedSrc !== src) return + const host = svgRef.current + if (!host) return + const hide = () => { + if (tooltipRef.current) tooltipRef.current.style.opacity = '0' + } const onMove = (e: MouseEvent) => { - const el = getAnnotatedElement(e) - if (el && !el.hasAttribute('data-anno-opens-detail')) { - const w = wrapperRef.current - if (!w) return - const rect = w.getBoundingClientRect() - showTooltip(el, e.clientX - rect.left, e.clientY - rect.top) - } else { - hideTooltip() - } + const el = annotatedTarget(e) + const wrapper = wrapperRef.current + if (!el || !wrapper || el.hasAttribute('data-anno-opens-view')) + return hide() + const rect = wrapper.getBoundingClientRect() + showTooltip(el, e.clientX - rect.left, e.clientY - rect.top) } - const onLeave = () => hideTooltip() - c.addEventListener('mousemove', onMove) - c.addEventListener('mouseleave', onLeave) + host.addEventListener('mousemove', onMove) + host.addEventListener('mouseleave', hide) return () => { - c.removeEventListener('mousemove', onMove) - c.removeEventListener('mouseleave', onLeave) + host.removeEventListener('mousemove', onMove) + host.removeEventListener('mouseleave', hide) } - }, [loadedSrc, src, showTooltip, hideTooltip]) + }, [showTooltip]) return (
-
+
) } diff --git a/apps/app/src/components/canvas/DetailModal.tsx b/apps/app/src/components/canvas/DetailModal.tsx index d3056126..3bbe1dae 100644 --- a/apps/app/src/components/canvas/DetailModal.tsx +++ b/apps/app/src/components/canvas/DetailModal.tsx @@ -1,25 +1,27 @@ import Dialog from '@/components/ui/Dialog' import AnatomyCanvas from './AnatomyCanvas' -import type { BoneState } from '@/anatomy/types' +import type { ViewStates } from '@/anatomy/drawing' +import type { SheetIndex } from '@/services/sheetIndex' import { useT } from '@/i18n/useT' export interface DetailModalProps { open: boolean onClose: () => void - detailSrc: string - detailId: string + index: SheetIndex + viewId: string title: string - boneStates: Map - onZoneClick: (boneId: string, detailId: string) => void + states: ViewStates + onZoneClick: (annotationId: string, viewId: string) => void } +/** A detail view of the sheet (a crop or its own drawing) in a dialog. */ export default function DetailModal({ open, onClose, - detailSrc, - detailId, + index, + viewId, title, - boneStates, + states, onZoneClick, }: DetailModalProps) { const t = useT() @@ -27,9 +29,10 @@ export default function DetailModal({
onZoneClick(id, detailId)} + index={index} + viewId={viewId} + states={states} + onZoneClick={onZoneClick} />

diff --git a/apps/app/src/components/observation/FindingsTreePicker.tsx b/apps/app/src/components/observation/FindingsTreePicker.tsx index 221aae5f..48734eab 100644 --- a/apps/app/src/components/observation/FindingsTreePicker.tsx +++ b/apps/app/src/components/observation/FindingsTreePicker.tsx @@ -1,75 +1,84 @@ import { useMemo, useState } from 'react' import { motion } from 'motion/react' import type { + Finding, + FindingCategory, FindingNode, - ZoneFindings, -} from '@/domain/schema/findings' -import type { Finding, LateralSide } from '@/domain/schema/observation' + FindingZone, + LateralSide, + LocalizedOptionalText, +} from '@faunosteo/domain' import Button from '@/components/ui/Button' +import { pickLabel } from '@/services/sheetIndex' import { useT } from '@/i18n/useT' import { useLocaleStore } from '@/state/localeStore' +import type { Locale } from '@/i18n/types' const levelVariants = { enter: (dir: 1 | -1) => ({ opacity: 0, x: dir * 32 }), center: { opacity: 1, x: 0 }, } +type TreeNode = FindingCategory | FindingNode + export interface FindingsTreePickerProps { - zoneId: string - tree: ZoneFindings + zone: FindingZone side?: LateralSide selected: Finding[] onChange: (next: Finding[]) => void } -function isLeaf(node: FindingNode): boolean { - return !node.children || node.children.length === 0 +function isLeaf(node: TreeNode): boolean { + return node.children.length === 0 } -function samePath(a: string[], b: string[]): boolean { - if (a.length !== b.length) return false - for (let i = 0; i < a.length; i += 1) { - if (a[i] !== b[i]) return false - } - return true +function samePath(a: readonly string[], b: readonly string[]): boolean { + return a.length === b.length && a.every((seg, i) => seg === b[i]) } -function pathStartsWith(full: string[], prefix: string[]): boolean { - if (full.length < prefix.length) return false - for (let i = 0; i < prefix.length; i += 1) { - if (full[i] !== prefix[i]) return false - } - return true +function pathStartsWith( + full: readonly string[], + prefix: readonly string[], +): boolean { + return ( + full.length >= prefix.length && prefix.every((seg, i) => full[i] === seg) + ) } function findNode( - categories: FindingNode[], - path: string[], -): FindingNode | undefined { - let nodes: FindingNode[] = categories - let node: FindingNode | undefined + categories: readonly FindingCategory[], + path: readonly string[], +): TreeNode | undefined { + let nodes: readonly TreeNode[] = categories + let node: TreeNode | undefined for (const segment of path) { node = nodes.find((n) => n.id === segment) if (!node) return undefined - nodes = node.children ?? [] + nodes = node.children } return node } +function descriptionOf(node: TreeNode, locale: Locale): string | undefined { + const text: LocalizedOptionalText | undefined = node.description + if (!text) return undefined + return ( + (locale === 'en' ? text.en || text.fr : text.fr || text.en) || undefined + ) +} + +/** + * Drill-down picker over one finding zone of the sheet. A finding is keyed + * by `(findingZoneId, path, side)`; labels are snapshotted at selection. + */ export default function FindingsTreePicker({ - zoneId, - tree, + zone, side, selected, onChange, }: FindingsTreePickerProps) { const t = useT() const locale = useLocaleStore((s) => s.locale) - const nameOf = (node: { name_fr: string; name_en: string }) => - locale === 'en' ? node.name_en : node.name_fr - const descOf = (node: { description_fr?: string; description_en?: string }) => - locale === 'en' ? node.description_en : node.description_fr - const [path, setPath] = useState([]) const [direction, setDirection] = useState<1 | -1>(1) @@ -86,74 +95,57 @@ export default function FindingsTreePicker({ setPath(path.slice(0, depth)) } - const currentNodes = useMemo(() => { - if (path.length === 0) return tree.categories - const node = findNode(tree.categories, path) - return node?.children ?? [] - }, [tree, path]) + const currentNodes = useMemo(() => { + if (path.length === 0) return zone.categories + return findNode(zone.categories, path)?.children ?? [] + }, [zone, path]) const focusedNode = useMemo( - () => (path.length === 0 ? undefined : findNode(tree.categories, path)), - [tree, path], + () => (path.length === 0 ? undefined : findNode(zone.categories, path)), + [zone, path], ) const breadcrumb = useMemo<{ label: string; depth: number }[]>(() => { - const pick = (z: { name_fr: string; name_en: string }) => - locale === 'en' ? z.name_en : z.name_fr - const crumbs: { label: string; depth: number }[] = [ - { label: pick(tree), depth: 0 }, - ] - let nodes: FindingNode[] = tree.categories + const crumbs = [{ label: pickLabel(zone.name, locale), depth: 0 }] + let nodes: readonly TreeNode[] = zone.categories path.forEach((seg, i) => { const n = nodes.find((x) => x.id === seg) if (n) { - crumbs.push({ label: pick(n), depth: i + 1 }) - nodes = n.children ?? [] + crumbs.push({ label: pickLabel(n.name, locale), depth: i + 1 }) + nodes = n.children } }) return crumbs - }, [tree, path, locale]) + }, [zone, path, locale]) - function matchesSide(f: Finding): boolean { - return f.zoneId === zoneId && f.side === side - } + const matches = (f: Finding) => f.findingZoneId === zone.id && f.side === side + const isLeafSelected = (leafPath: string[]) => + selected.some((f) => matches(f) && samePath(f.path, leafPath)) + const countSelectedUnder = (nodePath: string[]) => + selected.filter((f) => matches(f) && pathStartsWith(f.path, nodePath)) + .length - function isLeafSelected(leafPath: string[]): boolean { - return selected.some( - (f) => matchesSide(f) && samePath(f.path, leafPath), - ) - } - - function countSelectedUnder(nodePath: string[]): number { - let n = 0 - for (const f of selected) { - if (!matchesSide(f)) continue - if (!pathStartsWith(f.path, nodePath)) continue - n += 1 - } - return n - } - - function toggleLeaf(leafPath: string[], leaf: FindingNode) { + function toggleLeaf(leafPath: string[], leaf: TreeNode) { if (isLeafSelected(leafPath)) { onChange( - selected.filter( - (f) => !(matchesSide(f) && samePath(f.path, leafPath)), - ), + selected.filter((f) => !(matches(f) && samePath(f.path, leafPath))), ) return } const next: Finding = { - zoneId, + findingZoneId: zone.id, path: leafPath, - labelFrSnapshot: leaf.name_fr, - labelEnSnapshot: leaf.name_en, + labelFrSnapshot: leaf.name.fr, + labelEnSnapshot: leaf.name.en, } - if (leaf.requires_vet_referral) next.requiresVetReferral = true + if ('requires_vet_referral' in leaf && leaf.requires_vet_referral) + next.requiresVetReferral = true if (side) next.side = side onChange([...selected, next]) } + const focusedDescription = focusedNode && descriptionOf(focusedNode, locale) + return (

@@ -179,9 +171,9 @@ export default function FindingsTreePicker({ })}
- {focusedNode && descOf(focusedNode) && ( + {focusedDescription && (

- {descOf(focusedNode)} + {focusedDescription}

)} @@ -196,16 +188,16 @@ export default function FindingsTreePicker({ )} - + {currentNodes.length === 0 ? (
  • {t('findings.no_options')} @@ -213,16 +205,17 @@ export default function FindingsTreePicker({ ) : ( currentNodes.map((node) => { const nodePath = [...path, node.id] + const nodeLabel = pickLabel(node.name, locale) + const nodeDesc = descriptionOf(node, locale) if (isLeaf(node)) { - const checked = isLeafSelected(nodePath) - const nodeLabel = nameOf(node) - const nodeDesc = descOf(node) + const vet = + 'requires_vet_referral' in node && node.requires_vet_referral return (
  • ) } diff --git a/apps/app/src/components/observation/LateralityPicker.tsx b/apps/app/src/components/observation/LateralityPicker.tsx index 3d3547e3..c6b34bba 100644 --- a/apps/app/src/components/observation/LateralityPicker.tsx +++ b/apps/app/src/components/observation/LateralityPicker.tsx @@ -1,6 +1,6 @@ import Dialog from '@/components/ui/Dialog' import Button from '@/components/ui/Button' -import type { LateralSide } from '@/domain/schema/observation' +import type { LateralSide } from '@faunosteo/domain' import { useT } from '@/i18n/useT' export interface LateralityPickerProps { diff --git a/apps/app/src/components/observation/ObservationCard.tsx b/apps/app/src/components/observation/ObservationCard.tsx index 86de9ea6..57f5b845 100644 --- a/apps/app/src/components/observation/ObservationCard.tsx +++ b/apps/app/src/components/observation/ObservationCard.tsx @@ -1,16 +1,11 @@ import { useMemo, useState } from 'react' import type { - Observation, - ObservationZone, - Vertebra, + Finding, + FindingZone, LateralSide, -} from '@/domain/schema/observation' -import type { - SpeciesFindings, - ZoneFindings, -} from '@/domain/schema/findings' -import type { Bone } from '@/anatomy/types' -import { matchZoneFindings } from '@/lib/zoneMatch' + Observation, + ReportZone, +} from '@faunosteo/domain' import { AnimatePresence, motion } from 'motion/react' import Card from '@/components/ui/Card' import Badge from '@/components/ui/Badge' @@ -20,9 +15,9 @@ import Textarea from '@/components/ui/Textarea' import FindingsTreePicker from './FindingsTreePicker' import FreeTextFindingInput from './FreeTextFindingInput' import SeveritySelector from './SeveritySelector' +import { isObservable, pickLabel, type SheetIndex } from '@/services/sheetIndex' import { useT } from '@/i18n/useT' import { useLocaleStore } from '@/state/localeStore' -import { boneLabel } from '@/anatomy/labels' import type { Locale } from '@/i18n/types' export interface ObservationCardProps { @@ -36,35 +31,75 @@ export interface ObservationCardProps { canMoveUp: boolean canMoveDown: boolean // Editor body props (used only when expanded) - bones: Map - findings: SpeciesFindings | null + sheet: SheetIndex onChange: (next: Observation) => void onOpenVertebraPicker: (zoneIndex: number) => void onRemoveZone: (zoneIndex: number) => void } +/** Zone label: the sheet's current name, else the snapshot, else the id. */ +export function zoneLabel( + z: ReportZone, + sheet: SheetIndex, + locale: Locale, +): string { + const annotation = sheet.annotation(z.annotationId) + if (annotation) return pickLabel(sheet.name(annotation), locale) + const snapshot = + locale === 'en' + ? z.labelEnSnapshot || z.labelFrSnapshot + : z.labelFrSnapshot || z.labelEnSnapshot + return snapshot || z.annotationId +} + function describeZone( - z: ObservationZone, - bones: Map, + z: ReportZone, + sheet: SheetIndex, locale: Locale, t: (key: string) => string, ): string { - const label = boneLabel(bones.get(z.boneId), locale, z.boneId) + const label = zoneLabel(z, sheet, locale) if (z.vertebrae?.length) { - const vs = z.vertebrae - .map((v: Vertebra) => `${v.region}${v.index}`) - .join(', ') - return `${label} (${vs})` + return `${label} (${z.vertebrae.map((v) => `${v.region}${v.index}`).join(', ')})` } if (z.side) { - const sideLabel = t( - z.side === 'left' ? 'lateral.left_short' : 'lateral.right_short', - ) - return `${label} (${sideLabel})` + return `${label} (${t(z.side === 'left' ? 'lateral.left_short' : 'lateral.right_short')})` } return label } +interface ZoneTree { + zone: FindingZone + side?: LateralSide +} + +/** One picker per (finding zone, side) the observation's zones resolve to. */ +function zoneTrees(observation: Observation, sheet: SheetIndex): ZoneTree[] { + const seen = new Set() + const out: ZoneTree[] = [] + for (const z of observation.zones) { + const annotation = sheet.annotation(z.annotationId) + if (!isObservable(annotation) || !annotation.finding_zone_id) continue + const zone = sheet.findingZone(annotation.finding_zone_id) + if (!zone) continue + const key = z.side ? `${zone.id}:${z.side}` : zone.id + if (seen.has(key)) continue + seen.add(key) + out.push({ zone, side: z.side }) + } + return out +} + +/** Findings the sheet no longer holds at their path (migrated data, kept verbatim). */ +function unresolvedFindings( + observation: Observation, + sheet: SheetIndex, +): Finding[] { + return observation.findings.filter( + (f) => !sheet.nodeAt(f.findingZoneId, f.path), + ) +} + export default function ObservationCard({ observation, index, @@ -75,34 +110,37 @@ export default function ObservationCard({ onMoveDown, canMoveUp, canMoveDown, - bones, - findings, + sheet, onChange, onOpenVertebraPicker, onRemoveZone, }: ObservationCardProps) { const t = useT() const locale = useLocaleStore((s) => s.locale) - const nameOf = (z: { name_fr: string; name_en: string }) => - locale === 'en' ? z.name_en : z.name_fr - - // Per-zone picker accordion — only one tree picker open at a time, - // matching the observation-card accordion semantics. Closed by default - // so the card stays compact when first expanded. const [expandedZoneId, setExpandedZoneId] = useState(null) const zoneCount = observation.zones.length const findingCount = observation.findings.length + observation.freeTextFindings.length - - const zoneCountLabel = + const zoneCountLabel = t( zoneCount > 1 - ? t('observation.zone_label_plural') - : t('observation.zone_label_singular') - const findingCountLabel = + ? 'observation.zone_label_plural' + : 'observation.zone_label_singular', + ) + const findingCountLabel = t( findingCount > 1 - ? t('observation.finding_label_plural') - : t('observation.finding_label_singular') + ? 'observation.finding_label_plural' + : 'observation.finding_label_singular', + ) + + const trees = useMemo( + () => zoneTrees(observation, sheet), + [observation, sheet], + ) + const unresolved = useMemo( + () => unresolvedFindings(observation, sheet), + [observation, sheet], + ) function onHeaderKey(event: React.KeyboardEvent) { if (event.key === 'Enter' || event.key === ' ') { @@ -110,39 +148,15 @@ export default function ObservationCard({ onToggle() } } - - function stop(fn: () => void) { - return (event: React.MouseEvent) => { - event.stopPropagation() - fn() - } + const stop = (fn: () => void) => (event: React.MouseEvent) => { + event.stopPropagation() + fn() } - - const zonesArray = useMemo( - () => (findings ? Object.values(findings.zones) : []), - [findings], - ) - - const zonesWithTree = useMemo(() => { - if (zonesArray.length === 0) - return [] as { tree: ZoneFindings; side?: LateralSide }[] - const seen = new Set() - const out: { tree: ZoneFindings; side?: LateralSide }[] = [] - for (const z of observation.zones) { - const bone = bones.get(z.boneId) - if (!bone) continue - const tree = matchZoneFindings( - { fr: bone.fr, en: bone.en }, - zonesArray, - ) - if (!tree) continue - const key = z.side ? `${tree.id}:${z.side}` : tree.id - if (seen.has(key)) continue - seen.add(key) - out.push({ tree, side: z.side }) - } - return out - }, [observation.zones, bones, zonesArray]) + const removeFinding = (target: Finding) => + onChange({ + ...observation, + findings: observation.findings.filter((f) => f !== target), + }) return (
    - {t('observation.badge_n')}{index + 1} + + {t('observation.badge_n')} + {index + 1} + {observation.severity && ( ) : (
      - {observation.zones.map((z, i) => { - const b = bones.get(z.boneId) - const supportsVertebrae = - b?.special === 'vertebral-precision' - return ( -
    • - - {describeZone(z, bones, locale, t)} - {supportsVertebrae && ( - + {t('observation.unresolved_short')} + )} + {sheet.isSpine(z.annotationId) && ( - -
    • - ) - })} + )} + + + + ))}
    )}
    - {zonesWithTree.length === 0 ? ( + {trees.length === 0 ? (

    {observation.zones.length === 0 ? t('observation.findings_pick_zone_first') @@ -292,26 +315,19 @@ export default function ObservationCard({

    ) : (
      - {zonesWithTree.map(({ tree, side }) => { - const pickerKey = side - ? `${tree.id}:${side}` - : tree.id - const expanded = expandedZoneId === pickerKey + {trees.map(({ zone, side }) => { + const pickerKey = side ? `${zone.id}:${side}` : zone.id + const open = expandedZoneId === pickerKey const selectedCount = observation.findings.filter( - (f) => - f.zoneId === tree.id && f.side === side, + (f) => f.findingZoneId === zone.id && f.side === side, ).length - const selectedAria = `${selectedCount} ${ - selectedCount > 1 - ? t('findings.selected_plural') - : t('findings.selected_singular') - }` + const selectedAria = `${selectedCount} ${selectedCount > 1 ? t('findings.selected_plural') : t('findings.selected_singular')}` return (
    • - setExpandedZoneId(expanded ? null : pickerKey) + setExpandedZoneId(open ? null : pickerKey) } - aria-expanded={expanded} + aria-expanded={open} aria-controls={`findings-zone-${pickerKey}`} className="w-full flex items-center justify-between gap-2 px-3 py-2 text-left rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--color-accent)]/40" > - {nameOf(tree)} - {side && ` (${t(side === 'left' ? 'lateral.left' : 'lateral.right')})`} + {pickLabel(zone.name, locale)} + {side && + ` (${t(side === 'left' ? 'lateral.left' : 'lateral.right')})`} {selectedCount > 0 && ( - {expanded && ( + {open && (
      - onChange({ ...observation, findings: next }) + onChange({ + ...observation, + findings: next, + }) } />
      @@ -378,6 +397,40 @@ export default function ObservationCard({ )}
    + {unresolved.length > 0 && ( +
    + +

    + {t('observation.findings_unresolved_help')} +

    +
      + {unresolved.map((f, i) => ( +
    • + + {f.requiresVetReferral ? '⚠ ' : ''} + {locale === 'en' + ? f.labelEnSnapshot + : f.labelFrSnapshot} + {f.side && + ` (${t(f.side === 'left' ? 'lateral.left_short' : 'lateral.right_short')})`} + + +
    • + ))} +
    +
    + )} +
    void onMoveDown: (i: number) => void // Editor body props forwarded to each card - bones: Map - findings: SpeciesFindings | null + sheet: SheetIndex onChange: (i: number, next: Observation) => void onOpenVertebraPicker: (i: number, zoneIndex: number) => void onRemoveZone: (i: number, zoneIndex: number) => void @@ -29,8 +27,7 @@ export default function ObservationList({ onDelete, onMoveUp, onMoveDown, - bones, - findings, + sheet, onChange, onOpenVertebraPicker, onRemoveZone, @@ -64,8 +61,7 @@ export default function ObservationList({ onMoveDown={() => onMoveDown(i)} canMoveUp={i > 0} canMoveDown={i < observations.length - 1} - bones={bones} - findings={findings} + sheet={sheet} onChange={(next) => onChange(i, next)} onOpenVertebraPicker={(zoneIndex) => onOpenVertebraPicker(i, zoneIndex) diff --git a/apps/app/src/components/observation/SeveritySelector.tsx b/apps/app/src/components/observation/SeveritySelector.tsx index 16f22c53..996159fc 100644 --- a/apps/app/src/components/observation/SeveritySelector.tsx +++ b/apps/app/src/components/observation/SeveritySelector.tsx @@ -1,4 +1,4 @@ -import type { Severity } from '@/domain/schema/observation' +import type { Severity } from '@faunosteo/domain' import { useT } from '@/i18n/useT' export interface SeveritySelectorProps { @@ -6,17 +6,25 @@ export interface SeveritySelectorProps { onChange: (s: Severity | undefined) => void } -const SEVERITIES: Severity[] = ['légère', 'modérée', 'sévère'] +export const SEVERITIES: Severity[] = ['mild', 'moderate', 'severe'] const COLORS: Record = { - 'légère': 'border-[var(--severity-mild)] text-[var(--severity-mild)]', - 'modérée': 'border-[var(--severity-moderate)] text-[var(--severity-moderate)]', - 'sévère': 'border-[var(--severity-severe)] text-[var(--severity-severe)]', + mild: 'border-[var(--severity-mild)] text-[var(--severity-mild)]', + moderate: 'border-[var(--severity-moderate)] text-[var(--severity-moderate)]', + severe: 'border-[var(--severity-severe)] text-[var(--severity-severe)]', } -export default function SeveritySelector({ value, onChange }: SeveritySelectorProps) { +/** Severity codes are persisted; labels come from the dictionary (D8). */ +export default function SeveritySelector({ + value, + onChange, +}: SeveritySelectorProps) { const t = useT() return ( -
    +
    {SEVERITIES.map((s) => ( ))}
    @@ -89,26 +96,52 @@ export default function VertebraPicker({ {Array.from({ length: count }, (_, k) => k + 1).map((i) => ( toggle(activeRegion, i)} + active={has(active.code, i)} + onClick={() => toggle(active.code, i)} > - {activeRegion}{i} + {active.code} + {i} ))}
    - - + {canExtend && !showExtended && ( + + )} + {canExtend && showExtended && ( + + {t('vertebra.range_note') + .replace('{usual}', String(active.count)) + .replace('{min}', String(active.count_range?.min ?? active.count)) + .replace('{max}', String(maxCount))} + + )}
    - - + +
    ) diff --git a/apps/app/src/components/report/AnimalForm.tsx b/apps/app/src/components/report/AnimalForm.tsx index effc2527..c04f9b67 100644 --- a/apps/app/src/components/report/AnimalForm.tsx +++ b/apps/app/src/components/report/AnimalForm.tsx @@ -1,23 +1,36 @@ -import type { Animal, Owner } from '@/domain/schema/animal' +import type { Animal, LocalizedText, Owner } from '@faunosteo/domain' import Label from '@/components/ui/Label' import Input from '@/components/ui/Input' import Select from '@/components/ui/Select' -import { getAllSpecies, speciesLabel } from '@/domain/species/registry' +import { pickLabel } from '@/services/sheetIndex' import { useT } from '@/i18n/useT' import { useLocaleStore } from '@/state/localeStore' +export interface SpeciesOption { + id: string + name: LocalizedText +} + export interface AnimalFormProps { animal: Animal owner: Owner + /** Species that have a sheet in this build (one today). */ + species: readonly SpeciesOption[] onChangeAnimal: (next: Animal) => void onChangeOwner: (next: Owner) => void } -export default function AnimalForm({ animal, owner, onChangeAnimal, onChangeOwner }: AnimalFormProps) { +export default function AnimalForm({ + animal, + owner, + species, + onChangeAnimal, + onChangeOwner, +}: AnimalFormProps) { const t = useT() const locale = useLocaleStore((s) => s.locale) - const species = getAllSpecies() - const setA = (patch: Partial) => onChangeAnimal({ ...animal, ...patch }) + const setA = (patch: Partial) => + onChangeAnimal({ ...animal, ...patch }) return (
    @@ -31,25 +44,45 @@ export default function AnimalForm({ animal, owner, onChangeAnimal, onChangeOwne onChange={(e) => setA({ speciesId: e.target.value })} > {species.map((s) => ( - + ))}
    - setA({ name: e.target.value })} /> + setA({ name: e.target.value })} + />
    - setA({ breed: e.target.value || undefined })} /> + setA({ breed: e.target.value || undefined })} + />
    - setA({ age: e.target.value || undefined })} /> + setA({ age: e.target.value || undefined })} + />
    - onChangeOwner({ name: e.target.value })} /> + onChangeOwner({ name: e.target.value })} + />
    ) diff --git a/apps/app/src/components/report/ConclusionPanel.tsx b/apps/app/src/components/report/ConclusionPanel.tsx index 72757b8d..d73b8651 100644 --- a/apps/app/src/components/report/ConclusionPanel.tsx +++ b/apps/app/src/components/report/ConclusionPanel.tsx @@ -1,4 +1,4 @@ -import type { Report } from '@/domain/schema/report' +import type { Report } from '@faunosteo/domain' import Label from '@/components/ui/Label' import Textarea from '@/components/ui/Textarea' import NextAppointmentPicker from './NextAppointmentPicker' @@ -29,13 +29,26 @@ export default function ConclusionPanel({
    -