@flowselections/floriday-afhandeling-module 1.0.43 → 1.0.45

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

@@ -6,6 +6,8 @@ export interface PickAgendaOrder {
     carts: number;
     plants: number;
     shifted: boolean;
+    /** Verkoop-module zegt: deze order is afgehandeld (verzonden/geleverd). */
+    fulfilled?: boolean;
 }
 /** Eén dagregel uit `logistics_pick_agenda`. */
 export interface PickAgendaDay {
@@ -16,6 +18,8 @@ export interface PickAgendaDay {
     inPreparation: number;
     ready: number;
     shiftedCount: number;
+    /** Aantal orders van deze dag dat al is afgehandeld. */
+    doneCount: number;
     orders: PickAgendaOrder[];
 }
 export declare function usePickAgenda(from: string | null, to: string | null): {

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

@@ -1 +1 @@
-{"version":3,"file":"usePickAgenda.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickAgenda.ts"],"names":[],"mappings":"AAOA,kDAAkD;AAClD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AAuCD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;;;;;EAuGnE"}
+{"version":3,"file":"usePickAgenda.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickAgenda.ts"],"names":[],"mappings":"AAQA,kDAAkD;AAClD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,wDAAwD;IACxD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AAwCD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;;;;;EA6GnE"}

package/dist-lib/hooks/usePickAgenda.js

@@ -1,6 +1,7 @@
 import { useEffect, useMemo } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { supabase } from "../integrations/supabase/moduleClient";
