@shipengine/elements 0.6.21 → 0.6.23

package/hooks/use-address-preference.d.ts

@@ -20,7 +20,7 @@ export declare const useAddressPreference: () => {
         }[];
         alternativeSource: "originalAddress" | "matchedAddress";
         isModified: boolean;
-        toggle: () => SE.Address;
         selectionSource: "originalAddress" | "matchedAddress";
+        toggle: () => SE.Address;
     };
 };

package/index.cjs

@@ -20138,11 +20138,12 @@ const useAddressPreference = () => {
   }) => {
     const {
       matchedAddress,
-      originalAddress
+      originalAddress,
+      status
     } = validation; // If the address is domestic, we always default to the matchedAddress if it exists.
     // If the address is international, we always default to the original due to issues with SE-API's validation
 
-    const selectionSource = elementsCore.isDomesticAddress(originalAddress) ? matchedAddress ? "matchedAddress" : "originalAddress" : "originalAddress";
+    const selectionSource = elementsCore.isDomesticAddress(originalAddress) && status !== "error" ? matchedAddress ? "matchedAddress" : "originalAddress" : "originalAddress";
     const alternativeSource = selectionSource === "matchedAddress" ? "originalAddress" : "matchedAddress";
     const newAddressPreference = Object.assign(Object.assign(Object.assign({}, validation), _.isEqual(originalAddress, matchedAddress) ? {
       // An exact match in SE-API will *sometimes* return a matchedAddress exactly mirroring the originalAddress,
@@ -20263,34 +20264,73 @@ const SalesOrder = ({
         const pendingShipment = shipments.data.find(s => s.shipmentStatus === "pending");
 
         if (currentSalesOrder && !pendingShipment) {
-          const defaultWarehouse = (_c = warehouses.data) === null || _c === void 0 ? void 0 : _c[0]; // We don't have a shipment yet; create one.
-
-          const result = yield createShipment.trigger(Object.assign({
-            // /v-beta/shipments/sales_order/:salesOrderId requires at minimum
-            // a (warehouseId or shipFrom) and a package with weight defined.
-            packages: [{
-              weight: {
-                value: 0,
-                unit: "pound"
-              }
-            }],
-            validateAddress: "validate_and_clean",
-            warehouseId: defaultWarehouse.warehouseId
-          }, elementsCore.getIsCustomsRequiredForSalesOrder(currentSalesOrder, defaultWarehouse) && {
-            customs: elementsCore.getCustomsFromSalesOrder(currentSalesOrder, defaultWarehouse)
-          }));
-
-          if (!result) {
-            logger.error("createShipment returned an undefined result");
-          } else if (!result.addressValidation) {
-            logger.error("createShipment returned an undefined addressValidation");
-          } else {
-            yield shipments.mutate();
-            const updatedAddressPreference = resetAddressPreference({
-              validation: result.addressValidation,
-              fallbackAddress: currentSalesOrder.shipTo
+          const defaultWarehouse = (_c = warehouses.data) === null || _c === void 0 ? void 0 : _c[0];
+
+          try {
+            // We don't have a shipment yet; create one.
+            const result = yield createShipment.trigger(Object.assign({
+              // /v-beta/shipments/sales_order/:salesOrderId requires at minimum
+              // a (warehouseId or shipFrom) and a package with weight defined.
+              packages: [{
+                weight: {
+                  value: 0,
+                  unit: "pound"
+                }
+              }],
+              validateAddress: "validate_and_clean",
+              warehouseId: defaultWarehouse.warehouseId
+            }, elementsCore.getIsCustomsRequiredForSalesOrder(currentSalesOrder, defaultWarehouse) && {
+              customs: elementsCore.getCustomsFromSalesOrder(currentSalesOrder, defaultWarehouse)
+            }));
+
+            if (!result) {
+              logger.error("createShipment returned an undefined result");
+            } else if (!result.addressValidation) {
+              logger.error("createShipment returned an undefined addressValidation");
+            } else {
+              yield shipments.mutate();
+              const updatedAddressPreference = resetAddressPreference({
+                validation: result.addressValidation,
+                fallbackAddress: currentSalesOrder.shipTo
+              });
+              yield onAddressValidation === null || onAddressValidation === void 0 ? void 0 : onAddressValidation(updatedAddressPreference);
+            }
+          } catch (error) {
+            // Shipment creation failed most likely due to validate_and_clean failing create and update
+            // validate and create the shipment the old fashioned way.
+            logger.warn("createShipment failed to create a shipment, trying plan b", error.message);
+            const result = yield validateAddresses.trigger({
+              addresses: [currentSalesOrder.shipTo]
             });
-            yield onAddressValidation === null || onAddressValidation === void 0 ? void 0 : onAddressValidation(updatedAddressPreference);
+            const addressValidation = result === null || result === void 0 ? void 0 : result[0];
+
+            if (addressValidation) {
+              try {
+                yield createShipment.trigger(Object.assign({
+                  // /v-beta/shipments/sales_order/:salesOrderId requires at minimum
+                  // a (warehouseId or shipFrom) and a package with weight defined.
+                  packages: [{
+                    weight: {
+                      value: 0,
+                      unit: "pound"
+                    }
+                  }],
+                  shipTo: addressValidation.originalAddress,
+                  warehouseId: defaultWarehouse.warehouseId
+                }, elementsCore.getIsCustomsRequiredForSalesOrder(currentSalesOrder, defaultWarehouse) && {
+                  customs: elementsCore.getCustomsFromSalesOrder(currentSalesOrder, defaultWarehouse)
+                }));
+                yield shipments.mutate();
+                const updatedAddressPreference = resetAddressPreference({
+                  validation: addressValidation,
+                  fallbackAddress: currentSalesOrder.shipTo
+                });
+                yield onAddressValidation === null || onAddressValidation === void 0 ? void 0 : onAddressValidation(updatedAddressPreference);
+              } catch (error) {
+                logger.error("createShipment failed to create a shipment", error.message);
+                throw new Error("errorMessages.unableToLoad.shipment");
+              }
+            }
           }
         } else if (currentSalesOrder && pendingShipment && !validateAddresses.data && !validateAddresses.errors && !validateAddresses.isMutating) {
           // We have a preexisting shipment; validate the address

package/index.js

@@ -20134,11 +20134,12 @@ const useAddressPreference = () => {
   }) => {
     const {
       matchedAddress,
-      originalAddress
+      originalAddress,
+      status
     } = validation; // If the address is domestic, we always default to the matchedAddress if it exists.
     // If the address is international, we always default to the original due to issues with SE-API's validation
 
-    const selectionSource = isDomesticAddress(originalAddress) ? matchedAddress ? "matchedAddress" : "originalAddress" : "originalAddress";
+    const selectionSource = isDomesticAddress(originalAddress) && status !== "error" ? matchedAddress ? "matchedAddress" : "originalAddress" : "originalAddress";
     const alternativeSource = selectionSource === "matchedAddress" ? "originalAddress" : "matchedAddress";
     const newAddressPreference = Object.assign(Object.assign(Object.assign({}, validation), _.isEqual(originalAddress, matchedAddress) ? {
       // An exact match in SE-API will *sometimes* return a matchedAddress exactly mirroring the originalAddress,
@@ -20259,34 +20260,73 @@ const SalesOrder = ({
         const pendingShipment = shipments.data.find(s => s.shipmentStatus === "pending");
 
         if (currentSalesOrder && !pendingShipment) {
-          const defaultWarehouse = (_c = warehouses.data) === null || _c === void 0 ? void 0 : _c[0]; // We don't have a shipment yet; create one.
-
-          const result = yield createShipment.trigger(Object.assign({
-            // /v-beta/shipments/sales_order/:salesOrderId requires at minimum
-            // a (warehouseId or shipFrom) and a package with weight defined.
-            packages: [{
-              weight: {
-                value: 0,
-                unit: "pound"
-              }
-            }],
-            validateAddress: "validate_and_clean",
-            warehouseId: defaultWarehouse.warehouseId
-          }, getIsCustomsRequiredForSalesOrder(currentSalesOrder, defaultWarehouse) && {
-            customs: getCustomsFromSalesOrder(currentSalesOrder, defaultWarehouse)
-          }));
-
-          if (!result) {
-            logger.error("createShipment returned an undefined result");
-          } else if (!result.addressValidation) {
-            logger.error("createShipment returned an undefined addressValidation");
-          } else {
-            yield shipments.mutate();
-            const updatedAddressPreference = resetAddressPreference({
-              validation: result.addressValidation,
-              fallbackAddress: currentSalesOrder.shipTo
+          const defaultWarehouse = (_c = warehouses.data) === null || _c === void 0 ? void 0 : _c[0];
+
+          try {
+            // We don't have a shipment yet; create one.
+            const result = yield createShipment.trigger(Object.assign({
+              // /v-beta/shipments/sales_order/:salesOrderId requires at minimum
+              // a (warehouseId or shipFrom) and a package with weight defined.
+              packages: [{
+                weight: {
+                  value: 0,
+                  unit: "pound"
+                }
+              }],
+              validateAddress: "validate_and_clean",
+              warehouseId: defaultWarehouse.warehouseId
+            }, getIsCustomsRequiredForSalesOrder(currentSalesOrder, defaultWarehouse) && {
+              customs: getCustomsFromSalesOrder(currentSalesOrder, defaultWarehouse)
+            }));
+
+            if (!result) {
+              logger.error("createShipment returned an undefined result");
+            } else if (!result.addressValidation) {
+              logger.error("createShipment returned an undefined addressValidation");
+            } else {
+              yield shipments.mutate();
+              const updatedAddressPreference = resetAddressPreference({
+                validation: result.addressValidation,
+                fallbackAddress: currentSalesOrder.shipTo
+              });
+              yield onAddressValidation === null || onAddressValidation === void 0 ? void 0 : onAddressValidation(updatedAddressPreference);
+            }
+          } catch (error) {
+            // Shipment creation failed most likely due to validate_and_clean failing create and update
+            // validate and create the shipment the old fashioned way.
+            logger.warn("createShipment failed to create a shipment, trying plan b", error.message);
+            const result = yield validateAddresses.trigger({
+              addresses: [currentSalesOrder.shipTo]
             });
-            yield onAddressValidation === null || onAddressValidation === void 0 ? void 0 : onAddressValidation(updatedAddressPreference);
+            const addressValidation = result === null || result === void 0 ? void 0 : result[0];
+
+            if (addressValidation) {
+              try {
+                yield createShipment.trigger(Object.assign({
+                  // /v-beta/shipments/sales_order/:salesOrderId requires at minimum
+                  // a (warehouseId or shipFrom) and a package with weight defined.
+                  packages: [{
+                    weight: {
+                      value: 0,
+                      unit: "pound"
+                    }
+                  }],
+                  shipTo: addressValidation.originalAddress,
+                  warehouseId: defaultWarehouse.warehouseId
+                }, getIsCustomsRequiredForSalesOrder(currentSalesOrder, defaultWarehouse) && {
+                  customs: getCustomsFromSalesOrder(currentSalesOrder, defaultWarehouse)
+                }));
+                yield shipments.mutate();
+                const updatedAddressPreference = resetAddressPreference({
+                  validation: addressValidation,
+                  fallbackAddress: currentSalesOrder.shipTo
+                });
+                yield onAddressValidation === null || onAddressValidation === void 0 ? void 0 : onAddressValidation(updatedAddressPreference);
+              } catch (error) {
+                logger.error("createShipment failed to create a shipment", error.message);
+                throw new Error("errorMessages.unableToLoad.shipment");
+              }
+            }
           }
         } else if (currentSalesOrder && pendingShipment && !validateAddresses.data && !validateAddresses.errors && !validateAddresses.isMutating) {
           // We have a preexisting shipment; validate the address

package/package.json

@@ -1,19 +1,21 @@
 {
   "name": "@shipengine/elements",
-  "version": "0.6.21",
+  "version": "0.6.23",
+  "peerDependencies": {
+    "@packlink/giger": "*"
+  },
   "module": "./index.js",
   "main": "./index.cjs",
   "type": "module",
   "types": "./index.d.ts",
   "dependencies": {
     "react": "^18.2.0",
-    "@shipengine/elements-core": "0.6.21",
+    "@shipengine/elements-core": "0.6.23",
     "react-i18next": "^11.18.4",
     "i18next": "^21.9.1",
     "i18next-http-backend": "^1.4.1",
     "i18next-browser-languagedetector": "^6.1.4",
-    "@shipengine/types": "0.6.21",
-    "@shipengine/elements-ui": "0.6.21"
-  },
-  "peerDependencies": {}
+    "@shipengine/types": "0.6.23",
+    "@shipengine/elements-ui": "0.6.23"
+  }
 }