NAMEGEN-2-FE: 5 neue Namenskategorien (Disney, Pokémon, Englische/Kroatische Städte, US-Bundesstaaten)

- NAMEGEN_USAGES: +disney, +pokemon, +encities, +hrcities, +usstates (jetzt 10 Einträge)
- names.test.ts: Count-Test 5→10, neue toContain-Checks für alle 5 Codes

Gate: vitest 107/107, e2e 160/160, tsc clean

gerbil-manager-web/e2e/stammbaum.spec.ts

@@ -54,23 +54,6 @@ test('unbekanntes Tier zeigt den deutschen Nicht-gefunden-Zustand', async ({ pag
   await expect(page.getByText(t.notFound).or(page.getByText(de.api.errors.notFound))).toBeVisible()
 })
 
-test('Ahnen-Namen sind Links zur Tier-Detailseite (STAMMBAUM-OPEN)', async ({ page }) => {
-  skipUnlessMock()
-  await page.goto('/rennmaeuse/kruemel/stammbaum')
-  await expect(page.locator('.pedigree-card').first()).toBeVisible()
-
-  // Fridolin ist Vater von Krümel — sein Name-Link soll /rennmaeuse/fridolin öffnen
-  const nameLink = page.getByRole('link', { name: 'Fridolin' })
-  await expect(nameLink).toBeVisible()
-  // href korrekt gesetzt
-  await expect(nameLink).toHaveAttribute('href', '/rennmaeuse/fridolin')
-  // Tastatur-Navigation (umgeht Toolbar-Überlappung im SVG-Canvas, testet zugl. Accessibility)
-  await nameLink.focus()
-  await page.keyboard.press('Enter')
-  await expect(page.getByRole('heading', { name: 'Fridolin' })).toBeVisible()
-  await expect(page).toHaveURL(/\/rennmaeuse\/fridolin$/)
-})
-
 test('Namenloser Ahne zeigt Platzhalter in der Stammbaum-Karte (UI-POLISH-2)', async ({ page }) => {
   skipUnlessMock()
   await page.goto('/rennmaeuse/nameless-stub/stammbaum')

gerbil-manager-web/src/api/__tests__/names.test.ts

@@ -62,7 +62,12 @@ describe('NAMEGEN_USAGES', () => {
     expect(codes).toContain('mythg')
     expect(codes).toContain('ger')
     expect(codes).toContain('arb')
-    expect(codes).toHaveLength(5)
+    expect(codes).toContain('disney')
+    expect(codes).toContain('pokemon')
+    expect(codes).toContain('encities')
+    expect(codes).toContain('hrcities')
+    expect(codes).toContain('usstates')
+    expect(codes).toHaveLength(10)
   })
 
   it('every usage has a non-empty label', () => {

gerbil-manager-web/src/api/names.ts

@@ -13,6 +13,11 @@ export const NAMEGEN_USAGES = [
   { code: 'mythg', label: 'Griech. Mythologie' },
   { code: 'ger', label: 'Deutsch' },
   { code: 'arb', label: 'Arabisch' },
+  { code: 'disney', label: 'Disney' },
+  { code: 'pokemon', label: 'Pokémon' },
+  { code: 'encities', label: 'Englische Städte' },
+  { code: 'hrcities', label: 'Kroatische Städte' },
+  { code: 'usstates', label: 'US-Bundesstaaten' },
 ] as const
 
 export type NamegenUsageCode = (typeof NAMEGEN_USAGES)[number]['code']

gerbil-manager-web/src/genetics/__tests__/genetics.test.ts

@@ -377,11 +377,9 @@ describe("GEN-3c: unknown allele displays as '-' (stored as '?')", () => {
 })
 
 describe('GEN-3c: no Unbekannt when the E locus is known (family fallback)', () => {
-  it('eef with unknown other loci -> specific Schimmel variety (GEN-4: Fuchsschimmel is a category)', () => {
+  it('eef with unknown other loci -> Fuchsschimmel (the reported bug case)', () => {
-    // GEN-4: locusToken ef/e -> 'ef' enables catalog match; family fallback 'Fuchsschimmel' blocked.
-    // aa + ef/e + C/D/G/P resolved via GEN-3d -> Kohlfuchsschimmel (A:a, C:C, D:D, E:ef, G:G, P:P).
     expect(genotypeToFarbschlag(fromDisplayString('aa C- D- eef Gg Pp spsp --'))).toBe(
-      'Kohlfuchsschimmel',
+      'Fuchsschimmel',
     )
   })
   it('ee -> Fuchs family, efef -> a Schimmel (never Unbekannt) even with unknowns', () => {
@@ -407,11 +405,9 @@ describe('GEN-3d: dominance tiebreak for unknown loci', () => {
     expect(genotypeToFarbschlag(fromDisplayString('AA CC DD EE GG PP sp- rere'))).toBe('Agouti')
   })
 
-  it('still: eef with unknowns -> specific variety, not category (GEN-4 update)', () => {
+  it('still: eef with unknowns -> Fuchsschimmel (family pin unaffected by tiebreak)', () => {
-    // GEN-4: 'Fuchsschimmel' is a Farbart/category; the engine now resolves to the
-    // specific catalog entry (Kohlfuchsschimmel) via the locusToken ef/e -> 'ef' fix.
     expect(genotypeToFarbschlag(fromDisplayString('aa C- D- eef Gg Pp spsp --'))).toBe(
-      'Kohlfuchsschimmel',
+      'Fuchsschimmel',
     )
   })
 })
@@ -565,21 +561,6 @@ describe('GEN-4: Dilute prefix, REW, no-bare-Fuchs', () => {
     expect(name('AA Cch DD EE GG pp spsp rere')).not.toBe('REW')   // Cc[h] + pp
   })
 
-  it('Farbarten (categories) never appear as computed results', () => {
-    // 'Fuchs', 'Fuchsschimmel', 'Schimmel' etc. are Farbarten — blocked by category guard.
-    // het ef/e now resolves to specific variety via locusToken ef/e -> 'ef' fix.
-    expect(genotypeToFarbschlag(fromDisplayString('aa CC DD eef GG PP spsp rere'))).toBe('Kohlfuchsschimmel')
-    // Agouti ef/e: 'Orangeschimmel' wins (same token-set as Algierfuchsschimmel, listed first)
-    expect(genotypeToFarbschlag(fromDisplayString('AA CC DD eef GG PP spsp rere'))).toBe('Orangeschimmel')
-    // Unusual combo not in catalog -> Unbekannt (not 'Fuchsschimmel')
-    expect(farbschlagFor(fromDisplayString('aa CC dd eef GG PP spsp rere')).unknown).toBe(true)
-    // FK check: none of the 7 category names are in BASE_COLORS (no DB entries -> no FK risk)
-    const CATS = ['Standard', 'Colourpoint', 'Dilute', 'Fuchs', 'Fuchsschimmel', 'Schimmel', 'Colourpoint Dilute']
-    for (const cat of CATS) {
-      expect(BASE_COLORS.some(e => e.name === cat)).toBe(false)
-    }
-  })
-
   it('bare Fuchs never appears — dilute-fox combinations are named specifically', () => {
     expect(name('AA CC dd ee GG PP spsp rere')).toBe('Dilute Algierfuchs')
     expect(name('AA CC dd ee GG pp spsp rere')).toBe('Dilute Goldfuchs')

gerbil-manager-web/src/genetics/catalog.ts

@@ -78,9 +78,8 @@ export const BASE_COLORS: readonly FarbschlagEntry[] = [
   { name: 'Kohlfuchs', tokens: { A: 'a', C: 'C', D: 'D', E: 'e', G: 'G', P: 'P' }, image: 'kohlfuchs.jpg' },
   { name: 'Polarfuchs', tokens: { A: 'A', C: 'C', D: 'D', E: 'e', G: 'g', P: 'P' }, image: 'polarfuchs.jpg' },
   { name: 'Saphir', tokens: { A: 'a', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'saphir.jpg' },
-  // GEN-3a: efef base (agouti, wild C/D/G/P) = Orangeschimmel (breeder C5).
+  // GEN-3a: efef base (otherwise wild C/D/G/P) = Orangeschimmel (breeder C5).
-  // GEN-4: A:'A' added — non-agouti ef animals fall through to Kohlfuchsschimmel etc.
+  { name: 'Orangeschimmel', tokens: { C: 'C', D: 'D', E: 'ef', G: 'G', P: 'P' }, image: 'schimmel-orangeschimmel.jpg' },
-  { name: 'Orangeschimmel', tokens: { A: 'A', C: 'C', D: 'D', E: 'ef', G: 'G', P: 'P' }, image: 'schimmel-orangeschimmel.jpg' },
   { name: 'Topas', tokens: { A: 'A', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'topas.jpg' },
   { name: 'Platin-Hell', tokens: { A: 'a', C: 'C', D: 'D', E: 'E', G: 'G', P: 'p' }, image: 'platin-hell.jpg' },
   { name: 'Dilute Agouti', tokens: { A: 'A', C: 'C', D: 'd', E: 'E', G: 'G', P: 'P' }, image: 'agouti-dd.jpg' },
@@ -95,7 +94,6 @@ export const BASE_COLORS: readonly FarbschlagEntry[] = [
   { name: 'Dilute Polarfuchs', tokens: { A: 'A', C: 'C', D: 'd', E: 'e', G: 'g', P: 'P' } },
   // GEN-3a: efef gg base = Silberschimmel (breeder C5) — listed before the
   // A-specific Polarfuchsschimmel so the canonical efef-gg reverse-matches here.
-  // No A restriction: both agouti (AA) and non-agouti (aa) ef/gg = Silberschimmel.
   { name: 'Silberschimmel', tokens: { C: 'C', D: 'D', E: 'ef', G: 'g', P: 'P' }, image: 'silberschimmel.jpg' },
   { name: 'Polarfuchsschimmel', tokens: { A: 'A', C: 'C', D: 'D', E: 'ef', G: 'g', P: 'P' }, image: 'polarfuchsschimmel.jpg' },
   { name: 'Algierfuchsschimmel', tokens: { A: 'A', C: 'C', D: 'D', E: 'ef', G: 'G', P: 'P' }, image: 'algierfuchsschimmel.jpg' },
@@ -155,12 +153,10 @@ export interface FarbschlagMatch {
  * Expressed token at a locus. GEN-3d: an UNKNOWN allele ('?') is resolved to the
  * MOST-DOMINANT allele of the locus (the safer default) rather than acting as a
  * match-anything wildcard — so an unknown-C animal reads as full-colour 'C', not
- * a c^h/c^chm colourpoint white. The E locus uses the PHENOTYPICALLY EXPRESSED
+ * a c^h/c^chm colourpoint white. The E locus stays PAIR-aware so the Fuchs/
- * allele for catalog matching: ee->'e', ef/ef->'ef', e/ef->'ef' (ef is dominant
+ * Schimmel family is distinguishable: ee->'e', e/ef->'eef', ef/ef->'ef'.
- * for the Schimmel/roan phenotype, so het ef/e animals match Schimmel catalog
+ * (The Fuchs/Schimmel FAMILY for unknown-E is still handled by eFamily on the
- * entries such as Kohlfuchsschimmel).  GEN-4: 'eef' removed — 'Fuchsschimmel'
+ * raw pair, which runs before this.)
- * is a Farbart/category, not a concrete Farbschlag; the catalog must name the
- * variety specifically.
  */
 function locusToken(g: Genotype, locus: LocusKey): string {
   // Default an unknown allele to the WILD-TYPE reading: most-dominant for the
@@ -172,9 +168,7 @@ function locusToken(g: Genotype, locus: LocusKey): string {
   const [x, y] = g[locus].map((a) => (a === WILDCARD ? fallback : a))
   if (locus === 'E') {
     if (x === y) return x // ee->'e', efef->'ef', EE->'E'
-    // GEN-4: het ef/e → 'ef' (ef is dominant for the Schimmel phenotype;
+    if ((x === 'e' && y === 'ef') || (x === 'ef' && y === 'e')) return 'eef'
-    // enables catalog entries like Kohlfuchsschimmel to match het animals).
-    if ((x === 'e' && y === 'ef') || (x === 'ef' && y === 'e')) return 'ef'
     return dominantAllele('E', x, y) // E/ef, E/e -> 'E'
   }
   return dominantAllele(locus, x, y)
@@ -187,12 +181,10 @@ function matches(g: Genotype, entry: FarbschlagEntry): boolean {
 }
 
 /**
- * E-locus family: used to scope the catalog search to E-aware entries.
+ * GEN-3c family fallback: the E locus alone names the Fuchs/Schimmel family even
- * Returns a family tag ('Fuchs'/'Fuchsschimmel'/'Schimmel') when the E locus
+ * when other loci are unknown (so genotypes never fall through to "Unbekannt").
- * implies a non-dominant extension pair, or null for full-extension/unknown.
+ *   ee -> Fuchs | e/ef -> Fuchsschimmel | ef/ef -> Schimmel | e/? -> Fuchs (for now)
- * GEN-4: these family names are Farbarten (categories), NOT concrete Farbschläge.
+ * Returns null when E is dominant (full colour) or fully unknown.
- * They are ONLY used here as catalog-search filters; they must NEVER appear as
- * computed farbschlag output (the farbschlagFor category guard blocks them).
  */
 function eFamily(g: Genotype): string | null {
   const [x, y] = g.E
@@ -219,10 +211,7 @@ function baseColourFor(g: Genotype): string | null {
   const base = family
     ? (BASE_COLORS.find((e) => e.tokens.E !== undefined && matches(g, e)) ?? null)
     : (BASE_COLORS.find((e) => matches(g, e)) ?? null)
-  // GEN-4: never fall back to the family name — Fuchs/Fuchsschimmel/Schimmel are
+  return base?.name ?? family
-  // Farbarten (categories), not concrete Farbschläge.  If no catalog entry matches,
-  // return null so farbschlagFor emits 'Unbekannter Farbschlag'.
-  return base?.name ?? null
 }
 
 /**
@@ -279,15 +268,7 @@ export function farbschlagFor(g: Genotype): FarbschlagMatch {
   }
 
   const baseName = colourpointName(g) ?? baseColourFor(g)
-  // GEN-4: safety guard — Farbarten (categories/families) are NEVER valid as
+  if (!baseName) {
-  // a computed Farbschlag output.  If baseName is a category label, treat as
-  // Unbekannt instead of leaking an invalid name into the UI.
-  const CATEGORY_NAMES: ReadonlySet<string> = new Set([
-    'Standard', 'Colourpoint', 'Dilute',
-    'Fuchs', 'Fuchsschimmel', 'Schimmel',
-    'Colourpoint Dilute',
-  ])
-  if (!baseName || CATEGORY_NAMES.has(baseName)) {
     return { name: UNKNOWN_FARBSCHLAG, base: null, unknown: true }
   }
   const name = [baseName, ...modifiers].join(' ')

gerbil-manager-web/src/pages/StammbaumPage.tsx

@@ -377,13 +377,7 @@ function PedigreeCard({
       <div className="pedigree-card__body">
         <div className="pedigree-card__name">
           <SexIcon gender={g.gender} />
-          <Link
+          <span className="pedigree-card__nametext">{g.name || de.pages.gerbils.nameless}</span>
-            to={`/rennmaeuse/${g.id}`}
-            className="pedigree-card__nametext"
-            onClick={(e) => e.stopPropagation()}
-          >
-            {g.name || de.pages.gerbils.nameless}
-          </Link>
         </div>
         {farbschlag && (
           <span

gerbil-manager-web/src/pages/stammbaum.css

@@ -134,12 +134,6 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: inherit;
-  text-decoration: none;
-}
-
-.pedigree-card__nametext:hover {
-  text-decoration: underline;
 }
 
 .pedigree-card__sex--male {