feat(web): unify Invoice Detail Page with OrderInvoicePanel redesign #1514
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,7 +6,9 @@ | |
| * extras slot, and order back-link. | ||
| * | ||
| * Layout: 2-column grid at ≥1024 px. | ||
| * LEFT: Failure alert (when applicable) + one host card containing the | ||
| * Document/Regulatory KeyValueList and the nested provider region | ||
| * (#1462, mirrors #1449's OrderInvoicePanel card chrome) | ||
| * RIGHT: InvoiceTimeline + Actions (Retry / in-doubt) | ||
| * | ||
| * Lifecycle states: | ||
|
|
@@ -28,25 +30,101 @@ import { Alert } from '../../shared/ui/alert'; | |
| import { Button } from '../../shared/ui/button'; | ||
| import { ErrorState, EmptyState } from '../../shared/ui/feedback-state'; | ||
| import { TimeDisplay } from '../../shared/ui/time-display'; | ||
| import { KeyValueList, type KeyValueItem } from '../../shared/ui/key-value-list'; | ||
| import { useTranslation } from '../../shared/i18n'; | ||
| import { useToast } from '../../shared/ui/toast-provider'; | ||
| import { ApiError } from '../../shared/api/api-error'; | ||
| import { usePlatform } from '../../shared/plugins'; | ||
| import { useConnectionsQuery, type Connection } from '../../features/connections'; | ||
| import { useInvoiceQuery } from '../../features/invoicing/hooks/use-invoice-query'; | ||
| import { useIssueInvoiceMutation } from '../../features/invoicing/hooks/use-issue-invoice-mutation'; | ||
| import { | ||
| deriveInvoiceDisplayStatus, | ||
| canRetryInvoice, | ||
| resolveFailureCopy, | ||
| } from '../../features/invoicing/lib/derive-invoice-display'; | ||
| import type { InvoiceRecord } from '../../features/invoicing/api/invoicing.types'; | ||
| import { InvoiceStatusBadge } from '../../features/invoicing/components/invoice-status-badge'; | ||
| import { RegulatoryStatusBadge } from '../../features/invoicing/components/regulatory-status-badge'; | ||
| import { InvoicePdfLink } from '../../features/invoicing/components/invoice-pdf-link'; | ||
| import { InvoiceTimeline } from '../../features/invoicing/components/invoice-timeline'; | ||
| import { DOCUMENT_TYPE_LABEL_FALLBACK } from '../../features/invoicing/components/document-type-select'; | ||
| import { resolveIssueErrorMessage } from '../../features/invoicing/lib/issue-error-message'; | ||
|
|
||
| /** | ||
| * Build the `KeyValueList` rows for the Document fields block — same field | ||
| * set the bespoke `<dl className="invoice-panel__kv">` rendered, only the | ||
| * wrapping markup changed to the shared primitive (#1462, mirrors #1449's | ||
| * `buildInvoiceFieldItems` on `OrderInvoicePanel`). | ||
| */ | ||
| function buildInvoiceDetailFieldItems( | ||
| invoice: InvoiceRecord, | ||
| connection: Connection | null, | ||
| showRegulatoryBadge: boolean, | ||
| t: (key: string, fallback: string) => string, | ||
| ): KeyValueItem[] { | ||
| const items: KeyValueItem[] = [ | ||
| { | ||
| id: 'number', | ||
| label: t('invoice.field.number', 'Number'), | ||
| value: invoice.providerInvoiceNumber ? ( | ||
| <InvoicePdfLink | ||
| invoiceNumber={invoice.providerInvoiceNumber} | ||
| pdfUrl={invoice.pdfUrl} | ||
| /> | ||
| ) : ( | ||
| <span className="text-muted">—</span> | ||
| ), | ||
| }, | ||
| { | ||
| id: 'document', | ||
| label: t('invoice.field.document', 'Document type'), | ||
| value: t( | ||
| `invoice.documentType.${invoice.documentType}`, | ||
| DOCUMENT_TYPE_LABEL_FALLBACK[invoice.documentType] ?? invoice.documentType, | ||
| ), | ||
| }, | ||
| { | ||
| id: 'issued', | ||
| label: t('invoice.field.issued', 'Issued at'), | ||
| value: invoice.issuedAt ? ( | ||
| <TimeDisplay iso={invoice.issuedAt} format="datetime" className="mono-text" /> | ||
| ) : ( | ||
| <span className="text-muted">—</span> | ||
| ), | ||
| }, | ||
| { | ||
| id: 'via', | ||
| label: t('invoice.field.via', 'Invoiced via'), | ||
| value: connection ? ( | ||
| <Link to={`/connections/${connection.id}`} className="link"> | ||
| {connection.name} | ||
| </Link> | ||
| ) : ( | ||
| <span className="mono-text">{invoice.connectionId}</span> | ||
| ), | ||
| }, | ||
| ]; | ||
|
|
||
| if (showRegulatoryBadge) { | ||
| items.push({ | ||
| id: 'clearance', | ||
| label: t('invoice.field.clearance', 'Regulatory clearance'), | ||
| value: <RegulatoryStatusBadge status={invoice.regulatoryStatus} />, | ||
| }); | ||
|
|
||
| if (invoice.clearanceReference) { | ||
| items.push({ | ||
| id: 'clearanceRef', | ||
| label: t('invoice.field.clearanceRef', 'Reference'), | ||
| value: <span className="mono-text">{invoice.clearanceReference}</span>, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| return items; | ||
| } | ||
|
|
||
| export function InvoiceDetailPage(): ReactElement { | ||
| const { invoiceId = '' } = useParams<{ invoiceId: string }>(); | ||
| const { t } = useTranslation(); | ||
|
|
@@ -189,73 +267,30 @@ export function InvoiceDetailPage(): ReactElement { | |
| </Alert> | ||
| ) : null} | ||
|
|
||
| {/* Document fields + provider region — one host card (#1462) */} | ||
| <div className="invoice-detail__card"> | ||
| <section className="detail-section"> | ||
| <h2 className="detail-section__title"> | ||
| {t('invoice.detail.sectionDocument', 'Document')} | ||
| </h2> | ||
| <KeyValueList | ||
| items={buildInvoiceDetailFieldItems(invoice, connection, showRegulatoryBadge, t)} | ||
| /> | ||
| </section> | ||
|
|
||
| {/* Provider extras slot */} | ||
| {InvoiceDetailSection && connection ? ( | ||
| <> | ||
| <hr className="invoice-detail__card-divider" /> | ||
|
Collaborator
There was a problem hiding this comment. SUGGESTION (cross-surface consistency): the redesigned |
||
| <div> | ||
| <p className="invoice-detail__provider-label"> | ||
| {t('invoice.detail.providerRegion', 'Provider region')} | ||
| </p> | ||
| <InvoiceDetailSection invoice={invoice} connection={connection} /> | ||
| </div> | ||
| </> | ||
| ) : null} | ||
| </div> | ||
| </div> | ||
|
|
||
| {/* ── RIGHT COLUMN ── */} | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SUGGESTION (DRY):
buildInvoiceDetailFieldItemsmirrorsOrderInvoicePanel's localbuildInvoiceFieldItems(#1449) closely. The two field sets genuinely differ though — this page adds a linkedInvoiced via, aclearanceRefrow, and a different field order/labels ("Document type" vs "Document", "Regulatory clearance" vs "Clearance") — so a straight extraction would need parameterizing all of that, and the issue explicitly scoped this as "mirror the pattern," not literal reuse. Fine to keep as-is. If a third invoice-field surface ever appears, that's the moment to lift a shared, parameterized builder intofeatures/invoicing/lib/. No change required.