+import { debounce, subscribeTable } from "../lib/realtimeBus";
 import { useKnownOrders } from "./useKnownOrders";
 import { useOrderPickDates } from "./useOrderPickDates";
 function toOrders(value) {
@@ -30,9 +31,10 @@ function shiftDay(day, delta) {
 }
 export function usePickAgenda(from, to) {
     const queryClient = useQueryClient();
-    // Ruimer ophalen dan gevraagd: de Engine schuift oude taken naar vandaag, wij
-    // zetten ze terug op hun oorspronkelijke dag en dat kan buiten de week vallen.
-    const wideFrom = from ? shiftDay(from, -180) : null;
+    // Beperkte marge rond de zichtbare week: de Engine schuift oude taken naar
+    // vandaag en wij zetten ze terug op hun oorspronkelijke dag. Een venster van
+    // een half jaar haalde honderden dagen op die daarna toch werden weggefilterd.
+    const wideFrom = from ? shiftDay(from, -21) : null;
     const wideTo = to ? shiftDay(to, 30) : null;
     const queryKey = ["logistics-pick-agenda", wideFrom, wideTo];
     const query = useQuery({
@@ -41,7 +43,10 @@ export function usePickAgenda(from, to) {
         staleTime: 30000,
         retry: false,
         refetchInterval: 60000,
+        refetchIntervalInBackground: false,
         refetchOnWindowFocus: true,
+        // Vorige week blijft zichtbaar tijdens het laden van een nieuwe week.
+        placeholderData: (prev) => prev,
         queryFn: async () => {
             const { data, error } = await supabase.rpc("logistics_pick_agenda", {
                 p_from: wideFrom,
@@ -58,29 +63,29 @@ export function usePickAgenda(from, to) {
                 inPreparation: Number(d.in_preparation ?? 0),
                 ready: Number(d.ready ?? 0),
                 shiftedCount: Number(d.shifted_count ?? 0),
+                doneCount: 0,
                 orders: toOrders(d.orders),
             }));
         },
     });
-    // Ververs zodra de Engine taken wijzigt. Elke hook-instantie krijgt een eigen
-    // kanaalnaam; hergebruik van dezelfde naam laat Supabase een al-geabonneerd
-    // kanaal terugvinden en gooit "cannot add postgres_changes after subscribe()".
+    // Ververs zodra de Engine taken wijzigt, via één gedeelde verbinding en met
+    // samenvoegen van seintjes: de Engine schrijft tientallen taken achter elkaar
+    // en elke wijziging afzonderlijk opnieuw ophalen liet het scherm blokkeren.
     useEffect(() => {
-        const channel = supabase
-            .channel(`pick-agenda-logistics-tasks-${Math.random().toString(36).slice(2)}`)
-            .on("postgres_changes", { event: "*", schema: "public", table: "logistics_tasks" }, () => {
+        const refresh = debounce(() => {
             queryClient.invalidateQueries({ queryKey: ["logistics-pick-agenda"] });
-        })
-            .subscribe();
+        }, 750);
+        const off = subscribeTable("logistics_tasks", refresh);
         return () => {
-            supabase.removeChannel(channel);
+            refresh.cancel();
+            off();
         };
     }, [queryClient]);
     // Orders die de Verkoop-module niet kent horen hier niet te staan, en orders
     // die de Engine ná hun leverdatum plant gaan terug naar hun eigen dag. De
     // dagtotalen worden opnieuw opgeteld uit wat overblijft.
-    const { isKnownRef } = useKnownOrders();
-    const { correctPickDate } = useOrderPickDates();
+    const { isKnownRef, isFulfilledRef } = useKnownOrders();
+    const { correctPickDate } = useOrderPickDates(wideFrom, wideTo);
     const days = useMemo(() => {
         const perDay = new Map();
         for (const d of query.data ?? []) {
@@ -91,7 +96,7 @@ export function usePickAgenda(from, to) {
                     continue;
                 const dag = correctPickDate(o.orderRef, d.pickDate);
                 const list = perDay.get(dag) ?? [];
-                list.push(o);
+                list.push({ ...o, fulfilled: isFulfilledRef(o.orderRef) });
                 perDay.set(dag, list);
             }
         }
@@ -101,6 +106,7 @@ export function usePickAgenda(from, to) {
                 continue;
             if (to && pickDate > to)
                 continue;
+            const doneCount = orders.filter((o) => o.fulfilled || o.status === "done" || o.status === "completed").length;
             const ready = orders.filter((o) => o.status === "ready" || o.status === "done").length;
             out.push({
                 pickDate,
@@ -111,11 +117,12 @@ export function usePickAgenda(from, to) {
                 ready,
                 inPreparation: Math.max(0, orders.length - ready),
                 shiftedCount: orders.filter((o) => o.shifted).length,
+                doneCount,
             });
         }
         out.sort((a, b) => a.pickDate.localeCompare(b.pickDate));
         return out;
-    }, [query.data, isKnownRef, correctPickDate, from, to]);
+    }, [query.data, isKnownRef, isFulfilledRef, correctPickDate, from, to]);
     const byDate = new Map();
     for (const d of days)
         byDate.set(d.pickDate, d);

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

@@ -1,10 +1,16 @@
+import { type PickModeInfo } from "../lib/pickMode";
 /**
  * De Engine bepaalt de actieve pickmethode. Alleen bij "picken per kar"
- * bestaat er een karcontrolestap. Zonder antwoord blijft die verborgen.
+ * bestaat er een karcontrolestap. Mislukt het ophalen, dan blijft de laatst
+ * bekende werkwijze gelden en melden we dat als fout — nooit stil uitzetten.
  */
 export declare function usePickMode(): {
-    pickMode: "order" | "buffer" | "cart" | "smallest" | null;
+    pickMode: import("..").PickMode;
     showCartControl: boolean;
     isLoading: boolean;
+    isError: boolean;
+    isUnknown: boolean;
+    error: string | undefined;
+    refetch: (options?: import("@tanstack/query-core").RefetchOptions) => Promise<import("@tanstack/query-core").QueryObserverResult<NoInfer<PickModeInfo>, Error>>;
 };
 //# sourceMappingURL=usePickMode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"usePickMode.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickMode.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,wBAAgB,WAAW;;;;EA0B1B"}
+{"version":3,"file":"usePickMode.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickMode.ts"],"names":[],"mappings":"AAEA,OAAO,EAKL,KAAK,YAAY,EAClB,MAAM,iBAAiB,CAAC;AAEzB;;;;GAIG;AACH,wBAAgB,WAAW;;;;;;;;EAkC1B"}

package/dist-lib/hooks/usePickMode.js

@@ -1,19 +1,20 @@
 import { useEffect } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { fetchPickMode, startPickModeWatch, subscribePickMode, } from "../lib/pickMode";
+import { fetchPickMode, getPickMode, startPickModeWatch, subscribePickMode, } from "../lib/pickMode";
 /**
  * De Engine bepaalt de actieve pickmethode. Alleen bij "picken per kar"
- * bestaat er een karcontrolestap. Zonder antwoord blijft die verborgen.
+ * bestaat er een karcontrolestap. Mislukt het ophalen, dan blijft de laatst
+ * bekende werkwijze gelden en melden we dat als fout — nooit stil uitzetten.
  */
 export function usePickMode() {
     const queryClient = useQueryClient();
     const query = useQuery({
         queryKey: ["logistics-pick-mode"],
-        staleTime: 5000,
-        refetchInterval: 30000,
-        refetchOnWindowFocus: true,
-        refetchOnMount: "always",
-        retry: false,
+        staleTime: 60000,
+        refetchOnWindowFocus: false,
+        refetchOnMount: false,
+        retry: 1,
+        retryDelay: (attempt) => Math.min(1000 * 2 ** attempt, 15000),
         queryFn: fetchPickMode,
     });
     // Live meelopen met wijzigingen in de instellingen van de Engine.
@@ -23,9 +24,16 @@ export function usePickMode() {
             queryClient.invalidateQueries({ queryKey: ["logistics-pick-mode"] });
         });
     }, [queryClient]);
