@flowselections/floriday-voorraad 1.0.27 → 1.0.28

package/dist-lib/hooks/useLocalTradeItems.js

@@ -1,8 +1,19 @@
 import { useCallback, useEffect, useState } from "react";
 import { supabase } from "../integrations/supabase/client";
 import { derivePrimaryPacking } from "../lib/floriday-client";
+function asRecord(value) {
+    return value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : {};
+}
 function productToTradeItem(row) {
-    const payload = (row.floriday_payload ?? {});
+    const cf = asRecord(row.custom_fields);
+    const payload = asRecord(cf.floriday_payload);
+    const floridayId = row.floriday_trade_item_id ||
+        (typeof cf.floriday_id === "string" ? cf.floriday_id : null) ||
+        (row.trade_item_key && !row.trade_item_key.startsWith("product:")
+            ? row.trade_item_key
+            : null);
     const firstImage = Array.isArray(payload.images) && payload.images.length > 0 ? payload.images[0] : null;
     const payloadImage = (firstImage && (firstImage.url || firstImage.previewUrl)) ?? null;
     const packingConfigurations = Array.isArray(payload.packingConfigurations)
@@ -14,7 +25,7 @@ function productToTradeItem(row) {
         id: row.id,
         productId: row.id,
         localId: row.id,
-        tradeItemKey: `product:${row.id}`,
+        tradeItemKey: row.trade_item_key || `product:${row.id}`,
         source: "product",
         name,
         articleNumber,
@@ -26,18 +37,18 @@ function productToTradeItem(row) {
         incomingQuantity: 0,
         economicQuantity: 0,
         raw: row,
-        floridayActive: row.floriday_active,
-        published: row.floriday_active,
-        linkStatus: row.floriday_active ? "published" : "linked",
+        floridayActive: Boolean(floridayId),
+        published: Boolean(floridayId),
+        linkStatus: floridayId ? "published" : "linked",
         missingFields: [],
         linkError: null,
         lastSyncAt: null,
-        floridayId: row.floriday_trade_item_id,
+        floridayId,
         packingConfigurations,
         primaryPacking: derivePrimaryPacking(packingConfigurations),
     };
 }
-const SELECT_COLS = "id,product,article_number,barcode,image_url,floriday_active,floriday_trade_item_id,floriday_payload,updated_at,created_at";
+const SELECT_COLS = "id,product,article_number,barcode,image_url,trade_item_key,floriday_trade_item_id,custom_fields,updated_at,created_at";
 /**
  * `connectionId` wordt vandaag genegeerd: producten zijn niet meer per Floriday-connectie gescoped.
  * De parameter blijft in de signatuur zodat bestaande callers zonder wijziging werken.
@@ -83,11 +94,16 @@ export async function getLocalTradeItem(id) {
     return {
         id: p.id,
         connection_id: null,
-        data: (p.floriday_payload ?? {}),
+        data: (asRecord(p.custom_fields).floriday_payload ?? {
+            ...{},
+            name: p.product ?? "",
+            articleCode: p.article_number ?? "",
+            gtin: p.barcode ?? "",
+        }),
         updated_at: p.updated_at,
         created_at: p.created_at,
-        floriday_id: p.floriday_trade_item_id,
-        floriday_link_status: p.floriday_active ? "published" : "linked",
+        floriday_id: p.floriday_trade_item_id ?? asRecord(p.custom_fields).floriday_id ?? null,
+        floriday_link_status: p.floriday_trade_item_id || asRecord(p.custom_fields).floriday_id ? "published" : "linked",
         missing_required_fields: [],
         last_floriday_sync_at: null,
         floriday_link_error: null,
@@ -95,7 +111,7 @@ export async function getLocalTradeItem(id) {
     };
 }
 /**
- * Slaat Floriday-velden op in `products.floriday_payload`. Als `id` ontbreekt maken we een
+ * Slaat Floriday-velden op in `products.custom_fields.floriday_payload`. Als `id` ontbreekt maken we een
  * nieuw product aan (met minimale ERP-velden uit de payload). Nooit een concept-rij.
  */
 export async function upsertLocalTradeItem(params) {
@@ -109,15 +125,11 @@ export async function upsertLocalTradeItem(params) {
         : null;
     const targetId = params.id && params.id.length > 0 ? params.id : linkedProductId;
     const productPatch = {
-        floriday_payload: payload,
         updated_at: new Date().toISOString(),
     };
     if (params.meta?.floridayId !== undefined) {
         productPatch.floriday_trade_item_id = params.meta.floridayId;
     }
-    if (params.meta?.floridayLinkStatus === "published") {
-        productPatch.floriday_active = true;
-    }
     if (payload.name)
         productPatch.product = payload.name;
     if (payload.articleCode)
@@ -128,15 +140,21 @@ export async function upsertLocalTradeItem(params) {
     const firstImageUrl = firstImage?.url || firstImage?.previewUrl;
     if (firstImageUrl)
         productPatch.image_url = firstImageUrl;
-    if (payload.vatRate !== undefined) {
-        const v = payload.vatRate;
-        productPatch.vat_rate = v === null || v === "" || Number.isNaN(Number(v)) ? null : Number(v);
-    }
-    if (payload.vatCode !== undefined) {
-        const c = payload.vatCode;
-        productPatch.vat_code = c && String(c).length > 0 ? String(c) : null;
-    }
     if (targetId) {
+        const { data: existing } = await supabase
+            .from("products")
+            .select("custom_fields")
+            .eq("id", targetId)
+            .maybeSingle();
+        const currentCustomFields = asRecord(existing?.custom_fields);
+        productPatch.custom_fields = {
+            ...currentCustomFields,
+            articleCode: payload.articleCode || currentCustomFields.articleCode,
+            floriday_id: params.meta?.floridayId !== undefined
+                ? params.meta.floridayId
+                : currentCustomFields.floriday_id,
+            floriday_payload: payload,
+        };
         const { error } = await supabase
             .from("products")
             .update(productPatch)
@@ -158,15 +176,12 @@ export async function upsertLocalTradeItem(params) {
         image_url: firstImageUrl || null,
         product_type: "levend",
         trade_item_key: `product:${generatedId}`,
-        floriday_payload: payload,
         floriday_trade_item_id: params.meta?.floridayId ?? null,
-        floriday_active: params.meta?.floridayLinkStatus === "published",
-        vat_rate: payload.vatRate !== null && payload.vatRate !== undefined && payload.vatRate !== ""
-            ? Number(payload.vatRate)
-            : null,
-        vat_code: payload.vatCode && String(payload.vatCode).length > 0
-            ? String(payload.vatCode)
-            : null,
+        custom_fields: {
+            articleCode: payload.articleCode || null,
+            floriday_id: params.meta?.floridayId ?? null,
+            floriday_payload: payload,
+        },
     };
     const { error } = await supabase.from("products").insert(insertRow);
     if (error)
@@ -174,16 +189,25 @@ export async function upsertLocalTradeItem(params) {
     return generatedId;
 }
 /**
- * Legacy API. Alleen meta-velden die vandaag nog op `products` bestaan (`floriday_active`,
- * `floriday_trade_item_id`) worden gepersisteerd; overige velden worden stilzwijgend genegeerd
+ * Legacy API. Alleen meta-velden die vandaag nog op `products` bestaan (`floriday_trade_item_id`
+ * en `custom_fields.floriday_id`) worden gepersisteerd; overige velden worden stilzwijgend genegeerd
  * omdat het draft-model verdwenen is.
  */
 export async function updateDraftMeta(id, meta) {
     const patch = {};
     if (meta.floridayId !== undefined)
         patch.floriday_trade_item_id = meta.floridayId;
-    if (meta.floridayLinkStatus === "published")
-        patch.floriday_active = true;
+    if (meta.floridayId !== undefined) {
+        const { data } = await supabase
+            .from("products")
+            .select("custom_fields")
+            .eq("id", id)
+            .maybeSingle();
+        patch.custom_fields = {
+            ...asRecord(data?.custom_fields),
+            floriday_id: meta.floridayId,
+        };
+    }
     if (Object.keys(patch).length === 0)
         return;
     const { error } = await supabase.from("products").update(patch).eq("id", id);

package/dist-lib/hooks/useVoorraadCustomFields.d.ts

@@ -0,0 +1,9 @@
+import { type VoorraadCustomField } from "../lib/voorraad-custom-fields";
+/** Laadt de door de gebruiker gedefinieerde voorraadvelden. */
+export declare function useVoorraadCustomFields(): {
+    fields: VoorraadCustomField[];
+    loading: boolean;
+    error: string | null;
+    reload: () => Promise<void>;
+};
+//# sourceMappingURL=useVoorraadCustomFields.d.ts.map

package/dist-lib/hooks/useVoorraadCustomFields.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useVoorraadCustomFields.d.ts","sourceRoot":"","sources":["../../src/hooks/useVoorraadCustomFields.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;AAEvC,+DAA+D;AAC/D,wBAAgB,uBAAuB;;;;;EAuBtC"}

package/dist-lib/hooks/useVoorraadCustomFields.js

@@ -0,0 +1,26 @@
+import { useCallback, useEffect, useState } from "react";
+import { fetchVoorraadCustomFields, } from "../lib/voorraad-custom-fields";
+/** Laadt de door de gebruiker gedefinieerde voorraadvelden. */
+export function useVoorraadCustomFields() {
+    const [fields, setFields] = useState([]);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState(null);
+    const reload = useCallback(async () => {
+        setLoading(true);
+        try {
+            setFields(await fetchVoorraadCustomFields());
+            setError(null);
+        }
+        catch (e) {
+            setFields([]);
+            setError(e.message);
+        }
+        finally {
+            setLoading(false);
+        }
+    }, []);
+    useEffect(() => {
+        void reload();
+    }, [reload]);
+    return { fields, loading, error, reload };
+}

package/dist-lib/index.d.ts

@@ -6,5 +6,7 @@ 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 { VoorraadVeldenCard } from './components/voorraad/VoorraadVeldenCard';
+export { ProductCustomFieldsCard } from './components/voorraad/ProductCustomFieldsCard';
 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;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAExE,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;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAIxF,eAAO,MAAM,sBAAsB,EAAE,UAUpC,CAAC"}

package/dist-lib/index.js

@@ -9,6 +9,9 @@ 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 { VoorraadVeldenCard } from './components/voorraad/VoorraadVeldenCard';
+export { ProductCustomFieldsCard } from './components/voorraad/ProductCustomFieldsCard';
+import { VoorraadVeldenCard } from './components/voorraad/VoorraadVeldenCard';
 export const floridayVoorraadModule = {
     id: "voorraad",
     name: "Voorraad",
@@ -18,5 +21,5 @@ export const floridayVoorraadModule = {
         href: "/voorraad",
         icon: Package,
     },
-    settingsCards: [],
+    settingsCards: [{ component: VoorraadVeldenCard, order: 50 }],
 };