@shipengine/elements 0.6.47 → 0.7.1

package/components/void-label/void-label.d.ts

@@ -2,7 +2,8 @@
 import * as SE from "@shipengine/types";
 export declare type VoidLabelProps = {
     labelId?: string;
-    onViewShipment: (shipment: SE.SalesOrderShipment) => void;
     onComplete: (request: SE.VoidRequest, shipment: SE.SalesOrderShipment) => void;
+    onSuccess?: (label: SE.Label, shipment: SE.SalesOrderShipment) => void;
+    onViewShipment: (shipment: SE.SalesOrderShipment) => void;
 };
-export declare const VoidLabel: ({ labelId, onViewShipment, onComplete }: VoidLabelProps) => JSX.Element;
+export declare const VoidLabel: ({ labelId, onComplete, onSuccess, onViewShipment }: VoidLabelProps) => JSX.Element;

package/index.cjs

@@ -3003,11 +3003,24 @@ const RateForm = ({
   const updateShipment = elementsCore.useUpdateShipment({
     shipmentId: shipment === null || shipment === void 0 ? void 0 : shipment.shipmentId
   });
+  const [beforeCreateError, setBeforeCreateError] = react.useState(null);
   const handleSubmit = react.useCallback(rateId => __awaiter(void 0, void 0, void 0, function* () {
+    setBeforeCreateError(null);
     const rate = rates === null || rates === void 0 ? void 0 : rates.find(r => r.rateId === rateId);
 
     if (rate) {
-      yield onBeforeLabelCreate === null || onBeforeLabelCreate === void 0 ? void 0 : onBeforeLabelCreate(rate, shipment);
+      try {
+        yield onBeforeLabelCreate === null || onBeforeLabelCreate === void 0 ? void 0 : onBeforeLabelCreate(rate, shipment);
+      } catch (e) {
+        setBeforeCreateError({
+          errorSource: "client",
+          errorType: "unknown",
+          errorCode: "unknown",
+          message: e.message
+        });
+        return;
+      }
+
       const label = yield createLabel.trigger({
         rateId
       });
@@ -3036,7 +3049,7 @@ const RateForm = ({
   const carriers = elementsCore.useListCarriers();
   return jsxRuntime.jsx(elementsUi.Templates.RateForm, {
     carriers: carriers.data,
-    errors: [...(errors !== null && errors !== void 0 ? errors : []), ...((_a = createLabel.errors) !== null && _a !== void 0 ? _a : [])],
+    errors: [...(errors !== null && errors !== void 0 ? errors : []), ...((_a = createLabel.errors) !== null && _a !== void 0 ? _a : []), ...(beforeCreateError ? [beforeCreateError] : [])],
     loading: _loading,
     onSave: handleSave,
     onSubmit: handleSubmit,
@@ -20673,10 +20686,11 @@ const Shipment = ({
 
 const VoidLabel = ({
   labelId,
-  onViewShipment,
-  onComplete
+  onComplete,
+  onSuccess,
+  onViewShipment
 }) => {
-  var _a, _b, _c;
+  var _a;
 
   const label = elementsCore.useGetLabel({
     labelId
@@ -20684,24 +20698,25 @@ const VoidLabel = ({
   const shipment = elementsCore.useGetShipment({
     shipmentId: (_a = label.data) === null || _a === void 0 ? void 0 : _a.shipmentId
   });
-  const salesOrders = elementsCore.useListSalesOrders({
-    salesOrderIds: (_b = shipment.data) === null || _b === void 0 ? void 0 : _b.salesOrderIds
-  });
   const voidLabel = elementsCore.useVoidLabel({
     labelId
   });
 
   const handleVoidLabelSubmit = () => __awaiter(void 0, void 0, void 0, function* () {
-    yield voidLabel.trigger(label.data);
+    const result = yield voidLabel.trigger(label.data); // We should always have label.data and shipment.data if the request was approved,
+    // but we aren't using Suspense so we still need to check.
+
+    if ((result === null || result === void 0 ? void 0 : result.approved) && label.data && shipment.data) {
+      onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(label.data, shipment.data);
+    }
   });
 
   return jsxRuntime.jsx(elementsUi.Templates.VoidLabel, {
-    salesOrder: (_c = salesOrders.data) === null || _c === void 0 ? void 0 : _c[0],
-    shipment: shipment.data,
     onComplete: onComplete,
     onSubmit: handleVoidLabelSubmit,
     onViewShipment: onViewShipment,
-    voidLabel: voidLabel.data
+    shipment: shipment.data,
+    voidRequest: voidLabel.data
   });
 };
 

package/index.js

@@ -2999,11 +2999,24 @@ const RateForm = ({
   const updateShipment = useUpdateShipment({
     shipmentId: shipment === null || shipment === void 0 ? void 0 : shipment.shipmentId
   });
+  const [beforeCreateError, setBeforeCreateError] = useState(null);
   const handleSubmit = useCallback(rateId => __awaiter(void 0, void 0, void 0, function* () {
+    setBeforeCreateError(null);
     const rate = rates === null || rates === void 0 ? void 0 : rates.find(r => r.rateId === rateId);
 
     if (rate) {
-      yield onBeforeLabelCreate === null || onBeforeLabelCreate === void 0 ? void 0 : onBeforeLabelCreate(rate, shipment);
+      try {
+        yield onBeforeLabelCreate === null || onBeforeLabelCreate === void 0 ? void 0 : onBeforeLabelCreate(rate, shipment);
+      } catch (e) {
+        setBeforeCreateError({
+          errorSource: "client",
+          errorType: "unknown",
+          errorCode: "unknown",
+          message: e.message
+        });
+        return;
+      }
+
       const label = yield createLabel.trigger({
         rateId
       });
@@ -3032,7 +3045,7 @@ const RateForm = ({
   const carriers = useListCarriers();
   return jsx(Templates.RateForm, {
     carriers: carriers.data,
-    errors: [...(errors !== null && errors !== void 0 ? errors : []), ...((_a = createLabel.errors) !== null && _a !== void 0 ? _a : [])],
+    errors: [...(errors !== null && errors !== void 0 ? errors : []), ...((_a = createLabel.errors) !== null && _a !== void 0 ? _a : []), ...(beforeCreateError ? [beforeCreateError] : [])],
     loading: _loading,
     onSave: handleSave,
     onSubmit: handleSubmit,
@@ -20669,10 +20682,11 @@ const Shipment = ({
 
 const VoidLabel = ({
   labelId,
-  onViewShipment,
-  onComplete
+  onComplete,
+  onSuccess,
+  onViewShipment
 }) => {
-  var _a, _b, _c;
+  var _a;
 
   const label = useGetLabel({
     labelId
@@ -20680,24 +20694,25 @@ const VoidLabel = ({
   const shipment = useGetShipment({
     shipmentId: (_a = label.data) === null || _a === void 0 ? void 0 : _a.shipmentId
   });
-  const salesOrders = useListSalesOrders({
-    salesOrderIds: (_b = shipment.data) === null || _b === void 0 ? void 0 : _b.salesOrderIds
-  });
   const voidLabel = useVoidLabel({
     labelId
   });
 
   const handleVoidLabelSubmit = () => __awaiter(void 0, void 0, void 0, function* () {
-    yield voidLabel.trigger(label.data);
+    const result = yield voidLabel.trigger(label.data); // We should always have label.data and shipment.data if the request was approved,
+    // but we aren't using Suspense so we still need to check.
+
+    if ((result === null || result === void 0 ? void 0 : result.approved) && label.data && shipment.data) {
+      onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(label.data, shipment.data);
+    }
   });
 
   return jsx(Templates.VoidLabel, {
-    salesOrder: (_c = salesOrders.data) === null || _c === void 0 ? void 0 : _c[0],
-    shipment: shipment.data,
     onComplete: onComplete,
     onSubmit: handleVoidLabelSubmit,
     onViewShipment: onViewShipment,
-    voidLabel: voidLabel.data
+    shipment: shipment.data,
+    voidRequest: voidLabel.data
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shipengine/elements",
-  "version": "0.6.47",
+  "version": "0.7.1",
   "peerDependencies": {
     "@packlink/giger": "*",
     "react-i18next": "*",
@@ -12,10 +12,10 @@
   "types": "./index.d.ts",
   "dependencies": {
     "react": "^18.2.0",
-    "@shipengine/elements-core": "0.6.47",
+    "@shipengine/elements-core": "0.7.1",
     "i18next-http-backend": "^1.4.1",
     "i18next-browser-languagedetector": "^6.1.4",
-    "@shipengine/types": "0.6.47",
-    "@shipengine/elements-ui": "0.6.47"
+    "@shipengine/types": "0.7.1",
+    "@shipengine/elements-ui": "0.7.1"
   }
 }