ff01640f60
* feat(reports,settings): report library + focused report routes, settings modal Reports - Replace the monolithic /reports tab-switcher with a calm, grouped report library landing (ReportLibrary + RecentReportsShelf) driven by a new lib/reports/catalog.ts. - Each report opens a focused /reports/[slug] route (FocusedReport) with a shared fiscal-year selector, optional date-range, and URL-based account drill-down into the general ledger. - Extract every report view into components/reports/views, add a reusable ReportExportMenu, and remove the old ReportsNav. Settings - Add an intercepting @settingsModal parallel route so in-app navigation to /settings opens as a modal over the current page; hard loads still resolve to the full page. - Share one SettingsShell (rail + content) between page and modal, extract each section into components/settings/sections/*Content, add a settings hotkey and command-palette entry, and remove the old SettingsSidebar. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(reports,settings): remove dead salary-journal entry, fix border token Addresses PR review feedback (#629): - Remove the unreachable `salary-journal` report from the catalog. It had needsEmployees + no route + no FocusedView handler and `hasEmployees` was never plumbed through, so it never appeared in the library and a direct /reports/salary-journal URL rendered a blank frame. The report was never on the old page and has no view component; the API + generator stay in place for a proper follow-up. Drops its two now-unused i18n keys. - Replace opacity-suffixed `border-border/8` section dividers with full-opacity `border-border` across the extracted settings section components, per the design system (no opacity-suffixed border tokens on surfaces). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * ci: re-trigger checks (pg-real hit a Docker Hub registry timeout) --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
194 lines
7.0 KiB
TypeScript
194 lines
7.0 KiB
TypeScript
'use client'
|
|
|
|
import { Suspense, useState } from 'react'
|
|
import Link from 'next/link'
|
|
import { useRouter, useSearchParams } from 'next/navigation'
|
|
import { useTranslations } from 'next-intl'
|
|
import { ChevronLeft } from 'lucide-react'
|
|
import { PageHeader } from '@/components/ui/page-header'
|
|
import { EmptyState } from '@/components/ui/empty-state'
|
|
import { Card, CardContent } from '@/components/ui/card'
|
|
import { Skeleton } from '@/components/ui/skeleton'
|
|
import { useCompany } from '@/contexts/CompanyContext'
|
|
import { FiscalYearSelector } from '@/components/common/FiscalYearSelector'
|
|
import { ReportDateRange, type DateRangeValue } from '@/components/common/ReportDateRange'
|
|
import { DATE_RANGE_SLUGS, getReport } from '@/lib/reports/catalog'
|
|
import { NEDeclarationView } from '@/components/reports/NEDeclarationView'
|
|
import { PeriodiskSammanstallningView } from '@/components/reports/PeriodiskSammanstallningView'
|
|
import { INK2DeclarationView } from '@/components/reports/INK2DeclarationView'
|
|
import { BankReconciliationView } from '@/components/reports/BankReconciliationView'
|
|
import {
|
|
TrialBalanceView,
|
|
IncomeStatementView,
|
|
BalanceSheetView,
|
|
ResultatrapportView,
|
|
BalansrapportView,
|
|
VatDeclarationView,
|
|
SupplierLedgerView,
|
|
GeneralLedgerView,
|
|
JournalRegisterView,
|
|
ARLedgerView,
|
|
} from '@/components/reports/views'
|
|
|
|
/**
|
|
* The focused single-report experience at /reports/[slug]. Carries one report:
|
|
* a back link to the library, the shared fiscal-year selector (restored from
|
|
* localStorage so it matches the year picked on the landing), the report's
|
|
* optional date-range control, and the report body. Drilling into an account
|
|
* navigates to /reports/huvudbok?account=… — drill state lives in the URL.
|
|
*/
|
|
function FocusedReportInner({ slug }: { slug: string }) {
|
|
const router = useRouter()
|
|
const searchParams = useSearchParams()
|
|
const { company } = useCompany()
|
|
const t = useTranslations('reports')
|
|
|
|
const [selectedPeriod, setSelectedPeriod] = useState('')
|
|
const [selectedPeriodBounds, setSelectedPeriodBounds] = useState<{ start: string; end: string } | null>(null)
|
|
const [dateRange, setDateRange] = useState<DateRangeValue>({})
|
|
const [isReady, setIsReady] = useState(false)
|
|
|
|
const report = getReport(slug)
|
|
// Calendar (VAT family) and param-less reports don't need a fiscal period.
|
|
const isPeriodless = report?.params === 'calendar' || report?.params === 'none'
|
|
const reportName = report ? t(report.labelKey) : slug
|
|
const accountFilter = searchParams.get('account')
|
|
|
|
const isEnskildFirma = company?.entity_type === 'enskild_firma'
|
|
const isAktiebolag = company?.entity_type === 'aktiebolag'
|
|
|
|
// Drilling from a report into the general ledger is a route change, so the
|
|
// account lands in the URL and the browser back button returns to the report.
|
|
const navigateToAccount = (accountNumber: string) => {
|
|
router.push(`/reports/huvudbok?account=${encodeURIComponent(accountNumber)}`)
|
|
}
|
|
|
|
return (
|
|
<div className="space-y-8">
|
|
<Link
|
|
href="/reports"
|
|
className="inline-flex items-center gap-1 text-sm text-muted-foreground hover:text-foreground transition-colors"
|
|
>
|
|
<ChevronLeft className="h-4 w-4" />
|
|
{t('back_to_library')}
|
|
</Link>
|
|
|
|
<PageHeader
|
|
title={reportName}
|
|
action={
|
|
<FiscalYearSelector
|
|
value={selectedPeriod || null}
|
|
onChange={(id, period) => {
|
|
setSelectedPeriod(id || '')
|
|
setSelectedPeriodBounds(
|
|
period ? { start: period.period_start, end: period.period_end } : null,
|
|
)
|
|
setDateRange({})
|
|
}}
|
|
includeAllOption={false}
|
|
hideFuturePeriods
|
|
onReady={() => setIsReady(true)}
|
|
/>
|
|
}
|
|
/>
|
|
|
|
{DATE_RANGE_SLUGS.has(slug) && selectedPeriodBounds && (
|
|
<ReportDateRange
|
|
periodStart={selectedPeriodBounds.start}
|
|
periodEnd={selectedPeriodBounds.end}
|
|
value={dateRange}
|
|
onChange={setDateRange}
|
|
/>
|
|
)}
|
|
|
|
{!isReady && !isPeriodless ? (
|
|
<Card>
|
|
<CardContent className="p-6 space-y-4">
|
|
<Skeleton className="h-5 w-32" />
|
|
<Skeleton className="h-64" />
|
|
</CardContent>
|
|
</Card>
|
|
) : isPeriodless || selectedPeriod ? (
|
|
<FocusedView
|
|
slug={slug}
|
|
periodId={selectedPeriod}
|
|
periodBounds={selectedPeriodBounds}
|
|
dateRange={dateRange}
|
|
accountFilter={accountFilter}
|
|
isEnskildFirma={isEnskildFirma}
|
|
isAktiebolag={isAktiebolag}
|
|
onNavigateToAccount={navigateToAccount}
|
|
/>
|
|
) : (
|
|
<EmptyState
|
|
title="Inget räkenskapsår valt"
|
|
description="Skapa ett räkenskapsår för att kunna se rapporter."
|
|
actionLabel="Gå till inställningar"
|
|
actionHref="/settings"
|
|
/>
|
|
)}
|
|
</div>
|
|
)
|
|
}
|
|
|
|
function FocusedView({
|
|
slug,
|
|
periodId,
|
|
periodBounds,
|
|
dateRange,
|
|
accountFilter,
|
|
isEnskildFirma,
|
|
isAktiebolag,
|
|
onNavigateToAccount,
|
|
}: {
|
|
slug: string
|
|
periodId: string
|
|
periodBounds: { start: string; end: string } | null
|
|
dateRange: DateRangeValue
|
|
accountFilter: string | null
|
|
isEnskildFirma: boolean
|
|
isAktiebolag: boolean
|
|
onNavigateToAccount: (account: string) => void
|
|
}) {
|
|
switch (slug) {
|
|
case 'resultatrapport':
|
|
return <ResultatrapportView periodId={periodId} dateRange={dateRange} onNavigateToAccount={onNavigateToAccount} />
|
|
case 'balansrapport':
|
|
return <BalansrapportView periodId={periodId} dateRange={dateRange} onNavigateToAccount={onNavigateToAccount} />
|
|
case 'trial-balance':
|
|
return <TrialBalanceView periodId={periodId} onNavigateToAccount={onNavigateToAccount} />
|
|
case 'income-statement':
|
|
return <IncomeStatementView periodId={periodId} dateRange={dateRange} onNavigateToAccount={onNavigateToAccount} />
|
|
case 'balance-sheet':
|
|
return <BalanceSheetView periodId={periodId} dateRange={dateRange} onNavigateToAccount={onNavigateToAccount} />
|
|
case 'vat-declaration':
|
|
return <VatDeclarationView fiscalPeriodId={periodId} fiscalPeriodBounds={periodBounds} />
|
|
case 'periodisk-sammanstallning':
|
|
return <PeriodiskSammanstallningView />
|
|
case 'ne-declaration':
|
|
return isEnskildFirma ? <NEDeclarationView periodId={periodId} /> : null
|
|
case 'ink2-declaration':
|
|
return isAktiebolag ? <INK2DeclarationView periodId={periodId} /> : null
|
|
case 'huvudbok':
|
|
return <GeneralLedgerView periodId={periodId} initialAccountFilter={accountFilter} />
|
|
case 'grundbok':
|
|
return <JournalRegisterView periodId={periodId} />
|
|
case 'kundreskontra':
|
|
return <ARLedgerView periodId={periodId} />
|
|
case 'supplier-ledger':
|
|
return <SupplierLedgerView periodId={periodId} />
|
|
case 'bank-reconciliation':
|
|
return <BankReconciliationView />
|
|
default:
|
|
return null
|
|
}
|
|
}
|
|
|
|
export function FocusedReport({ slug }: { slug: string }) {
|
|
return (
|
|
<Suspense fallback={<div className="space-y-8" />}>
|
|
<FocusedReportInner slug={slug} />
|
|
</Suspense>
|
|
)
|
|
}
|