@metron-labs/quote-react 0.1.27 → 0.1.29

package/dist/app/stages/BasketStage.js

@@ -5,7 +5,7 @@ import { useTrack } from "../../lib/analytics";
 import BackArrow from "../../components/BackArrow";
 import { fmtCurrency } from "../../lib/formatters";
 import { productImageSrc } from "../../lib/productImage";
-import { getPricingBreakdown } from "../../util/pricing";
+import { getCartSubtotal, getPricingBreakdown } from "../../util/pricing";
 import { exportBasketExcel } from "../../util/exportScheduleExcel";
 import { renderDisplayUnit, unitDisplayText } from "../components/UnitDisplay";
 import { clientHeaders, getBoqClientId, readJson } from "../../lib/api/boqClient";
@@ -73,7 +73,8 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                     product_id: item.productId,
                     requested_description: item.requestedDescription ?? item.description,
                     requested_qty: item.qty,
-                    requested_uom: item.unit,
+                    requested_uom: item.unit || null,
+                    linked_context: item.linkedContext ?? [],
                     selected_description: item.description,
                     selected_uoi: item.uoi,
                     selected_uoi_count: item.uoiCount,
@@ -95,6 +96,7 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                 const conversion = resolved?.conversion;
                 if (!conversion || typeof resolved?.line_id !== "string")
                     continue;
+                const current = cart[resolved.line_id];
                 updates[resolved.line_id] = {
                     conversionType: conversion.conversion_type,
                     requestUomsSupported: conversion.request_uoms_supported,
@@ -106,12 +108,15 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                     roundingRule: conversion.rounding_rule,
                     conversionConfidence: conversion.conversion_confidence,
                     conversionNotes: conversion.conversion_notes,
+                    ...(current?.qty === 0 && Number.isFinite(conversion.suggested_order_qty) && conversion.suggested_order_qty > 0
+                        ? { qty: conversion.suggested_order_qty, unit: conversion.suggested_order_uom || current.unit }
+                        : {}),
                 };
             }
             if (Object.keys(updates).length > 0)
                 onResolveConversions(updates);
         })
-            .catch(() => { });
+            .catch((error) => console.error("Catalogue conversion resolution failed", error));
     }, [cart, onResolveConversions]);
     function clearQtyDraft(lineId) {
         setQtyDrafts((prev) => {
@@ -206,7 +211,10 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
             wasteFactorOverride: Math.max(0, Number.parseFloat(wastePercent) || 0) / 100,
         }),
     }));
-    const subtotal = pricedItems.reduce((sum, entry) => sum + (entry.pricing.lineTotal ?? 0), 0);
+    const subtotal = getCartSubtotal(items, {
+        wasteFactorEnabled: wasteEnabled,
+        wasteFactorOverride: Math.max(0, Number.parseFloat(wastePercent) || 0) / 100,
+    });
     const vat = subtotal * VAT_RATE;
     const total = subtotal + vat;
     // Once per visit to the basket, with the figures it opened with.

package/dist/app/stages/ScheduleResultsStage.js

@@ -12,6 +12,7 @@ import { productImageSrc } from "../../lib/productImage";
 import { candidateToCartItem } from "../../lib/boq/toCartItem";
 import { apiHeaders, getBoqClientId, readJson } from "../../lib/api/boqClient";
 import { exportScheduleExcel } from "../../util/exportScheduleExcel";
+import { getCartSubtotal, getPricingBreakdown } from "../../util/pricing";
 const NO_SELECTION = "__none__";
 const PAGE_SIZE = 24;
 const SORT_OPTIONS = [
@@ -147,7 +148,9 @@ function fmtTextList(values) {
 }
 export function displayLineLabel(item, allItems) {
     void allItems;
-    return item.customer_display_label?.trim() || item.description_original || "(no description)";
+    const original = typeof item.description_original === "string" ? item.description_original.trim() : "";
+    const label = typeof item.customer_display_label === "string" ? item.customer_display_label.trim() : "";
+    return (label && original.includes(label) ? label : original) || "(no description)";
 }
 const LINK_GROUP_BUBBLE_STYLES = [
     { background: "#fff7ed", borderColor: "#fdba74", color: "#9a3412" },
@@ -379,16 +382,18 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
             band: bandFor(best?.scores?.overall),
         };
     });
