From e43befc2cc6fc4f3a95ee25f0699e1bebf058228 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Mon, 15 Apr 2024 10:04:03 +0200 Subject: [PATCH] adapt arg names --- .../src/components/buttons/CopyButton.tsx | 2 +- .../src/components/buttons/SSOButton.tsx | 2 +- .../src/components/buttons/SplitButton.tsx | 2 +- .../src/components/details/DetailsImage.tsx | 16 ++++++++-------- .../editors/TemplateEditor/TemplateEditor.tsx | 8 ++++---- .../src/components/forms/HostOptionsForm.tsx | 2 +- .../src/components/forms/fields/ApiFormField.tsx | 2 +- .../src/components/forms/fields/ChoiceField.tsx | 2 +- .../src/components/forms/fields/DateField.tsx | 2 +- .../src/components/items/ActionDropdown.tsx | 2 +- .../src/components/items/Placeholder.tsx | 2 +- .../src/components/modals/QrCodeModal.tsx | 2 +- src/frontend/src/components/nav/Header.tsx | 4 ++-- src/frontend/src/components/nav/MainMenu.tsx | 12 ++++++++---- src/frontend/src/components/nav/PanelGroup.tsx | 4 ++-- .../src/components/nav/PartCategoryTree.tsx | 2 +- src/frontend/src/components/nav/SearchDrawer.tsx | 2 +- .../src/components/widgets/WidgetLayout.tsx | 6 +++--- .../Settings/AccountSettings/UserThemePanel.tsx | 5 ++--- src/frontend/src/tables/RowActions.tsx | 2 +- src/frontend/src/tables/bom/BomTable.tsx | 2 +- src/frontend/src/tables/build/BuildLineTable.tsx | 2 +- .../src/tables/machine/MachineListTable.tsx | 5 ++++- .../src/tables/machine/MachineTypeTable.tsx | 10 ++++++++-- src/frontend/src/tables/part/PartTable.tsx | 2 +- .../src/tables/plugin/PluginListTable.tsx | 2 +- src/frontend/src/tables/stock/StockItemTable.tsx | 2 +- 27 files changed, 59 insertions(+), 47 deletions(-) diff --git a/src/frontend/src/components/buttons/CopyButton.tsx b/src/frontend/src/components/buttons/CopyButton.tsx index d1ebb8dacb..bf51eebd0b 100644 --- a/src/frontend/src/components/buttons/CopyButton.tsx +++ b/src/frontend/src/components/buttons/CopyButton.tsx @@ -17,7 +17,7 @@ export function CopyButton({ onClick={copy} title={t`Copy to clipboard`} variant="subtle" - compact + size="compact-md" > {label &&
 
} diff --git a/src/frontend/src/components/buttons/SSOButton.tsx b/src/frontend/src/components/buttons/SSOButton.tsx index 503f5dafd5..08f9fd44da 100644 --- a/src/frontend/src/components/buttons/SSOButton.tsx +++ b/src/frontend/src/components/buttons/SSOButton.tsx @@ -50,7 +50,7 @@ export function SsoButton({ provider }: { provider: Provider }) { return ( {values.length == 0 ? ( - + No scans yet! ) : ( diff --git a/src/frontend/src/components/nav/Header.tsx b/src/frontend/src/components/nav/Header.tsx index 5b4638aa85..5e43603f4b 100644 --- a/src/frontend/src/components/nav/Header.tsx +++ b/src/frontend/src/components/nav/Header.tsx @@ -128,11 +128,11 @@ function NavTabs() { defaultValue="home" classNames={{ root: classes.tabs, - tabsList: classes.tabsList, + list: classes.tabsList, tab: classes.tab }} value={tabValue} - onTabChange={(value) => + onChange={(value) => value == '/' ? navigate('/') : navigate(`/${value}`) } > diff --git a/src/frontend/src/components/nav/MainMenu.tsx b/src/frontend/src/components/nav/MainMenu.tsx index aab8ba002b..f4e3e30b8b 100644 --- a/src/frontend/src/components/nav/MainMenu.tsx +++ b/src/frontend/src/components/nav/MainMenu.tsx @@ -38,12 +38,16 @@ export function MainMenu() { Settings - } component={Link} to="/settings/user"> + } + component={Link} + to="/settings/user" + > Account settings {userState.user?.is_staff && ( } + leftSection={} component={Link} to="/settings/system" > @@ -53,7 +57,7 @@ export function MainMenu() { {userState.user?.is_staff && } {userState.user?.is_staff && ( } + leftSection={} component={Link} to="/settings/admin" > @@ -62,7 +66,7 @@ export function MainMenu() { )} } + leftSection={} onClick={() => { doLogout(navigate); }} diff --git a/src/frontend/src/components/nav/PanelGroup.tsx b/src/frontend/src/components/nav/PanelGroup.tsx index de38a77423..95b6ad7904 100644 --- a/src/frontend/src/components/nav/PanelGroup.tsx +++ b/src/frontend/src/components/nav/PanelGroup.tsx @@ -108,7 +108,7 @@ function BasePanelGroup({ @@ -124,7 +124,7 @@ function BasePanelGroup({ p="xs" value={panel.name} // icon={()} // Enable when implementing Icon manager everywhere - icon={panel.icon} + leftSection={panel.icon} hidden={panel.hidden} disabled={panel.disabled} style={{ cursor: panel.disabled ? 'unset' : 'pointer' }} diff --git a/src/frontend/src/components/nav/PartCategoryTree.tsx b/src/frontend/src/components/nav/PartCategoryTree.tsx index 04d99496a4..d10966e6ff 100644 --- a/src/frontend/src/components/nav/PartCategoryTree.tsx +++ b/src/frontend/src/components/nav/PartCategoryTree.tsx @@ -59,7 +59,7 @@ export function PartCategoryTree({ function renderNode({ node }: { node: any }) { return ( { diff --git a/src/frontend/src/components/nav/SearchDrawer.tsx b/src/frontend/src/components/nav/SearchDrawer.tsx index c05f6b0eb5..13dd185fcf 100644 --- a/src/frontend/src/components/nav/SearchDrawer.tsx +++ b/src/frontend/src/components/nav/SearchDrawer.tsx @@ -337,7 +337,7 @@ export function SearchDrawer({ radius="xs" value={value} onChange={(event) => setValue(event.currentTarget.value)} - icon={} + leftSection={} rightSection={ value && ( setValue('')} /> diff --git a/src/frontend/src/components/widgets/WidgetLayout.tsx b/src/frontend/src/components/widgets/WidgetLayout.tsx index 7cfa6aedcd..ff79377399 100644 --- a/src/frontend/src/components/widgets/WidgetLayout.tsx +++ b/src/frontend/src/components/widgets/WidgetLayout.tsx @@ -160,13 +160,13 @@ function WidgetControlBar({ Layout } + leftSection={} onClick={resetLayout} > Reset Layout } onClick={editFnc} @@ -185,7 +185,7 @@ function WidgetControlBar({ Appearance ) : ( diff --git a/src/frontend/src/pages/Index/Settings/AccountSettings/UserThemePanel.tsx b/src/frontend/src/pages/Index/Settings/AccountSettings/UserThemePanel.tsx index 2a0ac3d85f..1c91a6b640 100644 --- a/src/frontend/src/pages/Index/Settings/AccountSettings/UserThemePanel.tsx +++ b/src/frontend/src/pages/Index/Settings/AccountSettings/UserThemePanel.tsx @@ -11,7 +11,6 @@ import { Table, Title } from '@mantine/core'; -import { LoaderType } from '@mantine/styles/lib/theme/types/MantineTheme'; import { useState } from 'react'; import { SizeMarks } from '../../../../defaults/defaults'; @@ -67,8 +66,8 @@ export function UserTheme({ height }: { height: number }) { { value: 'oval', label: t`oval` }, { value: 'dots', label: t`dots` } ]; - const [loader, setLoader] = useState(theme.loader); - function changeLoader(value: LoaderType) { + const [loader, setLoader] = useState(theme.loader); + function changeLoader(value: string) { setLoader(value); useLocalState.setState({ loader: value }); } diff --git a/src/frontend/src/tables/RowActions.tsx b/src/frontend/src/tables/RowActions.tsx index 1b35741fe4..87b2d39368 100644 --- a/src/frontend/src/tables/RowActions.tsx +++ b/src/frontend/src/tables/RowActions.tsx @@ -114,7 +114,7 @@ export function RowActions({ > { // Prevent clicking on the action from selecting the row itself cancelEvent(event); diff --git a/src/frontend/src/tables/bom/BomTable.tsx b/src/frontend/src/tables/bom/BomTable.tsx index d58b09d3c1..f430bcd37c 100644 --- a/src/frontend/src/tables/bom/BomTable.tsx +++ b/src/frontend/src/tables/bom/BomTable.tsx @@ -217,7 +217,7 @@ export function BomTable({ can_build = Math.trunc(can_build); return ( - {can_build} + {can_build} ); } }, diff --git a/src/frontend/src/tables/build/BuildLineTable.tsx b/src/frontend/src/tables/build/BuildLineTable.tsx index 550563c757..985562c291 100644 --- a/src/frontend/src/tables/build/BuildLineTable.tsx +++ b/src/frontend/src/tables/build/BuildLineTable.tsx @@ -109,7 +109,7 @@ export default function BuildLineTable({ params = {} }: { params?: any }) { available > 0 ? ( available ) : ( - {t`No stock available`} + {t`No stock available`} ) } title={t`Available Stock`} diff --git a/src/frontend/src/tables/machine/MachineListTable.tsx b/src/frontend/src/tables/machine/MachineListTable.tsx index 6c0dd920a7..86c2693160 100644 --- a/src/frontend/src/tables/machine/MachineListTable.tsx +++ b/src/frontend/src/tables/machine/MachineListTable.tsx @@ -287,7 +287,10 @@ function MachineDrawer({ - + {machineType ? ( diff --git a/src/frontend/src/tables/machine/MachineTypeTable.tsx b/src/frontend/src/tables/machine/MachineTypeTable.tsx index 90b68d2b91..91151c115b 100644 --- a/src/frontend/src/tables/machine/MachineTypeTable.tsx +++ b/src/frontend/src/tables/machine/MachineTypeTable.tsx @@ -102,7 +102,10 @@ function MachineTypeDrawer({ machineTypeSlug }: { machineTypeSlug: string }) { - + - + - {text} + {text} {record.units && ( [{record.units}] diff --git a/src/frontend/src/tables/plugin/PluginListTable.tsx b/src/frontend/src/tables/plugin/PluginListTable.tsx index cfac22fdb4..449f57281e 100644 --- a/src/frontend/src/tables/plugin/PluginListTable.tsx +++ b/src/frontend/src/tables/plugin/PluginListTable.tsx @@ -158,7 +158,7 @@ export function PluginDrawer({ /> - + diff --git a/src/frontend/src/tables/stock/StockItemTable.tsx b/src/frontend/src/tables/stock/StockItemTable.tsx index 0bf71cc8ed..2c6307befb 100644 --- a/src/frontend/src/tables/stock/StockItemTable.tsx +++ b/src/frontend/src/tables/stock/StockItemTable.tsx @@ -179,7 +179,7 @@ function stockItemTableColumns(): TableColumn[] { - {text} + {text} {part.units && ( [{part.units}]