* 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>
253 lines
9.4 KiB
TypeScript
253 lines
9.4 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useEffect, useMemo, useCallback } from 'react'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Badge } from '@/components/ui/badge'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
DialogTrigger,
|
|
} from '@/components/ui/dialog'
|
|
import { BookOpen, Search, Building2, Users, Globe } from 'lucide-react'
|
|
import { TEMPLATE_CATEGORY_LABELS, SCOPE_LABELS, getTemplateScope, applyTemplate } from '@/lib/bookkeeping/template-library'
|
|
import type { BookingTemplateLibrary, BookingTemplateCategory, EntityType } from '@/types'
|
|
import type { FormLine } from '@/components/bookkeeping/JournalEntryForm'
|
|
|
|
interface Props {
|
|
onApply: (lines: FormLine[], description: string) => void
|
|
entityType?: EntityType
|
|
}
|
|
|
|
const SCOPE_ICONS = {
|
|
system: Globe,
|
|
team: Users,
|
|
company: Building2,
|
|
} as const
|
|
|
|
export default function BookingTemplatePicker({ onApply, entityType }: Props) {
|
|
const { toast } = useToast()
|
|
const [open, setOpen] = useState(false)
|
|
const [templates, setTemplates] = useState<BookingTemplateLibrary[]>([])
|
|
const [isLoading, setIsLoading] = useState(false)
|
|
const [search, setSearch] = useState('')
|
|
const [selectedCategory, setSelectedCategory] = useState<BookingTemplateCategory | 'all'>('all')
|
|
const [amount, setAmount] = useState('')
|
|
const [selectedId, setSelectedId] = useState<string | null>(null)
|
|
|
|
const fetchTemplates = useCallback(async (signal?: AbortSignal) => {
|
|
setIsLoading(true)
|
|
try {
|
|
const r = await fetch('/api/settings/booking-templates', { signal })
|
|
const { data } = await r.json()
|
|
setTemplates(data || [])
|
|
} catch (err) {
|
|
if (err instanceof DOMException && err.name === 'AbortError') return
|
|
toast({ title: 'Kunde inte hämta mallar', variant: 'destructive' })
|
|
} finally {
|
|
setIsLoading(false)
|
|
}
|
|
}, [toast])
|
|
|
|
useEffect(() => {
|
|
if (!open) return
|
|
const controller = new AbortController()
|
|
fetchTemplates(controller.signal)
|
|
return () => { controller.abort() }
|
|
}, [open, fetchTemplates])
|
|
|
|
const filtered = useMemo(() => {
|
|
let result = templates
|
|
|
|
// Filter by entity type
|
|
if (entityType) {
|
|
result = result.filter((t) => t.entity_type === 'all' || t.entity_type === entityType)
|
|
}
|
|
|
|
// Filter by category
|
|
if (selectedCategory !== 'all') {
|
|
result = result.filter((t) => t.category === selectedCategory)
|
|
}
|
|
|
|
// Filter by search
|
|
if (search) {
|
|
const lower = search.toLowerCase()
|
|
result = result.filter(
|
|
(t) =>
|
|
t.name.toLowerCase().includes(lower) ||
|
|
t.description.toLowerCase().includes(lower),
|
|
)
|
|
}
|
|
|
|
return result
|
|
}, [templates, entityType, selectedCategory, search])
|
|
|
|
// Unique categories present in templates
|
|
const availableCategories = useMemo(() => {
|
|
const cats = new Set(templates.map((t) => t.category))
|
|
return Array.from(cats).sort()
|
|
}, [templates])
|
|
|
|
const selected = selectedId ? templates.find((t) => t.id === selectedId) : null
|
|
|
|
function handleApply() {
|
|
if (!selected) return
|
|
const totalAmount = parseFloat(amount)
|
|
if (!totalAmount || totalAmount <= 0) {
|
|
toast({ title: 'Ange belopp', description: 'Ange ett belopp för att använda mallen.', variant: 'destructive' })
|
|
return
|
|
}
|
|
const lines = applyTemplate(selected.lines, totalAmount)
|
|
// Fire-and-forget MRU bump so this template surfaces at the top next time.
|
|
fetch(`/api/settings/booking-templates/${selected.id}/touch`, { method: 'POST' }).catch(() => {})
|
|
onApply(lines, selected.name)
|
|
setOpen(false)
|
|
setSelectedId(null)
|
|
setAmount('')
|
|
setSearch('')
|
|
}
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={setOpen}>
|
|
<DialogTrigger asChild>
|
|
<Button variant="outline" size="sm" type="button">
|
|
<BookOpen className="h-3.5 w-3.5 mr-1.5" />
|
|
Använd mall
|
|
</Button>
|
|
</DialogTrigger>
|
|
<DialogContent className="max-w-2xl max-h-[80vh] flex flex-col">
|
|
<DialogHeader>
|
|
<DialogTitle>Bokföringsmallar</DialogTitle>
|
|
</DialogHeader>
|
|
|
|
{/* Search + category filter */}
|
|
<div className="flex flex-col sm:flex-row gap-2">
|
|
<div className="relative flex-1">
|
|
<Search className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
|
|
<Input
|
|
value={search}
|
|
onChange={(e) => setSearch(e.target.value)}
|
|
placeholder="Sök mall..."
|
|
className="pl-9"
|
|
/>
|
|
</div>
|
|
<div className="flex gap-1 flex-wrap">
|
|
<Button
|
|
variant={selectedCategory === 'all' ? 'default' : 'outline'}
|
|
size="sm"
|
|
onClick={() => setSelectedCategory('all')}
|
|
type="button"
|
|
>
|
|
Alla
|
|
</Button>
|
|
{availableCategories.map((cat) => (
|
|
<Button
|
|
key={cat}
|
|
variant={selectedCategory === cat ? 'default' : 'outline'}
|
|
size="sm"
|
|
onClick={() => setSelectedCategory(cat as BookingTemplateCategory)}
|
|
type="button"
|
|
>
|
|
{TEMPLATE_CATEGORY_LABELS[cat as BookingTemplateCategory]}
|
|
</Button>
|
|
))}
|
|
</div>
|
|
</div>
|
|
|
|
{/* Template list */}
|
|
<div className="flex-1 overflow-y-auto space-y-1 min-h-0">
|
|
{isLoading ? (
|
|
<p className="text-sm text-muted-foreground py-8 text-center">Laddar mallar...</p>
|
|
) : filtered.length === 0 ? (
|
|
<p className="text-sm text-muted-foreground py-8 text-center">Inga mallar hittades.</p>
|
|
) : (
|
|
filtered.map((t) => {
|
|
const scope = getTemplateScope(t)
|
|
const ScopeIcon = SCOPE_ICONS[scope]
|
|
const isSelected = selectedId === t.id
|
|
return (
|
|
<button
|
|
key={t.id}
|
|
type="button"
|
|
onClick={() => setSelectedId(isSelected ? null : t.id)}
|
|
className={`w-full text-left rounded-lg border p-3 transition-colors ${
|
|
isSelected
|
|
? 'border-primary bg-primary/5'
|
|
: 'border-border hover:border-primary/40 hover:bg-muted/50'
|
|
}`}
|
|
>
|
|
<div className="flex items-start justify-between gap-2">
|
|
<div className="flex-1 min-w-0">
|
|
<div className="flex items-center gap-2">
|
|
<span className="font-medium text-sm">{t.name}</span>
|
|
<Badge variant="secondary" className="text-[10px] px-1.5 py-0 shrink-0">
|
|
<ScopeIcon className="h-3 w-3 mr-0.5" />
|
|
{SCOPE_LABELS[scope]}
|
|
</Badge>
|
|
{t.entity_type !== 'all' && (
|
|
<Badge variant="outline" className="text-[10px] px-1.5 py-0 shrink-0">
|
|
{t.entity_type === 'enskild_firma' ? 'EF' : 'AB'}
|
|
</Badge>
|
|
)}
|
|
</div>
|
|
{t.description && (
|
|
<p className="text-xs text-muted-foreground mt-0.5 line-clamp-2">
|
|
{t.description}
|
|
</p>
|
|
)}
|
|
</div>
|
|
</div>
|
|
{/* Show lines preview when selected */}
|
|
{isSelected && (
|
|
<div className="mt-2 pt-2 border-t space-y-1">
|
|
{t.lines.map((line, i) => (
|
|
<div key={i} className="flex items-center gap-2 text-xs font-mono text-muted-foreground">
|
|
<span className="w-10">{line.account}</span>
|
|
<span className="flex-1 truncate">{line.label}</span>
|
|
<span className={line.side === 'debit' ? 'text-foreground' : ''}>
|
|
{line.side === 'debit' ? (line.type === 'vat' && line.vat_rate ? `${(line.vat_rate * 100).toFixed(0)}% moms` : 'D') : ''}
|
|
</span>
|
|
<span className={line.side === 'credit' ? 'text-foreground' : ''}>
|
|
{line.side === 'credit' ? (line.type === 'vat' && line.vat_rate ? `${(line.vat_rate * 100).toFixed(0)}% moms` : 'K') : ''}
|
|
</span>
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
</button>
|
|
)
|
|
})
|
|
)}
|
|
</div>
|
|
|
|
{/* Apply section */}
|
|
{selected && (
|
|
<div className="flex items-end gap-3 pt-3 border-t">
|
|
<div className="flex-1">
|
|
<label className="text-xs font-medium text-muted-foreground mb-1 block">
|
|
Totalt belopp (inkl. moms)
|
|
</label>
|
|
<Input
|
|
type="number"
|
|
value={amount}
|
|
onChange={(e) => setAmount(e.target.value)}
|
|
placeholder="0,00"
|
|
min="0"
|
|
step="0.01"
|
|
inputMode="decimal"
|
|
autoFocus
|
|
/>
|
|
</div>
|
|
<Button onClick={handleApply} type="button">
|
|
Använd mall
|
|
</Button>
|
|
</div>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|