src/components/Dashboard/common/ObjectDisplay.jsx

@@ -9,7 +9,6 @@ import { AuthContext } from '../context/AuthContext'
 import merge from 'lodash/merge'
 import IdDisplay from './IdDisplay'
 import SpotlightTooltip from './SpotlightTooltip'
-import StateTag from './StateTag'
 
 const { Text, Link } = Typography
 
@@ -256,7 +255,7 @@ const ObjectDisplay = ({
       className='object-display-tag'
     >
       <Flex
-        gap={objectData?.color || objectData?.state ? 'small' : '5px'}
+        gap={objectData?.color ? 'small' : '5px'}
         align='center'
         style={{ minWidth: 0, height: '24px' }}
       >
@@ -268,13 +267,6 @@ const ObjectDisplay = ({
               style={{ marginBottom: '1.5px' }}
             />
           ) : null}
-          {objectData?.state ? (
-            <StateTag
-              state={objectData?.state.type}
-              showTag={false}
-              style={{ marginBottom: '1.5px' }}
-            />
-          ) : null}
           <div style={{ minWidth: 0 }}>
             {renderNameDisplay()}
 

src/components/Dashboard/common/SpotlightTooltip.jsx

@@ -8,10 +8,7 @@ import ObjectProperty from './ObjectProperty'
 import InfoCircleIcon from '../../Icons/InfoCircleIcon'
 import { ApiServerContext } from '../context/ApiServerContext'
 import merge from 'lodash/merge'
-import {
+import { getModelByName } from '../../../database/ObjectModels'
-  getModelByName,
-  getModelProperty
-} from '../../../database/ObjectModels'
 
 const { Text } = Typography
 
@@ -131,7 +128,7 @@ const SpotlightTooltip = ({ query, type }) => {
                 return (
                   <Descriptions.Item key={prop.name} label={prop.label}>
                     <ObjectProperty
-                      {...getModelProperty(type, prop.name)}
+                      type={prop.type}
                       value={value}
                       objectData={spotlightData}
                       objectType={prop.objectType || type}

src/components/Dashboard/common/StateTag.jsx

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types'
 import { Badge, Flex, Tag } from 'antd'
 import { useMemo } from 'react'
 
-const StateTag = ({ state, showBadge = true, showTag = true, style = {} }) => {
+const StateTag = ({ state, showBadge = true, style = {} }) => {
   const { badgeStatus, badgeText } = useMemo(() => {
     let status = 'default'
     let text = 'Unknown'
@@ -196,10 +196,6 @@ const StateTag = ({ state, showBadge = true, showTag = true, style = {} }) => {
     badgeProps = { color: badgeStatus }
   }
 
-  if (showTag == false) {
-    return <Badge {...badgeProps} style={{ ...style }} />
-  }
-
   return (
     <Tag color={badgeStatus} style={{ marginRight: 0, ...style }}>
       <Flex gap={6}>
@@ -213,8 +209,7 @@ const StateTag = ({ state, showBadge = true, showTag = true, style = {} }) => {
 StateTag.propTypes = {
   state: PropTypes.string,
   showBadge: PropTypes.bool,
-  style: PropTypes.object,
+  style: PropTypes.object
-  showTag: PropTypes.bool
 }
 
 export default StateTag

src/database/models/DocumentJob.js

@@ -111,7 +111,7 @@ export const DocumentJob = {
       objectType: 'printer',
       showName: false,
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'objectType',

src/database/models/DocumentPrinter.js

@@ -113,7 +113,7 @@ export const DocumentPrinter = {
       objectType: 'printer',
       showName: false,
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'connectedAt',

src/database/models/FilamentStock.js

@@ -79,7 +79,7 @@ export const FilamentStock = {
       type: 'state',
       objectType: 'filamentStock',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'filament',

src/database/models/Host.js

@@ -132,7 +132,7 @@ export const Host = {
       objectType: 'host',
       showName: false,
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'online',

src/database/models/Invoice.js

@@ -191,7 +191,7 @@ export const Invoice = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'issuedAt',

src/database/models/Job.js

@@ -132,7 +132,7 @@ export const Job = {
       showProgress: true,
       showId: false,
       showQuantity: false,
-      columnWidth: 260,
+      columnWidth: 250,
       readOnly: true
     },
     {

src/database/models/Listing.js

@@ -248,7 +248,7 @@ export const Listing = {
       type: 'state',
       objectType: 'listing',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 130
     },
     {
       name: 'price',

src/database/models/ListingVarient.js

@@ -185,7 +185,7 @@ export const ListingVarient = {
       type: 'state',
       objectType: 'listingVarient',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 130
     },
     {
       name: 'price',

src/database/models/Marketplace.js

@@ -234,7 +234,7 @@ export const Marketplace = {
       type: 'state',
       objectType: 'marketplace',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 130
     },
     {
       name: 'active',

src/database/models/OrderItem.js

@@ -165,7 +165,7 @@ export const OrderItem = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'receivedAt',
@@ -374,11 +374,15 @@ export const OrderItem = {
         if (!totalAmount) return 0
         if (objectData?.taxRate?.rateType == 'percentage') {
           return (
-            (totalAmount * (1 + objectData?.taxRate?.rate / 100)).toFixed(2) ||
+            (
-            0
+              totalAmount *
+              (1 + objectData?.taxRate?.rate / 100)
+            ).toFixed(2) || 0
           )
         } else if (objectData?.taxRate?.rateType == 'amount') {
-          return (totalAmount + objectData?.taxRate?.rate).toFixed(2) || 0
+          return (
+            (totalAmount + objectData?.taxRate?.rate).toFixed(2) || 0
+          )
         }
         return totalAmount
       }

src/database/models/PartStock.js

@@ -62,7 +62,7 @@ export const PartStock = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 120
     },
     {
       name: 'updatedAt',

src/database/models/Payment.js

@@ -184,7 +184,7 @@ export const Payment = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'postedAt',

src/database/models/Printer.js

@@ -286,7 +286,7 @@ export const Printer = {
       objectType: 'printer',
       showName: false,
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'online',

src/database/models/ProductStock.js

@@ -129,7 +129,7 @@ export const ProductStock = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 120
     },
     {
       name: 'postedAt',

src/database/models/PurchaseOrder.js

@@ -248,7 +248,7 @@ export const PurchaseOrder = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'postedAt',

src/database/models/SalesOrder.js

@@ -230,7 +230,7 @@ export const SalesOrder = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
     {
       name: 'postedAt',

src/database/models/Shipment.js

@@ -184,7 +184,7 @@ export const Shipment = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 250
     },
 
     {

src/database/models/StockAudit.js

@@ -54,7 +54,7 @@ export const StockAudit = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 120
     },
     {
       name: 'updatedAt',

src/database/models/StockTransfer.js

@@ -136,7 +136,7 @@ export const StockTransfer = {
       label: 'State',
       type: 'state',
       readOnly: true,
-      columnWidth: 260
+      columnWidth: 120
     },
     {
       name: 'postedAt',

src/database/models/SubJob.js

@@ -86,7 +86,7 @@ export const SubJob = {
       showProgress: true,
       showId: false,
       showQuantity: false,
-      columnWidth: 260,
+      columnWidth: 250,
       readOnly: true
     },
     {