0ca9c25aba
* 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>
277 lines
9.5 KiB
TypeScript
277 lines
9.5 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useRef, useEffect, useMemo, useCallback } from 'react'
|
|
import { Plus } from 'lucide-react'
|
|
import { Input } from '@/components/ui/input'
|
|
import { getAccountClassName } from '@/lib/bookkeeping/account-descriptions'
|
|
import type { BASAccount } from '@/types'
|
|
|
|
interface AccountComboboxProps {
|
|
value: string
|
|
accounts: BASAccount[]
|
|
onChange: (accountNumber: string) => void
|
|
// Fired when the user definitively commits an account: selecting from the
|
|
// dropdown (Enter or click) or typing a full 4-digit number. Distinct from
|
|
// onChange, which also fires on intermediate edits. Callers use this to
|
|
// auto-advance focus (e.g. to the amount field).
|
|
onCommit?: (accountNumber: string) => void
|
|
// When provided, an inline "Skapa nytt konto" affordance appears in the
|
|
// dropdown's empty state. The current search string is passed so the caller
|
|
// can prefill the create dialog.
|
|
onCreateAccount?: (prefill: string) => void
|
|
// Extra classes merged into the trigger Input — callers pass `h-8` for dense
|
|
// table rows, omit it to use the default Input height.
|
|
className?: string
|
|
}
|
|
|
|
const MAX_RESULTS = 50
|
|
|
|
export default function AccountCombobox({ value, accounts, onChange, onCommit, onCreateAccount, className }: AccountComboboxProps) {
|
|
const [search, setSearch] = useState(value)
|
|
const [isOpen, setIsOpen] = useState(false)
|
|
const [highlightedIndex, setHighlightedIndex] = useState(0)
|
|
const containerRef = useRef<HTMLDivElement>(null)
|
|
const inputRef = useRef<HTMLInputElement>(null)
|
|
const listRef = useRef<HTMLDivElement>(null)
|
|
|
|
// Sync external value changes into the search field
|
|
useEffect(() => {
|
|
setSearch(value)
|
|
}, [value])
|
|
|
|
// Filter accounts based on search input
|
|
const filteredAccounts = useMemo(() => {
|
|
if (!search) return accounts.slice(0, MAX_RESULTS)
|
|
|
|
const trimmed = search.trim()
|
|
if (!trimmed) return accounts.slice(0, MAX_RESULTS)
|
|
|
|
const startsWithDigit = /^\d/.test(trimmed)
|
|
|
|
if (startsWithDigit) {
|
|
return accounts
|
|
.filter((a) => a.account_number.startsWith(trimmed))
|
|
.slice(0, MAX_RESULTS)
|
|
}
|
|
|
|
const lowerSearch = trimmed.toLowerCase()
|
|
return accounts
|
|
.filter((a) => a.account_name.toLowerCase().includes(lowerSearch))
|
|
.slice(0, MAX_RESULTS)
|
|
}, [accounts, search])
|
|
|
|
// Group filtered accounts by class
|
|
const groupedAccounts = useMemo(() => {
|
|
const groups: { className: string; accounts: BASAccount[] }[] = []
|
|
const groupMap = new Map<string, BASAccount[]>()
|
|
|
|
for (const account of filteredAccounts) {
|
|
const className = getAccountClassName(account.account_class)
|
|
if (!groupMap.has(className)) {
|
|
groupMap.set(className, [])
|
|
}
|
|
groupMap.get(className)!.push(account)
|
|
}
|
|
|
|
for (const [className, accts] of groupMap) {
|
|
groups.push({ className, accounts: accts })
|
|
}
|
|
|
|
return groups
|
|
}, [filteredAccounts])
|
|
|
|
// Flat list for keyboard navigation
|
|
const flatList = useMemo(() => filteredAccounts, [filteredAccounts])
|
|
|
|
// Reset highlight when filtered results change
|
|
useEffect(() => {
|
|
setHighlightedIndex(0)
|
|
}, [filteredAccounts])
|
|
|
|
// Scroll highlighted item into view
|
|
useEffect(() => {
|
|
if (!isOpen || !listRef.current) return
|
|
const highlighted = listRef.current.querySelector('[data-highlighted="true"]')
|
|
if (highlighted) {
|
|
highlighted.scrollIntoView({ block: 'nearest' })
|
|
}
|
|
}, [highlightedIndex, isOpen])
|
|
|
|
// Close dropdown when clicking/tapping outside
|
|
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 selectAccount = useCallback(
|
|
(accountNumber: string) => {
|
|
onChange(accountNumber)
|
|
setSearch(accountNumber)
|
|
setIsOpen(false)
|
|
onCommit?.(accountNumber)
|
|
},
|
|
[onChange, onCommit]
|
|
)
|
|
|
|
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((prev) => Math.min(prev + 1, flatList.length - 1))
|
|
break
|
|
case 'ArrowUp':
|
|
e.preventDefault()
|
|
setHighlightedIndex((prev) => Math.max(prev - 1, 0))
|
|
break
|
|
case 'Enter':
|
|
e.preventDefault()
|
|
if (flatList[highlightedIndex]) {
|
|
selectAccount(flatList[highlightedIndex].account_number)
|
|
}
|
|
break
|
|
case 'Escape':
|
|
e.preventDefault()
|
|
setIsOpen(false)
|
|
break
|
|
}
|
|
}
|
|
|
|
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
const newValue = e.target.value
|
|
setSearch(newValue)
|
|
// Emit any 4-digit numeric value to the parent. Unknown BAS numbers are
|
|
// accepted optimistically — the submit-time ActivateAccountsDialog lets
|
|
// the user activate missing accounts without leaving the form. A complete
|
|
// 4-digit number is treated as a commit so focus can advance to the amount.
|
|
if (/^\d{4}$/.test(newValue)) {
|
|
onChange(newValue)
|
|
// Only treat as a commit when the value newly becomes this account, so
|
|
// editing an already-committed number doesn't keep stealing focus.
|
|
if (newValue !== value) onCommit?.(newValue)
|
|
}
|
|
if (!isOpen) {
|
|
setIsOpen(true)
|
|
}
|
|
}
|
|
|
|
const handleFocus = () => {
|
|
setIsOpen(true)
|
|
}
|
|
|
|
const handleBlur = () => {
|
|
// Small delay to allow dropdown click to fire first. Keep any 4-digit
|
|
// numeric value even if it's not in the currently-active chart — the
|
|
// submit handler will prompt to activate it.
|
|
setTimeout(() => {
|
|
const isFourDigit = /^\d{4}$/.test(search)
|
|
if (!isFourDigit && !accounts.some(a => a.account_number === search)) {
|
|
setSearch(value)
|
|
}
|
|
}, 150)
|
|
}
|
|
|
|
return (
|
|
<div ref={containerRef} className="relative">
|
|
<Input
|
|
ref={inputRef}
|
|
value={search}
|
|
onChange={handleInputChange}
|
|
onFocus={handleFocus}
|
|
onBlur={handleBlur}
|
|
onKeyDown={handleKeyDown}
|
|
placeholder="Sök konto…"
|
|
className={`font-mono ${className ?? ''}`.trim()}
|
|
autoComplete="off"
|
|
/>
|
|
|
|
|
|
{/* Dropdown */}
|
|
{isOpen && flatList.length > 0 && (
|
|
<div
|
|
ref={listRef}
|
|
className="absolute z-50 top-full left-0 mt-1 min-w-[24rem] w-[max(100%,34rem)] max-h-[300px] overflow-y-auto rounded-md border border-input bg-card shadow-md"
|
|
>
|
|
{groupedAccounts.map((group) => (
|
|
<div key={group.className}>
|
|
<div className="sticky top-0 px-2 py-1.5 text-xs font-semibold text-muted-foreground bg-muted border-b border-input">
|
|
{group.className}
|
|
</div>
|
|
{group.accounts.map((account) => {
|
|
const flatIndex = flatList.indexOf(account)
|
|
const isHighlighted = flatIndex === highlightedIndex
|
|
return (
|
|
<button
|
|
key={account.account_number}
|
|
type="button"
|
|
data-highlighted={isHighlighted}
|
|
className={`w-full text-left px-2 py-1.5 text-sm cursor-pointer flex items-baseline gap-2 ${
|
|
isHighlighted ? 'bg-primary/10 text-primary' : 'hover:bg-muted/50'
|
|
}`}
|
|
onMouseDown={(e) => {
|
|
e.preventDefault()
|
|
selectAccount(account.account_number)
|
|
}}
|
|
onMouseEnter={() => setHighlightedIndex(flatIndex)}
|
|
>
|
|
<span className="font-mono shrink-0">{account.account_number}</span>
|
|
<span className="flex-1 min-w-0 break-words">{account.account_name}</span>
|
|
</button>
|
|
)
|
|
})}
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
|
|
{/* Empty state */}
|
|
{isOpen && search.trim() && flatList.length === 0 && (
|
|
<div className="absolute z-50 top-full left-0 mt-1 min-w-[24rem] w-[max(100%,34rem)] rounded-md border border-input bg-card shadow-md p-3">
|
|
<p className="text-sm text-muted-foreground">
|
|
Hittade inget konto som matchar.
|
|
</p>
|
|
{/^\d{4}$/.test(search.trim()) ? (
|
|
<p className="text-xs text-muted-foreground mt-1">
|
|
Om det är ett giltigt BAS-konto aktiveras det när du bokför.
|
|
</p>
|
|
) : (
|
|
<p className="text-xs text-muted-foreground mt-1">
|
|
Kontot kan behöva aktiveras i din kontoplan.
|
|
</p>
|
|
)}
|
|
{onCreateAccount && (
|
|
<button
|
|
type="button"
|
|
className="mt-2 flex w-full items-center gap-2 rounded-md border border-input bg-card px-2 py-1.5 text-left text-sm hover:bg-muted/50"
|
|
onMouseDown={(e) => {
|
|
e.preventDefault()
|
|
setIsOpen(false)
|
|
onCreateAccount(search.trim())
|
|
}}
|
|
>
|
|
<Plus className="h-3.5 w-3.5 shrink-0" />
|
|
<span className="truncate">Skapa konto "{search.trim()}"</span>
|
|
</button>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|