a7be1aab17
* feat: import system improvements, INK2 fix, and Swedish text corrections - SIE parser: Windows-1252 and CP437 encoding detection and decoding - Bank file parser: add Nordea Business (Företag) CSV format - Bank file parser: improve format detection for SEB, Länsförsäkringar, generic CSV - INK2 engine: calculate årets resultat (7222) from income statement for open fiscal years - Dashboard: parallel Supabase queries, simplified dashboard page - Fix Swedish characters (å, ä, ö) in BAS data descriptions, validation messages, AI consent disclosures - Import wizard UI improvements across all steps - Migration: add 'bas_range' match type to sie_account_mappings constraint - Extensive new tests for SIE parser encoding and bank file parser Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: arcim migration wizard UX fixes, Sentry setup, and extension scaffolding Arcim migration wizard improvements: - Progress bar now excludes non-interactive steps (migrating/result) - Fix OAuth text to match target="_blank" behavior (new tab, not redirect) - Display month names instead of "Månad X" in preview - Fix Swedish typo "förifylla" in no-company-info message - Replace native checkboxes with shadcn Switch in options step - Add ConfirmationDialog before starting migration - Show progress percentage during migration - Add "Nästa steg" guidance and navigation links in result step - Add "Försök igen" button in error state (returns to options) - Add Bokio company ID help text (GUID from URL) - Add Fortnox integration add-on hint on connection failure Also includes: SIE import system improvements, INK2 fixes, Swedish text corrections, Sentry error tracking setup, and arcim-migration extension scaffolding. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: address PR review feedback - Fix OAuth error recovery blank page (restore provider from URL params) - Pass real userId to MigrationWizard instead of empty string - Remove ~50 debug console.log statements from sie-import.ts - Fix comment referencing account 3740 → 3741 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * feat: comprehensive UI design audit and normalization Dashboard audit: - Fix muted-foreground contrast (4.31:1 → 5.08:1) for WCAG AA - Add prefers-reduced-motion media query for all animations - Replace border-l-2 accent anti-pattern with subtle full-border colors - Add aria-expanded to toggle buttons, role="status" to live counters - Fix touch targets on deadline buttons (28px → 36px) - Vary section spacing for rhythm (mb-12/mb-10/mb-8) - Remove unused imports and dead code Transactions audit + hardening: - Add pagination (200 per page) with "Ladda fler" button - Replace height animation with transform-only exit animation - Show batch progress in floating action bar during processing - Fix batch bar mobile overlap (bottom-20 on mobile) - Replace clickable badges with proper button elements - Add safe area padding to fullscreen swipe view - Add response.ok check to suggestion fetch - Add truncation to invoice number buttons Invoicing audit: - Remove border-l-4 accent pattern from invoice cards - Replace string concatenation with cn() utility Systemic sweep (34 files): - All page headings: font-bold → font-display font-medium (Fraunces) - All stat numbers: font-bold → font-display font-medium tabular-nums - All hard-coded blue/amber/emerald colors → design tokens - Remove all dark mode overrides (tokens handle automatically) - Tint pure white card background to 99% Design context added to CLAUDE.md with brand personality, aesthetic direction, and 5 design principles. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: bookkeeping flow audit — design system, accessibility, UX - Replace raw <select> with shadcn Select component (JournalEntryForm) - Add confirmation dialog for account deletion (ChartOfAccountsManager) - Remove console.error from production code (JournalEntryList, JournalEntryForm) - Fix contradictory h-7/min-h-[44px] button sizing → h-10 (ChartOfAccountsManager) - Increase BAS catalog "Lägg till" touch target h-7 → h-9 - Improve loading state with spinner (JournalEntryList) - Improve empty state with icon, description, and guidance (JournalEntryList) - Add response.ok check on journal entry fetch - Add aria-expanded to entry expand buttons - Add tabular-nums to desktop debit/credit columns Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: onboarding and empty state improvements Onboarding: - Replace font-serif with font-display (Fraunces) for brand consistency - Remove console.error calls from production code Empty states: - Fix broken /transactions/new link in EmptyTransactions (route doesn't exist) - Add actionHref fallback to EmptyCustomers when no onAction prop provided - Improve EmptyTransactions description copy Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: clarify Swedish UX copy — terminology, errors, descriptions Terminology consistency: - "Försenad" → "Förfallen" for overdue invoices (customers/[id]) - "bokföringsorder" → actionable description in bookkeeping page - "verifikation har bifogats" → "underlag har bifogats" in doc warning - "Fortsätt ändå" → "Bokför utan underlag" (specific action) Error messages — replace generic "Fel" + "Något gick fel" with specific: - "Något gick fel vid bokföring" → "Transaktionen kunde inte bokföras" - "Något gick fel vid matchning" → "Transaktionen kunde inte matchas" - "Kunde inte hämta X" → "Kunde inte ladda X" + recovery hint - Add "Försök igen" guidance to all error toasts Page descriptions — replace redundant with actionable: - Invoices: "Skapa och hantera" → "Skicka, följ betalningar, skapa kreditnotor" - Bookkeeping: list of features → actionable description Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: design critique — dashboard affordance, reports description Dashboard: - Add ChevronRight indicator to clickable summary cards (Att få betalt, Koppla bank) to distinguish from static cards - Add cursor-pointer to linked cards Reports: - Replace feature list description with actionable guidance "Huvudbok, grundbok..." → "Generera skattedeklarationer..." Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace generic "Fel" error toasts with specific messages Deadlines: 5 generic "Fel" → specific per-action titles (create, toggle, edit, delete, load) Expenses detail: 5 generic "Fel" → specific per-action titles (load, approve, pay, credit, delete) Expenses new: 3 generic "Fel" → instructional validation messages (supplier name, supplier selection, invoice number) Customers: 1 generic "Fel" → specific load error with recovery hint All error toasts now follow pattern: title = what failed, description = how to recover Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: replace all remaining generic "Fel" error toasts (37 instances) Systematic sweep across 12 dashboard pages replacing generic title: 'Fel' with context-specific error titles: - Load errors: "Kunde inte ladda [resurs]" - Action errors: "[Åtgärd] misslyckades" - Validation: "[Fält] saknas" Every error toast now tells the user what failed without needing to read the description. Recovery hints added where missing. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: import flow — normalize stat typography, remove console.warn - Replace font-bold with font-display font-medium on 13 stat numbers across SIEPreviewStep, BankFilePreviewStep, BankFileConfirmStep, ImportResultStep (missed by systemic sweep since these are in components/import/, not app/(dashboard)/) - Add tabular-nums to stat numbers displaying counts/currency - Remove console.warn in ArcimMigrationWorkspace Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: final cleanup — console statements, remaining font-bold stats Remove production console statements: - Step1EntityType: remove debug console.warn (dead code after onNext) - TransactionBookingDialog: remove console.error on doc link failure - JournalEntryAttachments: remove 3 console.error calls Normalize remaining font-bold stat displays: - SwipeCategorizationView: 3 instances (completion, amount displays) - NEDeclarationView: yearly result heading + value Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: address Greptile review feedback loadMoreTransactions: add inbox item enrichment matching fetchTransactions - Paginated transactions now fetch invoice_inbox_items in parallel - Fixes missing document indicator, template suggestions, and inbox match card for transactions loaded via "Ladda fler" fetchAllPages: add maxPages guard (default 500) to prevent infinite loop - If Arcim gateway returns hasMore:true indefinitely, the loop now exits after 500 pages instead of running forever Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
330 lines
11 KiB
TypeScript
330 lines
11 KiB
TypeScript
'use client'
|
|
|
|
import { useState, useMemo } from 'react'
|
|
import { Input } from '@/components/ui/input'
|
|
import { Badge } from '@/components/ui/badge'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Search, ChevronDown, ChevronUp, AlertTriangle, Info } from 'lucide-react'
|
|
import {
|
|
getCommonTemplates,
|
|
getAdvancedTemplates,
|
|
searchTemplates,
|
|
type BookingTemplate,
|
|
type TemplateGroup,
|
|
} from '@/lib/bookkeeping/booking-templates'
|
|
import type { EntityType } from '@/types'
|
|
import type { SuggestedTemplate } from '@/lib/transactions/category-suggestions'
|
|
|
|
const GROUP_ORDER: TemplateGroup[] = [
|
|
'premises', 'vehicle', 'it_software', 'office_supplies', 'marketing',
|
|
'travel', 'representation', 'insurance', 'professional_services',
|
|
'bank_finance', 'telecom', 'education', 'personnel', 'revenue',
|
|
'financial', 'private_transfers', 'equipment',
|
|
]
|
|
|
|
const GROUP_LABELS: Record<TemplateGroup, string> = {
|
|
premises: 'Lokalkostnader',
|
|
vehicle: 'Fordon',
|
|
it_software: 'IT & Programvara',
|
|
office_supplies: 'Kontorsmaterial',
|
|
marketing: 'Marknadsföring',
|
|
travel: 'Resor & Transport',
|
|
representation: 'Representation',
|
|
insurance: 'Försäkringar',
|
|
professional_services: 'Professionella tjänster',
|
|
bank_finance: 'Bank & Finans',
|
|
telecom: 'Telekom & Internet',
|
|
education: 'Utbildning',
|
|
personnel: 'Personal',
|
|
revenue: 'Intäkter',
|
|
financial: 'Finansiella poster',
|
|
private_transfers: 'Privata transaktioner',
|
|
equipment: 'Inventarier & Utrustning',
|
|
}
|
|
|
|
function getVatLabel(template: BookingTemplate): string | null {
|
|
if (!template.vat_treatment) return null
|
|
switch (template.vat_treatment) {
|
|
case 'standard_25': return '25% moms'
|
|
case 'reduced_12': return '12% moms'
|
|
case 'reduced_6': return '6% moms'
|
|
case 'reverse_charge': return 'Omvänd moms'
|
|
case 'export': return 'Momsfri (export)'
|
|
case 'exempt': return 'Momsfri'
|
|
default: return null
|
|
}
|
|
}
|
|
|
|
function groupTemplates(templates: BookingTemplate[]): Map<TemplateGroup, BookingTemplate[]> {
|
|
const grouped = new Map<TemplateGroup, BookingTemplate[]>()
|
|
for (const t of templates) {
|
|
const list = grouped.get(t.group) || []
|
|
list.push(t)
|
|
grouped.set(t.group, list)
|
|
}
|
|
return grouped
|
|
}
|
|
|
|
interface TemplateCardProps {
|
|
template: BookingTemplate
|
|
selected: boolean
|
|
onClick: () => void
|
|
compact?: boolean
|
|
}
|
|
|
|
function TemplateCard({ template, selected, onClick, compact }: TemplateCardProps) {
|
|
const vatLabel = getVatLabel(template)
|
|
|
|
return (
|
|
<button
|
|
type="button"
|
|
onClick={onClick}
|
|
className={`w-full text-left rounded-lg border px-3 py-2.5 transition-colors hover:bg-muted/50 ${
|
|
selected
|
|
? 'border-primary bg-primary/5 ring-1 ring-primary'
|
|
: 'border-border'
|
|
}`}
|
|
>
|
|
<div className="flex items-start justify-between gap-2">
|
|
<div className="min-w-0 flex-1">
|
|
<p className={`font-medium ${compact ? 'text-sm' : 'text-sm'} leading-tight`}>
|
|
{template.name_sv}
|
|
</p>
|
|
<div className="flex items-center gap-2 mt-1 flex-wrap">
|
|
<span className="text-xs font-mono text-muted-foreground">
|
|
D: {template.debit_account} · K: {template.credit_account}
|
|
</span>
|
|
{vatLabel && (
|
|
<Badge
|
|
variant="secondary"
|
|
className={`text-[10px] px-1.5 py-0 ${
|
|
template.vat_treatment === 'reverse_charge'
|
|
? 'bg-warning/10 text-warning-foreground'
|
|
: ''
|
|
}`}
|
|
>
|
|
{vatLabel}
|
|
</Badge>
|
|
)}
|
|
{template.requires_vat_registration_data && (
|
|
<Badge variant="outline" className="text-[10px] px-1.5 py-0 border-warning/30 text-warning-foreground gap-0.5">
|
|
<AlertTriangle className="h-2.5 w-2.5" />
|
|
Kräver momsreg.nr
|
|
</Badge>
|
|
)}
|
|
</div>
|
|
</div>
|
|
{template.requires_review && (
|
|
<Info className="h-3.5 w-3.5 text-muted-foreground flex-shrink-0 mt-0.5" />
|
|
)}
|
|
</div>
|
|
{template.special_rules_sv && !compact && (
|
|
<p className="text-[11px] text-muted-foreground mt-1.5 leading-snug">
|
|
{template.special_rules_sv}
|
|
</p>
|
|
)}
|
|
</button>
|
|
)
|
|
}
|
|
|
|
interface TemplatePickerProps {
|
|
direction: 'expense' | 'income'
|
|
entityType?: EntityType
|
|
suggestedTemplates?: SuggestedTemplate[]
|
|
recentTemplateIds?: string[]
|
|
onSelect: (template: BookingTemplate) => void
|
|
selectedTemplateId?: string
|
|
}
|
|
|
|
export default function TemplatePicker({
|
|
direction,
|
|
entityType,
|
|
suggestedTemplates,
|
|
onSelect,
|
|
selectedTemplateId,
|
|
}: TemplatePickerProps) {
|
|
const [searchQuery, setSearchQuery] = useState('')
|
|
const [showAdvanced, setShowAdvanced] = useState(false)
|
|
|
|
// Map direction to template direction filter (transfers show in both)
|
|
const templateDirection = direction === 'income' ? 'income' : 'expense'
|
|
|
|
const commonTemplates = useMemo(
|
|
() => getCommonTemplates(entityType, templateDirection),
|
|
[entityType, templateDirection]
|
|
)
|
|
|
|
const advancedTemplates = useMemo(
|
|
() => getAdvancedTemplates(entityType, templateDirection),
|
|
[entityType, templateDirection]
|
|
)
|
|
|
|
// Also include transfer templates in both directions
|
|
const commonTransfers = useMemo(
|
|
() => getCommonTemplates(entityType, 'transfer'),
|
|
[entityType]
|
|
)
|
|
const advancedTransfers = useMemo(
|
|
() => getAdvancedTemplates(entityType, 'transfer'),
|
|
[entityType]
|
|
)
|
|
|
|
const allCommon = useMemo(
|
|
() => [...commonTemplates, ...commonTransfers],
|
|
[commonTemplates, commonTransfers]
|
|
)
|
|
const allAdvanced = useMemo(
|
|
() => [...advancedTemplates, ...advancedTransfers],
|
|
[advancedTemplates, advancedTransfers]
|
|
)
|
|
|
|
// Search results
|
|
const searchResults = useMemo(() => {
|
|
if (!searchQuery.trim()) return null
|
|
return searchTemplates(searchQuery, entityType).filter((t) => {
|
|
if (t.direction === templateDirection || t.direction === 'transfer') return true
|
|
return false
|
|
})
|
|
}, [searchQuery, entityType, templateDirection])
|
|
|
|
// Group templates by group for display
|
|
const commonGrouped = useMemo(() => groupTemplates(allCommon), [allCommon])
|
|
const advancedGrouped = useMemo(() => groupTemplates(allAdvanced), [allAdvanced])
|
|
|
|
const handleSelect = (template: BookingTemplate) => {
|
|
onSelect(template)
|
|
}
|
|
|
|
// Suggested templates section
|
|
const hasSuggestions = suggestedTemplates && suggestedTemplates.length > 0
|
|
|
|
return (
|
|
<div className="flex flex-col h-full">
|
|
{/* Search bar */}
|
|
<div className="relative px-4 pt-3 pb-2">
|
|
<Search className="absolute left-7 top-1/2 -translate-y-1/2 h-4 w-4 text-muted-foreground mt-0.5" />
|
|
<Input
|
|
value={searchQuery}
|
|
onChange={(e) => setSearchQuery(e.target.value)}
|
|
placeholder="Sök mall..."
|
|
className="pl-9 h-9"
|
|
/>
|
|
</div>
|
|
|
|
{/* Scrollable content */}
|
|
<div className="flex-1 overflow-auto px-4 pb-4 space-y-4">
|
|
{/* Search results */}
|
|
{searchResults !== null ? (
|
|
<div>
|
|
<p className="text-xs font-medium text-muted-foreground mb-2">
|
|
{searchResults.length === 0 ? 'Inga resultat' : `${searchResults.length} resultat`}
|
|
</p>
|
|
<div className="space-y-1.5">
|
|
{searchResults.map((t) => (
|
|
<TemplateCard
|
|
key={t.id}
|
|
template={t}
|
|
selected={selectedTemplateId === t.id}
|
|
onClick={() => handleSelect(t)}
|
|
/>
|
|
))}
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<>
|
|
{/* Suggested templates */}
|
|
{hasSuggestions && (
|
|
<div>
|
|
<p className="text-xs font-medium text-muted-foreground mb-2">Föreslagna</p>
|
|
<div className="space-y-1.5">
|
|
{suggestedTemplates!.slice(0, 5).map((s) => {
|
|
// Find the full template object
|
|
const fullTemplate = allCommon.find((t) => t.id === s.template_id) ||
|
|
allAdvanced.find((t) => t.id === s.template_id)
|
|
if (!fullTemplate) return null
|
|
return (
|
|
<TemplateCard
|
|
key={s.template_id}
|
|
template={fullTemplate}
|
|
selected={selectedTemplateId === s.template_id}
|
|
onClick={() => handleSelect(fullTemplate)}
|
|
compact
|
|
/>
|
|
)
|
|
})}
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Common templates grouped */}
|
|
<div>
|
|
<p className="text-xs font-medium text-muted-foreground mb-2">Vanliga mallar</p>
|
|
<div className="space-y-3">
|
|
{GROUP_ORDER.filter((g) => commonGrouped.has(g)).map((group) => (
|
|
<div key={group}>
|
|
<p className="text-[11px] font-medium text-muted-foreground/70 uppercase tracking-wider mb-1">
|
|
{GROUP_LABELS[group]}
|
|
</p>
|
|
<div className="space-y-1.5">
|
|
{commonGrouped.get(group)!.map((t) => (
|
|
<TemplateCard
|
|
key={t.id}
|
|
template={t}
|
|
selected={selectedTemplateId === t.id}
|
|
onClick={() => handleSelect(t)}
|
|
compact
|
|
/>
|
|
))}
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
|
|
{/* Advanced templates (collapsible) */}
|
|
{allAdvanced.length > 0 && (
|
|
<div>
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
className="w-full justify-between text-xs text-muted-foreground h-8"
|
|
onClick={() => setShowAdvanced(!showAdvanced)}
|
|
>
|
|
Fler mallar ({allAdvanced.length})
|
|
{showAdvanced ? (
|
|
<ChevronUp className="h-3.5 w-3.5" />
|
|
) : (
|
|
<ChevronDown className="h-3.5 w-3.5" />
|
|
)}
|
|
</Button>
|
|
{showAdvanced && (
|
|
<div className="space-y-3 mt-2">
|
|
{GROUP_ORDER.filter((g) => advancedGrouped.has(g)).map((group) => (
|
|
<div key={group}>
|
|
<p className="text-[11px] font-medium text-muted-foreground/70 uppercase tracking-wider mb-1">
|
|
{GROUP_LABELS[group]}
|
|
</p>
|
|
<div className="space-y-1.5">
|
|
{advancedGrouped.get(group)!.map((t) => (
|
|
<TemplateCard
|
|
key={t.id}
|
|
template={t}
|
|
selected={selectedTemplateId === t.id}
|
|
onClick={() => handleSelect(t)}
|
|
compact
|
|
/>
|
|
))}
|
|
</div>
|
|
</div>
|
|
))}
|
|
</div>
|
|
)}
|
|
</div>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|