* feat(bookkeeping): dashboard deep link filters verifikat utan underlag server-side The dashboard "Verifikat utan underlag" card (and the push-notification link) pointed at /bookkeeping?missingUnderlag=true, but nothing read the param: the user landed on the plain unfiltered ledger. The existing "Visa saknade underlag" toggle also only filtered the already-fetched page, so it could not represent the badge count across pages. - lib/bookkeeping/missing-underlag.ts: shared resolver of "posted verifikat lacking underlag" (document-requiring source types, no current-version document, no anchored supplier-invoice reference per BFL 5 kap 7 §, no exemption), extracted from the bulk "Inget underlag krävs" route so list, bulk remedy and dashboard badge share one predicate. - GET /api/bookkeeping/journal-entries?missing_underlag=true: resolves the full missing set server-side, applies the active sort stack, pages it, and returns the full-set count, fetching page rows in id chunks so the "Alla" page size cannot blow the PostgREST URL limit. - JournalEntryList: the toggle is now server-backed (refetch on change, honest count in the dialog badge); client-side re-filtering against late-arriving attachment counts removed. Deep-link arrival turns the filter on and scopes the visit to all fiscal years in memory only, matching the all-years badge count without touching the saved preference. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(bookkeeping): harden the saknade-underlag filter after skeptic review Three skeptic subagents refuted the first cut; this fixes every confirmed finding in one pass: - FyPicker: new suppressAutoRestore prop. The deep-link visit opens as "Alla räkenskapsår" in memory, and FyPicker's on-load restore of the persisted year (value === null) snapped the scope back right after load, desyncing the list from the all-years badge that launched it. Manual picks still persist as usual. - Voucher-label search: the resolver now carries the same parseVoucher OR-branch as the direct list path, so searching "A209" with the filter on finds verifikat A209 instead of silently returning 0 rows. - Staleness while the filter is on: batch exempt, the single-row "Inget underlag krävs" toggle, and a row gaining its first underlag now refetch in place so fixed rows leave the filtered list and the count stays honest (the pre-server-filter behavior). The attachment-driven refetch is guarded per entry id against predicate-disagreement loops. - Drafts view: the filter switch is disabled there; the predicate is posted-only and the badge would mislabel the draft count. - Perf: the bulk-exempt route resolves ids only, skipping the per-row total_amount computed column on its full post-import candidate scan. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(bookkeeping): keep the underlag resolver statically checkable The skeptic-fix commit tripped the phantom-column scanner ceiling (tests/schema/no-phantom-columns.test.ts, 382 > 380): a computed select() string and a runtime-built .or() are expressions the scanner cannot resolve against the schema. Restructured instead of raising the ceiling: the idOnly/full column choice is two literal select() calls behind a lazy branch, and a voucher-label search fans out to two statically-checkable candidate queries (description ilike, series+number eq) unioned by id, same semantics as before. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
228 lines
9.1 KiB
TypeScript
228 lines
9.1 KiB
TypeScript
'use client'
|
|
|
|
import { useEffect, useState } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { useCompany } from '@/contexts/CompanyContext'
|
|
import { ContextPicker } from '@/components/common/ContextPicker'
|
|
import {
|
|
STORAGE_KEY_PREFIX,
|
|
ALL_YEARS_VALUE,
|
|
} from '@/components/common/FiscalYearSelector'
|
|
import type { FiscalPeriod } from '@/types'
|
|
|
|
interface FyPickerProps {
|
|
/** Current selection. `null` means "all years": no filter applied. */
|
|
value: string | null
|
|
/**
|
|
* Called with the selected period id (or null for "all years") and the
|
|
* matching FiscalPeriod so callers avoid an extra fetch.
|
|
*/
|
|
onChange: (periodId: string | null, period?: FiscalPeriod | null) => void
|
|
/** Include an "Alla räkenskapsår" option that clears the filter. */
|
|
includeAllOption?: boolean
|
|
/** Only show periods that have started (Reports-style filter). */
|
|
hideFuturePeriods?: boolean
|
|
/**
|
|
* Auto-select the most recently ENDED period on load instead of restoring
|
|
* the shared per-company scope or falling back to the newest started one.
|
|
* For filing surfaces (helårsmoms): only an ended räkenskapsår can be
|
|
* declared, so the newest started period is the one default that is always
|
|
* wrong there. Manual picks still work and are still persisted.
|
|
*/
|
|
preferLatestEnded?: boolean
|
|
/**
|
|
* Never auto-select on load, from ANY source: not the newest-period
|
|
* fallback, and not a selection persisted by an earlier session. The picker
|
|
* stays empty until the user chooses, every session.
|
|
*
|
|
* The default behaviour (restore or pick the newest) is right for a filter,
|
|
* where a sensible default beats an empty page. It is wrong where the year
|
|
* is an ASSERTION the user is making rather than a view they are narrowing:
|
|
* the underlag import resolves voucher references inside the chosen year and
|
|
* writes irreversible links. A pre-filled newest year would let a 2023 batch
|
|
* land in 2026, and a restored LAST-USED year is aimed even worse: in a
|
|
* multi-year migration the user is by definition moving to a year other than
|
|
* last time. Within one sitting the caller carries the choice in its own
|
|
* state (the wizard's reset() keeps it), which covers multi-batch runs
|
|
* without any cross-session hazard.
|
|
*/
|
|
requireExplicitChoice?: boolean
|
|
/**
|
|
* Skip ONLY the on-load restore of a persisted selection (and its
|
|
* newest-period fallback) while keeping manual picks persisted as usual.
|
|
* For deep-link visits that arrive with a deliberate transient scope (e.g.
|
|
* /bookkeeping?missingUnderlag=true opens as "Alla räkenskapsår" to match
|
|
* the all-years dashboard count): without this, the restore fires on
|
|
* `value === null` and snaps the scope back to the stored year right after
|
|
* load. Unlike requireExplicitChoice this does not change labels or
|
|
* persistence semantics.
|
|
*/
|
|
suppressAutoRestore?: boolean
|
|
/** Fires once after the initial period load completes. */
|
|
onReady?: () => void
|
|
/** Server-loaded periods for the first render, scoped to initialCompanyId. */
|
|
initialPeriods?: FiscalPeriod[]
|
|
initialCompanyId?: string | null
|
|
/**
|
|
* localStorage prefix for the persisted selection (companyId is appended).
|
|
* Defaults to the report-wide shared scope; pass a page-specific prefix
|
|
* when the page's scope must not follow (or steer) the shared one, e.g.
|
|
* the transactions inbox, where a narrowed scope hides pending rows.
|
|
*/
|
|
storageKeyPrefix?: string
|
|
className?: string
|
|
}
|
|
|
|
function preparePeriods(periods: FiscalPeriod[], hideFuturePeriods: boolean): FiscalPeriod[] {
|
|
const today = new Date().toISOString().split('T')[0]
|
|
return periods
|
|
.filter((p) => !hideFuturePeriods || p.period_start <= today)
|
|
.sort((a, b) => b.period_start.localeCompare(a.period_start))
|
|
}
|
|
|
|
/**
|
|
* Fiscal-year context picker (UI-migration plan PR 3): the chip-dropdown
|
|
* "Räkenskapsår 2026" with a check on the active choice and closed/locked
|
|
* years annotated. Same controlled API and per-company localStorage
|
|
* persistence as FiscalYearSelector, which it replaces page by page from
|
|
* PR 4 on.
|
|
*/
|
|
export function FyPicker({
|
|
value,
|
|
onChange,
|
|
includeAllOption = true,
|
|
hideFuturePeriods = false,
|
|
preferLatestEnded = false,
|
|
requireExplicitChoice = false,
|
|
suppressAutoRestore = false,
|
|
onReady,
|
|
initialPeriods,
|
|
initialCompanyId,
|
|
storageKeyPrefix = STORAGE_KEY_PREFIX,
|
|
className,
|
|
}: FyPickerProps) {
|
|
const { company } = useCompany()
|
|
const t = useTranslations('fiscal_year')
|
|
const canUseInitial = initialCompanyId === company?.id && initialPeriods !== undefined
|
|
const [periods, setPeriods] = useState<FiscalPeriod[]>(() =>
|
|
canUseInitial ? preparePeriods(initialPeriods, hideFuturePeriods) : [],
|
|
)
|
|
const [loaded, setLoaded] = useState(canUseInitial)
|
|
|
|
useEffect(() => {
|
|
if (!company?.id) {
|
|
onReady?.()
|
|
return
|
|
}
|
|
let cancelled = false
|
|
;(async () => {
|
|
let fetched: FiscalPeriod[]
|
|
if (initialCompanyId === company.id && initialPeriods !== undefined) {
|
|
fetched = preparePeriods(initialPeriods, hideFuturePeriods)
|
|
} else {
|
|
const res = await fetch('/api/bookkeeping/fiscal-periods')
|
|
if (!res.ok) {
|
|
if (!cancelled) {
|
|
setLoaded(true)
|
|
onReady?.()
|
|
}
|
|
return
|
|
}
|
|
const { data } = await res.json()
|
|
fetched = preparePeriods(data || [], hideFuturePeriods)
|
|
}
|
|
if (cancelled) return
|
|
|
|
setPeriods(fetched)
|
|
setLoaded(true)
|
|
|
|
// Restore last selection (same key as FiscalYearSelector so pages keep
|
|
// their scope when the picker swaps in).
|
|
//
|
|
// requireExplicitChoice gates this WHOLE block, not individual branches:
|
|
// every path in here ends in an unprompted onChange (restore, the
|
|
// ALL_YEARS-stored fallback, newest-period, preferLatestEnded), and a
|
|
// per-branch gate already missed one of them once. Nothing auto-fires;
|
|
// the picker stays empty until a human picks.
|
|
if (value === null && !requireExplicitChoice && !suppressAutoRestore && typeof window !== 'undefined') {
|
|
if (preferLatestEnded) {
|
|
// Filing surfaces: ignore the shared scope memory and open on the
|
|
// most recently ended period (fetched is sorted newest-first).
|
|
const today = new Date().toISOString().split('T')[0]
|
|
const pick = fetched.find((p) => p.period_end < today) ?? fetched[0]
|
|
if (pick) onChange(pick.id, pick)
|
|
} else {
|
|
const stored = window.localStorage.getItem(storageKeyPrefix + company.id)
|
|
if (stored === ALL_YEARS_VALUE) {
|
|
if (includeAllOption) onChange(null, null)
|
|
else if (fetched.length > 0) onChange(fetched[0].id, fetched[0])
|
|
} else if (stored && fetched.some((p) => p.id === stored)) {
|
|
onChange(stored, fetched.find((p) => p.id === stored) ?? null)
|
|
} else if (!includeAllOption && fetched.length > 0) {
|
|
onChange(fetched[0].id, fetched[0])
|
|
}
|
|
}
|
|
}
|
|
|
|
onReady?.()
|
|
})()
|
|
return () => {
|
|
cancelled = true
|
|
}
|
|
// onReady is a lifecycle callback: fire once per load, not on parent
|
|
// re-renders that re-create it.
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [company?.id, hideFuturePeriods, includeAllOption, preferLatestEnded, requireExplicitChoice, suppressAutoRestore, initialCompanyId, initialPeriods, storageKeyPrefix])
|
|
|
|
const handleChange = (id: string) => {
|
|
const nextId = id === ALL_YEARS_VALUE ? null : id
|
|
// A per-batch assertion is never restored, so persisting it would be a
|
|
// write nothing reads. Worse than useless: this write happens BEFORE
|
|
// onChange, so a pick the caller rejects (e.g. mid-preview) would still
|
|
// be recorded as if it had taken effect.
|
|
if (!requireExplicitChoice && company?.id && typeof window !== 'undefined') {
|
|
window.localStorage.setItem(storageKeyPrefix + company.id, nextId ?? ALL_YEARS_VALUE)
|
|
}
|
|
onChange(nextId, nextId ? periods.find((p) => p.id === nextId) ?? null : null)
|
|
}
|
|
|
|
const annotationFor = (p: FiscalPeriod) =>
|
|
p.locked_at ? t('badge_locked').toLowerCase() : p.is_closed ? t('badge_closed').toLowerCase() : undefined
|
|
|
|
const selected = value ? periods.find((p) => p.id === value) : null
|
|
// Real period names often already read "Räkenskapsår 2026"; only prefix
|
|
// the label when the name is a bare year/name so the chip never doubles up.
|
|
const chipLabel = (p: FiscalPeriod) =>
|
|
p.name.toLowerCase().includes(t('label').toLowerCase())
|
|
? p.name
|
|
: `${t('label')} ${p.name}`
|
|
const triggerLabel = selected
|
|
? chipLabel(selected)
|
|
: includeAllOption
|
|
? t('all_years')
|
|
: loaded
|
|
? t('placeholder')
|
|
: t('loading')
|
|
|
|
const items = [
|
|
...(includeAllOption ? [{ id: ALL_YEARS_VALUE, label: t('all_years') }] : []),
|
|
...periods.map((p) => ({
|
|
id: p.id,
|
|
label: p.name,
|
|
annotation: annotationFor(p),
|
|
})),
|
|
]
|
|
|
|
return (
|
|
<ContextPicker
|
|
items={items}
|
|
value={value ?? (includeAllOption ? ALL_YEARS_VALUE : null)}
|
|
onChange={handleChange}
|
|
triggerLabel={triggerLabel}
|
|
disabled={!loaded || periods.length === 0}
|
|
ariaLabel={t('label')}
|
|
className={className}
|
|
/>
|
|
)
|
|
}
|