From 3f499c829eb3d7fe14cd0caf817c05dca61130ac Mon Sep 17 00:00:00 2001
From: Stevche Radevski <sradevski@live.com>
Date: Wed, 3 Jul 2024 15:45:53 +0200
Subject: [PATCH] fix: Minor fixes to the inventory pages (#7921)

---
 .../components/inventory-item-general-section.tsx     |  8 +++++---
 .../components/edit-reservation-form.tsx              | 11 ++++++-----
 .../reservation-general-section.tsx                   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx
index cbdcbaa785..a6aa2e7d7f 100644
--- a/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/inventory/inventory-detail/components/inventory-item-general-section.tsx
@@ -59,7 +59,9 @@ export const InventoryItemGeneralSection = ({
 }
 
 const getQuantityFormat = (quantity: number, locations?: number) => {
-  return `${quantity ?? "-"} ${
-    quantity ? `across ${locations ?? "-"} locations` : ""
-  }`
+  if (quantity !== undefined && !isNaN(quantity)) {
+    return `${quantity} across ${locations ?? "-"} locations`
+  }
+
+  return "-"
 }
diff --git a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx
index ce9ba0bc12..ad0f445c76 100644
--- a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/edit-reservation/components/edit-reservation-form.tsx
@@ -2,10 +2,7 @@ import * as zod from "zod"
 
 import { InventoryTypes, StockLocationDTO } from "@medusajs/types"
 import { Button, Input, Select, Text, Textarea, toast } from "@medusajs/ui"
-import {
-  RouteDrawer,
-  useRouteModal,
-} from "../../../../../../components/modals"
+import { RouteDrawer, useRouteModal } from "../../../../../../components/modals"
 
 import { zodResolver } from "@hookform/resolvers/zod"
 import { useForm } from "react-hook-form"
@@ -140,7 +137,11 @@ export const EditReservationForm = ({
             />
             <AttributeGridRow
               title={t("inventory.available")}
-              value={level!.stocked_quantity - reservedQuantity}
+              value={
+                level!.stocked_quantity -
+                (level.reserved_quantity - reservation.quantity) -
+                reservedQuantity
+              }
             />
           </div>
           <Form.Field
diff --git a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx
index 4e76b7a1ee..1c8b6d65a6 100644
--- a/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/reservations/reservation-detail/components/reservation-general-section/reservation-general-section.tsx
@@ -82,7 +82,7 @@ export const ReservationGeneralSection = ({
       />
       <SectionRow
         title={t("inventory.reservation.reservedAtLocation")}
-        value={reservation.quantity}
+        value={locationLevel?.reserved_quantity}
       />
     </Container>
   )