@flowselections/pick-schermen-kwekers 1.0.18 → 1.0.20

package/dist-lib/components/pick/QueueTable.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { Badge, Button, Table, TableBody, TableCell, TableHead, TableHeader, TableRow, } from "@flowselections/core";
-import { AlertTriangle, Check, Eye, Lock, Printer, RotateCcw } from "lucide-react";
-import { bufferOrdersOf, dedupeByUnit, displayCartColumn, displayCartCount, displayPageCount, sinceLabel, unitTitleOf } from "../../lib/pickTypes";
+import { AlertTriangle, Check, Eye, Loader2, Lock, Printer, RefreshCw, RotateCcw } from "lucide-react";
+import { bufferOrdersOf, cartColumnInfo, comparePickQueue, dedupeByUnit, displayCartCount, displayPageCount, sinceLabel, unitTitleOf } from "../../lib/pickTypes";
 import { getPickTranslator } from "../../lib/pickI18n";
 /**
  * Uit hoeveel pakbonnen een order bestaat, is pas bekend nadat er geprint is.
@@ -25,23 +25,22 @@ function priorityTone(priority, urgent) {
         return "bg-secondary text-secondary-foreground";
     return "bg-muted text-muted-foreground";
 }
-export function QueueTable({ items, lockedIds, statuses, documentTypes, busyId, onPick, onReprint, onPrintAll, onSelectPrinted, onMarkPrinted, onPreview, readOnly, t: translator, }) {
+export function QueueTable({ items, lockedIds, statuses, documentTypes, busyId, readinessById, onPick, onReprint, onPrintAll, onSelectPrinted, onMarkPrinted, onPreview, readOnly, t: translator, }) {
     const t = translator ?? getPickTranslator("nl");
-    // Nog te printen documenten altijd bovenaan; onderlinge volgorde blijft gelijk.
-    // Eén regel per eenheid: een bufferorder verschijnt nooit als losse orders.
+    // Volgorde identiek aan de keuze van "volgende uitprinten" (zie
+    // comparePickQueue): niet-geprinte regels bovenaan, en bij gelijke stand op
+    // kar-nummer, zodat K1 boven K2 boven K3 staat en het printen van boven naar
+    // beneden loopt. Eén regel per eenheid: een bufferorder verschijnt nooit als
+    // losse orders.
     const safeItems = dedupeByUnit(Array.isArray(items) ? items : [])
-        .map((item, index) => ({ item, index }))
-        .sort((a, b) => {
-        const aPrinted = a.item.printed_at ? 1 : 0;
-        const bPrinted = b.item.printed_at ? 1 : 0;
-        if (aPrinted !== bPrinted)
-            return aPrinted - bPrinted;
-        return a.index - b.index;
-    })
-        .map((entry) => entry.item);
+        .slice()
+        .sort(comparePickQueue);
     const docById = new Map((Array.isArray(documentTypes) ? documentTypes : []).map((d) => [d.id, d]));
     return (_jsxs(_Fragment, { children: [_jsx("div", { className: "hidden overflow-x-auto rounded-lg border md:block", children: _jsxs(Table, { children: [_jsx(TableHeader, { children: _jsxs(TableRow, { children: [_jsx(TableHead, { children: t("document") }), _jsx(TableHead, { children: t("order") }), _jsx(TableHead, { children: t("customer") }), _jsx(TableHead, { className: "text-right", children: t("lines") }), _jsx(TableHead, { className: "text-right", children: "Karren" }), _jsx(TableHead, { className: "text-right", children: "Pakbonnen" }), _jsx(TableHead, { className: "text-right", children: t("page") }), _jsx(TableHead, { children: t("status") }), _jsx(TableHead, { children: t("priority") }), _jsx(TableHead, { children: t("announced") }), _jsx(TableHead, { children: t("waiting") }), _jsx(TableHead, { className: "text-right", children: t("action") })] }) }), _jsxs(TableBody, { children: [safeItems.map((item) => {
                                     const printed = !!item.printed_at;
+                                    const readiness = readinessById[item.id];
+                                    const checking = !readiness || readiness.checking;
+                                    const ready = readiness?.ready === true;
                                     const locked = !printed && lockedIds.has(item.id);
                                     const doc = item.document_type_id ? docById.get(item.document_type_id) : undefined;
                                     const warnings = Array.isArray(item.warnings) ? item.warnings : [];
@@ -54,7 +53,10 @@ export function QueueTable({ items, lockedIds, statuses, documentTypes, busyId,
                                                 event.preventDefault();
                                                 onSelectPrinted?.(item);
                                             }
-                                        }, children: [_jsxs(TableCell, { className: "font-medium", children: [_jsxs("div", { className: "flex items-center gap-2", children: [unitTitleOf(item), warnings.length > 0 && (_jsx(AlertTriangle, { className: "h-4 w-4 text-destructive", "aria-label": t("warning") }))] }), _jsx("div", { className: "text-xs text-muted-foreground", children: doc?.name ?? "-" })] }), _jsx(TableCell, { children: bufferOrdersOf(item).length > 0 ? "" : item.order_number }), _jsx(TableCell, { children: item.customer_name }), _jsx(TableCell, { className: "text-right", children: item.line_count }), _jsx(TableCell, { className: "text-right", children: displayCartColumn(item) }), _jsx(TableCell, { className: "text-right", children: printedSlipCount(item) ?? "—" }), _jsx(TableCell, { className: "text-right", children: displayPageCount(item.line_count) }), _jsxs(TableCell, { children: [_jsx(Badge, { variant: printed ? "secondary" : "default", children: printed ? t("statusPrinted") : t("statusToPrint") }), printed && (_jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: new Date(item.printed_at).toLocaleTimeString([], {
+                                        }, children: [_jsxs(TableCell, { className: "font-medium", children: [_jsxs("div", { className: "flex items-center gap-2", children: [unitTitleOf(item), warnings.length > 0 && (_jsx(AlertTriangle, { className: "h-4 w-4 text-destructive", "aria-label": t("warning") }))] }), _jsx("div", { className: "text-xs text-muted-foreground", children: doc?.name ?? "-" })] }), _jsx(TableCell, { children: bufferOrdersOf(item).length > 0 ? "" : item.order_number }), _jsx(TableCell, { children: item.customer_name }), _jsx(TableCell, { className: "text-right", children: item.line_count }), _jsx(TableCell, { className: "text-right", children: (() => {
+                                                    const info = cartColumnInfo(item);
+                                                    return (_jsxs("div", { className: "flex flex-col items-end", children: [_jsx("span", { children: info.carts }), info.cartLabel && (_jsx("span", { className: "text-xs text-muted-foreground", children: info.cartLabel })), info.reason && (_jsx("span", { className: "text-xs text-muted-foreground", children: info.reason }))] }));
+                                                })() }), _jsx(TableCell, { className: "text-right", children: printedSlipCount(item) ?? "—" }), _jsx(TableCell, { className: "text-right", children: displayPageCount(item.line_count) }), _jsxs(TableCell, { children: [_jsx(Badge, { variant: printed ? "secondary" : "default", children: printed ? t("statusPrinted") : t("statusToPrint") }), printed && (_jsx("div", { className: "mt-1 text-xs text-muted-foreground", children: new Date(item.printed_at).toLocaleTimeString([], {
                                                             hour: "2-digit",
                                                             minute: "2-digit",
                                                         }) }))] }), _jsx(TableCell, { children: _jsx("span", { className: "rounded px-2 py-1 text-xs font-semibold " +
@@ -67,15 +69,18 @@ export function QueueTable({ items, lockedIds, statuses, documentTypes, busyId,
                                                             }, children: _jsx(Eye, { className: "h-5 w-5" }) })), !printed && onMarkPrinted && (_jsx("button", { type: "button", "aria-label": "Markeer " + item.document_number + " als geprint", title: "Markeer als geprint (zonder opnieuw printen)", disabled: readOnly || busyId === item.id, className: "inline-flex h-11 w-11 shrink-0 items-center justify-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground disabled:opacity-50", onClick: (e) => {
                                                                 e.stopPropagation();
                                                                 onMarkPrinted(item);
-                                                            }, children: _jsx(Check, { className: "h-5 w-5" }) })), printed ? (_jsxs(Button, { size: "sm", variant: "ghost", disabled: readOnly || busyId === item.id, onClick: (e) => {
+                                                            }, children: _jsx(Check, { className: "h-5 w-5" }) })), printed ? (_jsxs(Button, { size: "sm", variant: "ghost", disabled: readOnly || busyId === item.id || checking, onClick: (e) => {
                                                                 e.stopPropagation();
                                                                 (onPrintAll ?? onReprint ?? onPick)(item);
-                                                            }, children: [_jsx(RotateCcw, { className: "mr-1 h-4 w-4" }), t("print")] })) : locked ? (_jsxs("span", { className: "inline-flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(Lock, { className: "h-3.5 w-3.5" }), " ", t("inProgress")] })) : (_jsxs(Button, { size: "sm", variant: "outline", disabled: readOnly || busyId === item.id, onClick: (e) => {
+                                                            }, children: [checking ? (_jsx(Loader2, { className: "mr-1 h-4 w-4 animate-spin" })) : ready ? (_jsx(RotateCcw, { className: "mr-1 h-4 w-4" })) : (_jsx(RefreshCw, { className: "mr-1 h-4 w-4" })), checking ? "Pakbon controleren" : ready ? t("print") : "Pakbon ophalen"] })) : locked ? (_jsxs("span", { className: "inline-flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(Lock, { className: "h-3.5 w-3.5" }), " ", t("inProgress")] })) : (_jsxs(Button, { size: "sm", variant: "outline", disabled: readOnly || busyId === item.id || checking, onClick: (e) => {
                                                                 e.stopPropagation();
                                                                 (onPrintAll ?? onPick)(item);
-                                                            }, children: [_jsx(Printer, { className: "mr-1 h-4 w-4" }), t("print")] }))] }) })] }, item.id));
+                                                            }, children: [checking ? (_jsx(Loader2, { className: "mr-1 h-4 w-4 animate-spin" })) : !ready ? (_jsx(RefreshCw, { className: "mr-1 h-4 w-4" })) : (_jsx(Printer, { className: "mr-1 h-4 w-4" })), checking ? "Pakbon controleren" : ready ? t("print") : "Pakbon ophalen"] }))] }) })] }, item.id));
                                 }), safeItems.length === 0 && (_jsx(TableRow, { children: _jsx(TableCell, { colSpan: 11, className: "py-10 text-center text-muted-foreground", children: t("emptyQueue") }) }))] })] }) }), _jsxs("div", { className: "space-y-3 md:hidden", children: [safeItems.map((item) => {
                         const printed = !!item.printed_at;
+                        const readiness = readinessById[item.id];
+                        const checking = !readiness || readiness.checking;
+                        const ready = readiness?.ready === true;
                         const locked = !printed && lockedIds.has(item.id);
                         const doc = item.document_type_id ? docById.get(item.document_type_id) : undefined;
                         const warnings = Array.isArray(item.warnings) ? item.warnings : [];
@@ -95,16 +100,19 @@ export function QueueTable({ items, lockedIds, statuses, documentTypes, busyId,
                                                                 hour: "2-digit",
                                                                 minute: "2-digit",
                                                             }) })), _jsx("span", { className: "rounded px-2 py-0.5 text-xs font-semibold " +
-                                                                priorityTone(item.priority, item.is_urgent), children: item.is_urgent ? t("urgent") : item.priority })] })] })] }), _jsxs("div", { className: "mt-2 min-w-0 space-y-0.5 text-sm", children: [bufferOrdersOf(item).length > 0 ? null : (_jsx("p", { className: "truncate text-foreground", children: item.order_number })), _jsx("p", { className: "truncate text-muted-foreground", children: item.customer_name })] }), _jsxs("div", { className: "mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground", children: [_jsxs("span", { children: [t("lines"), ": ", item.line_count] }), _jsxs("span", { children: ["Karren: ", displayCartColumn(item)] }), _jsxs("span", { children: ["Pakbonnen: ", printedSlipCount(item) ?? "—"] }), _jsxs("span", { children: [t("page"), ": ", displayPageCount(item.line_count)] }), _jsxs("span", { children: [t("announced"), ":", " ", new Date(item.announced_at).toLocaleTimeString(t.locale, {
+                                                                priorityTone(item.priority, item.is_urgent), children: item.is_urgent ? t("urgent") : item.priority })] })] })] }), _jsxs("div", { className: "mt-2 min-w-0 space-y-0.5 text-sm", children: [bufferOrdersOf(item).length > 0 ? null : (_jsx("p", { className: "truncate text-foreground", children: item.order_number })), _jsx("p", { className: "truncate text-muted-foreground", children: item.customer_name })] }), _jsxs("div", { className: "mt-2 flex flex-wrap gap-x-3 gap-y-1 text-xs text-muted-foreground", children: [_jsxs("span", { children: [t("lines"), ": ", item.line_count] }), (() => {
+                                            const info = cartColumnInfo(item);
+                                            return (_jsxs("span", { children: ["Karren: ", info.carts, info.cartLabel ? ` · ${info.cartLabel}` : "", info.reason ? ` · ${info.reason}` : ""] }));
+                                        })(), _jsxs("span", { children: ["Pakbonnen: ", printedSlipCount(item) ?? "—"] }), _jsxs("span", { children: [t("page"), ": ", displayPageCount(item.line_count)] }), _jsxs("span", { children: [t("announced"), ":", " ", new Date(item.announced_at).toLocaleTimeString(t.locale, {
                                                     hour: "2-digit",
                                                     minute: "2-digit",
-                                                })] }), _jsxs("span", { children: [t("waiting"), ": ", sinceLabel(item.announced_at)] })] }), _jsxs("div", { className: "mt-3", children: [printed ? (_jsxs(Button, { size: "lg", variant: "outline", className: "h-12 w-full", disabled: readOnly || busyId === item.id, onClick: (e) => {
+                                                })] }), _jsxs("span", { children: [t("waiting"), ": ", sinceLabel(item.announced_at)] })] }), _jsxs("div", { className: "mt-3", children: [printed ? (_jsxs(Button, { size: "lg", variant: "outline", className: "h-12 w-full", disabled: readOnly || busyId === item.id || checking, onClick: (e) => {
                                                 e.stopPropagation();
                                                 (onPrintAll ?? onReprint ?? onPick)(item);
-                                            }, children: [_jsx(RotateCcw, { className: "mr-2 h-4 w-4" }), t("print")] })) : locked ? (_jsxs("span", { className: "inline-flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(Lock, { className: "h-3.5 w-3.5" }), " ", t("inProgress")] })) : (_jsxs(Button, { size: "lg", className: "h-12 w-full", disabled: readOnly || busyId === item.id, onClick: (e) => {
+                                            }, children: [checking ? (_jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" })) : ready ? (_jsx(RotateCcw, { className: "mr-2 h-4 w-4" })) : (_jsx(RefreshCw, { className: "mr-2 h-4 w-4" })), checking ? "Pakbon controleren" : ready ? t("print") : "Pakbon ophalen"] })) : locked ? (_jsxs("span", { className: "inline-flex items-center gap-1 text-xs text-muted-foreground", children: [_jsx(Lock, { className: "h-3.5 w-3.5" }), " ", t("inProgress")] })) : (_jsxs(Button, { size: "lg", className: "h-12 w-full", disabled: readOnly || busyId === item.id || checking, onClick: (e) => {
                                                 e.stopPropagation();
                                                 (onPrintAll ?? onPick)(item);
-                                            }, children: [_jsx(Printer, { className: "mr-2 h-4 w-4" }), t("print")] })), !printed && onMarkPrinted && (_jsxs(Button, { size: "sm", variant: "ghost", className: "mt-2 w-full", disabled: readOnly || busyId === item.id, onClick: (e) => {
+                                            }, children: [checking ? (_jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" })) : !ready ? (_jsx(RefreshCw, { className: "mr-2 h-4 w-4" })) : (_jsx(Printer, { className: "mr-2 h-4 w-4" })), checking ? "Pakbon controleren" : ready ? t("print") : "Pakbon ophalen"] })), !printed && onMarkPrinted && (_jsxs(Button, { size: "sm", variant: "ghost", className: "mt-2 w-full", disabled: readOnly || busyId === item.id, onClick: (e) => {
                                                 e.stopPropagation();
                                                 onMarkPrinted(item);
                                             }, children: [_jsx(Check, { className: "mr-2 h-4 w-4" }), "Markeer als geprint"] }))] })] }, item.id));

package/dist-lib/hooks/usePickQueue.d.ts

@@ -33,6 +33,8 @@ export declare function usePickQueue(args: {
     error: string | null;
     lockedIds: Set<string>;
     realtimeOk: boolean;
+    /** Tijdstip van de laatste heropbouw na een buffer-seintje van de Engine. */
+    rebuiltAt: number | null;
     refresh: () => void;
 };
 /** Houdt bij dat dit scherm online is en ruimt verlopen locks op. */

