@flowselections/pick-schermen-kwekers 1.0.60 → 1.0.64

package/dist-lib/hooks/usePickPrintStatus.js

@@ -0,0 +1,47 @@
+import { useMemo } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { supabase } from "@flowselections/core";
+import { keyedRpc } from "../lib/pick159.js";
+import { inPrintIds, parsePrintStatus } from "../lib/pickPrintStatus.js";
+import { pickMeasure } from "../lib/pickPerf.js";
+const db = keyedRpc(supabase);
+const MAX_IDS = 500;
+/**
+ * Eén aanroep voor alle zichtbare regels. Openbaar station (slug):
+ * pickstation_print_status; ingelogd scherm: logistics_print_status direct.
+ * Fout: "niet beschikbaar" met reden, nooit terugvallen op printed_at.
+ */
+export async function fetchPrintStatus(ids, slug) {
+    const list = ids.slice(0, MAX_IDS);
+    const { data, error } = await pickMeasure("printstatus", () => slug
+        ? db.rpc("pickstation_print_status", { p_slug: slug, p_queue_item_ids: list })
+        : db.rpc("logistics_print_status", { p_queue_item_ids: list }));
+    if (error) {
+        const missing = /could not find|does not exist|PGRST202/i.test(error.message);
+        return {
+            beschikbaar: false,
+            reden: missing ? "Printstatus nog niet beschikbaar: de Logistiek Engine is te oud." : "Printstatus kon niet worden opgehaald.",
+            byId: new Map(),
+        };
+    }
+    return parsePrintStatus(data);
+}
+export function usePickPrintStatus(ids, slug, enabled = true) {
+    const sorted = useMemo(() => Array.from(new Set(ids)).sort(), [ids]);
+    const q = useQuery({
+        queryKey: ["pick", "printStatus", slug ?? "-", sorted.join(",")],
+        enabled: enabled && sorted.length > 0,
+        queryFn: () => fetchPrintStatus(sorted, slug),
+        refetchInterval: (query) => {
+            const d = query.state.data;
+            return d && inPrintIds(d).size > 0 ? 3000 : 20000;
+        },
+    });
+    const inPrint = useMemo(() => inPrintIds(q.data), [q.data]);
+    return {
+        result: q.data ?? null,
+        loading: sorted.length > 0 && q.data === undefined,
+        inPrint,
+        refetch: q.refetch,
+    };
+}

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

