@flowselections/floriday-voorraad 1.0.12 → 1.0.14

package/dist-lib/hooks/useVoorraadData.js

@@ -1,30 +1,85 @@
 import { useCallback, useEffect, useState } from "react";
-import { floriday } from "../lib/floriday-client";
+import { supabase } from "../integrations/supabase/client";
+import { normaliseTradeItem } from "../lib/floriday-client";
+import { useLocalTradeItems } from "./useLocalTradeItems";
+import { fetchStockMap } from "./useTradeItemStock";
+function applyStock(item, s) {
+    if (!s)
+        return item;
+    const physical = s.physical_stock;
+    const reserved = s.reserved_stock;
+    const available = Math.max(0, physical - reserved);
+    return {
+        ...item,
+        quantity: physical,
+        minQuantity: s.minimum_stock,
+        reservedQuantity: reserved,
+        incomingQuantity: s.incoming_stock,
+        availableQuantity: available,
+        economicQuantity: available + s.incoming_stock,
+    };
+}
+/**
+ * Reads trade items from the shared `floriday_trade_items_cache` (gepubliceerd,
+ * gevuld door de Auth-module elke 5 min) en merget lokale, niet-gepubliceerde
+ * producten uit `trade_item_drafts`. Voorraadwaarden uit `trade_item_stock`
+ * overschrijven de cache-waarden (lokale bron van waarheid voor stock).
+ */
 export function useVoorraadData(connectionId) {
-    const [items, setItems] = useState([]);
+    const [publishedItems, setPublishedItems] = useState([]);
+    const [stockMap, setStockMap] = useState(new Map());
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState(null);
-    const load = useCallback(async () => {
+    const { items: localItems, loading: localLoading, reload: reloadLocal, } = useLocalTradeItems(connectionId);
+    const loadPublished = useCallback(async () => {
         if (!connectionId) {
-            setItems([]);
+            setPublishedItems([]);
+            setStockMap(new Map());
             return;
         }
         setLoading(true);
         setError(null);
         try {
-            const data = await floriday.listTradeItems(connectionId);
-            setItems(data);
+            const [pubRes, stock] = await Promise.all([
+                supabase
+                    .from("floriday_trade_items_cache")
+                    .select("data,floriday_id,is_deleted")
+                    .eq("connection_id", connectionId)
+                    .eq("is_deleted", false)
+                    .limit(1000),
+                fetchStockMap(connectionId),
+            ]);
+            if (pubRes.error)
+                throw pubRes.error;
+            const normalised = (pubRes.data ?? [])
+                .map((row) => normaliseTradeItem({ ...row.data, id: row.floriday_id }))
+                .filter((i) => i.id)
+                .map((i) => ({ ...i, published: true }));
+            setPublishedItems(normalised);
+            setStockMap(stock);
         }
         catch (e) {
             setError(e.message);
-            setItems([]);
+            setPublishedItems([]);
         }
         finally {
             setLoading(false);
         }
     }, [connectionId]);
     useEffect(() => {
-        load();
-    }, [load]);
-    return { items, loading, error, reload: load };
+        loadPublished();
+    }, [loadPublished]);
+    const reload = useCallback(async () => {
+        await Promise.all([loadPublished(), reloadLocal()]);
+    }, [loadPublished, reloadLocal]);
+    const merged = [
+        ...localItems.map((i) => applyStock(i, stockMap.get(i.localId ? `draft:${i.localId}` : ""))),
+        ...publishedItems.map((i) => applyStock(i, stockMap.get(i.id))),
+    ];
+    return {
+        items: merged,
+        loading: loading || localLoading,
+        error,
+        reload,
+    };
 }

package/dist-lib/index.d.ts

@@ -1,5 +1,9 @@
 import type { FlowModule } from "@flowselections/core";
 export * from './_core-safelist';
 export { VoorraadPage } from './components/voorraad/VoorraadPage';
+export { NieuwArtikelPage } from './components/voorraad/NieuwArtikelPage';
+export { EditArtikelPage } from './components/voorraad/EditArtikelPage';
+export { ValidationPage } from './components/voorraad/ValidationPage';
+export { ArtikelWizard } from './components/voorraad/ArtikelWizard';
 export declare const floridayVoorraadModule: FlowModule;
 //# 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":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAIlE,eAAO,MAAM,sBAAsB,EAAE,UAYpC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,eAAO,MAAM,sBAAsB,EAAE,UAUpC,CAAC"}

package/dist-lib/index.js

@@ -4,17 +4,18 @@
 import { Package } from "lucide-react";
 export * from './_core-safelist';
 export { VoorraadPage } from './components/voorraad/VoorraadPage';
-import { VoorraadSettingsCard } from "./components/settings/VoorraadSettingsCard";
+export { NieuwArtikelPage } from './components/voorraad/NieuwArtikelPage';
+export { EditArtikelPage } from './components/voorraad/EditArtikelPage';
+export { ValidationPage } from './components/voorraad/ValidationPage';
+export { ArtikelWizard } from './components/voorraad/ArtikelWizard';
 export const floridayVoorraadModule = {
     id: "voorraad",
     name: "Voorraad",
     version: "1.0.0",
     nav: {
         label: "Voorraad",
-        href: "/floriday-voorraad",
+        href: "/voorraad",
         icon: Package,
     },
-    settingsCards: [
-        { component: VoorraadSettingsCard, order: 10 },
-    ],
+    settingsCards: [],
 };