@flowselections/pick-schermen-kwekers 1.0.62 → 1.0.66

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,