From 0e0accc115b2bb11ec36a7dcb883525a10cee52e Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sat, 1 Aug 2026 13:36:29 +0100
Subject: [PATCH] Update navigation button states across various components to
 improve user interaction

- Modified the `disabled` prop for `ObjectTableNavigationButtons` in multiple components, including InvoiceInfo, PaymentInfo, and TaxRecordInfo, to account for both loading states and editing states.
- This change enhances user experience by preventing interactions during loading or editing, ensuring a smoother workflow across the dashboard.
---
 src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx   | 2 +-
 src/components/Dashboard/Finance/Payments/PaymentInfo.jsx   | 2 +-
 .../Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx          | 6 ++++--
 .../Inventory/FilamentStocks/FilamentStockInfo.jsx          | 2 +-
 .../Dashboard/Inventory/OrderItems/OrderItemInfo.jsx        | 6 ++++--
 .../Dashboard/Inventory/PartStocks/PartStockInfo.jsx        | 2 +-
 .../Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx  | 2 +-
 .../Inventory/PurchaseOrders/PurchaseOrderInfo.jsx          | 2 +-
 .../Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx     | 6 ++++--
 .../Dashboard/Inventory/Shipments/ShipmentInfo.jsx          | 6 ++++--
 .../Dashboard/Inventory/StockAudits/StockAuditInfo.jsx      | 6 ++++--
 .../Inventory/StockLocations/StockLocationInfo.jsx          | 6 ++++--
 .../Inventory/StockTransfers/StockTransferInfo.jsx          | 2 +-
 .../Dashboard/Management/AppPasswords/AppPasswordInfo.jsx   | 2 +-
 .../Management/CourierServices/CourierServiceInfo.jsx       | 6 ++++--
 .../Dashboard/Management/Couriers/CourierInfo.jsx           | 6 ++++--
 .../Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx   | 6 ++++--
 .../Management/DocumentPrinters/DocumentPrinterInfo.jsx     | 2 +-
 .../Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx | 2 +-
 .../Management/DocumentTemplates/DocumentTemplateInfo.jsx   | 2 +-
 .../Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx   | 6 ++++--
 .../Dashboard/Management/Filaments/FilamentInfo.jsx         | 6 ++++--
 src/components/Dashboard/Management/Files/FileInfo.jsx      | 2 +-
 src/components/Dashboard/Management/Hosts/HostInfo.jsx      | 6 ++++--
 .../Dashboard/Management/Materials/MaterialInfo.jsx         | 6 ++++--
 .../Dashboard/Management/NoteTypes/NoteTypeInfo.jsx         | 6 ++++--
 src/components/Dashboard/Management/Notes/NoteInfo.jsx      | 6 ++++--
 .../Dashboard/Management/PartSkus/PartSkuInfo.jsx           | 6 ++++--
 src/components/Dashboard/Management/Parts/PartInfo.jsx      | 6 ++++--
 .../Management/ProductCategories/ProductCategoryInfo.jsx    | 6 ++++--
 .../Dashboard/Management/ProductSkus/ProductSkuInfo.jsx     | 6 ++++--
 .../Dashboard/Management/Products/ProductInfo.jsx           | 6 ++++--
 .../Dashboard/Management/TaxRates/TaxRateInfo.jsx           | 6 ++++--
 src/components/Dashboard/Management/Users/UserInfo.jsx      | 6 ++++--
 src/components/Dashboard/Management/Vendors/VendorInfo.jsx  | 6 ++++--
 .../Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx       | 6 ++++--
 src/components/Dashboard/Production/Jobs/JobInfo.jsx        | 2 +-
 .../Dashboard/Production/Printers/PrinterInfo.jsx           | 2 +-
 src/components/Dashboard/Production/SubJobs/SubJobInfo.jsx  | 2 +-
 src/components/Dashboard/Sales/Clients/ClientInfo.jsx       | 6 ++++--
 .../Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx  | 6 ++++--
 src/components/Dashboard/Sales/Listings/ListingInfo.jsx     | 6 ++++--
 .../Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx        | 6 ++++--
 .../Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx          | 2 +-
 44 files changed, 128 insertions(+), 72 deletions(-)

