b996da60ee
* feat(parties): Kontakter register, suggestion queue, dossier and merge Phase 1's two surfaces on top of the parties substrate: - /parties page: one list with the five-way switch (Alla, Kunder, Leverantörer, Förslag, Bara i bokföringen), search, a 12-month/all period picker, and at most one attention line. Confirmed rows show roles as muted text, rhythm, underlag, dominant account and money. Observed rows are computed and never stored; a generic band keeps unattributed spend visible. - Suggestion queue: a reason per row, hard-key rows pre-ticked, bulk confirm behind one dialog, dismiss on hover, undo on the toast. - Dossier slide-over: Pengar, Bokföring, Vad Accounted vet (facts and identities with source and count), Underlag och verifikat, Historik. - Merge dialog with a visible, swappable survivor and undo. - API: GET /api/parties, GET /api/parties/[id], POST suggest, decide, decide/undo, merge, merge/undo (withRouteContext, Zod, 15 tests). - Migration 20260903090000: decide_parties snapshots the reason it clears; undo_party_decisions reverses confirm/dismiss within 30 days; decision kind 'undo'. - The pipeline runs after SIE import and provider migration (non-blocking) so a migrant's register is full on arrival. - Nav entry under Register; sv/en strings. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(parties): pass explicit interpolation values to next-intl next build's type check rejects a typed interface where the translator wants an index-signature record. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(parties): retry label on the load-failed state Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(parties): hard keys for companies without org number, readable names, look-alikes at read time - get_ledger_key_evidence dropped every document for a company whose own org number is NULL (the self check compared against NULL). Replaced in 20260903100000 with a coalesced comparison; pg test covers it. - Display names come from the printed name on documents, otherwise from the voucher text with the AP/AR prefix and supplier number removed. - Look-alike parties (same core, or one core extending the other by whole words: Fortnox / Fortnox Finans) are detected when the register is read, never stored, and feed the Dubblett? chip and the merge dialog. - Queue shows Intäkt beside Kostnad; dossier hides zero money rows and formats bankgiro/plusgiro; merge dialog cancels with Avbryt; no synchronous setState inside effects. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * feat(parties): link every new supplier and customer to a party on write The backfill covered the rows that existed on 2026-09-02; 108 rows created since had no party and never reached the register. A BEFORE INSERT/UPDATE trigger on customers and suppliers now calls ensure_party on every write path at once: find-or-create by org number inside the company, never by name; a private customer gets a kind=person party without any number; a nameless row stays unlinked; a foreign party id is refused with the same error as the composite foreign key; a link to a merged party follows the chain to the survivor; the clear that ON DELETE SET NULL performs is kept. ensure_party lets the trigger act for the row's owner (pg_trigger_depth() > 0); the RPC path is unchanged. The migration also links the rows created since the backfill. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(parties): dossier hides dismissed parties and follows merges to the survivor The register hid archived parties while the dossier still served them by id, and a merged party's dossier pointed at a dead row. Superagent P2 on #2206; three unit tests. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * chore(parties): move the role-link migration past main's 20260903110000 Two files with one version would collide in schema_migrations. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * feat(parties): confirm suggestions into Leverantörer and Kunder, no third noun Founder decision after the walkthrough: users know two words. The page becomes the queue 'Förslag från bokföringen' with 'Bara i bokföringen' beside it; the Kontakter nav entry and the Alla/Kunder/Leverantörer views go. Each suggestion shows what it becomes (Blir), read from the ledger side and changeable per row; confirming calls promote_parties, which creates the supplier and/or customer row from the party's facts, never a duplicate, and is undoable for 30 days through undo_party_promotions (the created rows are archived, the party returns to the queue). Leverantörer and Kunder carry the one attention line that leads here. The dossier offers Lägg upp som leverantör / som kund. Migration 20260903130000, 5 pg tests, route and unit tests updated. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * fix(parties): write bankgiro and plusgiro the way the supplier form does Identities are stored as digits; suppliers carry 5317-0900. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * chore(parties): move the four queue migrations past main's 20260903170000 Main merged 20260903120000_skattekonto_transactions_realtime_publication with the same version as the role-link trigger; the preview database refused the duplicate key. All four now sit after main's newest so the set applies in one ordered run on prod. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
160 lines
5.7 KiB
TypeScript
160 lines
5.7 KiB
TypeScript
'use client'
|
|
|
|
import { useEffect, useMemo, useState } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { Button } from '@/components/ui/button'
|
|
import { Checkbox } from '@/components/ui/checkbox'
|
|
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
|
|
import { Input } from '@/components/ui/input'
|
|
import type { Register, RegisterRow } from '@/lib/parties/register'
|
|
import { formatOrgNumber } from '@/lib/utils'
|
|
|
|
export interface MergeCandidate {
|
|
id: string
|
|
displayName: string
|
|
orgNumber: string | null
|
|
status: string
|
|
}
|
|
|
|
/**
|
|
* Merge with a visible survivor that can be swapped. Everything merged keeps
|
|
* its rows; the survivor gains the aliases. Undo lives on the toast.
|
|
*/
|
|
export function MergeDialog({
|
|
open,
|
|
onOpenChange,
|
|
subject,
|
|
suggested,
|
|
busy,
|
|
onMerge,
|
|
}: {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
subject: MergeCandidate
|
|
suggested: MergeCandidate[]
|
|
busy: boolean
|
|
onMerge: (survivorId: string, mergedIds: string[]) => Promise<void>
|
|
}) {
|
|
const t = useTranslations('parties')
|
|
const tCommon = useTranslations('common')
|
|
const [picked, setPicked] = useState<Set<string>>(new Set(suggested.map((s) => s.id)))
|
|
const [survivor, setSurvivor] = useState<string>(subject.id)
|
|
const [query, setQuery] = useState('')
|
|
const [found, setFound] = useState<MergeCandidate[]>([])
|
|
|
|
useEffect(() => {
|
|
const q = query.trim()
|
|
if (q.length < 2) return
|
|
const ctrl = new AbortController()
|
|
const timer = setTimeout(async () => {
|
|
try {
|
|
const res = await fetch(`/api/parties?view=all&q=${encodeURIComponent(q)}`, { signal: ctrl.signal })
|
|
if (!res.ok) return
|
|
const json = (await res.json()) as { data: Register }
|
|
setFound(
|
|
json.data.rows
|
|
.filter((r: RegisterRow) => r.id !== subject.id)
|
|
.slice(0, 8)
|
|
.map((r: RegisterRow) => ({ id: r.id, displayName: r.displayName, orgNumber: r.orgNumber, status: r.status })),
|
|
)
|
|
} catch {
|
|
// aborted or offline: the list simply does not update
|
|
}
|
|
}, 250)
|
|
return () => {
|
|
clearTimeout(timer)
|
|
ctrl.abort()
|
|
}
|
|
}, [query, subject.id])
|
|
|
|
const candidates = useMemo(() => {
|
|
const seen = new Set<string>()
|
|
const out: MergeCandidate[] = []
|
|
const searched = query.trim().length >= 2 ? found : []
|
|
for (const c of [...suggested, ...searched]) {
|
|
if (seen.has(c.id) || c.id === subject.id) continue
|
|
seen.add(c.id)
|
|
out.push(c)
|
|
}
|
|
return out
|
|
}, [suggested, found, query, subject.id])
|
|
|
|
const members = [subject, ...candidates.filter((c) => picked.has(c.id))]
|
|
const mergedIds = members.filter((m) => m.id !== survivor).map((m) => m.id)
|
|
|
|
function toggle(id: string) {
|
|
setPicked((prev) => {
|
|
const next = new Set(prev)
|
|
if (next.has(id)) {
|
|
next.delete(id)
|
|
if (survivor === id) setSurvivor(subject.id)
|
|
} else next.add(id)
|
|
return next
|
|
})
|
|
}
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange}>
|
|
<DialogContent className="sm:max-w-lg">
|
|
<DialogHeader>
|
|
<DialogTitle>{t('merge_dialog_title')}</DialogTitle>
|
|
<DialogDescription>{t('merge_body')}</DialogDescription>
|
|
</DialogHeader>
|
|
<div className="space-y-4">
|
|
<ul className="divide-y divide-border rounded-lg border border-border">
|
|
{[subject, ...candidates].map((c) => {
|
|
const isSubject = c.id === subject.id
|
|
const included = isSubject || picked.has(c.id)
|
|
return (
|
|
<li key={c.id} className="flex items-center gap-3 px-4 py-3 text-[13px]">
|
|
<Checkbox
|
|
checked={included}
|
|
disabled={isSubject}
|
|
onCheckedChange={() => toggle(c.id)}
|
|
aria-label={c.displayName}
|
|
/>
|
|
<div className="min-w-0 flex-1">
|
|
<div className="truncate font-medium">{c.displayName}</div>
|
|
<div className="text-xs text-muted-foreground tabular-nums">
|
|
{c.orgNumber ? formatOrgNumber(c.orgNumber) : ''}
|
|
{c.status === 'suggested' ? (c.orgNumber ? ' · ' : '') + t('view_suggested') : ''}
|
|
</div>
|
|
</div>
|
|
<label className="flex items-center gap-2 text-xs text-muted-foreground">
|
|
<input
|
|
type="radio"
|
|
name="party-survivor"
|
|
className="h-4 w-4 accent-foreground"
|
|
checked={survivor === c.id}
|
|
disabled={!included}
|
|
onChange={() => setSurvivor(c.id)}
|
|
/>
|
|
{survivor === c.id ? t('merge_kept') : t('merge_keep')}
|
|
</label>
|
|
</li>
|
|
)
|
|
})}
|
|
</ul>
|
|
<Input
|
|
value={query}
|
|
onChange={(e) => setQuery(e.target.value)}
|
|
placeholder={t('merge_search_placeholder')}
|
|
aria-label={t('merge_search_placeholder')}
|
|
/>
|
|
{candidates.length === 0 && query.trim().length >= 2 ? (
|
|
<p className="text-xs text-muted-foreground">{t('merge_none')}</p>
|
|
) : null}
|
|
</div>
|
|
<DialogFooter>
|
|
<Button type="button" variant="outline" onClick={() => onOpenChange(false)} disabled={busy}>
|
|
{tCommon('cancel')}
|
|
</Button>
|
|
<Button type="button" onClick={() => void onMerge(survivor, mergedIds)} disabled={busy || mergedIds.length === 0}>
|
|
{t('merge_confirm', { count: mergedIds.length })}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|