@open-mercato/core 0.6.6-develop.6529.1.e1de4b3f27 → 0.6.6-develop.6530.1.6d8442bafd

package/src/modules/sales/components/documents/ShipmentDialog.tsx

@@ -296,6 +296,13 @@ export function ShipmentDialog({
   const [addressOptions, setAddressOptions] = React.useState<ShipmentAddressOption[]>([])
   const [addressLoading, setAddressLoading] = React.useState(false)
   const [addressError, setAddressError] = React.useState<string | null>(null)
+  const addressLoadPromiseRef = React.useRef<{
+    orderId: string
+    promise: Promise<ShipmentAddressOption[]>
+  } | null>(null)
+  const currentAddressOrderIdRef = React.useRef(orderId)
+  currentAddressOrderIdRef.current = orderId
+  const initializedDialogKeyRef = React.useRef<string | null>(null)
   const [documentStatuses, setDocumentStatuses] = React.useState<StatusOption[]>([])
   const [lineStatuses, setLineStatuses] = React.useState<StatusOption[]>([])
   const [shipmentStatuses, setShipmentStatuses] = React.useState<StatusOption[]>([])
@@ -479,37 +486,52 @@ export function ShipmentDialog({
     [],
   )
 
-  const loadAddressOptions = React.useCallback(async () => {
+  const loadAddressOptions = React.useCallback((): Promise<ShipmentAddressOption[]> => {
+    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<{ items?: Array<Record<string, unknown>> }>(
-        `/api/sales/document-addresses?${params.toString()}`,
-        undefined,
-        { fallback: { items: [] } },
-      )
-      const items = Array.isArray(response.result?.items) ? response.result.items : []
-      const mapped = items
-        .map((item) => mapDocumentAddressOption(item))
-        .filter((entry): entry is ShipmentAddressOption => 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<{ items?: Array<Record<string, unknown>> }>(
+          `/api/sales/document-addresses?${params.toString()}`,
+          undefined,
+          { fallback: { items: [] } },
+        )
+        const items = Array.isArray(response.result?.items) ? response.result.items : []
+        const mapped = items
+          .map((item) => mapDocumentAddressOption(item))
+          .filter((entry): entry is ShipmentAddressOption => 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: ShippingMethodOption): string | undefined => {
@@ -851,16 +873,20 @@ export function ShipmentDialog({
   )
 
   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()
     }
@@ -871,7 +897,6 @@ export function ShipmentDialog({
       void loadLineStatuses()
     }
   }, [
-    addressOptions.length,
     baseAddressOptions,
     documentStatuses.length,
     loadAddressOptions,
@@ -881,6 +906,8 @@ export function ShipmentDialog({
     loadShippingMethods,
     mode,
     open,
+    orderId,
+    shipment?.id,
     lineStatuses.length,
     shipmentStatuses.length,
     shippingMethods.length,
@@ -939,11 +966,9 @@ export function ShipmentDialog({
 
   const fetchAddressItems = React.useCallback(
     async (query?: string): Promise<LookupSelectItem[]> => {
-      if (!addressOptions.length && !addressLoading) {
-        await loadAddressOptions()
-      }
+      const options = addressOptions.length ? addressOptions : await loadAddressOptions()
       const needle = query?.trim().toLowerCase() ?? ''
-      return addressOptions
+      return options
         .filter((option) => {
           if (!needle) return true
           return (
@@ -962,7 +987,7 @@ export function ShipmentDialog({
           ),
         }))
     },
-    [addressLoading, addressOptions, loadAddressOptions],
+    [addressOptions, loadAddressOptions],
   )
 
   const validateItems = React.useCallback(