feat(settings): let a company name each verifikationsserie letter (#2336)

* feat(settings): let a company name each verifikationsserie letter The series pickers show a fixed preset label next to every letter (A Redovisning ... M Momsrapport, Fortnox's layout). A byrå that lays its series out differently sees a wrong or missing name in every dropdown: a partner running löner on L saw "Kontantfaktura" in the verifikat form and asked for the series name. - company_settings.voucher_series_labels JSONB ({"L": "Lön"}), keys A-Z, values 1 to 40 chars, CHECK on the JSON shape. Display only; the engine never reads it. - UpdateSettingsSchema validates the map, trims names and strips empty values so a cleared field removes the name. - voucherSeriesLabel(letter, labels) is the one place that decides what a letter is called: company name, then preset, then empty. buildVoucherSeriesOptions replaces the three near-identical option builders in the verifikat form and the two settings pickers. - The Verifikationsserier list in settings edits the names: rows are the union of used, configured and named letters, one save button. - The SIE import review's two series pickers show the name too. Migration applied to staging (metjnjrhvujscngnpzdv) as 20260906131300. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QBj3hzDUb8sgtxTvyAjFWC * fix(settings): keep imported series in the list and unsaved names through a refetch Skeptic pass on the series-name editor refuted two things: - The rewritten list filtered voucher_sequences to single letters, dropping multi-character series (FT, LB, SKV, ...) that 54 production companies carry over from Fortnox and Bokio imports; the old list showed them with their highest number. Rows are now every used series plus the configured and named letters; only single-letter series get a name input, since those are what the pickers offer and the schema accepts. - The draft re-seeded on the identity of settings.voucher_series_labels, and the settings hook revalidates on window focus with a fresh object, so unsaved typing was wiped after any earlier save on the page. The re-seed is now keyed on the serialized content of the saved names. Also folds the "new series are created on first use" footnote back into the group help, which the rewrite had dropped. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QBj3hzDUb8sgtxTvyAjFWC * fix(settings): name the default-series options and enforce the label shape in the database Review pass on #2336: - CodeRabbit: the Standardserie selector under Bokföring still rendered bare letters; it now shows the same name the other pickers do, through voucherSeriesLabel. - Compliance swarm (SOC 2 PI1.1, low): the key and length rules for voucher_series_labels lived only in UpdateSettingsSchema. Migration 20260906134700 adds voucher_series_labels_valid(jsonb) and swaps the object-only CHECK for one that mirrors the Zod rules (keys A-Z, values non-blank strings of at most 40 characters), so a write that bypasses /api/settings cannot store a map the pickers cannot handle. Applied to staging with its schema_migrations row; verified against good, empty, lowercase, blank, over-long, numeric and array inputs. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QBj3hzDUb8sgtxTvyAjFWC * test(pg): cover the voucher_series_labels CHECK against real Postgres The coverage gate refuses a migration that adds a function without a *.pg.test.ts. voucher_series_labels_valid(jsonb) and the constraint that wraps it now have one: accepts the empty map and single-letter keys with names of 1 to 40 characters, rejects lowercase and multi-letter keys, blank, over-long, numeric and null values, arrays and scalars, and leaves the row untouched after a refused write. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QBj3hzDUb8sgtxTvyAjFWC --------- Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
2026-09-06 16:20:42 +02:00
parent 0e3c0af841
commit 0c854ac54f
19 changed files with 633 additions and 89 deletions
@@ -1956,6 +1956,48 @@ describe('UpdateSettingsSchema', () => {
      expect(result.success).toBe(false)
    })
  })
