assets/stylesheets/App.css

@@ -330,28 +330,6 @@ code {
   padding: 0 !important;
 }
 
-.iddisplay > *:first-child {
-  min-width: 0;
-  flex: 0 1 auto;
-  max-width: 100%;
-  overflow: hidden;
-}
-
-.iddisplay .ant-btn {
-  flex-shrink: 0;
-}
-
-.miscid > *:first-child {
-  min-width: 0;
-  flex: 0 1 auto;
-  max-width: 100%;
-  overflow: hidden;
-}
-
-.miscid .ant-btn {
-  flex-shrink: 0;
-}
-
 .ant-popover-inner:has(.spotlight-tooltip) {
   padding: 0 !important;
 }
@@ -1161,150 +1139,3 @@ span.ant-skeleton-input.ant-skeleton-input-sm.text-skeleton {
 .filter-sidebar-field-select .ant-select-selector {
   width: max-content !important;
 }
-
-.elipsis-text-wrapper.ant-typography {
-  display: block;
-  min-width: 0;
-  max-width: 100%;
-  width: auto;
-  overflow: hidden;
-  flex-grow: 0;
-  flex-shrink: 1;
-  flex-basis: auto;
-}
-
-.elipsis-text-wrapper.ant-typography .elipsis-text {
-  display: flex;
-  flex-direction: row;
-  align-items: baseline;
-  width: 100%;
-  max-width: 100%;
-  min-width: 0;
-  position: relative;
-  overflow: hidden;
-  white-space: pre;
-}
-
-.elipsis-text-wrapper.ant-typography code.elipsis-text-measure,
-.elipsis-text-wrapper.ant-typography code.elipsis-text-full,
-.elipsis-text-wrapper.ant-typography code.elipsis-text-truncated {
-  margin: 0;
-  box-sizing: border-box;
-}
-
-.elipsis-text-measure {
-  position: absolute;
-  visibility: hidden;
-  pointer-events: none;
-  white-space: pre;
-}
-
-.elipsis-text-full {
-  display: none;
-  position: absolute;
-  left: 0;
-  top: 0;
-  width: max-content;
-  max-width: 100%;
-  min-width: 0;
-  overflow: hidden;
-  white-space: pre;
-}
-
-.elipsis-text:not(.is-truncated) .elipsis-text-full {
-  display: inline-block;
-}
-
-.elipsis-text.is-truncated .elipsis-text-full {
-  display: none;
-}
-
-.elipsis-text:not(.is-truncated) .elipsis-text-truncated .elipsis-text-dots {
-  display: none;
-}
-
-.elipsis-text:not(.is-truncated) .elipsis-text-truncated {
-  visibility: hidden;
-}
-
-.elipsis-text-truncated {
-  display: flex;
-  flex: 1 1 0;
-  align-items: baseline;
-  min-width: 0;
-  width: 100%;
-  max-width: 100%;
-  overflow: hidden;
-  white-space: pre;
-}
-
-.elipsis-text-wrapper.ant-typography code.elipsis-text-truncated {
-  display: flex;
-}
-
-.elipsis-text-start,
-.elipsis-text-end {
-  flex: 1 1 0;
-  min-width: 0;
-  overflow: hidden;
-  white-space: pre;
-}
-
-.elipsis-text-start {
-  mask-image: linear-gradient(
-    to right,
-    #000 0%,
-    #000 calc(100% - 0.8em),
-    transparent 100%
-  );
-  -webkit-mask-image: linear-gradient(
-    to right,
-    #000 0%,
-    #000 calc(100% - 0.8em),
-    transparent 100%
-  );
-}
-
-.elipsis-text-end {
-  display: flex;
-  justify-content: flex-end;
-  mask-image: linear-gradient(
-    to left,
-    #000 0%,
-    #000 calc(100% - 0.8em),
-    transparent 100%
-  );
-  -webkit-mask-image: linear-gradient(
-    to left,
-    #000 0%,
-    #000 calc(100% - 0.8em),
-    transparent 100%
-  );
-}
-
-.elipsis-text-end-inner {
-  flex: 0 0 auto;
-  white-space: pre;
-}
-
-.elipsis-text-dots {
-  flex: 0 0 auto;
-  user-select: none;
-}
-
-.code-diff-viewer {
-  height: 70vh;
-  border: 1px solid #85858541;
-}
-
-.code-diff-viewer .cm-mergeView {
-  height: 100%;
-  overflow: auto;
-}
-
-.diff-label-square {
-  width: 7px;
-  height: 7px;
-  background-color: #85858541;
-  border-radius: 2px;
-}

bun.lock

@@ -23,7 +23,6 @@
         "@codemirror/lang-xml": "^6.1.0",
         "@codemirror/lang-yaml": "^6.1.2",
         "@codemirror/language": "6.12.1",
-        "@codemirror/merge": "^6.12.2",
         "@codemirror/state": "6.7.1",
         "@codemirror/theme-one-dark": "^6.1.3",
         "@codemirror/view": "6.39.12",
@@ -239,8 +238,6 @@
 
     "@codemirror/lint": ["@codemirror/lint@6.9.3", "", { "dependencies": { "@codemirror/state": "6.7.1", "@codemirror/view": "6.39.12", "crelt": "1.0.6" } }, "sha512-y3YkYhdnhjDBAe0VIA0c4wVoFOvnp8CnAvfLqi0TqotIv92wIlAAP7HELOpLBsKwjAX6W92rSflA6an/2zBvXw=="],
 
-    "@codemirror/merge": ["@codemirror/merge@6.12.2", "", { "dependencies": { "@codemirror/language": "^6.0.0", "@codemirror/state": "^6.0.0", "@codemirror/view": "^6.17.0", "@lezer/highlight": "^1.0.0", "style-mod": "^4.1.0" } }, "sha512-V8JvyAPjHbPupqP7BeMcsdsYCbyPij74jxIbaIJDORI+VZzW44zFmon8bF+oxGWvOKhcRmkiUMXd8MxHr3YA2w=="],
-
     "@codemirror/search": ["@codemirror/search@6.6.0", "", { "dependencies": { "@codemirror/state": "6.7.1", "@codemirror/view": "6.39.12", "crelt": "1.0.7" } }, "sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw=="],
 
     "@codemirror/state": ["@codemirror/state@6.7.1", "", { "dependencies": { "@marijn/find-cluster-break": "1.0.3" } }, "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A=="],

package.json

@@ -27,7 +27,6 @@
     "@codemirror/lang-xml": "^6.1.0",
     "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/language": "6.12.1",
-    "@codemirror/merge": "^6.12.2",
     "@codemirror/state": "6.7.1",
     "@codemirror/theme-one-dark": "^6.1.3",
     "@codemirror/view": "6.39.12",

pnpm-lock.yaml

@@ -70,9 +70,6 @@ importers:
       '@codemirror/language':
         specifier: 6.12.1
         version: 6.12.1
-      '@codemirror/merge':
-        specifier: ^6.12.2
-        version: 6.12.2
       '@codemirror/state':
         specifier: 6.7.1
         version: 6.7.1
@@ -614,9 +611,6 @@ packages:
   '@codemirror/lint@6.9.3':
     resolution: {integrity: sha512-y3YkYhdnhjDBAe0VIA0c4wVoFOvnp8CnAvfLqi0TqotIv92wIlAAP7HELOpLBsKwjAX6W92rSflA6an/2zBvXw==}
 
-  '@codemirror/merge@6.12.2':
-    resolution: {integrity: sha512-V8JvyAPjHbPupqP7BeMcsdsYCbyPij74jxIbaIJDORI+VZzW44zFmon8bF+oxGWvOKhcRmkiUMXd8MxHr3YA2w==}
-
   '@codemirror/search@6.6.0':
     resolution: {integrity: sha512-koFuNXcDvyyotWcgOnZGmY7LZqEOXZaaxD/j6n18TCLx2/9HieZJ5H6hs1g8FiRxBD0DNfs0nXn17g872RmYdw==}
 
@@ -7053,14 +7047,6 @@ snapshots:
       '@codemirror/view': 6.39.12
       crelt: 1.0.6
 
-  '@codemirror/merge@6.12.2':
-    dependencies:
-      '@codemirror/language': 6.12.1
-      '@codemirror/state': 6.7.1
-      '@codemirror/view': 6.39.12
-      '@lezer/highlight': 1.2.3
-      style-mod: 4.1.3
-
   '@codemirror/search@6.6.0':
     dependencies:
       '@codemirror/state': 6.7.1

src/components/Dashboard/Finance/Invoices/InvoiceInfo.jsx

@@ -26,7 +26,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 { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 import OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
 
@@ -38,6 +38,7 @@ const InvoiceInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -81,7 +82,7 @@ const InvoiceInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -252,7 +253,7 @@ const InvoiceInfo = () => {
               ) : (
                 <ObjectTable
                   type='payment'
-                masterFilter={{ invoice: getModelByName('invoice').prefix + ':' + invoiceId }}
+                  masterFilter={{ 'invoice._id': invoiceId }}
                   visibleColumns={{ invoice: false }}
                 />
               )}
@@ -272,7 +273,9 @@ const InvoiceInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -280,13 +283,8 @@ const InvoiceInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': invoiceId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('invoice').prefix +
-                      ':' +
-                      invoiceId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Finance/Payments/PaymentInfo.jsx

@@ -23,7 +23,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('PaymentInfo')
@@ -34,6 +33,7 @@ const PaymentInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -74,7 +74,7 @@ const PaymentInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -207,7 +207,9 @@ const PaymentInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -215,13 +217,8 @@ const PaymentInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': paymentId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('payment').prefix +
-                      ':' +
-                      paymentId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Finance/TaxRecords/TaxRecordInfo.jsx

@@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('TaxRecordInfo')
@@ -200,13 +199,8 @@ const TaxRecordInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': taxRecordId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('taxRecord').prefix +
-                        ':' +
-                        taxRecordId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/FilamentStocks/FilamentStockInfo.jsx

@@ -22,7 +22,6 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder'
 import DocumentPrintButton from '../../common/DocumentPrintButton'
 import UserNotifierToggle from '../../common/UserNotifierToggle'
 import ScrollBox from '../../common/ScrollBox'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import HistoryDisplay from '../../common/HistoryDisplay'
 
 const FilamentStockInfo = () => {
@@ -187,7 +186,7 @@ const FilamentStockInfo = () => {
               ) : (
                 <ObjectTable
                   type='stockEvent'
-                  masterFilter={{ parent: getModelByName('filamentStock').prefix + ':' + filamentStockId }}
+                  masterFilter={{ 'parent._id': filamentStockId }}
                   visibleColumns={{ parent: false }}
                 />
               )}
@@ -235,13 +234,8 @@ const FilamentStockInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': filamentStockId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('filamentStock').prefix +
-                        ':' +
-                        filamentStockId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/OrderItems/OrderItemInfo.jsx

@@ -21,7 +21,6 @@ import ObjectActions from '../../common/ObjectActions.jsx'
 import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('OrderItemInfo')
@@ -206,13 +205,8 @@ const OrderItemInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': orderItemId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('orderItem').prefix +
-                        ':' +
-                        orderItemId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/PartStocks/PartStockInfo.jsx

@@ -25,7 +25,6 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import HistoryDisplay from '../../common/HistoryDisplay.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import PartStockIcon from '../../../Icons/PartStockIcon.jsx'
 
 const log = loglevel.getLogger('PartStockInfo')
@@ -205,7 +204,7 @@ const PartStockInfo = () => {
               ) : (
                 <ObjectTable
                   type='stockEvent'
-                  masterFilter={{ parent: getModelByName('partStock').prefix + ':' + partStockId }}
+                  masterFilter={{ 'parent._id': partStockId }}
                   visibleColumns={{ parent: false }}
                 />
               )}
