@flowselections/floriday-voorraad 1.0.15 → 1.0.17

package/dist-lib/hooks/useVoorraadData.js

@@ -19,14 +19,37 @@ function applyStock(item, s) {
         economicQuantity: available + s.incoming_stock,
     };
 }
+function erpToTradeItem(row) {
+    const key = row.trade_item_key ?? `product:${row.id}`;
+    return {
+        id: `erp:${row.id}`,
+        productId: row.id,
+        tradeItemKey: key,
+        source: "erp",
+        name: row.product || "(naamloos product)",
+        articleNumber: row.barcode || "",
+        imageUrl: row.image_url,
+        quantity: 0,
+        minQuantity: 0,
+        reservedQuantity: 0,
+        availableQuantity: 0,
+        incomingQuantity: 0,
+        economicQuantity: 0,
+        raw: row,
+        published: false,
+        linkStatus: "unlinked",
+    };
+}
 /**
- * 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).
+ * Reads trade items from three sources and merges them into one voorraad list:
+ * 1. `products` rows tied to a `product:<id>` key (pure ERP items).
+ * 2. `trade_item_drafts` (lokaal concept, mogelijk in publiceerflow).
+ * 3. `floriday_trade_items_cache` (gepubliceerd artikel).
+ * Voorraadwaarden komen uit `trade_item_stock` en overschrijven cache-defaults.
  */
 export function useVoorraadData(connectionId) {
     const [publishedItems, setPublishedItems] = useState([]);
+    const [erpItems, setErpItems] = useState([]);
     const [stockMap, setStockMap] = useState(new Map());
     const [loading, setLoading] = useState(false);
     const [error, setError] = useState(null);
@@ -34,33 +57,43 @@ export function useVoorraadData(connectionId) {
     const loadPublished = useCallback(async () => {
         if (!connectionId) {
             setPublishedItems([]);
+            setErpItems([]);
             setStockMap(new Map());
             return;
         }
         setLoading(true);
         setError(null);
         try {
-            const [pubRes, stock] = await Promise.all([
+            const [pubRes, erpRes, 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),
+                supabase
+                    .from("products")
+                    .select("id,product,barcode,image_url,trade_item_key")
+                    .or("trade_item_key.is.null,trade_item_key.like.product:%")
+                    .limit(1000),
                 fetchStockMap(connectionId),
             ]);
             if (pubRes.error)
                 throw pubRes.error;
+            if (erpRes.error)
+                throw erpRes.error;
             const normalised = (pubRes.data ?? [])
                 .map((row) => normaliseTradeItem({ ...row.data, id: row.floriday_id }))
                 .filter((i) => i.id)
-                .map((i) => ({ ...i, published: true }));
+                .map((i) => ({ ...i, published: true, source: "published", tradeItemKey: i.id }));
             setPublishedItems(normalised);
+            setErpItems((erpRes.data ?? []).map((r) => erpToTradeItem(r)));
             setStockMap(stock);
         }
         catch (e) {
             setError(e.message);
             setPublishedItems([]);
+            setErpItems([]);
         }
         finally {
             setLoading(false);
@@ -69,11 +102,44 @@ export function useVoorraadData(connectionId) {
     useEffect(() => {
         loadPublished();
     }, [loadPublished]);
+    // Realtime: refresh stock map whenever any trade_item_stock row for this
+    // connection changes (insert/update/delete). Keeps Voorraad in sync with
+    // reservations, order completions, wizard saves, imports, etc.
+    useEffect(() => {
+        if (!connectionId)
+            return;
+        const channel = supabase
+            .channel(`voorraad-stock-${connectionId}`)
+            .on("postgres_changes", {
+            event: "*",
+            schema: "public",
+            table: "trade_item_stock",
+            filter: `connection_id=eq.${connectionId}`,
+        }, () => {
+            fetchStockMap(connectionId).then(setStockMap).catch(() => { });
+        })
+            .on("postgres_changes", { event: "*", schema: "public", table: "products" }, () => {
+            loadPublished();
+        })
+            .on("postgres_changes", { event: "*", schema: "public", table: "floriday_trade_items_cache", filter: `connection_id=eq.${connectionId}` }, () => {
+            loadPublished();
+        })
+            .subscribe();
+        return () => {
+            supabase.removeChannel(channel);
+        };
+    }, [connectionId, loadPublished]);
     const reload = useCallback(async () => {
         await Promise.all([loadPublished(), reloadLocal()]);
     }, [loadPublished, reloadLocal]);
+    const linkedProductIds = new Set(localItems
+        .map((i) => i.productId)
+        .filter((id) => Boolean(id)));
     const merged = [
-        ...localItems.map((i) => applyStock(i, stockMap.get(i.localId ? `draft:${i.localId}` : ""))),
+        ...erpItems
+            .filter((i) => !i.productId || !linkedProductIds.has(i.productId))
+            .map((i) => applyStock(i, stockMap.get(i.tradeItemKey ?? ""))),
+        ...localItems.map((i) => applyStock(i, stockMap.get(i.tradeItemKey ?? (i.localId ? `draft:${i.localId}` : "")))),
         ...publishedItems.map((i) => applyStock(i, stockMap.get(i.id))),
     ];
     return {

package/dist-lib/index.d.ts

@@ -5,5 +5,6 @@ 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 { ProductLinkCard } from './components/voorraad/ProductLinkCard';
 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;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"}
+{"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;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,eAAO,MAAM,sBAAsB,EAAE,UAUpC,CAAC"}

package/dist-lib/index.js

@@ -8,6 +8,7 @@ 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 { ProductLinkCard } from './components/voorraad/ProductLinkCard';
 export const floridayVoorraadModule = {
     id: "voorraad",
     name: "Voorraad",