Jenkinsfile

@@ -14,7 +14,7 @@ def deploy() {
 
             stage('Install Dependencies (Ubuntu)') {
                 nodejs(nodeJSInstallationName: 'Node23') {
-                    sh 'pnpm install --frozen-lockfile --production=false  --ignore-scripts=false'
+                    sh 'pnpm install --frozen-lockfile --production=false'
                 }
             }
 

assets/icons/productcategoryicon.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(0.983114,0,0,0.983114,0.872652,-3.62694)">
-        <path d="M29.119,60.411L19.595,65.918C18.255,66.699 16.701,66.699 15.368,65.918L3.47,59.042C2.153,58.292 1.364,56.929 1.364,55.39L1.364,41.653C1.364,40.114 2.153,38.751 3.47,37.993L15.368,31.125C15.408,31.101 15.448,31.079 15.488,31.057C15.484,30.981 15.482,30.906 15.482,30.83L15.482,17.094C15.482,15.554 16.271,14.192 17.588,13.433L29.487,6.565C30.819,5.777 32.374,5.777 33.714,6.565L45.605,13.433C46.922,14.192 47.71,15.554 47.71,17.094L47.71,30.83C47.71,30.882 47.71,30.934 47.708,30.986C47.794,31.029 47.879,31.075 47.963,31.125L59.854,37.993C60.373,38.292 60.811,38.685 61.15,39.146C60.959,39.134 60.762,39.128 60.56,39.128L54.077,39.128L46.646,34.839C46.14,34.532 45.551,34.532 45.045,34.839L37.619,39.128L35.314,39.128C33.245,39.128 31.768,39.759 30.759,40.772C29.905,41.629 29.317,42.828 29.16,44.457L19.411,50.038L19.411,61.546C19.603,61.446 19.687,61.393 19.886,61.278L28.929,56.048C29.434,55.75 30.678,54.945 30.755,55.126L30.857,55.226L30.757,55.324C29.753,56.334 29.119,57.815 29.119,59.896L29.119,60.411ZM33.53,36.986C33.721,36.887 33.805,36.833 34.005,36.718L43.047,31.489C43.553,31.19 43.844,30.685 43.844,30.103L43.844,19.574L33.53,25.478L33.53,36.986ZM29.663,36.94L29.663,25.531L19.341,19.62L19.341,30.103C19.341,30.57 19.539,30.987 19.878,31.288L29.663,36.94ZM31.554,22.132L42.251,15.999C42.197,15.953 42.182,15.93 42.067,15.861L32.397,10.279C31.891,9.973 31.302,9.973 30.796,10.279L21.133,15.861C21.011,15.93 20.98,15.96 20.896,16.029L31.554,22.132ZM17.928,34.679C17.513,34.548 17.07,34.601 16.678,34.839L7.015,40.42C6.892,40.489 6.862,40.52 6.777,40.589L17.436,46.692L28.117,40.567L17.928,34.679ZM15.545,61.546L15.545,50.091L5.223,44.18L5.223,54.662C5.223,55.244 5.529,55.75 6.035,56.048L15.261,61.385C15.391,61.462 15.414,61.477 15.545,61.546Z"/>
-    </g>
-    <g transform="matrix(0.446187,0,0,0.446187,32,37.312437)">
-        <path d="M46.094,59.812L63.672,59.812C69.125,59.812 71.719,57.234 71.719,51.688L71.719,40.219C71.719,34.703 69.125,32.109 63.672,32.109L46.094,32.109C40.641,32.109 38.047,34.703 38.047,40.219L38.047,51.688C38.047,57.234 40.641,59.812 46.094,59.812ZM46.109,53.375C44.984,53.375 44.484,52.844 44.484,51.734L44.484,40.203C44.484,39.078 44.984,38.547 46.109,38.547L63.672,38.547C64.766,38.547 65.281,39.078 65.281,40.203L65.281,51.734C65.281,52.844 64.766,53.375 63.672,53.375L46.109,53.375Z" style="fill-rule:nonzero;"/>
-        <path d="M8.047,59.812L25.625,59.812C31.078,59.812 33.672,57.234 33.672,51.688L33.672,40.219C33.672,34.703 31.078,32.109 25.625,32.109L8.047,32.109C2.594,32.109 0,34.703 0,40.219L0,51.688C0,57.234 2.594,59.812 8.047,59.812ZM8.047,53.375C6.938,53.375 6.438,52.844 6.438,51.734L6.438,40.203C6.438,39.078 6.938,38.547 8.047,38.547L25.609,38.547C26.703,38.547 27.234,39.078 27.234,40.203L27.234,51.734C27.234,52.844 26.703,53.375 25.609,53.375L8.047,53.375Z" style="fill-rule:nonzero;"/>
-        <path d="M46.094,27.75L63.672,27.75C69.125,27.75 71.719,25.156 71.719,19.625L71.719,8.172C71.719,2.625 69.125,0.062 63.672,0.062L46.094,0.062C40.641,0.062 38.047,2.625 38.047,8.172L38.047,19.625C38.047,25.156 40.641,27.75 46.094,27.75ZM46.109,21.312C44.984,21.312 44.484,20.797 44.484,19.656L44.484,8.125C44.484,7.016 44.984,6.5 46.109,6.5L63.672,6.5C64.766,6.5 65.281,7.016 65.281,8.125L65.281,19.656C65.281,20.797 64.766,21.312 63.672,21.312L46.109,21.312Z" style="fill-rule:nonzero;"/>
-        <path d="M8.047,27.75L25.625,27.75C31.078,27.75 33.672,25.156 33.672,19.625L33.672,8.172C33.672,2.625 31.078,0.062 25.625,0.062L8.047,0.062C2.594,0.062 0,2.625 0,8.172L0,19.625C0,25.156 2.594,27.75 8.047,27.75ZM8.047,21.312C6.938,21.312 6.438,20.797 6.438,19.656L6.438,8.125C6.438,7.016 6.938,6.5 8.047,6.5L25.609,6.5C26.703,6.5 27.234,7.016 27.234,8.125L27.234,19.656C27.234,20.797 26.703,21.312 25.609,21.312L8.047,21.312Z" style="fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(0.446187,0,0,0.446187,32,37.312437)">
-        <path d="M46.094,59.812L63.672,59.812C69.125,59.812 71.719,57.234 71.719,51.688L71.719,40.219C71.719,34.703 69.125,32.109 63.672,32.109L46.094,32.109C40.641,32.109 38.047,34.703 38.047,40.219L38.047,51.688C38.047,57.234 40.641,59.812 46.094,59.812ZM46.109,53.375C44.984,53.375 44.484,52.844 44.484,51.734L44.484,40.203C44.484,39.078 44.984,38.547 46.109,38.547L63.672,38.547C64.766,38.547 65.281,39.078 65.281,40.203L65.281,51.734C65.281,52.844 64.766,53.375 63.672,53.375L46.109,53.375Z" style="fill-rule:nonzero;"/>
-    </g>
-</svg>

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

@@ -64,6 +64,10 @@ const InvoiceInfo = () => {
   const [newPaymentOpen, setNewPaymentOpen] = useState(false)
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false
@@ -309,7 +313,7 @@ const InvoiceInfo = () => {
         <PostInvoice
           onOk={() => {
             setPostInvoiceOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -327,7 +331,7 @@ const InvoiceInfo = () => {
         <AcknowledgeInvoice
           onOk={() => {
             setAcknowledgeInvoiceOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -345,7 +349,7 @@ const InvoiceInfo = () => {
         <NewPayment
           onOk={() => {
             setNewPaymentOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           reset={newPaymentOpen}
           defaultValues={{

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

@@ -50,6 +50,10 @@ const PaymentInfo = () => {
   const [postPaymentOpen, setPostPaymentOpen] = useState(false)
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false
@@ -229,7 +233,7 @@ const PaymentInfo = () => {
         <PostPayment
           onOk={() => {
             setPostPaymentOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -47,6 +47,10 @@ const FilamentStockInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -49,6 +49,10 @@ const OrderItemInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -51,6 +51,10 @@ const PartStockInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -58,6 +58,10 @@ const ProductStockInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false
@@ -258,7 +262,7 @@ const ProductStockInfo = () => {
         <PostProductStock
           onOk={() => {
             setPostProductStockOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -74,6 +74,10 @@ const PurchaseOrderInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       orderItemsTableRef?.current?.startEditing?.()
       objectFormRef?.current?.startEditing?.()
@@ -423,7 +427,7 @@ const PurchaseOrderInfo = () => {
         <PostPurchaseOrder
           onOk={() => {
             setPostPurchaseOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -441,7 +445,7 @@ const PurchaseOrderInfo = () => {
         <AcknowledgePurchaseOrder
           onOk={() => {
             setAcknowledgePurchaseOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -459,7 +463,7 @@ const PurchaseOrderInfo = () => {
         <CancelPurchaseOrder
           onOk={() => {
             setCancelPurchaseOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -64,6 +64,10 @@ const PurchaseOrderInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       orderItemsTableRef?.current?.startEditing?.()
       objectFormRef?.current?.startEditing?.()
@@ -328,7 +332,7 @@ const PurchaseOrderInfo = () => {
         <PostPurchaseOrder
           onOk={() => {
             setPostPurchaseOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -346,7 +350,7 @@ const PurchaseOrderInfo = () => {
         <AcknowledgePurchaseOrder
           onOk={() => {
             setAcknowledgePurchaseOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -57,6 +57,10 @@ const ShipmentInfo = () => {
   const [receiveShipmentOpen, setReceiveShipmentOpen] = useState(false)
   const [cancelShipmentOpen, setCancelShipmentOpen] = useState(false)
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false
@@ -257,7 +261,7 @@ const ShipmentInfo = () => {
         <ShipShipment
           onOk={() => {
             setShipShipmentOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -275,7 +279,7 @@ const ShipmentInfo = () => {
         <ReceiveShipment
           onOk={() => {
             setReceiveShipmentOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -293,7 +297,7 @@ const ShipmentInfo = () => {
         <CancelShipment
           onOk={() => {
             setCancelShipmentOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -51,6 +51,10 @@ const StockAuditInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -52,6 +52,10 @@ const StockLocationInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

src/components/Dashboard/Inventory/StockTransfers.jsx

@@ -90,7 +90,7 @@ const StockTransfers = () => {
         open={newOpen}
         styles={{ content: { paddingBottom: '24px' } }}
         footer={null}
-        width={740}
+        width={960}
         onCancel={() => {
           setNewOpen(false)
         }}

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

@@ -1,40 +1,17 @@
 import PropTypes from 'prop-types'
-import dayjs from 'dayjs'
 import ObjectInfo from '../../common/ObjectInfo'
 import NewObjectForm from '../../common/NewObjectForm'
 import WizardView from '../../common/WizardView'
 
-const defaultTransferName = () =>
-  `Transfer ${dayjs().format('YYYY-MM-DD HH:mm:ss')}`
-
 const NewStockTransfer = ({ onOk, reset }) => {
   return (
     <NewObjectForm
       type={'stockTransfer'}
       reset={reset}
-      defaultValues={{
+      defaultValues={{ state: { type: 'draft' }, lines: [] }}
-        name: defaultTransferName(),
-        state: { type: 'draft' },
-        lines: []
-      }}
     >
-      {({ handleSubmit, submitLoading, objectData, formValid }) => {
+      {({ handleSubmit, submitLoading, objectData }) => {
         const steps = [
-          {
-            title: 'Required',
-            key: 'required',
-            content: (
-              <ObjectInfo
-                type='stockTransfer'
-                column={1}
-                bordered={false}
-                labelWidth={80}
-                isEditing={true}
-                required={true}
-                objectData={objectData}
-              />
-            )
-          },
           {
             title: 'Summary',
             key: 'summary',
@@ -43,7 +20,6 @@ const NewStockTransfer = ({ onOk, reset }) => {
                 type='stockTransfer'
                 column={1}
                 bordered={false}
-                labelWidth={80}
                 visibleProperties={{
                   _id: false,
                   createdAt: false,
@@ -62,7 +38,7 @@ const NewStockTransfer = ({ onOk, reset }) => {
           <WizardView
             steps={steps}
             loading={submitLoading}
-            formValid={formValid}
+            formValid={true}
             title='New Stock Transfer'
             onSubmit={async () => {
               const result = await handleSubmit()

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

@@ -53,6 +53,10 @@ const StockTransferInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false
@@ -253,7 +257,7 @@ const StockTransferInfo = () => {
         <PostStockTransfer
           onOk={() => {
             setPostOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -48,6 +48,10 @@ const AppPasswordInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     regenerateSecret: () => {
       setRegenerateSecretOpen(true)
       return false

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

@@ -50,6 +50,10 @@ const CourierServiceInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -46,6 +46,10 @@ const CourierInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -51,6 +51,10 @@ const DocumentJobInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -53,6 +53,10 @@ const DocumentPrinterInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -51,6 +51,10 @@ const DocumentSizeInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -47,6 +47,10 @@ const DocumentTemplateDesign = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -53,6 +53,10 @@ const DocumentTemplateInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -43,6 +43,10 @@ const FilamentSkuInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -57,6 +57,10 @@ const FilamentInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     newFilamentSku: () => {
       setNewFilamentSkuOpen(true)
       return true
@@ -214,9 +218,10 @@ const FilamentInfo = () => {
               ) : (
                 <ObjectTable
                   type='filamentStock'
-                  masterFilter={{ filament: filamentId }}
+                  masterFilter={{ 'filamentSku.filament._id': filamentId }}
                   visibleColumns={{
-                    filament: false,
+                    filamentSku: false,
+                    'filamentSku.filament._id': false,
                     startingWeight: false
                   }}
                 />

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

@@ -52,6 +52,10 @@ const FileInfo = () => {
   const { fetchFileContent } = useContext(ApiServerContext)
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -53,6 +53,10 @@ const HostInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     hostOTP: () => {
       setHostOTPOpen(true)
       return false
@@ -68,10 +72,6 @@ const HostInfo = () => {
     finishEdit: () => {
       objectFormRef?.current.handleUpdate()
       return true
-    },
-    delete: () => {
-      objectFormRef?.current?.handleDelete?.()
-      return true
     }
   }
 

src/components/Dashboard/Management/ManagementSidebar.jsx

@@ -5,7 +5,6 @@ import FilamentSkuIcon from '../../Icons/FilamentSkuIcon'
 import PartIcon from '../../Icons/PartIcon'
 import PartSkuIcon from '../../Icons/PartSkuIcon'
 import ProductIcon from '../../Icons/ProductIcon'
-import ProductCategoryIcon from '../../Icons/ProductCategoryIcon'
 import ProductSkuIcon from '../../Icons/ProductSkuIcon'
 import VendorIcon from '../../Icons/VendorIcon'
 import MaterialIcon from '../../Icons/MaterialIcon'
@@ -58,12 +57,6 @@ const items = [
     label: 'Products',
     path: '/dashboard/management/products'
   },
-  {
-    key: 'productCategories',
-    icon: <ProductCategoryIcon />,
-    label: 'Product Categories',
-    path: '/dashboard/management/productcategories'
-  },
   {
     key: 'productSkus',
     icon: <ProductSkuIcon />,
@@ -206,7 +199,6 @@ const routeKeyMap = {
   '/dashboard/management/users': 'users',
   '/dashboard/management/apppasswords': 'appPasswords',
   '/dashboard/management/products': 'products',
-  '/dashboard/management/productcategories': 'productCategories',
   '/dashboard/management/productskus': 'productSkus',
   '/dashboard/management/vendors': 'vendors',
   '/dashboard/management/couriers': 'couriers',

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

@@ -45,6 +45,10 @@ const MaterialInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -41,6 +41,10 @@ const NoteTypeInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -50,6 +50,10 @@ const NoteInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -40,6 +40,10 @@ const PartSkuInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -45,6 +45,10 @@ const PartInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     newPartSku: () => {
       setNewPartSkuOpen(true)
       return true

src/components/Dashboard/Management/ProductCategories.jsx

@@ -1,109 +0,0 @@
-import { useRef, useState } from 'react'
-import { Button, Flex, Space, Modal, Dropdown } from 'antd'
-
-import NewProductCategory from './ProductCategories/NewProductCategory'
-
-import useColumnVisibility from '../hooks/useColumnVisibility'
-import ColumnViewButton from '../common/ColumnViewButton'
-import ObjectTable from '../common/ObjectTable'
-import PlusIcon from '../../Icons/PlusIcon'
-import ReloadIcon from '../../Icons/ReloadIcon'
-import ObjectTableViewButton from '../common/ObjectTableViewButton'
-import FilterSidebarButton from '../common/FilterSidebarButton'
-import useViewMode from '../hooks/useViewMode'
-import useFilterSidebarVisibility from '../hooks/useFilterSidebarVisibility'
-import ExportListButton from '../common/ExportListButton'
-
-const ProductCategories = () => {
-  const [newProductCategoryOpen, setNewProductCategoryOpen] = useState(false)
-  const tableRef = useRef()
-
-  const [viewMode, setViewMode] = useViewMode('productCategory')
-
-  const [columnVisibility, setColumnVisibility] =
-    useColumnVisibility('productCategory')
-
-  const [showFilterSidebar, setShowFilterSidebar] =
-    useFilterSidebarVisibility('ProductCategories')
-
-  const actionItems = {
-    items: [
-      {
-        label: 'New Product Category',
-        key: 'newProductCategory',
-        icon: <PlusIcon />
-      },
-      { type: 'divider' },
-      {
-        label: 'Reload List',
-        key: 'reloadList',
-        icon: <ReloadIcon />
-      }
-    ],
-    onClick: ({ key }) => {
-      if (key === 'reloadList') {
-        tableRef.current?.reload()
-      } else if (key === 'newProductCategory') {
-        setNewProductCategoryOpen(true)
-      }
-    }
-  }
-
-  return (
-    <>
-      <Flex vertical={'true'} gap='large' className='h-100'>
-        <Flex justify={'space-between'}>
-          <Space>
-            <Dropdown menu={actionItems}>
-              <Button>Actions</Button>
-            </Dropdown>
-            <ColumnViewButton
-              type='productCategory'
-              loading={false}
-              visibleState={columnVisibility}
-              updateVisibleState={setColumnVisibility}
-            />
-            <ExportListButton objectType='productCategory' />
-          </Space>
-          <Space>
-            <FilterSidebarButton
-              active={showFilterSidebar}
-              onClick={() => setShowFilterSidebar(!showFilterSidebar)}
-            />
-            <ObjectTableViewButton
-              viewMode={viewMode}
-              setViewMode={setViewMode}
-            />
-          </Space>
-        </Flex>
-
-        <ObjectTable
-          ref={tableRef}
-          type='productCategory'
-          cards={viewMode === 'cards'}
-          visibleColumns={columnVisibility}
-          showFilterSidebar={showFilterSidebar}
-        />
-
-        <Modal
-          open={newProductCategoryOpen}
-          footer={null}
-          width={700}
-          onCancel={() => {
-            setNewProductCategoryOpen(false)
-          }}
-        >
-          <NewProductCategory
-            onOk={() => {
-              setNewProductCategoryOpen(false)
-              tableRef.current?.reload()
-            }}
-            reset={newProductCategoryOpen}
-          />
-        </Modal>
-      </Flex>
-    </>
-  )
-}
-
-export default ProductCategories

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

@@ -1,68 +0,0 @@
-import PropTypes from 'prop-types'
-import ObjectInfo from '../../common/ObjectInfo'
-import NewObjectForm from '../../common/NewObjectForm'
-import WizardView from '../../common/WizardView'
-
-const NewProductCategory = ({ onOk }) => {
-  return (
-    <NewObjectForm type={'productCategory'}>
-      {({ handleSubmit, submitLoading, objectData, formValid }) => {
-        const steps = [
-          {
-            title: 'Required',
-            key: 'required',
-            content: (
-              <ObjectInfo
-                type='productCategory'
-                column={1}
-                bordered={false}
-                isEditing={true}
-                required={true}
-                objectData={objectData}
-              />
-            )
-          },
-          {
-            title: 'Summary',
-            key: 'summary',
-            content: (
-              <ObjectInfo
-                type='productCategory'
-                column={1}
-                bordered={false}
-                visibleProperties={{
-                  _id: false,
-                  createdAt: false,
-                  updatedAt: false
-                }}
-                isEditing={false}
-                objectData={objectData}
-              />
-            )
-          }
-        ]
-        return (
-          <WizardView
-            steps={steps}
-            loading={submitLoading}
-            formValid={formValid}
-            title='New Product Category'
-            onSubmit={async () => {
-              const result = await handleSubmit()
-              if (result) {
-                onOk()
-              }
-            }}
-          />
-        )
-      }}
-    </NewObjectForm>
-  )
-}
-
-NewProductCategory.propTypes = {
-  onOk: PropTypes.func.isRequired,
-  reset: PropTypes.bool
-}
-
-export default NewProductCategory

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

@@ -1,195 +0,0 @@
-import { useRef, useState } from 'react'
-import { useLocation } from 'react-router-dom'
-import { Space, Flex, Card } from 'antd'
-import useCollapseState from '../../hooks/useCollapseState'
-import NotesPanel from '../../common/NotesPanel'
-import InfoCollapse from '../../common/InfoCollapse'
-import ObjectInfo from '../../common/ObjectInfo'
-import ViewButton from '../../common/ViewButton'
-import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
-import NoteIcon from '../../../Icons/NoteIcon.jsx'
-import AuditLogIcon from '../../../Icons/AuditLogIcon.jsx'
-import ObjectForm from '../../common/ObjectForm'
-import EditButtons from '../../common/EditButtons'
-import LockIndicator from '../../common/LockIndicator.jsx'
-import ActionHandler from '../../common/ActionHandler.jsx'
-import ObjectActions from '../../common/ObjectActions.jsx'
-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 ScrollBox from '../../common/ScrollBox.jsx'
-
-const ProductCategoryInfo = () => {
-  const location = useLocation()
-  const objectFormRef = useRef(null)
-  const actionHandlerRef = useRef(null)
-  const productCategoryId = new URLSearchParams(location.search).get(
-    'productCategoryId'
-  )
-  const [collapseState, updateCollapseState] = useCollapseState(
-    'ProductCategoryInfo',
-    {
-      info: true,
-      notes: true,
-      auditLogs: true
-    }
-  )
-  const [objectFormState, setEditFormState] = useState({
-    isEditing: false,
-    editLoading: false,
-    formValid: false,
-    lock: null,
-    loading: false,
-    objectData: {}
-  })
-
-  const actions = {
-    edit: () => {
-      objectFormRef?.current?.startEditing?.()
-      return false
-    },
-    cancelEdit: () => {
-      objectFormRef?.current?.cancelEditing?.()
-      return true
-    },
-    finishEdit: () => {
-      objectFormRef?.current?.handleUpdate?.()
-      return true
-    },
-    delete: () => {
-      objectFormRef?.current?.handleDelete?.()
-      return true
-    }
-  }
-
-  return (
-    <>
-      <Flex
-        gap='large'
-        vertical='true'
-        style={{ maxHeight: '100%', minHeight: 0 }}
-      >
-        <Flex justify={'space-between'}>
-          <Space size='middle'>
-            <Space size='small'>
-              <ObjectActions
-                type='productCategory'
-                id={productCategoryId}
-                disabled={objectFormState.loading}
-                objectData={objectFormState.objectData}
-              />
-              <ViewButton
-                disabled={objectFormState.loading}
-                items={[
-                  { key: 'info', label: 'Product Category Information' },
-                  { key: 'notes', label: 'Notes' },
-                  { key: 'auditLogs', label: 'Audit Logs' }
-                ]}
-                visibleState={collapseState}
-                updateVisibleState={updateCollapseState}
-              />
-              <UserNotifierToggle
-                type='productCategory'
-                objectData={objectFormState.objectData}
-                disabled={objectFormState.loading}
-              />
-              <DocumentPrintButton
-                type='productCategory'
-                objectData={objectFormState.objectData}
-                disabled={objectFormState.loading}
-              />
-            </Space>
-            <LockIndicator lock={objectFormState.lock} />
-          </Space>
-          <Space>
-            <EditButtons
-              isEditing={objectFormState.isEditing}
-              handleUpdate={() => {
-                actionHandlerRef.current.callAction('finishEdit')
-              }}
-              cancelEditing={() => {
-                actionHandlerRef.current.callAction('cancelEdit')
-              }}
-              startEditing={() => {
-                actionHandlerRef.current.callAction('edit')
-              }}
-              editLoading={objectFormState.editLoading}
-              formValid={objectFormState.formValid}
-              disabled={objectFormState.lock?.locked || objectFormState.loading}
-              loading={objectFormState.editLoading}
-            />
-          </Space>
-        </Flex>
-        <ScrollBox>
-          <Flex vertical gap={'large'}>
-            <ActionHandler
-              actions={actions}
-              loading={objectFormState.loading}
-              ref={actionHandlerRef}
-            >
-              <InfoCollapse
-                title='Product Category Information'
-                icon={<InfoCircleIcon />}
-                active={collapseState.info}
-                onToggle={(expanded) => updateCollapseState('info', expanded)}
-                collapseKey='info'
-              >
-                <ObjectForm
-                  id={productCategoryId}
-                  type='productCategory'
-                  style={{ height: '100%' }}
-                  ref={objectFormRef}
-                  onStateChange={(state) => {
-                    setEditFormState((prev) => ({ ...prev, ...state }))
-                  }}
-                >
-                  {({ loading, isEditing, objectData }) => (
-                    <ObjectInfo
-                      loading={loading}
-                      isEditing={isEditing}
-                      type='productCategory'
-                      objectData={objectData}
-                    />
-                  )}
-                </ObjectForm>
-              </InfoCollapse>
-            </ActionHandler>
-            <InfoCollapse
-              title='Notes'
-              icon={<NoteIcon />}
-              active={collapseState.notes}
-              onToggle={(expanded) => updateCollapseState('notes', expanded)}
-              collapseKey='notes'
-            >
-              <Card>
-                <NotesPanel _id={productCategoryId} type='productCategory' />
-              </Card>
-            </InfoCollapse>
-            <InfoCollapse
-              title='Audit Logs'
-              icon={<AuditLogIcon />}
-              active={collapseState.auditLogs}
-              onToggle={(expanded) =>
-                updateCollapseState('auditLogs', expanded)
-              }
-              collapseKey='auditLogs'
-            >
-              {objectFormState.loading ? (
-                <InfoCollapsePlaceholder />
-              ) : (
-                <ObjectTable
-                  type='auditLog'
-                  masterFilter={{ 'parent._id': productCategoryId }}
-                  visibleColumns={{ _id: false, 'parent._id': false }}
-                />
-              )}
-            </InfoCollapse>
-          </Flex>
-        </ScrollBox>
-      </Flex>
-    </>
-  )
-}
-
-export default ProductCategoryInfo

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

@@ -47,6 +47,10 @@ const ProductSkuInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -46,6 +46,10 @@ const ProductInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.fetchObject?.()
+      return true
+    },
     newProductSku: () => {
       setNewProductSkuOpen(true)
       return true

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

@@ -45,6 +45,10 @@ const TaxRateInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -48,6 +48,10 @@ const TaxRecordInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -22,9 +22,6 @@ import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import NewAppPassword from '../AppPasswords/NewAppPassword.jsx'
-import ObjectProperty from '../../common/ObjectProperty.jsx'
-import { getModelProperty } from '../../../../database/ObjectModels.js'
-import { useMediaQuery } from 'react-responsive'
 
 const UserInfo = () => {
   const location = useLocation()
@@ -47,9 +44,12 @@ const UserInfo = () => {
     loading: false,
     objectData: {}
   })
-  const isMobile = useMediaQuery({ maxWidth: 768 })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     newAppPassword: () => {
       setNewAppPasswordOpen(true)
       return false
@@ -151,34 +151,13 @@ const UserInfo = () => {
                   }}
                 >
                   {({ loading, isEditing, objectData }) => (
-                    <Flex gap='large' vertical={isMobile}>
-                      <div
-                        style={
-                          isMobile
-                            ? { width: '100%' }
-                            : { width: '20%', maxWidth: '238px' }
-                        }
-                      >
-                        <Card styles={{ body: { padding: 18 } }}>
-                          <ObjectProperty
-                            {...getModelProperty('user', 'profileImage')}
-                            isEditing={isEditing}
-                            objectData={objectData}
-                            loading={loading}
-                          />
-                        </Card>
-                      </div>
                     <ObjectInfo
                       loading={loading}
                       indicator={<LoadingOutlined />}
                       isEditing={isEditing}
                       type='user'
                       objectData={objectData}
-                        visibleProperties={{
-                          profileImage: false
-                        }}
                     />
-                    </Flex>
                   )}
                 </ObjectForm>
               </InfoCollapse>

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

@@ -45,6 +45,10 @@ const VendorInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -20,8 +20,11 @@ import ActionHandler from '../../common/ActionHandler.jsx'
 import ObjectActions from '../../common/ObjectActions.jsx'
 import ObjectTable from '../../common/ObjectTable.jsx'
 import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
+import EyeIcon from '../../../Icons/EyeIcon.jsx'
 import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
 import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
+import MissingPlaceholder from '../../common/MissingPlaceholder.jsx'
+import FilePreview from '../../common/FilePreview.jsx'
 import ScrollBox from '../../common/ScrollBox.jsx'
 import { getModelProperty } from '../../../../database/ObjectModels.js'
 import PartIcon from '../../../Icons/PartIcon.jsx'
@@ -39,6 +42,7 @@ const GCodeFileInfo = () => {
     {
       info: true,
       parts: true,
+      preview: true,
       notes: true,
       auditLogs: true
     }
@@ -54,6 +58,10 @@ const GCodeFileInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false
@@ -92,6 +100,7 @@ const GCodeFileInfo = () => {
                 items={[
                   { key: 'info', label: 'GCode File Information' },
                   { key: 'parts', label: 'Parts' },
+                  { key: 'preview', label: 'GCode File Preview' },
                   { key: 'notes', label: 'Notes' },
                   { key: 'auditLogs', label: 'Audit Logs' }
                 ]}
@@ -187,6 +196,26 @@ const GCodeFileInfo = () => {
                           loading={loading}
                         />
                       </InfoCollapse>
+                      <InfoCollapse
+                        title='GCode File Preview'
+                        icon={<EyeIcon />}
+                        active={collapseState.preview}
+                        onToggle={(expanded) =>
+                          updateCollapseState('preview', expanded)
+                        }
+                        collapseKey='preview'
+                      >
+                        {objectData?.file?._id ? (
+                          <Card>
+                            <FilePreview
+                              file={objectData?.file}
+                              style={{ width: '100%', height: '100%' }}
+                            />
+                          </Card>
+                        ) : (
+                          <MissingPlaceholder message={'No file.'} />
+                        )}
+                      </InfoCollapse>
                     </Flex>
                   )
                 }}

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

@@ -1,140 +0,0 @@
-import { useRef, useState } from 'react'
-import { useLocation } from 'react-router-dom'
-import { Space, Flex, Card } from 'antd'
-import loglevel from 'loglevel'
-import config from '../../../../config.js'
-import useCollapseState from '../../hooks/useCollapseState.jsx'
-import NotesPanel from '../../common/NotesPanel.jsx'
-import InfoCollapse from '../../common/InfoCollapse.jsx'
-import ViewButton from '../../common/ViewButton.jsx'
-import NoteIcon from '../../../Icons/NoteIcon.jsx'
-import EyeIcon from '../../../Icons/EyeIcon.jsx'
-import ObjectForm from '../../common/ObjectForm.jsx'
-import LockIndicator from '../../common/LockIndicator.jsx'
-import ObjectActions from '../../common/ObjectActions.jsx'
-import ScrollBox from '../../common/ScrollBox.jsx'
-import FilePreview from '../../common/FilePreview.jsx'
-import MissingPlaceholder from '../../common/MissingPlaceholder.jsx'
-import InfoCollapsePlaceholder from '../../common/InfoCollapsePlaceholder.jsx'
-import DocumentPrintButton from '../../common/DocumentPrintButton.jsx'
-import UserNotifierToggle from '../../common/UserNotifierToggle.jsx'
-
-const log = loglevel.getLogger('GCodeFilePreview')
-log.setLevel(config.logLevel)
-
-const GCodeFilePreview = () => {
-  const location = useLocation()
-  const objectFormRef = useRef(null)
-  const gcodeFileId = new URLSearchParams(location.search).get('gcodeFileId')
-  const [collapseState, updateCollapseState] = useCollapseState(
-    'GCodeFilePreview',
-    {
-      preview: true,
-      notes: true
-    }
-  )
-
-  const [objectFormState, setEditFormState] = useState({
-    loading: false,
-    objectData: {},
-    lock: null
-  })
-
-  return (
-    <Flex
-      gap='large'
-      vertical='true'
-      style={{
-        maxHeight: '100%',
-        minHeight: 0
-      }}
-    >
-      <Flex justify={'space-between'}>
-        <Space size='middle'>
-          <Space size='small'>
-            <ObjectActions
-              type='gcodeFile'
-              id={gcodeFileId}
-              disabled={objectFormState.loading}
-              objectData={objectFormState.objectData}
-              visibleActions={{ edit: false }}
-            />
-            <ViewButton
-              disabled={objectFormState.loading}
-              items={[
-                { key: 'preview', label: 'GCode File Preview' },
-                { key: 'notes', label: 'Notes' }
-              ]}
-              visibleState={collapseState}
-              updateVisibleState={updateCollapseState}
-            />
-            <UserNotifierToggle
-              type='gcodeFile'
-              objectData={objectFormState.objectData}
-              disabled={objectFormState.loading}
-            />
-            <DocumentPrintButton
-              type='gcodeFile'
-              objectData={objectFormState.objectData}
-              disabled={objectFormState.loading}
-            />
-          </Space>
-          <LockIndicator lock={objectFormState.lock} />
-        </Space>
-      </Flex>
-
-      <ScrollBox>
-        <Flex vertical gap={'large'}>
-          <ObjectForm
-            id={gcodeFileId}
-            type='gcodeFile'
-            style={{ height: '100%' }}
-            ref={objectFormRef}
-            onStateChange={(state) => {
-              setEditFormState((prev) => ({ ...prev, ...state }))
-            }}
-          >
-            {({ loading, objectData }) => (
-              <InfoCollapse
-                title='GCode File Preview'
-                icon={<EyeIcon />}
-                active={collapseState.preview}
-                onToggle={(expanded) =>
-                  updateCollapseState('preview', expanded)
-                }
-                collapseKey='preview'
-              >
-                {loading ? (
-                  <InfoCollapsePlaceholder />
-                ) : objectData?.file?._id ? (
-                  <Card>
-                    <FilePreview
-                      file={objectData?.file}
-                      style={{ width: '100%', height: '72vh' }}
-                    />
-                  </Card>
-                ) : (
-                  <MissingPlaceholder message={'No file.'} />
-                )}
-              </InfoCollapse>
-            )}
-          </ObjectForm>
-
-          <InfoCollapse
-            title='Notes'
-            icon={<NoteIcon />}
-            active={collapseState.notes}
-            onToggle={(expanded) => updateCollapseState('notes', expanded)}
-            collapseKey='notes'
-          >
-            <Card>
-              <NotesPanel _id={gcodeFileId} type='gcodeFile' />
-            </Card>
-          </InfoCollapse>
-        </Flex>
-      </ScrollBox>
-    </Flex>
-  )
-}
-
-export default GCodeFilePreview

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

@@ -18,7 +18,7 @@ const NewGCodeFile = ({ onOk, defaultValues }) => {
         const steps = [
           {
             title: 'Upload',
-            key: 'upload',
+            key: 'uplaod',
             content: (
               <ObjectInfo
                 type='gcodeFile'
@@ -27,7 +27,7 @@ const NewGCodeFile = ({ onOk, defaultValues }) => {
                 isEditing={true}
                 required={true}
                 objectData={objectData}
-                visibleProperties={{ file: true }}
+                visibleProperties={{ name: false, filament: false }}
                 showLabels={false}
               />
             )
@@ -57,8 +57,6 @@ const NewGCodeFile = ({ onOk, defaultValues }) => {
                 bordered={false}
                 visibleProperties={{
                   _id: false,
-                  _reference: false,
-                  parts: false,
                   createdAt: false,
                   updatedAt: false,
                   startedAt: false

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

@@ -54,6 +54,10 @@ const JobInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -85,6 +85,10 @@ const ControlPrinter = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -48,6 +48,10 @@ const PrinterInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -42,6 +42,10 @@ const SubJobInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current.handleFetchObject()
+      return true
+    },
     edit: () => {
       objectFormRef?.current.startEditing()
       return false

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

@@ -45,6 +45,10 @@ const ClientInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false

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

@@ -55,6 +55,10 @@ const ListingVarientInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false
@@ -222,7 +226,7 @@ const ListingVarientInfo = () => {
           objectData={objectFormState.objectData}
           onOk={() => {
             setPublishOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
         />
       </Modal>
@@ -238,7 +242,7 @@ const ListingVarientInfo = () => {
           objectData={objectFormState.objectData}
           onOk={() => {
             setUnpublishOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
         />
       </Modal>

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

@@ -55,6 +55,10 @@ const ListingInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false
@@ -265,7 +269,7 @@ const ListingInfo = () => {
           objectData={objectFormState.objectData}
           onOk={() => {
             setPublishListingOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
             listingVarientsTableRef.current?.reload?.()
           }}
         />
@@ -282,7 +286,7 @@ const ListingInfo = () => {
           objectData={objectFormState.objectData}
           onOk={() => {
             setUnpublishListingOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
             listingVarientsTableRef.current?.reload?.()
           }}
         />

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

@@ -112,6 +112,10 @@ const MarketplaceInfo = () => {
   }
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       objectFormRef?.current?.startEditing?.()
       return false
@@ -291,7 +295,7 @@ const MarketplaceInfo = () => {
         <SyncListings
           onOk={() => {
             setSyncListingsOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -307,7 +311,7 @@ const MarketplaceInfo = () => {
         <SyncOrders
           onOk={() => {
             setSyncOrdersOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

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

@@ -71,6 +71,10 @@ const SalesOrderInfo = () => {
   })
 
   const actions = {
+    reload: () => {
+      objectFormRef?.current?.handleFetchObject?.()
+      return true
+    },
     edit: () => {
       orderItemsTableRef?.current?.startEditing?.()
       objectFormRef?.current?.startEditing?.()
@@ -420,7 +424,7 @@ const SalesOrderInfo = () => {
         <PostSalesOrder
           onOk={() => {
             setPostSalesOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -438,7 +442,7 @@ const SalesOrderInfo = () => {
         <ConfirmSalesOrder
           onOk={() => {
             setConfirmSalesOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />
@@ -456,7 +460,7 @@ const SalesOrderInfo = () => {
         <CancelSalesOrder
           onOk={() => {
             setCancelSalesOrderOpen(false)
-            objectFormRef?.current.handleFetchObject()
+            actions.reload()
           }}
           objectData={objectFormState.objectData}
         />

src/components/Dashboard/common/DashboardBreadcrumb.jsx

@@ -12,12 +12,10 @@ const breadcrumbNameMap = {
   developer: 'Developer',
   finance: 'Finance',
   sales: 'Sales',
-  productcategories: 'Product Categories',
   overview: 'Overview',
   info: 'Info',
   design: 'Design',
-  control: 'Control',
+  control: 'Control'
-  preview: 'Preview'
 }
 
 const mainSections = ['production', 'inventory', 'management', 'developer']

src/components/Dashboard/common/FileList.jsx

@@ -23,7 +23,6 @@ const FileList = ({
   showInfo = true,
   showDownload = true,
   defaultPreviewOpen = false,
-  minimal = false,
   card = true
 }) => {
   const { fetchFileContent, flushFile } = useContext(ApiServerContext)
@@ -79,7 +78,7 @@ const FileList = ({
           <Tag>{file.extension}</Tag>
         </Flex>
         <Flex gap={'small'} align='center'>
-          {showDownload && !minimal && (
+          {showDownload && (
             <Button
               icon={<DownloadIcon />}
               size='small'
@@ -87,7 +86,7 @@ const FileList = ({
               onClick={() => handleDownload(file)}
             />
           )}
-          {showPreview && !minimal && (
+          {showPreview && (
             <Button
               icon={previewOpen ? <EyeSlashIcon /> : <EyeIcon />}
               size='small'
@@ -101,7 +100,7 @@ const FileList = ({
               }}
             />
           )}
-          {showInfo && !minimal && (
+          {showInfo && (
             <Button
               icon={<InfoCircleIcon />}
               size='small'
@@ -111,7 +110,7 @@ const FileList = ({
               }}
             />
           )}
-          {editing && !minimal && (
+          {editing && (
             <Button
               icon={<BinIcon />}
               size='small'
@@ -121,7 +120,7 @@ const FileList = ({
           )}
         </Flex>
       </Flex>
-      {previewOpen && !minimal ? (
+      {previewOpen ? (
         <>
           <Divider style={{ marginTop: 0, marginBottom: card ? 0 : '4px' }} />
           <FilePreview file={file} style={{ width: '100%' }} />
@@ -175,8 +174,7 @@ FileList.propTypes = {
   showInfo: PropTypes.bool,
   showDownload: PropTypes.bool,
   defaultPreviewOpen: PropTypes.bool,
-  card: PropTypes.bool,
+  card: PropTypes.bool
-  minimal: PropTypes.bool
 }
 
 export default FileList

src/components/Dashboard/common/FileUpload.jsx

@@ -2,14 +2,7 @@ import { Upload, Button, Flex, Typography, Space, Progress, Card } from 'antd'
 import PropTypes from 'prop-types'
 import { ApiServerContext } from '../context/ApiServerContext'
 import UploadIcon from '../../Icons/UploadIcon'
-import {
+import { useContext, useState, useEffect } from 'react'
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-  useState
-} from 'react'
 import ObjectSelect from './ObjectSelect'
 import FileList from './FileList'
 import PlusIcon from '../../Icons/PlusIcon'
@@ -18,16 +11,6 @@ import FileIcon from '../../Icons/FileIcon'
 
 const { Text } = Typography
 
-const getFileIdentity = (value, multiple) => {
-  if (multiple) {
-    return Array.isArray(value)
-      ? value.map((file) => file?._id || file).join(',')
-      : ''
-  }
-
-  return value?._id || value || ''
-}
-
 const FileUpload = ({
   value,
   onChange,
@@ -40,11 +23,6 @@ const FileUpload = ({
   const { uploadFile } = useContext(ApiServerContext)
   const [uploading, setUploading] = useState(false)
   const [uploadProgress, setUploadProgress] = useState(0)
-  const onChangeRef = useRef(onChange)
-
-  useEffect(() => {
-    onChangeRef.current = onChange
-  }, [onChange])
 
   // Track current files using useState
   const [currentFiles, setCurrentFiles] = useState(() => {
@@ -57,34 +35,29 @@ const FileUpload = ({
 
   // Update currentFiles when value prop changes
   useEffect(() => {
-    setCurrentFiles((prev) => {
+    if (multiple) {
-      if (
+      setCurrentFiles(Array.isArray(value) ? value : [])
-        getFileIdentity(prev, multiple) === getFileIdentity(value, multiple)
+    } else {
-      ) {
+      setCurrentFiles(value || null)
-        return prev
     }
-
-      return multiple ? (Array.isArray(value) ? value : []) : value || null
-    })
   }, [value, multiple])
 
+  // Track if there are no items in the list
+  const [hasNoItems, setHasNoItems] = useState(false)
+
   // Track the selected file from ObjectSelect
   const [selectedFile, setSelectedFile] = useState(null)
 
-  const hasNoItems = useMemo(
+  // Update hasNoItems when currentFiles changes
-    () =>
+  useEffect(() => {
-      multiple
+    const noItems = multiple
       ? !currentFiles ||
         !Array.isArray(currentFiles) ||
         currentFiles.length === 0
-        : !currentFiles,
+      : !currentFiles
-    [currentFiles, multiple]
+    setHasNoItems(noItems)
-  )
+    onChange(currentFiles)
-
+  }, [currentFiles, multiple, onChange])
-  const updateCurrentFiles = useCallback((nextFiles) => {
-    setCurrentFiles(nextFiles)
-    onChangeRef.current?.(nextFiles)
-  }, [])
 
   const handleFileUpload = async (file) => {
     try {
@@ -97,10 +70,10 @@ const FileUpload = ({
         if (multiple) {
           // For multiple files, add to existing array
           const newFiles = [...currentFiles, uploadedFile]
-          updateCurrentFiles(newFiles)
+          setCurrentFiles(newFiles)
         } else {
           // For single file, replace the value
-          updateCurrentFiles(uploadedFile)
+          setCurrentFiles(uploadedFile)
         }
       }
     } catch (error) {
@@ -115,10 +88,10 @@ const FileUpload = ({
       if (multiple) {
         // For multiple files, add to existing array
         const newFiles = [...currentFiles, selectedFile]
-        updateCurrentFiles(newFiles)
+        setCurrentFiles(newFiles)
       } else {
         // For single file, replace the value
-        updateCurrentFiles(selectedFile)
+        setCurrentFiles(selectedFile)
       }
       // Clear the selection
       setSelectedFile(null)
@@ -137,7 +110,7 @@ const FileUpload = ({
   return (
     <Flex gap={'small'} vertical>
       {hasNoItems && uploading == false ? (
-        <Flex gap={'small'} align='center' wrap>
+        <Flex gap={'small'} align='center'>
           <Space.Compact style={{ flexGrow: 1 }}>
             <ObjectSelect
               type={'file'}
@@ -195,7 +168,7 @@ const FileUpload = ({
         showPreview={showPreview}
         defaultPreviewOpen={defaultPreviewOpen}
         onChange={(updatedFiles) => {
-          updateCurrentFiles(updatedFiles)
+          setCurrentFiles(updatedFiles)
         }}
       />
     </Flex>

src/components/Dashboard/common/GCodePreview.jsx

@@ -1,6 +1,6 @@
 import * as GCodePreview from 'gcode-preview'
 import PropTypes from 'prop-types'
-import { useCallback, useEffect, useRef } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import * as THREE from 'three'
 
 function GCodePreviewUI(props) {
@@ -14,19 +14,17 @@ function GCodePreviewUI(props) {
     style = {}
   } = props
   const canvasRef = useRef(null)
-  const previewRef = useRef(null)
+  const [preview, setPreview] = useState()
 
   const resizePreview = useCallback(() => {
-    previewRef.current?.resize()
+    preview?.resize()
-  }, [])
+  }, [preview])
 
   // Ex-ref methods removed; this component is now a regular functional component
 
   useEffect(() => {
-    if (!canvasRef.current) return
+    setPreview(
-
+      GCodePreview.init({
-    previewRef.current?.dispose?.()
-    previewRef.current = GCodePreview.init({
         canvas: canvasRef.current,
         startLayer,
         endLayer,
@@ -37,13 +35,12 @@ function GCodePreviewUI(props) {
         initialCameraPosition: [0, 400, 450],
         allowDragNDrop: false
       })
+    )
 
     window.addEventListener('resize', resizePreview)
 
     return () => {
       window.removeEventListener('resize', resizePreview)
-      previewRef.current?.dispose?.()
-      previewRef.current = null
     }
   }, [
     endLayer,
@@ -55,27 +52,18 @@ function GCodePreviewUI(props) {
   ])
 
   useEffect(() => {
-    let cancelled = false
-
     const loadFromSrc = async () => {
-      const preview = previewRef.current
       if (!src || !preview) return
       try {
         const response = await fetch(src)
         const text = await response.text()
-        if (cancelled || previewRef.current !== preview) return
         preview.processGCode(text)
       } catch (e) {
-        if (cancelled) return
         console.error('Failed to load G-code from src', e)
       }
     }
     loadFromSrc()
-
+  }, [src, preview])
-    return () => {
-      cancelled = true
-    }
-  }, [endLayer, lastSegmentColor, lineWidth, src, startLayer, topLayerColor])
 
   return <canvas ref={canvasRef} style={style}></canvas>
 }

src/components/Dashboard/common/NewObjectForm.jsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useContext, useCallback, useRef } from 'react'
+import { useState, useEffect, useContext, useCallback } from 'react'
 import { Form } from 'antd'
 import { ApiServerContext } from '../context/ApiServerContext'
 import { useMessageContext } from '../context/MessageContext'
@@ -38,35 +38,10 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
   const [submitLoading, setSubmitLoading] = useState(false)
   const [formValid, setFormValid] = useState(false)
   const [form] = Form.useForm()
-  const validationRunRef = useRef(0)
   const formUpdateValues = Form.useWatch([], form)
   const { showSuccess, showError: showMessageError } = useMessageContext()
   const { createObject, showError } = useContext(ApiServerContext)
 
-  const validateForm = useCallback(() => {
-    const validationRun = ++validationRunRef.current
-    let cancelled = false
-    const timeoutId = setTimeout(() => {
-      form
-        .validateFields({ validateOnly: true })
-        .then(() => {
-          if (!cancelled && validationRun === validationRunRef.current) {
-            setFormValid(true)
-          }
-        })
-        .catch(() => {
-          if (!cancelled && validationRun === validationRunRef.current) {
-            setFormValid(false)
-          }
-        })
-    }, 0)
-
-    return () => {
-      cancelled = true
-      clearTimeout(timeoutId)
-    }
-  }, [form])
-
   // Get the model definition for this object type
   const model = getModelByName(type)
 
@@ -166,15 +141,21 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
       const computedValuesObject = buildObjectFromEntries(computedEntries)
       const initialFormData = merge({}, defaultValues, computedValuesObject)
       form.setFieldsValue(initialFormData)
+      form
+        .validateFields({ validateOnly: true })
+        .then(() => setFormValid(true))
+        .catch(() => setFormValid(false))
       setObjectData((prev) => merge({}, prev, initialFormData))
-      return validateForm()
     }
-  }, [form, defaultValues, calculateComputedValues, model, validateForm])
+  }, [form, defaultValues, calculateComputedValues, model])
 
   // Validate form on change
   useEffect(() => {
-    return validateForm()
+    form
-  }, [validateForm, formUpdateValues])
+      .validateFields({ validateOnly: true })
+      .then(() => setFormValid(true))
+      .catch(() => setFormValid(false))
+  }, [form, formUpdateValues])
 
   const handleSubmit = async () => {
     try {
@@ -236,7 +217,7 @@ const NewObjectForm = ({ type, style, defaultValues = {}, children }) => {
       }}
     >
       {children({
-        submitLoading,
+        submitLoading: submitLoading,
         handleSubmit,
         form,
         formValid,

src/components/Dashboard/common/NoteItem.jsx

@@ -103,12 +103,13 @@ const NoteItem = ({
       if (isExpanded == true) {
         subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
           'note',
-          { 'parent._id': note._id },
+          (noteData) => {
-          () => {
+            if (noteData.parent._id == note._id) {
               if (isExpanded == true) {
                 handleNoteExpand()
               }
             }
+          }
         )
       } else {
         if (subscribeToObjectTypeUpdatesRef.current) {

src/components/Dashboard/common/NotesPanel.jsx

@@ -95,8 +95,11 @@ const NotesPanel = ({ _id, type }) => {
     if (connected == true && subscribeToObjectTypeUpdatesRef.current == null) {
       subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
         'note',
-        { 'parent._id': _id },
+        (noteData) => {
-        () => handleReloadData()
+          if (noteData.parent._id == _id) {
+            handleReloadData()
+          }
+        }
       )
     }
     return () => {

src/components/Dashboard/common/ObjectProperty.jsx

@@ -99,14 +99,6 @@ const ObjectProperty = ({
     value = value(objectData)
   }
 
-  if (max && typeof max == 'function' && objectData) {
-    max = max(objectData)
-  }
-
-  if (min && typeof min == 'function' && objectData) {
-    min = min(objectData)
-  }
-
   if (objectType && typeof objectType == 'function' && objectData) {
     objectType = objectType(objectData)
   }

src/components/Dashboard/common/ObjectSelect.jsx

@@ -17,8 +17,6 @@ import merge from 'lodash/merge'
 import { getModelProperty } from '../../../database/ObjectModels'
 const { SHOW_CHILD } = TreeSelect
 
-const EMPTY_OBJECT = {}
-
 // Helper to check if two values are equal (handling objects/ids)
 const areValuesEqual = (v1, v2) => {
   const id1 = v1 && typeof v1 === 'object' && v1._id ? v1._id : v1
@@ -30,11 +28,10 @@ const ObjectSelect = ({
   type = 'unknown',
   showSearch = false,
   multiple = false,
-  treeSelectProps = EMPTY_OBJECT,
+  treeSelectProps = {},
-  filter = EMPTY_OBJECT,
+  filter = {},
-  masterFilter = EMPTY_OBJECT,
+  masterFilter = {},
   value,
-  onChange,
   disabled = false,
   ...rest
 }) => {
@@ -58,6 +55,11 @@ const ObjectSelect = ({
   const prevValueRef = useRef(value)
   const isInternalChangeRef = useRef(false)
 
+  useEffect(() => {
+    console.log('type', type)
+    console.log('value', value)
+  }, [value, type])
+
   // Normalize a value to an identity string so we can detect in-place _id updates
   const getValueIdentity = useCallback((val) => {
     if (val && typeof val === 'object') {
@@ -357,15 +359,15 @@ const ObjectSelect = ({
             .filter(Boolean)
         }
         setTreeSelectValue(value)
-        onChange?.(selectedObjects)
+        if (rest.onChange) rest.onChange(selectedObjects)
       } else {
         // Single selection
         const selectedObject = objectList.find((obj) => obj._id === value)
         setTreeSelectValue(value)
-        onChange?.(selectedObject)
+        if (rest.onChange) rest.onChange(selectedObject)
       }
     },
-    [multiple, objectList, onChange]
+    [multiple, objectList, rest]
   )
 
   // Update treeData when objectPropertiesTree changes

src/components/Dashboard/common/ObjectTable.jsx

@@ -438,21 +438,9 @@ const ObjectTable = forwardRef(
     // Store the latest updateEventHandler in a ref
     updateEventHandlerRef.current = updateEventHandler
 
-    const newEventHandler = useCallback(
+    const newEventHandler = useCallback(() => {
-      (params) => {
-        logger.debug('New event handler:', params)
       reload()
-      },
+    }, [reload])
-      [reload]
-    )
-
-    const subscriptionFilter = useMemo(() => {
-      const active = {}
-      Object.entries(sidebarFilter).forEach(([k, v]) => {
-        if (v !== '' && v !== undefined) active[k] = v
-      })
-      return { ...active, ...masterFilter }
-    }, [sidebarFilter, masterFilter])
 
     // Subscribe to real-time updates for all items
     useEffect(() => {
@@ -525,28 +513,16 @@ const ObjectTable = forwardRef(
     }, [connected])
 
     useEffect(() => {
-      if (connected == true) {
+      if (
-        const unsubscribe = subscribeToObjectTypeUpdates(
+        connected == true &&
+        subscribeToObjectTypeUpdatesRef.current == null
+      ) {
+        subscribeToObjectTypeUpdatesRef.current = subscribeToObjectTypeUpdates(
           type,
-          subscriptionFilter,
           newEventHandler
         )
-        subscribeToObjectTypeUpdatesRef.current = unsubscribe
-
-        return () => {
-          if (unsubscribe) unsubscribe()
-          if (subscribeToObjectTypeUpdatesRef.current === unsubscribe) {
-            subscribeToObjectTypeUpdatesRef.current = null
       }
-        }
+    }, [type, subscribeToObjectTypeUpdates, connected, newEventHandler])
-      }
-    }, [
-      type,
-      subscriptionFilter,
-      subscribeToObjectTypeUpdates,
-      connected,
-      newEventHandler
-    ])
 
     const updateData = useCallback(
       (id, updatedData) => {
@@ -683,13 +659,11 @@ const ObjectTable = forwardRef(
         }
       })
 
-      console.log('filters--', filters)
-
       setSidebarFilter(next)
       setPages([])
       setLoading(true)
       loadPage(initialPage, getActiveFilter(next), {
-        field: sorter.columnKey,
+        field: sorter.field,
         order: sorter.order
       })
     }
@@ -880,20 +854,8 @@ const ObjectTable = forwardRef(
           style={{ overflowY: 'auto', maxHeight: adjustedScrollHeight }}
           ref={cardsContainerRef}
         >
-          {tableData.map((record) => {
+          {tableData.map((record) => (
-            if (record?._id == undefined) {
+            <Col xs={24} sm={12} md={12} lg={8} xl={6} xxl={6} key={record._id}>
-              return null
-            }
-            return (
-              <Col
-                xs={24}
-                sm={12}
-                md={12}
-                lg={8}
-                xl={6}
-                xxl={6}
-                key={record._id}
-              >
               <div style={{ width: '100%', overflow: 'hidden' }}>
                 <RowForm
                   record={record}
@@ -914,8 +876,7 @@ const ObjectTable = forwardRef(
                 </RowForm>
               </div>
             </Col>
-            )
+          ))}
-          })}
         </Row>
       )
     }

src/components/Dashboard/common/StateTag.jsx

@@ -136,10 +136,6 @@ const StateTag = ({ state, showBadge = true, style = {} }) => {
         status = 'cyan'
         text = 'Ordered'
         break
-      case 'posted':
-        status = 'magenta'
-        text = 'Posted'
-        break
       case 'received':
         status = 'success'
         text = 'Received'

src/components/Dashboard/context/ApiServerContext.jsx

@@ -17,7 +17,6 @@ import ExclamationOctagonIcon from '../../Icons/ExclamationOctagonIcon'
 import ReloadIcon from '../../Icons/ReloadIcon'
 import config from '../../../config'
 import loglevel from 'loglevel'
-import { getModelByName } from '../../../database/ObjectModels'
 const logger = loglevel.getLogger('ApiServerContext')
 logger.setLevel(config.logLevel)
 
@@ -26,35 +25,6 @@ const SPOTLIGHT_CACHE_TTL_MS = 10_000
 const spotlightCache = new Map()
 const runningSpotlightFetches = new Map()
 
-const stableStringify = (value) => {
-  if (Array.isArray(value)) {
-    return `[${value.map(stableStringify).join(',')}]`
-  }
-
-  if (value && typeof value === 'object') {
-    return `{${Object.keys(value)
-      .sort()
-      .map((key) => `${JSON.stringify(key)}:${stableStringify(value[key])}`)
-      .join(',')}}`
-  }
-
-  return JSON.stringify(value)
-}
-
-const getObjectTypeSubscriptionKey = (objectType, filter = {}) =>
-  `${objectType}:${stableStringify(filter || {})}`
-
-const getObjectTypeSubscriptionArgs = (filterOrCallback, callback) => {
-  if (typeof filterOrCallback === 'function') {
-    return { filter: {}, callback: filterOrCallback }
-  }
-
-  return { filter: filterOrCallback || {}, callback }
-}
-
-const getObjectEndpoint = (type) =>
-  getModelByName(type)?.endpoint || `${type.toLowerCase()}s`
-
 const ApiServerContext = createContext()
 
 const ApiServerProvider = ({ children }) => {
@@ -346,16 +316,12 @@ const ApiServerProvider = ({ children }) => {
   const handleObjectNew = async (data) => {
     logger.debug('Notifying object new:', data)
     const objectType = data.objectType || 'unknown'
-    const callbacksRefKey = getObjectTypeSubscriptionKey(
-      objectType,
-      data.filter || {}
-    )
 
-    if (objectType && subscribedCallbacksRef.current.has(callbacksRefKey)) {
+    if (objectType && subscribedCallbacksRef.current.has(objectType)) {
-      const callbacks = subscribedCallbacksRef.current.get(callbacksRefKey)
+      const callbacks = subscribedCallbacksRef.current.get(objectType)
       logger.debug(
         `Calling ${callbacks.length} callbacks for type:`,
-        callbacksRefKey
+        objectType
       )
       callbacks.forEach((callback) => {
         try {
@@ -366,7 +332,7 @@ const ApiServerProvider = ({ children }) => {
       })
     } else {
       logger.debug(
-        `No callbacks found for object: ${callbacksRefKey}, subscribed callbacks:`,
+        `No callbacks found for object: ${objectType}, subscribed callbacks:`,
         Array.from(subscribedCallbacksRef.current.keys())
       )
     }
@@ -375,16 +341,12 @@ const ApiServerProvider = ({ children }) => {
   const handleObjectDelete = async (data) => {
     logger.debug('Notifying object delete:', data)
     const objectType = data.objectType || 'unknown'
-    const callbacksRefKey = getObjectTypeSubscriptionKey(
-      objectType,
-      data.filter || {}
-    )
 
-    if (objectType && subscribedCallbacksRef.current.has(callbacksRefKey)) {
+    if (objectType && subscribedCallbacksRef.current.has(objectType)) {
-      const callbacks = subscribedCallbacksRef.current.get(callbacksRefKey)
+      const callbacks = subscribedCallbacksRef.current.get(objectType)
       logger.debug(
         `Calling ${callbacks.length} callbacks for type:`,
-        callbacksRefKey
+        objectType
       )
       callbacks.forEach((callback) => {
         try {
@@ -395,7 +357,7 @@ const ApiServerProvider = ({ children }) => {
       })
     } else {
       logger.debug(
-        `No callbacks found for object: ${callbacksRefKey}, subscribed callbacks:`,
+        `No callbacks found for object: ${objectType}, subscribed callbacks:`,
         Array.from(subscribedCallbacksRef.current.keys())
       )
     }
@@ -427,29 +389,24 @@ const ApiServerProvider = ({ children }) => {
     }
   }, [])
 
-  const offObjectTypeUpdatesEvent = useCallback(
+  const offObjectTypeUpdatesEvent = useCallback((objectType, callback) => {
-    (objectType, filter, callback) => {
     if (socketRef.current && socketRef.current.connected == true) {
-        const callbacksRefKey = getObjectTypeSubscriptionKey(objectType, filter)
       // Remove callback from the subscribed callbacks map
-        if (subscribedCallbacksRef.current.has(callbacksRefKey)) {
+      if (subscribedCallbacksRef.current.has(objectType)) {
         const callbacks = subscribedCallbacksRef.current
-            .get(callbacksRefKey)
+          .get(objectType)
           .filter((cb) => cb !== callback)
         if (callbacks.length === 0) {
-            subscribedCallbacksRef.current.delete(callbacksRefKey)
+          subscribedCallbacksRef.current.delete(objectType)
           socketRef.current.emit('unsubscribeObjectTypeUpdate', {
-              objectType: objectType,
+            objectType: objectType
-              filter: filter
           })
         } else {
-            subscribedCallbacksRef.current.set(callbacksRefKey, callbacks)
+          subscribedCallbacksRef.current.set(objectType, callbacks)
         }
       }
     }
-    },
+  }, [])
-    []
-  )
 
   const subscribeToObjectUpdates = useCallback(
     (id, objectType, callback) => {
@@ -514,46 +471,31 @@ const ApiServerProvider = ({ children }) => {
   }, [connected, userProfile?._id, subscribeToObjectUpdates, setUserProfile])
 
   const subscribeToObjectTypeUpdates = useCallback(
-    (objectType, filterOrCallback = {}, maybeCallback) => {
+    (objectType, callback) => {
-      const { filter, callback } = getObjectTypeSubscriptionArgs(
+      logger.debug('Subscribing to type updates:', objectType)
-        filterOrCallback,
-        maybeCallback
-      )
-      const callbacksRefKey = getObjectTypeSubscriptionKey(objectType, filter)
-
-      logger.debug('Subscribing to type updates:', objectType, filter)
       if (socketRef.current && socketRef.current.connected == true) {
         // Add callback to the subscribed callbacks map immediately
-        if (!subscribedCallbacksRef.current.has(callbacksRefKey)) {
+        if (!subscribedCallbacksRef.current.has(objectType)) {
-          subscribedCallbacksRef.current.set(callbacksRefKey, [])
+          subscribedCallbacksRef.current.set(objectType, [])
         }
+        subscribedCallbacksRef.current.get(objectType).push(callback)
+        logger.debug(
+          `Added callback for type ${objectType}, total callbacks: ${subscribedCallbacksRef.current.get(objectType).length}`
+        )
 
-        const callbacksLength =
-          subscribedCallbacksRef.current.get(callbacksRefKey).length
-
-        if (callbacksLength <= 0) {
         socketRef.current.emit(
           'subscribeToObjectTypeUpdate',
-            { objectType: objectType, filter: filter },
+          { objectType: objectType },
           (result) => {
             if (result.success) {
-                logger.info('Subscribed to objectType:', objectType, filter)
+              logger.info('Subscribed to objectType:', objectType)
             }
           }
         )
-        }
+        logger.debug('Registered type event listener for object:', objectType)
-
-        subscribedCallbacksRef.current.get(callbacksRefKey).push(callback)
-        logger.debug(
-          `Added callback for type ${callbacksRefKey}, total callbacks: ${callbacksLength + 1}`
-        )
-        logger.debug(
-          'Registered type event listener for object:',
-          callbacksRefKey
-        )
 
         // Return cleanup function
-        return () => offObjectTypeUpdatesEvent(objectType, filter, callback)
+        return () => offObjectTypeUpdatesEvent(objectType, callback)
       }
     },
     [offObjectTypeUpdatesEvent]
@@ -766,7 +708,7 @@ const ApiServerProvider = ({ children }) => {
 
   // Generalized fetchObject function
   const fetchObject = async (id, type) => {
-    const fetchUrl = `${config.backendUrl}/${getObjectEndpoint(type)}/${id}`
+    const fetchUrl = `${config.backendUrl}/${type}s/${id}`
     setFetchLoading(true)
     logger.debug('Fetching from ' + fetchUrl)
     try {
@@ -796,37 +738,21 @@ const ApiServerProvider = ({ children }) => {
       sorter = {},
       onDataChange
     } = params
-
-    let newFilter = { ...filter }
-
-    if (filter != null && Object.keys(filter).length > 0) {
-      const model = getModelByName(type)
-
-      for (const key of Object.keys(filter)) {
-        const property = model?.properties?.find((p) => p.name === key)
-        if (property && property.type === 'object') {
-          const value = filter[key]
-          newFilter[`${key}._id`] = value?._id ?? value
-          delete newFilter[key]
-        }
-      }
-    }
-
     logger.debug('Fetching table data from:', type, {
       page,
       limit,
-      newFilter,
+      filter,
       sorter
     })
 
     try {
       const response = await axios.get(
-        `${config.backendUrl}/${getObjectEndpoint(type)}`,
+        `${config.backendUrl}/${type.toLowerCase()}s`,
         {
           params: {
             page,
             limit,
-            ...newFilter,
+            ...filter,
             sort: sorter.field,
             order: sorter.order
           },
@@ -873,7 +799,7 @@ const ApiServerProvider = ({ children }) => {
 
     try {
       const response = await axios.get(
-        `${config.backendUrl}/${getObjectEndpoint(type)}/properties`,
+        `${config.backendUrl}/${type.toLowerCase()}s/properties`,
         {
           params: {
             ...Object.keys(filter).reduce((acc, key) => {
@@ -907,7 +833,7 @@ const ApiServerProvider = ({ children }) => {
 
   // Update filament information
   const updateObject = async (id, type, value) => {
-    const updateUrl = `${config.backendUrl}/${getObjectEndpoint(type)}/${id}`
+    const updateUrl = `${config.backendUrl}/${type.toLowerCase()}s/${id}`
     logger.debug('Updating info for ' + id)
     try {
       const response = await axios.put(updateUrl, value, {
@@ -929,7 +855,7 @@ const ApiServerProvider = ({ children }) => {
 
   // Update multiple objects
   const updateMultipleObjects = async (type, objects) => {
-    const updateUrl = `${config.backendUrl}/${getObjectEndpoint(type)}`
+    const updateUrl = `${config.backendUrl}/${type.toLowerCase()}s`
     logger.debug('Updating multiple objects for ' + type)
     try {
       const response = await axios.put(updateUrl, objects, {
@@ -951,7 +877,7 @@ const ApiServerProvider = ({ children }) => {
 
   // Update filament information
   const deleteObject = async (id, type) => {
-    const deleteUrl = `${config.backendUrl}/${getObjectEndpoint(type)}/${id}`
+    const deleteUrl = `${config.backendUrl}/${type.toLowerCase()}s/${id}`
     logger.debug('Deleting object ID: ' + id)
     try {
       const response = await axios.delete(deleteUrl, {
@@ -973,7 +899,7 @@ const ApiServerProvider = ({ children }) => {
 
   // Update filament information
   const createObject = async (type, value) => {
-    const createUrl = `${config.backendUrl}/${getObjectEndpoint(type)}`
+    const createUrl = `${config.backendUrl}/${type.toLowerCase()}s`
     logger.debug('Creating object...')
     try {
       const response = await axios.post(createUrl, value, {
@@ -994,7 +920,7 @@ const ApiServerProvider = ({ children }) => {
 
   // Call a function on an object
   const sendObjectFunction = async (id, type, functionName, value = {}) => {
-    const url = `${config.backendUrl}/${getObjectEndpoint(type)}/${id}/${functionName}`
+    const url = `${config.backendUrl}/${type.toLowerCase()}s/${id}/${functionName}`
     logger.debug(`Calling object function ${functionName} for ${id} at ${url}`)
     try {
       const response = await axios.post(url, value, {
@@ -1014,7 +940,7 @@ const ApiServerProvider = ({ children }) => {
   }
 
   const getObjectFunction = async (id, type, functionName, params = {}) => {
-    const url = `${config.backendUrl}/${getObjectEndpoint(type)}/${id}/${functionName}`
+    const url = `${config.backendUrl}/${type.toLowerCase()}s/${id}/${functionName}`
     logger.debug(`Fetching object function ${functionName} for ${id} at ${url}`)
     try {
       const response = await axios.get(url, {
@@ -1239,7 +1165,7 @@ const ApiServerProvider = ({ children }) => {
       if (objectType === 'history') {
         statsUrl = `${config.backendUrl}/stats/history`
       } else {
-        statsUrl = `${config.backendUrl}/${getObjectEndpoint(objectType)}/stats`
+        statsUrl = `${config.backendUrl}/${objectType.toLowerCase()}s/stats`
       }
 
       const response = await axios.get(statsUrl, {
@@ -1264,7 +1190,7 @@ const ApiServerProvider = ({ children }) => {
     const encodedStartDate = encodeURIComponent(startDate.toISOString())
     const encodedEndDate = encodeURIComponent(endDate.toISOString())
     try {
-      const historyUrl = `${config.backendUrl}/${getObjectEndpoint(objectType)}/history?from=${encodedStartDate}&to=${encodedEndDate}`
+      const historyUrl = `${config.backendUrl}/${objectType.toLowerCase()}s/history?from=${encodedStartDate}&to=${encodedEndDate}`
 
       const response = await axios.get(historyUrl, {
         headers: {

src/components/Icons/ProductCategoryIcon.jsx

@@ -1,8 +0,0 @@
-import Icon from '@ant-design/icons'
-import CustomIconSvg from '../../../assets/icons/productcategoryicon.svg?react'
-
-const ProductCategoryIcon = (props) => (
-  <Icon component={CustomIconSvg} {...props} />
-)
-
-export default ProductCategoryIcon

src/database/ObjectModels.js

@@ -7,7 +7,6 @@ import { Spool } from './models/Spool'
 import { GCodeFile } from './models/GCodeFile'
 import { Job } from './models/Job'
 import { Product } from './models/Product'
-import { ProductCategory } from './models/ProductCategory'
 import { ProductSku } from './models/ProductSku'
 import { Part } from './models/Part.js'
 import { PartSku } from './models/PartSku.js'
@@ -57,7 +56,6 @@ export const objectModels = [
   GCodeFile,
   Job,
   Product,
-  ProductCategory,
   ProductSku,
   Part,
   PartSku,
@@ -108,7 +106,6 @@ export {
   GCodeFile,
   Job,
   Product,
-  ProductCategory,
   ProductSku,
   Part,
   PartSku,

src/database/models/AppPassword.js

@@ -1,5 +1,6 @@
 import AppPasswordIcon from '../../components/Icons/AppPasswordIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
@@ -20,6 +21,13 @@ export const AppPassword = {
       url: (_id) =>
         `/dashboard/management/apppasswords/info?appPasswordId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/apppasswords/info?appPasswordId=${_id}&action=reload`
+    },
 
     {
       name: 'edit',

src/database/models/Client.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const Client = {
@@ -19,6 +20,13 @@ export const Client = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/sales/clients/info?clientId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/sales/clients/info?clientId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/Courier.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const Courier = {
@@ -19,6 +20,13 @@ export const Courier = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/couriers/info?courierId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/couriers/info?courierId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/CourierService.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const CourierService = {
@@ -20,6 +21,13 @@ export const CourierService = {
       url: (_id) =>
         `/dashboard/management/courierservices/info?courierServiceId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/courierservices/info?courierServiceId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/DocumentJob.js

@@ -1,4 +1,5 @@
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
@@ -21,6 +22,13 @@ export const DocumentJob = {
         `/dashboard/management/documentjobs/info?documentJobId=${_id}`
     },
 
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/documentjobs/info?documentJobId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/DocumentPrinter.js

@@ -1,4 +1,5 @@
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import DocumentPrinterIcon from '../../components/Icons/DocumentPrinterIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
@@ -20,6 +21,13 @@ export const DocumentPrinter = {
         `/dashboard/management/documentprinters/info?documentPrinterId=${_id}`
     },
 
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/documentprinters/info?documentPrinterId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/DocumentSize.js

@@ -1,4 +1,5 @@
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
@@ -20,6 +21,13 @@ export const DocumentSize = {
         `/dashboard/management/documentsizes/info?documentSizeId=${_id}`
     },
 
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/documentsizes/info?documentSizeId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/DocumentTemplate.js

@@ -1,4 +1,5 @@
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
@@ -29,6 +30,13 @@ export const DocumentTemplate = {
         `/dashboard/management/documenttemplates/info?documentTemplateId=${_id}`
     },
 
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/documenttemplates/info?documentTemplateId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/Filament.js

@@ -1,6 +1,7 @@
 import EditIcon from '../../components/Icons/EditIcon'
 import FilamentIcon from '../../components/Icons/FilamentIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
 import PlusIcon from '../../components/Icons/PlusIcon'
@@ -20,6 +21,13 @@ export const Filament = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/filaments/info?filamentId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/filaments/info?filamentId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/FilamentSku.js

@@ -4,6 +4,7 @@ import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
 import BinIcon from '../../components/Icons/BinIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 
 export const FilamentSku = {
   name: 'filamentSku',
@@ -20,6 +21,13 @@ export const FilamentSku = {
       url: (_id) =>
         `/dashboard/management/filamentskus/info?filamentSkuId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/filamentskus/info?filamentSkuId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',
@@ -94,7 +102,6 @@ export const FilamentSku = {
     'createdAt',
     'updatedAt'
   ],
-  group: ['filament'],
   properties: [
     {
       name: '_id',

src/database/models/FilamentStock.js

@@ -22,15 +22,14 @@ export const FilamentStock = {
     'state',
     'currentWeight',
     'startingWeight',
-    'filament',
     'filamentSku',
     'stockLocation',
     'createdAt',
     'updatedAt'
   ],
-  filters: ['_id', 'filament', 'filament._id', 'filamentSku', 'filamentSku._id'],
+  filters: ['_id'],
-  sorters: ['createdAt', 'updatedAt', 'filament', 'filamentSku'],
+  sorters: ['createdAt', 'updatedAt'],
-  group: ['filament', 'filamentSku'],
+  group: ['filamentSku'],
   properties: [
     {
       name: '_id',
@@ -72,17 +71,6 @@ export const FilamentStock = {
       readOnly: true,
       columnWidth: 175
     },
-    {
-      name: 'filament',
-      label: 'Filament',
-      type: 'object',
-      value: null,
-      objectType: 'filament',
-      required: true,
-      showHyperlink: true,
-      columnWidth: 200,
-      initial: true
-    },
     {
       name: 'filamentSku',
       label: 'Filament SKU',
@@ -92,12 +80,7 @@ export const FilamentStock = {
       initial: true,
       required: true,
       showHyperlink: true,
-      columnWidth: 200,
+      columnWidth: 200
-      masterFilter: (objectData) => {
-        return {
-          filament: objectData?.filament?._id
-        }
-      }
     },
     {
       name: 'stockLocation',

src/database/models/File.js

@@ -4,6 +4,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const File = {
@@ -20,6 +21,13 @@ export const File = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/files/info?fileId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/files/info?fileId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',
@@ -70,15 +78,7 @@ export const File = {
     }
   ],
   url: (id) => `/dashboard/management/files/info?fileId=${id}`,
-  columns: [
+  columns: ['_reference', 'name', 'type', 'size', 'temp', 'createdAt'],
-    '_reference',
-    'name',
-    'type',
-    'size',
-    'temp',
-    'createdAt',
-    'updatedAt'
-  ],
   filters: ['name', '_id', 'type', 'temp'],
   sorters: ['name', 'type', 'size', 'createdAt', 'temp'],
   group: ['type'],
@@ -129,7 +129,7 @@ export const File = {
       type: 'text',
       readOnly: true,
       required: true,
-      columnWidth: 190
+      columnWidth: 120
     },
     {
       name: 'size',

src/database/models/GCodeFile.js

@@ -4,7 +4,7 @@ import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
 import GCodeFileIcon from '../../components/Icons/GCodeFileIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
-import EyeIcon from '../../components/Icons/EyeIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 
 export const GCodeFile = {
   name: 'gcodeFile',
@@ -12,14 +12,6 @@ export const GCodeFile = {
   prefix: 'GCF',
   icon: GCodeFileIcon,
   actions: [
-    {
-      name: 'preview',
-      label: 'Preview',
-      row: true,
-      icon: EyeIcon,
-      url: (_id) =>
-        `/dashboard/production/gcodefiles/preview?gcodeFileId=${_id}`
-    },
     {
       name: 'info',
       label: 'Info',
@@ -28,6 +20,13 @@ export const GCodeFile = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/production/gcodefiles/info?gcodeFileId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/production/gcodefiles/info?gcodeFileId=${_id}&action=reload`
+    },
     {
       name: 'download',
       label: 'Download',
@@ -72,7 +71,6 @@ export const GCodeFile = {
   columns: [
     '_reference',
     'name',
-    'filament',
     'filamentSku',
     'cost',
     'gcodeFileInfo.estimatedPrintingTimeNormalMode',
@@ -82,24 +80,9 @@ export const GCodeFile = {
     'gcodeFileInfo.hotPlateTemp',
     'updatedAt'
   ],
-  filters: [
+  filters: ['_id', 'name', 'cost', 'updatedAt'],
-    '_id',
+  sorters: ['name', 'cost', 'createdAt', 'updatedAt'],
-    'name',
+  group: ['filamentSku'],
-    'filament',
-    'filament._id',
-    'filamentSku',
-    'cost',
-    'updatedAt'
-  ],
-  sorters: [
-    'name',
-    'filament',
-    'filamentSku',
-    'cost',
-    'createdAt',
-    'updatedAt'
-  ],
-  group: ['filament', 'filamentSku'],
   properties: [
     {
       name: '_id',
@@ -156,16 +139,6 @@ export const GCodeFile = {
       filter: ['.gcode', '.g'],
       columnWidth: 200
     },
-    {
-      name: 'filament',
-      label: 'Filament',
-      type: 'object',
-      value: null,
-      objectType: 'filament',
-      required: true,
-      showHyperlink: true,
-      columnWidth: 200
-    },
     {
       name: 'filamentSku',
       label: 'Filament SKU',
@@ -174,12 +147,7 @@ export const GCodeFile = {
       objectType: 'filamentSku',
       required: true,
       showHyperlink: true,
-      columnWidth: 200,
+      columnWidth: 200
-      masterFilter: (objectData) => {
-        return {
-          filament: objectData?.filament?._id
-        }
-      }
     },
     {
       name: 'cost',
@@ -188,9 +156,9 @@ export const GCodeFile = {
       roundNumber: 2,
       value: (objectData) => {
         const fs = objectData?.filamentSku
-        const costPerKg = fs?.overrideCost ? fs?.cost : fs?.filament?.cost
+        const costPerKg =
-        if (!costPerKg || !objectData?.file?.metaData?.filamentUsedG)
+          fs?.overrideCost ? fs?.cost : fs?.filament?.cost
-          return undefined
+        if (!costPerKg || !objectData?.file?.metaData?.filamentUsedG) return undefined
         return objectData.file.metaData.filamentUsedG * (costPerKg / 1000)
       },
       readOnly: true,
@@ -270,7 +238,6 @@ export const GCodeFile = {
       label: 'Parts',
       type: 'objectChildren',
       objectType: 'part',
-      size: 'medium',
       properties: [
         {
           name: 'part',

src/database/models/Host.js

@@ -1,9 +1,9 @@
 import HostIcon from '../../components/Icons/HostIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
-import BinIcon from '../../components/Icons/BinIcon'
 import OTPIcon from '../../components/Icons/OTPIcon'
 
 export const Host = {
@@ -21,6 +21,13 @@ export const Host = {
       url: (_id) => `/dashboard/management/hosts/info?hostId=${_id}`
     },
 
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/hosts/info?hostId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',
@@ -61,14 +68,6 @@ export const Host = {
       icon: OTPIcon,
       url: (_id) =>
         `/dashboard/management/hosts/info?hostId=${_id}&action=hostOTP`
-    },
-    {
-      name: 'delete',
-      label: 'Delete',
-      icon: BinIcon,
-      danger: true,
-      url: (_id) =>
-        `/dashboard/management/hosts/info?hostId=${_id}&action=delete`
     }
   ],
   columns: ['_reference', 'name', 'state', 'tags', 'connectedAt'],

src/database/models/Job.js

@@ -1,5 +1,6 @@
 import JobIcon from '../../components/Icons/JobIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import dayjs from 'dayjs'
 
@@ -29,6 +30,12 @@ export const Job = {
         return objectData?.state?.type != 'draft'
       }
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) => `/dashboard/production/jobs/info?jobId=${_id}&action=reload`
+    }
   ],
   columns: ['_reference', 'quantity', 'state', 'gcodeFile', 'createdAt'],
   filters: ['state', '_id', 'gcodeFile', 'quantity'],

src/database/models/Listing.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 import PlusIcon from '../../components/Icons/PlusIcon'
 
@@ -20,6 +21,13 @@ export const Listing = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/sales/listings/info?listingId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/sales/listings/info?listingId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/ListingVarient.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const ListingVarient = {
@@ -19,6 +20,13 @@ export const ListingVarient = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/sales/listingvarients/info?listingVarientId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/sales/listingvarients/info?listingVarientId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/Marketplace.js

@@ -21,6 +21,13 @@ export const Marketplace = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/sales/marketplaces/info?marketplaceId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/sales/marketplaces/info?marketplaceId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/Material.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const Material = {
@@ -19,6 +20,13 @@ export const Material = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/materials/info?materialId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/materials/info?materialId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/NoteType.js

@@ -1,5 +1,6 @@
 import NoteTypeIcon from '../../components/Icons/NoteTypeIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
@@ -18,6 +19,13 @@ export const NoteType = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/notetypes/info?noteTypeId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/notetypes/info?noteTypeId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/OrderItem.js

@@ -230,7 +230,7 @@ export const OrderItem = {
     },
     {
       name: 'sku',
-      label: 'Item SKU',
+      label: 'SKU',
       type: 'object',
       objectType: (objectData) => {
         if (objectData?.itemType === 'filament') return 'filamentSku'
@@ -238,9 +238,11 @@ export const OrderItem = {
         if (objectData?.itemType === 'product') return 'productSku'
         return undefined
       },
-      required: true,
+      required: false,
       showHyperlink: true,
       columnWidth: 300,
+      visible: (objectData) =>
+        ['filament', 'part', 'product'].includes(objectData?.itemType),
       masterFilter: (objectData) => {
         console.log(objectData)
         if (objectData?.itemType === 'filament' && objectData?.item?._id) {

src/database/models/Part.js

@@ -1,6 +1,7 @@
 import EditIcon from '../../components/Icons/EditIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import PartIcon from '../../components/Icons/PartIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
 import PlusIcon from '../../components/Icons/PlusIcon'
@@ -19,6 +20,13 @@ export const Part = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/parts/info?partId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/parts/info?partId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/PartSku.js

@@ -4,6 +4,7 @@ import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
 import BinIcon from '../../components/Icons/BinIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 
 export const PartSku = {
   name: 'partSku',
@@ -19,6 +20,13 @@ export const PartSku = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/partskus/info?partSkuId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/partskus/info?partSkuId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/Printer.js

@@ -26,6 +26,13 @@ export const Printer = {
       url: (_id) => `/dashboard/production/printers/info?printerId=${_id}`
     },
 
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/production/printers/info?printerId=${_id}&action=reload`
+    },
     {
       name: 'control',
       label: 'Control',

src/database/models/Product.js

@@ -1,5 +1,6 @@
 import ProductIcon from '../../components/Icons/ProductIcon'
 import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
@@ -19,6 +20,13 @@ export const Product = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/products/info?productId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/products/info?productId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',
@@ -68,7 +76,6 @@ export const Product = {
   columns: [
     '_reference',
     'name',
-    'productCategory',
     'tags',
     'vendor',
     'cost',
@@ -78,30 +85,8 @@ export const Product = {
     'createdAt',
     'updatedAt'
   ],
-  filters: [
+  filters: ['_id', 'name', 'type', 'color', 'vendor', 'cost', 'costWithTax', 'price', 'priceWithTax'],
-    '_id',
+  sorters: ['name', 'createdAt', 'type', 'vendor', 'cost', 'costWithTax', 'price', 'priceWithTax', 'updatedAt'],
-    'name',
-    'productCategory',
-    'type',
-    'color',
-    'vendor',
-    'cost',
-    'costWithTax',
-    'price',
-    'priceWithTax'
-  ],
-  sorters: [
-    'name',
-    'productCategory',
-    'createdAt',
-    'type',
-    'vendor',
-    'cost',
-    'costWithTax',
-    'price',
-    'priceWithTax',
-    'updatedAt'
-  ],
   properties: [
     {
       name: '_id',
@@ -143,15 +128,6 @@ export const Product = {
       readOnly: true,
       columnWidth: 175
     },
-    {
-      name: 'productCategory',
-      label: 'Product Category',
-      required: true,
-      type: 'object',
-      objectType: 'productCategory',
-      showHyperlink: true,
-      columnWidth: 200
-    },
     {
       name: 'vendor',
       label: 'Vendor',

src/database/models/ProductCategory.js

@@ -1,113 +0,0 @@
-import ProductCategoryIcon from '../../components/Icons/ProductCategoryIcon'
-import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
-import EditIcon from '../../components/Icons/EditIcon'
-import CheckIcon from '../../components/Icons/CheckIcon'
-import XMarkIcon from '../../components/Icons/XMarkIcon'
-import BinIcon from '../../components/Icons/BinIcon'
-
-export const ProductCategory = {
-  name: 'productCategory',
-  label: 'Product Category',
-  prefix: 'PCG',
-  endpoint: 'productcategories',
-  icon: ProductCategoryIcon,
-  actions: [
-    {
-      name: 'info',
-      label: 'Info',
-      default: true,
-      row: true,
-      icon: InfoCircleIcon,
-      url: (_id) =>
-        `/dashboard/management/productcategories/info?productCategoryId=${_id}`
-    },
-    {
-      name: 'edit',
-      label: 'Edit',
-      row: true,
-      icon: EditIcon,
-      url: (_id) =>
-        `/dashboard/management/productcategories/info?productCategoryId=${_id}&action=edit`,
-      visible: (objectData) => {
-        return !(objectData?._isEditing && objectData?._isEditing == true)
-      }
-    },
-    {
-      name: 'finishEdit',
-      label: 'Save Edits',
-      icon: CheckIcon,
-      url: (_id) =>
-        `/dashboard/management/productcategories/info?productCategoryId=${_id}&action=finishEdit`,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
-    {
-      name: 'cancelEdit',
-      label: 'Cancel Edits',
-      icon: XMarkIcon,
-      url: (_id) =>
-        `/dashboard/management/productcategories/info?productCategoryId=${_id}&action=cancelEdit`,
-      visible: (objectData) => {
-        return objectData?._isEditing && objectData?._isEditing == true
-      }
-    },
-    { type: 'divider' },
-    {
-      name: 'delete',
-      label: 'Delete',
-      icon: BinIcon,
-      danger: true,
-      url: (_id) =>
-        `/dashboard/management/productcategories/info?productCategoryId=${_id}&action=delete`
-    }
-  ],
-  url: (id) =>
-    `/dashboard/management/productcategories/info?productCategoryId=${id}`,
-  columns: ['_reference', 'name', 'createdAt', 'updatedAt'],
-  filters: ['_id', 'name'],
-  sorters: ['name', 'createdAt', 'updatedAt', '_id'],
-  properties: [
-    {
-      name: '_id',
-      label: 'ID',
-      columnFixed: 'left',
-      type: 'id',
-      objectType: 'productCategory',
-      showCopy: true,
-      readOnly: true,
-      columnWidth: 140
-    },
-    {
-      name: 'createdAt',
-      label: 'Created At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 175
-    },
-    {
-      name: '_reference',
-      label: 'Reference',
-      type: 'reference',
-      columnFixed: 'left',
-      objectType: 'productCategory',
-      showCopy: true,
-      readOnly: true
-    },
-    {
-      name: 'name',
-      label: 'Name',
-      columnFixed: 'left',
-      required: true,
-      type: 'text',
-      columnWidth: 200
-    },
-    {
-      name: 'updatedAt',
-      label: 'Updated At',
-      type: 'dateTime',
-      readOnly: true,
-      columnWidth: 175
-    }
-  ]
-}

src/database/models/ProductSku.js

@@ -4,6 +4,7 @@ import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
 import BinIcon from '../../components/Icons/BinIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 
 export const ProductSku = {
   name: 'productSku',
@@ -19,6 +20,13 @@ export const ProductSku = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/productskus/info?productSkuId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/productskus/info?productSkuId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',

src/database/models/PurchaseOrder.js

@@ -172,26 +172,8 @@ export const PurchaseOrder = {
     }
   ],
   group: ['vendor'],
-  filters: [
+  filters: ['vendor'],
-    'vendor',
+  sorters: ['createdAt', 'state', 'updatedAt'],
-    'totalAmount',
-    'totalAmountWithTax',
-    'totalTaxAmount',
-    'shippingAmount',
-    'shippingAmountWithTax',
-    'grandTotalAmount'
-  ],
-  sorters: [
-    'createdAt',
-    'state',
-    'updatedAt',
-    'totalAmount',
-    'totalAmountWithTax',
-    'totalTaxAmount',
-    'shippingAmount',
-    'shippingAmountWithTax',
-    'grandTotalAmount'
-  ],
   columns: [
     '_reference',
     'state',
@@ -278,7 +260,7 @@ export const PurchaseOrder = {
       prefix: '£',
       roundNumber: 2,
       readOnly: true,
-      columnWidth: 185
+      columnWidth: 175
     },
     {
       name: 'completedAt',
@@ -293,7 +275,7 @@ export const PurchaseOrder = {
       type: 'number',
       prefix: '£',
       readOnly: true,
-      columnWidth: 215,
+      columnWidth: 175,
       roundNumber: 2
     },
     {
@@ -303,7 +285,7 @@ export const PurchaseOrder = {
       prefix: '£',
       roundNumber: 2,
       readOnly: true,
-      columnWidth: 190
+      columnWidth: 150
     },
     {
       name: 'shippingAmountWithTax',
@@ -312,7 +294,7 @@ export const PurchaseOrder = {
       prefix: '£',
       readOnly: true,
       roundNumber: 2,
-      columnWidth: 240
+      columnWidth: 200
     },
     {
       name: 'totalAmount',
@@ -321,7 +303,7 @@ export const PurchaseOrder = {
       prefix: '£',
       roundNumber: 2,
       readOnly: true,
-      columnWidth: 170
+      columnWidth: 150
     },
     {
       name: 'grandTotalAmount',
@@ -329,7 +311,7 @@ export const PurchaseOrder = {
       type: 'number',
       prefix: '£',
       roundNumber: 2,
-      columnWidth: 215,
+      columnWidth: 175,
       readOnly: true
     }
   ],

src/database/models/SalesOrder.js

@@ -170,7 +170,7 @@ export const SalesOrder = {
       }
     }
   ],
-  group: ['client'],
+  group: ['client', 'marketplace'],
   filters: ['client', 'marketplace'],
   sorters: ['createdAt', 'state', 'updatedAt'],
   columns: [

src/database/models/StockTransfer.js

@@ -85,9 +85,9 @@ export const StockTransfer = {
     }
   ],
   url: (id) => `/dashboard/inventory/stocktransfers/info?stockTransferId=${id}`,
-  filters: ['_id', 'name', 'state'],
+  filters: ['_id', 'state'],
-  sorters: ['name', 'createdAt', 'postedAt'],
+  sorters: ['createdAt', 'postedAt'],
-  columns: ['_reference', 'name', 'state', 'postedAt', 'createdAt', 'updatedAt'],
+  columns: ['_reference', 'state', 'postedAt', 'createdAt', 'updatedAt'],
   properties: [
     {
       name: '_id',
@@ -114,14 +114,6 @@ export const StockTransfer = {
       showCopy: true,
       readOnly: true
     },
-    {
-      name: 'name',
-      label: 'Name',
-      type: 'text',
-      required: true,
-      columnWidth: 220,
-      columnFixed: 'left'
-    },
     {
       name: 'state',
       label: 'State',
@@ -185,38 +177,6 @@ export const StockTransfer = {
           suffix: (row) =>
             row?.fromStockType === 'filamentStock' ? 'g net' : null
         },
-        {
-          name: 'available',
-          label: 'Available',
-          type: 'number',
-          readOnly: true,
-          columnWidth: 140,
-          value: (row) => {
-            if (row?.fromStockType === 'filamentStock') {
-              return row?.fromStock?.currentWeight?.net ?? 0
-            } else {
-              return row?.fromStock?.currentQuantity ?? 0
-            }
-          },
-          suffix: (row) =>
-            row?.fromStockType === 'filamentStock' ? 'g net' : null
-        },
-        {
-          name: 'remaining',
-          label: 'Remaining',
-          type: 'number',
-          readOnly: true,
-          columnWidth: 140,
-          value: (row) => {
-            const quantity = row?.quantity ?? 0
-            if (row?.fromStockType === 'filamentStock') {
-              return (row?.fromStock?.currentWeight?.net ?? 0) - quantity
-            }
-            return (row?.fromStock?.currentQuantity ?? 0) - quantity
-          },
-          suffix: (row) =>
-            row?.fromStockType === 'filamentStock' ? 'g net' : null
-        },
         {
           name: 'toStockLocation',
           label: 'To location',

src/database/models/TaxRate.js

@@ -3,6 +3,7 @@ import InfoCircleIcon from '../../components/Icons/InfoCircleIcon'
 import EditIcon from '../../components/Icons/EditIcon'
 import CheckIcon from '../../components/Icons/CheckIcon'
 import XMarkIcon from '../../components/Icons/XMarkIcon'
+import ReloadIcon from '../../components/Icons/ReloadIcon'
 import BinIcon from '../../components/Icons/BinIcon'
 
 export const TaxRate = {
@@ -19,6 +20,13 @@ export const TaxRate = {
       icon: InfoCircleIcon,
       url: (_id) => `/dashboard/management/taxrates/info?taxRateId=${_id}`
     },
+    {
+      name: 'reload',
+      label: 'Reload',
+      icon: ReloadIcon,
+      url: (_id) =>
+        `/dashboard/management/taxrates/info?taxRateId=${_id}&action=reload`
+    },
     {
       name: 'edit',
       label: 'Edit',