* refactor(invoices): extract editor payload builders with parity tests Extract the three near-identical inline payload builders in InvoiceEditor.tsx (handleConfirm, saveDraftData, saveEdit) and the self-billed body mapper into pure functions in lib/invoices/editor-payload.ts. Zero behavioral change: the new lib module carries a 300-case parity suite asserting JSON byte equality against verbatim copies of the legacy inline recipes across the full mode x deduction x dimensions x ore-rounding matrix. This is the byte-compatibility ratchet under the upcoming editor re-layout: the repo renders no components in tests, so the wire bodies are what CI can pin. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): rebuild the invoice editor as the snabbflöde single column Reshape InvoiceEditor to the approved prototype: one 640px column with uppercase section labels and honest state marks (RequiredMark asterisks, sage check on a picked customer, muted row counts), a dense in-table rows surface with a unified last-row entry (autocomplete over the artikelregister, italic ghost cells, Enter commits free text and lands in the price cell, ArrowDown+Enter commits an article through the same applyArticle side effects), hover-revealed 24px row controls with 40px coarse-pointer targets and per-row aria-labels, a Förval chip line whose collapsed settings re-surface as chips whenever a value deviates from its default (critical in edit/copy so PATCH never round-trips invisible values), a single ochre next-step line (aria-live polite) that doubles as the invalid-submit focus router, and a sticky bottom action bar with the live total: position sticky in both hosts, never fixed, since DialogContent's transform re-anchors fixed children in bare mode. Behavioral deltas, all pre-decided: the primary action is never disabled pre-click for writable users (viewers keep the lock+tooltip treatment); client-side validation failures route focus instead of toasting; genuine field errors stay terracotta and field-adjacent while the two ochre disclosures (taxed-where-performed, labor-only) demote to muted text; committed free-text rows expose a quiet Spara-som-artikel link; the review dialog lists the applied förval (currency, öre rounding, payment-link state); a freshly committed row gets a brief background settle that collapses under prefers-reduced-motion. ArticleCombobox gains the missing combobox ARIA (listbox/option roles, aria-controls, aria-activedescendant only after explicit arrowing). New pure module invoice-editor-flow.ts pins the next-step priority order, the Förval chip derivation and the suggestion filter with unit tests. All payload builders, submit targets and the VAT baseline refs are untouched. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): editor review nits: orphaned keys, housing gate, listbox ARIA Three review findings on the snabbflode editor: - Delete 13 orphaned invoice_editor keys from both message files (subtitle_*, add_row, remove_row, remove_row_aria, details_card_title, save_as_draft_short, validation_toast_*, delivery_date_placeholder); each verified unused on the branch, sv/en parity kept. - Gate the housing next-step on a claimed deduction amount so it matches the ROT/RUT claim card's mount condition: a ROT-flagged line with a zero amount mounts no card, and the ochre link would try to focus an unmounted field. Extracted as deriveRequiresHousing in the flow module with a test proven to fail on the old gate. - Move the entry-row popover hint out of the role=listbox element (listbox children must be options) into a sibling inside the absolute wrapper, referenced via aria-describedby on the combobox input. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(invoices): drop the in-editor faktura/sjalvfaktura tabs The Ny faktura split button already chooses the mode (?self=1); a second switcher inside the editor was double steering. The mode is now fixed for the editor's lifetime and the heading (Registrera sjalvfaktura) carries the distinction. Orphaned tab keys removed from both message files. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): wrap sticky-bar actions so they fit small viewports Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): stop dialog grid item overflowing small viewports min-w-0 on the editor root: DialogContent is display:grid, so the row grid's min-w otherwise forces the column past narrow screens. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * fix(invoices): lift assistant FAB above the standalone editor's action bar The rebuilt editor introduces the first page-level sticky bottom bar; the assistant FAB (fixed, z-30) covered its Spara/Granska buttons on the /invoices/[id]/edit page. The editor now sets body[data-page-bottom-bar] in non-bare mode and AgentTrigger lifts to bottom-20 when it is present. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
182 lines
6.8 KiB
TypeScript
182 lines
6.8 KiB
TypeScript
'use client'
|
|
|
|
import dynamic from 'next/dynamic'
|
|
import { useEffect, useMemo, useState } from 'react'
|
|
import { useTranslations } from 'next-intl'
|
|
import { Dialog, DialogContent, DialogTitle, DialogVeil } from '@/components/ui/dialog'
|
|
import { Skeleton } from '@/components/ui/skeleton'
|
|
import { Button } from '@/components/ui/button'
|
|
import { createClient } from '@/lib/supabase/client'
|
|
import { useCompany } from '@/contexts/CompanyContext'
|
|
import { fetchAllRows } from '@/lib/supabase/fetch-all'
|
|
import {
|
|
buildInvoiceCopyInitial,
|
|
canCopyInvoice,
|
|
type InvoiceCopyInitial,
|
|
type InvoiceCopySource,
|
|
} from '@/lib/invoices/copy-invoice'
|
|
|
|
// Deferred: the editor (and its framer-motion dependency) is a large chunk
|
|
// that would otherwise ship with the invoice LIST bundle: it is only needed
|
|
// once this dialog actually opens.
|
|
const InvoiceEditor = dynamic(() => import('@/components/invoices/InvoiceEditor'), {
|
|
ssr: false,
|
|
loading: () => (
|
|
<div className="space-y-4 p-6">
|
|
<Skeleton className="h-8 w-1/3" />
|
|
<Skeleton className="h-32 w-full" />
|
|
<Skeleton className="h-32 w-full" />
|
|
</div>
|
|
),
|
|
})
|
|
|
|
interface Props {
|
|
open: boolean
|
|
onOpenChange: (open: boolean) => void
|
|
copyFromId?: string | null
|
|
/** Preselect the självfaktura tab (split-button entry on /invoices). */
|
|
selfBilled?: boolean
|
|
}
|
|
|
|
/**
|
|
* "Ny faktura" as a modal: mirrors NewJournalEntryDialog. Wraps the bare
|
|
* InvoiceEditor; the editor's own review/confirm/send dialogs stack on top of
|
|
* this one, and every successful create navigates to the invoice detail page
|
|
* (unmounting the host list page and this dialog with it).
|
|
*
|
|
* The accessible title is visually hidden: the bare editor renders its own
|
|
* live heading, which tracks document type (faktura/proforma/följesedel) and
|
|
* shows the invoice-number preview: a static DialogTitle would duplicate or
|
|
* contradict it.
|
|
*/
|
|
export default function NewInvoiceDialog({ open, onOpenChange, copyFromId = null, selfBilled = false }: Props) {
|
|
const t = useTranslations('invoice_editor')
|
|
const { company } = useCompany()
|
|
const supabase = useMemo(() => createClient(), [])
|
|
const [copyLoad, setCopyLoad] = useState<{
|
|
sourceId: string | null
|
|
initial: InvoiceCopyInitial | null
|
|
failed: boolean
|
|
}>({ sourceId: null, initial: null, failed: false })
|
|
|
|
useEffect(() => {
|
|
if (!open || !copyFromId) return
|
|
if (!company?.id) return
|
|
|
|
let cancelled = false
|
|
|
|
const loadCopySource = async () => {
|
|
const { data, error } = await supabase
|
|
.from('invoices')
|
|
.select('*')
|
|
.eq('id', copyFromId)
|
|
.eq('company_id', company.id)
|
|
.single()
|
|
|
|
let items: Record<string, unknown>[] = []
|
|
if (!error && data) {
|
|
try {
|
|
// invoice_items has NO company_id column: it is scoped through its
|
|
// parent invoice. Filtering on it made PostgREST answer 42703, which
|
|
// fetchAllRows rethrows, so the copy flow hit the "kunde inte
|
|
// laddas" panel for EVERY company. Tenancy is unaffected: the
|
|
// invoices lookup above already pins copyFromId to this company, and
|
|
// the invoice_items RLS policy joins back to the parent invoice.
|
|
items = await fetchAllRows<Record<string, unknown>>(({ from, to }) =>
|
|
supabase
|
|
.from('invoice_items')
|
|
.select('*')
|
|
.eq('invoice_id', copyFromId)
|
|
.order('id', { ascending: true })
|
|
.range(from, to),
|
|
)
|
|
} catch {
|
|
if (!cancelled) setCopyLoad({ sourceId: copyFromId, initial: null, failed: true })
|
|
return
|
|
}
|
|
}
|
|
|
|
if (cancelled) return
|
|
const source = data ? { ...data, items } : null
|
|
if (error || !source || !canCopyInvoice(source)) {
|
|
setCopyLoad({ sourceId: copyFromId, initial: null, failed: true })
|
|
return
|
|
}
|
|
setCopyLoad({
|
|
sourceId: copyFromId,
|
|
initial: buildInvoiceCopyInitial(source as InvoiceCopySource),
|
|
failed: false,
|
|
})
|
|
}
|
|
|
|
void loadCopySource()
|
|
|
|
return () => {
|
|
cancelled = true
|
|
}
|
|
}, [company?.id, copyFromId, open, supabase])
|
|
|
|
const copyInitial = copyLoad.sourceId === copyFromId ? copyLoad.initial : null
|
|
const copyLoadFailed = copyLoad.sourceId === copyFromId && copyLoad.failed
|
|
|
|
// The dialog is non-modal so the agent sheet (a body-level sibling at
|
|
// z-[60]) stays clickable and focusable above it: Radix modal mode sets
|
|
// body pointer-events: none and traps focus, which left the visible chat
|
|
// input dead. Page modality is restored by hand instead: `inert` on the
|
|
// dash shell blocks pointer, keyboard, and AT access to the page behind,
|
|
// while the agent sheet (outside the shell) stays live.
|
|
useEffect(() => {
|
|
if (!open) return
|
|
const shell = document.getElementById('dash-shell')
|
|
if (!shell) return
|
|
shell.inert = true
|
|
return () => {
|
|
shell.inert = false
|
|
}
|
|
}, [open])
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={onOpenChange} modal={false}>
|
|
<DialogVeil />
|
|
<DialogContent
|
|
// p-0/gap-0: the bare editor carries its own padding so its sticky
|
|
// action bar can sit flush against the dialog's bottom edge (position
|
|
// sticky binds to this DialogContent, the scroll container).
|
|
className="sm:max-w-2xl max-h-[95dvh] sm:max-h-[90vh] overflow-y-auto p-0 gap-0"
|
|
// A half-typed invoice must survive an accidental backdrop click or a
|
|
// stray Escape (nested comboboxes and date pickers portal outside the
|
|
// dialog). Closing is explicit: the header X. Same convention as
|
|
// NewJournalEntryDialog.
|
|
onEscapeKeyDown={(e) => e.preventDefault()}
|
|
onPointerDownOutside={(e) => e.preventDefault()}
|
|
onInteractOutside={(e) => e.preventDefault()}
|
|
>
|
|
<DialogTitle className="sr-only">
|
|
{copyFromId ? t('title_copy') : t('title_invoice')}
|
|
</DialogTitle>
|
|
{copyFromId ? (
|
|
copyLoadFailed ? (
|
|
<div className="space-y-4 p-6 text-center">
|
|
<p className="font-medium">{t('copy_load_failed_title')}</p>
|
|
<p className="text-sm text-muted-foreground">{t('copy_load_failed_description')}</p>
|
|
<Button variant="outline" onClick={() => onOpenChange(false)}>
|
|
{t('close')}
|
|
</Button>
|
|
</div>
|
|
) : copyInitial ? (
|
|
<InvoiceEditor key={copyFromId} mode="copy" initial={copyInitial} bare />
|
|
) : (
|
|
<div className="space-y-4 p-6">
|
|
<Skeleton className="h-8 w-1/3" />
|
|
<Skeleton className="h-32 w-full" />
|
|
<Skeleton className="h-32 w-full" />
|
|
</div>
|
|
)
|
|
) : (
|
|
<InvoiceEditor mode="create" bare initialSelfBilled={selfBilled} />
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|