diff --git a/src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx b/src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx
index 3a7d6d2..93d3e54 100644
--- a/src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx
+++ b/src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx
@@ -170,7 +170,7 @@ const InvoiceInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={invoiceId}
               objectType='invoice'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Finance/Payments/PaymentInfo.jsx b/src/components/Dashboard/Finance/Payments/PaymentInfo.jsx
index e189492..0aee1fc 100644
--- a/src/components/Dashboard/Finance/Payments/PaymentInfo.jsx
+++ b/src/components/Dashboard/Finance/Payments/PaymentInfo.jsx
@@ -163,7 +163,7 @@ const PaymentInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={paymentId}
               objectType='payment'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx b/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
index a2c6569..b2619f2 100644
--- a/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
+++ b/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
@@ -123,11 +123,13 @@ const TaxRecordInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={taxRecordId}
               objectType='taxRecord'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx b/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
index 335d514..e980974 100644
--- a/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
+++ b/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
@@ -127,7 +127,7 @@ const FilamentStockInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={filamentStockId}
               objectType='filamentStock'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx b/src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx
index fd7bb7b..8bea305 100644
--- a/src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx
+++ b/src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx
@@ -122,11 +122,13 @@ const OrderItemInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={orderItemId}
               objectType='orderItem'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx b/src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx
index 8fced32..e6ee1c7 100644
--- a/src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx
+++ b/src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx
@@ -137,7 +137,7 @@ const PartStockInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={partStockId}
               objectType='partStock'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx b/src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx
index c2b91bb..e6c30fa 100644
--- a/src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx
+++ b/src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx
@@ -164,7 +164,7 @@ const ProductStockInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={productStockId}
               objectType='productStock'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx b/src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx
index 5bdafdf..aca6954 100644
--- a/src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx
+++ b/src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx
@@ -197,7 +197,7 @@ const PurchaseOrderInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={purchaseOrderId}
               objectType='purchaseOrder'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx b/src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx
index 2c11ff4..0e03635 100644
--- a/src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx
+++ b/src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx
@@ -158,11 +158,13 @@ const PurchaseOrderInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={purchaseOrderId}
               objectType='purchaseOrder'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx b/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
index 7fa463a..74f95d0 100644
--- a/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
+++ b/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
@@ -147,11 +147,13 @@ const ShipmentInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={shipmentId}
               objectType='shipment'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx b/src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx
index 62ac59f..8d9faac 100644
--- a/src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx
+++ b/src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx
@@ -125,11 +125,13 @@ const StockAuditInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={stockAuditId}
               objectType='stockAudit'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx b/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx
index 36a53ff..f77dbb3 100644
--- a/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx
+++ b/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx
@@ -126,11 +126,13 @@ const StockLocationInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={stockLocationId}
               objectType='stockLocation'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx b/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx
index 656c6e8..2a93b28 100644
--- a/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx
+++ b/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx
@@ -152,7 +152,7 @@ const StockTransferInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={stockTransferId}
               objectType='stockTransfer'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx b/src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx
index e9e1d62..76de2e4 100644
--- a/src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx
+++ b/src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx
@@ -134,7 +134,7 @@ const AppPasswordInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={appPasswordId}
               objectType='appPassword'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx b/src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx
index 3cb469e..22cba55 100644
--- a/src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx
+++ b/src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx
@@ -125,11 +125,13 @@ const CourierServiceInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={courierServiceId}
               objectType='courierService'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Couriers/CourierInfo.jsx b/src/components/Dashboard/Management/Couriers/CourierInfo.jsx
index 3fa41eb..bb6a76e 100644
--- a/src/components/Dashboard/Management/Couriers/CourierInfo.jsx
+++ b/src/components/Dashboard/Management/Couriers/CourierInfo.jsx
@@ -121,11 +121,13 @@ const CourierInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={courierId}
               objectType='courier'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx b/src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx
index ef03d3c..e8ad5d7 100644
--- a/src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx
@@ -122,11 +122,13 @@ const DocumentJobInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={documentJobId}
               objectType='documentJob'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx b/src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx
index 08c6dbb..65277d5 100644
--- a/src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx
@@ -136,7 +136,7 @@ const DocumentPrinterInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={documentPrinterId}
               objectType='documentPrinter'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx b/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx
