* fix(invoices): surface validation errors instead of a silent dead submit button A missing unit (or any other Zod failure) blocked both Granska & skapa and Spara som utkast with zero feedback: handleSubmit had no onInvalid callback, the buttons stayed enabled, and the unit field rendered no inline error. Reported by a byra user whose client could not save any invoice. - onInvalid handler on all three submit paths: destructive toast plus scroll to the first inline error - inline error text under the unit select and quantity input (the only line fields that had none) - same treatment in NewRecurringScheduleDialog, including inline errors on its item rows Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(supplier-invoices): stop defaulting 25 % moms for icke momsregistrerade companies The registration form hard-coded vat_rate 0.25 on the initial line, added rows, AI prefill fallback and konto defaults, regardless of company_settings.vat_registered. A non-VAT-registered business that missed the prefilled rate booked ingaende moms (2641) it has no right to deduct (ML 8 kap. 3 \u00a7). The customer-invoice side already gates on the same flag; the supplier side ignored it. - form: read vat_registered from /api/settings; when false, all moms controls (rate cells, per-line moms, totals rows) are hidden and every line is forced to 0 %, including late AI prefills - reverse charge keeps its rate controls: self-assessment is a separate obligation from deduction - route: 400 SI_CREATE_INVALID_INPUT when a non-registered company posts a line with vat_rate/vat_amount > 0 (API/MCP defense in depth), and an omitted vat_rate now defaults to 0 instead of 25 % for those companies - tests: guard rejection, reverse-charge pass-through, 0-default; existing POST tests updated for the new settings lookup Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(year-end): klarmarkera imported years already closed in a previous system SIE-imported historical fiscal years land with is_closed = false and no closing entry, so the year-end page lists every migrated year as pending bokslut even though the bokslut was done in the old software. There was no sanctioned way to mark them done: closePeriod hard-requires locked_at and closing_entry_id. - migration: fiscal_periods.closed_externally boolean (audit clarity: distinguishes a year-end run here from a close done elsewhere) - markPeriodClosedExternally(): closes + locks without a closing entry; refuses already-closed periods, periods with their own closing entry, periods that have not ended, and periods with unbooked bank transactions (same stranding guard as lockPeriod); writes the immutable audit_log entry - POST /api/bookkeeping/fiscal-periods/[id]/close-external (requireWrite) - year-end page: one attn line on the preflight step with a confirm dialog describing the outcome; the marked year drops out of the eligible list Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): searchable article picker on invoice lines The article field was a plain Radix Select whose only matching is label-prefix typeahead: for numbered articles that means number-only lookup, and typing "skruv" found nothing. Byra feedback: name search would help a lot for users with real article catalogs. New ArticleCombobox (input-trigger dropdown, same pattern as AccountCombobox): free-text search over name + article number, diacritics-folded via foldText, keyboard navigation, pinned "Egen rad" free-text option, browse-all on focus like the Select it replaces. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * docs: log klarmarkera pg-test decision Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: address skeptic and compliance-review findings on PR #1641 - ArticleCombobox: keyboard focus no longer auto-opens the list, opening highlights the committed selection, typing highlights the first match, and re-selecting the current value is a no-op. Previously Tab+Enter silently detached the article and wiped its revenue-account override. - Supplier invoice prefill for icke momsregistrerade: the zeroing effect now grosses the net amount up by the extracted rate before forcing 0 %, so the booked cost and 2440 keep the full att-betala amount instead of understating both by the moms. - markPeriodClosedExternally: only migrated periods qualify (must contain SIE-imported verifikat or no verifikat at all); the update carries an is_closed=false predicate so a concurrent normal close cannot be overwritten; confirm dialog now names the reporting consequences. - Route comment: honest scope (this route only; v1/inbox/MCP sweep is a follow-up) and current-law citation (13 kap. ML 2023:200). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix: use roundOre for the icke-momsregistrerad gross-up (ratchet guard) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
253 lines
8.8 KiB
TypeScript
253 lines
8.8 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useRef, useEffect, useMemo, useCallback } from 'react'
|
|
import { Input } from '@/components/ui/input'
|
|
import { foldText } from '@/lib/bookkeeping/account-search'
|
|
|
|
export interface ArticleComboboxItem {
|
|
id: string
|
|
article_number: string | null
|
|
name: string
|
|
}
|
|
|
|
interface ArticleComboboxProps {
|
|
/** Selected article id, or null for a free-text line. */
|
|
value: string | null
|
|
/** Already sorted by the caller (sortArticles). */
|
|
articles: ArticleComboboxItem[]
|
|
/** Receives the picked article id, or 'none' for the free-text option. */
|
|
onChange: (value: string) => void
|
|
/** Label for the pinned free-text option ("Egen rad"). */
|
|
freeTextLabel: string
|
|
/** Trigger placeholder when nothing is selected. */
|
|
placeholder: string
|
|
/** Empty-state text when the search matches nothing. */
|
|
emptyLabel: string
|
|
disabled?: boolean
|
|
ariaLabel?: string
|
|
}
|
|
|
|
function articleLabel(a: ArticleComboboxItem): string {
|
|
return a.article_number ? `${a.article_number}: ${a.name}` : a.name
|
|
}
|
|
|
|
/**
|
|
* Searchable article picker for invoice lines. Replaces the plain Select whose
|
|
* only matching was Radix's label-prefix typeahead: for numbered articles that
|
|
* meant number-only lookup, and typing "skruv" found nothing. Free-text search
|
|
* here matches both name and article number, diacritics-folded (foldText), on
|
|
* the already-loaded article list. Same input-trigger dropdown pattern as
|
|
* AccountCombobox.
|
|
*/
|
|
export default function ArticleCombobox({
|
|
value,
|
|
articles,
|
|
onChange,
|
|
freeTextLabel,
|
|
placeholder,
|
|
emptyLabel,
|
|
disabled = false,
|
|
ariaLabel,
|
|
}: ArticleComboboxProps) {
|
|
const selected = value ? articles.find((a) => a.id === value) ?? null : null
|
|
// Free-text lines display the "Egen rad" label, matching the Select this
|
|
// replaces (which pinned value 'none' and never showed a placeholder).
|
|
const selectedLabel = selected ? articleLabel(selected) : freeTextLabel
|
|
|
|
const [search, setSearch] = useState(selectedLabel)
|
|
const [isOpen, setIsOpen] = useState(false)
|
|
const [highlightedIndex, setHighlightedIndex] = useState(0)
|
|
// Typing narrows the list; a fresh focus shows everything so the field also
|
|
// works as a browse dropdown, exactly like the Select it replaces.
|
|
const [hasTyped, setHasTyped] = useState(false)
|
|
const containerRef = useRef<HTMLDivElement>(null)
|
|
const listRef = useRef<HTMLDivElement>(null)
|
|
// True while a pointer interaction is what is about to focus the field.
|
|
// Keyboard focus (Tab) must NOT auto-open: with the list open a bare Enter
|
|
// would select the highlighted row, and the old Select treated Tab+Enter as
|
|
// a no-op. Pointer focus keeps the click-to-browse behavior.
|
|
const pointerDownRef = useRef(false)
|
|
|
|
// Sync external value changes (applyArticle, draft restore) into the field.
|
|
useEffect(() => {
|
|
setSearch(selectedLabel)
|
|
// selectedLabel is derived from value + articles; both belong here.
|
|
}, [selectedLabel])
|
|
|
|
const filtered = useMemo(() => {
|
|
const q = foldText(search.trim())
|
|
// A committed selection sits in the field as its full label; treating it
|
|
// as a filter would show exactly one row. Browse instead.
|
|
if (!q || !hasTyped) return articles
|
|
return articles.filter((a) =>
|
|
foldText(`${a.article_number ?? ''} ${a.name}`).includes(q),
|
|
)
|
|
}, [articles, search, hasTyped])
|
|
|
|
// Options list: the free-text "Egen rad" choice stays pinned on top.
|
|
type Option = { key: string; label: string; muted: boolean }
|
|
const options = useMemo<Option[]>(
|
|
() => [
|
|
{ key: 'none', label: freeTextLabel, muted: true },
|
|
...filtered.map((a) => ({ key: a.id, label: articleLabel(a), muted: false })),
|
|
],
|
|
[filtered, freeTextLabel],
|
|
)
|
|
|
|
// While typing, highlight the first actual match (index 1: index 0 is the
|
|
// pinned "Egen rad"), so type-and-Enter picks the searched article instead
|
|
// of silently detaching the line to free text.
|
|
useEffect(() => {
|
|
setHighlightedIndex(hasTyped && filtered.length > 0 ? 1 : 0)
|
|
}, [options.length, search, hasTyped, filtered.length])
|
|
|
|
// Opening on a committed selection starts the highlight ON that selection,
|
|
// like the Select this replaces, so Enter re-confirms instead of switching.
|
|
const openList = useCallback(() => {
|
|
const currentKey = value ?? 'none'
|
|
const idx = options.findIndex((o) => o.key === currentKey)
|
|
setHighlightedIndex(idx >= 0 ? idx : 0)
|
|
setIsOpen(true)
|
|
}, [options, value])
|
|
|
|
useEffect(() => {
|
|
if (!isOpen || !listRef.current) return
|
|
listRef.current
|
|
.querySelector('[data-highlighted="true"]')
|
|
?.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(
|
|
(option: Option) => {
|
|
// Re-selecting the committed value is a no-op close: applyArticle
|
|
// re-applies the article's description/price/unit, which would clobber
|
|
// per-line edits, and re-selecting "Egen rad" on a free-text line would
|
|
// needlessly null the article link. The old Radix Select behaved the
|
|
// same (onValueChange only fires on an actual change).
|
|
if (option.key !== (value ?? 'none')) {
|
|
onChange(option.key)
|
|
}
|
|
setSearch(option.label)
|
|
setHasTyped(false)
|
|
setIsOpen(false)
|
|
},
|
|
[onChange, value],
|
|
)
|
|
|
|
const handleKeyDown = (e: React.KeyboardEvent) => {
|
|
if (!isOpen) {
|
|
if (e.key === 'ArrowDown' || e.key === 'ArrowUp' || e.key === 'Enter') {
|
|
e.preventDefault()
|
|
openList()
|
|
}
|
|
return
|
|
}
|
|
switch (e.key) {
|
|
case 'ArrowDown':
|
|
e.preventDefault()
|
|
setHighlightedIndex((prev) => Math.min(prev + 1, options.length - 1))
|
|
break
|
|
case 'ArrowUp':
|
|
e.preventDefault()
|
|
setHighlightedIndex((prev) => Math.max(prev - 1, 0))
|
|
break
|
|
case 'Enter':
|
|
e.preventDefault()
|
|
if (options[highlightedIndex]) select(options[highlightedIndex])
|
|
break
|
|
case 'Escape':
|
|
e.preventDefault()
|
|
setIsOpen(false)
|
|
break
|
|
}
|
|
}
|
|
|
|
const handleBlur = () => {
|
|
setIsOpen(false)
|
|
// Delay so a dropdown mousedown wins, then snap the field back to the
|
|
// committed selection: a half-typed search must not linger as a label.
|
|
setTimeout(() => {
|
|
setSearch(selectedLabel)
|
|
setHasTyped(false)
|
|
}, 150)
|
|
}
|
|
|
|
return (
|
|
<div ref={containerRef} className="relative">
|
|
<Input
|
|
value={search}
|
|
onChange={(e) => {
|
|
setSearch(e.target.value)
|
|
setHasTyped(true)
|
|
if (!isOpen) setIsOpen(true)
|
|
}}
|
|
onPointerDown={() => {
|
|
pointerDownRef.current = true
|
|
}}
|
|
onClick={() => {
|
|
// Clicking an already-focused field reopens the list (onFocus will
|
|
// not fire again in that case).
|
|
if (!isOpen) openList()
|
|
}}
|
|
onFocus={(e) => {
|
|
setHasTyped(false)
|
|
if (pointerDownRef.current) openList()
|
|
pointerDownRef.current = false
|
|
// Typing should replace the committed label, not append to it.
|
|
e.currentTarget.select()
|
|
}}
|
|
onBlur={handleBlur}
|
|
onKeyDown={handleKeyDown}
|
|
placeholder={placeholder}
|
|
autoComplete="off"
|
|
disabled={disabled}
|
|
role="combobox"
|
|
aria-expanded={isOpen}
|
|
aria-label={ariaLabel}
|
|
/>
|
|
|
|
{isOpen && !disabled && (
|
|
<div
|
|
ref={listRef}
|
|
className="absolute z-50 top-full left-0 mt-1 w-full min-w-[16rem] max-h-[300px] overflow-y-auto rounded-lg border border-input bg-card shadow-md"
|
|
>
|
|
{options.map((option, index) => (
|
|
<button
|
|
key={option.key}
|
|
type="button"
|
|
data-highlighted={index === highlightedIndex}
|
|
className={`w-full text-left px-2 py-1.5 text-sm cursor-pointer ${
|
|
index === highlightedIndex ? 'bg-primary/10 text-primary' : 'hover:bg-muted/50'
|
|
} ${option.muted ? 'text-muted-foreground' : ''}`}
|
|
onMouseDown={(e) => {
|
|
e.preventDefault()
|
|
select(option)
|
|
}}
|
|
onMouseEnter={() => setHighlightedIndex(index)}
|
|
>
|
|
{option.label}
|
|
</button>
|
|
))}
|
|
{filtered.length === 0 && (
|
|
<p className="px-2 py-1.5 text-sm text-muted-foreground">{emptyLabel}</p>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|