-    let totalValue = 0;
+    // Match BasketStage: catalogue waste defaults are opt-in in the basket UI.
+    let totalValue = getCartSubtotal(Object.values(cart), { wasteFactorEnabled: false, wasteFactorOverride: 0 });
     let needsPricingCount = 0;
     for (const row of rows) {
         if (row.unmatchable || row.decision?.include_in_quote !== true || !row.best)
             continue;
-        if (row.best.price != null)
-            totalValue += row.best.price * row.qty;
-        else
+        const cartItem = cart[row.item.line_id];
+        if (!cartItem || getPricingBreakdown(cartItem).lineTotal == null)
             needsPricingCount += 1;
     }
+    if (needsPricingCount > 0)
+        totalValue = null;
     const hasBestAlternative = (row) => !row.unmatchable && !row.best && row.decision?.technical_classification !== "no_suitable_candidate" && recommendedCandidates(row.result).length > 0;
     const previewCandidate = (row) => row.best ?? recommendedCandidates(row.result)[0];
     const reviewRequiredRows = rows.filter((row) => !row.unmatchable && !row.best);
@@ -556,6 +561,12 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
             description: row.item.description_original,
             unit: row.item.unit,
             qty: row.qty,
+            linkedContext: row.item.linked_group_role === "dependent" && row.item.linked_group_id
+                ? lineItems
+                    .filter((line) => line.linked_group_id === row.item.linked_group_id && line.linked_group_role === "anchor")
+                    .slice(0, 1)
+                    .map((anchor) => ({ description: anchor.description_original, qty: anchor.qty, unit: anchor.unit, role: "anchor" }))
+                : undefined,
         });
     }
     // All matched items, including review-required ones, land in the basket automatically
