@metron-labs/quote-react 0.1.43 → 0.1.45

package/dist/app/QuickQuote.js

@@ -6,6 +6,7 @@ import { TrackContext, useTracker } from "../lib/analytics";
 import { submitSchedule, pollScheduleJob } from "../lib/api/fetchSchedule";
 import { pollJob } from "../lib/api/pollJob";
 import EntryStage from "./stages/EntryStage";
+import { ENTRY_DRAFT_KEY } from "./stages/EntryStage";
 import ScheduleResultsStage from "./stages/ScheduleResultsStage";
 import BasketStage from "./stages/BasketStage";
 import { CartProvider, useCart } from "../lib/cart/CartContext";
@@ -22,11 +23,22 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
     const [entryMode, setEntryMode] = useState(null);
     const [error, setError] = useState("");
     const schedulePollCancelRef = useRef(null);
+    const matchRunRef = useRef(0);
     const [processingStep, setProcessingStep] = useState(0);
     const [scheduleResult, setScheduleResult] = useState(null);
     const [scheduleReviewGateComplete, setScheduleReviewGateComplete] = useState(false);
     const { cart, addToCart, addManyToCart, removeFromCart, updateCartQty, updateCartSellUnits, updateCartConversions, clearCart } = useCart();
     const [cartSeeded, setCartSeeded] = useState(false);
+    // The file is memory only - a refresh loses it (a File can't go in sessionStorage). The tab
+    // and text survive one: EntryStage keeps them under ENTRY_DRAFT_KEY.
+    const [entryDraft, setEntryDraft] = useState(null);
+    const clearEntryDraft = () => {
+        setEntryDraft(null);
+        try {
+            window.sessionStorage.removeItem(ENTRY_DRAFT_KEY);
+        }
+        catch { }
+    };
     const resolvedConversionInputs = useRef(new Map());
     const rootRef = useRef(null);
     const track = useTracker("quick-quote", rootRef);
@@ -166,8 +178,11 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
             const hash = window.location.hash;
             if (hash === "#quote-request")
                 setStage("basket");
-            else if (hash === "#matched-products" && scheduleResult)
+            else if (hash === "#matched-products" && scheduleResult) {
+                // Opening an entry tab after browser-back clears the mode; results only render in schedule mode.
+                setEntryMode("schedule");
                 setStage("results");
+            }
             else
                 setStage("entry");
             // Turbo's popstate listener (registered before ours, so it can't be pre-empted) stamps its
@@ -181,8 +196,8 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
                     return;
                 // Our own steps always get our state back, even if a stamp slipped through earlier -
                 // otherwise it sticks and every later visit to that step is a Turbo page visit.
