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>
238 lines
8.2 KiB
TypeScript
238 lines
8.2 KiB
TypeScript
'use client'
|
|
|
|
import { useState } from 'react'
|
|
import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/components/ui/card'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
|
|
import { Label } from '@/components/ui/label'
|
|
import type { DetectedColumns, BalanceColumnLayout } from '@/lib/import/opening-balance/types'
|
|
|
|
interface OpeningBalanceColumnMappingStepProps {
|
|
headers: string[]
|
|
previewRows: string[][]
|
|
detectedColumns: DetectedColumns
|
|
onConfirm: (columns: DetectedColumns) => void
|
|
onBack: () => void
|
|
}
|
|
|
|
export default function OpeningBalanceColumnMappingStep({
|
|
headers,
|
|
previewRows,
|
|
detectedColumns,
|
|
onConfirm,
|
|
onBack,
|
|
}: OpeningBalanceColumnMappingStepProps) {
|
|
const [accountNumberCol, setAccountNumberCol] = useState(
|
|
detectedColumns.account_number_col,
|
|
)
|
|
const [accountNameCol, setAccountNameCol] = useState<number | null>(
|
|
detectedColumns.account_name_col,
|
|
)
|
|
const [layout, setLayout] = useState<BalanceColumnLayout>(
|
|
detectedColumns.layout,
|
|
)
|
|
const [balanceCol, setBalanceCol] = useState<number | null>(
|
|
detectedColumns.balance_col,
|
|
)
|
|
const [debitCol, setDebitCol] = useState<number | null>(
|
|
detectedColumns.debit_col,
|
|
)
|
|
const [creditCol, setCreditCol] = useState<number | null>(
|
|
detectedColumns.credit_col,
|
|
)
|
|
|
|
const columnOptions = headers.map((h, i) => ({
|
|
value: String(i),
|
|
label: `${i + 1}: ${h || '(tom)'}`,
|
|
}))
|
|
|
|
const canContinue =
|
|
accountNumberCol >= 0 &&
|
|
(layout === 'net' ? balanceCol !== null : debitCol !== null && creditCol !== null)
|
|
|
|
const handleConfirm = () => {
|
|
onConfirm({
|
|
account_number_col: accountNumberCol,
|
|
account_name_col: accountNameCol,
|
|
layout,
|
|
balance_col: layout === 'net' ? balanceCol : null,
|
|
debit_col: layout === 'debit_credit' ? debitCol : null,
|
|
credit_col: layout === 'debit_credit' ? creditCol : null,
|
|
confidence: 1, // User-confirmed
|
|
})
|
|
}
|
|
|
|
return (
|
|
<Card>
|
|
<CardHeader>
|
|
<CardTitle>Kolumnmappning</CardTitle>
|
|
<CardDescription>
|
|
Vi kunde inte automatiskt identifiera alla kolumner. Ange vilka kolumner
|
|
som innehåller kontonummer och belopp.
|
|
</CardDescription>
|
|
</CardHeader>
|
|
<CardContent className="space-y-6">
|
|
{/* Layout toggle */}
|
|
<div className="space-y-2">
|
|
<Label>Beloppslayout</Label>
|
|
<Select value={layout} onValueChange={(v) => setLayout(v as BalanceColumnLayout)}>
|
|
<SelectTrigger>
|
|
<SelectValue />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="net">Nettobelopp (en kolumn)</SelectItem>
|
|
<SelectItem value="debit_credit">Debet & kredit (två kolumner)</SelectItem>
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
|
|
{/* Required mappings */}
|
|
<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
|
<div className="space-y-2">
|
|
<Label>Kontonummer *</Label>
|
|
<Select
|
|
value={String(accountNumberCol)}
|
|
onValueChange={(v) => setAccountNumberCol(Number(v))}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder="Välj kolumn" />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{columnOptions.map((opt) => (
|
|
<SelectItem key={opt.value} value={opt.value}>
|
|
{opt.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
<Label>Kontonamn</Label>
|
|
<Select
|
|
value={accountNameCol !== null ? String(accountNameCol) : 'none'}
|
|
onValueChange={(v) => setAccountNameCol(v === 'none' ? null : Number(v))}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder="Välj kolumn" />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="none">(ingen)</SelectItem>
|
|
{columnOptions.map((opt) => (
|
|
<SelectItem key={opt.value} value={opt.value}>
|
|
{opt.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
|
|
{layout === 'net' && (
|
|
<div className="space-y-2">
|
|
<Label>Saldo/Belopp *</Label>
|
|
<Select
|
|
value={balanceCol !== null ? String(balanceCol) : ''}
|
|
onValueChange={(v) => setBalanceCol(Number(v))}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder="Välj kolumn" />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{columnOptions.map((opt) => (
|
|
<SelectItem key={opt.value} value={opt.value}>
|
|
{opt.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
)}
|
|
|
|
{layout === 'debit_credit' && (
|
|
<>
|
|
<div className="space-y-2">
|
|
<Label>Debet *</Label>
|
|
<Select
|
|
value={debitCol !== null ? String(debitCol) : ''}
|
|
onValueChange={(v) => setDebitCol(Number(v))}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder="Välj kolumn" />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{columnOptions.map((opt) => (
|
|
<SelectItem key={opt.value} value={opt.value}>
|
|
{opt.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
|
|
<div className="space-y-2">
|
|
<Label>Kredit *</Label>
|
|
<Select
|
|
value={creditCol !== null ? String(creditCol) : ''}
|
|
onValueChange={(v) => setCreditCol(Number(v))}
|
|
>
|
|
<SelectTrigger>
|
|
<SelectValue placeholder="Välj kolumn" />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
{columnOptions.map((opt) => (
|
|
<SelectItem key={opt.value} value={opt.value}>
|
|
{opt.label}
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
</>
|
|
)}
|
|
</div>
|
|
|
|
{/* Preview */}
|
|
{previewRows.length > 0 && (
|
|
<div className="space-y-2">
|
|
<Label className="text-muted-foreground">Förhandsgranskning (5 första raderna)</Label>
|
|
<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">
|
|
{headers.map((h, i) => (
|
|
<th key={i} className="px-3 py-2 text-left whitespace-nowrap">
|
|
{h || `Kolumn ${i + 1}`}
|
|
</th>
|
|
))}
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{previewRows.slice(0, 5).map((row, ri) => (
|
|
<tr key={ri} className="border-b last:border-0">
|
|
{row.map((cell, ci) => (
|
|
<td key={ci} className="px-3 py-1.5 whitespace-nowrap tabular-nums">
|
|
{cell}
|
|
</td>
|
|
))}
|
|
</tr>
|
|
))}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Actions */}
|
|
<div className="flex justify-between">
|
|
<Button variant="ghost" onClick={onBack}>
|
|
Tillbaka
|
|
</Button>
|
|
<Button onClick={handleConfirm} disabled={!canContinue}>
|
|
Fortsätt
|
|
</Button>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
)
|
|
}
|