Seven radii were in circulation (4/5/6/8/12/16px + pill) with no rule for which went where; one toolbar row on /transactions mixed four shape languages. This locks a 4-tier ladder (design.md convention 16): - pill: interactive toolbar controls (buttons, chips, pickers, segmented controls, toolbar search, count nubs) - rounded-xl (12px): overlay tier: page panel, dialogs, slide-overs - rounded-lg (8px): cards, form fields, popover/menu content, boxes - rounded-sm (4px): nested leaves (menu items, checkboxes, kbd/code nubs) Changes: - New SegmentedControl primitive (pill-in-pill tablist, h-8) replaces the hand-rolled bg-muted/70 tablist copied across 11 files - New ToolbarSearch primitive (pill, h-8) adopted on 9 page toolbars; dialog/picker searches keep the rounded-lg Input - dialog.tsx 8px -> 12px, matching SettingsModal/slide-over/CommandPalette - ContextPicker chips at the shared h-8 toolbar height - ~300 rounded-md / bare rounded call sites remapped by role; auth icon tiles and the mobile nav sheet come down from 16px to 12px - rounded-md, bare rounded, rounded-2xl and rounded-[Npx] are dead vocabulary, enforced by a new off-ladder-radius check in check:guards Verified: lint 0 errors, 14422 unit tests pass, check:guards green, tsc clean on all changed files, sandbox screenshots of transactions/ bookkeeping/granskning toolbars and the Ny verifikation dialog. Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
274 lines
10 KiB
TypeScript
274 lines
10 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useMemo, useRef } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Label } from '@/components/ui/label'
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
|
import { InfoTooltip } from '@/components/ui/info-tooltip'
|
|
import MunicipalityCombobox from './MunicipalityCombobox'
|
|
import { TAX_COLUMN_OPTIONS, deriveTaxColumn } from '@/lib/salary/tax-column'
|
|
|
|
export interface EmployeeTaxValue {
|
|
f_skatt_status: string
|
|
is_sidoinkomst: boolean
|
|
tax_table_number: number | null
|
|
tax_column: number
|
|
tax_municipality: string
|
|
}
|
|
|
|
interface EmployeeTaxCardProps {
|
|
/** Live personnummer (full or masked): drives the column suggestion. */
|
|
personnummer: string
|
|
initial?: Partial<EmployeeTaxValue>
|
|
/** Income year the table/column applies to. Defaults to the current year. */
|
|
year?: number
|
|
disabled?: boolean
|
|
/**
|
|
* Render the fields without the Card chrome (no border/header), for hosts
|
|
* that lay their own section dividers around it (e.g. the compact
|
|
* NewEmployeeDialog). The edit page keeps the default boxed rendering.
|
|
*/
|
|
flat?: boolean
|
|
onChange: (value: EmployeeTaxValue) => void
|
|
}
|
|
|
|
function RequiredMark() {
|
|
return <span className="text-destructive ml-0.5">*</span>
|
|
}
|
|
|
|
/**
|
|
* The "Skatt" card on the employee form. Instead of asking the user to look up
|
|
* an opaque skattetabell (29-42) and kolumn (1-6), it derives both from data we
|
|
* already have: the folkbokföringskommun fills the tax table, and the
|
|
* personnummer fills the column. Manual overrides remain for edge cases.
|
|
*/
|
|
export default function EmployeeTaxCard({
|
|
personnummer,
|
|
initial,
|
|
year,
|
|
disabled,
|
|
flat,
|
|
onChange,
|
|
}: EmployeeTaxCardProps) {
|
|
const t = useTranslations('salary_employee')
|
|
const incomeYear = year ?? new Date().getFullYear()
|
|
|
|
const [fSkatt, setFSkatt] = useState(initial?.f_skatt_status ?? 'a_skatt')
|
|
const [sido, setSido] = useState(initial?.is_sidoinkomst ?? false)
|
|
const [municipality, setMunicipality] = useState(initial?.tax_municipality ?? '')
|
|
const [tableNumber, setTableNumber] = useState<number | null>(initial?.tax_table_number ?? null)
|
|
const [rate, setRate] = useState<number | null>(null)
|
|
const [tableManual, setTableManual] = useState(false)
|
|
const [column, setColumn] = useState(initial?.tax_column ?? 1)
|
|
// Editing an existing employee: respect their saved column. New employee:
|
|
// let the personnummer drive it until the user picks one.
|
|
const [columnTouched, setColumnTouched] = useState(initial?.tax_column != null)
|
|
|
|
const requiresTable = fSkatt === 'a_skatt' && !sido
|
|
|
|
const derivedColumn = useMemo(
|
|
() => deriveTaxColumn(personnummer, incomeYear),
|
|
[personnummer, incomeYear]
|
|
)
|
|
const isSenior = personnummer.replace(/\D/g, '').length >= 8 && derivedColumn === null
|
|
|
|
// The effective column is the user's explicit choice once they've made one,
|
|
// otherwise the value suggested from the personnummer (falling back to 1).
|
|
// Derived in render: no setState-in-effect needed.
|
|
const effectiveColumn = columnTouched ? column : (derivedColumn ?? 1)
|
|
|
|
// Report the current value up. onChange via ref so an unstable parent callback
|
|
// doesn't retrigger the effect (deps are the primitive values only).
|
|
const onChangeRef = useRef(onChange)
|
|
useEffect(() => {
|
|
onChangeRef.current = onChange
|
|
})
|
|
useEffect(() => {
|
|
onChangeRef.current({
|
|
f_skatt_status: fSkatt,
|
|
is_sidoinkomst: sido,
|
|
tax_table_number: requiresTable ? tableNumber : null,
|
|
tax_column: effectiveColumn,
|
|
tax_municipality: municipality.trim(),
|
|
})
|
|
}, [fSkatt, sido, tableNumber, effectiveColumn, municipality, requiresTable])
|
|
|
|
const body = (
|
|
<>
|
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="f_skatt_status">
|
|
<InfoTooltip content={t('tax_form_tooltip')}>
|
|
{t('tax_form_label')}
|
|
</InfoTooltip>
|
|
</Label>
|
|
<Select value={fSkatt} onValueChange={setFSkatt} disabled={disabled}>
|
|
<SelectTrigger id="f_skatt_status">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="a_skatt">A-skatt</SelectItem>
|
|
<SelectItem value="f_skatt">F-skatt</SelectItem>
|
|
<SelectItem value="fa_skatt">FA-skatt</SelectItem>
|
|
<SelectItem value="not_verified">{t('tax_status_not_verified')}</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
<div className="flex items-end pb-2">
|
|
<label className="flex items-center gap-2 text-sm">
|
|
<input
|
|
type="checkbox"
|
|
checked={sido}
|
|
onChange={(e) => setSido(e.target.checked)}
|
|
disabled={disabled}
|
|
className="rounded-sm border-border"
|
|
/>
|
|
<InfoTooltip content={t('tax_sidoinkomst_tooltip')}>
|
|
{t('tax_sidoinkomst_label')}
|
|
</InfoTooltip>
|
|
</label>
|
|
</div>
|
|
</div>
|
|
|
|
{requiresTable ? (
|
|
<>
|
|
<div className="space-y-2">
|
|
<Label htmlFor="tax_municipality">
|
|
<InfoTooltip content={t('tax_municipality_tooltip')}>
|
|
{t('tax_municipality_label')}
|
|
</InfoTooltip>
|
|
<RequiredMark />
|
|
</Label>
|
|
<MunicipalityCombobox
|
|
id="tax_municipality"
|
|
value={municipality}
|
|
year={incomeYear}
|
|
disabled={disabled}
|
|
onChange={(value) => {
|
|
setMunicipality(value)
|
|
// Clearing the field must clear the derived table/rate too:
|
|
// otherwise we'd report an empty kommun alongside a stale
|
|
// table number (an inconsistent pair). Manual entry keeps its
|
|
// own value.
|
|
if (!value && !tableManual) {
|
|
setTableNumber(null)
|
|
setRate(null)
|
|
}
|
|
}}
|
|
onSelect={(kommun, table, totalRate) => {
|
|
setMunicipality(kommun)
|
|
setRate(totalRate)
|
|
if (!tableManual) setTableNumber(table)
|
|
}}
|
|
/>
|
|
</div>
|
|
|
|
<div className="grid grid-cols-1 md:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label htmlFor="tax_table_number">
|
|
<InfoTooltip content={t('tax_table_tooltip')}>
|
|
{t('tax_table_label')}
|
|
</InfoTooltip>
|
|
<RequiredMark />
|
|
</Label>
|
|
|
|
{tableManual ? (
|
|
<Input
|
|
id="tax_table_number"
|
|
type="number"
|
|
min="29"
|
|
max="42"
|
|
value={tableNumber ?? ''}
|
|
onChange={(e) => setTableNumber(parseInt(e.target.value) || null)}
|
|
disabled={disabled}
|
|
/>
|
|
) : tableNumber ? (
|
|
<div className="flex items-baseline gap-2 rounded-lg border border-input px-3 py-2">
|
|
<span className="font-sans text-xl tabular-nums">{tableNumber}</span>
|
|
{(municipality || rate != null) && (
|
|
<span className="text-xs text-muted-foreground">
|
|
{municipality}
|
|
{rate != null ? ` · ${rate.toLocaleString('sv-SE')} %` : ''}
|
|
</span>
|
|
)}
|
|
</div>
|
|
) : (
|
|
<p className="rounded-lg border border-dashed border-input px-3 py-2 text-sm text-muted-foreground">
|
|
{t('tax_table_pick_municipality')}
|
|
</p>
|
|
)}
|
|
|
|
{!disabled && (
|
|
<button
|
|
type="button"
|
|
onClick={() => setTableManual((v) => !v)}
|
|
className="text-xs text-primary hover:underline underline-offset-4"
|
|
>
|
|
{tableManual ? t('tax_table_use_municipality') : t('tax_table_enter_manually')}
|
|
</button>
|
|
)}
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
<Label htmlFor="tax_column">
|
|
<InfoTooltip content={t('tax_column_tooltip')}>
|
|
{t('tax_column_label')}
|
|
</InfoTooltip>
|
|
</Label>
|
|
<Select
|
|
value={String(effectiveColumn)}
|
|
onValueChange={(v) => {
|
|
setColumn(parseInt(v))
|
|
setColumnTouched(true)
|
|
}}
|
|
disabled={disabled}
|
|
>
|
|
<SelectTrigger id="tax_column">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{TAX_COLUMN_OPTIONS.map((opt) => (
|
|
<SelectItem key={opt.value} value={String(opt.value)}>
|
|
{opt.value}. {opt.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
{!columnTouched && derivedColumn != null ? (
|
|
<p className="text-xs text-muted-foreground">
|
|
{t('tax_column_suggested_under_66')}
|
|
</p>
|
|
) : isSenior && !columnTouched ? (
|
|
<p className="text-xs text-attn">
|
|
{t('tax_column_senior_warning')}
|
|
</p>
|
|
) : null}
|
|
</div>
|
|
</div>
|
|
</>
|
|
) : (
|
|
<p className="rounded-lg border border-dashed border-input px-3 py-3 text-sm text-muted-foreground">
|
|
{sido
|
|
? t('tax_no_table_sidoinkomst')
|
|
: t('tax_no_table_f_skatt')}
|
|
</p>
|
|
)}
|
|
</>
|
|
)
|
|
|
|
if (flat) {
|
|
return <div className="space-y-4">{body}</div>
|
|
}
|
|
|
|
return (
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle className="text-base">{t('tax_title')}</CardTitle>
|
|
</CardHeader>
|
|
<CardContent className="space-y-4">{body}</CardContent>
|
|
</Card>
|
|
)
|
|
}
|