package/dist-lib/hooks/usePickQueue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePickQueue.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickQueue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAY,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG9E,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,mDAAmD;IACnD,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,eAAO,MAAM,cAAc,EAAE,YAS5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;;;;;;;;;;;;EAoJA;AAED,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM;;EAuBhG;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,0FAOnF;AACD,iEAAiE;AACjE,wBAAgB,WAAW,CAAC,OAAO,UAAO;;;aAQzC"}
+{"version":3,"file":"usePickQueue.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickQueue.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAY,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAG9E,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,mDAAmD;IACnD,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,YAAY,EAAE,CAAC;CAC3B;AAED,eAAO,MAAM,cAAc,EAAE,YAS5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,2EAA2E;IAC3E,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;;;;;;;;;;;IAgLG,6EAA6E;;;EAIhF;AAED,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,SAAS,CAAC,EAAE,MAAM;;EAuBhG;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,0FAOnF;AACD,iEAAiE;AACjE,wBAAgB,WAAW,CAAC,OAAO,UAAO;;;aAQzC"}

package/dist-lib/hooks/usePickQueue.js

@@ -39,6 +39,20 @@ export function usePickQueue(args) {
         refetchInterval: 60000,
         retry: false,
     });
+    /**
+     * Seintjes van de Engine: een gesloten buffer of een losgekoppelde order.
+     * Zodra er zo'n seintje is, worden de regels opnieuw opgebouwd vanuit de
+     * Engine — de oude groepering per eenheid wordt niet meer getoond.
+     */
+    const bufferEventsQuery = useQuery({
+        queryKey: ["pick", "bufferEvents"],
+        enabled,
+        queryFn: () => pickApi.applyBufferEvents(),
+        refetchInterval: 15000,
+        retry: false,
+    });
+    const rebuildCount = bufferEventsQuery.data?.events ?? 0;
+    const [rebuiltAt, setRebuiltAt] = useState(null);
     const pickDayQuery = useQuery({
         queryKey: ["pick", "pickDay"],
         enabled: enabled && !syncQuery.isLoading,
@@ -54,6 +68,20 @@ export function usePickQueue(args) {
         queryClient.invalidateQueries({ queryKey: ["pick", "queue"] });
         queryClient.invalidateQueries({ queryKey: ["pick", "dayCounts"] });
     }, [syncQuery.data, queryClient]);
+    /**
+     * Na een buffer-seintje: de oude regels uit het geheugen gooien en alles
+     * opnieuw ophalen bij de Engine. Niets uit cache tonen.
+     */
+    useEffect(() => {
+        if (rebuildCount <= 0)
+            return;
+        queryClient.removeQueries({ queryKey: ["pick", "queue"] });
+        queryClient.invalidateQueries({ queryKey: ["pick", "pickDay"] });
+        queryClient.invalidateQueries({ queryKey: ["pick", "pickDays"] });
+        queryClient.invalidateQueries({ queryKey: ["pick", "dayCounts"] });
+        queryClient.invalidateQueries({ queryKey: ["pick", "countryCounts"] });
+        setRebuiltAt(Date.now());
+    }, [rebuildCount, bufferEventsQuery.dataUpdatedAt, queryClient]);
     const key = useMemo(() => ["pick", "queue", stationId ?? "-", screenId ?? "-", pickDay ?? "-", filters], [stationId, screenId, pickDay, filters]);
     const queueQuery = useQuery({
         queryKey: key,
@@ -142,6 +170,8 @@ export function usePickQueue(args) {
         error: queueQuery.error instanceof Error ? queueQuery.error.message : null,
         lockedIds,
         realtimeOk,
+        /** Tijdstip van de laatste heropbouw na een buffer-seintje van de Engine. */
+        rebuiltAt,
         refresh: invalidateNow,
     };
 }

package/dist-lib/hooks/useShippingNoteStatus.d.ts

@@ -0,0 +1,27 @@
+import { type ShippingNoteStatus } from "../lib/shippingNoteStatus";
+export interface WatchedShippingNote {
+    /** Het print_job-id van de pakbon; leidend bij het opvragen van de status. */
+    jobId: string;
+    cartId: string | null;
+    cartLabel: string | null;
+    state: ShippingNoteStatus;
+}
+/**
+ * Volgt per geprinte kar of de verzendbrief wordt klaargezet, op Floriday
+ * wacht, geprint is of is mislukt. Uitsluitend lezen: er wordt nooit een nieuwe
+ * aanvraag of printopdracht gemaakt.
+ */
+export declare function useShippingNoteStatus(): {
+    shippingNotes: WatchedShippingNote[];
+    watchShippingNotes: (entries: {
+        jobId: string;
+        cartId?: string | null;
+        cartLabel?: string | null;
+    }[]) => void;
+    clearShippingNotes: () => void;
+    refreshShippingNotesNow: () => Promise<{
+        ok: boolean;
+        message: string | null;
+    }>;
+};
+//# sourceMappingURL=useShippingNoteStatus.d.ts.map

package/dist-lib/hooks/useShippingNoteStatus.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useShippingNoteStatus.d.ts","sourceRoot":"","sources":["../../src/hooks/useShippingNoteStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,kBAAkB,EACxB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,mBAAmB;IAClC,8EAA8E;IAC9E,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAMD;;;;GAIG;AACH,wBAAgB,qBAAqB;;kCAYvB;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,EAAE;;mCA4C5B,OAAO,CAAC;QAC5D,EAAE,EAAE,OAAO,CAAC;QACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;KACxB,CAAC;EAuFH"}

package/dist-lib/hooks/useShippingNoteStatus.js

@@ -0,0 +1,132 @@
+import { useCallback, useEffect, useRef, useState } from "react";
+import { isWaitingShippingNote, readShippingNoteStatus, requestShippingNoteNow, } from "../lib/shippingNoteStatus";
+/** Ververs elke 3 seconden, maximaal 15 minuten. */
+const INTERVAL_MS = 3000;
+const MAX_MS = 15 * 60 * 1000;
+/**
+ * Volgt per geprinte kar of de verzendbrief wordt klaargezet, op Floriday
+ * wacht, geprint is of is mislukt. Uitsluitend lezen: er wordt nooit een nieuwe
+ * aanvraag of printopdracht gemaakt.
+ */
+export function useShippingNoteStatus() {
+    const [notes, setNotes] = useState([]);
+    const notesRef = useRef([]);
+    const startedAt = useRef({});
+    const apply = useCallback((next) => {
+        notesRef.current = next;
+        setNotes(next);
+    }, []);
+    /** Start (of hergebruik) de statuscontrole voor de geprinte karren. */
+    const watchShippingNotes = useCallback((entries) => {
+        const now = Date.now();
+        const existing = new Map(notesRef.current.map((note) => [note.jobId, note]));
+        const next = [];
+        let hasNew = false;
+        for (const entry of Array.isArray(entries) ? entries : []) {
+            if (!entry?.jobId)
+                continue;
+            const prev = existing.get(entry.jobId);
+            if (!startedAt.current[entry.jobId]) {
+                startedAt.current[entry.jobId] = now;
+                hasNew = true;
+            }
+            next.push(prev ?? {
+                jobId: entry.jobId,
+                cartId: entry.cartId ?? null,
+                cartLabel: entry.cartLabel ?? null,
+                state: {
+                    status: null,
+                    message: null,
+                    attempts: null,
+                    nextAttemptAt: null,
+                    source: null,
+                },
+            });
+        }
+        apply(next);
+        // Eén directe aanvraag per printactie, niet per kar en niet bij verversen.
+        if (hasNew)
+            void requestShippingNoteNow();
+    }, [apply]);
+    const clearShippingNotes = useCallback(() => {
+        startedAt.current = {};
+        apply([]);
+    }, [apply]);
+    /**
+     * Handmatig: vraagt de shell één keer om nu alle openstaande verzendbrieven op
+     * te halen en leest daarna de status van de karren die in beeld staan. Blijft
+     * alleen-lezen richting Floriday en maakt nooit een tweede aanvraag.
+     */
+    const refreshShippingNotesNow = useCallback(async () => {
+        const result = await requestShippingNoteNow();
+        const current = notesRef.current;
+        if (current.length > 0) {
+            const results = await Promise.all(current.map(async (note) => {
+                try {
+                    return { jobId: note.jobId, state: await readShippingNoteStatus(note.jobId, note.cartId) };
+                }
+                catch {
+                    return null;
+                }
+            }));
+            const byJob = new Map(results
+                .filter((r) => r !== null)
+                .map((r) => [r.jobId, r.state]));
+            if (byJob.size > 0) {
+                apply(notesRef.current.map((note) => byJob.has(note.jobId) ? { ...note, state: byJob.get(note.jobId) } : note));
+            }
+        }
+        return result;
+    }, [apply]);
+    const key = notes.map((note) => note.jobId).join(",");
+    useEffect(() => {
+        if (!key)
+            return;
+        let stopped = false;
+        let timer = null;
+        const stop = () => {
+            if (timer !== null) {
+                window.clearInterval(timer);
+                timer = null;
+            }
+        };
+        const read = async () => {
+            const current = notesRef.current;
+            const pending = current.filter((note) => {
+                if (note.state.status && !isWaitingShippingNote(note.state.status))
+                    return false;
+                const since = startedAt.current[note.jobId] ?? Date.now();
+                return Date.now() - since < MAX_MS;
+            });
+            if (pending.length === 0) {
+                stop();
+                return;
+            }
+            const results = await Promise.all(pending.map(async (note) => {
+                try {
+                    return { jobId: note.jobId, state: await readShippingNoteStatus(note.jobId, note.cartId) };
+                }
+                catch {
+                    // Status tijdelijk niet leesbaar; volgende ronde volgt.
+                    return null;
+                }
+            }));
+            if (stopped)
+                return;
+            const byJob = new Map(results.filter((r) => r !== null)
+                .map((r) => [r.jobId, r.state]));
+            if (byJob.size === 0)
+                return;
+            const updated = notesRef.current.map((note) => byJob.has(note.jobId) ? { ...note, state: byJob.get(note.jobId) } : note);
+            notesRef.current = updated;
+            setNotes(updated);
+        };
+        void read();
+        timer = window.setInterval(() => void read(), INTERVAL_MS);
+        return () => {
+            stopped = true;
+            stop();
+        };
+    }, [key]);
+    return { shippingNotes: notes, watchShippingNotes, clearShippingNotes, refreshShippingNotesNow };
+}

package/dist-lib/index.d.ts

@@ -14,6 +14,7 @@ export * from './lib/pickI18n';
 export { QueueTable } from './components/pick/QueueTable';
 export { ShippingNoteScan } from './components/pick/ShippingNoteScan';
 export * from './lib/shippingNote';
+export * from './lib/shippingNoteStatus';
 export { PickScherm } from './components/pick/PickScherm';
 export { PickstationsPage } from './components/PickstationsPage';
 export { PickPublicPage } from './components/PickPublicPage';

package/dist-lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGvD,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,cAAc,oBAAoB,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAE9E,eAAO,MAAM,kBAAkB,EAAE,UAYhC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGvD,cAAc,kBAAkB,CAAC;AACjC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,cAAc,iBAAiB,CAAC;AAChC,cAAc,eAAe,CAAC;AAC9B,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sBAAsB,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,cAAc,gBAAgB,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AACtE,cAAc,oBAAoB,CAAC;AACnC,cAAc,0BAA0B,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,GACxB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AAC9F,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,wCAAwC,CAAC;AAE9E,eAAO,MAAM,kBAAkB,EAAE,UAYhC,CAAC"}

package/dist-lib/index.js

@@ -30,6 +30,7 @@ export * from './lib/pickI18n';
 export { QueueTable } from './components/pick/QueueTable';
 export { ShippingNoteScan } from './components/pick/ShippingNoteScan';
 export * from './lib/shippingNote';
+export * from './lib/shippingNoteStatus';
 export { PickScherm } from './components/pick/PickScherm';
 export { PickstationsPage } from './components/PickstationsPage';
 export { PickPublicPage } from './components/PickPublicPage';