70 changed files with 146 additions and 352 deletions
--- a/src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx
+++ b/src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx
@ -26,7 +26,10 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
-import { getModelProperty } from '../../../../database/ObjectModels.js'
+import {
+  getModelByName,
+  getModelProperty
+} from '../../../../database/ObjectModels.js'
 import OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'

@ -62,7 +65,6 @@ const InvoiceInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -85,6 +87,11 @@ const InvoiceInfo = () => {
    },
  }

+  const editDisabled =
+    getModelByName('invoice')
+      ?.actions?.find((action) => action.name === 'edit')
+      ?.disabled(objectFormState.objectData) ?? false
+
  return (
      <Flex
        gap='large'
@ -149,7 +156,7 @@ const InvoiceInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Finance/Payments/PaymentInfo.jsx
+++ b/src/components/Dashboard/Finance/Payments/PaymentInfo.jsx
@ -24,6 +24,7 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
+import { getModelByName } from '../../../../database/ObjectModels.js'

 const log = loglevel.getLogger('PaymentInfo')
 log.setLevel(config.logLevel)
@ -54,7 +55,6 @@ const PaymentInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -77,6 +77,11 @@ const PaymentInfo = () => {
    },
  }

+  const editDisabled =
+    getModelByName('payment')
+      ?.actions?.find((action) => action.name === 'edit')
+      ?.disabled(objectFormState.objectData) ?? false
+
  return (
      <Flex
        gap='large'
@ -138,7 +143,7 @@ const PaymentInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
+++ b/src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx
@ -45,7 +45,6 @@ const TaxRecordInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -125,9 +124,7 @@ const TaxRecordInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
+++ b/src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx
@ -47,7 +47,6 @@ const FilamentStockInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -124,11 +123,7 @@ const FilamentStockInfo = () => {
              }}
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
-              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
-              }
+              disabled={true}
              loading={objectFormState.editLoading}
            />
            <ObjectTableNavigationButtons
--- a/src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx
+++ b/src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx
@ -46,7 +46,6 @@ const OrderItemInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -124,9 +123,7 @@ const OrderItemInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx
+++ b/src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx
@ -52,7 +52,6 @@ const PartStockInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -133,9 +132,7 @@ const PartStockInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx
+++ b/src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx
@ -10,7 +10,10 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
 import ObjectInfo from '../../common/ObjectInfo.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
 import ViewButton from '../../common/ViewButton.jsx'
-import { getModelProperty } from '../../../../database/ObjectModels.js'
+import {
+  getModelProperty,
+  getModelByName
+} from '../../../../database/ObjectModels.js'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
@ -68,7 +71,6 @@ const ProductStockInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -91,6 +93,11 @@ const ProductStockInfo = () => {
    },
  }

+  const editDisabled =
+    getModelByName('productStock')
+      ?.actions?.find((action) => action.name === 'edit')
+      ?.disabled(objectFormState.objectData) ?? false
+
  return (
      <Flex
        gap='large'
@ -155,7 +162,7 @@ const ProductStockInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx
+++ b/src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx
@ -28,6 +28,7 @@ import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
 import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
 import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
+import { getModelByName } from '../../../../database/ObjectModels.js'

 const log = loglevel.getLogger('PurchaseOrderInfo')
 log.setLevel(config.logLevel)
@ -69,7 +70,6 @@ const PurchaseOrderInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -95,6 +95,10 @@ const PurchaseOrderInfo = () => {
    },
  }