-                if (hash === "#quote-request" || hash === "#matched-products") {
-                    window.history.replaceState({ boqQuoteStage: hash === "#quote-request" ? "basket" : "results" }, "", href);
+                if (hash === "#quote-request" || hash === "#matched-products" || hash === "#quote-entry") {
+                    window.history.replaceState({ boqQuoteStage: hash === "#quote-request" ? "basket" : hash === "#quote-entry" ? "entry" : "results" }, "", href);
                     return;
                 }
                 if (!original?.turbo && window.history.state?.turbo)
@@ -230,12 +245,14 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         setScheduleReviewGateComplete(false);
         clearCart();
         setCartSeeded(false);
+        clearEntryDraft();
     };
     // Schedule-upload path: match a schedule file's line items against the
     // catalogue on the backend. Takes the file directly, so
     // callers that have only just obtained it — e.g. the entry-page paste box —
     // don't hit a stale-closure read.
     const runScheduleMatch = useCallback(async (file, providedLines, archiveSource = true) => {
+        const run = ++matchRunRef.current;
         setError("");
         setProcessingStep(0);
         let step = 0;
@@ -245,6 +262,8 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         };
         try {
             const { jobId } = await submitSchedule(file, providedLines, archiveSource);
+            if (run !== matchRunRef.current)
+                return;
             // Poll rather than hold one request open: the pipeline can take several minutes,
             // well past Azure Static Web Apps' 45s API timeout, but each individual poll is fast.
             const { promise, cancel } = pollJob(() => pollScheduleJob(jobId), 5000, advanceFakeStep, "schedule");
@@ -256,21 +275,36 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
             const lines = job.result.lineItems.length;
             const matched = job.result.results.filter((result) => result.candidates.length > 0).length;
             track("results_shown", { lines, matched, unmatched: lines - matched });
+            // A new schedule is a new quote. Browser-back to the entry screen only swaps the
+            // screen, so the previous quote's basket is still here - drop it.
+            clearCart();
+            setCartSeeded(false);
             setScheduleReviewGateComplete(false);
             setScheduleResult(job.result);
             writeQuoteHistory("results");
             setStage("results");
         }
         catch (err) {
+            if (run !== matchRunRef.current)
+                return;
             track("error", { stage: "matching" });
             setError(err?.message || "Failed to process schedule");
             setStage("entry");
         }
         finally {
-            schedulePollCancelRef.current?.();
-            schedulePollCancelRef.current = null;
+            if (run === matchRunRef.current) {
+                schedulePollCancelRef.current?.();
+                schedulePollCancelRef.current = null;
+            }
         }
-    }, [writeQuoteHistory, track]);
+    }, [writeQuoteHistory, track, clearCart]);
+    // Browser back out of the dialog mid-match: drop the match, or its results would turn up
+    // later on a screen the user has already left. The job still finishes server-side, unread.
+    const cancelMatch = useCallback(() => {
+        matchRunRef.current++;
+        schedulePollCancelRef.current?.();
+        schedulePollCancelRef.current = null;
+    }, []);
     // Entry-page "paste your line items" shortcut: skip the upload step entirely,
     // wrap the pasted text as a .txt — verbatim, so the copy archived in blob storage reads
     // exactly as pasted — and feed it straight into the same match pipeline.
@@ -287,10 +321,11 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         setEntryMode("schedule");
         await runScheduleMatch(file);
     }, [runScheduleMatch]);
