@flowselections/floriday-voorraad 1.0.13 → 1.0.15

package/dist-lib/integrations/supabase/types.js

@@ -1,8 +1,17 @@
 export const Constants = {
     public: {
         Enums: {
-            app_role: ["admin", "manager", "warehouse", "sales", "developer"],
+            app_role: [
+                "admin",
+                "manager",
+                "warehouse",
+                "sales",
+                "developer",
+                "receptie",
+                "monteur",
+            ],
             exact_env: ["staging", "live"],
+            exact_push_status: ["pending", "sent", "error"],
             quote_status: [
                 "concept",
                 "verzonden",

package/dist-lib/lib/__tests__/floricode-required-features.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=floricode-required-features.test.d.ts.map

package/dist-lib/lib/__tests__/floricode-required-features.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"floricode-required-features.test.d.ts","sourceRoot":"","sources":["../../../src/lib/__tests__/floricode-required-features.test.ts"],"names":[],"mappings":""}

package/dist-lib/lib/__tests__/floricode-required-features.test.js

@@ -0,0 +1,186 @@
+import { describe, it, expect } from "vitest";
+import { computeVbnRequiredFeatures, } from "../floricode-required-features.functions";
+const REG_100023 = [
+    {
+        record_id: "REG|100023|S01",
+        data: {
+            product_id: "100023",
+            feature_type_id: "S01",
+            regulation_type_id: 1,
+            presentation_order: 10,
+        },
+    },
+    {
+        record_id: "REG|100023|S02",
+        data: {
+            product_id: "100023",
+            feature_type_id: "S02",
+            regulation_type_id: 1,
+            presentation_order: 20,
+        },
+    },
+    {
+        record_id: "REG|100023|S05",
+        data: {
+            product_id: "100023",
+            feature_type_id: "S05",
+            regulation_type_id: 2, // advies
+            presentation_order: 30,
+        },
+    },
+    // Vervallen — moet genegeerd worden.
+    {
+        record_id: "REG|100023|S99",
+        data: {
+            product_id: "100023",
+            feature_type_id: "S99",
+            regulation_type_id: 1,
+            expiry_date: "2020-01-01",
+        },
+    },
+    // Dubbele S01 → moet gededupliceerd worden.
+    {
+        record_id: "REG|100023|S01|dup",
+        data: {
+            product_id: "100023",
+            feature_type_id: "S01",
+            regulation_type_id: 1,
+            presentation_order: 10,
+        },
+    },
+];
+const FEATURE_TYPES = [
+    { record_id: "S01", data: { description: "Potmaat" } },
+    { record_id: "S02", data: { description: "Min planthoogte" } },
+    { record_id: "S05", data: { description: "Rijpheidsstadium" } },
+];
+const FEATURE_VALUES = [
+    { data: { feature_type_id: "S01", code: "003", description: "3 cm" } },
+    { data: { feature_type_id: "S01", code: "004", description: "4 cm" } },
+    { data: { feature_type_id: "S01", code: "004", description: "4 cm" } }, // dup
+    { data: { feature_type_id: "S02", code: "010", description: "10 cm" } },
+    { data: { feature_type_id: "S05", code: "R", description: "Rijp" } },
+    // Vervallen value — moet weg.
+    {
+        data: {
+            feature_type_id: "S01",
+            code: "999",
+            description: "vervallen",
+            expiry_date: "2020-01-01",
+        },
+    },
+];
+/**
+ * Minimalistische fake die exact de chain reproduceert die
+ * `computeVbnRequiredFeatures` gebruikt:
+ *   .from(table).select(...).eq("resource", X)[.filter(...)|.in(...)]
+ * en awaitable is → { data, error }.
+ */
+function makeFakeClient(rowsByResource) {
+    return {
+        from() {
+            const state = {};
+            const resolve = () => {
+                const src = state.resource ? rowsByResource[state.resource] ?? [] : [];
+                let out = src;
+                if (state.productId !== undefined) {
+                    out = out.filter((r) => r.data["product_id"] === state.productId);
+                }
+                if (state.recordIdIn) {
+                    const set = new Set(state.recordIdIn);
+                    out = out.filter((r) => r.record_id != null && set.has(r.record_id));
+                }
+                if (state.featureTypeIdIn) {
+                    const set = new Set(state.featureTypeIdIn);
+                    out = out.filter((r) => set.has(String(r.data["feature_type_id"] ?? "")));
+                }
+                if (state.recordIdLike) {
+                    const prefix = state.recordIdLike.replace(/%$/, "");
+                    out = out.filter((r) => String(r.record_id ?? "").startsWith(prefix));
+                }
+                return { data: out, error: null };
+            };
+            const builder = {
+                select: () => builder,
+                eq: (col, val) => {
+                    if (col === "resource")
+                        state.resource = val;
+                    return builder;
+                },
+                filter: (col, _op, val) => {
+                    if (col === "data->>product_id")
+                        state.productId = val;
+                    return builder;
+                },
+                in: (col, vals) => {
+                    if (col === "record_id")
+                        state.recordIdIn = vals;
+                    if (col === "data->>feature_type_id")
+                        state.featureTypeIdIn = vals;
+                    return builder;
+                },
+                like: (col, pattern) => {
+                    if (col === "record_id")
+                        state.recordIdLike = pattern;
+                    return builder;
+                },
+                then: (onFulfilled) => Promise.resolve(resolve()).then(onFulfilled),
+            };
+            return builder;
+        },
+    };
+}
+const client = makeFakeClient({
+    RegulatoryFeatureType: REG_100023,
+    FeatureType: FEATURE_TYPES,
+    FeatureValue: FEATURE_VALUES,
+});
+describe("computeVbnRequiredFeatures — VBN 100023", () => {
+    it("markeert S01 en S02 als required en S05 als advised", async () => {
+        const res = await computeVbnRequiredFeatures(client, "100023");
+        expect(res.vbnCode).toBe("100023");
+        const byCode = Object.fromEntries(res.features.map((f) => [f.code, f]));
+        expect(byCode.S01?.regulation).toBe("required");
+        expect(byCode.S01?.label).toBe("Potmaat");
+        expect(byCode.S02?.regulation).toBe("required");
+        expect(byCode.S02?.label).toBe("Min planthoogte");
+        expect(byCode.S05?.regulation).toBe("advised");
+        expect(byCode.S05?.label).toBe("Rijpheidsstadium");
+    });
+    it("filtert vervallen regulatory rows en dedupliceert", async () => {
+        const res = await computeVbnRequiredFeatures(client, "100023");
+        expect(res.features.find((f) => f.code === "S99")).toBeUndefined();
+        // Geen dubbele S01.
+        expect(res.features.filter((f) => f.code === "S01")).toHaveLength(1);
+    });
+    it("sorteert verplicht vóór advies", async () => {
+        const res = await computeVbnRequiredFeatures(client, "100023");
+        expect(res.features.map((f) => f.code)).toEqual(["S01", "S02", "S05"]);
+    });
+    it("levert toegestane waarden per feature (gededupliceerd, zonder vervallen)", async () => {
+        const res = await computeVbnRequiredFeatures(client, "100023");
+        const s01 = res.features.find((f) => f.code === "S01");
+        expect(s01?.values.map((v) => v.code).sort()).toEqual(["003", "004"]);
+        expect(s01?.values.some((v) => v.code === "999")).toBe(false);
+    });
+    it("geeft lege lijst terug voor onbekende VBN-code", async () => {
+        const res = await computeVbnRequiredFeatures(client, "99999");
+        expect(res).toEqual({ vbnCode: "99999", features: [] });
+    });
+    it("vindt regulatory rows via record_id-prefix als data.product_id ontbreekt", async () => {
+        const prefixOnlyClient = makeFakeClient({
+            RegulatoryFeatureType: REG_100023.map((r) => ({
+                record_id: r.record_id?.replace("REG|100023|", "100023:"),
+                data: Object.fromEntries(Object.entries(r.data).filter(([key]) => key !== "product_id")),
+            })),
+            FeatureType: FEATURE_TYPES,
+            FeatureValue: FEATURE_VALUES,
+        });
+        const res = await computeVbnRequiredFeatures(prefixOnlyClient, "100023");
+        expect(res.features.map((f) => [f.code, f.regulation])).toEqual([
+            ["S01", "required"],
+            ["S02", "required"],
+            ["S05", "advised"],
+        ]);
+    });
+});

package/dist-lib/lib/floricode-client.d.ts

@@ -4,9 +4,23 @@ export interface FloricodeRecord {
     data: Record<string, any>;
 }
 export interface ListFloricodeOpts {
-    /** Optional jsonb field to filter with a LIKE-prefix (e.g. `product_group_id`). */
+    /** Optional jsonb field to filter with a single LIKE-prefix. */
     prefixField?: string;
     prefix?: string;
+    /**
+     * Optional jsonb field to filter on één van meerdere prefixes.
+     * Wordt vertaald naar een PostgREST `or(field.like.p1%,field.like.p2%,…)`.
+     */
+    prefixIn?: {
+        field: string;
+        prefixes: string[];
+    };
+    /**
+     * Token-zoeken: elk token moet (case-insensitive) voorkomen in `name`
+     * OF `description`. Hierdoor speelt de woordvolgorde geen rol meer,
+     * gelijk aan hoe Floriday zoekt.
+     */
+    tokens?: string[];
     /** Optional sort field — either a table column (e.g. `record_id`) or `data->>field` for jsonb. */
     sortField?: string;
     sortAscending?: boolean;

package/dist-lib/lib/floricode-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"floricode-client.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-client.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,mFAAmF;IACnF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,kGAAkG;IAClG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,EACf,KAAK,SAAK,EACV,IAAI,GAAE,iBAAsB,GAC3B,OAAO,CAAC,eAAe,EAAE,CAAC,CA0B5B;AAED,0DAA0D;AAC1D,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,SAAM,GACV,OAAO,CAAC,eAAe,EAAE,CAAC,CAS5B"}
+{"version":3,"file":"floricode-client.d.ts","sourceRoot":"","sources":["../../src/lib/floricode-client.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,QAAQ,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;IACjD;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,kGAAkG;IAClG,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE,MAAM,EACf,KAAK,SAAK,EACV,IAAI,GAAE,iBAAsB,GAC3B,OAAO,CAAC,eAAe,EAAE,CAAC,CA2D5B;AAED,0DAA0D;AAC1D,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,MAAM,GAAG,MAAM,EACtB,KAAK,SAAO,GACX,OAAO,CAAC,eAAe,EAAE,CAAC,CAS5B"}

package/dist-lib/lib/floricode-client.js

@@ -13,9 +13,47 @@ export async function listFloricode(resource, search, limit = 50, opts = {}) {
     if (opts.prefixField && opts.prefix) {
         q = q.like(`data->>${opts.prefixField}`, `${opts.prefix}%`);
     }
-    if (search && search.trim()) {
-        const s = search.trim().replace(/[(),]/g, " ");
-        q = q.or(`data->>name.ilike.%${s}%,data->>description.ilike.%${s}%`);
+    if (opts.prefixIn && opts.prefixIn.prefixes.length > 0) {
+        const { field, prefixes } = opts.prefixIn;
+        const orExpr = prefixes
+            .map((p) => `data->>${field}.like.${p}%`)
+            .join(",");
+        q = q.or(orExpr);
+    }
+    // Token-zoeken heeft voorrang op simpel substring-zoeken zodra er
+    // meerdere woorden zijn — Floriday matcht ook woord-voor-woord.
+    const explicitTokens = opts.tokens?.filter((t) => t.trim().length > 0);
+    if (explicitTokens && explicitTokens.length > 0) {
+        for (const tok of explicitTokens) {
+            const s = tok.trim().replace(/[(),%]/g, " ");
+            q = q.or(`data->>name.ilike.%${s}%,data->>description.ilike.%${s}%`);
+        }
+    }
+    else if (search && search.trim()) {
+        const cleaned = search.trim().replace(/[(),%]/g, " ");
+        const parts = cleaned.split(/\s+/).filter(Boolean);
+        if (parts.length > 1) {
+            for (const tok of parts) {
+                const isNumeric = /^\d+$/.test(tok);
+                const clauses = [
+                    `data->>name.ilike.%${tok}%`,
+                    `data->>description.ilike.%${tok}%`,
+                ];
+                if (isNumeric)
+                    clauses.push(`record_id.ilike.%${tok}%`);
+                q = q.or(clauses.join(","));
+            }
+        }
+        else {
+            const isNumeric = /^\d+$/.test(cleaned);
+            const clauses = [
+                `data->>name.ilike.%${cleaned}%`,
+                `data->>description.ilike.%${cleaned}%`,
+            ];
+            if (isNumeric)
+                clauses.push(`record_id.ilike.%${cleaned}%`);
+            q = q.or(clauses.join(","));
+        }
     }
     if (opts.sortField) {
         const ascending = opts.sortAscending ?? true;
@@ -27,7 +65,7 @@ export async function listFloricode(resource, search, limit = 50, opts = {}) {
     return (data ?? []);
 }
 /** Exact-match lookup op een veld binnen data (jsonb). */
-export async function listFloricodeByField(resource, field, value, limit = 500) {
+export async function listFloricodeByField(resource, field, value, limit = 2000) {
     const { data, error } = await supabase
         .from("floricode_records")
         .select("record_id,resource,data")