* 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>
260 lines
12 KiB
TypeScript
260 lines
12 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useCallback } from 'react'
|
|
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Badge } from '@/components/ui/badge'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { Loader2, Trash2, Users, ChevronDown } from 'lucide-react'
|
|
import { formatAccountWithName } from '@/lib/bookkeeping/client-account-names'
|
|
import { formatCounterpartyName } from '@/lib/bookkeeping/counterparty-templates'
|
|
import type { CategorizationTemplate } from '@/types'
|
|
|
|
const SOURCE_LABELS: Record<string, string> = {
|
|
sie_import: 'SIE-import',
|
|
user_approved: 'Godkänd',
|
|
auto_learned: 'Automatisk',
|
|
sni_default: 'Standard',
|
|
}
|
|
|
|
const VAT_LABELS: Record<string, string> = {
|
|
standard_25: '25%',
|
|
reduced_12: '12%',
|
|
reduced_6: '6%',
|
|
reverse_charge: 'Omvänd',
|
|
export: 'Export',
|
|
exempt: 'Momsfri',
|
|
}
|
|
|
|
function formatDate(iso: string | null) {
|
|
if (!iso) return '—'
|
|
return new Date(iso).toLocaleDateString('sv-SE', {
|
|
year: 'numeric',
|
|
month: 'short',
|
|
day: 'numeric',
|
|
})
|
|
}
|
|
|
|
function confidenceColor(c: number): string {
|
|
if (c >= 0.8) return 'text-emerald-600 dark:text-emerald-400'
|
|
if (c >= 0.5) return 'text-amber-600 dark:text-amber-400'
|
|
return 'text-muted-foreground'
|
|
}
|
|
|
|
export function CounterpartyTemplatesPanel() {
|
|
const { toast } = useToast()
|
|
|
|
const [templates, setTemplates] = useState<CategorizationTemplate[]>([])
|
|
const [isLoading, setIsLoading] = useState(true)
|
|
const [deletingId, setDeletingId] = useState<string | null>(null)
|
|
const [expandedId, setExpandedId] = useState<string | null>(null)
|
|
|
|
const fetchTemplates = useCallback(async () => {
|
|
try {
|
|
const res = await fetch('/api/settings/counterparty-templates')
|
|
const json = await res.json()
|
|
if (json.data) {
|
|
setTemplates(json.data)
|
|
}
|
|
} catch {
|
|
toast({ title: 'Kunde inte hämta mallar', variant: 'destructive' })
|
|
} finally {
|
|
setIsLoading(false)
|
|
}
|
|
}, [toast])
|
|
|
|
useEffect(() => {
|
|
fetchTemplates()
|
|
}, [fetchTemplates])
|
|
|
|
async function handleDelete(id: string) {
|
|
setDeletingId(id)
|
|
try {
|
|
const res = await fetch('/api/settings/counterparty-templates', {
|
|
method: 'DELETE',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ id }),
|
|
})
|
|
if (!res.ok) {
|
|
toast({ title: 'Kunde inte ta bort mall', variant: 'destructive' })
|
|
return
|
|
}
|
|
setTemplates((prev) => prev.filter((t) => t.id !== id))
|
|
if (expandedId === id) setExpandedId(null)
|
|
toast({ title: 'Mall borttagen' })
|
|
} catch {
|
|
toast({ title: 'Kunde inte ta bort mall', variant: 'destructive' })
|
|
} finally {
|
|
setDeletingId(null)
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="space-y-6">
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle>Bokföringsmallar</CardTitle>
|
|
<CardDescription>
|
|
Inlärda mönster som automatiskt föreslår kontering baserat på motpart.
|
|
Mallar skapas från SIE-import och när du godkänner kategoriseringar.
|
|
</CardDescription>
|
|
</CardHeader>
|
|
<CardContent>
|
|
{isLoading ? (
|
|
<div className="flex items-center justify-center py-8">
|
|
<Loader2 className="h-5 w-5 animate-spin text-muted-foreground" />
|
|
</div>
|
|
) : templates.length === 0 ? (
|
|
<div className="flex flex-col items-center justify-center py-8 text-center">
|
|
<Users className="h-8 w-8 text-muted-foreground/50 mb-3" />
|
|
<p className="text-sm text-muted-foreground">Inga mallar ännu.</p>
|
|
<p className="text-xs text-muted-foreground mt-1">
|
|
Mallar skapas automatiskt när du kategoriserar transaktioner eller importerar en SIE-fil.
|
|
</p>
|
|
</div>
|
|
) : (
|
|
<div className="space-y-1">
|
|
{templates.map((t) => {
|
|
const isExpanded = expandedId === t.id
|
|
const isMultiLine = t.line_pattern && t.line_pattern.length > 0
|
|
|
|
return (
|
|
<div key={t.id} className="rounded-md border overflow-hidden">
|
|
{/* Clickable summary row */}
|
|
<button
|
|
type="button"
|
|
onClick={() => setExpandedId(isExpanded ? null : t.id)}
|
|
className="w-full text-left px-4 py-3 flex items-center gap-3 hover:bg-muted/50 transition-colors"
|
|
>
|
|
<div className="min-w-0 flex-1">
|
|
<div className="flex items-center gap-2">
|
|
<p className="text-sm font-medium truncate">{formatCounterpartyName(t.counterparty_name)}</p>
|
|
<Badge variant="outline" className="text-[10px] shrink-0">
|
|
{SOURCE_LABELS[t.source] || t.source}
|
|
</Badge>
|
|
</div>
|
|
<div className="flex items-center gap-1.5 mt-0.5 text-xs text-muted-foreground">
|
|
{isMultiLine ? (
|
|
<span className="font-mono">
|
|
{t.line_pattern!.filter(lp => lp.type === 'business').map(lp => lp.account).join(', ')}
|
|
</span>
|
|
) : (
|
|
<>
|
|
<span className="font-mono">{t.debit_account}</span>
|
|
<span className="text-muted-foreground/50">→</span>
|
|
<span className="font-mono">{t.credit_account}</span>
|
|
</>
|
|
)}
|
|
{t.vat_treatment && (
|
|
<>
|
|
<span className="text-muted-foreground/30">·</span>
|
|
<span>{VAT_LABELS[t.vat_treatment] || t.vat_treatment}</span>
|
|
</>
|
|
)}
|
|
<span className="text-muted-foreground/30">·</span>
|
|
<span>{t.occurrence_count} ggr</span>
|
|
<span className={`tabular-nums ${confidenceColor(Number(t.confidence))}`}>
|
|
{Math.round(Number(t.confidence) * 100)}%
|
|
</span>
|
|
</div>
|
|
</div>
|
|
<ChevronDown className={`h-4 w-4 text-muted-foreground shrink-0 transition-transform ${isExpanded ? 'rotate-180' : ''}`} />
|
|
</button>
|
|
|
|
{/* Expanded detail */}
|
|
{isExpanded && (
|
|
<div className="border-t bg-muted/30 px-4 py-3 space-y-3">
|
|
{/* Account lines */}
|
|
<div>
|
|
<p className="text-[10px] font-medium text-muted-foreground uppercase tracking-wider mb-1.5">Kontering</p>
|
|
{isMultiLine ? (
|
|
<div className="space-y-1">
|
|
{t.line_pattern!.map((lp, i) => (
|
|
<div key={i} className="flex items-center gap-2 text-xs">
|
|
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 w-14 justify-center">
|
|
{lp.side === 'debit' ? 'Debet' : 'Kredit'}
|
|
</Badge>
|
|
<span className="font-mono">{formatAccountWithName(lp.account)}</span>
|
|
{lp.type === 'vat' && lp.vat_rate && (
|
|
<span className="text-muted-foreground">({Math.round(lp.vat_rate * 100)}% moms)</span>
|
|
)}
|
|
{lp.ratio !== undefined && (
|
|
<span className="text-muted-foreground">({Math.round(lp.ratio * 100)}%)</span>
|
|
)}
|
|
</div>
|
|
))}
|
|
</div>
|
|
) : (
|
|
<div className="space-y-1">
|
|
<div className="flex items-center gap-2 text-xs">
|
|
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 w-14 justify-center">Debet</Badge>
|
|
<span className="font-mono">{formatAccountWithName(t.debit_account)}</span>
|
|
</div>
|
|
<div className="flex items-center gap-2 text-xs">
|
|
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 w-14 justify-center">Kredit</Badge>
|
|
<span className="font-mono">{formatAccountWithName(t.credit_account)}</span>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Metadata */}
|
|
<div className="grid grid-cols-2 gap-x-6 gap-y-1 text-xs">
|
|
{t.vat_treatment && (
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground">Moms</span>
|
|
<span>{VAT_LABELS[t.vat_treatment] || t.vat_treatment}</span>
|
|
</div>
|
|
)}
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground">Antal bokföringar</span>
|
|
<span className="tabular-nums">{t.occurrence_count}</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground">Säkerhet</span>
|
|
<span className={`tabular-nums ${confidenceColor(Number(t.confidence))}`}>
|
|
{Math.round(Number(t.confidence) * 100)}%
|
|
</span>
|
|
</div>
|
|
<div className="flex justify-between">
|
|
<span className="text-muted-foreground">Senast använd</span>
|
|
<span>{formatDate(t.last_seen_date)}</span>
|
|
</div>
|
|
{t.counterparty_aliases && t.counterparty_aliases.length > 1 && (
|
|
<div className="col-span-2 flex justify-between">
|
|
<span className="text-muted-foreground">Alias</span>
|
|
<span className="text-right truncate ml-4">{t.counterparty_aliases.slice(0, 3).join(', ')}{t.counterparty_aliases.length > 3 ? ` +${t.counterparty_aliases.length - 3}` : ''}</span>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Delete */}
|
|
<div className="flex justify-end pt-1">
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
onClick={() => handleDelete(t.id)}
|
|
disabled={deletingId === t.id}
|
|
className="text-destructive hover:text-destructive text-xs h-7"
|
|
>
|
|
{deletingId === t.id ? (
|
|
<Loader2 className="mr-1.5 h-3 w-3 animate-spin" />
|
|
) : (
|
|
<Trash2 className="mr-1.5 h-3 w-3" />
|
|
)}
|
|
Ta bort mall
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
)
|
|
})}
|
|
</div>
|
|
)}
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
)
|
|
}
|