@flowselections/pick-schermen-kwekers 1.0.93 → 1.0.95

package/dist-lib/lib/werkvloer.d.ts

@@ -37,4 +37,10 @@ export declare function reprintQuestion(printedAt: string | null, tz: string | n
 export declare const ACCEPTED_STATUSES: Set<string>;
 /** Wachtrij-telling als echt getal: "12 orders nog te printen". */
 export declare function todoCountText(n: number): string;
+/**
+ * Bevestigvraag van de Engine (`payload.bevestigVraag`) voor een kaart: de
+ * eerste gevulde vraag van zijn karregels, anders null. Het scherm rekent zelf
+ * nooit of een kar vol is; het toont alleen wat de Engine vraagt.
+ */
+export declare function confirmQuestionOf(card: WerkvloerCard | null | undefined): string | null;
 //# sourceMappingURL=werkvloer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"werkvloer.d.ts","sourceRoot":"","sources":["../../src/lib/werkvloer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAIrD;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,qDAAqD;IACrD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,6FAA6F;AAC7F,wBAAgB,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAsBlE;AAED,uFAAuF;AACvF,wBAAgB,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAM7D;AASD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED,yDAAyD;AACzD,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAIvD;AAcD,gFAAgF;AAChF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,OAAa,GAAG,MAAM,GAAG,IAAI,CASjG;AAED,2CAA2C;AAC3C,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAE9E;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAI1F;AAED,qDAAqD;AACrD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGrE;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGnF;AAED,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,aAA6E,CAAC;AAE5G,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/C"}
+{"version":3,"file":"werkvloer.d.ts","sourceRoot":"","sources":["../../src/lib/werkvloer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAIrD;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,6CAA6C;IAC7C,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,qDAAqD;IACrD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,6FAA6F;AAC7F,wBAAgB,UAAU,CAAC,KAAK,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE,CAsBlE;AAED,uFAAuF;AACvF,wBAAgB,UAAU,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,GAAG,IAAI,CAM7D;AASD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED,yDAAyD;AACzD,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAIvD;AAcD,gFAAgF;AAChF,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,EAAE,GAAG,OAAa,GAAG,MAAM,GAAG,IAAI,CASjG;AAED,2CAA2C;AAC3C,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAE9E;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAI1F;AAED,qDAAqD;AACrD,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGrE;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAGnF;AAED,2DAA2D;AAC3D,eAAO,MAAM,iBAAiB,aAA6E,CAAC;AAE5G,mEAAmE;AACnE,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE/C;AAMD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAQvF"}

package/dist-lib/lib/werkvloer.js

@@ -119,3 +119,18 @@ export function todoCountText(n) {
 function textOf(v) {
     return typeof v === "string" && v.trim() ? v.trim() : null;
 }
+/**
+ * Bevestigvraag van de Engine (`payload.bevestigVraag`) voor een kaart: de
+ * eerste gevulde vraag van zijn karregels, anders null. Het scherm rekent zelf
+ * nooit of een kar vol is; het toont alleen wat de Engine vraagt.
+ */
+export function confirmQuestionOf(card) {
+    const rows = Array.isArray(card?.rows) ? card.rows : [];
+    for (const r of rows) {
+        const p = (r.payload && typeof r.payload === "object" ? r.payload : {});
+        const q = p["bevestigVraag"];
+        if (typeof q === "string" && q.trim() !== "")
+            return q.trim();
+    }
+    return null;
+}

package/dist-lib/lib/werkvloer.test.js

@@ -47,3 +47,13 @@ describe("werkvloer", () => {
         expect(todoCountText(12)).toBe("12 orders nog te printen");
     });
 });
+import { confirmQuestionOf as _cq } from "./werkvloer.js";
+describe("confirmQuestionOf (bevestigVraag van de Engine)", () => {
+    const card = (payloads) => ({ key: "k", rows: payloads.map((payload, i) => ({ id: String(i), payload })) });
+    it("geeft de vraag van de Engine terug als die gevuld is", () => {
+        expect(_cq(card([{}, { bevestigVraag: "Deze kar is nog niet vol. Toch nu printen?" }]))).toBe("Deze kar is nog niet vol. Toch nu printen?");
+    });
+    it("geen vraag bij een volle kar (leeg veld)", () => {
+        expect(_cq(card([{ bevestigVraag: "" }, { bevestigVraag: null }]))).toBeNull();
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/pick-schermen-kwekers",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "flowselections": {
     "moduleId": "pick-schermen",
     "schema": {
@@ -20,6 +20,14 @@
         "nav": false,
         "public": true
       }
+    ],
+    "crons": [
+      {
+        "name": "pick-history-cleanup",
+        "kind": "sql",
+        "schedule": "35 * * * *",
+        "sql": "SELECT public.pick_cleanup_history();"
+      }
     ]
   },
   "private": false,

package/schema/pickschermen.sql

@@ -6441,4 +6441,182 @@ BEGIN
   END IF;
 END $mig$;
 REVOKE ALL ON FUNCTION public.pick_ensure_defaults_intern() FROM PUBLIC, anon, authenticated;
-GRANT EXECUTE ON FUNCTION public.pick_ensure_defaults_intern() TO service_role;
+GRANT EXECUTE ON FUNCTION public.pick_ensure_defaults_intern() TO service_role;
+-- ===== Golf 1: pickhistorie (20261110191301_eb6ef686-ecc0-446d-a7d8-65dfa16a2855.sql) =====
+-- Golf 1: pickhistorie alleen gewijzigde velden + eigen opruiming in porties
+CREATE OR REPLACE FUNCTION public.pick_queue_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_old jsonb; v_new jsonb; v_o jsonb := '{}'::jsonb; v_n jsonb := '{}'::jsonb; k text;
+BEGIN
+  IF TG_OP = 'INSERT' THEN
+    INSERT INTO public.pick_station_history(entity_table, entity_id, action, changed_by, old_data, new_data)
+    VALUES ('pick_queue', NEW.id, TG_OP, auth.uid(), NULL, jsonb_strip_nulls(to_jsonb(NEW)));
+    RETURN NEW;
+  ELSIF TG_OP = 'DELETE' THEN
+    INSERT INTO public.pick_station_history(entity_table, entity_id, action, changed_by, old_data, new_data)
+    VALUES ('pick_queue', OLD.id, TG_OP, auth.uid(), jsonb_strip_nulls(to_jsonb(OLD)), NULL);
+    RETURN OLD;
+  END IF;
+
+  v_old := to_jsonb(OLD); v_new := to_jsonb(NEW);
+  FOR k IN SELECT jsonb_object_keys(v_new) LOOP
+    IF k <> 'updated_at' AND (v_old -> k) IS DISTINCT FROM (v_new -> k) THEN
+      v_o := v_o || jsonb_build_object(k, v_old -> k);
+      v_n := v_n || jsonb_build_object(k, v_new -> k);
+    END IF;
+  END LOOP;
+  IF v_n = '{}'::jsonb THEN RETURN NEW; END IF;  -- niets wezenlijks gewijzigd
+  v_o := v_o || jsonb_build_object('updated_at', v_old -> 'updated_at');
+  v_n := v_n || jsonb_build_object('updated_at', v_new -> 'updated_at');
+  INSERT INTO public.pick_station_history(entity_table, entity_id, action, changed_by, old_data, new_data)
+  VALUES ('pick_queue', NEW.id, TG_OP, auth.uid(), v_o, v_n);
+  RETURN NEW;
+END; $function$;
+GRANT EXECUTE ON FUNCTION public.pick_queue_audit() TO anon, authenticated, service_role;
+
+CREATE OR REPLACE FUNCTION public.pick_cleanup_history()
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ VOLATILE
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_days integer; v_start timestamptz := clock_timestamp(); v_total integer := 0; n integer; v_bron text := 'standaard';
+BEGIN
+  IF current_user NOT IN ('postgres','service_role','supabase_admin')
+     AND NOT COALESCE(public.has_role(auth.uid(), 'admin'), false) THEN
+    RAISE EXCEPTION 'Geen toegang tot het opruimen van de pickhistorie.' USING ERRCODE = '42501';
+  END IF;
+  IF to_regprocedure('public.logistics_retention_days(text)') IS NOT NULL THEN
+    BEGIN
+      EXECUTE 'SELECT public.logistics_retention_days($1)' INTO v_days USING 'pick_history_retention_days';
+      v_bron := 'engine';
+    EXCEPTION WHEN OTHERS THEN
+      RAISE WARNING 'pick_cleanup_history: termijn uit Engine niet leesbaar (%), standaard 30 dagen', SQLERRM;
+      v_days := NULL;
+    END;
+  END IF;
+  IF v_days IS NULL OR v_days < 1 THEN v_days := 30; v_bron := 'standaard'; END IF;
+
+  LOOP
+    WITH weg AS (SELECT id FROM public.pick_station_history
+                  WHERE created_at < now() - make_interval(days => v_days)
+                  ORDER BY created_at LIMIT 10000)
+    DELETE FROM public.pick_station_history h USING weg WHERE h.id = weg.id;
+    GET DIAGNOSTICS n = ROW_COUNT;
+    v_total := v_total + n;
+    EXIT WHEN n = 0 OR clock_timestamp() - v_start > interval '20 seconds';
+  END LOOP;
+  RETURN jsonb_build_object('verwijderd', v_total, 'termijn_dagen', v_days, 'bron', v_bron,
+    'duur_ms', round(extract(epoch FROM clock_timestamp() - v_start) * 1000));
+END $function$;
+REVOKE ALL ON FUNCTION public.pick_cleanup_history() FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.pick_cleanup_history() TO service_role;
+
+COMMENT ON FUNCTION public.pick_reset_print(uuid, text) IS 'Verouderd: niet meer in gebruik (scherm gebruikt variant met _cart_id via p_device_key-wrapper). Verwijderen als handmatige stap.';
+COMMENT ON FUNCTION public.pick_enqueue_print_job(uuid, uuid, text, boolean) IS 'Verouderd: niet meer door het scherm aangeroepen; nog genest gebruikt door oude kernvarianten. Verwijderen als handmatige stap na controle.';
+-- 20261110194034_4411e109-0b93-4bc4-833b-fc93487e214c.sql
+-- Golf 1 aanvulling: binnen payload alleen gewijzigde onderdelen in de historie
+CREATE OR REPLACE FUNCTION public.pick_queue_audit()
+ RETURNS trigger
+ LANGUAGE plpgsql
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_old jsonb; v_new jsonb; v_o jsonb := '{}'::jsonb; v_n jsonb := '{}'::jsonb; k text; s text;
+  v_po jsonb; v_pn jsonb;
+BEGIN
+  IF TG_OP = 'INSERT' THEN
+    INSERT INTO public.pick_station_history(entity_table, entity_id, action, changed_by, old_data, new_data)
+    VALUES ('pick_queue', NEW.id, TG_OP, auth.uid(), NULL, jsonb_strip_nulls(to_jsonb(NEW)));
+    RETURN NEW;
+  ELSIF TG_OP = 'DELETE' THEN
+    INSERT INTO public.pick_station_history(entity_table, entity_id, action, changed_by, old_data, new_data)
+    VALUES ('pick_queue', OLD.id, TG_OP, auth.uid(), jsonb_strip_nulls(to_jsonb(OLD)), NULL);
+    RETURN OLD;
+  END IF;
+
+  v_old := to_jsonb(OLD); v_new := to_jsonb(NEW);
+  FOR k IN SELECT jsonb_object_keys(v_new) LOOP
+    IF k <> 'updated_at' AND (v_old -> k) IS DISTINCT FROM (v_new -> k) THEN
+      IF jsonb_typeof(v_old -> k) = 'object' AND jsonb_typeof(v_new -> k) = 'object' THEN
+        v_po := '{}'::jsonb; v_pn := '{}'::jsonb;
+        FOR s IN SELECT jsonb_object_keys(v_old -> k) UNION SELECT jsonb_object_keys(v_new -> k) LOOP
+          IF (v_old -> k -> s) IS DISTINCT FROM (v_new -> k -> s) THEN
+            v_po := v_po || jsonb_build_object(s, COALESCE(v_old -> k -> s, 'null'::jsonb));
+            v_pn := v_pn || jsonb_build_object(s, COALESCE(v_new -> k -> s, 'null'::jsonb));
+          END IF;
+        END LOOP;
+        v_o := v_o || jsonb_build_object(k, v_po);
+        v_n := v_n || jsonb_build_object(k, v_pn);
+      ELSE
+        v_o := v_o || jsonb_build_object(k, v_old -> k);
+        v_n := v_n || jsonb_build_object(k, v_new -> k);
+      END IF;
+    END IF;
+  END LOOP;
+  IF v_n = '{}'::jsonb THEN RETURN NEW; END IF;
+  v_o := v_o || jsonb_build_object('updated_at', v_old -> 'updated_at');
+  v_n := v_n || jsonb_build_object('updated_at', v_new -> 'updated_at');
+  INSERT INTO public.pick_station_history(entity_table, entity_id, action, changed_by, old_data, new_data)
+  VALUES ('pick_queue', NEW.id, TG_OP, auth.uid(), v_o, v_n);
+  RETURN NEW;
+END; $function$;
+GRANT EXECUTE ON FUNCTION public.pick_queue_audit() TO anon, authenticated, service_role;
+-- ==== 20261111093706_3c5ab944-e36a-4e47-9a41-681415615661.sql ====
+CREATE INDEX IF NOT EXISTS idx_pick_station_history_created_at ON public.pick_station_history USING btree (created_at);
+
+CREATE OR REPLACE FUNCTION public.pick_cleanup_history()
+ RETURNS jsonb
+ LANGUAGE plpgsql
+ VOLATILE
+ SECURITY DEFINER
+ SET search_path TO 'public'
+AS $function$
+DECLARE
+  v_days integer; v_start timestamptz := clock_timestamp(); v_total integer := 0; n integer;
+  v_bron text := 'standaard'; v_max integer := 5000; v_portie integer := 1000; v_rest boolean := false;
+BEGIN
+  IF current_user NOT IN ('postgres','service_role','supabase_admin')
+     AND NOT COALESCE(public.has_role(auth.uid(), 'admin'), false) THEN
+    RAISE EXCEPTION 'Geen toegang tot het opruimen van de pickhistorie.' USING ERRCODE = '42501';
+  END IF;
+  IF to_regprocedure('public.logistics_retention_days(text)') IS NOT NULL THEN
+    BEGIN
+      EXECUTE 'SELECT public.logistics_retention_days($1)' INTO v_days USING 'pick_history_retention_days';
+      v_bron := 'engine';
+    EXCEPTION WHEN OTHERS THEN
+      RAISE WARNING 'pick_cleanup_history: termijn uit Engine niet leesbaar (%), standaard 30 dagen', SQLERRM;
+      v_days := NULL;
+    END;
+  END IF;
+  IF v_days IS NULL OR v_days < 1 THEN v_days := 30; v_bron := 'standaard'; END IF;
+
+  BEGIN
+    LOOP
+      WITH weg AS (SELECT id FROM public.pick_station_history
+                    WHERE created_at < now() - make_interval(days => v_days)
+                    ORDER BY created_at LIMIT LEAST(v_portie, v_max - v_total))
+      DELETE FROM public.pick_station_history h USING weg WHERE h.id = weg.id;
+      GET DIAGNOSTICS n = ROW_COUNT;
+      v_total := v_total + n;
+      IF n = 0 THEN EXIT; END IF;
+      IF v_total >= v_max OR clock_timestamp() - v_start > interval '10 seconds' THEN v_rest := true; EXIT; END IF;
+    END LOOP;
+  EXCEPTION WHEN OTHERS THEN
+    RAISE WARNING 'pick_cleanup_history mislukt na % verwijderde regels: % (%)', v_total, SQLERRM, SQLSTATE;
+    RAISE;
+  END;
+  RETURN jsonb_build_object('verwijderd', v_total, 'termijn_dagen', v_days, 'bron', v_bron,
+    'mogelijk_meer', v_rest,
+    'duur_ms', round(extract(epoch FROM clock_timestamp() - v_start) * 1000));
+END $function$;
+REVOKE ALL ON FUNCTION public.pick_cleanup_history() FROM PUBLIC, anon, authenticated;
+GRANT EXECUTE ON FUNCTION public.pick_cleanup_history() TO service_role;