@flowselections/floriday-verkoop-module 1.0.11 → 1.0.13

package/dist-lib/lib/floriday-public.functions.js

@@ -55,6 +55,38 @@ export const getFlorydayCachedList = createServerFn({ method: "POST" })
     const { data: rows, error } = await q;
     if (error)
         throw new Error(`${table} lezen faalde: ${error.message}`);
+    if (table === "floriday_salesorders_cache") {
+        const ids = (rows ?? [])
+            .map((r) => String(r?.floriday_id ?? r?.data?.salesOrderId ?? ""))
+            .filter((id) => id.length > 0);
+        if (ids.length > 0) {
+            const mapped = [];
+            const idSet = new Set(ids);
+            for (let from = 0; from < 10000; from += 1000) {
+                const { data: chunkRows, error: mapError } = await context.supabase
+                    .from("floriday_order_number_map")
+                    .select("floriday_id, order_number")
+                    .range(from, from + 999);
+                if (mapError)
+                    throw new Error(`floriday_order_number_map lezen faalde: ${mapError.message}`);
+                const batch = chunkRows ?? [];
+                mapped.push(...batch.filter((m) => idSet.has(String(m.floriday_id))));
+                if (batch.length < 1000)
+                    break;
+            }
+            const orderNumbers = new Map((mapped ?? []).map((m) => [String(m.floriday_id), String(m.order_number ?? "")]));
+            return {
+                entity: data.entity,
+                rows: (rows ?? []).map((r) => {
+                    const floridayId = String(r?.floriday_id ?? r?.data?.salesOrderId ?? "");
+                    const orderNumber = orderNumbers.get(floridayId) ?? null;
+                    return orderNumber
+                        ? { ...r, order_number: orderNumber, data: { ...(r.data ?? {}), orderNumber } }
+                        : r;
+                }),
+            };
+        }
+    }
     return { entity: data.entity, rows: rows ?? [] };
 });
 const CodeListSchema = z.object({
@@ -159,52 +191,18 @@ export const getFlorydayResourceSchema = createServerFn({ method: "POST" })
         throw new Error(`resource-schema lezen faalde: ${error.message}`);
     return rows?.[0] ?? null;
 });
-const SyncHealthSchema = z.object({
-    environment: EnvSchema,
-    resources: z.array(z.string()).min(1),
-});
-// Voor de FlorydaySyncHealthBanner — leest sync-state voor de actieve connectie
-// van de gevraagde environment en geeft per resource laatste sync-info terug.
-export const getFlorydaySyncHealth = createServerFn({ method: "POST" })
+// Actieve Floriday-omgeving zoals ingesteld in de Authenticatie-module
+// (`floriday_settings.active_environment`). Fallback → "staging".
+export const getActiveFloridayEnvironment = createServerFn({ method: "GET" })
     .middleware([requireSupabaseAuth])
-    .inputValidator((d) => SyncHealthSchema.parse(d))
-    .handler(async ({ data, context }) => {
-    const dbEnv = data.environment === "live" ? "production" : "staging";
-    const { data: conns } = await context.supabase
-        .from("floriday_connections")
-        .select("id")
-        .eq("environment", dbEnv)
-        .eq("is_active", true)
-        .limit(1);
-    const connectionId = (conns ?? [])[0]?.id ?? null;
-    if (!connectionId) {
-        return { connectionId: null, resources: [] };
-    }
-    // Map resource → entity_type used in floriday_sync_state.
-    const RES_TO_ENTITY = {
-        "sales-orders": "salesorders",
-        "trade-items": "tradeitems",
-        "customer-organizations": "customers",
-        "fulfillment-orders": "fulfillment-orders",
-    };
-    const { data: rows } = await context.supabase
-        .from("floriday_sync_state")
-        .select("entity_type, last_sequence_number, last_synced_at, last_success_at, last_error")
-        .eq("connection_id", connectionId);
-    const stateByEntity = new Map((rows ?? []).map((r) => [String(r.entity_type), r]));
-    return {
-        connectionId,
-        resources: data.resources.map((res) => {
-            const entity = RES_TO_ENTITY[res] ?? res;
-            const s = stateByEntity.get(entity) ?? null;
-            return {
-                resource: res,
-                entityType: entity,
-                lastSyncedAt: s?.last_synced_at ?? null,
-                lastSuccessAt: s?.last_success_at ?? null,
-                lastSequenceNumber: s?.last_sequence_number ?? null,
-                lastError: s?.last_error ?? null,
-            };
-        }),
-    };
+    .handler(async () => {
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server");
+    const { data } = await supabaseAdmin
+        .from("floriday_settings")
+        .select("active_environment")
+        .eq("id", 1)
+        .maybeSingle();
+    const raw = String(data?.active_environment ?? "staging");
+    const env = raw === "production" || raw === "prod" || raw === "live" ? "live" : "staging";
+    return { environment: env };
 });