@flowselections/floriday-klanten-module 1.0.14 → 1.0.15

package/dist-lib/lib/customers.functions.js

@@ -209,21 +209,69 @@ export const listFloridayNetwork = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
     .inputValidator((input) => ({
     search: (input?.search ?? "").toString().trim().slice(0, 255),
+    types: Array.isArray(input?.types) && input.types.length > 0
+        ? input.types.slice(0, 10).map((t) => String(t).toUpperCase())
+        : ["CUSTOMER", "AGENT"],
+    includeExpired: !!input?.includeExpired,
+    limit: Math.min(Math.max(Number(input?.limit) || 500, 1), 2000),
 }))
     .handler(async ({ data, context }) => {
+    const nowIso = new Date().toISOString();
     let q = context.supabase
         .from("floriday_network_cache")
-        .select("connection_id, organization_id, organization_name, gln, country, city, fetched_at")
-        .order("organization_name")
-        .limit(200);
+        .select("connection_id, organization_id, organization_name, gln, country, city, data, fetched_at", { count: "exact" })
+        .in("data->>organizationType", data.types)
+        .limit(data.limit);
+    if (!data.includeExpired) {
+        q = q.or(`data->>endDate.is.null,data->>endDate.gt.${nowIso}`);
+    }
     if (data.search) {
         const s = `%${data.search}%`;
-        q = q.or(`organization_name.ilike.${s},gln.ilike.${s}`);
+        q = q.or(`organization_name.ilike.${s},gln.ilike.${s},data->>commercialName.ilike.${s},data->>name.ilike.${s}`);
     }
-    const { data: rows, error } = await q;
+    const { data: rows, error, count } = await q;
     if (error)
         throw new Error(error.message);
-    return { organizations: rows ?? [] };
+    const organizations = (rows ?? []).map((r) => {
+        const d = (r.data ?? {});
+        const physical = d.physicalAddress ?? {};
+        const mailing = d.mailingAddress ?? {};
+        const name = (r.organization_name && r.organization_name.trim()) ||
+            (typeof d.name === "string" && d.name.trim()) ||
+            (typeof d.commercialName === "string" && d.commercialName.trim()) ||
+            "";
+        const commercial = (typeof d.commercialName === "string" && d.commercialName.trim()) || "";
+        const endDate = d.endDate ?? null;
+        const isExpired = !!endDate && endDate < nowIso;
+        return {
+            connection_id: r.connection_id,
+            organization_id: r.organization_id,
+            organization_name: name,
+            commercial_name: commercial && commercial !== name ? commercial : null,
+            gln: r.gln ?? d.companyGln ?? null,
+            city: r.city ?? physical.city ?? mailing.city ?? null,
+            country: r.country ?? physical.countryCode ?? mailing.countryCode ?? null,
+            postal_code: physical.postalCode ?? mailing.postalCode ?? null,
+            address_line: physical.addressLine ?? mailing.addressLine ?? null,
+            organization_type: d.organizationType ?? null,
+            logo_url: d.logoUrl ?? null,
+            website: d.website ?? null,
+            end_date: endDate,
+            is_expired: isExpired,
+            fetched_at: r.fetched_at,
+        };
+    });
+    organizations.sort((a, b) => {
+        const an = a.organization_name || "\uffff";
+        const bn = b.organization_name || "\uffff";
+        return an.localeCompare(bn);
+    });
+    return {
+        organizations,
+        total: count ?? organizations.length,
+        limit: data.limit,
+        truncated: (count ?? 0) > organizations.length,
+    };
 });
 export const listCustomerClasses = createServerFn({ method: "POST" })
     .middleware([requireSupabaseAuth])
@@ -253,7 +301,7 @@ export const bulkImportCustomers = createServerFn({ method: "POST" })
         try {
             if (data.skipDuplicates) {
                 const dupes = await findDuplicates(supabase, {
-                    email: row.email,
+                    email: row.email ?? "",
                     vat_number: row.vat_number || undefined,
                     company_name: row.company_name,
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-klanten-module",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "private": false,
   "sideEffects": false,
   "type": "module",
@@ -46,7 +46,7 @@
   "devDependencies": {
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
-    "@flowselections/core": "^1.0.11",
+    "@flowselections/core": "1.0.12",
     "@lovable.dev/vite-tanstack-config": "2.6.4",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",