d0fbc2b616
* refactor(ui): app-wide UI/UX consistency pass
Net: +1,159 / −1,373 LOC across 77 files. No new features, no behavior
changes. Locks in a uniform design system across every dashboard surface.
What changed:
- **Foundation**: sidebar width 232→256px (md:w-64), spacing scale locked
(Tailwind 1/2/3/4/6/8/10/12; 2.5/5 forbidden), card padding p-6 default
(p-4 for compact metric cards), space-y-8 between page sections.
- **Tables unified**: all 33 thead blocks now share the Resultatrapport
pattern via shadcn Table primitive (text-[11px] font-medium uppercase
tracking-wider text-muted-foreground). Hand-rolled <table> instances
converted where they were data tables; form/edit grids kept distinct.
- **Status badges unified**: every status indicator routes through
shadcn <Badge variant>. Eliminated raw Tailwind colors
(bg-amber-100, bg-emerald-500/10, bg-blue-100, bg-purple-100, etc.)
in favor of the gnubok semantic palette (success=sage, warning=ochre,
destructive=terracotta).
- **Empty states unified**: list pages migrated from hand-rolled
"flex flex-col items-center py-12" divs to the EmptyState primitive.
- **Loading skeletons unified**: hand-rolled bg-muted rounded animate-pulse
divs replaced with shadcn <Skeleton> across 15 files.
- **Touch targets**: 6 back-buttons + edit-pencil + inbox delete bumped
from 24/32/36px to shadcn's 40px icon default. Added aria-labels on
9 icon-only navigation buttons.
- **Date formatting**: formatDate() for accounting data (ISO yyyy-MM-dd,
table-friendly) vs formatDateLong() for metadata (Swedish long form).
Raw {x.invoice_date} renderings routed through formatDate() in 18 sites.
- **Toast titles**: eliminated 33 generic "Fel" titles. Each toast title
now carries the action ("Kunde inte skapa lönekörning" etc.) with
description carrying the error detail.
- **Page-level cleanups**:
- Dashboard: dropped greeting hero + Snabbåtgärder/Att hantera nav
duplicates + Visa detaljer collapsible.
- Reports: 5-col mega-menu replaced with left-rail layout
(new ReportsNav component).
- Bookkeeping: fixed layout jump between Verifikationer/Ny verifikation
tabs (moved FiscalYearSelector inside journal tab).
- Bookkeeping: added voucher sort (A1 first / latest first) alongside
existing date sort. Required matching API param sort_by.
- KPI page: FiscalYearSelector instead of raw <select>; InfoTooltip
instead of inline info-button toggle; bigger numbers.
- Salary section: enum values translated to Swedish labels, mobile
table collapses to Anställd+Netto on <md, KPI typography aligned
with dashboard.
- Invoice forms: styled RequiredMark + aria-required, tabular-nums
on amount inputs.
- **CLAUDE.md**: new "Design System Tokens" subsection documents the
locked spacing scale, primitives table, typography rules, date helpers,
and forbidden patterns so future contributors don't drift.
Tests: 2,906 passing (unchanged). Lint: unchanged from main baseline.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: address PR review feedback (Greptile + compliance bot)
- **formatDate / formatDateLong timezone fix**: switch from new Date() to
parseISO. Bare yyyy-MM-dd strings are now parsed as local midnight rather
than UTC midnight, eliminating the off-by-one display in west-of-UTC
timezones flagged by Greptile.
- **DashboardContentProps cleanup**: removed unused firstName and settings
fields from the interface, and the corresponding fetch (profiles table)
+ computation in app/(dashboard)/page.tsx. The greeting was dropped in
the dashboard cleanup; these props were dead weight.
- **Voucher sort behavior documented**: extended the comment in the journal
entries API route to explain why voucher sort intentionally uses strict
fiscal_period_id filtering (BFL 5 kap 6–7 §§ — voucher numbers are
series-scoped within a fiscal year). The row-count delta between date
sort and voucher sort is now a documented design choice.
- **delete_last_voucher migration + draft-delete test included**: the UI
already shipped the "Radera utkast" path in the previous commit; this
pulls in the backing RPC migration that allows draft deletes (with the
full safety logic — drafts skip series/period checks since they have
voucher_number=0, posted entries go through the existing unchanged
path). This was originally meant for a separate PR but the UI shipped
half the feature without it.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* chore(migration): rename to match applied version
The function delete_last_voucher is already applied to the production DB
under version 20260509103736 (verified via pg_get_functiondef — exact
byte-for-byte match to file content). The previous file timestamp
20260509120000 would cause a fresh `supabase db push` to attempt re-applying
under a different version row. Renaming the file aligns local tracking
with what the database actually has.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
* fix: address compliance bot findings (payroll label + VAT visibility)
- sick_karens label: drop "(första sjukdagen)" qualifier. Per sjuklönelagen
6 §, karensavdrag is a single calculated amount (20% of one week's
sjuklön) deducted from the first sick day's pay — not bounded to the
first day. The qualifier could mislead users when the first sick day
and return-to-work span a weekend. Swedish-payroll bot recommendation.
- Omvänd skattskyldighet badge: variant outline → warning. The reverse-
charge indicator is compliance-critical (ML 16 kap) — missing it leads
to incorrect input VAT deduction. Outline was too subtle; warning's
ochre fill matches its semantic weight.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
254 lines
9.6 KiB
TypeScript
254 lines
9.6 KiB
TypeScript
'use client'
|
|
|
|
import { useMemo, useState, useCallback } from 'react'
|
|
import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/components/ui/card'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
|
import { Switch } from '@/components/ui/switch'
|
|
import { Label } from '@/components/ui/label'
|
|
import { Trash2, AlertTriangle, Loader2, RefreshCw } from 'lucide-react'
|
|
import { cn } from '@/lib/utils'
|
|
import type { CustomerType } from '@/types'
|
|
import type { AnnotatedCustomerRow } from '@/lib/import/customers/types'
|
|
|
|
let idCounter = 0
|
|
const newId = () => `cust_row_${++idCounter}_${Date.now()}`
|
|
|
|
interface EditableCustomerRow extends AnnotatedCustomerRow {
|
|
id: string
|
|
}
|
|
|
|
interface CustomersEditStepProps {
|
|
rows: AnnotatedCustomerRow[]
|
|
onExecute: (rows: AnnotatedCustomerRow[], updateDuplicates: boolean) => void
|
|
onBack: () => void
|
|
isLoading: boolean
|
|
error: string | null
|
|
}
|
|
|
|
const TYPE_LABELS: Record<CustomerType, string> = {
|
|
individual: 'Privatperson',
|
|
swedish_business: 'Svenskt företag eller organisation',
|
|
eu_business: 'EU-företag',
|
|
non_eu_business: 'Utomeuropeiskt företag',
|
|
}
|
|
|
|
export default function CustomersEditStep({
|
|
rows: initialRows,
|
|
onExecute,
|
|
onBack,
|
|
isLoading,
|
|
error,
|
|
}: CustomersEditStepProps) {
|
|
const [rows, setRows] = useState<EditableCustomerRow[]>(() =>
|
|
initialRows.map((r) => ({ ...r, id: newId() })),
|
|
)
|
|
const [updateDuplicates, setUpdateDuplicates] = useState(false)
|
|
|
|
const liveDuplicateCount = useMemo(
|
|
() => rows.filter((r) => r.duplicate_match !== null).length,
|
|
[rows],
|
|
)
|
|
|
|
const newCount = rows.length - liveDuplicateCount
|
|
|
|
const hasErrors = useMemo(
|
|
() => rows.some((r) => !r.is_valid),
|
|
[rows],
|
|
)
|
|
|
|
const canContinue = rows.length > 0 && !hasErrors && !isLoading
|
|
|
|
const updateRow = useCallback((id: string, updates: Partial<EditableCustomerRow>) => {
|
|
setRows((prev) =>
|
|
prev.map((r) => (r.id === id ? { ...r, ...updates } : r)),
|
|
)
|
|
}, [])
|
|
|
|
const deleteRow = useCallback((id: string) => {
|
|
setRows((prev) => prev.filter((r) => r.id !== id))
|
|
}, [])
|
|
|
|
const handleExecute = () => {
|
|
if (!canContinue) return
|
|
const stripped: AnnotatedCustomerRow[] = rows.map(({ id: _id, ...rest }) => rest)
|
|
onExecute(stripped, updateDuplicates)
|
|
}
|
|
|
|
return (
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle>Granska kunder</CardTitle>
|
|
<CardDescription>
|
|
Kontrollera att uppgifterna stämmer. Du kan justera namn och kundtyp inline,
|
|
eller ta bort rader. {newCount} ny{newCount === 1 ? '' : 'a'} kund{newCount === 1 ? '' : 'er'} skapas
|
|
{liveDuplicateCount > 0 ? ` och ${liveDuplicateCount} matchar befintliga.` : '.'}
|
|
</CardDescription>
|
|
</CardHeader>
|
|
<CardContent className="space-y-4">
|
|
{/* Duplicate handling banner */}
|
|
{liveDuplicateCount > 0 && (
|
|
<div className="flex items-start gap-3 rounded-lg border border-warning/30 bg-warning/5 px-4 py-3">
|
|
<RefreshCw className="h-4 w-4 text-warning mt-0.5 shrink-0" />
|
|
<div className="flex-1 space-y-2">
|
|
<p className="text-sm">
|
|
<span className="font-medium">{liveDuplicateCount} rader</span> matchar befintliga
|
|
kunder (på orgnummer eller e-post).
|
|
</p>
|
|
<div className="flex items-center gap-3">
|
|
<Switch
|
|
id="update-duplicates"
|
|
checked={updateDuplicates}
|
|
onCheckedChange={setUpdateDuplicates}
|
|
/>
|
|
<Label htmlFor="update-duplicates" className="text-sm cursor-pointer">
|
|
{updateDuplicates
|
|
? 'Uppdatera befintliga kunder med ny information'
|
|
: 'Hoppa över befintliga kunder'}
|
|
</Label>
|
|
</div>
|
|
{updateDuplicates && (
|
|
<p className="text-xs text-muted-foreground">
|
|
Endast fält med värden i filen skrivs över. Tomma fält i filen lämnar
|
|
befintliga värden orörda.
|
|
</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Table */}
|
|
<div className="overflow-x-auto rounded-md border">
|
|
<table className="w-full text-sm">
|
|
<thead className="[&_th]:font-medium [&_th]:text-[11px] [&_th]:uppercase [&_th]:tracking-wider [&_th]:text-muted-foreground">
|
|
<tr className="border-b">
|
|
<th className="px-3 py-2 text-left">Namn</th>
|
|
<th className="px-3 py-2 text-left w-44">Kundtyp</th>
|
|
<th className="px-3 py-2 text-left w-36">Orgnr</th>
|
|
<th className="px-3 py-2 text-left">E-post</th>
|
|
<th className="px-3 py-2 text-left w-32">Status</th>
|
|
<th className="px-3 py-2 w-10" />
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{rows.map((row) => (
|
|
<tr
|
|
key={row.id}
|
|
className={cn(
|
|
'border-b last:border-0',
|
|
!row.is_valid && 'bg-destructive/5',
|
|
)}
|
|
>
|
|
<td className="px-3 py-1.5">
|
|
<Input
|
|
value={row.name}
|
|
onChange={(e) => updateRow(row.id, { name: e.target.value })}
|
|
className="h-8"
|
|
/>
|
|
</td>
|
|
<td className="px-3 py-1.5">
|
|
<Select
|
|
value={row.customer_type}
|
|
onValueChange={(v) => updateRow(row.id, { customer_type: v as CustomerType })}
|
|
>
|
|
<SelectTrigger className="h-8">
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{(Object.keys(TYPE_LABELS) as CustomerType[]).map((t) => (
|
|
<SelectItem key={t} value={t}>
|
|
{TYPE_LABELS[t]}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</td>
|
|
<td className="px-3 py-1.5 text-muted-foreground tabular-nums">
|
|
{row.org_number || '—'}
|
|
</td>
|
|
<td className="px-3 py-1.5 text-muted-foreground truncate max-w-xs">
|
|
{row.email || '—'}
|
|
</td>
|
|
<td className="px-3 py-1.5">
|
|
<div className="flex items-center gap-1.5">
|
|
{!row.is_valid && (
|
|
<span
|
|
className="text-destructive shrink-0"
|
|
title={row.validation_errors.join(', ')}
|
|
>
|
|
<AlertTriangle className="h-3.5 w-3.5" />
|
|
</span>
|
|
)}
|
|
{row.duplicate_match ? (
|
|
<span
|
|
className={cn(
|
|
'text-[11px] font-medium px-1.5 py-0.5 rounded',
|
|
updateDuplicates
|
|
? 'bg-warning/15 text-warning'
|
|
: 'bg-muted text-muted-foreground',
|
|
)}
|
|
title={`Matchar ${row.duplicate_match.existing_name} (${row.duplicate_match.matched_by})`}
|
|
>
|
|
{updateDuplicates ? 'Uppdateras' : 'Hoppas över'}
|
|
</span>
|
|
) : (
|
|
<span className="text-[11px] font-medium px-1.5 py-0.5 rounded bg-success/15 text-success">
|
|
Ny
|
|
</span>
|
|
)}
|
|
</div>
|
|
</td>
|
|
<td className="px-3 py-1.5">
|
|
<Button
|
|
variant="ghost"
|
|
size="icon"
|
|
className="h-7 w-7"
|
|
onClick={() => deleteRow(row.id)}
|
|
>
|
|
<Trash2 className="h-3.5 w-3.5 text-muted-foreground" />
|
|
</Button>
|
|
</td>
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
{hasErrors && (
|
|
<div className="flex items-start gap-3 rounded-lg border border-warning/30 bg-warning/5 px-4 py-3">
|
|
<AlertTriangle className="h-4 w-4 text-warning mt-0.5 shrink-0" />
|
|
<p className="text-sm text-warning">
|
|
Vissa rader har valideringsfel (markerade i rött). Åtgärda eller ta bort dem
|
|
innan du fortsätter.
|
|
</p>
|
|
</div>
|
|
)}
|
|
|
|
{error && (
|
|
<div className="flex items-start gap-3 rounded-lg border border-destructive/30 bg-destructive/5 px-4 py-3">
|
|
<AlertTriangle className="h-4 w-4 text-destructive mt-0.5 shrink-0" />
|
|
<p className="text-sm text-destructive">{error}</p>
|
|
</div>
|
|
)}
|
|
|
|
<div className="flex justify-between pt-2">
|
|
<Button variant="ghost" onClick={onBack} disabled={isLoading}>
|
|
Tillbaka
|
|
</Button>
|
|
<Button onClick={handleExecute} disabled={!canContinue}>
|
|
{isLoading ? (
|
|
<>
|
|
<Loader2 className="h-4 w-4 animate-spin mr-2" />
|
|
Importerar...
|
|
</>
|
|
) : (
|
|
`Importera ${rows.length} rad${rows.length === 1 ? '' : 'er'}`
|
|
)}
|
|
</Button>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
)
|
|
}
|