diff --git a/src/frontend/src/components/nav/PanelGroup.tsx b/src/frontend/src/components/nav/PanelGroup.tsx index c7e880a642..5c1671fb90 100644 --- a/src/frontend/src/components/nav/PanelGroup.tsx +++ b/src/frontend/src/components/nav/PanelGroup.tsx @@ -24,7 +24,6 @@ import { identifierString } from '../../functions/conversion'; import { navigateToLink } from '../../functions/navigation'; import { useLocalState } from '../../states/LocalState'; import { Boundary } from '../Boundary'; -import { PlaceholderPanel } from '../items/Placeholder'; import { StylishText } from '../items/StylishText'; /** @@ -34,7 +33,7 @@ export type PanelType = { name: string; label: string; icon?: ReactNode; - content?: ReactNode; + content: ReactNode; hidden?: boolean; disabled?: boolean; showHeadline?: boolean; @@ -190,7 +189,7 @@ function BasePanelGroup({ )} - {panel.content ?? } + {panel.content} diff --git a/src/frontend/src/pages/Index/Settings/SystemSettings.tsx b/src/frontend/src/pages/Index/Settings/SystemSettings.tsx index 53f2e18227..f787f77b99 100644 --- a/src/frontend/src/pages/Index/Settings/SystemSettings.tsx +++ b/src/frontend/src/pages/Index/Settings/SystemSettings.tsx @@ -19,6 +19,7 @@ import { } from '@tabler/icons-react'; import { useMemo } from 'react'; +import { PlaceholderPanel } from '../../../components/items/Placeholder'; import { PanelGroup, PanelType } from '../../../components/nav/PanelGroup'; import { SettingsHeader } from '../../../components/nav/SettingsHeader'; import { GlobalSettingList } from '../../../components/settings/SettingList'; @@ -98,7 +99,8 @@ export default function SystemSettings() { { name: 'notifications', label: t`Notifications`, - icon: + icon: , + content: }, { name: 'pricing', @@ -161,7 +163,8 @@ export default function SystemSettings() { { name: 'categories', label: t`Part Categories`, - icon: + icon: , + content: }, { name: 'parts', @@ -223,7 +226,8 @@ export default function SystemSettings() { { name: 'stocktake', label: t`Stocktake`, - icon: + icon: , + content: }, { name: 'buildorders', diff --git a/src/frontend/src/pages/Index/Settings/UserSettings.tsx b/src/frontend/src/pages/Index/Settings/UserSettings.tsx index e20f0489f1..f585000d5d 100644 --- a/src/frontend/src/pages/Index/Settings/UserSettings.tsx +++ b/src/frontend/src/pages/Index/Settings/UserSettings.tsx @@ -11,6 +11,7 @@ import { } from '@tabler/icons-react'; import { useMemo } from 'react'; +import { PlaceholderPanel } from '../../../components/items/Placeholder'; import { PanelGroup, PanelType } from '../../../components/nav/PanelGroup'; import { SettingsHeader } from '../../../components/nav/SettingsHeader'; import { UserSettingList } from '../../../components/settings/SettingList'; @@ -39,7 +40,8 @@ export default function UserSettings() { { name: 'dashboard', label: t`Dashboard`, - icon: + icon: , + content: }, { name: 'display', @@ -92,7 +94,8 @@ export default function UserSettings() { { name: 'notifications', label: t`Notifications`, - icon: + icon: , + content: }, { name: 'reporting', diff --git a/src/frontend/src/pages/part/PartDetail.tsx b/src/frontend/src/pages/part/PartDetail.tsx index 4cb71cf97c..08b330bde8 100644 --- a/src/frontend/src/pages/part/PartDetail.tsx +++ b/src/frontend/src/pages/part/PartDetail.tsx @@ -53,6 +53,7 @@ import { UnlinkBarcodeAction, ViewBarcodeAction } from '../../components/items/ActionDropdown'; +import { PlaceholderPanel } from '../../components/items/Placeholder'; import NavigationTree from '../../components/nav/NavigationTree'; import { PageDetail } from '../../components/nav/PageDetail'; import { PanelGroup, PanelType } from '../../components/nav/PanelGroup'; @@ -513,7 +514,8 @@ export default function PartDetail() { name: 'allocations', label: t`Allocations`, icon: , - hidden: !part.component && !part.salable + hidden: !part.component && !part.salable, + content: }, { name: 'bom', @@ -572,7 +574,8 @@ export default function PartDetail() { name: 'purchase_orders', label: t`Purchase Orders`, icon: , - hidden: !part.purchaseable + hidden: !part.purchaseable, + content: }, { name: 'sales_orders', @@ -584,12 +587,14 @@ export default function PartDetail() { { name: 'scheduling', label: t`Scheduling`, - icon: + icon: , + content: }, { name: 'stocktake', label: t`Stocktake`, - icon: + icon: , + content: }, { name: 'test_templates', diff --git a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx index 830a864171..9dfc84e699 100644 --- a/src/frontend/src/pages/sales/ReturnOrderDetail.tsx +++ b/src/frontend/src/pages/sales/ReturnOrderDetail.tsx @@ -22,6 +22,7 @@ import { DuplicateItemAction, EditItemAction } from '../../components/items/ActionDropdown'; +import { PlaceholderPanel } from '../../components/items/Placeholder'; import { PageDetail } from '../../components/nav/PageDetail'; import { PanelGroup, PanelType } from '../../components/nav/PanelGroup'; import { StatusRenderer } from '../../components/render/StatusRenderer'; @@ -220,7 +221,8 @@ export default function ReturnOrderDetail() { { name: 'line-items', label: t`Line Items`, - icon: + icon: , + content: }, { name: 'attachments', diff --git a/src/frontend/src/pages/sales/SalesOrderDetail.tsx b/src/frontend/src/pages/sales/SalesOrderDetail.tsx index a7ba38cfa1..d342dc5e60 100644 --- a/src/frontend/src/pages/sales/SalesOrderDetail.tsx +++ b/src/frontend/src/pages/sales/SalesOrderDetail.tsx @@ -25,6 +25,7 @@ import { DuplicateItemAction, EditItemAction } from '../../components/items/ActionDropdown'; +import { PlaceholderPanel } from '../../components/items/Placeholder'; import { PageDetail } from '../../components/nav/PageDetail'; import { PanelGroup, PanelType } from '../../components/nav/PanelGroup'; import { StatusRenderer } from '../../components/render/StatusRenderer'; @@ -248,17 +249,20 @@ export default function SalesOrderDetail() { { name: 'line-items', label: t`Line Items`, - icon: + icon: , + content: }, { name: 'pending-shipments', label: t`Pending Shipments`, - icon: + icon: , + content: }, { name: 'completed-shipments', label: t`Completed Shipments`, - icon: + icon: , + content: }, { name: 'build-orders', diff --git a/src/frontend/src/pages/stock/StockDetail.tsx b/src/frontend/src/pages/stock/StockDetail.tsx index dd28ccd061..a2981bd295 100644 --- a/src/frontend/src/pages/stock/StockDetail.tsx +++ b/src/frontend/src/pages/stock/StockDetail.tsx @@ -32,6 +32,7 @@ import { UnlinkBarcodeAction, ViewBarcodeAction } from '../../components/items/ActionDropdown'; +import { PlaceholderPanel } from '../../components/items/Placeholder'; import NavigationTree from '../../components/nav/NavigationTree'; import { PageDetail } from '../../components/nav/PageDetail'; import { PanelGroup, PanelType } from '../../components/nav/PanelGroup'; @@ -283,7 +284,9 @@ export default function StockDetail() { label: t`Allocations`, icon: , hidden: - !stockitem?.part_detail?.salable && !stockitem?.part_detail?.component + !stockitem?.part_detail?.salable && + !stockitem?.part_detail?.component, + content: }, { name: 'testdata',