@@ -29,6 +29,8 @@ export declare function usePickQueue(args: {
     pendingCount: number;
     printedCount: number;
     urgentCount: number;
+    /** Tellingen nog niet geladen: kopregel toont "…". */
+    countsLoading: boolean;
     loading: boolean;
     error: string | null;
     lockedIds: Set<string>;

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;;;;;;;;;;;IAoMG,gEAAgE;;IAEhE,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,iFAOnF;AACD,iEAAiE;AACjE,wBAAgB,WAAW,CAAC,OAAO,UAAO;;;YAQzC;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,CAAC,EAAE,SAAS,OAAO,EAAE,EAAE,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAEpF"}
+{"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;AAK9E,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;;;;;;;IAqNG,sDAAsD;;;;;;IAMtD,gEAAgE;;IAEhE,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,iFAOnF;AACD,iEAAiE;AACjE,wBAAgB,WAAW,CAAC,OAAO,UAAO;;;YAQzC;AAED,+EAA+E;AAC/E,wBAAgB,cAAc,CAAC,CAAC,EAAE,SAAS,OAAO,EAAE,EAAE,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAEpF"}

package/dist-lib/hooks/usePickQueue.js

@@ -1,7 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { keepPreviousData, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { pickApi, pickDb } from "../lib/pickApi.js";
 import { safeArray } from "../lib/pickTypes.js";
+import { isRowOpen } from "../lib/pick143.js";
+import { pickMark, pickMeasure } from "../lib/pickPerf.js";
 export const defaultFilters = {
     country: null,
     search: "",
@@ -64,7 +66,7 @@ export function usePickQueue(args) {
     const pickDayQuery = useQuery({
         queryKey: ["pick", "pickDay"],
         enabled: enabled && !syncQuery.isLoading,
-        queryFn: () => pickApi.currentPickDay(),
+        queryFn: () => pickMeasure("pickdag", () => pickApi.currentPickDay()),
         staleTime: 30000,
     });
     const pickDay = pickDayOverride ?? pickDayQuery.data ?? null;
@@ -96,7 +98,7 @@ export function usePickQueue(args) {
         queryKey: key,
         // Pas laden als de pickdag bekend is, anders flitst een oude lijst.
         enabled: enabled && (pickDayOverride != null || pickDayQuery.isFetched),
-        queryFn: () => pickApi.queue({
+        queryFn: () => pickMeasure("wachtrij", () => pickApi.queue({
             stationId,
             screenId,
             country: filters.country,
@@ -108,15 +110,16 @@ export function usePickQueue(args) {
             sortRules: filters.sortRules,
             page: filters.page,
             pageSize: filters.pageSize,
-        }),
+        })),
         // Vorige lijst alleen vasthouden bij filteren/bladeren binnen hetzelfde station en dezelfde pickdag.
         placeholderData: (prev, prevQuery) => (prevQuery && sameQueueScope(prevQuery.queryKey, key) ? prev : undefined),
     });
     const countsQuery = useQuery({
         queryKey: ["pick", "dayCounts", stationId ?? "-", screenId ?? "-", pickDay ?? "-"],
-        enabled: enabled && !pickDayQuery.isLoading,
-        queryFn: () => pickApi.dayCounts({ stationId, screenId, pickDay }),
-        placeholderData: keepPreviousData,
+        // 1.0.63: pas tellen als de pickdag bekend is (anders telt de database alle
+        // dagen en springt de kopregel), en geen oude telling van een andere dag tonen.
+        enabled: enabled && pickDay != null,
+        queryFn: () => pickMeasure("dagtelling", () => pickApi.dayCounts({ stationId, screenId, pickDay })),
     });
     // Locks komen primair via realtime binnen; deze poll is alleen terugval.
     const locksQuery = useQuery({
@@ -131,6 +134,7 @@ export function usePickQueue(args) {
         queryClient.invalidateQueries({ queryKey: ["pick", "dayCounts"] });
         queryClient.invalidateQueries({ queryKey: ["pick", "countryCounts"] });
         queryClient.invalidateQueries({ queryKey: ["pick", "dashboard"] });
+        queryClient.invalidateQueries({ queryKey: ["pick", "printStatus"] });
     }, [queryClient]);
     /**
      * Realtime-meldingen komen bij een Engine-sync in tientallen tegelijk binnen.
@@ -175,14 +179,31 @@ export function usePickQueue(args) {
             pickDb.removeChannel(channel);
         };
     }, [enabled, stationId, invalidate]);
+    // Laadtijd: van openen tot de eerste lijst binnen is.
+    useEffect(() => {
+        if (enabled)
+            pickMark("start");
+    }, [enabled]);
+    const firstReady = useRef(false);
+    useEffect(() => {
+        if (!firstReady.current && queueQuery.isSuccess) {
+            firstReady.current = true;
+            pickMark("lijst-klaar");
+        }
+    }, [queueQuery.isSuccess]);
+    // Afgeronde of geannuleerde rijen (bv. na een kar-vervanging) nooit tonen,
+    // ook niet uit de vastgehouden vorige lijst.
+    const openItems = useMemo(() => safeArray(queueQuery.data?.items).filter((i) => isRowOpen(i)), [queueQuery.data]);
     const lockedIds = useMemo(() => new Set(safeArray(locksQuery.data).map((l) => l.queue_item_id)), [locksQuery.data]);
     return {
-        items: safeArray(queueQuery.data?.items),
+        items: openItems,
         total: queueQuery.data?.total ?? 0,
         pickDay,
         pendingCount: countsQuery.data?.pending ?? 0,
         printedCount: countsQuery.data?.printed ?? 0,
         urgentCount: countsQuery.data?.urgent ?? 0,
+        /** Tellingen nog niet geladen: kopregel toont "…". */
+        countsLoading: countsQuery.data === undefined,
         loading: queueQuery.isPending,
         error: queueQuery.error instanceof Error ? queueQuery.error.message : null,
         lockedIds,