* 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>
455 lines
18 KiB
TypeScript
455 lines
18 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useTransition } from 'react'
|
|
import { useRouter } from 'next/navigation'
|
|
import Link from 'next/link'
|
|
import { Building2, ArrowRight, Loader2, Plus, Check, AlertTriangle } from 'lucide-react'
|
|
import { cn } from '@/lib/utils'
|
|
import { useToast } from '@/components/ui/use-toast'
|
|
import { switchCompany, createCompanyFromTicRole } from '@/lib/company/actions'
|
|
import { mapEntityType } from '@/lib/company-lookup/entity-type-map'
|
|
import type { CompanyLookupResult, EnrichmentCompanyRole } from '@/lib/company-lookup/types'
|
|
import { getBranding } from '@/lib/branding/service'
|
|
|
|
const branding = getBranding()
|
|
|
|
export interface MemberCompany {
|
|
id: string
|
|
name: string
|
|
orgNumber: string | null
|
|
entityType: string | null
|
|
role: string
|
|
}
|
|
|
|
export interface TicPickerCompany {
|
|
role: EnrichmentCompanyRole
|
|
/** 'new' = not in gnubok, can set up. 'exists' = in gnubok but user is not a member. */
|
|
status: 'new' | 'exists'
|
|
}
|
|
|
|
interface BankIdCompanyPickerProps {
|
|
firstName: string | null
|
|
teamId: string
|
|
memberCompanies: MemberCompany[]
|
|
ticCompanies: TicPickerCompany[]
|
|
enrichmentStale: boolean
|
|
}
|
|
|
|
type SetupState =
|
|
| { kind: 'idle' }
|
|
| { kind: 'opening'; companyId: string }
|
|
| { kind: 'creating'; orgNumber: string; step: 'lookup' | 'provision' }
|
|
|
|
function humanEntityType(t: string | null | undefined): string {
|
|
if (!t) return ''
|
|
if (t === 'aktiebolag') return 'Aktiebolag'
|
|
if (t === 'enskild_firma') return 'Enskild firma'
|
|
// TIC legalEntityType strings ('AB', 'HB', etc.) fall through to this
|
|
return t
|
|
}
|
|
|
|
function humanTicEntityType(t: string): string {
|
|
const mapped = mapEntityType(t)
|
|
if (mapped === 'aktiebolag') return 'Aktiebolag'
|
|
if (mapped === 'enskild_firma') return 'Enskild firma'
|
|
if (t.toLowerCase().includes('handelsbolag') || t.toLowerCase() === 'hb') return 'Handelsbolag'
|
|
if (t.toLowerCase().includes('kommanditbolag') || t.toLowerCase() === 'kb') return 'Kommanditbolag'
|
|
return t
|
|
}
|
|
|
|
function positionLabel(role: EnrichmentCompanyRole): string {
|
|
const descs = role.positionDescriptions?.filter(Boolean)
|
|
if (descs && descs.length > 0) return descs.join(' · ')
|
|
const types = role.positionTypes?.filter(Boolean)
|
|
if (types && types.length > 0) return types.join(' · ')
|
|
return ''
|
|
}
|
|
|
|
export default function BankIdCompanyPicker({
|
|
firstName,
|
|
teamId,
|
|
memberCompanies,
|
|
ticCompanies,
|
|
enrichmentStale,
|
|
}: BankIdCompanyPickerProps) {
|
|
const router = useRouter()
|
|
const { toast } = useToast()
|
|
const [setup, setSetup] = useState<SetupState>({ kind: 'idle' })
|
|
const [isPending, startTransition] = useTransition()
|
|
|
|
const hour = new Date().getHours()
|
|
const greeting = hour < 5 ? 'God natt' : hour < 10 ? 'Godmorgon' : hour < 14 ? 'Hej' : hour < 18 ? 'God eftermiddag' : 'God kväll'
|
|
|
|
const busy = setup.kind !== 'idle' || isPending
|
|
|
|
async function handleOpenMember(companyId: string) {
|
|
if (busy) return
|
|
setSetup({ kind: 'opening', companyId })
|
|
const result = await switchCompany(companyId)
|
|
if (result.error) {
|
|
toast({ title: result.error, variant: 'destructive' })
|
|
setSetup({ kind: 'idle' })
|
|
return
|
|
}
|
|
window.location.assign('/')
|
|
}
|
|
|
|
async function handleCreateFromTic(role: EnrichmentCompanyRole) {
|
|
if (busy) return
|
|
const orgNumber = role.companyRegistrationNumber.replace(/[\s-]/g, '')
|
|
const mapped = mapEntityType(role.legalEntityType)
|
|
if (!mapped) {
|
|
// Entity type isn't supported end-to-end — route to manual wizard with
|
|
// the org number pre-filled.
|
|
router.push(`/onboarding?org_number=${encodeURIComponent(orgNumber)}`)
|
|
return
|
|
}
|
|
|
|
setSetup({ kind: 'creating', orgNumber, step: 'lookup' })
|
|
|
|
let lookup: CompanyLookupResult | null = null
|
|
try {
|
|
const res = await fetch(
|
|
`/api/extensions/ext/tic/lookup?org_number=${encodeURIComponent(orgNumber)}`,
|
|
{ method: 'GET' },
|
|
)
|
|
if (res.ok) {
|
|
const json = await res.json()
|
|
lookup = (json?.data as CompanyLookupResult | undefined) ?? null
|
|
}
|
|
} catch {
|
|
// Network/parse failure — fall through to the lookup-missing branch below.
|
|
}
|
|
|
|
// Without a lookup we don't know the company's VAT/F-skatt status.
|
|
// Defaulting those to false for a momsregistrerat bolag would silently
|
|
// create a company that issues invoices without moms — ML 17 kap violation.
|
|
// Route to the manual wizard with the known fields pre-filled instead.
|
|
if (!lookup) {
|
|
toast({
|
|
title: 'Kunde inte hämta företagsuppgifter',
|
|
description: 'Fyll i resterande uppgifter manuellt.',
|
|
})
|
|
setSetup({ kind: 'idle' })
|
|
router.push(`/onboarding?org_number=${encodeURIComponent(orgNumber)}`)
|
|
return
|
|
}
|
|
|
|
// Block provisioning for companies that are avregistrerade/likviderade.
|
|
// Under BFL 2 kap, bokföringsskyldighet ends when a company is struck off.
|
|
if (lookup.isCeased) {
|
|
toast({
|
|
title: 'Företaget är avregistrerat',
|
|
description: 'Det går inte att sätta upp bokföring för ett avregistrerat företag.',
|
|
variant: 'destructive',
|
|
})
|
|
setSetup({ kind: 'idle' })
|
|
return
|
|
}
|
|
|
|
setSetup({ kind: 'creating', orgNumber, step: 'provision' })
|
|
|
|
startTransition(async () => {
|
|
const result = await createCompanyFromTicRole({
|
|
teamId,
|
|
orgNumber,
|
|
legalName: role.legalName,
|
|
legalEntityType: role.legalEntityType,
|
|
lookup,
|
|
})
|
|
|
|
if (result.error === 'lookup_missing') {
|
|
// Extremely unlikely (we just verified lookup above) but if it happens,
|
|
// the same fallback applies.
|
|
setSetup({ kind: 'idle' })
|
|
router.push(`/onboarding?org_number=${encodeURIComponent(orgNumber)}`)
|
|
return
|
|
}
|
|
|
|
if (result.error === 'org_number_exists') {
|
|
toast({
|
|
title: 'Företaget finns redan',
|
|
description: 'Be en befintlig administratör att bjuda in dig.',
|
|
variant: 'destructive',
|
|
})
|
|
setSetup({ kind: 'idle' })
|
|
return
|
|
}
|
|
|
|
if (result.error === 'company_ceased') {
|
|
// Belt-and-suspenders: we already check lookup.isCeased client-side
|
|
// above, but the server-side guard catches any race where TIC's
|
|
// cached result differs between the two calls.
|
|
toast({
|
|
title: 'Företaget är avregistrerat',
|
|
description: 'Det går inte att sätta upp bokföring för ett avregistrerat företag.',
|
|
variant: 'destructive',
|
|
})
|
|
setSetup({ kind: 'idle' })
|
|
return
|
|
}
|
|
|
|
if (result.error === 'org_number_invalid') {
|
|
toast({
|
|
title: 'Ogiltigt organisationsnummer',
|
|
description: 'Fortsätt med manuell uppsättning.',
|
|
variant: 'destructive',
|
|
})
|
|
setSetup({ kind: 'idle' })
|
|
router.push(`/onboarding?org_number=${encodeURIComponent(orgNumber)}`)
|
|
return
|
|
}
|
|
|
|
if (result.error || !result.companyId) {
|
|
toast({
|
|
title: 'Kunde inte skapa företag',
|
|
description: result.error ?? 'Försök igen eller lägg till manuellt.',
|
|
variant: 'destructive',
|
|
})
|
|
setSetup({ kind: 'idle' })
|
|
return
|
|
}
|
|
|
|
toast({ title: 'Välkommen!', description: 'Ditt företag är nu redo.' })
|
|
window.location.assign('/')
|
|
})
|
|
}
|
|
|
|
// Progress card while creating
|
|
if (setup.kind === 'creating') {
|
|
const lookupDone = setup.step === 'provision'
|
|
return (
|
|
<div className="stagger-enter">
|
|
<header className="mb-10">
|
|
<h1 className="font-display text-2xl md:text-3xl font-medium tracking-tight">
|
|
{greeting}{firstName ? `, ${firstName}` : ''}
|
|
</h1>
|
|
<p className="text-muted-foreground text-sm mt-1.5">Sätter upp ditt företag…</p>
|
|
</header>
|
|
|
|
<div className="max-w-lg rounded-xl border bg-card p-6" style={{ boxShadow: 'var(--shadow-md)' }}>
|
|
<div className="flex items-start gap-3">
|
|
<Building2 className="h-5 w-5 text-muted-foreground mt-0.5" />
|
|
<div className="flex-1">
|
|
<p className="font-medium text-sm">Org.nr {setup.orgNumber}</p>
|
|
<ul className="mt-3 space-y-2 text-sm">
|
|
<li className="flex items-center gap-2">
|
|
{lookupDone
|
|
? <Check className="h-4 w-4 text-sage" />
|
|
: <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />}
|
|
<span className={cn(!lookupDone && 'text-muted-foreground')}>
|
|
Hämtar uppgifter från Bolagsverket
|
|
</span>
|
|
</li>
|
|
<li className="flex items-center gap-2">
|
|
{lookupDone
|
|
? <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
|
|
: <span className="h-4 w-4 inline-block rounded-full border border-border" />}
|
|
<span className={cn(!lookupDone && 'text-muted-foreground/50')}>
|
|
Skapar företag och kontoplan
|
|
</span>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<div className="stagger-enter">
|
|
<header className="mb-10">
|
|
<h1 className="font-display text-2xl md:text-3xl font-medium tracking-tight">
|
|
{greeting}{firstName ? `, ${firstName}` : ''}
|
|
</h1>
|
|
<p className="text-muted-foreground text-sm mt-1.5">
|
|
Välj ett företag att öppna eller lägg till ett nytt.
|
|
</p>
|
|
</header>
|
|
|
|
<div className="max-w-lg space-y-8">
|
|
{enrichmentStale && (
|
|
<div className="rounded-lg border border-amber-200 bg-amber-50 p-3 dark:border-amber-900/60 dark:bg-amber-950/30">
|
|
<div className="flex items-start gap-2.5">
|
|
<AlertTriangle className="h-4 w-4 text-amber-600 dark:text-amber-400 mt-0.5 flex-shrink-0" />
|
|
<p className="text-sm text-amber-800 dark:text-amber-200">
|
|
Uppgifterna från BankID är äldre än en vecka. Logga in med BankID igen för att uppdatera listan.
|
|
</p>
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{memberCompanies.length > 0 && (
|
|
<section>
|
|
<h2 className="text-xs uppercase tracking-[0.08em] text-muted-foreground mb-3">
|
|
Dina företag i {branding.appName.toLowerCase()}
|
|
</h2>
|
|
<ul className="space-y-2">
|
|
{memberCompanies.map((c) => {
|
|
const isOpening = setup.kind === 'opening' && setup.companyId === c.id
|
|
return (
|
|
<li key={c.id}>
|
|
<button
|
|
type="button"
|
|
onClick={() => handleOpenMember(c.id)}
|
|
disabled={busy}
|
|
className={cn(
|
|
'w-full rounded-lg border bg-card p-4 text-left transition-colors',
|
|
!busy && 'hover:border-foreground/30 hover:bg-muted/30',
|
|
busy && 'opacity-60 cursor-not-allowed',
|
|
)}
|
|
>
|
|
<div className="flex items-center justify-between gap-3">
|
|
<div className="min-w-0">
|
|
<p className="font-medium text-sm truncate">{c.name}</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5 truncate">
|
|
{c.orgNumber ? `${c.orgNumber} · ` : ''}
|
|
{humanEntityType(c.entityType)}
|
|
</p>
|
|
</div>
|
|
<div className="flex items-center gap-2 flex-shrink-0">
|
|
{c.role !== 'owner' && (
|
|
<span className="text-[10px] uppercase tracking-wide text-muted-foreground/80">
|
|
{c.role}
|
|
</span>
|
|
)}
|
|
{isOpening
|
|
? <Loader2 className="h-4 w-4 animate-spin text-muted-foreground" />
|
|
: <ArrowRight className="h-4 w-4 text-muted-foreground" />}
|
|
</div>
|
|
</div>
|
|
</button>
|
|
</li>
|
|
)
|
|
})}
|
|
</ul>
|
|
</section>
|
|
)}
|
|
|
|
{ticCompanies.length > 0 && (
|
|
<section>
|
|
<h2 className="text-xs uppercase tracking-[0.08em] text-muted-foreground mb-3">
|
|
Företag kopplade till ditt BankID
|
|
</h2>
|
|
<ul className="space-y-2">
|
|
{ticCompanies.map(({ role, status }) => {
|
|
const cleaned = role.companyRegistrationNumber.replace(/[\s-]/g, '')
|
|
const position = positionLabel(role)
|
|
const entityLabel = humanTicEntityType(role.legalEntityType)
|
|
const mappable = mapEntityType(role.legalEntityType) !== null
|
|
|
|
if (status === 'exists') {
|
|
return (
|
|
<li key={cleaned}>
|
|
<div className="w-full rounded-lg border bg-muted/20 p-4 text-left opacity-70">
|
|
<div className="flex items-center justify-between gap-3">
|
|
<div className="min-w-0">
|
|
<p className="font-medium text-sm truncate">{role.legalName}</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5 truncate">
|
|
{cleaned} · {entityLabel}
|
|
</p>
|
|
</div>
|
|
<span className="text-[10px] uppercase tracking-wide text-muted-foreground flex-shrink-0">
|
|
Finns redan i {branding.appName.toLowerCase()}
|
|
</span>
|
|
</div>
|
|
<p className="text-xs text-muted-foreground/70 mt-2">
|
|
Be en befintlig administratör att bjuda in dig.
|
|
</p>
|
|
</div>
|
|
</li>
|
|
)
|
|
}
|
|
|
|
if (!mappable) {
|
|
return (
|
|
<li key={cleaned}>
|
|
<Link
|
|
href={`/onboarding?org_number=${encodeURIComponent(cleaned)}`}
|
|
className={cn(
|
|
'block w-full rounded-lg border bg-card p-4 text-left transition-colors',
|
|
!busy && 'hover:border-foreground/30 hover:bg-muted/30',
|
|
busy && 'pointer-events-none opacity-60',
|
|
)}
|
|
>
|
|
<div className="flex items-center justify-between gap-3">
|
|
<div className="min-w-0">
|
|
<p className="font-medium text-sm truncate">{role.legalName}</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5 truncate">
|
|
{cleaned} · {entityLabel}
|
|
{position ? ` · ${position}` : ''}
|
|
</p>
|
|
</div>
|
|
<span className="text-[10px] uppercase tracking-wide text-muted-foreground flex-shrink-0">
|
|
Sätts upp manuellt
|
|
</span>
|
|
</div>
|
|
</Link>
|
|
</li>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<li key={cleaned}>
|
|
<button
|
|
type="button"
|
|
onClick={() => handleCreateFromTic(role)}
|
|
disabled={busy}
|
|
className={cn(
|
|
'w-full rounded-lg border bg-card p-4 text-left transition-colors',
|
|
!busy && 'hover:border-foreground/30 hover:bg-muted/30',
|
|
busy && 'opacity-60 cursor-not-allowed',
|
|
)}
|
|
>
|
|
<div className="flex items-center justify-between gap-3">
|
|
<div className="min-w-0">
|
|
<p className="font-medium text-sm truncate">{role.legalName}</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5 truncate">
|
|
{cleaned} · {entityLabel}
|
|
{position ? ` · ${position}` : ''}
|
|
</p>
|
|
</div>
|
|
<ArrowRight className="h-4 w-4 text-muted-foreground flex-shrink-0" />
|
|
</div>
|
|
</button>
|
|
</li>
|
|
)
|
|
})}
|
|
</ul>
|
|
</section>
|
|
)}
|
|
|
|
{memberCompanies.length === 0 && ticCompanies.length === 0 && (
|
|
<p className="text-sm text-muted-foreground">
|
|
Inga företag hittades. Lägg till ditt första företag nedan.
|
|
</p>
|
|
)}
|
|
|
|
<div className="relative">
|
|
<div className="absolute inset-0 flex items-center" aria-hidden>
|
|
<div className="w-full border-t border-border/60" />
|
|
</div>
|
|
<div className="relative flex justify-center">
|
|
<span className="bg-background px-3 text-xs uppercase tracking-[0.08em] text-muted-foreground">
|
|
eller
|
|
</span>
|
|
</div>
|
|
</div>
|
|
|
|
<Link
|
|
href="/onboarding"
|
|
className={cn(
|
|
'flex items-center justify-center gap-2 w-full rounded-lg border border-dashed p-4 text-sm font-medium transition-colors',
|
|
!busy && 'hover:border-foreground/30 hover:bg-muted/30',
|
|
busy && 'pointer-events-none opacity-60',
|
|
)}
|
|
>
|
|
<Plus className="h-4 w-4" />
|
|
Lägg till företag manuellt
|
|
</Link>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|