+  const editDisabled = getModelByName('purchaseOrder')
+    .actions.find((action) => action.name === 'edit')
+    .disabled(objectFormState.objectData)
+
  return (
      <Flex
        gap='large'
@ -160,7 +164,7 @@ const PurchaseOrderInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx
+++ b/src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx
@ -61,7 +61,6 @@ const PurchaseOrderInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -160,9 +159,7 @@ const PurchaseOrderInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
+++ b/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
@ -58,7 +58,6 @@ const ShipmentInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })
  const actions = {
@ -139,9 +138,7 @@ const ShipmentInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx
+++ b/src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx
@ -48,7 +48,6 @@ const StockAuditInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -127,9 +126,7 @@ const StockAuditInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx
+++ b/src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx
@ -49,7 +49,6 @@ const StockLocationInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -128,9 +127,7 @@ const StockLocationInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx
+++ b/src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx
@ -8,7 +8,10 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
 import ObjectInfo from '../../common/ObjectInfo.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
 import ViewButton from '../../common/ViewButton.jsx'
-import { getModelProperty } from '../../../../database/ObjectModels.js'
+import {
+  getModelProperty,
+  getModelByName
+} from '../../../../database/ObjectModels.js'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
@ -58,7 +61,6 @@ const StockTransferInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -81,6 +83,11 @@ const StockTransferInfo = () => {
    },
  }

+  const editDisabled =
+    getModelByName('stockTransfer')
+      ?.actions?.find((action) => action.name === 'edit')
+      ?.disabled(objectFormState.objectData) ?? false
+
  return (
      <Flex
        gap='large'
@ -143,7 +150,7 @@ const StockTransferInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx
+++ b/src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx
@ -1,4 +1,4 @@
-import { useRef, useState, useEffect } from 'react'
+import { useRef, useState, useEffect, useContext } from 'react'
 import { useLocation } from 'react-router-dom'
 import { Flex, Space } from 'antd'
 import { LoadingOutlined } from '@ant-design/icons'
@ -20,6 +20,8 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
+import { getModelByName } from '../../../../database/ObjectModels.js'
+import { AuthContext } from '../../context/AuthContext.jsx'

 const AppPasswordInfo = () => {
  const location = useLocation()
@ -34,6 +36,7 @@ const AppPasswordInfo = () => {
    })
    return () => setOnModalOk(null)
  }, [setOnModalOk])
+  const { userProfile } = useContext(AuthContext)
  const appPasswordId = new URLSearchParams(location.search).get(
    'appPasswordId'
  )
@ -50,7 +53,6 @@ const AppPasswordInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -69,6 +71,10 @@ const AppPasswordInfo = () => {
    }
  }

