@open-mercato/core 0.6.6-develop.6529.1.e1de4b3f27 → 0.6.6-develop.6531.1.87e9d31db6

package/dist/modules/sales/components/documents/ShipmentDialog.js

@@ -183,6 +183,10 @@ function ShipmentDialog({
   const [addressOptions, setAddressOptions] = React.useState([]);
   const [addressLoading, setAddressLoading] = React.useState(false);
   const [addressError, setAddressError] = React.useState(null);
+  const addressLoadPromiseRef = React.useRef(null);
+  const currentAddressOrderIdRef = React.useRef(orderId);
+  currentAddressOrderIdRef.current = orderId;
+  const initializedDialogKeyRef = React.useRef(null);
   const [documentStatuses, setDocumentStatuses] = React.useState([]);
   const [lineStatuses, setLineStatuses] = React.useState([]);
   const [shipmentStatuses, setShipmentStatuses] = React.useState([]);
@@ -340,35 +344,49 @@ function ShipmentDialog({
     }),
     []
   );
-  const loadAddressOptions = React.useCallback(async () => {
+  const loadAddressOptions = React.useCallback(() => {
+    const activeRequest = addressLoadPromiseRef.current;
+    if (activeRequest?.orderId === orderId) return activeRequest.promise;
     setAddressLoading(true);
-    try {
-      const params = new URLSearchParams({
-        page: "1",
-        pageSize: "100",
-        documentId: orderId,
-        documentKind: "order"
-      });
-      const response = await apiCall(
-        `/api/sales/document-addresses?${params.toString()}`,
-        void 0,
-        { fallback: { items: [] } }
-      );
-      const items = Array.isArray(response.result?.items) ? response.result.items : [];
-      const mapped = items.map((item) => mapDocumentAddressOption(item)).filter((entry) => Boolean(entry));
-      mergeAddressOptions(mapped);
-      setAddressError(null);
-      return mapped;
-    } catch (err) {
-      logger.error("sales.shipments.addresses.load", { err });
-      setAddressError(
-        t("sales.documents.shipments.addressLoadError", "Failed to load addresses.")
-      );
-      return [];
-    } finally {
-      setAddressLoading(false);
-    }
-  }, [mapDocumentAddressOption, mergeAddressOptions, orderId, t]);
+    const request = (async () => {
+      try {
+        const params = new URLSearchParams({
+          page: "1",
+          pageSize: "100",
+          documentId: orderId,
+          documentKind: "order"
+        });
+        const response = await apiCall(
+          `/api/sales/document-addresses?${params.toString()}`,
+          void 0,
+          { fallback: { items: [] } }
+        );
+        const items = Array.isArray(response.result?.items) ? response.result.items : [];
+        const mapped = items.map((item) => mapDocumentAddressOption(item)).filter((entry) => Boolean(entry));
+        const loadedOptions = dedupeAddressOptions([...baseAddressOptions, ...mapped]);
+        if (currentAddressOrderIdRef.current !== orderId) return baseAddressOptions;
+        mergeAddressOptions(loadedOptions);
+        setAddressError(null);
+        return loadedOptions;
+      } catch (err) {
+        logger.error("sales.shipments.addresses.load", { err });
+        if (currentAddressOrderIdRef.current === orderId) {
+          setAddressError(
+            t("sales.documents.shipments.addressLoadError", "Failed to load addresses.")
+          );
+        }
+        return baseAddressOptions;
+      }
+    })();
+    addressLoadPromiseRef.current = { orderId, promise: request };
+    void request.then(() => {
+      if (addressLoadPromiseRef.current?.promise === request) {
+        addressLoadPromiseRef.current = null;
+        setAddressLoading(false);
+      }
+    });
+    return request;
+  }, [baseAddressOptions, mapDocumentAddressOption, mergeAddressOptions, orderId, t]);
   const buildPriceSubtitle = React.useCallback(
     (option) => {
       const currency = option.currencyCode ?? currencyCode ?? void 0;
@@ -638,16 +656,20 @@ function ShipmentDialog({
     [renderStatusIcon, shipmentStatuses]
   );
   React.useEffect(() => {
-    if (!open) return;
+    if (!open) {
+      initializedDialogKeyRef.current = null;
+      return;
+    }
+    const dialogKey = `${orderId}:${mode}:${shipment?.id ?? "new"}`;
+    if (initializedDialogKeyRef.current === dialogKey) return;
+    initializedDialogKeyRef.current = dialogKey;
     setFormResetKey((prev) => prev + 1);
     if (!shippingMethods.length) {
       void loadShippingMethods();
     }
     setAddressOptions(baseAddressOptions);
     setAddressError(null);
-    if (!addressOptions.length) {
-      void loadAddressOptions();
-    }
+    void loadAddressOptions();
     if (!shipmentStatuses.length) {
       void loadShipmentStatuses();
     }
@@ -658,7 +680,6 @@ function ShipmentDialog({
       void loadLineStatuses();
     }
   }, [
-    addressOptions.length,
     baseAddressOptions,
     documentStatuses.length,
     loadAddressOptions,
@@ -668,6 +689,8 @@ function ShipmentDialog({
     loadShippingMethods,
     mode,
     open,
+    orderId,
+    shipment?.id,
     lineStatuses.length,
     shipmentStatuses.length,
     shippingMethods.length
@@ -718,11 +741,9 @@ function ShipmentDialog({
   }, [baseAddressOptions, mergeAddressOptions, open]);
   const fetchAddressItems = React.useCallback(
     async (query) => {
-      if (!addressOptions.length && !addressLoading) {
-        await loadAddressOptions();
-      }
+      const options = addressOptions.length ? addressOptions : await loadAddressOptions();
       const needle = query?.trim().toLowerCase() ?? "";
-      return addressOptions.filter((option) => {
+      return options.filter((option) => {
         if (!needle) return true;
         return option.label.toLowerCase().includes(needle) || option.summary.toLowerCase().includes(needle);
       }).map((option) => ({
@@ -732,7 +753,7 @@ function ShipmentDialog({
         icon: /* @__PURE__ */ jsx("div", { className: "flex h-8 w-8 items-center justify-center rounded-md bg-muted text-muted-foreground", children: /* @__PURE__ */ jsx(MapPin, { className: "h-4 w-4" }) })
       }));
     },
-    [addressLoading, addressOptions, loadAddressOptions]
+    [addressOptions, loadAddressOptions]
   );
   const validateItems = React.useCallback(
     (itemsValue) => {