* feat(bookkeeping): make blocked fiscal-year creation actionable When creating a new räkenskapsår is blocked because a prior period is still open, the "Skapa räkenskapsår" dialog no longer dead-ends on an English toast. The API now returns the canonical bilingual error envelope with the blocking periods (id/name/dates) under details, and the dialog renders a Swedish panel that locks them inline (reversible locked_at) via the existing /lock endpoint and retries creation. The guard rule is unchanged and remains BFL-compliant: BFL 6 kap allows löpande bokföring of the new year in parallel with the prior year's bokslut, so a lock (not a full close) is sufficient and reversible. - Add PERIOD_CREATE_BLOCKED_BY_OPEN_PERIODS structured error code - Return envelope + details.blockingPeriods from the 409 (was English string) - CreatePeriodDialog: inline "lås och skapa" panel + lock-and-retry - Update route tests for the new envelope shape Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(ui): prevent mouse wheel from mutating number inputs A focused <input type="number"> would change its value on scroll, silently turning e.g. a 20000 salary into 19998. Blur number inputs on wheel so the page scrolls instead of editing the value. Applied at the Input primitive so all number fields are protected. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat(salary): auto-derive skattetabell and kolumn for employees Replace the opaque manual "Skattetabell (29-42)" and "Kolumn (1-6)" inputs on the employee form with a self-deriving flow: the user picks their folkbokföringskommun from a searchable dropdown and the tax table fills itself in, while the column derives from the personnummer we already collect. - Add a searchable municipality picker (MunicipalityCombobox) backed by a new cached GET /api/salary/tax-tables/kommuner endpoint. - Wrap the whole "Skatt" card in a self-contained EmployeeTaxCard used by both the create and edit pages, with InfoTooltips and named column options. - deriveTaxColumn(): auto-select column 1 for under-66 employees; leave the ambiguous 66+ case (pension vs working senior) to a clearly-named manual choice. - Fix fetchKommunTaxRates() to page through all ~1300 församling rows instead of a single 500-row page (which silently dropped ~200 kommuner, incl. Göteborg) and normalize the uppercase names to title case. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(import): correct CSV amount-column guess and surface skipped rows Manual CSV column-mapping auto-guess walked each data row right-to-left and picked the first numeric cell as the amount, so on the common ...;Belopp;Saldo layout it grabbed the trailing running-balance column. Extract the guess into a pure, tested suggestColumnMapping(): match header labels first (belopp/amount -> amount, saldo/balance -> balance), auto-fill the balance field, and fall back to value heuristics that skip the balance column and prefer a column carrying negative values. Also surface stats.skipped_rows + parse warnings in BankFileConfirmStep - the manual-mapping path skips the preview step that was the only place they showed, so skipped rows were silently dropped from view. Add a unit test reproducing the Saldo-as-amount regression. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * feat: add "Save as draft" functionality for invoices - Implemented a new feature to allow users to save invoices as unnumbered drafts without generating an invoice number until finalized. - Added a `save_as_draft` flag to the CreateInvoiceInput schema to handle draft saving logic. - Updated the invoice creation API to skip number allocation when saving as a draft. - Introduced a new endpoint for finalizing drafts, which allocates an invoice number and emits an `invoice.created` event. - Enhanced the UI to include a "Save as draft" button, with loading states and tooltips. - Updated tests to cover the new draft saving and finalization logic, including race conditions for concurrent modifications. - Added relevant error handling for draft finalization and deletion scenarios. * feat(employee): add employment start and end date fields to employee forms * feat: enhance invoice and salary run handling with improved validation and event logging --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
202 lines
5.9 KiB
TypeScript
202 lines
5.9 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useRef, useEffect, useMemo, useCallback } from 'react'
|
|
import { Input } from '@/components/ui/input'
|
|
|
|
export interface KommunRate {
|
|
kommun: string
|
|
totalRate: number
|
|
tableNumber: number
|
|
}
|
|
|
|
interface MunicipalityComboboxProps {
|
|
value: string
|
|
/** Fired when a municipality is committed from the list (with its derived table). */
|
|
onSelect: (kommun: string, tableNumber: number, totalRate: number) => void
|
|
/** Fired on free-text edits that don't match a known municipality. */
|
|
onChange?: (kommun: string) => void
|
|
/** Income year — drives which year's municipal rates are fetched. */
|
|
year: number
|
|
disabled?: boolean
|
|
id?: string
|
|
className?: string
|
|
}
|
|
|
|
const MAX_RESULTS = 50
|
|
|
|
/**
|
|
* Searchable folkbokföringskommun picker. Loads the kommun → skattetabell map
|
|
* from /api/salary/tax-tables/kommuner once, so picking a town auto-fills the
|
|
* tax table. Degrades to a plain free-text field if the list can't be fetched.
|
|
*/
|
|
export default function MunicipalityCombobox({
|
|
value,
|
|
onSelect,
|
|
onChange,
|
|
year,
|
|
disabled,
|
|
id,
|
|
className,
|
|
}: MunicipalityComboboxProps) {
|
|
const [search, setSearch] = useState(value)
|
|
const [isOpen, setIsOpen] = useState(false)
|
|
const [highlightedIndex, setHighlightedIndex] = useState(0)
|
|
const [kommuner, setKommuner] = useState<KommunRate[]>([])
|
|
const [loadFailed, setLoadFailed] = useState(false)
|
|
const containerRef = useRef<HTMLDivElement>(null)
|
|
const listRef = useRef<HTMLDivElement>(null)
|
|
|
|
// Sync external value changes into the search field
|
|
useEffect(() => {
|
|
setSearch(value)
|
|
}, [value])
|
|
|
|
// Load the municipality list once per year
|
|
useEffect(() => {
|
|
let cancelled = false
|
|
async function load() {
|
|
try {
|
|
const res = await fetch(`/api/salary/tax-tables/kommuner?year=${year}`)
|
|
if (!res.ok) throw new Error(`status ${res.status}`)
|
|
const { data } = await res.json()
|
|
if (!cancelled) setKommuner(data.kommuner ?? [])
|
|
} catch {
|
|
if (!cancelled) setLoadFailed(true)
|
|
}
|
|
}
|
|
load()
|
|
return () => {
|
|
cancelled = true
|
|
}
|
|
}, [year])
|
|
|
|
const filtered = useMemo(() => {
|
|
const trimmed = search.trim().toLowerCase()
|
|
if (!trimmed) return kommuner.slice(0, MAX_RESULTS)
|
|
return kommuner.filter((k) => k.kommun.toLowerCase().includes(trimmed)).slice(0, MAX_RESULTS)
|
|
}, [kommuner, search])
|
|
|
|
useEffect(() => {
|
|
setHighlightedIndex(0)
|
|
}, [filtered])
|
|
|
|
useEffect(() => {
|
|
if (!isOpen || !listRef.current) return
|
|
const el = listRef.current.querySelector('[data-highlighted="true"]')
|
|
if (el) el.scrollIntoView({ block: 'nearest' })
|
|
}, [highlightedIndex, isOpen])
|
|
|
|
useEffect(() => {
|
|
function handleClickOutside(e: MouseEvent | TouchEvent) {
|
|
if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
|
|
setIsOpen(false)
|
|
}
|
|
}
|
|
document.addEventListener('mousedown', handleClickOutside)
|
|
document.addEventListener('touchstart', handleClickOutside)
|
|
return () => {
|
|
document.removeEventListener('mousedown', handleClickOutside)
|
|
document.removeEventListener('touchstart', handleClickOutside)
|
|
}
|
|
}, [])
|
|
|
|
const select = useCallback(
|
|
(k: KommunRate) => {
|
|
setSearch(k.kommun)
|
|
setIsOpen(false)
|
|
onSelect(k.kommun, k.tableNumber, k.totalRate)
|
|
},
|
|
[onSelect]
|
|
)
|
|
|
|
const handleKeyDown = (e: React.KeyboardEvent) => {
|
|
if (!isOpen) {
|
|
if (e.key === 'ArrowDown' || e.key === 'ArrowUp') {
|
|
setIsOpen(true)
|
|
e.preventDefault()
|
|
}
|
|
return
|
|
}
|
|
switch (e.key) {
|
|
case 'ArrowDown':
|
|
e.preventDefault()
|
|
setHighlightedIndex((p) => Math.min(p + 1, filtered.length - 1))
|
|
break
|
|
case 'ArrowUp':
|
|
e.preventDefault()
|
|
setHighlightedIndex((p) => Math.max(p - 1, 0))
|
|
break
|
|
case 'Enter':
|
|
if (filtered[highlightedIndex]) {
|
|
e.preventDefault()
|
|
select(filtered[highlightedIndex])
|
|
}
|
|
break
|
|
case 'Escape':
|
|
e.preventDefault()
|
|
setIsOpen(false)
|
|
break
|
|
}
|
|
}
|
|
|
|
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
const next = e.target.value
|
|
setSearch(next)
|
|
onChange?.(next)
|
|
if (!isOpen) setIsOpen(true)
|
|
}
|
|
|
|
return (
|
|
<div ref={containerRef} className="relative">
|
|
<Input
|
|
id={id}
|
|
value={search}
|
|
onChange={handleInputChange}
|
|
onFocus={() => setIsOpen(true)}
|
|
onKeyDown={handleKeyDown}
|
|
placeholder="Sök kommun…"
|
|
autoComplete="off"
|
|
disabled={disabled}
|
|
className={className}
|
|
/>
|
|
|
|
{isOpen && filtered.length > 0 && (
|
|
<div
|
|
ref={listRef}
|
|
className="absolute z-50 top-full left-0 mt-1 w-full max-h-[300px] overflow-y-auto rounded-md border border-input bg-card shadow-md"
|
|
>
|
|
{filtered.map((k, i) => {
|
|
const isHighlighted = i === highlightedIndex
|
|
return (
|
|
<button
|
|
key={k.kommun}
|
|
type="button"
|
|
data-highlighted={isHighlighted}
|
|
className={`w-full text-left px-3 py-1.5 text-sm cursor-pointer flex items-baseline justify-between gap-2 ${
|
|
isHighlighted ? 'bg-primary/10 text-primary' : 'hover:bg-muted/50'
|
|
}`}
|
|
onMouseDown={(e) => {
|
|
e.preventDefault()
|
|
select(k)
|
|
}}
|
|
onMouseEnter={() => setHighlightedIndex(i)}
|
|
>
|
|
<span className="min-w-0 break-words">{k.kommun}</span>
|
|
<span className="shrink-0 text-xs text-muted-foreground tabular-nums">
|
|
Tabell {k.tableNumber}
|
|
</span>
|
|
</button>
|
|
)
|
|
})}
|
|
</div>
|
|
)}
|
|
|
|
{loadFailed && (
|
|
<p className="mt-1 text-xs text-muted-foreground">
|
|
Kunde inte hämta kommunlistan — skriv kommunnamnet och ange skattetabellen manuellt.
|
|
</p>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|