index 37eda7f..6dc0730 100644
--- a/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx
@@ -128,7 +128,7 @@ const DocumentSizeInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={documentSizeId}
               objectType='documentSize'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx b/src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx
index 8504eb5..23dca4c 100644
--- a/src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx
@@ -133,7 +133,7 @@ const DocumentTemplateInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={documentTemplateId}
               objectType='documentTemplate'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx b/src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx
index fce3c14..51fea6b 100644
--- a/src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx
+++ b/src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx
@@ -120,11 +120,13 @@ const FilamentSkuInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={filamentSkuId}
               objectType='filamentSku'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx b/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
index dc04115..28e33b7 100644
--- a/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
+++ b/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
@@ -141,11 +141,13 @@ const FilamentInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={filamentId}
               objectType='filament'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Files/FileInfo.jsx b/src/components/Dashboard/Management/Files/FileInfo.jsx
index b94d3aa..fc89096 100644
--- a/src/components/Dashboard/Management/Files/FileInfo.jsx
+++ b/src/components/Dashboard/Management/Files/FileInfo.jsx
@@ -142,7 +142,7 @@ const FileInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={fileId}
               objectType='file'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Hosts/HostInfo.jsx b/src/components/Dashboard/Management/Hosts/HostInfo.jsx
index 81282fb..6069cd9 100644
--- a/src/components/Dashboard/Management/Hosts/HostInfo.jsx
+++ b/src/components/Dashboard/Management/Hosts/HostInfo.jsx
@@ -137,11 +137,13 @@ const HostInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={hostId}
               objectType='host'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Materials/MaterialInfo.jsx b/src/components/Dashboard/Management/Materials/MaterialInfo.jsx
index 2bd03d8..005a0a6 100644
--- a/src/components/Dashboard/Management/Materials/MaterialInfo.jsx
+++ b/src/components/Dashboard/Management/Materials/MaterialInfo.jsx
@@ -123,11 +123,13 @@ const MaterialInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={materialId}
               objectType='material'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx b/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
index c6fac2d..01c0ffa 100644
--- a/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
+++ b/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
@@ -111,11 +111,13 @@ const NoteTypeInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={noteTypeId}
               objectType='noteType'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Notes/NoteInfo.jsx b/src/components/Dashboard/Management/Notes/NoteInfo.jsx
index a072f37..10c8bd7 100644
--- a/src/components/Dashboard/Management/Notes/NoteInfo.jsx
+++ b/src/components/Dashboard/Management/Notes/NoteInfo.jsx
@@ -126,11 +126,13 @@ const NoteInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={noteId}
               objectType='note'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx b/src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx
index 90ff27a..5d006c9 100644
--- a/src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx
+++ b/src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx
@@ -115,11 +115,13 @@ const PartSkuInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={partSkuId}
               objectType='partSku'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Parts/PartInfo.jsx b/src/components/Dashboard/Management/Parts/PartInfo.jsx
index 734dc79..f1d2000 100644
--- a/src/components/Dashboard/Management/Parts/PartInfo.jsx
+++ b/src/components/Dashboard/Management/Parts/PartInfo.jsx
@@ -121,11 +121,13 @@ const PartInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={partId}
               objectType='part'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx b/src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx
index 3a95e4c..2ca72ae 100644
--- a/src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx
+++ b/src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx
@@ -120,11 +120,13 @@ const ProductCategoryInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={productCategoryId}
               objectType='productCategory'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx b/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
index 7fa54ea..8e9a050 100644
--- a/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
+++ b/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
@@ -123,11 +123,13 @@ const ProductSkuInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={productSkuId}
               objectType='productSku'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Products/ProductInfo.jsx b/src/components/Dashboard/Management/Products/ProductInfo.jsx
index 586a29f..9ddb98f 100644
--- a/src/components/Dashboard/Management/Products/ProductInfo.jsx
+++ b/src/components/Dashboard/Management/Products/ProductInfo.jsx
@@ -121,11 +121,13 @@ const ProductInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={productId}
               objectType='product'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx b/src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx
