Adjust scrollHeight calculations in ObjectTable component for improved layout consistency across different environments.

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

@@ -48,7 +48,7 @@ const InvoiceInfo = () => {
     invoiceShipments: true,
     payments: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
 
   const [objectFormState, setEditFormState] = useState({

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

@@ -39,7 +39,7 @@ const PaymentInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('PaymentInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
 
   const [objectFormState, setEditFormState] = useState({

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

@@ -35,7 +35,7 @@ const TaxRecordInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -34,7 +34,7 @@ const FilamentStockInfo = () => {
       info: true,
       events: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -35,7 +35,7 @@ const OrderItemInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -37,7 +37,7 @@ const PartStockInfo = () => {
       info: true,
       stocks: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -10,7 +10,10 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
 import ObjectInfo from '../../common/ObjectInfo.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
 import ViewButton from '../../common/ViewButton.jsx'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import {
+  getModelProperty,
+  getModelByName
+} from '../../../../database/ObjectModels.js'
 import PostProductStock from './PostProductStock.jsx'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
@@ -44,7 +47,7 @@ const ProductStockInfo = () => {
       info: true,
       partStocks: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -58,7 +58,9 @@ const PurchaseOrderInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true,
+      orderItems: true,
+      shipments: true,
+      auditLogs: false,
       invoices: true,
       stockEvents: true
     }

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

@@ -50,7 +50,7 @@ const PurchaseOrderInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -40,7 +40,7 @@ const ShipmentInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -37,7 +37,7 @@ const StockAuditInfo = () => {
       info: true,
       stocks: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -38,7 +38,7 @@ const StockLocationInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -8,7 +8,10 @@ import InfoCollapse from '../../common/InfoCollapse.jsx'
 import ObjectInfo from '../../common/ObjectInfo.jsx'
 import ObjectProperty from '../../common/ObjectProperty.jsx'
 import ViewButton from '../../common/ViewButton.jsx'
-import { getModelProperty, getModelByName } from '../../../../database/ObjectModels.js'
+import {
+  getModelProperty,
+  getModelByName
+} from '../../../../database/ObjectModels.js'
 import PostStockTransfer from './PostStockTransfer.jsx'
 import InfoCircleIcon from '../../../Icons/InfoCircleIcon.jsx'
 import NoteIcon from '../../../Icons/NoteIcon.jsx'
@@ -39,7 +42,7 @@ const StockTransferInfo = () => {
       info: true,
       lines: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -35,7 +35,7 @@ const AppPasswordInfo = () => {
     'AppPasswordInfo',
     {
       info: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -37,7 +37,7 @@ const CourierServiceInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -34,7 +34,7 @@ const CourierInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('CourierInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -38,7 +38,7 @@ const DocumentJobInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -39,7 +39,7 @@ const DocumentPrinterInfo = () => {
       info: true,
       stocks: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -38,7 +38,7 @@ const DocumentSizeInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -33,7 +33,7 @@ const DocumentTemplateDesign = () => {
       preview: true,
       editor: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -39,7 +39,7 @@ const DocumentTemplateInfo = () => {
       info: true,
       stocks: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -24,13 +24,15 @@ const FilamentSkuInfo = () => {
   const location = useLocation()
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
-  const filamentSkuId = new URLSearchParams(location.search).get('filamentSkuId')
+  const filamentSkuId = new URLSearchParams(location.search).get(
+    'filamentSkuId'
+  )
   const [collapseState, updateCollapseState] = useCollapseState(
     'FilamentSkuInfo',
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -43,7 +43,7 @@ const FilamentInfo = () => {
       filamentSkus: true,
       stocks: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -37,7 +37,7 @@ const FileInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('FileInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -39,7 +39,7 @@ const HostInfo = () => {
     printers: true,
     documentPrinters: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
 
   const [hostOTPOpen, setHostOTPOpen] = useState(false)

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

@@ -30,11 +30,14 @@ const MaterialInfo = () => {
   const objectFormRef = useRef(null)
   const actionHandlerRef = useRef(null)
   const materialId = new URLSearchParams(location.search).get('materialId')
-  const [collapseState, updateCollapseState] = useCollapseState('MaterialInfo', {
+  const [collapseState, updateCollapseState] = useCollapseState(
-    info: true,
+    'MaterialInfo',
-    notes: true,
+    {
-    auditLogs: true
+      info: true,
-  })
+      notes: true,
+      auditLogs: false
+    }
+  )
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,
     editLoading: false,

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

@@ -28,7 +28,7 @@ const NoteTypeInfo = () => {
     'NoteTypeInfo',
     {
       info: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -38,7 +38,7 @@ const NoteInfo = () => {
     info: true,
     content: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -28,7 +28,7 @@ const PartSkuInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('PartSkuInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -33,7 +33,7 @@ const PartInfo = () => {
     info: true,
     partSkus: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -32,7 +32,7 @@ const ProductCategoryInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -34,7 +34,7 @@ const ProductSkuInfo = () => {
       info: true,
       parts: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -32,7 +32,7 @@ const ProductInfo = () => {
     info: true,
     productSkus: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [newProductSkuOpen, setNewProductSkuOpen] = useState(false)
   const productSkusTableRef = useRef()

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

@@ -33,7 +33,7 @@ const TaxRateInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('TaxRateInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -37,7 +37,7 @@ const UserInfo = () => {
     info: true,
     appPasswords: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -33,7 +33,7 @@ const VendorInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('VendorInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -40,7 +40,7 @@ const GCodeFileInfo = () => {
       info: true,
       parts: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
 

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

@@ -39,7 +39,7 @@ const JobInfo = () => {
     info: true,
     subJobs: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
 
   const [objectFormState, setEditFormState] = useState({

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

@@ -35,7 +35,7 @@ const PrinterInfo = () => {
     info: true,
     stocks: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
 
   const [objectFormState, setEditFormState] = useState({

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

@@ -30,7 +30,7 @@ const SubJobInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('SubJobInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -33,7 +33,7 @@ const ClientInfo = () => {
   const [collapseState, updateCollapseState] = useCollapseState('ClientInfo', {
     info: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,
@@ -193,4 +193,3 @@ const ClientInfo = () => {
 }
 
 export default ClientInfo
-

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

@@ -42,7 +42,7 @@ const ListingVarientInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -43,7 +43,7 @@ const ListingInfo = () => {
     info: true,
     listingVarients: true,
     notes: true,
-    auditLogs: true
+    auditLogs: false
   })
   const [objectFormState, setEditFormState] = useState({
     isEditing: false,

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

@@ -50,7 +50,7 @@ const MarketplaceInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true
+      auditLogs: false
     }
   )
   const [objectFormState, setEditFormState] = useState({

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

@@ -55,7 +55,9 @@ const SalesOrderInfo = () => {
     {
       info: true,
       notes: true,
-      auditLogs: true,
+      auditLogs: false,
+      orderItems: true,
+      shipments: true,
       invoices: true,
       stockEvents: true
     }

src/components/Dashboard/common/ObjectForm.jsx

@@ -430,8 +430,8 @@ const ObjectForm = forwardRef(
         setEditLoading(true)
 
         const currentFormData = {
-          ...value,
+          ...objectData,
-          ...objectData
+          ...value
         }
         onStateChangeRef.current({ editLoading: true })
         await updateObject(id, type, currentFormData)

src/components/Dashboard/common/ObjectTable.jsx

@@ -93,7 +93,7 @@ const ObjectTable = forwardRef(
     {
       type,
       pageSize = 25,
-      scrollHeight = 'calc(var(--unit-100vh) - 260px)',
+      scrollHeight = 'calc(var(--unit-100vh) - 258px)',
       onDataChange,
       initialPage = 1,
       cards = false,
@@ -132,13 +132,13 @@ const ObjectTable = forwardRef(
       adjustedScrollHeight = 'calc(var(--unit-100vh) - 210px)'
     }
     if (isElectron) {
-      adjustedScrollHeight = 'calc(var(--unit-100vh) - 244px)'
+      adjustedScrollHeight = 'calc(var(--unit-100vh) - 238px)'
     }
     if (isMobile && isElectron) {
       adjustedScrollHeight = 'calc(var(--unit-100vh) - 282px)'
     }
     if (cards && isElectron) {
-      adjustedScrollHeight = 'calc(var(--unit-100vh) - 260px)'
+      adjustedScrollHeight = 'calc(var(--unit-100vh) - 258px)'
     }
     const tableRef = useRef(null)
     const model = getModelByName(type)
@@ -999,7 +999,7 @@ const ObjectTable = forwardRef(
             )}
           </Splitter.Panel>
           {showFilterSidebar && (
-            <Splitter.Panel>
+            <Splitter.Panel defaultSize={'25%'}>
               <FilterSidebar
                 type={type}
                 filter={sidebarFilter}