-
+
+ <>
{contextHolder}
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
- Filament Stock Information
-
- }
- key='1'
- >
-
-
+
)
}
diff --git a/src/components/Dashboard/Inventory/InventorySidebar.jsx b/src/components/Dashboard/Inventory/InventorySidebar.jsx
new file mode 100644
index 0000000..bcf0688
--- /dev/null
+++ b/src/components/Dashboard/Inventory/InventorySidebar.jsx
@@ -0,0 +1,73 @@
+import React from 'react'
+import { useLocation } from 'react-router-dom'
+import DashboardSidebar from '../common/DashboardSidebar'
+import { DashboardOutlined } from '@ant-design/icons'
+import FilamentStockIcon from '../../Icons/FilamentStockIcon'
+import PartStockIcon from '../../Icons/PartStockIcon'
+import ProductStockIcon from '../../Icons/ProductStockIcon'
+import StockEventIcon from '../../Icons/StockEventIcon'
+import StockAuditIcon from '../../Icons/StockAuditIcon'
+
+const items = [
+ {
+ key: 'overview',
+ label: 'Overview',
+ icon:
-
+
+ <>
{contextHolder}
-
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
-
- Filament Information
-
-
- }
- danger
- onClick={() => setIsDeleteModalOpen(true)}
- loading={loading}
- />
- {isEditing ? (
- <>
- }
- type='primary'
- onClick={updateFilamentInfo}
- loading={loading}
- />
- }
- onClick={cancelEditing}
- disabled={loading}
- />
-
- ) : (
- } onClick={startEditing} />
- )}
-
-
- }
- key='1'
- >
-
+
)
}
diff --git a/src/components/Dashboard/Management/ManagementSidebar.jsx b/src/components/Dashboard/Management/ManagementSidebar.jsx
new file mode 100644
index 0000000..e25a2ef
--- /dev/null
+++ b/src/components/Dashboard/Management/ManagementSidebar.jsx
@@ -0,0 +1,109 @@
+import React from 'react'
+import { useLocation } from 'react-router-dom'
+import DashboardSidebar from '../common/DashboardSidebar'
+import FilamentIcon from '../../Icons/FilamentIcon'
+import PartIcon from '../../Icons/PartIcon'
+import ProductIcon from '../../Icons/ProductIcon'
+import VendorIcon from '../../Icons/VendorIcon'
+import MaterialIcon from '../../Icons/MaterialIcon'
+import NoteTypeIcon from '../../Icons/NoteTypeIcon'
+import SettingsIcon from '../../Icons/SettingsIcon'
+import AuditLogIcon from '../../Icons/AuditLogIcon'
+import DeveloperIcon from '../../Icons/DeveloperIcon'
+import PersonIcon from '../../Icons/PersonIcon'
+
+const items = [
+ {
+ key: 'filaments',
+ icon:
-
+
+ <>
{contextHolder}
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
-
- Part Information
-
-
- {isEditing ? (
- <>
- }
- type='primary'
- onClick={updateInfo}
- loading={loading}
- />
- }
- onClick={cancelEditing}
- disabled={loading}
- />
-
- ) : (
- } onClick={startEditing} />
- )}
-
-
- }
- key='1'
- >
-
-
-
-
- updateCollapseState('preview', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
- Part Preview
-
- }
- key='2'
+ {error ? (
+
-
- {stlLoadError ? (
-
+
)
}
diff --git a/src/components/Dashboard/Management/Products.jsx b/src/components/Dashboard/Management/Products.jsx
index 170f79e..7459d50 100644
--- a/src/components/Dashboard/Management/Products.jsx
+++ b/src/components/Dashboard/Management/Products.jsx
@@ -28,6 +28,9 @@ import ReloadIcon from '../../Icons/ReloadIcon'
import XMarkIcon from '../../Icons/XMarkIcon'
import CheckIcon from '../../Icons/CheckIcon'
import useColumnVisibility from '../hooks/useColumnVisibility'
+import GridIcon from '../../Icons/GridIcon'
+import ListIcon from '../../Icons/ListIcon'
+import useViewMode from '../hooks/useViewMode'
import config from '../../../config'
@@ -37,6 +40,7 @@ const Products = () => {
const [newProductOpen, setNewProductOpen] = useState(false)
const tableRef = useRef()
const { authenticated } = useContext(AuthContext)
+ const [viewMode, setViewMode] = useViewMode('Products')
const getProductActionItems = (id) => {
return {
@@ -63,12 +67,11 @@ const Products = () => {
// Column definitions
const columns = [
{
- title: '',
- dataIndex: '',
- key: '',
+ title: {error || 'Part not found'}
+ } onClick={fetchPartDetails}>
+ Retry
+
+
+ ) : (
+
+ setPartFormValues((prevValues) => ({
+ ...prevValues,
+ ...changedValues
+ }))
+ }
+ initialValues={{
+ name: partData?.name || '',
+ version: partData?.version || '',
+ tags: partData?.tags || []
}}
- >
- )
- )}
-
-
-
+ >
+
+
+ {partData?.id ? (
+ n/a
+ )}
+
+
+ {partData?.createdAt ? (
+ n/a
+ )}
+
+
+
+ {isEditing ? (
+
+
+
+ ) : partData?.name ? (
+ {partData.name}
+ ) : (
+ n/a
+ )}
+
+
+
+ {partData?.updatedAt ? (
+ n/a
+ )}
+
+
+
+ {partData?.product?.name ? (
+ {partData.product.name}
+ ) : (
+ n/a
+ )}
+
+
+ {partData?.product?._id ? (
+ n/a
+ )}
+
+
+ {isEditing && useGlobalPricing == false ? (
+
+ {marginOrPrice == false ? (
+
+
+ ) : (
+
+
+ )}
+
+ Price
+
+
+ ) : partData?.margin &&
+ marginOrPrice == false &&
+ partData?.useGlobalPricing == false ? (
+ {partData.margin + '%'}
+ ) : partData?.price &&
+ marginOrPrice == true &&
+ partData?.useGlobalPricing == false ? (
+ {'£' + partData.price}
+ ) : (
+ n/a
+ )}
+
+
+ {isEditing ? (
+
+
+ ) : partData ? (
+ n/a
+ )}
+
+
+ {partData?.version ? (
+ {partData.version}
+ ) : (
+ n/a
+ )}
+
+
+ {partData?.tags && partData.tags.length > 0 ? (
+ partData.tags.map((tag, index) => (
+ {tag}
+ ))
+ ) : (
+ n/a
+ )}
+
+
+
+
+
+
+
+
+ updateCollapseState('preview', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Part Preview
+
+
+ }
+ key='2'
+ >
+
+ {stlLoadError ? (
+
+
+
+
+
+ updateCollapseState('notes', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Notes
+
+
+ }
+ key='notes'
+ >
+
+
+
+
+
+
+ updateCollapseState('auditLogs', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Audit Logs
+
+
+ }
+ key='auditLogs'
+ >
+
+
+
+
+ )}
-
+
+
+ updateCollapseState('info', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Part Information
+
+
+ }
+ key='1'
>
-
-
- {stlLoadError}
-
-
-
- ) : (
- partFileObjectId && (
-
+
+
+ {stlLoadError}
+
+
+
+ ) : (
+ partFileObjectId && (
+
-
+
+ <>
{contextHolder}
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
-
- Product Information
-
-
- {isEditing ? (
- <>
- }
- type='primary'
- onClick={updateInfo}
- loading={loading}
- />
- }
- onClick={cancelEditing}
- disabled={loading}
- />
-
- ) : (
- } onClick={startEditing} />
- )}
-
-
- }
- key='1'
- >
-
-
-
-
- updateCollapseState('parts', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
- Product Parts
-
- }
- key='2'
+ {error ? (
+
-
-
+
+
)
}
diff --git a/src/components/Dashboard/Management/Settings.jsx b/src/components/Dashboard/Management/Settings.jsx
index 00f5b79..faaa9c0 100644
--- a/src/components/Dashboard/Management/Settings.jsx
+++ b/src/components/Dashboard/Management/Settings.jsx
@@ -1,6 +1,6 @@
import React from 'react'
import { Select, Typography, Descriptions, Collapse, Flex } from 'antd'
-import { CaretRightOutlined } from '@ant-design/icons'
+import { CaretLeftOutlined } from '@ant-design/icons'
import { useThemeContext } from '../context/ThemeContext'
import useCollapseState from '../hooks/useCollapseState'
@@ -53,13 +53,13 @@ const Settings = () => {
{error || 'Product not found'}
+ } onClick={fetchProductDetails}> + Retry + + + ) : ( +
+
+
+ updateCollapseState('info', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Product Information
+
+
+ }
+ key='1'
+ >
+
+
+
+
+
+ updateCollapseState('parts', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Product Parts
+
+
+ }
+ key='2'
+ >
+
+
+
+
+ updateCollapseState('notes', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Notes
+
+
+ }
+ key='notes'
+ >
+
+
+
+
+
+
+ updateCollapseState('auditLogs', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Audit Logs
+
+
+ }
+ key='auditLogs'
+ >
+
+
+
+
+ )}
-
+
+
+ setSelectedKeys(e.target.value ? [e.target.value] : [])
+ }
+ onPressEnter={() => confirm()}
+ style={{ width: 200, display: 'block' }}
+ />
+
+
+ )
+ }
+
+ const getViewDropdownItems = () => {
+ const columnItems = columns
+ .filter((col) => col.key && col.title !== '')
+ .map((col) => (
+
+
+ )}
+
+ {!isMobile && {error || 'User not found'}
+ } onClick={fetchUserDetails}> + Retry + +{error || 'User not found'}
+ } onClick={fetchUserDetails}> + Retry + +
+
+
+ updateCollapseState('info', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ User Information
+
+
+ }
+ key='1'
+ >
+
+
+
+
+
+ updateCollapseState('notes', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Notes
+
+
+ }
+ key='notes'
+ >
+
+
+
+
+
+
+ updateCollapseState('auditLogs', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Audit Logs
+
+
+ }
+ key='auditLogs'
+ >
+
+
+
+
+ )}
+
-
+
+ <>
{contextHolder}
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
-
- Vendor Information
-
-
- {isEditing ? (
- <>
- }
- type='primary'
- onClick={updateInfo}
- loading={loading}
- />
- }
- onClick={cancelEditing}
- disabled={loading}
- />
-
- ) : (
- } onClick={startEditing} />
- )}
-
-
- }
- key='1'
+
+
+
+
+
+
+
+
+
+
+
+ {isEditing ? (
+ <>
+ }
+ type='primary'
+ onClick={updateInfo}
+ loading={loading}
+ disabled={loading}
+ />
+ }
+ onClick={cancelEditing}
+ disabled={loading}
+ />
+
+ ) : (
+ } onClick={startEditing} />
+ )}
+
+
+
+ {error ? (
+
-
+ ) : (
+
-
+
)
}
diff --git a/src/components/Dashboard/Production/GCodeFiles.jsx b/src/components/Dashboard/Production/GCodeFiles.jsx
index 2f60a6a..c6287c9 100644
--- a/src/components/Dashboard/Production/GCodeFiles.jsx
+++ b/src/components/Dashboard/Production/GCodeFiles.jsx
@@ -31,6 +31,9 @@ import XMarkIcon from '../../Icons/XMarkIcon'
import CheckIcon from '../../Icons/CheckIcon'
import TimeDisplay from '../common/TimeDisplay'
import DashboardTable from '../common/DashboardTable'
+import ListIcon from '../../Icons/ListIcon'
+import GridIcon from '../../Icons/GridIcon'
+import useViewMode from '../hooks/useViewMode'
import config from '../../../config'
@@ -42,6 +45,7 @@ const GCodeFiles = () => {
const [newGCodeFileOpen, setNewGCodeFileOpen] = useState(false)
const [showDeleted, setShowDeleted] = useState(false)
const tableRef = useRef()
+ const [viewMode, setViewMode] = useViewMode('GCodeFiles')
const getFilterDropdown = ({
setSelectedKeys,
@@ -82,12 +86,11 @@ const GCodeFiles = () => {
// Column definitions
const columns = [
{
- title: '',
- dataIndex: '',
- key: '',
+ title:
+
+
+ updateCollapseState('info', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
-
-
-
+
+ Vendor Information
+
+
+ }
+ key='1'
+ >
+
+
+
+
+
+ updateCollapseState('notes', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Notes
+
+
+ }
+ key='notes'
+ >
+
+
+
+
+
+
+ updateCollapseState('auditLogs', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Audit Logs
+
+
+ }
+ key='auditLogs'
+ >
+
- {isEditing ? (
-
-
-
- ) : (
- vendorData.name
- )}
-
-
-
-
-
-
- {isEditing ? (
-
-
-
- ) : vendorData.website ? (
-
- {new URL(vendorData.website).hostname + ' '}
-
-
-
- {isEditing ? (
-
-
- ) : vendorData.country ? (
-
-
-
- {isEditing ? (
-
-
-
- ) : vendorData.contact ? (
- vendorData.contact
- ) : (
- 'n/a'
- )}
-
-
-
- {isEditing ? (
-
-
-
- ) : vendorData.phone ? (
- vendorData.phone
- ) : (
- 'n/a'
- )}
-
-
-
- {isEditing ? (
-
-
-
- ) : vendorData.email ? (
-
- {vendorData.email + ' '}
-
-
-
-
-
+
+
+
+
+ )}
-
+
+ <>
{contextHolder}
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
-
- GCode File Information
-
-
- {isEditing ? (
- <>
- }
- type='primary'
- onClick={updateInfo}
- loading={loading}
- />
- }
- onClick={cancelEditing}
- disabled={loading}
- />
-
- ) : (
- } onClick={startEditing} />
- )}
-
-
- }
- key='1'
- >
-
-
-
-
- updateCollapseState('preview', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
- GCode File Preview
-
- }
- key='2'
- >
-
- {gcodeFileData.gcodeFileInfo.thumbnail ? (
- 
+
+
+
+
+
+
+
+
+
+
+ {isEditing ? (
+ <>
+ }
+ type='primary'
+ onClick={updateGCodeFileInfo}
+ loading={editLoading}
+ disabled={editLoading}
/>
- ) : (
- 'n/a'
- )}
-
-
-
+ }
+ onClick={cancelEditing}
+ disabled={editLoading}
+ />
+
+ ) : (
+ } onClick={startEditing} />
+ )}
+
+
+
+ {error ? (
+
+
+ ) : (
+
+
)
}
diff --git a/src/components/Dashboard/Production/Jobs.jsx b/src/components/Dashboard/Production/Jobs.jsx
index 4de127f..be54fc8 100644
--- a/src/components/Dashboard/Production/Jobs.jsx
+++ b/src/components/Dashboard/Production/Jobs.jsx
@@ -37,6 +37,9 @@ import PauseCircleIcon from '../../Icons/PauseCircleIcon.jsx'
import XMarkCircleIcon from '../../Icons/XMarkCircleIcon.jsx'
import QuestionCircleIcon from '../../Icons/QuestionCircleIcon.jsx'
import DashboardTable from '../common/DashboardTable'
+import ListIcon from '../../Icons/ListIcon.jsx'
+import GridIcon from '../../Icons/GridIcon.jsx'
+import useViewMode from '../hooks/useViewMode.js'
import config from '../../../config.js'
@@ -49,6 +52,7 @@ const Jobs = () => {
const navigate = useNavigate()
const [newJobOpen, setNewJobOpen] = useState(false)
const tableRef = useRef()
+ const [viewMode, setViewMode] = useViewMode('Jobs')
const getFilterDropdown = ({
setSelectedKeys,
@@ -89,20 +93,18 @@ const Jobs = () => {
// Column definitions
const columns = [
{
- title: '',
- dataIndex: '',
- key: '',
+ title: {error || 'Print job not found'}
+ } onClick={fetchGCodeFileDetails}> + Retry + +
+
+
+ updateCollapseState('info', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ GCode File Information
+
+
+ }
+ key='info'
+ >
+
+
+
+
+
+ updateCollapseState('preview', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ GCode File Preview
+
+
+ }
+ key='preview'
+ >
+
+ {gcodeFileData?.gcodeFileInfo?.thumbnail ? (
+
+ ) : (
+ n/a
+ )}
+
+
+
+
+
+
+ updateCollapseState('notes', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Notes
+
+
+ }
+ key='notes'
+ >
+
+
+
+
+
+
+ updateCollapseState('auditLogs', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Audit Log
+
+
+ }
+ key='auditLogs'
+ >
+
+
+
+
+ )}
-
- {printerData ? (
-
-
-
- {printerData?.alerts?.some(
- (alert) => alert.type === 'klippyError'
- ) &&
-
- updateCollapseState('job', keys.length > 0)
+
+
+
+ {printerData?.alerts?.some(
+ (alert) => alert.type === 'klippyError'
+ ) &&
+ updateCollapseState('job', keys.length > 0)}
+ expandIcon={({ isActive }) => (
+
+
+ Current Job
+
+
}
- expandIcon={({ isActive }) => (
-
-
- Current Job
-
-
- }
- key='1'
+ {
}}
>
- {printerData.name}
+ {printerData?.name ? (
+ {printerData.name}
+ ) : (
+ n/a
+ )}
- {printerData._id ? (
+ {printerData?._id ? (
{
showHyperlink={true}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentJob?.gcodeFile?.name ? (
+ {printerData?.currentJob?.gcodeFile?.name ? (
@@ -563,11 +568,11 @@ const ControlPrinter = () => {
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentJob?.gcodeFile ? (
+ {printerData?.currentJob?.gcodeFile ? (
{
showHyperlink={true}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentJob?.id ? (
+ {printerData?.currentJob?.id ? (
{
showHyperlink={true}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentSubJob?.id ? (
+ {printerData?.currentSubJob?.id ? (
{
showHyperlink={false}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData?.state.type === 'printing' && (
+ {printerData?.state?.type === 'printing' && (
<>
- {printerData.currentSubJob?.startedAt ? (
+ {printerData?.currentSubJob?.startedAt ? (
n/a
)}
)}
- {(() => {
- if (
- printerData?.currentJob?.gcodeFile.gcodeFileInfo
- .printSettingsId
- ) {
- return (
-
- {printerData.currentJob.gcodeFile.gcodeFileInfo.printSettingsId.replaceAll(
- '"',
- ''
- )}
-
- )
- } else {
- return 'n/a'
- }
- })()}
+ {printerData?.currentJob?.gcodeFile?.gcodeFileInfo
+ ?.printSettingsId ? (
+
+ {printerData.currentJob.gcodeFile.gcodeFileInfo.printSettingsId.replaceAll(
+ '"',
+ ''
+ )}
+
+ ) : (
+ n/a
+ )}
- {(() => {
- if (
- printerData.currentJob?.gcodeFile?.gcodeFileInfo
- .estimatedPrintingTimeNormalMode
- ) {
- return (
-
- {
- printerData.currentJob.gcodeFile.gcodeFileInfo
- .estimatedPrintingTimeNormalMode
- }
-
- )
- }
- return 'n/a'
- })()}
+ {printerData?.currentJob?.gcodeFile?.gcodeFileInfo
+ ?.estimatedPrintingTimeNormalMode ? (
+
+ {
+ printerData.currentJob.gcodeFile.gcodeFileInfo
+ .estimatedPrintingTimeNormalMode
+ }
+
+ ) : (
+ n/a
+ )}
-
-
-
- updateCollapseState('filament', keys.length > 0)
+
+
+
+
+ updateCollapseState('filament', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Loaded Filament Stock
+
+
}
- expandIcon={({ isActive }) => (
-
-
- Loaded Filament Stock
-
-
- }
- key='1'
+ {
filamentStock={printerData?.currentFilamentStock}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentFilamentStock ? (
+ {printerData?.currentFilamentStock?._id ? (
{
showHyperlink={true}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentFilamentStock?.filament?.name ? (
+ {printerData?.currentFilamentStock?.filament?.name ? (
{
>
) : (
- 'n/a'
+ n/a
)}
@@ -759,11 +755,11 @@ const ControlPrinter = () => {
showHyperlink={true}
/>
) : (
- 'n/a'
+ n/a
)}
- {printerData.currentFilamentStock?.currentNetWeight ? (
+ {printerData?.currentFilamentStock?.currentNetWeight ? (
{
) : (
- 'n/a'
+ n/a
)}
-
-
-
- updateCollapseState('jobs', keys.length > 0)
+
+
+
+
+ updateCollapseState('jobs', keys.length > 0)
+ }
+ expandIcon={({ isActive }) => (
+
+
+ Printer Jobs
+
+
}
- expandIcon={({ isActive }) => (
-
+
+
+
+ {componentVisibility.temperature && (
+
-
- Printer Jobs
-
-
- }
- key='1'
- >
-
- {componentVisibility.temperature && (
- )}
+
+ )}
- {componentVisibility.position && (
+ {componentVisibility.position && (
+
{
showMoreInfo={true}
/>
- )}
+
+ )}
- {componentVisibility.movement && (
+ {componentVisibility.movement && (
+
- )}
+
+ )}
- {componentVisibility.misc && (
+ {componentVisibility.misc && (
+
- )}
-
+
+ )}
- ) : (
-
-
- )
+ const actionItems = {
+ items: [
+ {
+ label: 'Reload Printer',
+ key: 'reload',
+ icon: {error || 'Printer not found'}
- } onClick={fetchPrinterDetails}> - Retry - -
+ <>
{contextHolder}
-
- updateCollapseState('info', keys.length > 0)}
- expandIcon={({ isActive }) => (
-
-
- Printer Information
-
-
- {isEditing ? (
- <>
- }
- type='primary'
- onClick={updatePrinterInfo}
- loading={loading}
- />
- }
- onClick={cancelEditing}
- disabled={loading}
- />
-
- ) : (
- } onClick={startEditing} />
- )}
-
-
- }
- key='1'
- >
-
+
)
}
diff --git a/src/components/Dashboard/Production/ProductionOverview.jsx b/src/components/Dashboard/Production/ProductionOverview.jsx
index 8cd9f91..4c32241 100644
--- a/src/components/Dashboard/Production/ProductionOverview.jsx
+++ b/src/components/Dashboard/Production/ProductionOverview.jsx
@@ -12,7 +12,7 @@ import {
Segmented,
Card
} from 'antd'
-import { LoadingOutlined, CaretRightOutlined } from '@ant-design/icons'
+import { LoadingOutlined, CaretLeftOutlined } from '@ant-design/icons'
import { Line } from '@ant-design/charts'
import axios from 'axios'
import PrinterIcon from '../../Icons/PrinterIcon'
@@ -151,11 +151,11 @@ const ProductionOverview = () => {
+ n/a
+
+ )
}
// Handle colors specifically
@@ -42,11 +47,7 @@ const formatValue = (value, propertyName) => {
}
if (typeof value === 'boolean' || value === true || value === false) {
- return (
-
+
+ - {children}
- {children}
{children}
-
+
+ {loading ? (
+
+ {notifications.map((notification) => (
+
+ )}
+
+
+
+
+ ) : notifications.length === 0 ? (
+
+ Loading notifications...
+
+
+ Failed to load data.{' '}
+
+
+ ) : (
+
+
+ {loading ? (
+ <>
+
+ {renderValue(
+ key,
+ key === 'state' && value.type ? value.type : value
+ )}
+
+ ) : null
+ )
+ )}
+
+
+
+ )
+}
+
+SpotlightTooltip.propTypes = {
+ query: PropTypes.string.isRequired,
+ type: PropTypes.string.isRequired
+}
+
+export default SpotlightTooltip
diff --git a/src/components/Dashboard/common/StockEventTable.jsx b/src/components/Dashboard/common/StockEventTable.jsx
index 365297c..3280a79 100644
--- a/src/components/Dashboard/common/StockEventTable.jsx
+++ b/src/components/Dashboard/common/StockEventTable.jsx
@@ -48,6 +48,10 @@ const StockEventTable = ({ stockEvents }) => {
}
}, [socket, initialized])
+ useEffect(() => {
+ setStockEventsData(stockEvents)
+ }, [stockEvents])
+
const getTypeFilterProps = () => {
// Get unique types from the data
const uniqueTypes = [
diff --git a/src/components/Dashboard/common/SubJobState.jsx b/src/components/Dashboard/common/SubJobState.jsx
index 67211f9..ca0f0a6 100644
--- a/src/components/Dashboard/common/SubJobState.jsx
+++ b/src/components/Dashboard/common/SubJobState.jsx
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types'
import { Badge, Progress, Flex, Button, Space, Tag, Tooltip } from 'antd' // eslint-disable-line
-import { CaretRightOutlined } from '@ant-design/icons' // eslint-disable-line
+import { CaretLeftOutlined } from '@ant-design/icons' // eslint-disable-line
import React, { useState, useContext, useEffect } from 'react'
import { SocketContext } from '../context/SocketContext'
import IdText from './IdText'
@@ -84,11 +84,7 @@ const SubJobState = ({
return (
- (
-
+
)}
- {
+ // Determine type for meta lookup
+ let type = item.type || inputPrefix?.type
+ // Fallback: try to infer type from known keys
+ if (!type) {
+ if (item.printer) type = 'printer'
+ else if (item.job) type = 'job'
+ // Add more inference as needed
+ }
+ const meta = getTypeMeta(type)
+ console.log('meta', inputPrefix?.type)
+ const Icon = meta.icon
- {item.printer ? (
-