+  const editDisabled = getModelByName('appPassword')
+    .actions.find((action) => action.name === 'edit')
+    .disabled({ ...objectFormState.objectData, _user: userProfile })
+
  return (
      <Flex
        gap='large'
@ -126,7 +132,7 @@ const AppPasswordInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx
+++ b/src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx
@ -47,7 +47,6 @@ const CourierServiceInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -127,9 +126,7 @@ const CourierServiceInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Couriers/CourierInfo.jsx
+++ b/src/components/Dashboard/Management/Couriers/CourierInfo.jsx
@ -43,7 +43,6 @@ const CourierInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -123,9 +122,7 @@ const CourierInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx
@ -48,7 +48,6 @@ const DocumentJobInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -124,9 +123,7 @@ const DocumentJobInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx
@ -50,7 +50,6 @@ const DocumentPrinterInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -132,9 +131,7 @@ const DocumentPrinterInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx
@ -48,7 +48,6 @@ const DocumentSizeInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -124,9 +123,7 @@ const DocumentSizeInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx
+++ b/src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx
@ -50,7 +50,6 @@ const DocumentTemplateInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -129,9 +128,7 @@ const DocumentTemplateInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx
+++ b/src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx
@ -42,7 +42,6 @@ const FilamentSkuInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -122,9 +121,7 @@ const FilamentSkuInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
+++ b/src/components/Dashboard/Management/Filaments/FilamentInfo.jsx
@ -61,7 +61,6 @@ const FilamentInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -145,9 +144,7 @@ const FilamentInfo = () => {
            editLoading={objectFormState.editLoading}
            formValid={objectFormState.formValid}
            disabled={
-              objectFormState.beingEditedByOther ||
-              objectFormState.loading ||
-              objectFormState.editDisabled
+              objectFormState.beingEditedByOther || objectFormState.loading
            }
            loading={objectFormState.editLoading}
          />
--- a/src/components/Dashboard/Management/Files/FileInfo.jsx
+++ b/src/components/Dashboard/Management/Files/FileInfo.jsx
@ -49,7 +49,6 @@ const FileInfo = () => {
    formValid: false,
    lock: null,
    loading: true,
-    editDisabled: false
    objectData: {
      _id: fileId
    }
@ -138,9 +137,7 @@ const FileInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Hosts/HostInfo.jsx
+++ b/src/components/Dashboard/Management/Hosts/HostInfo.jsx
@ -57,7 +57,6 @@ const HostInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -141,9 +140,7 @@ const HostInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Materials/MaterialInfo.jsx
+++ b/src/components/Dashboard/Management/Materials/MaterialInfo.jsx
@ -45,7 +45,6 @@ const MaterialInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -125,9 +124,7 @@ const MaterialInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
+++ b/src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx
@ -38,7 +38,6 @@ const NoteTypeInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -113,9 +112,7 @@ const NoteTypeInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Notes/NoteInfo.jsx
+++ b/src/components/Dashboard/Management/Notes/NoteInfo.jsx
@ -47,7 +47,6 @@ const NoteInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -128,9 +127,7 @@ const NoteInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx
+++ b/src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx
@ -37,7 +37,6 @@ const PartSkuInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -117,9 +116,7 @@ const PartSkuInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Parts/PartInfo.jsx
+++ b/src/components/Dashboard/Management/Parts/PartInfo.jsx
@ -50,7 +50,6 @@ const PartInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -126,9 +125,7 @@ const PartInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx
+++ b/src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx
@ -42,7 +42,6 @@ const ProductCategoryInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -122,9 +121,7 @@ const ProductCategoryInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
+++ b/src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx
@ -44,7 +44,6 @@ const ProductSkuInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -125,9 +124,7 @@ const ProductSkuInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Products/ProductInfo.jsx
+++ b/src/components/Dashboard/Management/Products/ProductInfo.jsx
@ -50,7 +50,6 @@ const ProductInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -126,9 +125,7 @@ const ProductInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx
+++ b/src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx
@ -42,7 +42,6 @@ const TaxRateInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -122,9 +121,7 @@ const TaxRateInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Management/Users/UserInfo.jsx
+++ b/src/components/Dashboard/Management/Users/UserInfo.jsx
@ -44,7 +44,6 @@ const UserInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })
  const isMobile = useMediaQuery({ maxWidth: 768 })
@ -121,9 +120,7 @@ const UserInfo = () => {
            editLoading={objectFormState.editLoading}
            formValid={objectFormState.formValid}
            disabled={
-              objectFormState.beingEditedByOther ||
-              objectFormState.loading ||
-              objectFormState.editDisabled
+              objectFormState.beingEditedByOther || objectFormState.loading
            }
            loading={objectFormState.editLoading}
          />
--- a/src/components/Dashboard/Management/Vendors/VendorInfo.jsx
+++ b/src/components/Dashboard/Management/Vendors/VendorInfo.jsx
@ -42,7 +42,6 @@ const VendorInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -122,9 +121,7 @@ const VendorInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Production/FilamentProfiles/FilamentProfileInfo.jsx
+++ b/src/components/Dashboard/Production/FilamentProfiles/FilamentProfileInfo.jsx
@ -80,7 +80,6 @@ const FilamentProfileInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -167,11 +166,7 @@ const FilamentProfileInfo = () => {
            startEditing={() => actionHandlerRef.current.callAction('edit')}
            editLoading={objectFormState.editLoading}
            formValid={objectFormState.formValid}
-            disabled={
-              objectFormState.beingEditedByOther ||
-              objectFormState.loading ||
-              objectFormState.editDisabled
-            }
+            disabled={objectFormState.beingEditedByOther || objectFormState.loading}
            loading={objectFormState.editLoading}
          />
          <ObjectTableNavigationButtons
--- a/src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
+++ b/src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx
@ -51,7 +51,6 @@ const GCodeFileInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -131,9 +130,7 @@ const GCodeFileInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Production/Jobs/JobInfo.jsx
+++ b/src/components/Dashboard/Production/Jobs/JobInfo.jsx
@ -25,6 +25,7 @@ import JobIcon from '../../../Icons/JobIcon.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
+import { getModelByName } from '../../../../database/ObjectModels.js'

 const log = loglevel.getLogger('JobInfo')
 log.setLevel(config.logLevel)
@ -56,12 +57,16 @@ const JobInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {
      _id: jobId
    }
  })

+  const editDisabled =
+    getModelByName('job')
+      ?.actions?.find((action) => action.name === 'edit')
+      ?.disabled(objectFormState.objectData) ?? false
+
  const actions = {
    edit: () => {
      objectFormRef?.current.startEditing()
@ -139,7 +144,7 @@ const JobInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Production/PrinterProfiles/PrinterProfileInfo.jsx
+++ b/src/components/Dashboard/Production/PrinterProfiles/PrinterProfileInfo.jsx
@ -59,7 +59,6 @@ const PrinterProfileInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -140,11 +139,7 @@ const PrinterProfileInfo = () => {
            startEditing={() => actionHandlerRef.current.callAction('edit')}
            editLoading={objectFormState.editLoading}
            formValid={objectFormState.formValid}
-            disabled={
-              objectFormState.beingEditedByOther ||
-              objectFormState.loading ||
-              objectFormState.editDisabled
-            }
+            disabled={objectFormState.beingEditedByOther || objectFormState.loading}
            loading={objectFormState.editLoading}
          />
          <ObjectTableNavigationButtons
--- a/src/components/Dashboard/Production/Printers/PrinterInfo.jsx
+++ b/src/components/Dashboard/Production/Printers/PrinterInfo.jsx
@ -51,7 +51,6 @@ const PrinterInfo = () => {
    formValid: false,
    activities: [],
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -138,9 +137,7 @@ const PrinterInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Sales/Clients/ClientInfo.jsx
+++ b/src/components/Dashboard/Sales/Clients/ClientInfo.jsx
@ -42,7 +42,6 @@ const ClientInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -122,9 +121,7 @@ const ClientInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx
+++ b/src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx
@ -57,7 +57,6 @@ const ListingVarientInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -136,9 +135,7 @@ const ListingVarientInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Sales/Listings/ListingInfo.jsx
+++ b/src/components/Dashboard/Sales/Listings/ListingInfo.jsx
@ -55,7 +55,6 @@ const ListingInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -135,9 +134,7 @@ const ListingInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx
+++ b/src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx
@ -66,7 +66,6 @@ const MarketplaceInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -203,9 +202,7 @@ const MarketplaceInfo = () => {
              editLoading={objectFormState.editLoading}
              formValid={objectFormState.formValid}
              disabled={
-                objectFormState.beingEditedByOther ||
-                objectFormState.loading ||
-                objectFormState.editDisabled
+                objectFormState.beingEditedByOther || objectFormState.loading
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx
+++ b/src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx
@ -28,6 +28,7 @@ import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
 import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
 import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
+import { getModelByName } from '../../../../database/ObjectModels.js'

 const log = loglevel.getLogger('SalesOrderInfo')
 log.setLevel(config.logLevel)
@ -67,7 +68,6 @@ const SalesOrderInfo = () => {
    formValid: false,
    lock: null,
    loading: false,
-    editDisabled: false,
    objectData: {}
  })

@ -93,6 +93,10 @@ const SalesOrderInfo = () => {
    },
  }

+  const editDisabled = getModelByName('salesOrder')
+    .actions.find((action) => action.name === 'edit')
+    .disabled(objectFormState.objectData)
+
  return (
      <Flex
        gap='large'
@ -158,7 +162,7 @@ const SalesOrderInfo = () => {
              disabled={
                objectFormState.beingEditedByOther ||
                objectFormState.loading ||
-                objectFormState.editDisabled
+                editDisabled
              }
              loading={objectFormState.editLoading}
            />
--- a/src/components/Dashboard/common/ObjectActions.jsx
+++ b/src/components/Dashboard/common/ObjectActions.jsx
@ -6,10 +6,7 @@ import { useNavigate, useLocation } from 'react-router-dom'
 import { useActionsModal } from '../context/ActionsModalContext'
 import KeyboardShortcut from './KeyboardShortcut'
 import { AuthContext } from '../context/AuthContext'
-import {
-  buildActionUrl,
-  stripPageActionParams
-} from '../../../utils/modelActions'
+import { buildActionUrl, stripPageActionParams } from '../../../utils/modelActions'

 // Recursively filter actions based on visibleActions
 function filterActionsByVisibility(actions, visibleActions) {
@ -77,12 +74,12 @@ function isSameActionUrl(action, actionUrl, currentUrl, pathname, search) {
  if (action.type === 'modal') {
    return actionUrl === currentUrl
  }
-  // Compare the action URL to the current location with its action param
-  // stripped. Default page actions (e.g. Info) match and stay hidden when
-  // already on that page. Actions that set their own action param (edit,
-  // cancelEdit, finishEdit, etc.) do not match and remain available —
-  // visibility is controlled by action.visible (e.g. _isEditing).
-  return actionUrl === stripPageActionParams(pathname, search)
+  return (
+    stripPageActionParams(
+      actionUrl.split('?')[0],
+      actionUrl.includes('?') ? actionUrl.split('?')[1] : ''
+    ) === stripPageActionParams(pathname, search)
+  )
 }

 // Recursively map actions to AntD Dropdown items
@ -241,7 +238,7 @@ const ObjectActions = ({
      <Dropdown menu={menu} {...dropdownProps}>
        <Button
          {...buttonProps}
-          disabled={disabled || filteredActions.length === 0}
+          disabled={disabled}
          onClick={() => showActionsModal(id, type, objectData)}
        >
          Actions
--- a/src/components/Dashboard/common/ObjectForm.jsx
+++ b/src/components/Dashboard/common/ObjectForm.jsx
@ -76,23 +76,6 @@ const buildObjectFromEntries = (entries = []) => {
  }, {})
 }

-const getEditDisabled = (model, objectData, userProfile) => {
-  if (model?.readOnly === true) {
-    return true
-  }
-
-  const editAction = model?.actions?.find((action) => action.name === 'edit')
-  if (!editAction?.disabled) {
-    return false
-  }
-  if (typeof editAction.disabled === 'function') {
-    return (
-      editAction.disabled({ ...objectData, _user: userProfile }) ?? false
-    )
-  }
-  return !!editAction.disabled
-}
-
 /**
 * ObjectForm is a reusable form component for editing any object type.
 * It handles fetching, updating, locking, unlocking, and validation logic.
@ -102,10 +85,9 @@ const getEditDisabled = (model, objectData, userProfile) => {
 * - type: string (required)
 * - formItems: array (for ObjectInfo/ObjectProperty items)
 * - children: function({
- *     loading, isEditing, startEditing, cancelEditing, handleUpdate, form, formValid, objectData, setIsEditing, setObjectData, editDisabled
+ *     loading, isEditing, startEditing, cancelEditing, handleUpdate, form, formValid, objectData, setIsEditing, setObjectData
 *   }) => ReactNode
 * - setCurrentObject: boolean (sync object data to ActionsContext)
- * - onStateChange: receives form state including editDisabled (from model edit action)
 */
 const ObjectForm = forwardRef(
  (
@ -406,22 +388,20 @@ const ObjectForm = forwardRef(
            setFormValid(true)
            onStateChangeRef.current({
              formValid: true,
-              objectData: mergedObjectData,
-              editDisabled: getEditDisabled(model, mergedObjectData, userProfile)
+              objectData: mergedObjectData
            })
          })
          .catch(() => {
            setFormValid(false)
            onStateChangeRef.current({
              formValid: false,
-              objectData: mergedObjectData,
-              editDisabled: getEditDisabled(model, mergedObjectData, userProfile)
+              objectData: mergedObjectData
            })
          })
      }, 150)

      return () => clearTimeout(timeoutId)
-    }, [form, formUpdateValues, model, userProfile])
+    }, [form, formUpdateValues])

    // Cleanup on unmount
    useEffect(() => {
@ -612,13 +592,10 @@ const ObjectForm = forwardRef(
    // Debounce objectData updates sent to parent to limit re-renders
    useEffect(() => {
      const timeoutId = setTimeout(() => {
-        onStateChangeRef.current({
-          objectData,
-          editDisabled: getEditDisabled(model, objectData, userProfile)
-        })
+        onStateChangeRef.current({ objectData })
      }, 150)
      return () => clearTimeout(timeoutId)
-    }, [objectData, model, userProfile])
+    }, [objectData])

    useEffect(() => {
      if (!setCurrentObject) {
@ -674,15 +651,13 @@ const ObjectForm = forwardRef(
          ...computedValuesObject,
          _isEditing: true
        }))
-        const nextObjectData = {
-          ...objectData,
-          ...computedValuesObject,
-          _isEditing: true
-        }
        onStateChangeRef.current({
          isEditing: true,
-          objectData: nextObjectData,
-          editDisabled: getEditDisabled(model, nextObjectData, userProfile)
+          objectData: {
+            ...objectData,
+            ...computedValuesObject,
+            _isEditing: true
+          }
        })
      } catch (err) {
        console.error(err)
@ -856,7 +831,6 @@ const ObjectForm = forwardRef(
            setIsEditing,
            setObjectData,
            editLoading,
-            editDisabled: getEditDisabled(model, objectData, userProfile),
            activities,
            handleFetchObject,
            handleDelete
--- a/src/database/models/DocumentJob.js
+++ b/src/database/models/DocumentJob.js
@ -37,8 +37,8 @@ export const DocumentJob = {
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
      }
-    },
-    {
+    }
+,    {
      name: 'cancelEdit',
      label: 'Cancel Edits',
      type: 'page',
--- a/src/database/models/DocumentPrinter.js
+++ b/src/database/models/DocumentPrinter.js
@ -36,8 +36,8 @@ export const DocumentPrinter = {
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
      }
-    },
-    {
+    }
+,    {
      name: 'cancelEdit',
      label: 'Cancel Edits',
      type: 'page',
--- a/src/database/models/DocumentSize.js
+++ b/src/database/models/DocumentSize.js
@ -36,8 +36,8 @@ export const DocumentSize = {
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
      }
-    },
-    {
+    }
+,    {
      name: 'cancelEdit',
      label: 'Cancel Edits',
      type: 'page',
--- a/src/database/models/DocumentTemplate.js
+++ b/src/database/models/DocumentTemplate.js
@ -45,8 +45,8 @@ export const DocumentTemplate = {
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
      }
-    },
-    {
+    }
+,    {
      name: 'cancelEdit',
      label: 'Cancel Edits',
      type: 'page',
--- a/src/database/models/FilamentProfile.js
+++ b/src/database/models/FilamentProfile.js
@ -34,9 +34,7 @@ export const FilamentProfile = {
      label: 'Edit',
      row: true,
      icon: EditIcon,
-      visible: (objectData) => {
-        return !(objectData?._isEditing && objectData?._isEditing == true)
-      }
+      visible: (objectData) => !objectData?._isEditing
    },
    {
      name: 'cancelEdit',
--- a/src/database/models/FilamentStock.js
+++ b/src/database/models/FilamentStock.js
@ -1,8 +1,7 @@
 import { createElement, lazy } from 'react'

 const FilamentStockInfo = lazy(
-  () =>
-    import('../../components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo')
+  () => import('../../components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo')
 )
 import FilamentStockIcon from '../../components/Icons/FilamentStockIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
@ -13,7 +12,6 @@ export const FilamentStock = {
  labelPlural: 'Filament Stocks',
  url: '/dashboard/inventory/filamentstocks',
  prefix: 'FLS',
-  readOnly: true,
  icon: FilamentStockIcon,
  actions: [
    {
@ -57,7 +55,13 @@ export const FilamentStock = {
    'updatedAt',
    '_reference'
  ],
-  sorters: ['createdAt', 'updatedAt', 'filament', 'filamentSku', 'state'],
+  sorters: [
+    'createdAt',
+    'updatedAt',
+    'filament',
+    'filamentSku',
+    'state'
+  ],
  group: ['filament', 'filamentSku'],
  properties: [
    {
--- a/src/database/models/GCodeFile.js
+++ b/src/database/models/GCodeFile.js
@ -54,8 +54,8 @@ export const GCodeFile = {
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
      }
-    },
-    {
+    }
+,    {
      name: 'cancelEdit',
      label: 'Cancel Edits',
      type: 'page',
--- a/src/database/models/Invoice.js
+++ b/src/database/models/Invoice.js
@ -42,7 +42,6 @@ export const Invoice = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/Job.js
+++ b/src/database/models/Job.js
@ -36,7 +36,6 @@ export const Job = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/Note.js
+++ b/src/database/models/Note.js
@ -1,8 +1,5 @@
 import NoteIcon from '../../components/Icons/NoteIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
-import EditIcon from '../../components/Icons/EditIcon'
-import CheckIcon from '../../components/Icons/CheckIcon'
-import XMarkIcon from '../../components/Icons/XMarkIcon'

 export const Note = {
  name: 'note',
@ -18,30 +15,6 @@ export const Note = {
      row: true,
      icon: InfoCircleIcon,
      url: (_id) => `/dashboard/management/notes/info?noteId=${_id}`
-    },
-    {
-      name: 'edit',
-      label: 'Edit',
-      icon: EditIcon,
-      visible: (objectData) => {
-        return !(objectData?._isEditing && objectData?._isEditing == true)
-      }
-    },
-    {
-      name: 'cancelEdit',
-      label: 'Cancel Edits',
-      icon: XMarkIcon,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
-    {
-      name: 'finishEdit',
-      label: 'Save Edits',
-      icon: CheckIcon,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
    }
  ],
  properties: [
--- a/src/database/models/NoteType.js
+++ b/src/database/models/NoteType.js
@ -36,8 +36,8 @@ export const NoteType = {
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
      }
-    },
-    {
+    }
+,    {
      name: 'cancelEdit',
      label: 'Cancel Edits',
      type: 'page',
--- a/src/database/models/OrderItem.js
+++ b/src/database/models/OrderItem.js
@ -32,7 +32,6 @@ export const OrderItem = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/PartStock.js
+++ b/src/database/models/PartStock.js
@ -12,7 +12,6 @@ export const PartStock = {
  labelPlural: 'Part Stocks',
  url: '/dashboard/inventory/partstocks',
  prefix: 'PTS',
-  readOnly: true,
  icon: PartStockIcon,
  actions: [
    {
--- a/src/database/models/Payment.js
+++ b/src/database/models/Payment.js
@ -44,7 +44,6 @@ export const Payment = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/PrinterProfile.js
+++ b/src/database/models/PrinterProfile.js
@ -299,9 +299,7 @@ export const PrinterProfile = {
      label: 'Edit',
      row: true,
      icon: EditIcon,
-      visible: (objectData) => {
-        return !(objectData?._isEditing && objectData?._isEditing == true)
-      }
+      visible: (objectData) => !objectData?._isEditing
    },
    {
      name: 'cancelEdit',
--- a/src/database/models/ProductStock.js
+++ b/src/database/models/ProductStock.js
@ -35,7 +35,6 @@ export const ProductStock = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/PurchaseOrder.js
+++ b/src/database/models/PurchaseOrder.js
@ -51,7 +51,6 @@ export const PurchaseOrder = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/SalesOrder.js
+++ b/src/database/models/SalesOrder.js
@ -51,7 +51,6 @@ export const SalesOrder = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/Shipment.js
+++ b/src/database/models/Shipment.js
@ -41,7 +41,6 @@ export const Shipment = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/StockAudit.js
+++ b/src/database/models/StockAudit.js
@ -5,9 +5,6 @@ const StockAuditInfo = lazy(
 )
 import StockAuditIcon from '../../components/Icons/StockAuditIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
-import EditIcon from '../../components/Icons/EditIcon'
-import CheckIcon from '../../components/Icons/CheckIcon'
-import XMarkIcon from '../../components/Icons/XMarkIcon'

 export const StockAudit = {
  name: 'stockAudit',
@ -25,38 +22,7 @@ export const StockAudit = {
      default: true,
      row: true,
      icon: InfoCircleIcon
-    },
-    {
-      name: 'edit',
-      type: 'page',
-      pageName: 'info',
-      label: 'Edit',
-      row: true,
-      icon: EditIcon,
-      visible: (objectData) => {
-        return !(objectData?._isEditing && objectData?._isEditing == true)
-      }
-    },
-    {
-      name: 'cancelEdit',
-      label: 'Cancel Edits',
-      type: 'page',
-      pageName: 'info',
-      icon: XMarkIcon,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
-    {
-      name: 'finishEdit',
-      label: 'Save Edits',
-      type: 'page',
-      pageName: 'info',
-      icon: CheckIcon,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
+    }
  ],
  pages: [
    {
--- a/src/database/models/StockLocation.js
+++ b/src/database/models/StockLocation.js
@ -5,9 +5,6 @@ const StockLocationInfo = lazy(
 )
 import StockLocationIcon from '../../components/Icons/StockLocationIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
-import EditIcon from '../../components/Icons/EditIcon'
-import CheckIcon from '../../components/Icons/CheckIcon'
-import XMarkIcon from '../../components/Icons/XMarkIcon'

 export const StockLocation = {
  name: 'stockLocation',
@ -25,38 +22,7 @@ export const StockLocation = {
      default: true,
      row: true,
      icon: InfoCircleIcon
-    },
-    {
-      name: 'edit',
-      type: 'page',
-      pageName: 'info',
-      label: 'Edit',
-      row: true,
-      icon: EditIcon,
-      visible: (objectData) => {
-        return !(objectData?._isEditing && objectData?._isEditing == true)
-      }
-    },
-    {
-      name: 'cancelEdit',
-      label: 'Cancel Edits',
-      type: 'page',
-      pageName: 'info',
-      icon: XMarkIcon,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
-    {
-      name: 'finishEdit',
-      label: 'Save Edits',
-      type: 'page',
-      pageName: 'info',
-      icon: CheckIcon,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
+    }
  ],
  pages: [
    {
--- a/src/database/models/StockTransfer.js
+++ b/src/database/models/StockTransfer.js
@ -35,7 +35,6 @@ export const StockTransfer = {
      type: 'page',
      pageName: 'info',
      label: 'Edit',
-      row: true,
      icon: EditIcon,
      visible: (objectData) => {
        return !(objectData?._isEditing && objectData?._isEditing == true)
--- a/src/database/models/SubJob.js
+++ b/src/database/models/SubJob.js
@ -61,7 +61,7 @@ export const SubJob = {
    'createdAt',
    'updatedAt'
  ],
-  sorters: ['createdAt', 'state', 'updatedAt'],
+  sorters: ['createdAt','state','updatedAt'],
  group: ['job'],
  properties: [
    {