@@ -256,13 +255,8 @@ const PartStockInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': partStockId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('partStock').prefix +
-                        ':' +
-                        partStockId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/ProductStocks/ProductStockInfo.jsx

@@ -10,7 +10,7 @@ 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, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
@@ -39,6 +39,7 @@ const ProductStockInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -87,7 +88,7 @@ const ProductStockInfo = () => {
     delete: () => {
       objectFormRef?.current.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -239,7 +240,7 @@ const ProductStockInfo = () => {
               ) : (
                 <ObjectTable
                   type='stockEvent'
-                masterFilter={{ parent: getModelByName('productStock').prefix + ':' + productStockId }}
+                  masterFilter={{ 'parent._id': productStockId }}
                   visibleColumns={{ parent: false }}
                 />
               )}
@@ -280,7 +281,9 @@ const ProductStockInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -288,13 +291,8 @@ const ProductStockInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': productStockId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('productStock').prefix +
-                      ':' +
-                      productStockId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo.jsx

@@ -27,7 +27,6 @@ import ScrollBox from '../../common/ScrollBox.jsx'
 import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
 import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
 
 const log = loglevel.getLogger('PurchaseOrderInfo')
@@ -40,6 +39,7 @@ const PurchaseOrderInfo = () => {
   const shipmentsTableRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -92,7 +92,7 @@ const PurchaseOrderInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -225,7 +225,7 @@ const PurchaseOrderInfo = () => {
                       <ObjectTable
                         type='orderItem'
                         masterFilter={{
-                        order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
+                          'order._id': purchaseOrderId,
                           orderType: 'purchaseOrder'
                         }}
                         visibleColumns={{ order: false }}
@@ -244,7 +244,7 @@ const PurchaseOrderInfo = () => {
                       <ObjectTable
                         type='shipment'
                         masterFilter={{
-                        order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
+                          'order._id': purchaseOrderId,
                           orderType: 'purchaseOrder'
                         }}
                         visibleColumns={{ order: false }}
@@ -266,7 +266,7 @@ const PurchaseOrderInfo = () => {
                         <ObjectTable
                           type='invoice'
                           masterFilter={{
-                          order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
+                            'order._id': purchaseOrderId,
                             orderType: 'purchaseOrder'
                           }}
                           visibleColumns={{ order: false }}
@@ -288,7 +288,7 @@ const PurchaseOrderInfo = () => {
                         <ObjectTable
                           type='stockEvent'
                           masterFilter={{
-                          owner: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId
+                            'owner._id': purchaseOrderId
                           }}
                         />
                       )}
@@ -312,7 +312,9 @@ const PurchaseOrderInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -320,13 +322,8 @@ const PurchaseOrderInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': purchaseOrderId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('purchaseOrder').prefix +
-                      ':' +
-                      purchaseOrderId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/Shipments/PurchaseOrderInfo.jsx

@@ -27,7 +27,6 @@ import NewOrderItem from '../OrderItems/NewOrderItem.jsx'
 import NewShipment from './NewShipment.jsx'
 import PostPurchaseOrder from '../PurchaseOrders/PostPurchaseOrder.jsx'
 import AcknowledgePurchaseOrder from '../PurchaseOrders/AcknowledgePurchaseOrder.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
 
 const log = loglevel.getLogger('PurchaseOrderInfo')
@@ -228,7 +227,7 @@ const PurchaseOrderInfo = () => {
                       <ObjectTable
                         type='orderItem'
                         masterFilter={{
-                          order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
+                          'order._id': purchaseOrderId,
                           orderType: 'purchaseOrder'
                         }}
                         visibleColumns={{ order: false }}
@@ -247,7 +246,7 @@ const PurchaseOrderInfo = () => {
                       <ObjectTable
                         type='shipment'
                         masterFilter={{
-                          order: getModelByName('purchaseOrder').prefix + ':' + purchaseOrderId,
+                          'order._id': purchaseOrderId,
                           orderType: 'purchaseOrder'
                         }}
                         visibleColumns={{ order: false }}
@@ -283,13 +282,8 @@ const PurchaseOrderInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': purchaseOrderId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('purchaseOrder').prefix +
-                        ':' +
-                        purchaseOrderId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx

@@ -24,7 +24,6 @@ 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 OrderItemIcon from '../../../Icons/OrderItemIcon.jsx'
 
 const log = loglevel.getLogger('ShipmentInfo')
@@ -35,6 +34,7 @@ const ShipmentInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -77,7 +77,7 @@ const ShipmentInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -205,7 +205,7 @@ const ShipmentInfo = () => {
                     >
                       <ObjectTable
                         type='orderItem'
-                      masterFilter={{ shipment: getModelByName('shipment').prefix + ':' + shipmentId }}
+                        masterFilter={{ 'shipment._id': shipmentId }}
                         visibleColumns={{
                           shipment: false,
                           order: false,
@@ -232,7 +232,9 @@ const ShipmentInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -240,13 +242,8 @@ const ShipmentInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': shipmentId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('shipment').prefix +
-                      ':' +
-                      shipmentId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/StockAudits/StockAuditInfo.jsx

@@ -22,7 +22,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('StockAuditInfo')
@@ -212,13 +211,8 @@ const StockAuditInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': stockAuditId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('stockAudit').prefix +
-                        ':' +
-                        stockAuditId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/StockLocations/StockLocationInfo.jsx

@@ -22,7 +22,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('StockLocationInfo')
@@ -210,13 +209,8 @@ const StockLocationInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': stockLocationId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('stockLocation').prefix +
-                        ':' +
-                        stockLocationId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Inventory/StockTransfers/StockTransferInfo.jsx

@@ -8,7 +8,7 @@ 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, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
 import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
@@ -31,6 +31,7 @@ const StockTransferInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -77,7 +78,7 @@ const StockTransferInfo = () => {
     delete: () => {
       objectFormRef?.current.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -231,7 +232,9 @@ const StockTransferInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -239,13 +242,8 @@ const StockTransferInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': stockTransferId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('stockTransfer').prefix +
-                      ':' +
-                      stockTransferId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/AppPasswords/AppPasswordInfo.jsx

@@ -19,7 +19,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const AppPasswordInfo = () => {
@@ -27,6 +26,7 @@ const AppPasswordInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -178,7 +178,9 @@ const AppPasswordInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -186,13 +188,8 @@ const AppPasswordInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': appPasswordId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('appPassword').prefix +
-                      ':' +
-                      appPasswordId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/AppUpdates/AppUpdateProgress.jsx

@@ -6,7 +6,6 @@ import CloudIcon from '../../../Icons/CloudIcon'
 import HostIcon from '../../../Icons/HostIcon'
 import ReloadIcon from '../../../Icons/ReloadIcon'
 import HProgress from '../../common/HProgress'
-import ElipsisText from '../../common/ElipsisText'
 
 import CheckCircleIcon from '../../../Icons/CheckCircleIcon'
 import XMarkCircleIcon from '../../../Icons/XMarkCircleIcon'
@@ -144,9 +143,9 @@ const UpdateStage = ({ stage, status, percent, detail }) => {
               style={{ flex: 1, margin: 0 }}
             />
             {detail && (
-              <ElipsisText type='secondary' style={{ minWidth: 0 }}>
+              <Text type='secondary' ellipsis style={{ minWidth: 0 }}>
                 {detail}
-              </ElipsisText>
+              </Text>
             )}
           </Flex>
         )}

src/components/Dashboard/Management/CourierServices/CourierServiceInfo.jsx

@@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('CourierServiceInfo')
@@ -202,13 +201,8 @@ const CourierServiceInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': courierServiceId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('courierService').prefix +
-                        ':' +
-                        courierServiceId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Couriers/CourierInfo.jsx

@@ -22,7 +22,6 @@ 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 CourierServiceIcon from '../../../Icons/CourierServiceIcon.jsx'
 
 const log = loglevel.getLogger('CourierInfo')
@@ -187,10 +186,10 @@ const CourierInfo = () => {
               ) : (
                 <ObjectTable
                   type='courierService'
-                  masterFilter={{ courier: getModelByName('courier').prefix + ':' + courierId }}
+                  masterFilter={{ 'courier._id': courierId }}
                   visibleColumns={{
                     courier: false,
-                    courier: false
+                    'courier._id': false
                   }}
                 />
               )}
@@ -220,13 +219,8 @@ const CourierInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': courierId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('courier').prefix +
-                        ':' +
-                        courierId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/DocumentJobs/DocumentJobInfo.jsx

@@ -22,7 +22,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('DocumentJobInfo')
@@ -200,13 +199,8 @@ const DocumentJobInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': documentJobId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('documentJob').prefix +
-                        ':' +
-                        documentJobId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/DocumentPrinters/DocumentPrinterInfo.jsx

@@ -22,7 +22,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('DocumentPrinterInfo')
@@ -214,13 +213,8 @@ const DocumentPrinterInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': documentPrinterId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('documentPrinter').prefix +
-                        ':' +
-                        documentPrinterId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/DocumentSizes/DocumentSizeInfo.jsx

@@ -22,7 +22,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('DocumentSizeInfo')
@@ -201,13 +200,8 @@ const DocumentSizeInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': documentSizeId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('documentSize').prefix +
-                        ':' +
-                        documentSizeId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/DocumentTemplates/DocumentTemplateInfo.jsx

@@ -22,7 +22,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('DocumentTemplateInfo')
@@ -215,13 +214,8 @@ const DocumentTemplateInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': documentTemplateId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('documentTemplate').prefix +
-                        ':' +
-                        documentTemplateId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/FilamentSkus/FilamentSkuInfo.jsx

@@ -19,7 +19,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const FilamentSkuInfo = () => {
@@ -197,13 +196,8 @@ const FilamentSkuInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': filamentSkuId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('filamentSku').prefix +
-                        ':' +
-                        filamentSkuId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Filaments/FilamentInfo.jsx

@@ -25,7 +25,6 @@ import FilamentIcon from '../../../Icons/FilamentIcon.jsx'
 import FilamentSkuIcon from '../../../Icons/FilamentSkuIcon.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 
 const log = loglevel.getLogger('FilamentInfo')
@@ -215,7 +214,7 @@ const FilamentInfo = () => {
               <ObjectTable
                 ref={filamentSkusTableRef}
                 type='filamentSku'
-                masterFilter={{ filament: getModelByName('filament').prefix + ':' + filamentId }}
+                masterFilter={{ filament: filamentId }}
                 visibleColumns={{ filament: false }}
               />
             )}
@@ -233,7 +232,7 @@ const FilamentInfo = () => {
             ) : (
               <ObjectTable
                 type='filamentStock'
-                masterFilter={{ filament: getModelByName('filament').prefix + ':' + filamentId }}
+                masterFilter={{ filament: filamentId }}
                 visibleColumns={{
                   filament: false,
                   startingWeight: false
@@ -266,13 +265,8 @@ const FilamentInfo = () => {
             ) : (
               <ObjectTable
                 type='auditLog'
-                masterFilter={{
+                masterFilter={{ 'parent._id': filamentId }}
-                    parent:
+                visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('filament').prefix +
-                      ':' +
-                      filamentId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
               />
             )}
           </InfoCollapse>

src/components/Dashboard/Management/Files/FileInfo.jsx

@@ -28,7 +28,7 @@ import { ApiServerContext } from '../../context/ApiServerContext.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import JsonObjectIcon from '../../../Icons/JsonObjectIcon.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 
 const log = loglevel.getLogger('FileInfo')
 log.setLevel(config.logLevel)
@@ -250,13 +250,8 @@ const FileInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': fileId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('file').prefix +
-                        ':' +
-                        fileId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Hosts/HostInfo.jsx

@@ -25,7 +25,6 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import PrinterIcon from '../../../Icons/PrinterIcon.jsx'
 import DocumentPrinterIcon from '../../../Icons/DocumentPrinterIcon.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('HostInfo')
@@ -36,6 +35,7 @@ const HostInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -208,10 +208,10 @@ const HostInfo = () => {
               ) : (
                 <ObjectTable
                   type='printer'
-                masterFilter={{ host: getModelByName('host').prefix + ':' + hostId }}
+                  masterFilter={{ 'host._id': hostId }}
                   visibleColumns={{
                     host: false,
-                  host: false
+                    'host._id': false
                   }}
                 />
               )}
@@ -230,10 +230,10 @@ const HostInfo = () => {
               ) : (
                 <ObjectTable
                   type='documentPrinter'
-                masterFilter={{ host: getModelByName('host').prefix + ':' + hostId }}
+                  masterFilter={{ 'host._id': hostId }}
                   visibleColumns={{
                     host: false,
-                  host: false
+                    'host._id': false
                   }}
                 />
               )}
@@ -255,7 +255,9 @@ const HostInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -263,13 +265,8 @@ const HostInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': hostId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('host').prefix +
-                      ':' +
-                      hostId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Materials/MaterialInfo.jsx

@@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('MaterialInfo')
@@ -200,13 +199,8 @@ const MaterialInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': materialId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('material').prefix +
-                        ':' +
-                        materialId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/NoteTypes/NoteTypeInfo.jsx

@@ -18,7 +18,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const NoteTypeInfo = () => {
@@ -178,13 +177,8 @@ const NoteTypeInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': noteTypeId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('noteType').prefix +
-                        ':' +
-                        noteTypeId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Notes/NewNote.jsx

@@ -15,7 +15,7 @@ const NewNote = ({ onOk, defaultValues = {} }) => {
               <ObjectInfo
                 type='note'
                 column={1}
-                visibleProperties={{ parent: false }}
+                visibleProperties={{ 'parent._id': false }}
                 bordered={false}
                 isEditing={true}
                 required={true}

src/components/Dashboard/Management/Notes/NoteInfo.jsx

@@ -25,7 +25,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 { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 
 const log = loglevel.getLogger('NoteInfo')
 log.setLevel(config.logLevel)
@@ -228,13 +228,8 @@ const NoteInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': noteId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('note').prefix +
-                        ':' +
-                        noteId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/PartSkus/PartSkuInfo.jsx

@@ -19,7 +19,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const PartSkuInfo = () => {
@@ -192,13 +191,8 @@ const PartSkuInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': partSkuId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('partSku').prefix +
-                        ':' +
-                        partSkuId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Parts/PartInfo.jsx

@@ -21,7 +21,6 @@ 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 PartSkuIcon from '../../../Icons/PartSkuIcon.jsx'
 
 const PartInfo = () => {
@@ -31,6 +30,7 @@ const PartInfo = () => {
   const partId = new URLSearchParams(location.search).get('partId')
   const partSkusTableRef = useRef()
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -162,7 +162,9 @@ const PartInfo = () => {
                     title='Part Information'
                     icon={<InfoCircleIcon />}
                     active={collapseState.info}
-                  onToggle={(expanded) => updateCollapseState('info', expanded)}
+                    onToggle={(expanded) =>
+                      updateCollapseState('info', expanded)
+                    }
                     collapseKey='info'
                   >
                     <ObjectInfo
@@ -178,7 +180,9 @@ const PartInfo = () => {
                 title='Part SKUs'
                 icon={<PartSkuIcon />}
                 active={collapseState.partSkus}
-              onToggle={(expanded) => updateCollapseState('partSkus', expanded)}
+                onToggle={(expanded) =>
+                  updateCollapseState('partSkus', expanded)
+                }
                 collapseKey='partSkus'
               >
                 {objectFormState.loading ? (
@@ -187,7 +191,7 @@ const PartInfo = () => {
                   <ObjectTable
                     ref={partSkusTableRef}
                     type='partSku'
-                  masterFilter={{ part: getModelByName('part').prefix + ':' + partId }}
+                    masterFilter={{ part: partId }}
                     visibleColumns={{ part: false }}
                   />
                 )}
@@ -208,7 +212,9 @@ const PartInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -216,13 +222,8 @@ const PartInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': partId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('part').prefix +
-                      ':' +
-                      partId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/ProductCategories/ProductCategoryInfo.jsx

@@ -19,7 +19,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const ProductCategoryInfo = () => {
@@ -197,13 +196,8 @@ const ProductCategoryInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': productCategoryId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('productCategory').prefix +
-                        ':' +
-                        productCategoryId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/ProductSkus/ProductSkuInfo.jsx

@@ -21,7 +21,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 import PartIcon from '../../../Icons/PartIcon.jsx'
 
 const ProductSkuInfo = () => {
@@ -224,13 +224,8 @@ const ProductSkuInfo = () => {
                 ) : (
                   <ObjectTable
                     type='auditLog'
-                    masterFilter={{
+                    masterFilter={{ 'parent._id': productSkuId }}
-                        parent:
+                    visibleColumns={{ _id: false, 'parent._id': false }}
-                          getModelByName('productSku').prefix +
-                          ':' +
-                          productSkuId
-                    }}
-                    visibleColumns={{ _id: false, parent: false }}
                   />
                 )}
               </InfoCollapse>

src/components/Dashboard/Management/Products/ProductInfo.jsx

@@ -21,7 +21,6 @@ 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 ProductSkuIcon from '../../../Icons/ProductSkuIcon.jsx'
 
 const ProductInfo = () => {
@@ -37,6 +36,7 @@ const ProductInfo = () => {
   })
   const productSkusTableRef = useRef()
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -190,7 +190,7 @@ const ProductInfo = () => {
                         <ObjectTable
                           ref={productSkusTableRef}
                           type='productSku'
-                        masterFilter={{ product: getModelByName('product').prefix + ':' + productId }}
+                          masterFilter={{ product: productId }}
                           visibleColumns={{ product: false }}
                         />
                       )}
@@ -215,7 +215,9 @@ const ProductInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -223,13 +225,8 @@ const ProductInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': productId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('product').prefix +
-                      ':' +
-                      productId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/TaxRates/TaxRateInfo.jsx

@@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('TaxRateInfo')
@@ -197,13 +196,8 @@ const TaxRateInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': taxRateId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('taxRate').prefix +
-                        ':' +
-                        taxRateId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Management/Users/UserInfo.jsx

@@ -23,7 +23,7 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 import { useMediaQuery } from 'react-responsive'
 
 const UserInfo = () => {
@@ -206,7 +206,7 @@ const UserInfo = () => {
             ) : (
               <ObjectTable
                 type='appPassword'
-                masterFilter={{ user: getModelByName('user').prefix + ':' + userId }}
+                masterFilter={{ user: userId }}
                 visibleColumns={{ user: false }}
                 ref={appPasswordsTableRef}
               />
@@ -227,7 +227,9 @@ const UserInfo = () => {
             title='Audit Logs'
             icon={<AuditLogIcon />}
             active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+            onToggle={(expanded) =>
+              updateCollapseState('auditLogs', expanded)
+            }
             collapseKey='auditLogs'
           >
             {objectFormState.loading ? (
@@ -235,13 +237,8 @@ const UserInfo = () => {
             ) : (
               <ObjectTable
                 type='auditLog'
-                masterFilter={{
+                masterFilter={{ 'parent._id': userId }}
-                    parent:
+                visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('user').prefix +
-                      ':' +
-                      userId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
               />
             )}
           </InfoCollapse>

src/components/Dashboard/Management/Vendors/VendorInfo.jsx

@@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('VendorInfo')
@@ -197,13 +196,8 @@ const VendorInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': vendorId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('vendor').prefix +
-                        ':' +
-                        vendorId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Production/FilamentProfiles/FilamentProfileInfo.jsx

@@ -27,7 +27,6 @@ import SettingsIcon from '../../../Icons/SettingsIcon'
 import UserNotifierToggle from '../../common/UserNotifierToggle'
 import ViewButton from '../../common/ViewButton'
 import useCollapseState from '../../hooks/useCollapseState'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import {
   FILAMENT_PROFILE_BED_TEMPERATURE_PROPERTIES,
   FILAMENT_PROFILE_COMPATIBILITY_PROPERTIES,
@@ -161,9 +160,7 @@ const FilamentProfileInfo = () => {
         <Space>
           <EditButtons
             isEditing={objectFormState.isEditing}
-            handleUpdate={() =>
+            handleUpdate={() => actionHandlerRef.current.callAction('finishEdit')}
-              actionHandlerRef.current.callAction('finishEdit')
-            }
             cancelEditing={() =>
               actionHandlerRef.current.callAction('cancelEdit')
             }
@@ -536,13 +533,8 @@ const FilamentProfileInfo = () => {
             ) : (
               <ObjectTable
                 type='auditLog'
-                masterFilter={{
+                masterFilter={{ 'parent._id': filamentProfileId }}
-                    parent:
+                visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('filamentProfile').prefix +
-                      ':' +
-                      filamentProfileId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
               />
             )}
           </InfoCollapse>

src/components/Dashboard/Production/GCodeFiles/GCodeFileInfo.jsx

@@ -24,7 +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 { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import { getModelProperty } from '../../../../database/ObjectModels.js'
 import PartIcon from '../../../Icons/PartIcon.jsx'
 
 const log = loglevel.getLogger('GCodeFileInfo')
@@ -235,13 +235,8 @@ const GCodeFileInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': gcodeFileId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('gcodeFile').prefix +
-                        ':' +
-                        gcodeFileId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Production/Jobs/DeployJob.jsx

@@ -4,7 +4,6 @@ import WizardView from '../../common/WizardView'
 import { ApiServerContext } from '../../context/ApiServerContext'
 import { Descriptions, Flex, Typography } from 'antd'
 import ObjectTable from '../../common/ObjectTable'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ObjectProperty from '../../common/ObjectProperty'
 const { Text } = Typography
 const DeployJob = ({
@@ -27,7 +26,7 @@ const DeployJob = ({
     while (hasMore == true) {
       const subJobsPage = await fetchObjects('subJob', {
         page: currentPage,
-        filter: { job: job._id }
+        filter: { 'job._id': job._id }
       })
       subJobs = [...subJobs, ...subJobsPage.data]
       if (subJobsPage.data.length >= 25) {
@@ -151,7 +150,7 @@ const DeployJob = ({
               printer: false,
               job: false
             }}
-            masterFilter={{ job: getModelByName('job').prefix + ':' + job?._id }}
+            masterFilter={{ 'job._id': job?._id }}
             size={'small'}
             showActions={!slicerIntegration}
           />

src/components/Dashboard/Production/Jobs/JobInfo.jsx

@@ -24,7 +24,6 @@ import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import JobIcon from '../../../Icons/JobIcon.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('JobInfo')
@@ -35,6 +34,7 @@ const JobInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -74,7 +74,7 @@ const JobInfo = () => {
     finishEdit: () => {
       objectFormRef?.current.handleUpdate()
       return true
-    }
+    },
   }
 
   return (
@@ -198,8 +198,8 @@ const JobInfo = () => {
             >
               <ObjectTable
                 type='subJob'
-              masterFilter={{ job: getModelByName('job').prefix + ':' + jobId }}
+                masterFilter={{ 'job._id': jobId }}
-              visibleColumns={{ job: false }}
+                visibleColumns={{ 'job._id': false }}
               />
             </InfoCollapse>
 
@@ -219,7 +219,9 @@ const JobInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -227,13 +229,8 @@ const JobInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': jobId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('job').prefix +
-                      ':' +
-                      jobId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Production/PrinterProfiles/PrinterProfileInfo.jsx

@@ -26,7 +26,7 @@ import UserNotifierToggle from '../../common/UserNotifierToggle'
 import ViewButton from '../../common/ViewButton'
 import useCollapseState from '../../hooks/useCollapseState'
 import ObjectProperty from '../../common/ObjectProperty'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels'
+import { getModelProperty } from '../../../../database/ObjectModels'
 import GCodeFileIcon from '../../../Icons/GCodeFileIcon'
 import SettingsIcon from '../../../Icons/SettingsIcon'
 import ExclamationOctagonIcon from '../../../Icons/ExclamationOctagonIcon'
@@ -133,9 +133,7 @@ const PrinterProfileInfo = () => {
         <Space>
           <EditButtons
             isEditing={objectFormState.isEditing}
-            handleUpdate={() =>
+            handleUpdate={() => actionHandlerRef.current.callAction('finishEdit')}
-              actionHandlerRef.current.callAction('finishEdit')
-            }
             cancelEditing={() =>
               actionHandlerRef.current.callAction('cancelEdit')
             }
@@ -387,13 +385,8 @@ const PrinterProfileInfo = () => {
             ) : (
               <ObjectTable
                 type='auditLog'
-                masterFilter={{
+                masterFilter={{ 'parent._id': printerProfileId }}
-                    parent:
+                visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('printerProfile').prefix +
-                      ':' +
-                      printerProfileId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
               />
             )}
           </InfoCollapse>

src/components/Dashboard/Production/Printers/PrinterInfo.jsx

@@ -24,7 +24,6 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import PrinterProfileIcon from '../../../Icons/PrinterProfileIcon.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ObjectTableNavigationButtons from '../../common/ObjectTableNavigationButtons.jsx'
 const log = loglevel.getLogger('PrinterInfo')
 log.setLevel(config.logLevel)
@@ -35,6 +34,7 @@ const PrinterInfo = () => {
   const profilesTableRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   const printerId = new URLSearchParams(location.search).get('printerId')
   const [collapseState, updateCollapseState] = useCollapseState('PrinterInfo', {
@@ -75,7 +75,7 @@ const PrinterInfo = () => {
     finishEdit: () => {
       objectFormRef?.current.handleUpdate()
       return true
-    }
+    },
   }
 
   return (
@@ -214,7 +214,7 @@ const PrinterInfo = () => {
                 <ObjectTable
                   ref={profilesTableRef}
                   type='printerProfile'
-                masterFilter={{ printer: getModelByName('printer').prefix + ':' + printerId }}
+                  masterFilter={{ printer: printerId }}
                   visibleColumns={{
                     printer: false,
                     'printer._id': false
@@ -239,7 +239,9 @@ const PrinterInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -247,13 +249,8 @@ const PrinterInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': printerId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('printer').prefix +
-                      ':' +
-                      printerId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Production/SubJobs/SubJobInfo.jsx

@@ -21,7 +21,6 @@ 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 StockEventIcon from '../../../Icons/StockEventIcon.jsx'
 
 const SubJobInfo = () => {
@@ -174,9 +173,9 @@ const SubJobInfo = () => {
               ) : (
                 <ObjectTable
                   type='stockEvent'
-                  masterFilter={{ owner: getModelByName('subJob').prefix + ':' + subJobId }}
+                  masterFilter={{ 'owner._id': subJobId }}
                   visibleColumns={{
-                    owner: false,
+                    'owner._id': false,
                     'owner.type': false,
                     owner: false
                   }}
@@ -208,13 +207,8 @@ const SubJobInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': subJobId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('subJob').prefix +
-                        ':' +
-                        subJobId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Sales/Clients/ClientInfo.jsx

@@ -21,7 +21,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('ClientInfo')
@@ -197,13 +196,8 @@ const ClientInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                  masterFilter={{
+                  masterFilter={{ 'parent._id': clientId }}
-                      parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                        getModelByName('client').prefix +
-                        ':' +
-                        clientId
-                  }}
-                  visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Sales/ListingVarients/ListingVarientInfo.jsx

@@ -23,7 +23,6 @@ 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('ListingVarientInfo')
 log.setLevel(config.logLevel)
@@ -33,6 +32,7 @@ const ListingVarientInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -77,7 +77,7 @@ const ListingVarientInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -204,7 +204,9 @@ const ListingVarientInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -212,13 +214,8 @@ const ListingVarientInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': listingVarientId }}
-                  parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                    getModelByName('listingVarient').prefix +
-                    ':' +
-                    listingVarientId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Sales/Listings/ListingInfo.jsx

@@ -23,7 +23,6 @@ import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import ScrollBox from '../../common/ScrollBox.jsx'
 
 const log = loglevel.getLogger('ListingInfo')
@@ -35,6 +34,7 @@ const ListingInfo = () => {
   const listingVarientsTableRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -75,7 +75,7 @@ const ListingInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -197,7 +197,7 @@ const ListingInfo = () => {
                       <ObjectTable
                         type='listingVarient'
                         masterFilter={{
-                        listing: getModelByName('listing').prefix + ':' + listingId
+                          'listing._id': listingId
                         }}
                         visibleColumns={{ listing: false }}
                         ref={listingVarientsTableRef}
@@ -222,7 +222,9 @@ const ListingInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -230,13 +232,8 @@ const ListingInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': listingId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('listing').prefix +
-                      ':' +
-                      listingId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Sales/Marketplaces/MarketplaceInfo.jsx

@@ -1,4 +1,4 @@
-import { useContext, useRef, useState, useEffect } from 'react'
+import { useContext, useRef, useState , useEffect} from 'react'
 import { useLocation } from 'react-router-dom'
 import { Card, Flex, message, Space } from 'antd'
 import loglevel from 'loglevel'
@@ -25,7 +25,6 @@ import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import { ApiServerContext } from '../../context/ApiServerContext.jsx'
 import { ElectronContext } from '../../context/ElectronContext.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import {
   buildMarketplaceAuthState,
   storeMarketplaceAuthState
@@ -39,6 +38,7 @@ const MarketplaceInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -268,7 +268,9 @@ const MarketplaceInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -276,13 +278,8 @@ const MarketplaceInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': marketplaceId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('marketplace').prefix +
-                      ':' +
-                      marketplaceId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/Sales/SalesOrders/SalesOrderInfo.jsx

@@ -27,7 +27,6 @@ import ScrollBox from '../../common/ScrollBox.jsx'
 import OrderItemsIcon from '../../../Icons/OrderItemIcon.jsx'
 import ShipmentIcon from '../../../Icons/ShipmentIcon.jsx'
 import InvoiceIcon from '../../../Icons/InvoiceIcon.jsx'
-import { getModelByName } from '../../../../database/ObjectModels.js'
 import StockEventIcon from '../../../Icons/StockEventIcon.jsx'
 
 const log = loglevel.getLogger('SalesOrderInfo')
@@ -40,6 +39,7 @@ const SalesOrderInfo = () => {
   const shipmentsTableRef = useRef(null)
   const actionHandlerRef = useRef(null)
 
+
   const { setOnModalOk } = useActions()
   useEffect(() => {
     setOnModalOk(() => () => {
@@ -90,7 +90,7 @@ const SalesOrderInfo = () => {
     delete: () => {
       objectFormRef?.current?.handleDelete?.()
       return true
-    }
+    },
   }
 
   return (
@@ -223,7 +223,7 @@ const SalesOrderInfo = () => {
                       <ObjectTable
                         type='orderItem'
                         masterFilter={{
-                        order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
+                          'order._id': salesOrderId,
                           orderType: 'salesOrder'
                         }}
                         visibleColumns={{ order: false }}
@@ -242,7 +242,7 @@ const SalesOrderInfo = () => {
                       <ObjectTable
                         type='shipment'
                         masterFilter={{
-                        order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
+                          'order._id': salesOrderId,
                           orderType: 'salesOrder'
                         }}
                         visibleColumns={{ order: false }}
@@ -264,7 +264,7 @@ const SalesOrderInfo = () => {
                         <ObjectTable
                           type='invoice'
                           masterFilter={{
-                          order: getModelByName('salesOrder').prefix + ':' + salesOrderId,
+                            'order._id': salesOrderId,
                             orderType: 'salesOrder'
                           }}
                           visibleColumns={{ order: false }}
@@ -286,7 +286,7 @@ const SalesOrderInfo = () => {
                         <ObjectTable
                           type='stockEvent'
                           masterFilter={{
-                          owner: getModelByName('salesOrder').prefix + ':' + salesOrderId
+                            'owner._id': salesOrderId
                           }}
                         />
                       )}
@@ -310,7 +310,9 @@ const SalesOrderInfo = () => {
               title='Audit Logs'
               icon={<AuditLogIcon />}
               active={collapseState.auditLogs}
-            onToggle={(expanded) => updateCollapseState('auditLogs', expanded)}
+              onToggle={(expanded) =>
+                updateCollapseState('auditLogs', expanded)
+              }
               collapseKey='auditLogs'
             >
               {objectFormState.loading ? (
@@ -318,13 +320,8 @@ const SalesOrderInfo = () => {
               ) : (
                 <ObjectTable
                   type='auditLog'
-                masterFilter={{
+                  masterFilter={{ 'parent._id': salesOrderId }}
-                    parent:
+                  visibleColumns={{ _id: false, 'parent._id': false }}
-                      getModelByName('salesOrder').prefix +
-                      ':' +
-                      salesOrderId
-                }}
-                visibleColumns={{ _id: false, parent: false }}
                 />
               )}
             </InfoCollapse>

src/components/Dashboard/common/AddressDisplay.jsx

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import { Flex, Typography, Input } from 'antd'
 import CountryDisplay from './CountryDisplay'
 import CountrySelect from './CountrySelect'
-import ElipsisText from './ElipsisText'
 
 const { Text } = Typography
 
@@ -51,9 +50,9 @@ const AddressDisplay = ({
               {isCountry ? (
                 <CountryDisplay countryCode={fieldValue} />
               ) : (
-                <ElipsisText alt={label}>
+                <Text ellipsis alt={label}>
                   {fieldValue}
-                </ElipsisText>
+                </Text>
               )}
             </Flex>
           )

src/components/Dashboard/common/CodeBlockEditor.jsx

@@ -22,21 +22,30 @@ import { Button, Modal, Typography } from 'antd'
 
 const { Link } = Typography
 
-export function toEditorCode(code, language = 'javascript') {
+export default function CodeBlockEditor({
-  if (code == null) return ''
+  code = '',
-  if (typeof code === 'object' && language === 'json') {
-    return JSON.stringify(code, null, 2)
-  }
-  return String(code)
-}
-
-export function getCodeLanguageExtension(
   language = 'javascript',
+  style = {},
+  className = '',
+  readOnly = false,
+  onChange = null,
+  height = 'auto',
+  showLineNumbers = true,
+  disabled = false,
+  minimal = false,
   autoCompleteObject = null
-) {
+}) {
-  const lang = Array.isArray(language) ? language[0] : language
+  const { isDarkMode } = useThemeContext()
+  const [codeMirrorOpen, setCodeMirrorOpen] = useState(false)
+  var editorCode = code
 
-  switch (String(lang || 'javascript').toLowerCase()) {
+  if (typeof code == 'object' && language == 'json') {
+    editorCode = JSON.stringify(code, null, 2)
+  }
+
+  // Map language to CodeMirror extension
+  const languageExtension = useMemo(() => {
+    switch (language.toLowerCase()) {
       case 'javascript':
       case 'js':
         return javascript()
@@ -76,31 +85,9 @@ export function getCodeLanguageExtension(
       case 'yml':
         return yaml()
       default:
-      return javascript()
+        return javascript() // Default fallback
     }
-}
+  }, [language, autoCompleteObject])
-
-export default function CodeBlockEditor({
-  code = '',
-  language = 'javascript',
-  style = {},
-  className = '',
-  readOnly = false,
-  onChange = null,
-  height = 'auto',
-  showLineNumbers = true,
-  disabled = false,
-  minimal = false,
-  autoCompleteObject = null
-}) {
-  const { isDarkMode } = useThemeContext()
-  const [codeMirrorOpen, setCodeMirrorOpen] = useState(false)
-  const editorCode = toEditorCode(code, language)
-
-  const languageExtension = useMemo(
-    () => getCodeLanguageExtension(language, autoCompleteObject),
-    [language, autoCompleteObject]
-  )
 
   const handleOnChange = (value) => {
     if (typeof code == 'object' && language == 'json') {

src/components/Dashboard/common/CodeDiffViewer.jsx

@@ -1,85 +0,0 @@
-import { useLayoutEffect, useMemo, useRef } from 'react'
-import PropTypes from 'prop-types'
-import { MergeView } from '@codemirror/merge'
-import { EditorState } from '@codemirror/state'
-import { EditorView } from '@codemirror/view'
-import { oneDark } from '@codemirror/theme-one-dark'
-import { basicSetup } from 'codemirror'
-import { useThemeContext } from '../context/ThemeContext'
-import {
-  getCodeLanguageExtension,
-  toEditorCode
-} from './CodeBlockEditor'
-
-export default function CodeDiffViewer({
-  oldCode = '',
-  newCode = '',
-  language = 'javascript'
-}) {
-  const { isDarkMode } = useThemeContext()
-  const parentRef = useRef(null)
-  const oldDoc = toEditorCode(oldCode, language)
-  const newDoc = toEditorCode(newCode, language)
-
-  const languageExtension = useMemo(
-    () => getCodeLanguageExtension(language),
-    [language]
-  )
-
-  useLayoutEffect(() => {
-    if (!parentRef.current) return
-
-    const editorTheme = EditorView.theme({
-      '&': {
-        fontSize: '14px',
-        fontFamily: 'Monaco, Menlo, "Ubuntu Mono", monospace'
-      }
-    })
-
-    const sharedExtensions = [
-      basicSetup,
-      languageExtension,
-      editorTheme,
-      EditorView.editable.of(false),
-      EditorState.readOnly.of(true),
-      ...(isDarkMode ? [oneDark] : [])
-    ]
-
-    const view = new MergeView({
-      a: {
-        doc: oldDoc,
-        extensions: sharedExtensions
-      },
-      b: {
-        doc: newDoc,
-        extensions: sharedExtensions
-      },
-      parent: parentRef.current,
-      highlightChanges: true,
-      gutter: true,
-      collapseUnchanged: { margin: 3, minSize: 6 }
-    })
-
-    return () => {
-      view.destroy()
-    }
-  }, [oldDoc, newDoc, languageExtension, isDarkMode])
-
-  return (
-    <div
-      ref={parentRef}
-      className={
-        isDarkMode ? 'code-diff-viewer is-dark' : 'code-diff-viewer'
-      }
-    />
-  )
-}
-
-CodeDiffViewer.propTypes = {
-  oldCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-  newCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-  language: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string)
-  ])
-}

src/components/Dashboard/common/CountryDisplay.jsx

@@ -1,8 +1,9 @@
 import PropTypes from 'prop-types'
-import { Flex } from 'antd'
+import { Flex, Typography } from 'antd'
 import Flag from './Flag'
 import countries from '../../../database/Countries'
-import ElipsisText from './ElipsisText'
+
+const { Text } = Typography
 
 const CountryDisplay = ({ countryCode }) => {
   const country = countries.find((c) => c.code === countryCode)
@@ -16,7 +17,7 @@ const CountryDisplay = ({ countryCode }) => {
       gap={'small'}
       align='center'
       className='country-display'
-      style={{ minWidth: 0, width: '100%' }}
+      style={{ minWidth: 0 }}
     >
       <Flag
         code={country.code}
@@ -24,8 +25,8 @@ const CountryDisplay = ({ countryCode }) => {
         hasBorder={true}
         borderRadius={5}
       />
-      <div style={{ minWidth: 0, flex: 1, overflow: 'hidden' }}>
+      <div style={{ minWidth: 0 }}>
-        <ElipsisText>{country.name}</ElipsisText>
+        <Text ellipsis>{country.name}</Text>
       </div>
     </Flex>
   )

src/components/Dashboard/common/CountrySelect.jsx

@@ -1,8 +1,9 @@
-import { Select, Flex } from 'antd'
+import { Select, Flex, Typography } from 'antd'
 import PropTypes from 'prop-types'
 import Flag from './Flag'
 import countries from '../../../database/Countries'
-import ElipsisText from './ElipsisText'
+
+const { Text } = Typography
 
 const CountrySelect = ({
   value,
@@ -29,7 +30,7 @@ const CountrySelect = ({
           label: (
             <Flex gap='small' align='center' className='country-display'>
               <Flag code={country.code} size='small' borderRadius={3} />
-              <ElipsisText>{country.name}</ElipsisText>
+              <Text elipsis>{country.name}</Text>
             </Flex>
           )
         }))}

src/components/Dashboard/common/DashboardNavigation.jsx

@@ -22,7 +22,6 @@ import { Header } from 'antd/es/layout/layout'
 import { useMediaQuery } from 'react-responsive'
 import KeyboardShortcut from './KeyboardShortcut'
 import UserProfilePopover from './UserProfilePopover'
-import ElipsisText from './ElipsisText'
 
 import FarmControlLogo from '../../Logos/FarmControlLogo'
 import FarmControlLogoSmall from '../../Logos/FarmControlLogoSmall'
@@ -195,17 +194,19 @@ const DashboardNavigation = () => {
           }}
         >
           {selectedMenuItem.icon}
-          <ElipsisText
+          <Text
+            ellipsis
             style={{
-              minWidth: 0,
+              minWidth: 0, // CRUCIAL for flex children
-              maxWidth: '100%',
+              maxWidth: '100%', // Responsive
               whiteSpace: 'nowrap',
               overflow: 'hidden',
-              flex: 1
+              textOverflow: 'ellipsis',
+              flex: 1 // Take available space, shrink as needed
             }}
           >
             {selectedMenuItem.label}
-          </ElipsisText>
+          </Text>
         </Flex>
       )}
       <div style={{ flexGrow: 1 }}>

src/components/Dashboard/common/DiffLabel.jsx

@@ -1,116 +0,0 @@
-import { useMemo, useState } from 'react'
-import PropTypes from 'prop-types'
-import { Button, Modal, Typography, theme, Flex } from 'antd'
-import { presentableDiff } from '@codemirror/merge'
-import CodeDiffViewer from './CodeDiffViewer'
-import { toEditorCode } from './CodeBlockEditor'
-
-const { Link, Text } = Typography
-
-const SQUARE_COUNT = 10
-
-const countLines = (str) => {
-  if (!str) return 0
-  const parts = str.split('\n')
-  if (parts[parts.length - 1] === '') parts.pop()
-  return Math.max(parts.length, 1)
-}
-
-export function getCodeDiffStats(oldCode, newCode, language = 'javascript') {
-  const oldText = toEditorCode(oldCode, language)
-  const newText = toEditorCode(newCode, language)
-  const changes = presentableDiff(oldText, newText)
-  let additions = 0
-  let deletions = 0
-
-  for (const change of changes) {
-    const deleted = oldText.slice(change.fromA, change.toA)
-    const added = newText.slice(change.fromB, change.toB)
-    if (deleted) deletions += countLines(deleted)
-    if (added) additions += countLines(added)
-  }
-
-  return { additions, deletions }
-}
-
-export default function DiffLabel({
-  oldCode = '',
-  newCode = '',
-  language = 'javascript'
-}) {
-  const { token } = theme.useToken()
-  const [open, setOpen] = useState(false)
-  const [viewerReady, setViewerReady] = useState(false)
-  const { additions, deletions } = useMemo(
-    () => getCodeDiffStats(oldCode, newCode, language),
-    [oldCode, newCode, language]
-  )
-
-  const greenCount = Math.round(
-    (additions / (additions + deletions)) * SQUARE_COUNT
-  )
-
-  return (
-    <>
-      <Link
-        className='diff-label'
-        onClick={() => {
-          setOpen(true)
-        }}
-      >
-        <Flex gap='small' align='center' style={{ marginTop: 0.5 }}>
-          <Text style={{ color: token.colorSuccess }}>+{additions}</Text>
-          <Flex gap='4px' align='center' style={{ marginBottom: 2 }}>
-            {Array.from({ length: SQUARE_COUNT }).map((_, i) => (
-              <div
-                key={i}
-                className='diff-label-square'
-                style={{
-                  backgroundColor:
-                    i < greenCount ? token.colorSuccess : token.colorError
-                }}
-              />
-            ))}
-          </Flex>
-          <Text style={{ color: token.colorError }}>-{deletions}</Text>
-        </Flex>
-      </Link>
-      <Modal
-        closeIcon={false}
-        open={open}
-        width='90%'
-        destroyOnClose
-        afterOpenChange={setViewerReady}
-        onCancel={() => {
-          setOpen(false)
-        }}
-        footer={
-          <Button
-            onClick={() => {
-              setOpen(false)
-            }}
-          >
-            Close
-          </Button>
-        }
-      >
-        {viewerReady ? (
-          <CodeDiffViewer
-            oldCode={oldCode}
-            newCode={newCode}
-            language={language}
-          />
-        ) : null}
-      </Modal>
-    </>
-  )
-}
-
-DiffLabel.propTypes = {
-  oldCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-  newCode: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
-  language: PropTypes.oneOfType([
-    PropTypes.string,
-    PropTypes.arrayOf(PropTypes.string)
-  ])
-}

src/components/Dashboard/common/ElipsisText.jsx

@@ -1,108 +0,0 @@
-import { useLayoutEffect, useRef, useState } from 'react'
-import PropTypes from 'prop-types'
-import { Typography } from 'antd'
-
-const { Text } = Typography
-
-const childrenToString = (children) => {
-  if (children == null || typeof children === 'boolean') return ''
-  if (typeof children === 'string' || typeof children === 'number') {
-    return String(children)
-  }
-  if (Array.isArray(children)) {
-    return children.map(childrenToString).join('')
-  }
-  if (typeof children === 'object' && children.props) {
-    return childrenToString(children.props.children)
-  }
-  return ''
-}
-
-const splitMiddle = (text) => {
-  const mid = Math.ceil(text.length / 2)
-  return {
-    start: text.slice(0, mid),
-    end: text.slice(mid)
-  }
-}
-
-const ElipsisText = ({ children, style, className, title, code, ...rest }) => {
-  const text = childrenToString(children)
-  const { start, end } = splitMiddle(text)
-
-  const containerRef = useRef(null)
-  const measureRef = useRef(null)
-  const truncatedRef = useRef(false)
-  const [truncated, setTruncated] = useState(false)
-
-  useLayoutEffect(() => {
-    const container = containerRef.current
-    const measure = measureRef.current
-    if (!container || !measure) return
-
-    const update = () => {
-      const available = container.getBoundingClientRect().width
-      if (available < 1) return
-
-      const textWidth = measure.getBoundingClientRect().width
-      const next = Boolean(end) && textWidth > available
-      if (truncatedRef.current === next) return
-      truncatedRef.current = next
-      setTruncated(next)
-    }
-
-    update()
-    const frame = requestAnimationFrame(update)
-
-    const resizeObserver = new ResizeObserver(update)
-    resizeObserver.observe(container)
-
-    const intersectionObserver = new IntersectionObserver(update)
-    intersectionObserver.observe(container)
-
-    return () => {
-      cancelAnimationFrame(frame)
-      resizeObserver.disconnect()
-      intersectionObserver.disconnect()
-    }
-  }, [text, end])
-
-  const showTruncated = truncated && Boolean(end)
-  const RootTag = code ? 'code' : 'span'
-
-  return (
-    <Text
-      {...rest}
-      className={['elipsis-text-wrapper', className].filter(Boolean).join(' ')}
-      title={title ?? text}
-      style={style}
-    >
-      <span
-        className={showTruncated ? 'elipsis-text is-truncated' : 'elipsis-text'}
-        ref={containerRef}
-      >
-        <RootTag className='elipsis-text-measure' ref={measureRef}>
-          {text}
-        </RootTag>
-        <RootTag className='elipsis-text-full'>{text}</RootTag>
-        <RootTag className='elipsis-text-truncated'>
-          <span className='elipsis-text-start'>{start}</span>
-          <span className='elipsis-text-dots'>...</span>
-          <span className='elipsis-text-end'>
-            <span className='elipsis-text-end-inner'>{end}</span>
-          </span>
-        </RootTag>
-      </span>
-    </Text>
-  )
-}
-
-ElipsisText.propTypes = {
-  children: PropTypes.node,
-  style: PropTypes.object,
-  className: PropTypes.string,
-  title: PropTypes.string,
-  code: PropTypes.bool
-}
-
-export default ElipsisText

src/components/Dashboard/common/EmailDisplay.jsx

@@ -3,7 +3,6 @@ import { Typography, Flex, Button, Tooltip } from 'antd'
 import NewMailIcon from '../../Icons/NewMailIcon'
 // import CopyIcon from './CopyIcon'
 import CopyButton from './CopyButton'
-import ElipsisText from './ElipsisText'
 
 const { Text, Link } = Typography
 
@@ -19,9 +18,9 @@ const EmailDisplay = ({ email, showCopy = true, showLink = false }) => {
           </Link>
         ) : (
           <>
-            <ElipsisText style={{ marginRight: 8 }}>
+            <Text style={{ marginRight: 8 }} ellipsis>
               {email}
-            </ElipsisText>
+            </Text>
             <Tooltip title='Email' arrow={false}>
               <Button
                 icon={<NewMailIcon />}

src/components/Dashboard/common/FileList.jsx

@@ -1,4 +1,4 @@
-import { Card, Flex, Button, Tag, Divider } from 'antd'
+import { Card, Flex, Typography, Button, Tag, Divider } from 'antd'
 import PropTypes from 'prop-types'
 import FileIcon from '../../Icons/FileIcon'
 import BinIcon from '../../Icons/BinIcon'
@@ -11,7 +11,8 @@ import EyeSlashIcon from '../../Icons/EyeSlashIcon'
 import { getModelByName } from '../../../database/ObjectModels'
 import InfoCircleIcon from '../../Icons/InfoCircleIcon'
 import { useNavigate } from 'react-router-dom'
-import ElipsisText from './ElipsisText'
+
+const { Text } = Typography
 
 const FileList = ({
   files,
@@ -86,15 +87,15 @@ const FileList = ({
         <Flex
           gap={'small'}
           align='center'
-          style={{ minWidth: 0, flex: '1 1 auto', overflow: 'hidden' }}
+          style={{ minWidth: 0, flex: '0 1 auto', overflow: 'hidden' }}
         >
           <FileIcon
             style={{ margin: 0, fontSize: card == true ? '24px' : '16px' }}
           />
 
-          <ElipsisText style={{ marginTop: '1px', minWidth: 0 }}>
+          <Text style={{ marginTop: '1px', minWidth: 0 }} ellipsis>
             {file.name || file.filename || 'Unknown file'}
-          </ElipsisText>
+          </Text>
           {file.extension && <Tag style={{ margin: 0 }}>{file.extension}</Tag>}
         </Flex>
         {!minimal && (

src/components/Dashboard/common/IdDisplay.jsx

@@ -4,7 +4,6 @@ import { Flex, Typography, Popover } from 'antd'
 import { useNavigate } from 'react-router-dom'
 import { useMediaQuery } from 'react-responsive'
 import CopyButton from './CopyButton'
-import ElipsisText from './ElipsisText'
 import SpotlightTooltip from './SpotlightTooltip'
 import { getModelByName } from '../../../database/ObjectModels'
 import { buildActionUrl } from '../../../utils/modelActions'
@@ -69,12 +68,13 @@ const IdDisplay = ({
 
         if (plainCode == false) {
           textElement = (
-            <ElipsisText
+            <Text
               code
+              ellipsis
               style={showCopy ? { marginRight: 6, minWidth: '0px' } : undefined}
             >
               {displayId}
-            </ElipsisText>
+            </Text>
           )
         }
 
@@ -83,12 +83,8 @@ const IdDisplay = ({
           const linkElement = (
             <Link
               onClick={() => navigate(hyperlink)}
-              style={{
+              ellipsis
-                minWidth: 0,
+              style={showCopy ? { marginRight: 6 } : undefined}
-                maxWidth: '100%',
-                display: 'block',
-                ...(showCopy ? { marginRight: 6 } : null)
-              }}
             >
               {textElement}
             </Link>

src/components/Dashboard/common/MiscId.jsx

@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types'
 import { Flex, Typography } from 'antd'
 import CopyButton from './CopyButton'
-import ElipsisText from './ElipsisText'
 
 const { Text } = Typography
 
@@ -16,12 +15,13 @@ const MiscId = ({ value, showCopy = true }) => {
       className='miscid'
       style={{ minWidth: '0px', width: '100%' }}
     >
-      <ElipsisText
+      <Text
         code
+        ellipsis
         style={showCopy ? { marginRight: 6, minWidth: '0px' } : undefined}
       >
         {value}
-      </ElipsisText>
+      </Text>
 
       {showCopy && (
         <CopyButton

src/components/Dashboard/common/NoteItem.jsx

@@ -71,9 +71,7 @@ const NoteItem = ({
     setChildNotesLoading(true)
     try {
       const childNotesData = await fetchObjects('note', {
-        filter: {
+        filter: { 'parent._id': note._id }
-          parent: getModelByName('note').prefix + ':' + note._id
-        }
       })
       setChildNotes(childNotesData.data)
     } catch (error) {
@@ -107,7 +105,7 @@ const NoteItem = ({
       if (isExpanded == true) {
         subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
           'note',
-          { parent: getModelByName('note').prefix + ':' + note._id },
+          { 'parent._id': note._id },
           () => {
             if (isExpanded == true) {
               handleNoteExpand()

src/components/Dashboard/common/NotesPanel.jsx

@@ -19,7 +19,6 @@ import InfoCircleIcon from '../../Icons/InfoCircleIcon'
 import ReloadIcon from '../../Icons/ReloadIcon'
 import NewNote from '../Management/Notes/NewNote'
 import NoteItem from './NoteItem'
-import { getModelByName } from '../../../database/ObjectModels.js'
 
 const { Text } = Typography
 
@@ -41,14 +40,14 @@ const NotesPanel = ({ _id, type }) => {
   const fetchData = useCallback(
     async (id) => {
       try {
-        const newData = await fetchNotes(id, type)
+        const newData = await fetchNotes(id)
         return newData
       } catch (error) {
         setError(error)
         return null
       }
     },
-    [fetchNotes, type]
+    [fetchNotes]
   )
 
   const generateNotes = useCallback(
@@ -99,7 +98,7 @@ const NotesPanel = ({ _id, type }) => {
     if (connected == true && subscribeToObjectTypeUpdatesRef.current == null) {
       subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
         'note',
-        { parent: getModelByName(type).prefix + ':' + _id },
+        { 'parent._id': _id },
         () => handleReloadData()
       )
     }

src/components/Dashboard/common/Notification.jsx

@@ -23,7 +23,6 @@ import ExclamationOctagonIcon from '../../Icons/ExclamationOctagonIcon'
 import CheckCircleIcon from '../../Icons/CheckCircleIcon'
 import BellIcon from '../../Icons/BellIcon'
 import { getModelByName } from '../../../database/ObjectModels'
-import ElipsisText from './ElipsisText'
 
 const { Text, Paragraph } = Typography
 
@@ -362,12 +361,13 @@ const Notification = ({
               {inlineIcon &&
                 getNotificationIcon(notification.type, notification.metadata)}
 
-              <ElipsisText
+              <Text
                 strong={!notification.read}
+                ellipsis
                 style={{ minWidth: 0 }}
               >
                 {notification.title}
-              </ElipsisText>
+              </Text>
             </Flex>
             <Flex align='center' gap='5px' style={{ marginLeft: 10 }}>
               {showDetails && (

src/components/Dashboard/common/ObjectDisplay.jsx

@@ -9,7 +9,6 @@ import { ApiServerContext } from '../context/ApiServerContext'
 import { AuthContext } from '../context/AuthContext'
 import merge from 'lodash/merge'
 import IdDisplay from './IdDisplay'
-import ElipsisText from './ElipsisText'
 import SpotlightTooltip from './SpotlightTooltip'
 import StateTag from './StateTag'
 
@@ -184,7 +183,13 @@ const ObjectDisplay = ({
   const objectId = getStringId(objectData)
 
   if (defaultModelActions.length >= 1 && objectId) {
-    hyperlink = buildActionUrl(model, defaultModelActions[0], objectId, '', '')
+    hyperlink = buildActionUrl(
+      model,
+      defaultModelActions[0],
+      objectId,
+      '',
+      ''
+    )
   }
 
   // Render name with hyperlink/spotlight support
@@ -192,9 +197,9 @@ const ObjectDisplay = ({
     if (!objectData?.name) return null
 
     const textElement = (
-      <ElipsisText style={{ lineHeight: '1', paddingBottom: '2px' }}>
+      <Text ellipsis style={{ lineHeight: '1', paddingBottom: '2px' }}>
         {objectData.name}
-      </ElipsisText>
+      </Text>
     )
 
     // If hyperlink is enabled
@@ -263,7 +268,7 @@ const ObjectDisplay = ({
         style={{ minWidth: 0, height: '24px' }}
       >
         <Icon />
-        <Flex gap={'small'} align='center' style={{ minWidth: 0, flex: 1 }}>
+        <Flex gap={'small'} align='center' style={{ minWidth: 0 }}>
           {objectData?.color ? (
             <Badge
               color={objectData?.color}
@@ -277,7 +282,7 @@ const ObjectDisplay = ({
               style={{ marginBottom: '1.5px' }}
             />
           ) : null}
-          <div style={{ minWidth: 0, flex: 1, overflow: 'hidden' }}>
+          <div style={{ minWidth: 0 }}>
             {renderNameDisplay()}
 
             {objectId && !objectData?.name ? (

src/components/Dashboard/common/ObjectProperty.jsx

@@ -51,7 +51,6 @@ import MiscId from './MiscId'
 import AddressDisplay from './AddressDisplay'
 import ArrayDisplay from './ArrayDisplay'
 import ArrayInput from './ArrayInput'
-import ElipsisText from './ElipsisText'
 import { round } from '../utils/Utils'
 
 const { Text } = Typography
@@ -379,11 +378,11 @@ const ObjectProperty = ({
         case 'text':
           if (value != null && value != '') {
             return (
-              <ElipsisText style={style}>
+              <Text ellipsis style={style}>
                 {prefix}
                 {getTextValue(value)}
                 {suffix}
-              </ElipsisText>
+              </Text>
             )
           } else {
             return (

src/components/Dashboard/common/PropertyChanges.jsx

@@ -1,11 +1,7 @@
 import PropTypes from 'prop-types'
 import { Descriptions, Typography, Flex } from 'antd'
-import {
+import { getModelProperty } from '../../../database/ObjectModels'
-  getModelProperty,
-  getPropertyValue
-} from '../../../database/ObjectModels'
 import ObjectProperty from './ObjectProperty'
-import DiffLabel from './DiffLabel'
 import ArrowRightIcon from '../../Icons/ArrowRightIcon'
 
 const { Text } = Typography
@@ -55,17 +51,6 @@ const PropertyChanges = ({ type, value }) => {
         if (!changeProperty) {
           return null
         }
-
-        const oldValue = getPropertyValue(value?.old, key)
-        const newValue = getPropertyValue(value?.new, key)
-        const isCodeKey = key === 'code' || changeProperty.type === 'codeBlock'
-        const isCodeEdit =
-          isCodeKey &&
-          oldValue != null &&
-          oldValue !== '' &&
-          newValue != null &&
-          newValue !== ''
-
         return (
           <Descriptions.Item key={key} label={changeProperty.label}>
             <Flex
@@ -73,14 +58,6 @@ const PropertyChanges = ({ type, value }) => {
               style={{ minWidth: 0, width: '100%' }}
               className='property-changes'
             >
-              {isCodeEdit ? (
-                <DiffLabel
-                  oldCode={oldValue}
-                  newCode={newValue}
-                  language={changeProperty.language}
-                />
-              ) : (
-                <>
               {value?.old ? (
                 <ObjectProperty
                   {...changeProperty}
@@ -106,8 +83,6 @@ const PropertyChanges = ({ type, value }) => {
                   maxWidth='200px'
                 />
               ) : null}
-                </>
-              )}
             </Flex>
           </Descriptions.Item>
         )

src/components/Dashboard/common/UrlDisplay.jsx

@@ -2,7 +2,6 @@ import PropTypes from 'prop-types'
 import { Typography, Flex, Button, Tooltip } from 'antd'
 import LinkIcon from '../../Icons/LinkIcon'
 import CopyButton from './CopyButton'
-import ElipsisText from './ElipsisText'
 
 const { Text, Link } = Typography
 
@@ -25,15 +24,15 @@ const UrlDisplay = ({ url, showCopy = true, showLink = false }) => {
               width: 0
             }}
           >
-            <ElipsisText style={{ display: 'block' }}>
+            <Text ellipsis style={{ display: 'block' }}>
               {url}
-            </ElipsisText>
+            </Text>
           </Link>
         ) : (
           <>
-            <ElipsisText style={{ marginRight: 8, minWidth: 0 }}>
+            <Text style={{ marginRight: 8, minWidth: 0 }} ellipsis>
               {url}
-            </ElipsisText>
+            </Text>
             <Tooltip title='Open URL' arrow={false}>
               <Button
                 icon={<LinkIcon />}

src/components/Dashboard/common/UserProfilePopover.jsx

@@ -8,7 +8,6 @@ import { User } from '../../../database/models/User'
 import { buildActionUrl } from '../../../utils/modelActions'
 import { AuthContext } from '../context/AuthContext'
 import ObjectActions from './ObjectActions'
-import ElipsisText from './ElipsisText'
 
 const { Text } = Typography
 
@@ -90,12 +89,13 @@ const UserProfilePopover = ({ onClose }) => {
         )}
         <Flex vertical style={{ minWidth: 0 }}>
           {fullName && (
-            <ElipsisText
+            <Text
               strong
+              ellipsis
               style={{ fontSize: 18, lineHeight: 1, marginTop: 1 }}
             >
               {fullName}
-            </ElipsisText>
+            </Text>
           )}
           {email && (
             <Space>
@@ -106,12 +106,13 @@ const UserProfilePopover = ({ onClose }) => {
               >
                 @{username}
               </Text>
-              <ElipsisText
+              <Text
                 type='secondary'
+                ellipsis
                 style={{ fontSize: 12, lineHeight: 1 }}
               >
                 {email}
-              </ElipsisText>
+              </Text>
             </Space>
           )}
           {!username && !fullName && !email && (

src/components/Dashboard/context/ActionsModalContext.jsx

@@ -16,7 +16,6 @@ import {
   buildActionUrl,
   stripActionParams
 } from '../../../utils/modelActions'
-import ElipsisText from '../common/ElipsisText'
 
 const ActionsModalContext = createContext()
 
@@ -292,14 +291,15 @@ const ActionsModalProvider = ({ children }) => {
                         >
                           {Icon ? <Icon style={{ fontSize: '18px' }} /> : null}
                           <Flex vertical style={{ flexGrow: 1, minWidth: 0 }}>
-                            <ElipsisText
+                            <Text
+                              ellipsis
                               style={{
                                 maxWidth: 320,
                                 width: '100%'
                               }}
                             >
                               {action.fullLabel || action.label || action.name}
-                            </ElipsisText>
+                            </Text>
                           </Flex>
                         </Flex>
                         <Flex gap='small' align='center'>

src/components/Dashboard/context/ApiServerContext.jsx

@@ -1543,12 +1543,12 @@ const ApiServerProvider = ({ children }) => {
   }
 
   // Fetch notes for a specific parent
-  const fetchNotes = async (parentId, parentType) => {
+  const fetchNotes = async (parentId) => {
-    logger.debug('Fetching notes for parent:', parentId, parentType)
+    logger.debug('Fetching notes for parent:', parentId)
     try {
       const response = await axios.get(`${config.backendUrl}/notes`, {
         params: {
-          parent: getModelByName(parentType).prefix + ':' + parentId,
+          'parent._id': parentId,
           sort: 'createdAt',
           order: 'ascend'
         },
@@ -1564,7 +1564,7 @@ const ApiServerProvider = ({ children }) => {
     } catch (err) {
       console.error(err)
       showError(err, () => {
-        fetchNotes(parentId, parentType)
+        fetchNotes(parentId)
       })
     }
   }

src/components/Dashboard/context/SpotlightContext.jsx

@@ -26,7 +26,6 @@ import PropTypes from 'prop-types'
 import { useNavigate } from 'react-router-dom'
 import StateDisplay from '../common/StateDisplay'
 import IdDisplay from '../common/IdDisplay'
-import ElipsisText from '../common/ElipsisText'
 
 import config from '../../../config'
 import {
@@ -502,7 +501,8 @@ const SpotlightContent = ({
                         {Icon ? <Icon style={{ fontSize: '20px' }} /> : null}
 
                         {item.name ? (
-                          <ElipsisText
+                          <Text
+                            ellipsis
                             style={{
                               maxWidth: 170,
                               flexGrow: 1,
@@ -510,7 +510,7 @@ const SpotlightContent = ({
                             }}
                           >
                             {item.name}
-                          </ElipsisText>
+                          </Text>
                         ) : null}
                         {item?.state ? (
                           <StateDisplay

src/database/models/AppPassword.js

@@ -97,6 +97,7 @@ export const AppPassword = {
     'name',
     'user',
     'active',
+    'user._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/AuditLog.js

@@ -17,8 +17,8 @@ export const AuditLog = {
     'createdAt'
   ],
   filters: [
-    'parent',
+    'parent._id',
-    'owner',
+    'owner._id',
     'operation',
     'createdAt',
     'updatedAt',

src/database/models/CourierService.js

@@ -89,6 +89,7 @@ export const CourierService = {
   filters: [
     '_id',
     'courier',
+    'courier._id',
     'name',
     'active',
     'tracked',

src/database/models/Filament.js

@@ -110,6 +110,7 @@ export const Filament = {
   filters: [
     '_id',
     'material',
+    'material._id',
     'diameter',
     'name',
     'cost',

src/database/models/FilamentSku.js

@@ -90,6 +90,7 @@ export const FilamentSku = {
     '_id',
     'barcode',
     'filament',
+    'filament._id',
     'name',
     'color',
     'cost',

src/database/models/FilamentStock.js

@@ -45,11 +45,14 @@ export const FilamentStock = {
   ],
   filters: [
     'filament',
+    'filament._id',
     'filamentSku',
     'state',
     'startingWeight',
     'currentWeight',
+    'filamentSku._id',
     'stockLocation',
+    'stockLocation._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/GCodeFile.js

@@ -101,7 +101,9 @@ export const GCodeFile = {
     '_id',
     'name',
     'filament',
+    'filament._id',
     'filamentSku',
+    'filamentSku._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/Invoice.js

@@ -166,7 +166,10 @@ export const Invoice = {
     'vendor',
     'client',
     'state',
+    'vendor._id',
+    'client._id',
     'order',
+    'order._id',
     'orderType',
     'createdAt',
     'updatedAt',

src/database/models/ListingVarient.js

@@ -122,6 +122,7 @@ export const ListingVarient = {
   ],
   filters: [
     'listing',
+    'listing._id',
     'product',
     'productSku',
     'state',

src/database/models/Note.js

@@ -56,10 +56,12 @@ export const Note = {
   filters: [
     '_id',
     'user',
+    'user._id',
     'parentType',
     'parent',
-    'parent',
+    'parent._id',
     'noteType',
+    'noteType._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/OrderItem.js

@@ -87,9 +87,12 @@ export const OrderItem = {
     'name',
     'itemType',
     'item',
+    'item._id',
     'order',
+    'order._id',
     'orderType',
     'shipment',
+    'shipment._id',
     'state',
     'createdAt',
     'updatedAt',

src/database/models/PartSku.js

@@ -92,6 +92,7 @@ export const PartSku = {
     '_id',
     'barcode',
     'part',
+    'part._id',
     'name',
     'cost',
     'price',

src/database/models/PartStock.js

@@ -36,7 +36,9 @@ export const PartStock = {
     'state',
     'startingQuantity',
     'currentQuantity',
+    'partSku._id',
     'stockLocation',
+    'stockLocation._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/Payment.js

@@ -163,7 +163,10 @@ export const Payment = {
     'vendor',
     'client',
     'state',
+    'vendor._id',
+    'client._id',
     'invoice',
+    'invoice._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/Product.js

@@ -102,6 +102,7 @@ export const Product = {
     'name',
     'globalPrice',
     'productCategory',
+    'productCategory._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/ProductSku.js

@@ -92,6 +92,7 @@ export const ProductSku = {
     '_id',
     'barcode',
     'product',
+    'product._id',
     'name',
     'cost',
     'price',

src/database/models/ProductStock.js

@@ -7,7 +7,6 @@ const PostProductStock = lazy(
   () => import('../../components/Dashboard/Inventory/ProductStocks/PostProductStock')
 )
 import ProductStockIcon from '../../components/Icons/ProductStockIcon'
-import { getModelByName } from '../ObjectModels.js'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
@@ -104,7 +103,9 @@ export const ProductStock = {
     'productSku',
     'state',
     'currentQuantity',
+    'productSku._id',
     'stockLocation',
+    'stockLocation._id',
     'createdAt',
     'updatedAt',
     '_reference'
@@ -226,9 +227,7 @@ export const ProductStock = {
           masterFilter: (objectData) => {
             const partSkuId = objectData?.partSku?._id
             if (partSkuId == null) return {}
-            return {
+            return { 'partSku._id': partSkuId }
-              partSku: getModelByName('partSku').prefix + ':' + partSkuId
-            }
           }
         },
         {

src/database/models/PurchaseOrder.js

@@ -231,6 +231,7 @@ export const PurchaseOrder = {
     'vendor',
     'state',
     'value',
+    'vendor._id',
     'totalAmount',
     'totalAmountWithTax',
     'totalTaxAmount',

src/database/models/SalesOrder.js

@@ -238,6 +238,7 @@ export const SalesOrder = {
     'client',
     'state',
     'value',
+    'client._id',
     'createdAt',
     'updatedAt',
     '_reference'

src/database/models/Shipment.js

@@ -147,6 +147,7 @@ export const Shipment = {
     'order',
     'state',
     'courierService',
+    'order._id',
     'taxRate',
     'createdAt',
     'updatedAt',

src/database/models/StockEvent.js

@@ -9,8 +9,14 @@ export const StockEvent = {
   icon: StockEventIcon,
   actions: [],
   columns: ['_reference', 'owner', 'parent', 'value', 'createdAt', 'updatedAt'],
-  filters: ['owner', 'parent', 'createdAt', 'updatedAt', '_reference'],
+  filters: [
-  sorters: ['createdAt', 'updatedAt'],
+    'owner._id',
+    'parent._id',
+    'createdAt',
+    'updatedAt',
+    '_reference'
+  ],
+  sorters: ['createdAt','updatedAt'],
   properties: [
     {
       name: '_id',