@@ -571,16 +582,14 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
         onCartSeeded();
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [cartSeeded]);
-    // Keep already-added basket rows aligned to the latest matched candidate metadata. This
-    // repairs stale cart rows after pricing/conversion schema changes without clobbering any
-    // quantity edits the user made in the basket.
+    // The cart is authoritative once a row has been added. Rebuilding an existing row from
+    // scheduleResult can overwrite contextual quantities resolved in the basket when the
+    // user navigates back here. Only seed rows that are not already present.
     useEffect(() => {
         for (const row of rows) {
             const existing = cart[row.item.line_id];
-            if (!existing)
-                continue;
-            const refreshed = toCartItem(row);
-            onAddToCart(refreshedCartItem(refreshed, existing));
+            if (!existing && !row.unmatchable && row.best)
+                onAddToCart(toCartItem(row));
         }
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [scheduleResult]);
@@ -664,7 +673,7 @@ export default function ScheduleResultsStage({ scheduleResult, onStartOver, cart
     })();
     const activeReviewCartMatches = !!activeReviewRow?.best && cart[activeReviewRow.item.line_id]?.productId === activeReviewRow.best.product_id;
     const activeReviewHasPendingUpdate = !!activeReviewRow?.best && !!cart[activeReviewRow.item.line_id] && !activeReviewCartMatches;
-    return (_jsxs("div", { className: "wizard-step entry-stage", children: [_jsxs("div", { className: `quick-order-card${internal ? "" : " quick-order-card--customer"}`, children: [_jsx("div", { className: `quick-order-hero${internal ? "" : " quick-order-hero--customer"}`, children: internal ? (_jsxs(_Fragment, { children: [_jsx("div", { className: "quick-order-eyebrow", children: "Construction Services" }), _jsxs("div", { className: "quick-order-hero-title-row", children: [_jsx("h1", { children: "Your Results" }), _jsxs("span", { className: "summary-chip summary-chip--scope", children: [_jsx("strong", { children: fmtCurrency(totalValue) }), " Est. total"] })] }), _jsx("p", { children: "Each line item from your schedule matched against your catalogue, ranked by confidence." })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { children: [_jsx("h1", { children: "Review your matched products" }), _jsxs("p", { children: ["Check you're happy with these items, then click ", qzaQuoteRequest ? "View Quote" : "View Basket", " to continue."] })] }), _jsxs("button", { type: "button", className: "results-total-action", onClick: onGoToBasket, "aria-label": qzaQuoteRequest ? "View quote" : "View basket", children: [_jsxs("span", { children: [_jsx("small", { children: qzaQuoteRequest ? "View Quote" : "View Basket" }), _jsx("strong", { children: fmtCurrency(totalValue) })] }), _jsx("span", { className: "arrow", children: _jsx(ForwardArrow, {}) })] })] })) }), _jsxs("div", { className: "quick-order-panel", style: { paddingTop: 16 }, children: [debugEnabled && (_jsx("div", { className: "results-summary", style: { marginBottom: 12 }, children: _jsx("button", { type: "button", className: "bom-toolbar-btn", "aria-pressed": showTimings, onClick: () => setShowTimings((value) => !value), children: showTimings ? "Hide timings" : "Show timings" }) })), debugEnabled && showTimings && _jsx(TimingBreakdown, { ...timings }), !qzaQuoteRequest && (_jsx("div", { className: "results-toolbar-row", children: !activeReviewRow && (_jsxs("div", { className: "results-summary", style: { marginBottom: 0 }, children: [needsPricingCount > 0 && (_jsxs("span", { className: "summary-chip summary-chip--neutral", children: [_jsx("strong", { children: needsPricingCount }), " need pricing"] })), _jsxs("div", { style: {
+    return (_jsxs("div", { className: "wizard-step entry-stage", children: [_jsxs("div", { className: `quick-order-card${internal ? "" : " quick-order-card--customer"}`, children: [_jsx("div", { className: `quick-order-hero${internal ? "" : " quick-order-hero--customer"}`, children: internal ? (_jsxs(_Fragment, { children: [_jsx("div", { className: "quick-order-eyebrow", children: "Construction Services" }), _jsxs("div", { className: "quick-order-hero-title-row", children: [_jsx("h1", { children: "Your Results" }), _jsxs("span", { className: "summary-chip summary-chip--scope", children: [_jsx("strong", { children: totalValue == null ? "Calculating…" : fmtCurrency(totalValue) }), " Est. total"] })] }), _jsx("p", { children: "Each line item from your schedule matched against your catalogue, ranked by confidence." })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { children: [_jsx("h1", { children: "Review your matched products" }), _jsxs("p", { children: ["Check you're happy with these items, then click ", qzaQuoteRequest ? "View Quote" : "View Basket", " to continue."] })] }), _jsxs("button", { type: "button", className: "results-total-action", onClick: onGoToBasket, "aria-label": qzaQuoteRequest ? "View quote" : "View basket", children: [_jsxs("span", { children: [_jsx("small", { children: qzaQuoteRequest ? "View Quote" : "View Basket" }), _jsx("strong", { children: totalValue == null ? "Calculating…" : fmtCurrency(totalValue) })] }), _jsx("span", { className: "arrow", children: _jsx(ForwardArrow, {}) })] })] })) }), _jsxs("div", { className: "quick-order-panel", style: { paddingTop: 16 }, children: [debugEnabled && (_jsx("div", { className: "results-summary", style: { marginBottom: 12 }, children: _jsx("button", { type: "button", className: "bom-toolbar-btn", "aria-pressed": showTimings, onClick: () => setShowTimings((value) => !value), children: showTimings ? "Hide timings" : "Show timings" }) })), debugEnabled && showTimings && _jsx(TimingBreakdown, { ...timings }), !qzaQuoteRequest && (_jsx("div", { className: "results-toolbar-row", children: !activeReviewRow && (_jsxs("div", { className: "results-summary", style: { marginBottom: 0 }, children: [needsPricingCount > 0 && (_jsxs("span", { className: "summary-chip summary-chip--neutral", children: [_jsx("strong", { children: needsPricingCount }), " need pricing"] })), _jsxs("div", { style: {
                                                 display: "flex",
                                                 gap: 8,
                                                 flexWrap: "wrap",