9686b54b41
Seven radii were in circulation (4/5/6/8/12/16px + pill) with no rule for which went where; one toolbar row on /transactions mixed four shape languages. This locks a 4-tier ladder (design.md convention 16): - pill: interactive toolbar controls (buttons, chips, pickers, segmented controls, toolbar search, count nubs) - rounded-xl (12px): overlay tier: page panel, dialogs, slide-overs - rounded-lg (8px): cards, form fields, popover/menu content, boxes - rounded-sm (4px): nested leaves (menu items, checkboxes, kbd/code nubs) Changes: - New SegmentedControl primitive (pill-in-pill tablist, h-8) replaces the hand-rolled bg-muted/70 tablist copied across 11 files - New ToolbarSearch primitive (pill, h-8) adopted on 9 page toolbars; dialog/picker searches keep the rounded-lg Input - dialog.tsx 8px -> 12px, matching SettingsModal/slide-over/CommandPalette - ContextPicker chips at the shared h-8 toolbar height - ~300 rounded-md / bare rounded call sites remapped by role; auth icon tiles and the mobile nav sheet come down from 16px to 12px - rounded-md, bare rounded, rounded-2xl and rounded-[Npx] are dead vocabulary, enforced by a new off-ladder-radius check in check:guards Verified: lint 0 errors, 14422 unit tests pass, check:guards green, tsc clean on all changed files, sandbox screenshots of transactions/ bookkeeping/granskning toolbars and the Ny verifikation dialog. Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <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-lg 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>
|
|
)
|
|
}
|