index 4b0dafd..68572ad 100644
--- a/src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx
+++ b/src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx
@@ -120,11 +120,13 @@ const TaxRateInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={taxRateId}
               objectType='taxRate'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Users/UserInfo.jsx b/src/components/Dashboard/Management/Users/UserInfo.jsx
index 3b61d24..77d05ad 100644
--- a/src/components/Dashboard/Management/Users/UserInfo.jsx
+++ b/src/components/Dashboard/Management/Users/UserInfo.jsx
@@ -126,11 +126,13 @@ const UserInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={userId}
               objectType='user'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Management/Vendors/VendorInfo.jsx b/src/components/Dashboard/Management/Vendors/VendorInfo.jsx
index d310c6d..53f943f 100644
--- a/src/components/Dashboard/Management/Vendors/VendorInfo.jsx
+++ b/src/components/Dashboard/Management/Vendors/VendorInfo.jsx
@@ -120,11 +120,13 @@ const VendorInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={vendorId}
               objectType='vendor'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx b/src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
index f97012e..aeb6990 100644
--- a/src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
+++ b/src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
@@ -129,11 +129,13 @@ const GCodeFileInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={gcodeFileId}
               objectType='gcodeFile'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Production/Jobs/JobInfo.jsx b/src/components/Dashboard/Production/Jobs/JobInfo.jsx
index eec826b..663311c 100644
--- a/src/components/Dashboard/Production/Jobs/JobInfo.jsx
+++ b/src/components/Dashboard/Production/Jobs/JobInfo.jsx
@@ -147,7 +147,7 @@ const JobInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={jobId}
               objectType='job'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx
index 0968957..4487ba7 100644
--- a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx
+++ b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx
@@ -137,7 +137,7 @@ const PrinterInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={printerId}
               objectType='printer'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Production/SubJobs/SubJobInfo.jsx b/src/components/Dashboard/Production/SubJobs/SubJobInfo.jsx
index bfe3f7f..c6b35d0 100644
--- a/src/components/Dashboard/Production/SubJobs/SubJobInfo.jsx
+++ b/src/components/Dashboard/Production/SubJobs/SubJobInfo.jsx
@@ -117,7 +117,7 @@ const SubJobInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={subJobId}
               objectType='subJob'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Sales/Clients/ClientInfo.jsx b/src/components/Dashboard/Sales/Clients/ClientInfo.jsx
index 8bd5ccd..5423a32 100644
--- a/src/components/Dashboard/Sales/Clients/ClientInfo.jsx
+++ b/src/components/Dashboard/Sales/Clients/ClientInfo.jsx
@@ -120,11 +120,13 @@ const ClientInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={clientId}
               objectType='client'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx b/src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx
index 6ccfc4a..3393c66 100644
--- a/src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx
+++ b/src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx
@@ -137,11 +137,13 @@ const ListingVarientInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={listingVarientId}
               objectType='listingVarient'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Sales/Listings/ListingInfo.jsx b/src/components/Dashboard/Sales/Listings/ListingInfo.jsx
index ec677cc..fc2c44d 100644
--- a/src/components/Dashboard/Sales/Listings/ListingInfo.jsx
+++ b/src/components/Dashboard/Sales/Listings/ListingInfo.jsx
@@ -142,11 +142,13 @@ const ListingInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={listingId}
               objectType='listing'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx b/src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx
index 34b2c88..c161589 100644
--- a/src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx
+++ b/src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx
@@ -210,11 +210,13 @@ const MarketplaceInfo = () => {
               }}
               editLoading={objectFormState.editLoading}
               formValid={objectFormState.formValid}
-              disabled={objectFormState.beingEditedByOther || objectFormState.loading}
+              disabled={
+                objectFormState.beingEditedByOther || objectFormState.loading
+              }
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={marketplaceId}
               objectType='marketplace'
               showEndingDivider={true}
diff --git a/src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx b/src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx
index 939cdad..5f6f9cd 100644
--- a/src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx
+++ b/src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx
@@ -194,7 +194,7 @@ const SalesOrderInfo = () => {
               loading={objectFormState.editLoading}
             />
             <ObjectTableNavigationButtons
-              disabled={objectFormState.loading}
+              disabled={objectFormState.loading || objectFormState.isEditing}
               _id={salesOrderId}
               objectType='salesOrder'
               showEndingDivider={true}