+
+  describe('voucher_series_labels', () => {
+    it('accepts a map of letters to names and trims the names', () => {
+      const result = UpdateSettingsSchema.safeParse({
+        voucher_series_labels: { L: '  Lön ', N: 'Utlägg' },
+      })
+      expect(result.success).toBe(true)
+      expect(result.data?.voucher_series_labels).toEqual({ L: 'Lön', N: 'Utlägg' })
+    })
+
+    it('strips empty names so a cleared field removes the name', () => {
+      const result = UpdateSettingsSchema.safeParse({
+        voucher_series_labels: { L: 'Lön', K: '', M: '   ' },
+      })
+      expect(result.success).toBe(true)
+      expect(result.data?.voucher_series_labels).toEqual({ L: 'Lön' })
+    })
+
+    it('accepts an empty map', () => {
+      const result = UpdateSettingsSchema.safeParse({ voucher_series_labels: {} })
+      expect(result.success).toBe(true)
+      expect(result.data?.voucher_series_labels).toEqual({})
+    })
+
+    it('rejects keys that are not a single uppercase letter', () => {
+      expect(UpdateSettingsSchema.safeParse({ voucher_series_labels: { l: 'Lön' } }).success).toBe(false)
+      expect(UpdateSettingsSchema.safeParse({ voucher_series_labels: { AB: 'Lön' } }).success).toBe(false)
+      expect(UpdateSettingsSchema.safeParse({ voucher_series_labels: { '': 'Lön' } }).success).toBe(false)
+    })
+
+    it('rejects a name longer than 40 characters', () => {
+      const result = UpdateSettingsSchema.safeParse({
+        voucher_series_labels: { L: 'x'.repeat(41) },
+      })
+      expect(result.success).toBe(false)
+    })
+
+    it('rejects a non-string name', () => {
+      const result = UpdateSettingsSchema.safeParse({ voucher_series_labels: { L: 7 } })
+      expect(result.success).toBe(false)
+    })
+  })
 })

 // ============================================================
@@ -2394,6 +2394,20 @@ export const UpdateSettingsSchema = z.object({
      z.string().regex(/^[A-Z]$/, 'Verifikationsserie måste vara en bokstav A-Z'),
    )
    .optional(),
+  // Company-defined display names per series letter ({"L": "Lön"}). Keys are
+  // single uppercase letters; values are trimmed to at most 40 characters. An
+  // empty value means "clear this name": it is stripped here so the stored
+  // map only ever holds real names and the resolver can treat a missing key
+  // as "use the preset". Display only; the engine never reads this column.
+  voucher_series_labels: z
+    .record(
+      z.string().regex(/^[A-Z]$/, 'Verifikationsserie måste vara en bokstav A-Z'),
+      z.string().trim().max(40, 'Serienamn får vara högst 40 tecken'),
+    )
+    .transform((labels) =>
+      Object.fromEntries(Object.entries(labels).filter(([, name]) => name.length > 0)),
+    )
+    .optional(),
  // Invoice PDF settings
  ore_rounding: z.boolean().optional(),
  invoice_show_ocr: z.boolean().optional(),
@@ -1,6 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import {
  applyDefaultSeriesToMap,
+  buildVoucherSeriesOptions,
  formatVoucher,
  parseVoucher,
  resolveDefaultSeriesForSource,
@@ -232,4 +233,54 @@ describe('voucherSeriesLabel', () => {
    expect(voucherSeriesLabel('Z')).toBe('')
    expect(voucherSeriesLabel('')).toBe('')
  })
+
+  it('lets the company name beat the preset, in place', () => {
+    // A byrå that runs löner on L (not the preset K) must see its own word.
+    expect(voucherSeriesLabel('L', { L: 'Lön' })).toBe('Lön')
+    expect(voucherSeriesLabel('L', { L: ' Lön ' })).toBe('Lön')
+  })
+
+  it('names a letter with no preset when the company has named it', () => {
+    expect(voucherSeriesLabel('N', { N: 'Utlägg' })).toBe('Utlägg')
+  })
+
+  it('falls back to the preset when the company name is empty or missing', () => {
+    expect(voucherSeriesLabel('K', { K: '' })).toBe('Lön')
+    expect(voucherSeriesLabel('K', { K: '   ' })).toBe('Lön')
+    expect(voucherSeriesLabel('K', {})).toBe('Lön')
+    expect(voucherSeriesLabel('K', null)).toBe('Lön')
+    expect(voucherSeriesLabel('N', { K: 'x' })).toBe('')
+  })
+})
+
+describe('buildVoucherSeriesOptions', () => {
+  it('offers the presets first, in their fixed order, with preset labels', () => {
+    const options = buildVoucherSeriesOptions(null, [])
+    expect(options.map((o) => o.letter).join('')).toBe('ABCDEFGHIJKLM')
+    expect(options[0]).toEqual({ letter: 'A', label: 'Redovisning' })
+  })
+
+  it('appends extra letters once, sorted, after the presets', () => {
+    const options = buildVoucherSeriesOptions(null, ['Z', 'N', 'N', 'A'])
+    expect(options.map((o) => o.letter).join('')).toBe('ABCDEFGHIJKLMNZ')
+    expect(options.find((o) => o.letter === 'N')).toEqual({ letter: 'N', label: '' })
+  })
+
+  it('drops anything that is not a single uppercase letter', () => {
+    const options = buildVoucherSeriesOptions(null, ['', null, undefined, 'ab', 'n', 7, ' '])
+    expect(options.map((o) => o.letter).join('')).toBe('ABCDEFGHIJKLM')
+  })
+
+  it('applies company names to presets in place and lists named non-preset letters', () => {
+    const options = buildVoucherSeriesOptions({ L: 'Lön', N: 'Utlägg' }, [])
+    expect(options.find((o) => o.letter === 'L')).toEqual({ letter: 'L', label: 'Lön' })
+    expect(options.find((o) => o.letter === 'K')).toEqual({ letter: 'K', label: 'Lön' })
+    expect(options.find((o) => o.letter === 'N')).toEqual({ letter: 'N', label: 'Utlägg' })
+    expect(options.map((o) => o.letter).join('')).toBe('ABCDEFGHIJKLMN')
+  })
+
+  it('ignores malformed keys in the label map', () => {
+    const options = buildVoucherSeriesOptions({ ab: 'x', n: 'y', '': 'z' }, [])
+    expect(options.map((o) => o.letter).join('')).toBe('ABCDEFGHIJKLM')
+  })
 })