+    // Bij een fout heeft de query geen data; de module-cache houdt de laatst
+    // succesvol opgehaalde werkwijze vast.
+    const info = query.data ?? getPickMode();
     return {
-        pickMode: query.data?.pickMode ?? null,
-        showCartControl: query.data?.showCartControl === true,
+        pickMode: info.pickMode,
+        showCartControl: info.showCartControl === true,
         isLoading: query.isLoading,
+        isError: query.isError,
+        isUnknown: info.status !== "ok",
+        error: query.error instanceof Error ? query.error.message : info.lastError,
+        refetch: query.refetch,
     };
 }

package/dist-lib/index.d.ts

@@ -1,4 +1,3 @@
-import type { FlowModule } from "@flowselections/core";
 export * from "./_core-safelist";
 export { LeveringenPage } from "./components/afhandeling/LeveringenPage";
 export { VervoerdersPage } from "./components/afhandeling/VervoerdersPage";
@@ -16,5 +15,5 @@ export { calculateEarliestDeliveryDate, calculateOrderPlanning, DEFAULT_PICKUP_M
 export { carrierLeadDaysFromMoments, normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget, type CarrierOrderTarget, type CarrierPlanningInfo, } from "./lib/carrierPlanning";
 export { ensurePickMode, fetchPickMode, getPickMode, refreshPickMode, startPickModeWatch, subscribePickMode, type PickMode, type PickModeInfo } from "./lib/pickMode";
 export { usePickMode } from "./hooks/usePickMode";
-export declare const floridayAfhandelingModule: FlowModule;
+export { floridayAfhandelingModule } from "./moduleDefinition";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAExF,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACzB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtK,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAalD,eAAO,MAAM,yBAAyB,EAAE,UAmBvC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAExF,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACzB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtK,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist-lib/index.js

@@ -1,4 +1,3 @@
-import { PackageCheck, CalendarCheck, CalendarRange, ClipboardCheck } from "lucide-react";
 export * from "./_core-safelist";
 export { LeveringenPage } from "./components/afhandeling/LeveringenPage";
 export { VervoerdersPage } from "./components/afhandeling/VervoerdersPage";
@@ -14,37 +13,6 @@ export { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettin
 export { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
 export { calculateEarliestDeliveryDate, calculateOrderPlanning, DEFAULT_PICKUP_MOMENT, } from "./lib/planning";
 export { carrierLeadDaysFromMoments, normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget, } from "./lib/carrierPlanning";
-import { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettingsCard";
-import { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
-import { ensurePickMode, getPickMode } from "./lib/pickMode";
 export { ensurePickMode, fetchPickMode, getPickMode, refreshPickMode, startPickModeWatch, subscribePickMode } from "./lib/pickMode";
 export { usePickMode } from "./hooks/usePickMode";
-const baseChildren = [
-    { label: "Pick Agenda", href: "/afhandeling/picking", icon: CalendarCheck },
-    { label: "Planning en leveringen", href: "/afhandeling/leveringen", icon: CalendarRange },
-];
-const cartControlChild = {
-    label: "Controle karren",
-    href: "/afhandeling/controle",
-    icon: ClipboardCheck,
-};
-export const floridayAfhandelingModule = {
-    id: "afhandeling",
-    name: "Afhandeling",
-    version: "1.4.0",
-    nav: {
-        label: "Afhandeling",
-        href: "/afhandeling/picking",
-        icon: PackageCheck,
-        // De Engine beslist: karcontrole hoort alleen bij "picken per kar".
-        // Zonder antwoord blijft het item verborgen (fail closed).
-        get children() {
-            void ensurePickMode();
-            return getPickMode().showCartControl ? [...baseChildren, cartControlChild] : baseChildren;
-        },
-    },
-    settingsCards: [
-        { component: VervoerdersSettingsCard, order: 80 },
-        { component: AfhandelingSettingsCard, order: 100 },
-    ],
-};
+export { floridayAfhandelingModule } from "./moduleDefinition";