-    return (_jsx(TrackContext.Provider, { value: track, children: _jsx("div", { ref: rootRef, className: `app-wrapper${fullPage ? "" : " app-wrapper--embedded"}${hideHeader ? " app-wrapper--no-header" : ""}${!fullPage && stage === "processing" ? " app-wrapper--loading" : ""}`, style: getQuoteConfig().theme, children: _jsxs("main", { className: "main-content", children: [error && (_jsxs("div", { className: "error-box", role: "alert", children: [_jsx("strong", { children: "Error:" }), " ", error] })), stage === "entry" && _jsx(EntryStage, { onPasteSchedule: handlePasteSchedule, onUploadSchedule: handleUploadSchedule, onEntryModeChange: setEntryMode }), stage === "results" && entryMode === "schedule" && scheduleResult && (_jsx(ScheduleResultsStage, { scheduleResult: scheduleResult, onStartOver: resetToEntry, cart: cart, onAddToCart: addToCart, onRemoveFromCart: removeFromCart, onGoToBasket: goToBasket, cartSeeded: cartSeeded, onCartSeeded: () => setCartSeeded(true), reviewGateComplete: scheduleReviewGateComplete, onReviewGateComplete: () => setScheduleReviewGateComplete(true), internal: internal })), stage === "basket" && (_jsx(BasketStage, { cart: cart, onUpdateQty: updateCartQty, onUpdateSellUnits: updateCartSellUnits, onRemove: removeFromCart, onBack: backToResults, onStartNewQuote: resetToEntry, onQuoteRequested: () => {
+    return (_jsx(TrackContext.Provider, { value: track, children: _jsx("div", { ref: rootRef, className: `app-wrapper${fullPage ? "" : " app-wrapper--embedded"}${hideHeader ? " app-wrapper--no-header" : ""}${!fullPage && stage === "processing" ? " app-wrapper--loading" : ""}`, style: getQuoteConfig().theme, children: _jsxs("main", { className: "main-content", children: [error && (_jsxs("div", { className: "error-box", role: "alert", children: [_jsx("strong", { children: "Error:" }), " ", error] })), stage === "entry" && _jsx(EntryStage, { onPasteSchedule: handlePasteSchedule, onUploadSchedule: handleUploadSchedule, onEntryModeChange: setEntryMode, draft: entryDraft, onSubmitDraft: setEntryDraft, onCancelMatch: cancelMatch }), stage === "results" && entryMode === "schedule" && scheduleResult && (_jsx(ScheduleResultsStage, { scheduleResult: scheduleResult, onStartOver: resetToEntry, cart: cart, onAddToCart: addToCart, onRemoveFromCart: removeFromCart, onGoToBasket: goToBasket, cartSeeded: cartSeeded, onCartSeeded: () => setCartSeeded(true), reviewGateComplete: scheduleReviewGateComplete, onReviewGateComplete: () => setScheduleReviewGateComplete(true), internal: internal })), stage === "basket" && (_jsx(BasketStage, { cart: cart, onUpdateQty: updateCartQty, onUpdateSellUnits: updateCartSellUnits, onRemove: removeFromCart, onBack: backToResults, onStartNewQuote: resetToEntry, onQuoteRequested: () => {
                             setScheduleResult(null);
                             setScheduleReviewGateComplete(false);
                             setCartSeeded(false);
                             clearCart();
+                            clearEntryDraft();
                         }, internal: internal }))] }) }) }));
 }

package/dist/app/stages/BasketStage.js

@@ -9,6 +9,7 @@ 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";
+import { MAX_ORDER_QTY } from "../../lib/boq/inputLimits";
 // ponytail: flat UK VAT rate, matching fmtCurrency's GBP-only assumption elsewhere in this app.
 const VAT_RATE = 0.2;
 const PAGE_SIZE = 10;
@@ -128,11 +129,11 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
     function commitRequestedQty(lineId, raw) {
         const n = parseFloat(raw);
         if (!isNaN(n) && n >= 0)
-            onUpdateQty(lineId, n);
+            onUpdateQty(lineId, Math.min(n, MAX_ORDER_QTY));
         clearQtyDraft(lineId);
     }
     function stepRequestedQty(lineId, current, delta) {
-        onUpdateQty(lineId, Math.max(0, current + delta));
+        onUpdateQty(lineId, Math.min(MAX_ORDER_QTY, Math.max(0, current + delta)));
         clearQtyDraft(lineId);
     }
     function clearSellUnitsDraft(lineId) {
@@ -145,11 +146,11 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
     function commitSellUnits(lineId, raw) {
         const n = parseFloat(raw);
         if (!isNaN(n) && n >= 0)
-            onUpdateSellUnits(lineId, n);
+            onUpdateSellUnits(lineId, Math.min(n, MAX_ORDER_QTY));
         clearSellUnitsDraft(lineId);
     }
     function stepSellUnits(lineId, current, delta) {
-        onUpdateSellUnits(lineId, Math.max(0, current + delta));
+        onUpdateSellUnits(lineId, Math.min(MAX_ORDER_QTY, Math.max(0, current + delta)));
         clearSellUnitsDraft(lineId);
     }
     // Sends the basket to the merchant as a quote request (POST /v1/quote-requests). Success only
@@ -229,11 +230,15 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
     if (quoteRequestSent) {
         return (_jsx("div", { className: "wizard-step entry-stage", children: _jsxs("div", { className: "quote-request-sent", role: "status", children: [_jsx("div", { className: "quote-request-sent-icon", "aria-hidden": "true", children: _jsx("svg", { width: "40", height: "40", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2.5", strokeLinecap: "round", strokeLinejoin: "round", children: _jsx("polyline", { points: "5 12.5 10 17.5 19 7" }) }) }), _jsx("h1", { children: "Quote requested" }), _jsxs("p", { children: ["You're all done. We'll email your sharper price to ", _jsx("strong", { children: reference.trim() }), ", usually within one working day."] }), _jsx("button", { type: "button", className: "cta-btn", onClick: onStartNewQuote, children: _jsx("span", { children: "Start a new quote" }) }), _jsx("p", { className: "quote-request-sent-note", children: "Nothing is charged until you approve the quote." })] }) }));
     }
+    // A customer's empty basket gets the same full-page treatment as the confirmation above.
+    if (!internal && items.length === 0) {
+        return (_jsx("div", { className: "wizard-step entry-stage", children: _jsxs("div", { className: "quote-request-sent", children: [_jsx("div", { className: "quote-request-sent-icon", "aria-hidden": "true", children: _jsxs("svg", { width: "40", height: "40", viewBox: "0 0 24 24", fill: "none", stroke: "currentColor", strokeWidth: "2", strokeLinecap: "round", strokeLinejoin: "round", children: [_jsx("path", { d: "M3 9h18l-2 11H5z" }), _jsx("path", { d: "M8 9l4-6 4 6" })] }) }), _jsx("h1", { children: qzaBasketLayout ? "Your quote request is empty" : "Your basket is empty" }), _jsx("p", { children: qzaBasketLayout ? "Start again with your list to build your quote." : "Start again with your list to fill your basket." }), _jsx("button", { type: "button", className: "cta-btn", onClick: onStartNewQuote, children: _jsx("span", { children: "Back to start" }) })] }) }));
+    }
     return (_jsx("div", { className: `wizard-step entry-stage${qzaBasketLayout ? " basket-layout--qza6-mra4" : ""}`, children: _jsxs("div", { className: `quick-order-card${internal ? "" : " quick-order-card--customer"}`, children: [_jsxs("div", { className: `quick-order-hero${internal ? "" : " quick-order-hero--customer"}`, children: [internal && _jsx("div", { className: "quick-order-eyebrow", children: "Construction Services" }), _jsxs("div", { className: "basket-hero-copy", children: [qzaBasketLayout && (_jsxs("button", { type: "button", className: "cta-btn cta-btn-secondary basket-hero-back", onClick: onBack, children: [_jsx(BackArrow, {}), _jsx("span", { children: "Back to results" })] })), _jsxs("div", { className: "quick-order-hero-title-row", children: [_jsx("h1", { children: internal ? "Your Selection" : qzaBasketLayout ? "Request a quote" : "Your Basket" }), internal && (_jsxs("span", { className: "summary-chip summary-chip--scope", children: [_jsx("strong", { children: items.length }), " ", items.length === 1 ? "item" : "items"] }))] }), _jsx("p", { children: internal
                                         ? "Review the items you've added before exporting them for review."
                                         : qzaBasketLayout
                                             ? "Check your items & quantities below, and we'll do our best to beat list prices."
-                                            : "Review your quantities and order summary before you buy." })] })] }), _jsx("div", { className: "quick-order-panel", style: { paddingTop: 16 }, children: items.length === 0 ? (_jsxs("div", { className: "quick-order-history-empty", children: [_jsx("div", { className: "basket-empty-icon", "aria-hidden": "true", children: internal ? "📋" : "🧺" }), _jsx("p", { children: internal ? "Your selection is empty." : qzaBasketLayout ? "Your quote request is empty." : "Your basket is empty." }), _jsx("p", { className: "basket-empty-hint", children: qzaBasketLayout ? "Go back to your results and add items for your quote." : "Go back to your results and add quoted items." }), _jsx("div", { className: "btn-row", style: { marginTop: 20, justifyContent: "center" }, children: _jsx("button", { className: "cta-btn", style: { width: "auto", maxWidth: 280 }, onClick: onBack, "aria-label": "Back to results", children: _jsx("span", { children: "Back to Results" }) }) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "basket-layout", children: [_jsxs("div", { className: "basket-main", children: [_jsx("div", { className: "basket-list", "aria-label": internal ? "Selection items" : qzaBasketLayout ? "Quote request items" : "Basket items", children: pagedItems.map(({ item, pricing }) => {
+                                            : "Review your quantities and order summary before you buy." })] })] }), _jsx("div", { className: "quick-order-panel", style: { paddingTop: 16 }, children: items.length === 0 ? (_jsxs("div", { className: "quick-order-history-empty", children: [_jsx("div", { className: "basket-empty-icon", "aria-hidden": "true", children: "\uD83D\uDCCB" }), _jsx("p", { children: "Your selection is empty." }), _jsx("p", { className: "basket-empty-hint", children: "Go back to your results and add quoted items." }), _jsx("div", { className: "btn-row", style: { marginTop: 20, justifyContent: "center" }, children: _jsx("button", { className: "cta-btn", style: { width: "auto", maxWidth: 280 }, onClick: onBack, "aria-label": "Back to results", children: _jsx("span", { children: "Back to Results" }) }) })] })) : (_jsxs(_Fragment, { children: [_jsxs("div", { className: "basket-layout", children: [_jsxs("div", { className: "basket-main", children: [_jsx("div", { className: "basket-list", "aria-label": internal ? "Selection items" : qzaBasketLayout ? "Quote request items" : "Basket items", children: pagedItems.map(({ item, pricing }) => {
                                                     const requestedQtyValue = qtyDrafts[item.lineId] ?? String(pricing.requestedAmount);
                                                     const requestedLocked = pricing.requestedUnit === pricing.sellUnit || pricing.costingMode === "review";
                                                     const rawDiffersFromOrder = pricing.requiredSellUnits == null || pricing.requestedAmount !== pricing.requiredSellUnits || pricing.requestedUnit !== pricing.sellUnit;
@@ -253,7 +258,7 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                                                                                                     if (e.key === "Enter")
                                                                                                         e.target.blur();
                                                                                                 }, "aria-label": `${item.description} order quantity` }), _jsxs("div", { className: "basket-qty-arrows", children: [_jsx("button", { type: "button", className: "basket-qty-arrow", onClick: () => stepSellUnits(item.lineId, parseFloat(sellUnitsDrafts[item.lineId] ?? String(pricing.requiredSellUnits ?? "0")) || 0, 1), "aria-label": `Increase ${item.description} order quantity`, children: _jsx(ChevronIcon, {}) }), _jsx("button", { type: "button", className: "basket-qty-arrow basket-qty-arrow--down", onClick: () => stepSellUnits(item.lineId, parseFloat(sellUnitsDrafts[item.lineId] ?? String(pricing.requiredSellUnits ?? "0")) || 0, -1), "aria-label": `Decrease ${item.description} order quantity`, children: _jsx(ChevronIcon, {}) })] })] }), _jsx("span", { className: "basket-metric-unit", children: renderDisplayUnit(pricing.sellUnit, parseFloat(sellUnitsDrafts[item.lineId] ?? String(pricing.requiredSellUnits ?? "0")) || 0) })] })] }), _jsxs("div", { className: "basket-stat basket-stat--total", children: [_jsx("span", { className: "basket-stat-label", children: "Total" }), _jsxs("div", { className: "basket-stat-value", children: [_jsx("strong", { children: pricing.lineTotal != null ? fmtCurrency(pricing.lineTotal) : "-" }), pricing.lineTotal != null && _jsx("span", { className: "basket-metric-unit", children: "ex. VAT" })] })] })] })] }, item.lineId));
-                                                }) }), totalPages > 1 && (_jsxs("div", { className: "results-pagination", children: [_jsxs("span", { className: "results-pagination-count", children: ["Showing ", (currentPage - 1) * PAGE_SIZE + 1, "\u2013", Math.min(currentPage * PAGE_SIZE, pricedItems.length), " of ", pricedItems.length] }), _jsxs("div", { className: "results-pagination-controls", children: [_jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage - 1), disabled: currentPage === 1, children: "Previous" }), _jsxs("span", { className: "results-pagination-page", children: ["Page ", currentPage, " of ", totalPages] }), _jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage + 1), disabled: currentPage === totalPages, children: "Next" })] })] }))] }), _jsxs("aside", { className: "basket-sidebar", children: [_jsx("div", { className: "basket-sidebar-title", children: qzaBasketLayout ? "Quote request summary" : "Order summary" }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "List price (ex. VAT)" : "Subtotal (ex. VAT)" }), _jsx("span", { children: fmtCurrency(subtotal) })] }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "VAT (20%)" : "VAT (20%)" }), _jsx("span", { children: fmtCurrency(vat) })] }), _jsxs("div", { className: "basket-sidebar-row basket-sidebar-row--total", children: [_jsx("span", { children: qzaBasketLayout ? "List price (inc. VAT)" : "Total" }), _jsx("span", { children: fmtCurrency(total) })] }), !qzaBasketLayout && (_jsx("div", { className: "basket-summary-waste", children: _jsxs("div", { className: "basket-waste-control", children: [_jsxs("label", { className: "basket-global-waste", children: [_jsx("input", { type: "checkbox", checked: wasteEnabled, onChange: (e) => setWasteEnabled(e.target.checked) }), _jsx("span", { children: "Add waste factor" })] }), _jsxs("label", { className: "basket-global-waste-percent", children: [_jsx("input", { type: "number", inputMode: "decimal", min: "0", step: "0.1", value: wastePercent, onChange: (e) => setWastePercent(e.target.value), disabled: !wasteEnabled, "aria-label": "Waste factor percent" }), _jsx("span", { children: "%" })] })] }) })), _jsx("label", { htmlFor: `${uid}-basket-reference`, className: "basket-sidebar-label", children: qzaBasketLayout ? "Enter email for your sharper quote" : "Your reference (optional)" }), _jsx("input", { id: `${uid}-basket-reference`, type: qzaBasketLayout ? "email" : "text", className: "basket-sidebar-input", value: reference, onChange: (e) => {
+                                                }) }), totalPages > 1 && (_jsxs("div", { className: "results-pagination", children: [_jsxs("span", { className: "results-pagination-count", children: ["Showing ", (currentPage - 1) * PAGE_SIZE + 1, "\u2013", Math.min(currentPage * PAGE_SIZE, pricedItems.length), " of ", pricedItems.length] }), _jsxs("div", { className: "results-pagination-controls", children: [_jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage - 1), disabled: currentPage === 1, children: "Previous" }), _jsxs("span", { className: "results-pagination-page", children: ["Page ", currentPage, " of ", totalPages] }), _jsx("button", { type: "button", className: "bom-toolbar-btn", onClick: () => setPage(currentPage + 1), disabled: currentPage === totalPages, children: "Next" })] })] }))] }), _jsxs("aside", { className: "basket-sidebar", children: [_jsx("div", { className: "basket-sidebar-title", children: qzaBasketLayout ? "Quote request summary" : "Order summary" }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "List price (ex. VAT)" : "Subtotal (ex. VAT)" }), _jsx("span", { children: fmtCurrency(subtotal) })] }), _jsxs("div", { className: "basket-sidebar-row", children: [_jsx("span", { children: qzaBasketLayout ? "VAT (20%)" : "VAT (20%)" }), _jsx("span", { children: fmtCurrency(vat) })] }), _jsxs("div", { className: "basket-sidebar-row basket-sidebar-row--total", children: [_jsx("span", { children: qzaBasketLayout ? "List price (inc. VAT)" : "Total" }), _jsx("span", { children: fmtCurrency(total) })] }), !qzaBasketLayout && (_jsx("div", { className: "basket-summary-waste", children: _jsxs("div", { className: "basket-waste-control", children: [_jsxs("label", { className: "basket-global-waste", children: [_jsx("input", { type: "checkbox", checked: wasteEnabled, onChange: (e) => setWasteEnabled(e.target.checked) }), _jsx("span", { children: "Add waste factor" })] }), _jsxs("label", { className: "basket-global-waste-percent", children: [_jsx("input", { type: "number", inputMode: "decimal", min: "0", step: "0.1", value: wastePercent, onChange: (e) => setWastePercent(e.target.value), disabled: !wasteEnabled, "aria-label": "Waste factor percent" }), _jsx("span", { children: "%" })] })] }) })), _jsx("label", { htmlFor: `${uid}-basket-reference`, className: "basket-sidebar-label", children: qzaBasketLayout ? "Enter email for your sharper quote" : "Your reference (optional)" }), _jsx("input", { id: `${uid}-basket-reference`, type: qzaBasketLayout ? "email" : "text", className: "basket-sidebar-input", value: reference, onChange: (e) => {
                                                     setReference(e.target.value);
                                                     if (qzaBasketLayout)
                                                         setQuoteContactError("");

package/dist/app/stages/EntryStage.d.ts

@@ -3,6 +3,18 @@ interface EntryStageProps {
     onPasteSchedule: (text: string, providedLines?: PhotoExtractedLine[], archiveSource?: boolean) => Promise<void> | void;
     onUploadSchedule: (file: File) => Promise<void> | void;
     onEntryModeChange: (mode: EntryMode) => void;
+    /** The last submitted input, so stepping back from the matches reopens the dialog with it. */
+    draft?: EntryDraft | null;
+    onSubmitDraft?: (draft: EntryDraft) => void;
+    /** Browser back out of the dialog mid-match - drop the match in flight. */
+    onCancelMatch?: () => void;
 }
-export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryModeChange }: EntryStageProps): import("react").JSX.Element;
+type QuickOrderTab = "paste" | "upload";
+export interface EntryDraft {
+    tab: QuickOrderTab;
+    text: string;
+    file: File | null;
+}
+export declare const ENTRY_DRAFT_KEY = "metron-quick-quote-entry";
+export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryModeChange, draft, onSubmitDraft, onCancelMatch }: EntryStageProps): import("react").JSX.Element;
 export {};

package/dist/app/stages/EntryStage.js

@@ -22,16 +22,21 @@ const STEPS = {
         { title: "Review Quote", desc: "Review the matched materials for your quote." },
     ],
 };
-export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryModeChange }) {
-    const [activeTab, setActiveTab] = useState(null);
+// The open dialog is its own history step, so browser back closes it rather than leaving the page.
+const DIALOG_HASH = "#quote-entry";
+export const ENTRY_DRAFT_KEY = "metron-quick-quote-entry";
+export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryModeChange, draft, onSubmitDraft, onCancelMatch }) {
+    const [activeTab, setActiveTab] = useState(() => (draft && typeof window !== "undefined" && window.location.hash === DIALOG_HASH ? draft.tab : null));
     const track = useTrack();
-    const [pastedText, setPastedText] = useState("");
-    const [uploadFile, setUploadFile] = useState(null);
+    const [pastedText, setPastedText] = useState(draft?.text ?? "");
+    const [uploadFile, setUploadFile] = useState(draft?.file ?? null);
     const [uploadError, setUploadError] = useState("");
     const [matching, setMatching] = useState(false);
     const [pageDragOver, setPageDragOver] = useState(false);
     const [photoPreviewUrl, setPhotoPreviewUrl] = useState(null);
     const dragDepth = useRef(0);
+    // Bumped on each submit and on cancel; a match that finds it moved on was cancelled.
+    const matchRun = useRef(0);
     const fileInputRef = useRef(null);
     const lineCount = pastedText.split("\n").filter((line) => line.trim()).length;
     const pasteLineProblem = validateLines(pastedText);
@@ -45,14 +50,77 @@ export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryM
         setPhotoPreviewUrl(url);
         return () => URL.revokeObjectURL(url);
     }, [uploadFile]);
+    // Back closes the dialog, forward reopens it on the tab it was showing.
+    const lastTab = useRef(activeTab ?? draft?.tab ?? null);
+    if (activeTab)
+        lastTab.current = activeTab;
+    // A refresh on the dialog's step reopens it with its tab and text; the file can't come back.
+    // After mount, not in the initial state, so a server-rendered host doesn't hit a hydration mismatch.
+    useEffect(() => {
+        if (draft || window.location.hash !== DIALOG_HASH)
+            return;
+        let saved = null;
+        try {
+            saved = JSON.parse(window.sessionStorage.getItem(ENTRY_DRAFT_KEY) ?? "null");
+        }
+        catch { }
+        if (!saved?.tab) {
+            // Nothing to reopen (a copied link in a new tab, or storage cleared): drop the hash, or
+            // the dialog would reuse this step and closing it would go back off the page.
+            const url = new URL(window.location.href);
+            url.hash = "";
+            window.history.replaceState(window.history.state, "", url);
+            return;
+        }
+        lastTab.current = saved.tab;
+        setActiveTab(saved.tab);
+        setPastedText(saved.text ?? "");
+    }, []);
+    // Only while the dialog is open: the closed screen's empty state would overwrite the
+    // saved draft before the effect above reads it on a StrictMode remount.
+    useEffect(() => {
+        if (!activeTab)
+            return;
+        try {
+            window.sessionStorage.setItem(ENTRY_DRAFT_KEY, JSON.stringify({ tab: activeTab, text: pastedText }));
+        }
+        catch { }
+    }, [activeTab, pastedText]);
+    useEffect(() => {
+        const onPopState = () => {
+            if (window.location.hash === DIALOG_HASH)
+                return setActiveTab(lastTab.current);
+            setActiveTab(null);
+            // Backing out of the dialog cancels a match in progress (a no-op when there isn't one);
+            // forward reopens the dialog with the input, ready to submit again.
+            matchRun.current++;
+            setMatching(false);
+            onCancelMatch?.();
+        };
+        window.addEventListener("popstate", onPopState);
+        return () => window.removeEventListener("popstate", onPopState);
+    }, []);
     const openWorkflow = (tab) => {
         track("method_selected", { method: tab });
         setActiveTab(tab);
         onEntryModeChange(null);
+        const hash = window.location.hash;
+        if (hash === DIALOG_HASH)
+            return;
+        const url = new URL(window.location.href);
+        url.hash = DIALOG_HASH;
+        // Our own state only, as in QuickQuote's writeQuoteHistory. A results/basket hash left
+        // behind by "start over" is reused, or back would land on that stale step.
+        const stale = hash === "#matched-products" || hash === "#quote-request";
+        window.history[stale ? "replaceState" : "pushState"]({ boqQuoteStage: "entry" }, "", url);
     };
     const closeWorkflow = () => {
         setActiveTab(null);
         onEntryModeChange(null);
+        // Drop the dialog's step too. Closing hides the dialog straight away, so a second
+        // Escape/click can't step back again past the page.
+        if (window.location.hash === DIALOG_HASH)
+            window.history.back();
     };
     // Like the close button, but not mid-match, where the modal is showing progress.
     useEscapeKey(Boolean(activeTab) && !matching, closeWorkflow);
@@ -70,15 +138,26 @@ export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryM
         setUploadFile(file);
     };
     const startMatching = async (run) => {
+        // Keep only what was submitted: stepping back to an image's dialog shouldn't still
+        // hold an earlier pasted list, or the other way round.
+        if (activeTab === "paste")
+            setUploadFile(null);
+        if (activeTab === "upload")
+            setPastedText("");
+        if (activeTab)
+            onSubmitDraft?.({ tab: activeTab, text: activeTab === "paste" ? pastedText : "", file: activeTab === "upload" ? uploadFile : null });
+        const id = ++matchRun.current;
         setMatching(true);
         try {
             await run();
         }
         finally {
-            setMatching(false);
+            if (id === matchRun.current)
+                setMatching(false);
         }
     };
     const matchPhoto = async (file) => {
+        const id = matchRun.current;
         try {
             const photo = await shrinkPhoto(file);
             const problem = validateUploadFile(photo);
@@ -96,9 +175,14 @@ export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryM
             const lines = Array.isArray(payload?.lines)
                 ? payload.lines.filter((line) => Boolean(line && typeof line === "object" && typeof line.text === "string"))
                 : undefined;
+            // Cancelled while the photo was being read - don't start matching it.
+            if (id !== matchRun.current)
+                return;
             await onPasteSchedule(text, lines, false);
         }
         catch (error) {
+            if (id !== matchRun.current)
+                return;
             track("error", { stage: "photo" });
             setUploadError(error?.message || "Failed to extract line items from image");
         }