@@ -59,12 +59,62 @@ export const VOUCHER_SERIES_PRESETS: ReadonlyArray<{ letter: string; label: stri
  { letter: 'M', label: 'Momsrapport' },
 ]

-/** Swedish description for a preset series letter; empty for unknown letters. */
-export function voucherSeriesLabel(letter: string): string {
+/**
+ * Company-defined series names, company_settings.voucher_series_labels:
+ * {"L": "Lön"}. Keys are single uppercase letters, values non-empty names.
+ */
+export type VoucherSeriesLabels = Partial<Record<string, string>>
+
+/**
+ * Display name for a series letter: the company's own name first, the Swedish
+ * preset second, empty when neither exists. The ONLY place that decides what a
+ * letter is called; every picker and list goes through it so a company that
+ * lays its series out differently from the presets (L for löner instead of K)
+ * sees its own words everywhere, not Fortnox's.
+ */
+export function voucherSeriesLabel(
+  letter: string,
+  labels?: VoucherSeriesLabels | null,
+): string {
+  const custom = labels?.[letter]
+  if (typeof custom === 'string' && custom.trim().length > 0) return custom.trim()
  const match = VOUCHER_SERIES_PRESETS.find((p) => p.letter === letter)
  return match ? match.label : ''
 }

+/**
+ * The closed list every series picker offers: the presets in their fixed
+ * order, then every other letter the company already uses or has named,
+ * deduplicated and sorted. Each entry carries the display name resolved by
+ * voucherSeriesLabel, so a custom name overrides a preset in place.
+ *
+ * `extraLetters` may hold anything (settings values, draft state, account
+ * rows); only single uppercase letters survive, so an empty string, null or a
+ * typo never becomes an option. A free A-Z list would let a slip start an
+ * undocumented series (BFNAR 2013:2 p. 9.2-9.15 wants the series in use
+ * enumerated in the systemdokumentation).
+ */
+export function buildVoucherSeriesOptions(
+  labels: VoucherSeriesLabels | null | undefined,
+  extraLetters: Iterable<unknown>,
+): Array<{ letter: string; label: string }> {
+  const seen = new Set(VOUCHER_SERIES_PRESETS.map((p) => p.letter))
+  const extras = new Set<string>()
+  const consider = (value: unknown) => {
+    if (typeof value === 'string' && SERIES_LETTER_RE.test(value) && !seen.has(value)) {
+      extras.add(value)
+    }
+  }
+  for (const value of extraLetters) consider(value)
+  for (const key of Object.keys(labels ?? {})) consider(key)
+  return [
+    ...VOUCHER_SERIES_PRESETS.map((p) => ({ letter: p.letter, label: voucherSeriesLabel(p.letter, labels) })),
+    ...Array.from(extras)
+      .sort()
+      .map((letter) => ({ letter, label: voucherSeriesLabel(letter, labels) })),
+  ]
+}
+
 /**
 * Resolve the default voucher_series letter for a given source_type from a
 * company_settings row. Returns 'A' as a safe fallback when no mapping is