From 77c8a9d255b78ab14bce439946a64cc9efa2f594 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Tue, 9 Apr 2024 23:56:19 +0100 Subject: [PATCH] [PUI] Move buttons form components (#6988) * move buttons * fix import --- src/frontend/src/components/{items => buttons}/CopyButton.tsx | 0 src/frontend/src/components/{items => buttons}/EditButton.tsx | 0 src/frontend/src/components/{items => buttons}/ScanButton.tsx | 0 src/frontend/src/components/{items => buttons}/YesNoButton.tsx | 0 src/frontend/src/components/details/Details.tsx | 2 +- src/frontend/src/components/forms/InstanceOptions.tsx | 2 +- src/frontend/src/components/items/InfoItem.tsx | 2 +- src/frontend/src/components/modals/AboutInvenTreeModal.tsx | 2 +- src/frontend/src/components/nav/Header.tsx | 2 +- .../pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx | 2 +- src/frontend/src/tables/ColumnRenderers.tsx | 2 +- src/frontend/src/tables/bom/BomTable.tsx | 2 +- src/frontend/src/tables/company/AddressTable.tsx | 2 +- src/frontend/src/tables/machine/MachineListTable.tsx | 2 +- src/frontend/src/tables/part/ParametricPartTable.tsx | 2 +- src/frontend/src/tables/part/PartCategoryTable.tsx | 2 +- src/frontend/src/tables/part/PartParameterTable.tsx | 2 +- src/frontend/src/tables/stock/StockItemTestResultTable.tsx | 2 +- 18 files changed, 14 insertions(+), 14 deletions(-) rename src/frontend/src/components/{items => buttons}/CopyButton.tsx (100%) rename src/frontend/src/components/{items => buttons}/EditButton.tsx (100%) rename src/frontend/src/components/{items => buttons}/ScanButton.tsx (100%) rename src/frontend/src/components/{items => buttons}/YesNoButton.tsx (100%) diff --git a/src/frontend/src/components/items/CopyButton.tsx b/src/frontend/src/components/buttons/CopyButton.tsx similarity index 100% rename from src/frontend/src/components/items/CopyButton.tsx rename to src/frontend/src/components/buttons/CopyButton.tsx diff --git a/src/frontend/src/components/items/EditButton.tsx b/src/frontend/src/components/buttons/EditButton.tsx similarity index 100% rename from src/frontend/src/components/items/EditButton.tsx rename to src/frontend/src/components/buttons/EditButton.tsx diff --git a/src/frontend/src/components/items/ScanButton.tsx b/src/frontend/src/components/buttons/ScanButton.tsx similarity index 100% rename from src/frontend/src/components/items/ScanButton.tsx rename to src/frontend/src/components/buttons/ScanButton.tsx diff --git a/src/frontend/src/components/items/YesNoButton.tsx b/src/frontend/src/components/buttons/YesNoButton.tsx similarity index 100% rename from src/frontend/src/components/items/YesNoButton.tsx rename to src/frontend/src/components/buttons/YesNoButton.tsx diff --git a/src/frontend/src/components/details/Details.tsx b/src/frontend/src/components/details/Details.tsx index d82615212d..e0c8a6cc44 100644 --- a/src/frontend/src/components/details/Details.tsx +++ b/src/frontend/src/components/details/Details.tsx @@ -23,9 +23,9 @@ import { getDetailUrl } from '../../functions/urls'; import { base_url } from '../../main'; import { apiUrl } from '../../states/ApiState'; import { useGlobalSettingsState } from '../../states/SettingsState'; +import { YesNoButton } from '../buttons/YesNoButton'; import { ProgressBar } from '../items/ProgressBar'; import { StylishText } from '../items/StylishText'; -import { YesNoButton } from '../items/YesNoButton'; import { getModelInfo } from '../render/ModelType'; import { StatusRenderer } from '../render/StatusRenderer'; diff --git a/src/frontend/src/components/forms/InstanceOptions.tsx b/src/frontend/src/components/forms/InstanceOptions.tsx index 9dc1c1115f..4074cee3cf 100644 --- a/src/frontend/src/components/forms/InstanceOptions.tsx +++ b/src/frontend/src/components/forms/InstanceOptions.tsx @@ -6,7 +6,7 @@ import { IconCheck } from '@tabler/icons-react'; import { useServerApiState } from '../../states/ApiState'; import { useLocalState } from '../../states/LocalState'; import { HostList } from '../../states/states'; -import { EditButton } from '../items/EditButton'; +import { EditButton } from '../buttons/EditButton'; import { HostOptionsForm } from './HostOptionsForm'; export function InstanceOptions({ diff --git a/src/frontend/src/components/items/InfoItem.tsx b/src/frontend/src/components/items/InfoItem.tsx index dbfdae25ec..ad12e5d855 100644 --- a/src/frontend/src/components/items/InfoItem.tsx +++ b/src/frontend/src/components/items/InfoItem.tsx @@ -2,8 +2,8 @@ import { Trans } from '@lingui/macro'; import { Code, Flex, Group, Text } from '@mantine/core'; import { Link, To } from 'react-router-dom'; +import { YesNoButton } from '../buttons/YesNoButton'; import { DetailDrawerLink } from '../nav/DetailDrawer'; -import { YesNoButton } from './YesNoButton'; export function InfoItem({ name, diff --git a/src/frontend/src/components/modals/AboutInvenTreeModal.tsx b/src/frontend/src/components/modals/AboutInvenTreeModal.tsx index 19e7d5011c..4c4bd53c14 100644 --- a/src/frontend/src/components/modals/AboutInvenTreeModal.tsx +++ b/src/frontend/src/components/modals/AboutInvenTreeModal.tsx @@ -19,7 +19,7 @@ import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { apiUrl, useServerApiState } from '../../states/ApiState'; import { useLocalState } from '../../states/LocalState'; import { useUserState } from '../../states/UserState'; -import { CopyButton } from '../items/CopyButton'; +import { CopyButton } from '../buttons/CopyButton'; type AboutLookupRef = { ref: string; diff --git a/src/frontend/src/components/nav/Header.tsx b/src/frontend/src/components/nav/Header.tsx index b4f139cfb8..755db08a8d 100644 --- a/src/frontend/src/components/nav/Header.tsx +++ b/src/frontend/src/components/nav/Header.tsx @@ -10,7 +10,7 @@ import { navTabs as mainNavTabs } from '../../defaults/links'; import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { InvenTreeStyle } from '../../globalStyle'; import { apiUrl } from '../../states/ApiState'; -import { ScanButton } from '../items/ScanButton'; +import { ScanButton } from '../buttons/ScanButton'; import { MainMenu } from './MainMenu'; import { NavHoverMenu } from './NavHoverMenu'; import { NavigationDrawer } from './NavigationDrawer'; diff --git a/src/frontend/src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx b/src/frontend/src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx index 576e34a75d..f5b89678b9 100644 --- a/src/frontend/src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx +++ b/src/frontend/src/pages/Index/Settings/AccountSettings/AccountDetailPanel.tsx @@ -4,7 +4,7 @@ import { useForm } from '@mantine/form'; import { useToggle } from '@mantine/hooks'; import { api } from '../../../../App'; -import { EditButton } from '../../../../components/items/EditButton'; +import { EditButton } from '../../../../components/buttons/EditButton'; import { ApiEndpoints } from '../../../../enums/ApiEndpoints'; import { apiUrl } from '../../../../states/ApiState'; import { useUserState } from '../../../../states/UserState'; diff --git a/src/frontend/src/tables/ColumnRenderers.tsx b/src/frontend/src/tables/ColumnRenderers.tsx index acd89d48c4..a7f266e8da 100644 --- a/src/frontend/src/tables/ColumnRenderers.tsx +++ b/src/frontend/src/tables/ColumnRenderers.tsx @@ -4,9 +4,9 @@ import { t } from '@lingui/macro'; import { Anchor } from '@mantine/core'; +import { YesNoButton } from '../components/buttons/YesNoButton'; import { Thumbnail } from '../components/images/Thumbnail'; import { ProgressBar } from '../components/items/ProgressBar'; -import { YesNoButton } from '../components/items/YesNoButton'; import { TableStatusRenderer } from '../components/render/StatusRenderer'; import { RenderOwner } from '../components/render/User'; import { formatCurrency, renderDate } from '../defaults/formatters'; diff --git a/src/frontend/src/tables/bom/BomTable.tsx b/src/frontend/src/tables/bom/BomTable.tsx index 5c4e602526..b2101897dc 100644 --- a/src/frontend/src/tables/bom/BomTable.tsx +++ b/src/frontend/src/tables/bom/BomTable.tsx @@ -8,8 +8,8 @@ import { import { ReactNode, useCallback, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; +import { YesNoButton } from '../../components/buttons/YesNoButton'; import { Thumbnail } from '../../components/images/Thumbnail'; -import { YesNoButton } from '../../components/items/YesNoButton'; import { formatPriceRange } from '../../defaults/formatters'; import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { ModelType } from '../../enums/ModelType'; diff --git a/src/frontend/src/tables/company/AddressTable.tsx b/src/frontend/src/tables/company/AddressTable.tsx index 96af3c7d9f..bef8d0cef9 100644 --- a/src/frontend/src/tables/company/AddressTable.tsx +++ b/src/frontend/src/tables/company/AddressTable.tsx @@ -2,8 +2,8 @@ import { t } from '@lingui/macro'; import { useCallback, useMemo, useState } from 'react'; import { AddItemButton } from '../../components/buttons/AddItemButton'; +import { YesNoButton } from '../../components/buttons/YesNoButton'; import { ApiFormFieldSet } from '../../components/forms/fields/ApiFormField'; -import { YesNoButton } from '../../components/items/YesNoButton'; import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { UserRoles } from '../../enums/Roles'; import { diff --git a/src/frontend/src/tables/machine/MachineListTable.tsx b/src/frontend/src/tables/machine/MachineListTable.tsx index 28c703f304..d46772f4b2 100644 --- a/src/frontend/src/tables/machine/MachineListTable.tsx +++ b/src/frontend/src/tables/machine/MachineListTable.tsx @@ -23,6 +23,7 @@ import { useNavigate } from 'react-router-dom'; import { api } from '../../App'; import { AddItemButton } from '../../components/buttons/AddItemButton'; +import { YesNoButton } from '../../components/buttons/YesNoButton'; import { ActionDropdown, DeleteItemAction, @@ -30,7 +31,6 @@ import { } from '../../components/items/ActionDropdown'; import { InfoItem } from '../../components/items/InfoItem'; import { UnavailableIndicator } from '../../components/items/UnavailableIndicator'; -import { YesNoButton } from '../../components/items/YesNoButton'; import { DetailDrawer, DetailDrawerLink diff --git a/src/frontend/src/tables/part/ParametricPartTable.tsx b/src/frontend/src/tables/part/ParametricPartTable.tsx index c842efde04..ee2baa620f 100644 --- a/src/frontend/src/tables/part/ParametricPartTable.tsx +++ b/src/frontend/src/tables/part/ParametricPartTable.tsx @@ -6,8 +6,8 @@ import { useQuery } from '@tanstack/react-query'; import { useCallback, useMemo, useState } from 'react'; import { api } from '../../App'; +import { YesNoButton } from '../../components/buttons/YesNoButton'; import { ApiFormFieldSet } from '../../components/forms/fields/ApiFormField'; -import { YesNoButton } from '../../components/items/YesNoButton'; import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { ModelType } from '../../enums/ModelType'; import { UserRoles } from '../../enums/Roles'; diff --git a/src/frontend/src/tables/part/PartCategoryTable.tsx b/src/frontend/src/tables/part/PartCategoryTable.tsx index 46cbe72b2f..8f78438b18 100644 --- a/src/frontend/src/tables/part/PartCategoryTable.tsx +++ b/src/frontend/src/tables/part/PartCategoryTable.tsx @@ -3,7 +3,7 @@ import { useCallback, useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { AddItemButton } from '../../components/buttons/AddItemButton'; -import { YesNoButton } from '../../components/items/YesNoButton'; +import { YesNoButton } from '../../components/buttons/YesNoButton'; import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { ModelType } from '../../enums/ModelType'; import { UserRoles } from '../../enums/Roles'; diff --git a/src/frontend/src/tables/part/PartParameterTable.tsx b/src/frontend/src/tables/part/PartParameterTable.tsx index a598cf885a..80e37fbb20 100644 --- a/src/frontend/src/tables/part/PartParameterTable.tsx +++ b/src/frontend/src/tables/part/PartParameterTable.tsx @@ -3,8 +3,8 @@ import { Text } from '@mantine/core'; import { useCallback, useMemo, useState } from 'react'; import { AddItemButton } from '../../components/buttons/AddItemButton'; +import { YesNoButton } from '../../components/buttons/YesNoButton'; import { ApiFormFieldSet } from '../../components/forms/fields/ApiFormField'; -import { YesNoButton } from '../../components/items/YesNoButton'; import { ApiEndpoints } from '../../enums/ApiEndpoints'; import { UserRoles } from '../../enums/Roles'; import { diff --git a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx index dba02931cf..8014e1a33b 100644 --- a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx +++ b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx @@ -12,9 +12,9 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { api } from '../../App'; import { AddItemButton } from '../../components/buttons/AddItemButton'; +import { PassFailButton } from '../../components/buttons/YesNoButton'; import { ApiFormFieldSet } from '../../components/forms/fields/ApiFormField'; import { AttachmentLink } from '../../components/items/AttachmentLink'; -import { PassFailButton } from '../../components/items/YesNoButton'; import { RenderUser } from '../../components/render/User'; import { renderDate } from '../../defaults/formatters'; import { ApiEndpoints } from '../../enums/ApiEndpoints';