From 23f43ffd33ff8031af2546f8d9eb19313e77a742 Mon Sep 17 00:00:00 2001 From: Oliver Date: Mon, 13 Apr 2026 20:36:29 +1000 Subject: [PATCH] [plugin] Render tables (#11733) * Move useFilterSet state to the @lib * Refactor useTable hook into @lib * Refactor string helper functions * Refactor constructFormUrl func * Refactor Boundary component * Refactor StoredTableState * More refactoring * Refactor CopyButton and CopyableCell * Pass table render func to plugins * Provide internal wrapper function, while allowing the "api" and "navigate" functions to be provided by the caller * Adds component which is exposed to plugins * Update frontend versioning * Update docs * Handle condition where UI does not provide table rendering function * Move queryFilters out of custom state * Fix exported type * Extract searchParams - Cannot be used outside of router component - Only provide when the table is generated internally * Bump UI version * Fix for right-click context menu - Function needs to be defined with the context menu provider --- docs/docs/plugins/frontend.md | 23 +++- src/frontend/CHANGELOG.md | 8 ++ .../{src => lib}/components/Boundary.tsx | 0 .../buttons => lib/components}/CopyButton.tsx | 9 +- .../components}/CopyableCell.tsx | 2 +- .../lib/components/InvenTreeTable.tsx | 63 ++++++++++ .../components/TableColumnSelect.tsx} | 0 src/frontend/lib/functions/Forms.tsx | 47 +++++++ src/frontend/lib/functions/Notification.tsx | 50 ++++++++ .../tables.tsx => lib/functions/String.tsx} | 0 .../{src => lib}/hooks/UseFilterSet.tsx | 4 +- src/frontend/{src => lib}/hooks/UseTable.tsx | 19 +-- src/frontend/lib/index.ts | 50 +++++++- .../{src => lib}/states/StoredTableState.tsx | 2 +- src/frontend/lib/types/Plugins.tsx | 26 ++-- src/frontend/lib/types/Tables.tsx | 25 ++-- src/frontend/package.json | 2 +- .../src/components/barcodes/BarcodeInput.tsx | 2 +- .../src/components/barcodes/QRCode.tsx | 2 +- .../src/components/calendar/Calendar.tsx | 2 +- .../components/dashboard/DashboardWidget.tsx | 2 +- .../src/components/details/Details.tsx | 2 +- .../editors/TemplateEditor/TemplateEditor.tsx | 2 +- src/frontend/src/components/forms/ApiForm.tsx | 23 ++-- .../importer/ImportDataSelector.tsx | 2 +- .../components/modals/AboutInvenTreeModal.tsx | 2 +- src/frontend/src/components/nav/Layout.tsx | 2 +- .../src/components/nav/NotificationDrawer.tsx | 2 +- .../src/components/nav/PageDetail.tsx | 2 +- .../src/components/nav/SearchDrawer.tsx | 2 +- .../src/components/panels/PanelGroup.tsx | 2 +- .../src/components/plugins/PluginContext.tsx | 12 ++ .../components/plugins/RemoteComponent.tsx | 2 +- .../src/components/render/Instance.tsx | 2 +- src/frontend/src/components/render/Part.tsx | 2 +- src/frontend/src/components/render/Stock.tsx | 2 +- .../src/components/settings/SettingItem.tsx | 2 +- .../components/wizards/OrderPartsWizard.tsx | 2 +- .../src/components/wizards/WizardDrawer.tsx | 2 +- src/frontend/src/contexts/LanguageContext.tsx | 2 +- src/frontend/src/functions/forms.tsx | 50 +------- src/frontend/src/functions/notifications.tsx | 49 -------- src/frontend/src/hooks/UseCalendar.tsx | 2 +- src/frontend/src/pages/Index/Scan.tsx | 6 +- .../Settings/AccountSettings/MFASettings.tsx | 2 +- .../AccountSettings/QrRegistrationForm.tsx | 2 +- .../AccountSettings/SecurityContent.tsx | 2 +- .../AdminCenter/CurrencyManagementPanel.tsx | 2 +- .../AdminCenter/UnitManagementPanel.tsx | 2 +- src/frontend/src/pages/Notifications.tsx | 2 +- .../src/pages/part/PartStockHistoryDetail.tsx | 2 +- .../pages/part/pricing/BomPricingPanel.tsx | 2 +- .../pages/part/pricing/PriceBreakPanel.tsx | 2 +- .../part/pricing/PurchaseHistoryPanel.tsx | 2 +- .../pages/part/pricing/SaleHistoryPanel.tsx | 2 +- .../part/pricing/SupplierPricingPanel.tsx | 2 +- .../part/pricing/VariantPricingPanel.tsx | 2 +- src/frontend/src/tables/InvenTreeTable.tsx | 116 +++++++++++++----- .../src/tables/InvenTreeTableHeader.tsx | 24 ++-- src/frontend/src/tables/bom/BomTable.tsx | 2 +- src/frontend/src/tables/bom/UsedInTable.tsx | 2 +- .../tables/build/BuildAllocatedStockTable.tsx | 2 +- .../src/tables/build/BuildLineTable.tsx | 2 +- .../src/tables/build/BuildOrderTable.tsx | 2 +- .../src/tables/build/BuildOutputTable.tsx | 2 +- .../src/tables/company/AddressTable.tsx | 2 +- .../src/tables/company/CompanyTable.tsx | 2 +- .../src/tables/company/ContactTable.tsx | 2 +- .../src/tables/general/AttachmentTable.tsx | 2 +- .../src/tables/general/BarcodeScanTable.tsx | 2 +- .../src/tables/general/ExtraLineItemTable.tsx | 2 +- .../src/tables/general/ParameterTable.tsx | 2 +- .../tables/general/ParameterTemplateTable.tsx | 2 +- .../tables/general/ParametricDataTable.tsx | 2 +- .../src/tables/machine/MachineListTable.tsx | 2 +- .../src/tables/machine/MachineTypeTable.tsx | 2 +- .../tables/part/PartBuildAllocationsTable.tsx | 2 +- .../src/tables/part/PartCategoryTable.tsx | 2 +- .../tables/part/PartCategoryTemplateTable.tsx | 2 +- .../tables/part/PartPurchaseOrdersTable.tsx | 2 +- .../tables/part/PartSalesAllocationsTable.tsx | 2 +- src/frontend/src/tables/part/PartTable.tsx | 2 +- .../src/tables/part/PartTestResultTable.tsx | 2 +- .../src/tables/part/PartTestTemplateTable.tsx | 2 +- .../src/tables/part/RelatedPartTable.tsx | 2 +- .../src/tables/part/SelectionListTable.tsx | 2 +- .../src/tables/plugin/PluginErrorTable.tsx | 2 +- .../src/tables/plugin/PluginListTable.tsx | 2 +- .../purchasing/ManufacturerPartTable.tsx | 2 +- .../purchasing/PurchaseOrderLineItemTable.tsx | 2 +- .../tables/purchasing/PurchaseOrderTable.tsx | 2 +- .../tables/purchasing/SupplierPartTable.tsx | 2 +- .../purchasing/SupplierPriceBreakTable.tsx | 2 +- .../tables/sales/ReturnOrderLineItemTable.tsx | 2 +- .../src/tables/sales/ReturnOrderTable.tsx | 2 +- .../sales/SalesOrderAllocationTable.tsx | 2 +- .../tables/sales/SalesOrderLineItemTable.tsx | 2 +- .../tables/sales/SalesOrderShipmentTable.tsx | 2 +- .../src/tables/sales/SalesOrderTable.tsx | 2 +- .../src/tables/settings/ApiTokenTable.tsx | 4 +- .../settings/BarcodeScanHistoryTable.tsx | 6 +- .../src/tables/settings/CustomStateTable.tsx | 2 +- .../src/tables/settings/CustomUnitsTable.tsx | 2 +- .../src/tables/settings/EmailTable.tsx | 2 +- .../src/tables/settings/ErrorTable.tsx | 4 +- .../tables/settings/ExportSessionTable.tsx | 2 +- .../src/tables/settings/FailedTasksTable.tsx | 2 +- .../src/tables/settings/GroupTable.tsx | 2 +- .../tables/settings/ImportSessionTable.tsx | 2 +- .../src/tables/settings/PendingTasksTable.tsx | 2 +- .../src/tables/settings/ProjectCodeTable.tsx | 2 +- .../tables/settings/ScheduledTasksTable.tsx | 2 +- .../src/tables/settings/TemplateTable.tsx | 2 +- .../src/tables/settings/UserTable.tsx | 2 +- .../src/tables/stock/InstalledItemsTable.tsx | 2 +- .../src/tables/stock/LocationTypesTable.tsx | 2 +- .../src/tables/stock/StockItemTable.tsx | 2 +- .../tables/stock/StockItemTestResultTable.tsx | 2 +- .../src/tables/stock/StockLocationTable.tsx | 2 +- .../src/tables/stock/StockTrackingTable.tsx | 2 +- 120 files changed, 506 insertions(+), 304 deletions(-) rename src/frontend/{src => lib}/components/Boundary.tsx (100%) rename src/frontend/{src/components/buttons => lib/components}/CopyButton.tsx (89%) rename src/frontend/{src/tables => lib/components}/CopyableCell.tsx (95%) create mode 100644 src/frontend/lib/components/InvenTreeTable.tsx rename src/frontend/{src/tables/ColumnSelect.tsx => lib/components/TableColumnSelect.tsx} (100%) create mode 100644 src/frontend/lib/functions/Forms.tsx create mode 100644 src/frontend/lib/functions/Notification.tsx rename src/frontend/{src/functions/tables.tsx => lib/functions/String.tsx} (100%) rename src/frontend/{src => lib}/hooks/UseFilterSet.tsx (91%) rename src/frontend/{src => lib}/hooks/UseTable.tsx (86%) rename src/frontend/{src => lib}/states/StoredTableState.tsx (98%) diff --git a/docs/docs/plugins/frontend.md b/docs/docs/plugins/frontend.md index 0df93fd49d..550a604590 100644 --- a/docs/docs/plugins/frontend.md +++ b/docs/docs/plugins/frontend.md @@ -10,6 +10,9 @@ Plugins can inherit from the [UserInterfaceMixin](./mixins/ui.md) class to provi Note that the [InvenTree plugin creator](./creator.md) can be used to scaffold a new plugin with the necessary structure for frontend integration. This will automatically set up the necessary files and configurations to get started with frontend development. +!!! info "Simplified Development" + Using the plugin creator can significantly simplify the process of developing a frontend plugin, as it provides a ready-made template with the necessary configurations for building and integrating the frontend code. Rolling your own frontend plugin from scratch is possible, but it requires a good understanding of the InvenTree frontend architecture and build process. + ## Frontend Architecture When designing a frontend plugin component, it is important to have at least a basic understanding of the InvenTree frontend architecture. @@ -76,20 +79,28 @@ The following properties are available in the `context` object: | Property | Description | | -------- | ----------- | | `version` | An object containing the current InvenTree version information. | +| `api` | The Axios instance configured to communicate with the InvenTree API. | +| `queryClient` | The query client instance used for managing API calls in the frontend. | | `user` | An object containing information about the currently logged-in user. | +| `userSettings` | An object containing user-specific settings. | +| `globalSettings` | An object containing global settings for the InvenTree instance. | +| `modelInformation` | An object containing information about the models available in the InvenTree instance. | +| `renderInstance` | A function to render a model instance | | `host` | An object containing information about the current host (server) configuration. | | `i18n` | An object containing internationalization (i18n) functions for translating text. | | `locale` | The current locale being used for the user interface. | -| `api` | The Axios instance configured to communicate with the InvenTree API. | -| `queryClient` | The query client instance used for managing API calls in the frontend. | | `navigate` | A function to navigate to a different page in the InvenTree web interface. | -| `globalSettings` | An object containing global settings for the InvenTree instance. | -| `userSettings` | An object containing user-specific settings. | -| `modelInformation` | An object containing information about the models available in the InvenTree instance. | -| `renderInstance` | A function to render a model instance | | `theme` | The current Mantine theme being used in the InvenTree web interface. | | `colorScheme` | The current color scheme being used in the InvenTree web interface. | | `forms` | A set of functional components for rendering forms in the InvenTree web interface. | +| `tables` | A set of functional components for rendering tables in the InvenTree web interface. | +| `importer` | A set of functions for controlling the global importer drawer in the InvenTree web interface. | +| `model` | The model type associated with the rendered component (if applicable). | +| `id` | The ID (primary key) of the model instance being rendered (if applicable). | +| `instance` | The model instance data (if available). | +| `reloadContent` | A function which can be called to reload the plugin content. | +| `reloadInstance` | A function which can be called to reload the model instance. | +| `context` | Any additional context data which may be passed to the plugin. | This set of components is passed through at render time to the plugin function, allowing the plugin code to hook directly into the InvenTree web interface and access the necessary context for rendering. diff --git a/src/frontend/CHANGELOG.md b/src/frontend/CHANGELOG.md index 7fd7be38d5..9d1d44f1bb 100644 --- a/src/frontend/CHANGELOG.md +++ b/src/frontend/CHANGELOG.md @@ -2,6 +2,14 @@ This file contains historical changelog information for the InvenTree UI components library. +### 0.11.1 - April 2026 + +Fixes dependency issues for the `InvenTreeTable` component, which were introduced in `0.11.0`. This ensures that the component works correctly and does not cause issues with plugin builds. + +### 0.11.0 - April 2026 + +Adds the `InvenTreeTable` component, which provides plugins with a method of implementing an API-driven data table which is consistent with the rest of the InvenTree UI. This component supports features such as pagination, sorting, and filtering, and can be used to display data from the InvenTree API in a tabular format. + ### 0.10.1 - April 2026 Allows plugins to specify custom model rendering functions within the data import wizard, allowing import of data models not defined in the core InvenTree codebase. diff --git a/src/frontend/src/components/Boundary.tsx b/src/frontend/lib/components/Boundary.tsx similarity index 100% rename from src/frontend/src/components/Boundary.tsx rename to src/frontend/lib/components/Boundary.tsx diff --git a/src/frontend/src/components/buttons/CopyButton.tsx b/src/frontend/lib/components/CopyButton.tsx similarity index 89% rename from src/frontend/src/components/buttons/CopyButton.tsx rename to src/frontend/lib/components/CopyButton.tsx index a43b4b3099..da72f82a26 100644 --- a/src/frontend/src/components/buttons/CopyButton.tsx +++ b/src/frontend/lib/components/CopyButton.tsx @@ -10,8 +10,7 @@ import { Text, Tooltip } from '@mantine/core'; - -import { InvenTreeIcon } from '../../functions/icons'; +import { IconCheck, IconCopy } from '@tabler/icons-react'; import type { JSX } from 'react'; @@ -62,11 +61,7 @@ export function CopyButton({ variant={copied ? 'transparent' : (variant ?? 'transparent')} size={size ?? 'sm'} > - {copied ? ( - - ) : ( - - )} + {copied ? : } {content} {label && ( diff --git a/src/frontend/src/tables/CopyableCell.tsx b/src/frontend/lib/components/CopyableCell.tsx similarity index 95% rename from src/frontend/src/tables/CopyableCell.tsx rename to src/frontend/lib/components/CopyableCell.tsx index e90d122296..eee9b0e26f 100644 --- a/src/frontend/src/tables/CopyableCell.tsx +++ b/src/frontend/lib/components/CopyableCell.tsx @@ -1,6 +1,6 @@ import { Group } from '@mantine/core'; import { useState } from 'react'; -import { CopyButton } from '../components/buttons/CopyButton'; +import { CopyButton } from './CopyButton'; /** * A wrapper component that adds a copy button to cell content on hover diff --git a/src/frontend/lib/components/InvenTreeTable.tsx b/src/frontend/lib/components/InvenTreeTable.tsx new file mode 100644 index 0000000000..298d0b994e --- /dev/null +++ b/src/frontend/lib/components/InvenTreeTable.tsx @@ -0,0 +1,63 @@ +import { Alert } from '@mantine/core'; +import { + INVENTREE_PLUGIN_VERSION, + type InvenTreePluginContext +} from '../types/Plugins'; +import type { + InvenTreeTableProps, + TableColumn, + TableState +} from '../types/Tables'; + +/** + * Wrapper function which allows plugins to render an InvenTree component instance directly, + * in a similar way to the standard InvenTreeTable component. + * + * Note: The InventreePluginContext "context" object must be provided when rendering the table + * + */ + +export default function InvenTreeTable({ + url, + tableState, + tableData, + columns, + props, + context +}: { + url?: string; + tableState: TableState; + tableData?: any[]; + columns: TableColumn[]; + props: InvenTreeTableProps; + context: InvenTreePluginContext; +}) { + if (!context?.tables?.renderTable) { + return ( + + { + 'The component cannot be rendered because the plugin context is missing the "renderTable" function.' + } +
+ { + 'This means that the InvenTree UI library version is incompatible with this plugin version.' + } +
+ Plugin Version: {INVENTREE_PLUGIN_VERSION} +
+ UI Version: {context?.version?.inventree || 'unknown'} +
+ + ); + } + + return context?.tables.renderTable({ + url: url, + tableState: tableState, + tableData: tableData, + columns: columns, + props: props, + api: context.api, + navigate: context.navigate + }); +} diff --git a/src/frontend/src/tables/ColumnSelect.tsx b/src/frontend/lib/components/TableColumnSelect.tsx similarity index 100% rename from src/frontend/src/tables/ColumnSelect.tsx rename to src/frontend/lib/components/TableColumnSelect.tsx diff --git a/src/frontend/lib/functions/Forms.tsx b/src/frontend/lib/functions/Forms.tsx new file mode 100644 index 0000000000..78ad55ce2e --- /dev/null +++ b/src/frontend/lib/functions/Forms.tsx @@ -0,0 +1,47 @@ +import type { ApiEndpoints } from '../enums/ApiEndpoints'; +import type { PathParams } from '../types/Core'; +import type { ApiFormFieldSet, ApiFormFieldType } from '../types/Forms'; +import { apiUrl } from './Api'; + +/** + * Construct an API url from the provided ApiFormProps object + */ +export function constructFormUrl( + url: ApiEndpoints | string, + pk?: string | number, + pathParams?: PathParams, + queryParams?: URLSearchParams +): string { + let formUrl = apiUrl(url, pk, pathParams); + + if (queryParams) { + formUrl += `?${queryParams.toString()}`; + } + + return formUrl; +} + +export type NestedDict = { [key: string]: string | number | NestedDict }; + +export function mapFields( + fields: ApiFormFieldSet, + fieldFunction: (path: string, value: ApiFormFieldType, key: string) => any, + _path?: string +): NestedDict { + const res: NestedDict = {}; + + for (const [k, v] of Object.entries(fields)) { + const path = _path ? `${_path}.${k}` : k; + let value: any; + + if (v.field_type === 'nested object' && v.children) { + value = mapFields(v.children, fieldFunction, path); + } else { + value = fieldFunction(path, v, k); + } + + if (value !== undefined) res[k] = value; + } + + return res; +} diff --git a/src/frontend/lib/functions/Notification.tsx b/src/frontend/lib/functions/Notification.tsx new file mode 100644 index 0000000000..8e16570e7c --- /dev/null +++ b/src/frontend/lib/functions/Notification.tsx @@ -0,0 +1,50 @@ +import { t } from '@lingui/core/macro'; +import { notifications } from '@mantine/notifications'; + +/** + * Show a notification that the feature is not yet implemented + */ +export function notYetImplemented() { + notifications.hide('not-implemented'); + + notifications.show({ + title: t`Not implemented`, + message: t`This feature is not yet implemented`, + color: 'red', + id: 'not-implemented' + }); +} + +/** + * Show a notification that the user does not have permission to perform the action + */ +export function permissionDenied() { + notifications.show({ + title: t`Permission Denied`, + message: t`You do not have permission to perform this action`, + color: 'red' + }); +} + +/** + * Display a notification on an invalid return code + */ +export function invalidResponse(returnCode: number) { + // TODO: Specific return code messages + notifications.show({ + title: t`Invalid Return Code`, + message: t`Server returned status ${returnCode}`, + color: 'red' + }); +} + +/** + * Display a notification on timeout + */ +export function showTimeoutNotification() { + notifications.show({ + title: t`Timeout`, + message: t`The request timed out`, + color: 'red' + }); +} diff --git a/src/frontend/src/functions/tables.tsx b/src/frontend/lib/functions/String.tsx similarity index 100% rename from src/frontend/src/functions/tables.tsx rename to src/frontend/lib/functions/String.tsx diff --git a/src/frontend/src/hooks/UseFilterSet.tsx b/src/frontend/lib/hooks/UseFilterSet.tsx similarity index 91% rename from src/frontend/src/hooks/UseFilterSet.tsx rename to src/frontend/lib/hooks/UseFilterSet.tsx index 9d0300cb46..80a7791f1e 100644 --- a/src/frontend/src/hooks/UseFilterSet.tsx +++ b/src/frontend/lib/hooks/UseFilterSet.tsx @@ -1,8 +1,8 @@ -import type { FilterSetState, TableFilter } from '@lib/types/Filters'; import { useLocalStorage } from '@mantine/hooks'; import { useCallback, useMemo } from 'react'; +import type { FilterSetState, TableFilter } from '../types/Filters'; -export function useFilterSet( +export default function useFilterSet( filterKey: string, initialFilters?: TableFilter[] ): FilterSetState { diff --git a/src/frontend/src/hooks/UseTable.tsx b/src/frontend/lib/hooks/UseTable.tsx similarity index 86% rename from src/frontend/src/hooks/UseTable.tsx rename to src/frontend/lib/hooks/UseTable.tsx index 49a2c50569..52bdd6afa4 100644 --- a/src/frontend/src/hooks/UseTable.tsx +++ b/src/frontend/lib/hooks/UseTable.tsx @@ -1,10 +1,9 @@ import { randomId } from '@mantine/hooks'; import { useCallback, useMemo, useState } from 'react'; -import { useSearchParams } from 'react-router-dom'; -import type { FilterSetState, TableFilter } from '@lib/types/Filters'; -import type { TableState } from '@lib/types/Tables'; -import { useFilterSet } from './UseFilterSet'; +import type { FilterSetState, TableFilter } from '../types/Filters'; +import type { TableState } from '../types/Tables'; +import useFilterSet from './UseFilterSet'; export type TableStateExtraProps = { idAccessor?: string; @@ -17,7 +16,7 @@ export type TableStateExtraProps = { * Refer to the TableState type definition for more information. */ -export function useTable( +export default function useTable( tableName: string, tableProps: TableStateExtraProps = { idAccessor: 'pk', @@ -29,13 +28,6 @@ export function useTable( return `${tableName.replaceAll('-', '')}-${randomId()}`; } - // Extract URL query parameters (e.g. ?active=true&overdue=false) - const [queryFilters, setQueryFilters] = useSearchParams(); - - const clearQueryFilters = useCallback(() => { - setQueryFilters({}); - }, []); - const [tableKey, setTableKey] = useState(generateTableName()); // Callback used to refresh (reload) the table @@ -133,9 +125,6 @@ export function useTable( isLoading, setIsLoading, filterSet, - queryFilters, - setQueryFilters, - clearQueryFilters, expandedRecords, setExpandedRecords, isRowExpanded, diff --git a/src/frontend/lib/index.ts b/src/frontend/lib/index.ts index f9812e6df7..c38dfffca2 100644 --- a/src/frontend/lib/index.ts +++ b/src/frontend/lib/index.ts @@ -15,10 +15,20 @@ export { UserRoles, UserPermissions } from './enums/Roles'; export type { InvenTreePluginContext, InvenTreeFormsContext, + InvenTreeTablesContext, + ImporterDrawerContext, PluginVersion, StockAdjustmentFormsContext } from './types/Plugins'; -export type { RowAction, RowViewProps } from './types/Tables'; + +export type { + RowAction, + RowViewProps, + TableColumn, + TableColumnProps, + InvenTreeTableProps, + InvenTreeTableRenderProps +} from './types/Tables'; export type { ApiFormFieldChoice, @@ -42,6 +52,14 @@ export { getDetailUrl, navigateToLink } from './functions/Navigation'; + +export { + notYetImplemented, + permissionDenied, + invalidResponse, + showTimeoutNotification +} from './functions/Notification'; + export { checkPluginVersion, initPlugin @@ -53,16 +71,32 @@ export { formatFileSize } from './functions/Formatting'; +export { + constructFormUrl, + mapFields, + type NestedDict +} from './functions/Forms'; + +export { + shortenString, + hashString +} from './functions/String'; + // Common UI components export { ActionButton, type ActionButtonProps } from './components/ActionButton'; export { AddItemButton } from './components/AddItemButton'; +export { Boundary, DefaultFallback } from './components/Boundary'; export { ButtonMenu } from './components/ButtonMenu'; +export { CopyButton } from './components/CopyButton'; +export { CopyableCell } from './components/CopyableCell'; export { ProgressBar } from './components/ProgressBar'; export { PassFailButton, YesNoButton } from './components/YesNoButton'; export { SearchInput } from './components/SearchInput'; +export { TableColumnSelect } from './components/TableColumnSelect'; +export { default as InvenTreeTable } from './components/InvenTreeTable'; export { RowViewAction, RowDuplicateAction, @@ -77,7 +111,21 @@ export { default as useMonitorDataOutput, type MonitorDataOutputProps } from './hooks/MonitorDataOutput'; + export { default as useMonitorBackgroundTask, type MonitorBackgroundTaskProps } from './hooks/MonitorBackgroundTask'; + +export { default as useFilterSet } from './hooks/UseFilterSet'; + +export { + default as useTable, + type TableStateExtraProps +} from './hooks/UseTable'; + +// State management +export { + type StoredTableStateProps, + useStoredTableState +} from './states/StoredTableState'; diff --git a/src/frontend/src/states/StoredTableState.tsx b/src/frontend/lib/states/StoredTableState.tsx similarity index 98% rename from src/frontend/src/states/StoredTableState.tsx rename to src/frontend/lib/states/StoredTableState.tsx index 7d9519dc09..f0e6c40e09 100644 --- a/src/frontend/src/states/StoredTableState.tsx +++ b/src/frontend/lib/states/StoredTableState.tsx @@ -13,7 +13,7 @@ const DEFAULT_PAGE_SIZE: number = 25; * - columnNames: An object mapping table keys to arrays of column names. * - sorting: An object mapping table keys to sorting configurations. */ -interface StoredTableStateProps { +export interface StoredTableStateProps { pageSize: number; setPageSize: (size: number) => void; tableSorting: Record; diff --git a/src/frontend/lib/types/Plugins.tsx b/src/frontend/lib/types/Plugins.tsx index 840d695d6d..575cf9f3c5 100644 --- a/src/frontend/lib/types/Plugins.tsx +++ b/src/frontend/lib/types/Plugins.tsx @@ -13,6 +13,7 @@ import type { import type { UseModalReturn } from './Modals'; import type { RenderInstanceProps } from './Rendering'; import type { SettingsStateProps } from './Settings'; +import type { InvenTreeTableRenderProps } from './Tables'; import type { UserStateProps } from './User'; export interface PluginProps { @@ -48,6 +49,10 @@ export type InvenTreeFormsContext = { stockActions: StockAdjustmentFormsContext; }; +export type InvenTreeTablesContext> = { + renderTable: (props: InvenTreeTableRenderProps) => React.ReactNode; +}; + export type ImporterDrawerContext = { open: (sessionId: number, options?: { onClose?: () => void }) => void; close: () => void; @@ -61,20 +66,22 @@ export type ImporterDrawerContext = { * * @param version - The version of the running InvenTree software stack * @param api - The Axios API instance (see ../states/ApiState.tsx) + * @param queryClient - The Tanstack QueryClient instance (see ../states/QueryState.tsx) * @param user - The current user instance (see ../states/UserState.tsx) * @param userSettings - The current user settings (see ../states/SettingsState.tsx) * @param globalSettings - The global settings (see ../states/SettingsState.tsx) - * @param navigate - The navigation function (see react-router-dom) - * @param theme - The current Mantine theme - * @param forms - A set of functions for opening various API forms (see ../components/Forms.tsx) - * @param importer - A set of functions for controlling the global importer drawer (see ../components/importer/GlobalImporterDrawer.tsx) - * @param colorScheme - The current Mantine color scheme (e.g. 'light' / 'dark') + * @param modelInformation - A dictionary of available model information + * @param renderInstance - A component function for rendering a model instance * @param host - The current host URL * @param i18n - The i18n instance for translations (from @lingui/core) * @param locale - The current locale string (e.g. 'en' / 'de') + * @param navigate - The navigation function (see react-router-dom) + * @param theme - The current Mantine theme + * @param colorScheme - The current Mantine color scheme (e.g. 'light' / 'dark') + * @param forms - A set of functions for opening various API forms (see ../components/Forms.tsx) + * @param tables - A set of functions for rendering API tables + * @param importer - A set of functions for controlling the global importer drawer (see ../components/importer/GlobalImporterDrawer.tsx) * @param model - The model type associated with the rendered component (if applicable) - * @param modelInformation - A dictionary of available model information - * @param renderInstance - A component function for rendering a model instance * @param id - The ID (primary key) of the model instance for the plugin (if applicable) * @param instance - The model instance data (if available) * @param reloadContent - A function which can be called to reload the plugin content @@ -95,9 +102,10 @@ export type InvenTreePluginContext = { locale: string; navigate: NavigateFunction; theme: MantineTheme; - forms: InvenTreeFormsContext; - importer: ImporterDrawerContext; colorScheme: MantineColorScheme; + forms: InvenTreeFormsContext; + tables: InvenTreeTablesContext; + importer: ImporterDrawerContext; model?: ModelType | string; id?: string | number | null; instance?: any; diff --git a/src/frontend/lib/types/Tables.tsx b/src/frontend/lib/types/Tables.tsx index 99f02ce06d..ffb7186e06 100644 --- a/src/frontend/lib/types/Tables.tsx +++ b/src/frontend/lib/types/Tables.tsx @@ -1,10 +1,12 @@ import type { MantineStyleProp } from '@mantine/core'; +import type { AxiosInstance } from 'axios'; +import type { ShowContextMenuFunction } from 'mantine-contextmenu'; import type { DataTableCellClickHandler, DataTableRowExpansionProps } from 'mantine-datatable'; import type { ReactNode } from 'react'; -import type { NavigateFunction, SetURLSearchParams } from 'react-router-dom'; +import type { NavigateFunction } from 'react-router-dom'; import type { ModelType } from '../enums/ModelType'; import type { FilterSetState, TableFilter } from './Filters'; import type { ApiFormFieldType } from './Forms'; @@ -17,9 +19,6 @@ import type { ApiFormFieldType } from './Forms'; * isLoading: A boolean flag to indicate if the table is currently loading data * setIsLoading: A function to set the isLoading flag * filterSet: A group of active filters - * queryFilters: A map of query filters (e.g. ?active=true&overdue=false) passed in the URL - * setQueryFilters: A function to set the query filters - * clearQueryFilters: A function to clear all query filters * expandedRecords: An array of expanded records (rows) in the table * setExpandedRecords: A function to set the expanded records * isRowExpanded: A function to determine if a record is expanded @@ -49,9 +48,6 @@ export type TableState = { isLoading: boolean; setIsLoading: (value: boolean) => void; filterSet: FilterSetState; - queryFilters: URLSearchParams; - setQueryFilters: SetURLSearchParams; - clearQueryFilters: () => void; expandedRecords: any[]; setExpandedRecords: (records: any[]) => void; isRowExpanded: (pk: number) => boolean; @@ -219,3 +215,18 @@ export type InvenTreeTableProps = { minHeight?: number; noHeader?: boolean; }; + +export type InvenTreeTableRenderProps> = { + url?: string; + tableState: TableState; + tableData?: T[]; + columns: TableColumn[]; + props: InvenTreeTableProps; + api: AxiosInstance; + navigate: NavigateFunction; + + // The following attributes are for internal use only (plugins should not use these directly) + showContextMenu?: ShowContextMenuFunction; + searchParams?: URLSearchParams; + setSearchParams?: (params: URLSearchParams) => void; +}; diff --git a/src/frontend/package.json b/src/frontend/package.json index 9e588afb9c..db56aa4aae 100644 --- a/src/frontend/package.json +++ b/src/frontend/package.json @@ -1,7 +1,7 @@ { "name": "@inventreedb/ui", "description": "UI components for the InvenTree project", - "version": "0.10.1", + "version": "0.11.1", "private": false, "type": "module", "license": "MIT", diff --git a/src/frontend/src/components/barcodes/BarcodeInput.tsx b/src/frontend/src/components/barcodes/BarcodeInput.tsx index 6e5d5e012b..4fa4dd03b8 100644 --- a/src/frontend/src/components/barcodes/BarcodeInput.tsx +++ b/src/frontend/src/components/barcodes/BarcodeInput.tsx @@ -13,9 +13,9 @@ import { import { IconCamera, IconScan } from '@tabler/icons-react'; import { useCallback, useMemo, useState } from 'react'; +import { Boundary } from '@lib/components/Boundary'; import { useLocalStorage } from '@mantine/hooks'; import { useGlobalSettingsState } from '../../states/SettingsStates'; -import { Boundary } from '../Boundary'; import BarcodeCameraInput from './BarcodeCameraInput'; import BarcodeKeyboardInput from './BarcodeKeyboardInput'; diff --git a/src/frontend/src/components/barcodes/QRCode.tsx b/src/frontend/src/components/barcodes/QRCode.tsx index fd8e0a1387..11155e5d8f 100644 --- a/src/frontend/src/components/barcodes/QRCode.tsx +++ b/src/frontend/src/components/barcodes/QRCode.tsx @@ -18,11 +18,11 @@ import { useQuery } from '@tanstack/react-query'; import QR from 'qrcode'; import { useCallback, useEffect, useMemo, useState } from 'react'; +import { CopyButton } from '@lib/components/CopyButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; import { api } from '../../App'; import { useGlobalSettingsState } from '../../states/SettingsStates'; -import { CopyButton } from '../buttons/CopyButton'; import type { QrCodeType } from '../items/ActionDropdown'; import { extractErrorMessage } from '../../functions/api'; diff --git a/src/frontend/src/components/calendar/Calendar.tsx b/src/frontend/src/components/calendar/Calendar.tsx index 50f416a175..508cdc4673 100644 --- a/src/frontend/src/components/calendar/Calendar.tsx +++ b/src/frontend/src/components/calendar/Calendar.tsx @@ -5,6 +5,7 @@ import interactionPlugin from '@fullcalendar/interaction'; import FullCalendar from '@fullcalendar/react'; import { ActionButton } from '@lib/components/ActionButton'; +import { Boundary } from '@lib/components/Boundary'; import { SearchInput } from '@lib/components/SearchInput'; import type { TableFilter } from '@lib/types/Filters'; import { t } from '@lingui/core/macro'; @@ -36,7 +37,6 @@ import { import type { CalendarState } from '../../hooks/UseCalendar'; import { useLocalState } from '../../states/LocalState'; import { FilterSelectDrawer } from '../../tables/FilterSelectDrawer'; -import { Boundary } from '../Boundary'; import { StylishText } from '../items/StylishText'; export interface InvenTreeCalendarProps extends CalendarOptions { diff --git a/src/frontend/src/components/dashboard/DashboardWidget.tsx b/src/frontend/src/components/dashboard/DashboardWidget.tsx index d56f733587..cc806d01b9 100644 --- a/src/frontend/src/components/dashboard/DashboardWidget.tsx +++ b/src/frontend/src/components/dashboard/DashboardWidget.tsx @@ -2,7 +2,7 @@ import { t } from '@lingui/core/macro'; import { ActionIcon, Box, Group, Overlay, Paper, Tooltip } from '@mantine/core'; import { IconX } from '@tabler/icons-react'; -import { Boundary } from '../Boundary'; +import { Boundary } from '@lib/components/Boundary'; import type { ModelType } from '@lib/index'; import type { JSX } from 'react'; diff --git a/src/frontend/src/components/details/Details.tsx b/src/frontend/src/components/details/Details.tsx index 9222814fa4..a55a96f489 100644 --- a/src/frontend/src/components/details/Details.tsx +++ b/src/frontend/src/components/details/Details.tsx @@ -17,6 +17,7 @@ import { getValueAtPath } from 'mantine-datatable'; import { useCallback, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; +import { CopyButton } from '@lib/components/CopyButton'; import { ProgressBar } from '@lib/components/ProgressBar'; import { YesNoButton } from '@lib/components/YesNoButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; @@ -29,7 +30,6 @@ import { useApi } from '../../contexts/ApiContext'; import { formatDate, formatDecimal } from '../../defaults/formatters'; import { InvenTreeIcon } from '../../functions/icons'; import { useGlobalSettingsState } from '../../states/SettingsStates'; -import { CopyButton } from '../buttons/CopyButton'; import { StylishText } from '../items/StylishText'; import { getModelInfo } from '../render/ModelType'; import { StatusRenderer } from '../render/StatusRenderer'; diff --git a/src/frontend/src/components/editors/TemplateEditor/TemplateEditor.tsx b/src/frontend/src/components/editors/TemplateEditor/TemplateEditor.tsx index 2cf8633136..786b4803da 100644 --- a/src/frontend/src/components/editors/TemplateEditor/TemplateEditor.tsx +++ b/src/frontend/src/components/editors/TemplateEditor/TemplateEditor.tsx @@ -25,12 +25,12 @@ import Split from '@uiw/react-split'; import type React from 'react'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { Boundary } from '@lib/components/Boundary'; import { ModelInformationDict } from '@lib/enums/ModelInformation'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; import { api } from '../../../App'; import type { TemplateI } from '../../../tables/settings/TemplateTable'; -import { Boundary } from '../../Boundary'; import { SplitButton } from '../../buttons/SplitButton'; import { StandaloneField } from '../../forms/StandaloneField'; diff --git a/src/frontend/src/components/forms/ApiForm.tsx b/src/frontend/src/components/forms/ApiForm.tsx index 43b2b22948..7531e9b927 100644 --- a/src/frontend/src/components/forms/ApiForm.tsx +++ b/src/frontend/src/components/forms/ApiForm.tsx @@ -22,26 +22,25 @@ import { } from 'react-hook-form'; import { type NavigateFunction, useNavigate } from 'react-router-dom'; +import { Boundary } from '@lib/components/Boundary'; import { isTrue } from '@lib/functions/Conversion'; +import { + type NestedDict, + constructFormUrl, + mapFields +} from '@lib/functions/Forms'; import { getDetailUrl } from '@lib/functions/Navigation'; +import { + invalidResponse, + showTimeoutNotification +} from '@lib/functions/Notification'; import type { ApiFormFieldSet, ApiFormFieldType, ApiFormProps } from '@lib/types/Forms'; import { useApi } from '../../contexts/ApiContext'; -import { - type NestedDict, - constructField, - constructFormUrl, - extractAvailableFields, - mapFields -} from '../../functions/forms'; -import { - invalidResponse, - showTimeoutNotification -} from '../../functions/notifications'; -import { Boundary } from '../Boundary'; +import { constructField, extractAvailableFields } from '../../functions/forms'; import { KeepFormOpenSwitch } from './KeepFormOpenSwitch'; import { ApiFormField } from './fields/ApiFormField'; diff --git a/src/frontend/src/components/importer/ImportDataSelector.tsx b/src/frontend/src/components/importer/ImportDataSelector.tsx index 0b09bf31e6..82aadf2d5c 100644 --- a/src/frontend/src/components/importer/ImportDataSelector.tsx +++ b/src/frontend/src/components/importer/ImportDataSelector.tsx @@ -20,6 +20,7 @@ import { YesNoButton } from '@lib/components/YesNoButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; import { cancelEvent } from '@lib/functions/Events'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -29,7 +30,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import type { ImportSessionState } from '../../hooks/UseImportSession'; -import { useTable } from '../../hooks/UseTable'; import { InvenTreeTable } from '../../tables/InvenTreeTable'; import { RenderRemoteInstance } from '../render/Instance'; diff --git a/src/frontend/src/components/modals/AboutInvenTreeModal.tsx b/src/frontend/src/components/modals/AboutInvenTreeModal.tsx index dc478d56b7..ecdc4eaf04 100644 --- a/src/frontend/src/components/modals/AboutInvenTreeModal.tsx +++ b/src/frontend/src/components/modals/AboutInvenTreeModal.tsx @@ -13,13 +13,13 @@ import { import type { ContextModalProps } from '@mantine/modals'; import { useQuery } from '@tanstack/react-query'; +import { CopyButton } from '@lib/components/CopyButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; import { useShallow } from 'zustand/react/shallow'; import { api } from '../../App'; import { generateUrl } from '../../functions/urls'; import { useServerApiState } from '../../states/ServerApiState'; -import { CopyButton } from '../buttons/CopyButton'; import { StylishText } from '../items/StylishText'; import type { JSX } from 'react'; diff --git a/src/frontend/src/components/nav/Layout.tsx b/src/frontend/src/components/nav/Layout.tsx index 741f6d14ad..c3b084c835 100644 --- a/src/frontend/src/components/nav/Layout.tsx +++ b/src/frontend/src/components/nav/Layout.tsx @@ -9,6 +9,7 @@ import { IconSearch } from '@tabler/icons-react'; import { type JSX, useEffect, useMemo, useState } from 'react'; import { Navigate, Outlet, useLocation, useNavigate } from 'react-router-dom'; +import { Boundary } from '@lib/components/Boundary'; import { identifierString } from '@lib/functions/Conversion'; import { ApiEndpoints, apiUrl } from '@lib/index'; import { useQuery } from '@tanstack/react-query'; @@ -20,7 +21,6 @@ import { useUserSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; -import { Boundary } from '../Boundary'; import GlobalImporterDrawer from '../importer/GlobalImporterDrawer'; import { ApiIcon } from '../items/ApiIcon'; import { useInvenTreeContext } from '../plugins/PluginContext'; diff --git a/src/frontend/src/components/nav/NotificationDrawer.tsx b/src/frontend/src/components/nav/NotificationDrawer.tsx index c8d8d890ed..285f1559f6 100644 --- a/src/frontend/src/components/nav/NotificationDrawer.tsx +++ b/src/frontend/src/components/nav/NotificationDrawer.tsx @@ -23,6 +23,7 @@ import { useQuery } from '@tanstack/react-query'; import { useCallback, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; +import { Boundary } from '@lib/components/Boundary'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelInformationDict } from '@lib/enums/ModelInformation'; import type { ModelType } from '@lib/enums/ModelType'; @@ -32,7 +33,6 @@ import { getBaseUrl } from '@lib/functions/Navigation'; import { navigateToLink } from '@lib/functions/Navigation'; import { api } from '../../App'; import { useUserState } from '../../states/UserState'; -import { Boundary } from '../Boundary'; import { StylishText } from '../items/StylishText'; /** diff --git a/src/frontend/src/components/nav/PageDetail.tsx b/src/frontend/src/components/nav/PageDetail.tsx index d133a557d5..922ccbfdf4 100644 --- a/src/frontend/src/components/nav/PageDetail.tsx +++ b/src/frontend/src/components/nav/PageDetail.tsx @@ -1,8 +1,8 @@ import { Group, Paper, Space, Stack, Text } from '@mantine/core'; import { useHotkeys } from '@mantine/hooks'; +import { shortenString } from '@lib/functions/String'; import { Fragment, type ReactNode, useMemo } from 'react'; -import { shortenString } from '../../functions/tables'; import { useUserSettingsState } from '../../states/SettingsStates'; import { ApiImage } from '../images/ApiImage'; import { StylishText } from '../items/StylishText'; diff --git a/src/frontend/src/components/nav/SearchDrawer.tsx b/src/frontend/src/components/nav/SearchDrawer.tsx index 931add12ae..1d5874eb6f 100644 --- a/src/frontend/src/components/nav/SearchDrawer.tsx +++ b/src/frontend/src/components/nav/SearchDrawer.tsx @@ -33,6 +33,7 @@ import { useQuery } from '@tanstack/react-query'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { type NavigateFunction, useNavigate } from 'react-router-dom'; +import { Boundary } from '@lib/components/Boundary'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelInformationDict } from '@lib/enums/ModelInformation'; import { ModelType } from '@lib/enums/ModelType'; @@ -48,7 +49,6 @@ import { showNotification } from '@mantine/notifications'; import { api } from '../../App'; import { useUserSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; -import { Boundary } from '../Boundary'; import { RenderInstance } from '../render/Instance'; import { getModelInfo } from '../render/ModelType'; diff --git a/src/frontend/src/components/panels/PanelGroup.tsx b/src/frontend/src/components/panels/PanelGroup.tsx index 8ec6084fae..c6d7015ec6 100644 --- a/src/frontend/src/components/panels/PanelGroup.tsx +++ b/src/frontend/src/components/panels/PanelGroup.tsx @@ -32,6 +32,7 @@ import { useParams } from 'react-router-dom'; +import { Boundary } from '@lib/components/Boundary'; import type { ModelType } from '@lib/enums/ModelType'; import { identifierString } from '@lib/functions/Conversion'; import { cancelEvent } from '@lib/functions/Events'; @@ -43,7 +44,6 @@ import { generateUrl } from '../../functions/urls'; import { usePluginPanels } from '../../hooks/UsePluginPanels'; import { useLocalState } from '../../states/LocalState'; import { vars } from '../../theme'; -import { Boundary } from '../Boundary'; import { StylishText } from '../items/StylishText'; import type { PanelGroupType, PanelType } from '../panels/Panel'; import * as classes from './PanelGroup.css'; diff --git a/src/frontend/src/components/plugins/PluginContext.tsx b/src/frontend/src/components/plugins/PluginContext.tsx index d306db7d3f..0c527fb507 100644 --- a/src/frontend/src/components/plugins/PluginContext.tsx +++ b/src/frontend/src/components/plugins/PluginContext.tsx @@ -17,7 +17,9 @@ import { INVENTREE_REACT_VERSION, type InvenTreePluginContext } from '@lib/types/Plugins'; +import type { InvenTreeTableRenderProps } from '@lib/types/Tables'; import { i18n } from '@lingui/core'; +import { useContextMenu } from 'mantine-contextmenu'; import { defaultLocale } from '../../contexts/LanguageContext'; import { useAddStockItem, @@ -43,6 +45,7 @@ import { openGlobalImporter } from '../../states/ImporterState'; import { useServerApiState } from '../../states/ServerApiState'; +import { InvenTreeTableInternal } from '../../tables/InvenTreeTable'; import { RenderInstance } from '../render/Instance'; export const useInvenTreeContext = () => { @@ -54,6 +57,7 @@ export const useInvenTreeContext = () => { const theme = useMantineTheme(); const globalSettings = useGlobalSettingsState(); const userSettings = useUserSettingsState(); + const { showContextMenu } = useContextMenu(); const contextData = useMemo(() => { return { @@ -83,6 +87,14 @@ export const useInvenTreeContext = () => { isOpen: () => getGlobalImporterState().isOpen, sessionId: () => getGlobalImporterState().sessionId }, + tables: { + renderTable: (props: InvenTreeTableRenderProps) => ( + + ) + }, forms: { bulkEdit: useBulkEditApiFormModal, create: useCreateApiFormModal, diff --git a/src/frontend/src/components/plugins/RemoteComponent.tsx b/src/frontend/src/components/plugins/RemoteComponent.tsx index 0b0c03823f..671dc7c5a0 100644 --- a/src/frontend/src/components/plugins/RemoteComponent.tsx +++ b/src/frontend/src/components/plugins/RemoteComponent.tsx @@ -3,6 +3,7 @@ import { Alert, MantineProvider, Stack, Text } from '@mantine/core'; import { IconExclamationCircle } from '@tabler/icons-react'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; +import { Boundary } from '@lib/components/Boundary'; import { identifierString } from '@lib/functions/Conversion'; import type { InvenTreePluginContext } from '@lib/types/Plugins'; import { type Root, createRoot } from 'react-dom/client'; @@ -10,7 +11,6 @@ import { api, queryClient } from '../../App'; import { ApiProvider } from '../../contexts/ApiContext'; import { LanguageContext } from '../../contexts/LanguageContext'; import { useLocalState } from '../../states/LocalState'; -import { Boundary } from '../Boundary'; import { findExternalPluginFunction } from './PluginSource'; /** diff --git a/src/frontend/src/components/render/Instance.tsx b/src/frontend/src/components/render/Instance.tsx index d368f7554c..b21c820fd5 100644 --- a/src/frontend/src/components/render/Instance.tsx +++ b/src/frontend/src/components/render/Instance.tsx @@ -21,8 +21,8 @@ import type { RenderInstanceProps } from '@lib/types/Rendering'; export type { InstanceRenderInterface } from '@lib/types/Rendering'; +import { shortenString } from '@lib/functions/String'; import { useApi } from '../../contexts/ApiContext'; -import { shortenString } from '../../functions/tables'; import { Thumbnail } from '../images/Thumbnail'; import { RenderBuildItem, RenderBuildLine, RenderBuildOrder } from './Build'; import { diff --git a/src/frontend/src/components/render/Part.tsx b/src/frontend/src/components/render/Part.tsx index 14be70f6ce..ed5ddf7d9c 100644 --- a/src/frontend/src/components/render/Part.tsx +++ b/src/frontend/src/components/render/Part.tsx @@ -5,7 +5,7 @@ import type { ReactNode } from 'react'; import { ModelType } from '@lib/enums/ModelType'; import { formatDecimal } from '@lib/functions/Formatting'; import { getDetailUrl } from '@lib/functions/Navigation'; -import { shortenString } from '../../functions/tables'; +import { shortenString } from '@lib/functions/String'; import { TableHoverCard } from '../../tables/TableHoverCard'; import { ApiIcon } from '../items/ApiIcon'; import { type InstanceRenderInterface, RenderInlineModel } from './Instance'; diff --git a/src/frontend/src/components/render/Stock.tsx b/src/frontend/src/components/render/Stock.tsx index 1e5a13b25e..1ecd89809b 100644 --- a/src/frontend/src/components/render/Stock.tsx +++ b/src/frontend/src/components/render/Stock.tsx @@ -5,7 +5,7 @@ import type { ReactNode } from 'react'; import { ModelType } from '@lib/enums/ModelType'; import { formatDecimal } from '@lib/functions/Formatting'; import { getDetailUrl } from '@lib/functions/Navigation'; -import { shortenString } from '../../functions/tables'; +import { shortenString } from '@lib/functions/String'; import { TableHoverCard } from '../../tables/TableHoverCard'; import { ApiIcon } from '../items/ApiIcon'; import { diff --git a/src/frontend/src/components/settings/SettingItem.tsx b/src/frontend/src/components/settings/SettingItem.tsx index 8b9b3ef84e..d188eff8b2 100644 --- a/src/frontend/src/components/settings/SettingItem.tsx +++ b/src/frontend/src/components/settings/SettingItem.tsx @@ -13,13 +13,13 @@ import { import { IconEdit } from '@tabler/icons-react'; import { useCallback, useEffect, useMemo, useState } from 'react'; +import { Boundary } from '@lib/components/Boundary'; import { ModelInformationDict } from '@lib/enums/ModelInformation'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; import type { Setting } from '@lib/types/Settings'; import { api } from '../../App'; import { vars } from '../../theme'; -import { Boundary } from '../Boundary'; import { RenderInstance } from '../render/Instance'; type ConfirmResult = { diff --git a/src/frontend/src/components/wizards/OrderPartsWizard.tsx b/src/frontend/src/components/wizards/OrderPartsWizard.tsx index eaaa221733..2d74c5b130 100644 --- a/src/frontend/src/components/wizards/OrderPartsWizard.tsx +++ b/src/frontend/src/components/wizards/OrderPartsWizard.tsx @@ -1,5 +1,6 @@ import { ActionButton } from '@lib/components/ActionButton'; import { AddItemButton } from '@lib/components/AddItemButton'; +import { CopyButton } from '@lib/components/CopyButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; @@ -32,7 +33,6 @@ import { useCreateApiFormModal } from '../../hooks/UseForm'; import { useInstance } from '../../hooks/UseInstance'; import useWizard from '../../hooks/UseWizard'; import { RenderPartColumn } from '../../tables/ColumnRenderers'; -import { CopyButton } from '../buttons/CopyButton'; import RemoveRowButton from '../buttons/RemoveRowButton'; import { StandaloneField } from '../forms/StandaloneField'; import Expand from '../items/Expand'; diff --git a/src/frontend/src/components/wizards/WizardDrawer.tsx b/src/frontend/src/components/wizards/WizardDrawer.tsx index 1d5ea53ae9..2e134af509 100644 --- a/src/frontend/src/components/wizards/WizardDrawer.tsx +++ b/src/frontend/src/components/wizards/WizardDrawer.tsx @@ -1,3 +1,4 @@ +import { Boundary } from '@lib/components/Boundary'; import { t } from '@lingui/core/macro'; import { ActionIcon, @@ -16,7 +17,6 @@ import { IconCircleCheck } from '@tabler/icons-react'; import { type ReactNode, useCallback, useMemo } from 'react'; -import { Boundary } from '../Boundary'; import { StylishText } from '../items/StylishText'; /** diff --git a/src/frontend/src/contexts/LanguageContext.tsx b/src/frontend/src/contexts/LanguageContext.tsx index ef6d8b902e..2bf33232ad 100644 --- a/src/frontend/src/contexts/LanguageContext.tsx +++ b/src/frontend/src/contexts/LanguageContext.tsx @@ -3,11 +3,11 @@ import { I18nProvider } from '@lingui/react'; import { LoadingOverlay, Text } from '@mantine/core'; import { type JSX, useEffect, useRef, useState } from 'react'; +import { useStoredTableState } from '@lib/states/StoredTableState'; import { useShallow } from 'zustand/react/shallow'; import { api } from '../App'; import { useLocalState } from '../states/LocalState'; import { useServerApiState } from '../states/ServerApiState'; -import { useStoredTableState } from '../states/StoredTableState'; import { fetchGlobalStates } from '../states/states'; export const defaultLocale = 'en'; diff --git a/src/frontend/src/functions/forms.tsx b/src/frontend/src/functions/forms.tsx index 6b2c6fb563..a2c59cef73 100644 --- a/src/frontend/src/functions/forms.tsx +++ b/src/frontend/src/functions/forms.tsx @@ -1,28 +1,6 @@ -import type { AxiosResponse } from 'axios'; - -import type { ApiEndpoints } from '@lib/enums/ApiEndpoints'; -import { apiUrl } from '@lib/functions/Api'; -import type { PathParams } from '@lib/types/Core'; +import { invalidResponse, permissionDenied } from '@lib/functions/Notification'; import type { ApiFormFieldSet, ApiFormFieldType } from '@lib/types/Forms'; -import { invalidResponse, permissionDenied } from './notifications'; - -/** - * Construct an API url from the provided ApiFormProps object - */ -export function constructFormUrl( - url: ApiEndpoints | string, - pk?: string | number, - pathParams?: PathParams, - queryParams?: URLSearchParams -): string { - let formUrl = apiUrl(url, pk, pathParams); - - if (queryParams) { - formUrl += `?${queryParams.toString()}`; - } - - return formUrl; -} +import type { AxiosResponse } from 'axios'; /** * Extract the available fields (for a given method) from the response object @@ -104,30 +82,6 @@ export function extractAvailableFields( return processFields(actions[method]); } -export type NestedDict = { [key: string]: string | number | NestedDict }; -export function mapFields( - fields: ApiFormFieldSet, - fieldFunction: (path: string, value: ApiFormFieldType, key: string) => any, - _path?: string -): NestedDict { - const res: NestedDict = {}; - - for (const [k, v] of Object.entries(fields)) { - const path = _path ? `${_path}.${k}` : k; - let value: any; - - if (v.field_type === 'nested object' && v.children) { - value = mapFields(v.children, fieldFunction, path); - } else { - value = fieldFunction(path, v, k); - } - - if (value !== undefined) res[k] = value; - } - - return res; -} - /* * Build a complete field definition based on the provided data */ diff --git a/src/frontend/src/functions/notifications.tsx b/src/frontend/src/functions/notifications.tsx index 90fc97ba68..e84c6faac0 100644 --- a/src/frontend/src/functions/notifications.tsx +++ b/src/frontend/src/functions/notifications.tsx @@ -1,56 +1,7 @@ -import { t } from '@lingui/core/macro'; import { notifications } from '@mantine/notifications'; import { IconCircleCheck, IconExclamationCircle } from '@tabler/icons-react'; import { extractErrorMessage } from './api'; -/** - * Show a notification that the feature is not yet implemented - */ -export function notYetImplemented() { - notifications.hide('not-implemented'); - - notifications.show({ - title: t`Not implemented`, - message: t`This feature is not yet implemented`, - color: 'red', - id: 'not-implemented' - }); -} - -/** - * Show a notification that the user does not have permission to perform the action - */ -export function permissionDenied() { - notifications.show({ - title: t`Permission Denied`, - message: t`You do not have permission to perform this action`, - color: 'red' - }); -} - -/** - * Display a notification on an invalid return code - */ -export function invalidResponse(returnCode: number) { - // TODO: Specific return code messages - notifications.show({ - title: t`Invalid Return Code`, - message: t`Server returned status ${returnCode}`, - color: 'red' - }); -} - -/** - * Display a notification on timeout - */ -export function showTimeoutNotification() { - notifications.show({ - title: t`Timeout`, - message: t`The request timed out`, - color: 'red' - }); -} - /* * Display a login / logout notification message. * Any existing login notification(s) will be hidden. diff --git a/src/frontend/src/hooks/UseCalendar.tsx b/src/frontend/src/hooks/UseCalendar.tsx index 9d86ccdd8c..5c7556b5b3 100644 --- a/src/frontend/src/hooks/UseCalendar.tsx +++ b/src/frontend/src/hooks/UseCalendar.tsx @@ -1,6 +1,7 @@ import type FullCalendar from '@fullcalendar/react'; import type { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useFilterSet from '@lib/hooks/UseFilterSet'; import type { FilterSetState } from '@lib/types/Filters'; import type { UseModalReturn } from '@lib/types/Modals'; import type { DateValue } from '@mantine/dates'; @@ -10,7 +11,6 @@ import { useCallback, useMemo, useRef, useState } from 'react'; import { api } from '../App'; import { showApiErrorMessage } from '../functions/notifications'; import useDataExport from './UseDataExport'; -import { useFilterSet } from './UseFilterSet'; /* * Type definition for representing the state of a calendar: diff --git a/src/frontend/src/pages/Index/Scan.tsx b/src/frontend/src/pages/Index/Scan.tsx index 51d77a055b..a09fa8aba2 100644 --- a/src/frontend/src/pages/Index/Scan.tsx +++ b/src/frontend/src/pages/Index/Scan.tsx @@ -23,6 +23,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelInformationDict } from '@lib/enums/ModelInformation'; import type { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import { notYetImplemented } from '@lib/functions/Notification'; import { hideNotification, showNotification } from '@mantine/notifications'; import dayjs from 'dayjs'; import { api } from '../../App'; @@ -30,10 +31,7 @@ import { BarcodeInput } from '../../components/barcodes/BarcodeInput'; import type { BarcodeScanItem } from '../../components/barcodes/BarcodeScanItem'; import { StylishText } from '../../components/items/StylishText'; import PageTitle from '../../components/nav/PageTitle'; -import { - notYetImplemented, - showApiErrorMessage -} from '../../functions/notifications'; +import { showApiErrorMessage } from '../../functions/notifications'; import BarcodeScanTable from '../../tables/general/BarcodeScanTable'; export default function Scan() { diff --git a/src/frontend/src/pages/Index/Settings/AccountSettings/MFASettings.tsx b/src/frontend/src/pages/Index/Settings/AccountSettings/MFASettings.tsx index c59121d306..57287cc9c3 100644 --- a/src/frontend/src/pages/Index/Settings/AccountSettings/MFASettings.tsx +++ b/src/frontend/src/pages/Index/Settings/AccountSettings/MFASettings.tsx @@ -1,4 +1,5 @@ import { create } from '@github/webauthn-json/browser-ponyfill'; +import { CopyButton } from '@lib/components/CopyButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; import { FlowEnum } from '@lib/types/Auth'; @@ -31,7 +32,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { useNavigate } from 'react-router-dom'; import { useShallow } from 'zustand/react/shallow'; import { api, queryClient } from '../../../../App'; -import { CopyButton } from '../../../../components/buttons/CopyButton'; import { StylishText } from '../../../../components/items/StylishText'; import { authApi, doLogout } from '../../../../functions/auth'; import { useServerApiState } from '../../../../states/ServerApiState'; diff --git a/src/frontend/src/pages/Index/Settings/AccountSettings/QrRegistrationForm.tsx b/src/frontend/src/pages/Index/Settings/AccountSettings/QrRegistrationForm.tsx index 47f6f85d90..aec89f9a99 100644 --- a/src/frontend/src/pages/Index/Settings/AccountSettings/QrRegistrationForm.tsx +++ b/src/frontend/src/pages/Index/Settings/AccountSettings/QrRegistrationForm.tsx @@ -1,8 +1,8 @@ +import { CopyButton } from '@lib/components/CopyButton'; import { t } from '@lingui/core/macro'; import { Trans } from '@lingui/react/macro'; import { Divider, Group, Paper, Stack, Text, TextInput } from '@mantine/core'; import { QRCode } from '../../../../components/barcodes/QRCode'; -import { CopyButton } from '../../../../components/buttons/CopyButton'; export function QrRegistrationForm({ url, diff --git a/src/frontend/src/pages/Index/Settings/AccountSettings/SecurityContent.tsx b/src/frontend/src/pages/Index/Settings/AccountSettings/SecurityContent.tsx index fa0b8156aa..c4da72c5d8 100644 --- a/src/frontend/src/pages/Index/Settings/AccountSettings/SecurityContent.tsx +++ b/src/frontend/src/pages/Index/Settings/AccountSettings/SecurityContent.tsx @@ -1,3 +1,4 @@ +import { DefaultFallback } from '@lib/components/Boundary'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; import type { AuthConfig, AuthProvider } from '@lib/types/Auth'; @@ -30,7 +31,6 @@ import { import { useQuery } from '@tanstack/react-query'; import { useCallback, useMemo, useState } from 'react'; import { useShallow } from 'zustand/react/shallow'; -import { DefaultFallback } from '../../../../components/Boundary'; import { StylishText } from '../../../../components/items/StylishText'; import { ProviderLogin, authApi } from '../../../../functions/auth'; import { useServerApiState } from '../../../../states/ServerApiState'; diff --git a/src/frontend/src/pages/Index/Settings/AdminCenter/CurrencyManagementPanel.tsx b/src/frontend/src/pages/Index/Settings/AdminCenter/CurrencyManagementPanel.tsx index 7e1ca77049..7570736537 100644 --- a/src/frontend/src/pages/Index/Settings/AdminCenter/CurrencyManagementPanel.tsx +++ b/src/frontend/src/pages/Index/Settings/AdminCenter/CurrencyManagementPanel.tsx @@ -7,11 +7,11 @@ import { useCallback, useMemo, useState } from 'react'; import { ActionButton } from '@lib/components/ActionButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { api } from '../../../../App'; import { FactCollection } from '../../../../components/settings/FactCollection'; import { GlobalSettingList } from '../../../../components/settings/SettingList'; import { showApiErrorMessage } from '../../../../functions/notifications'; -import { useTable } from '../../../../hooks/UseTable'; import { InvenTreeTable } from '../../../../tables/InvenTreeTable'; /* diff --git a/src/frontend/src/pages/Index/Settings/AdminCenter/UnitManagementPanel.tsx b/src/frontend/src/pages/Index/Settings/AdminCenter/UnitManagementPanel.tsx index 658d84840f..a59993c3fb 100644 --- a/src/frontend/src/pages/Index/Settings/AdminCenter/UnitManagementPanel.tsx +++ b/src/frontend/src/pages/Index/Settings/AdminCenter/UnitManagementPanel.tsx @@ -4,8 +4,8 @@ import { useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { StylishText } from '../../../../components/items/StylishText'; -import { useTable } from '../../../../hooks/UseTable'; import { BooleanColumn } from '../../../../tables/ColumnRenderers'; import { InvenTreeTable } from '../../../../tables/InvenTreeTable'; import CustomUnitsTable from '../../../../tables/settings/CustomUnitsTable'; diff --git a/src/frontend/src/pages/Notifications.tsx b/src/frontend/src/pages/Notifications.tsx index 00656f3889..a5e1dec080 100644 --- a/src/frontend/src/pages/Notifications.tsx +++ b/src/frontend/src/pages/Notifications.tsx @@ -13,10 +13,10 @@ import { useCallback, useMemo } from 'react'; import { ActionButton } from '@lib/components/ActionButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { PageDetail } from '../components/nav/PageDetail'; import { PanelGroup } from '../components/panels/PanelGroup'; import { useApi } from '../contexts/ApiContext'; -import { useTable } from '../hooks/UseTable'; import { NotificationTable } from '../tables/notifications/NotificationTable'; export default function NotificationsPage() { diff --git a/src/frontend/src/pages/part/PartStockHistoryDetail.tsx b/src/frontend/src/pages/part/PartStockHistoryDetail.tsx index 8a7ded28b8..2c375f2295 100644 --- a/src/frontend/src/pages/part/PartStockHistoryDetail.tsx +++ b/src/frontend/src/pages/part/PartStockHistoryDetail.tsx @@ -2,6 +2,7 @@ import { RowDeleteAction, RowEditAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { AddItemButton } from '@lib/index'; import type { TableColumn } from '@lib/types/Tables'; import { t } from '@lingui/core/macro'; @@ -25,7 +26,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DateColumn, DecimalColumn } from '../../tables/ColumnRenderers'; import { InvenTreeTable } from '../../tables/InvenTreeTable'; diff --git a/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx b/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx index e932431965..1eeb3fdd64 100644 --- a/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx +++ b/src/frontend/src/pages/part/pricing/BomPricingPanel.tsx @@ -13,11 +13,11 @@ import { type ReactNode, useMemo, useState } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { CHART_COLORS } from '../../../components/charts/colors'; import { tooltipFormatter } from '../../../components/charts/tooltipFormatter'; import { formatDecimal, formatPriceRange } from '../../../defaults/formatters'; -import { useTable } from '../../../hooks/UseTable'; import { DateColumn, PartColumn } from '../../../tables/ColumnRenderers'; import { InvenTreeTable } from '../../../tables/InvenTreeTable'; import { LoadingPricingData, NoPricingData } from './PricingPanel'; diff --git a/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx b/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx index 57f7c60a97..8151a55e62 100644 --- a/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx +++ b/src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx @@ -12,6 +12,7 @@ import { import type { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; import { tooltipFormatter } from '../../../components/charts/tooltipFormatter'; @@ -21,7 +22,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../../hooks/UseForm'; -import { useTable } from '../../../hooks/UseTable'; import { useUserState } from '../../../states/UserState'; import { InvenTreeTable } from '../../../tables/InvenTreeTable'; import { NoPricingData } from './PricingPanel'; diff --git a/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx b/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx index 53f71388be..60b3f6fb3a 100644 --- a/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx +++ b/src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx @@ -5,9 +5,9 @@ import { type ReactNode, useCallback, useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { formatCurrency, formatDate } from '../../../defaults/formatters'; -import { useTable } from '../../../hooks/UseTable'; import { InvenTreeTable } from '../../../tables/InvenTreeTable'; import { NoPricingData } from './PricingPanel'; diff --git a/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx b/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx index 1f38d460c1..cdd6c4b224 100644 --- a/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx +++ b/src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx @@ -5,9 +5,9 @@ import { type ReactNode, useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { formatCurrency } from '../../../defaults/formatters'; -import { useTable } from '../../../hooks/UseTable'; import { DateColumn } from '../../../tables/ColumnRenderers'; import { InvenTreeTable } from '../../../tables/InvenTreeTable'; import { NoPricingData } from './PricingPanel'; diff --git a/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx b/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx index e807d84a4c..48982989d5 100644 --- a/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx +++ b/src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx @@ -5,9 +5,9 @@ import { useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { tooltipFormatter } from '../../../components/charts/tooltipFormatter'; -import { useTable } from '../../../hooks/UseTable'; import { InvenTreeTable } from '../../../tables/InvenTreeTable'; import { SupplierPriceBreakColumns, diff --git a/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx b/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx index faffca8a7e..6aa8911d75 100644 --- a/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx +++ b/src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx @@ -6,10 +6,10 @@ import { type ReactNode, useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { tooltipFormatter } from '../../../components/charts/tooltipFormatter'; import { formatCurrency } from '../../../defaults/formatters'; -import { useTable } from '../../../hooks/UseTable'; import { DateColumn, PartColumn } from '../../../tables/ColumnRenderers'; import { InvenTreeTable } from '../../../tables/InvenTreeTable'; import { NoPricingData } from './PricingPanel'; diff --git a/src/frontend/src/tables/InvenTreeTable.tsx b/src/frontend/src/tables/InvenTreeTable.tsx index d290eafb48..91e8570fd2 100644 --- a/src/frontend/src/tables/InvenTreeTable.tsx +++ b/src/frontend/src/tables/InvenTreeTable.tsx @@ -1,12 +1,21 @@ +import { Boundary } from '@lib/components/Boundary'; +import { CopyableCell } from '@lib/components/CopyableCell'; import { RowActions } from '@lib/components/RowActions'; import { ModelInformationDict } from '@lib/enums/ModelInformation'; import { resolveItem } from '@lib/functions/Conversion'; import { cancelEvent } from '@lib/functions/Events'; +import { mapFields } from '@lib/functions/Forms'; import { getDetailUrl } from '@lib/functions/Navigation'; import { navigateToLink } from '@lib/functions/Navigation'; +import { hashString } from '@lib/functions/String'; +import { useStoredTableState } from '@lib/states/StoredTableState'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; -import type { InvenTreeTableProps, TableState } from '@lib/types/Tables'; +import type { + InvenTreeTableProps, + InvenTreeTableRenderProps, + TableState +} from '@lib/types/Tables'; import type { TableColumn } from '@lib/types/Tables'; import { t } from '@lingui/core/macro'; import { Box, Stack } from '@mantine/core'; @@ -24,16 +33,12 @@ import { } from 'mantine-datatable'; import type React from 'react'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import { useNavigate } from 'react-router-dom'; -import { Boundary } from '../components/Boundary'; +import { useNavigate, useSearchParams } from 'react-router-dom'; import { useApi } from '../contexts/ApiContext'; -import { extractAvailableFields, mapFields } from '../functions/forms'; +import { extractAvailableFields } from '../functions/forms'; import { showApiErrorMessage } from '../functions/notifications'; -import { hashString } from '../functions/tables'; import { useLocalState } from '../states/LocalState'; import { useUserSettingsState } from '../states/SettingsStates'; -import { useStoredTableState } from '../states/StoredTableState'; -import { CopyableCell } from './CopyableCell'; import InvenTreeTableHeader from './InvenTreeTableHeader'; const ACTIONS_COLUMN_ACCESSOR: string = '--actions--'; @@ -62,20 +67,27 @@ const defaultInvenTreeTableProps: InvenTreeTableProps = { /** * Table Component which extends DataTable with custom InvenTree functionality + * + * This component is not used directly - instead, the "InvenTreeTable" component is a wrapper, + * which provides the necessary context and state management for this internal component. + * + * This function is also provided to the plugin context, and when used by external plugins, + * it must be supplied with with following additional context items: + * - api: AxiosInstance - The API instance for making requests to the server + * - navigate: NavigateFunction - The navigation function for navigating to different pages */ -export function InvenTreeTable>({ +export function InvenTreeTableInternal>({ url, tableState, tableData, columns, - props -}: Readonly<{ - url?: string; - tableState: TableState; - tableData?: any[]; - columns: TableColumn[]; - props: InvenTreeTableProps; -}>) { + props, + api, + navigate, + showContextMenu, + searchParams, + setSearchParams +}: Readonly>) { const { userTheme } = useLocalState(); const { @@ -91,10 +103,6 @@ export function InvenTreeTable>({ const [fieldNames, setFieldNames] = useState>({}); - const api = useApi(); - const navigate = useNavigate(); - const { showContextMenu } = useContextMenu(); - const userSettings = useUserSettingsState(); const stickyTableHeader = useMemo(() => { @@ -388,11 +396,7 @@ export function InvenTreeTable>({ useEffect(() => { tableState.setPage(1); tableState.clearSelectedRecords(); - }, [ - tableState.searchTerm, - tableState.filterSet.activeFilters, - tableState.queryFilters - ]); + }, [tableState.searchTerm, tableState.filterSet.activeFilters, searchParams]); // Account for invalid page offsets useEffect(() => { @@ -426,9 +430,9 @@ export function InvenTreeTable>({ ...tableProps.params }; - if (tableState.queryFilters && tableState.queryFilters.size > 0) { + if (searchParams && searchParams.size > 0) { // Allow override of filters based on URL query parameters - for (const [key, value] of tableState.queryFilters) { + for (const [key, value] of searchParams) { queryParams[key] = value; } } else if (tableState.filterSet.activeFilters) { @@ -467,7 +471,7 @@ export function InvenTreeTable>({ tableProps.params, tableProps.enablePagination, tableState.filterSet.activeFilters, - tableState.queryFilters, + searchParams, tableState.searchTerm, getOrderingTerm ] @@ -609,7 +613,7 @@ export function InvenTreeTable>({ // Refetch data when the query parameters change useEffect(() => { refetch(); - }, [tableState.queryFilters]); + }, [searchParams]); useEffect(() => { const loading: boolean = @@ -705,7 +709,7 @@ export function InvenTreeTable>({ const empty = () => {}; let items: ContextMenuItemOptions[] = []; - if (props.rowActions) { + if (!!props.rowActions) { items = props.rowActions(record).map((action) => ({ key: action.title ?? '', title: action.title ?? '', @@ -743,7 +747,7 @@ export function InvenTreeTable>({ }); } - return showContextMenu(items)(event); + return showContextMenu?.(items)(event); }; // Pagination refresh table if pageSize changes @@ -825,6 +829,8 @@ export function InvenTreeTable>({ hasSwitchableColumns={hasSwitchableColumns} columns={dataColumns} filters={filters} + queryFilters={searchParams} + clearQueryFilters={() => setSearchParams?.(new URLSearchParams())} toggleColumn={toggleColumn} /> @@ -874,3 +880,51 @@ export function InvenTreeTable>({ ); } + +/** + * This is an internal wrapper function for the InvenTreeTableInternal component, + * which provides the necessary context management for the table to function correctly. + * + * In addition to the provided table props, this wrapper provides context for: + * + * - api: The API instance for making requests to the server + * - navigate: The navigation function for navigating to different pages + * + */ +export function InvenTreeTable>({ + url, + tableState, + tableData, + columns, + props +}: Readonly<{ + url?: string; + tableState: TableState; + tableData?: T[]; + columns: TableColumn[]; + props: InvenTreeTableProps; +}>) { + const api = useApi(); + const navigate = useNavigate(); + + const { showContextMenu } = useContextMenu(); + + // Extract URL query parameters (e.g. ?active=true&overdue=false) + // Note: These can only be used internally (i.e *not in plugin context) + const [searchParams, setSearchParams] = useSearchParams(); + + return ( + + ); +} diff --git a/src/frontend/src/tables/InvenTreeTableHeader.tsx b/src/frontend/src/tables/InvenTreeTableHeader.tsx index d5d6b45c27..30e8e771d3 100644 --- a/src/frontend/src/tables/InvenTreeTableHeader.tsx +++ b/src/frontend/src/tables/InvenTreeTableHeader.tsx @@ -23,19 +23,19 @@ import { useMemo, useState } from 'react'; import { Fragment } from 'react/jsx-runtime'; import { ActionButton } from '@lib/components/ActionButton'; +import { Boundary } from '@lib/components/Boundary'; import { ButtonMenu } from '@lib/components/ButtonMenu'; import { SearchInput } from '@lib/components/SearchInput'; +import { TableColumnSelect } from '@lib/components/TableColumnSelect'; import { resolveItem } from '@lib/functions/Conversion'; import type { TableFilter } from '@lib/types/Filters'; import type { TableState } from '@lib/types/Tables'; import type { InvenTreeTableProps } from '@lib/types/Tables'; import { showNotification } from '@mantine/notifications'; -import { Boundary } from '../components/Boundary'; import { PrintingActions } from '../components/buttons/PrintingActions'; import { StylishText } from '../components/items/StylishText'; import useDataExport from '../hooks/UseDataExport'; import { useDeleteApiFormModal } from '../hooks/UseForm'; -import { TableColumnSelect } from './ColumnSelect'; import { FilterPreview, FilterSelectDrawer } from './FilterSelectDrawer'; /** @@ -48,6 +48,8 @@ export default function InvenTreeTableHeader({ hasSwitchableColumns, columns, filters, + queryFilters, + clearQueryFilters, toggleColumn }: Readonly<{ tableUrl?: string; @@ -56,6 +58,8 @@ export default function InvenTreeTableHeader({ hasSwitchableColumns: boolean; columns: any; filters: TableFilter[]; + queryFilters?: URLSearchParams; + clearQueryFilters: () => void; toggleColumn: (column: string) => void; }>) { // Filter list visibility @@ -80,8 +84,8 @@ export default function InvenTreeTableHeader({ } // Allow overriding of query parameters - if (tableState.queryFilters) { - for (const [key, value] of tableState.queryFilters) { + if (queryFilters) { + for (const [key, value] of queryFilters) { if (value != undefined) { filters[key] = value; } @@ -89,7 +93,7 @@ export default function InvenTreeTableHeader({ } return filters; - }, [tableProps.params, tableState.filterSet, tableState.queryFilters]); + }, [tableProps.params, tableState.filterSet, queryFilters]); const exportModal = useDataExport({ url: tableUrl ?? '', @@ -139,12 +143,12 @@ export default function InvenTreeTableHeader({ }); const hasCustomSearch = useMemo(() => { - return tableState.queryFilters.has('search'); - }, [tableState.queryFilters]); + return queryFilters?.has('search'); + }, [queryFilters]); const hasCustomFilters = useMemo(() => { - return (tableState?.queryFilters?.size ?? 0) > 0; - }, [tableState.queryFilters]); + return (queryFilters?.size ?? 0) > 0; + }, [queryFilters]); // Extract ID values for label and report printing const printingIdValues = useMemo(() => { @@ -174,7 +178,7 @@ export default function InvenTreeTableHeader({ color='yellow' withCloseButton title={t`Custom table filters are active`} - onClose={() => tableState.clearQueryFilters()} + onClose={() => clearQueryFilters()} /> )} diff --git a/src/frontend/src/tables/bom/BomTable.tsx b/src/frontend/src/tables/bom/BomTable.tsx index 09a2c7ee1c..61d064c1c3 100644 --- a/src/frontend/src/tables/bom/BomTable.tsx +++ b/src/frontend/src/tables/bom/BomTable.tsx @@ -9,6 +9,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { navigateToLink } from '@lib/functions/Navigation'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { t } from '@lingui/core/macro'; @@ -37,7 +38,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useImporterState } from '../../states/ImporterState'; import { useUserState } from '../../states/UserState'; import { diff --git a/src/frontend/src/tables/bom/UsedInTable.tsx b/src/frontend/src/tables/bom/UsedInTable.tsx index 0134d1a4ec..272e9a43c0 100644 --- a/src/frontend/src/tables/bom/UsedInTable.tsx +++ b/src/frontend/src/tables/bom/UsedInTable.tsx @@ -5,13 +5,13 @@ import { useCallback, useMemo, useState } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { RowEditAction, UserRoles } from '@lib/index'; import type { TableFilter } from '@lib/types/Filters'; import type { RowAction, TableColumn } from '@lib/types/Tables'; import { formatDecimal } from '../../defaults/formatters'; import { bomItemFields } from '../../forms/BomForms'; import { useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn, diff --git a/src/frontend/src/tables/build/BuildAllocatedStockTable.tsx b/src/frontend/src/tables/build/BuildAllocatedStockTable.tsx index bbeff526d3..ca70958099 100644 --- a/src/frontend/src/tables/build/BuildAllocatedStockTable.tsx +++ b/src/frontend/src/tables/build/BuildAllocatedStockTable.tsx @@ -6,6 +6,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { ActionButton, formatDecimal } from '@lib/index'; import type { TableFilter } from '@lib/types/Filters'; import type { StockOperationProps } from '@lib/types/Forms'; @@ -19,7 +20,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DecimalColumn, diff --git a/src/frontend/src/tables/build/BuildLineTable.tsx b/src/frontend/src/tables/build/BuildLineTable.tsx index 559303666a..2e0a07a18a 100644 --- a/src/frontend/src/tables/build/BuildLineTable.tsx +++ b/src/frontend/src/tables/build/BuildLineTable.tsx @@ -22,6 +22,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { formatDecimal } from '@lib/functions/Formatting'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { RowAction, TableColumn } from '@lib/types/Tables'; import OrderPartsWizard from '../../components/wizards/OrderPartsWizard'; @@ -38,7 +39,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import useStatusCodes from '../../hooks/UseStatusCodes'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, diff --git a/src/frontend/src/tables/build/BuildOrderTable.tsx b/src/frontend/src/tables/build/BuildOrderTable.tsx index b4480256ca..bc875ebb37 100644 --- a/src/frontend/src/tables/build/BuildOrderTable.tsx +++ b/src/frontend/src/tables/build/BuildOrderTable.tsx @@ -7,10 +7,10 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import { useBuildOrderFields } from '../../forms/BuildForms'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useGlobalSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; import { diff --git a/src/frontend/src/tables/build/BuildOutputTable.tsx b/src/frontend/src/tables/build/BuildOutputTable.tsx index f02c28e92a..497d5d2d0a 100644 --- a/src/frontend/src/tables/build/BuildOutputTable.tsx +++ b/src/frontend/src/tables/build/BuildOutputTable.tsx @@ -28,6 +28,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { StockOperationProps } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -52,7 +53,6 @@ import { } from '../../hooks/UseForm'; import useStatusCodes from '../../hooks/UseStatusCodes'; import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { LocationColumn, diff --git a/src/frontend/src/tables/company/AddressTable.tsx b/src/frontend/src/tables/company/AddressTable.tsx index a51e381c18..8114bf1f24 100644 --- a/src/frontend/src/tables/company/AddressTable.tsx +++ b/src/frontend/src/tables/company/AddressTable.tsx @@ -11,6 +11,7 @@ import { YesNoButton } from '@lib/components/YesNoButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; import { @@ -18,7 +19,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { LinkColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/company/CompanyTable.tsx b/src/frontend/src/tables/company/CompanyTable.tsx index 13d9c61159..9856579709 100644 --- a/src/frontend/src/tables/company/CompanyTable.tsx +++ b/src/frontend/src/tables/company/CompanyTable.tsx @@ -9,13 +9,13 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { navigateToLink } from '@lib/functions/Navigation'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import { companyFields } from '../../forms/CompanyForms'; import { useCreateApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, diff --git a/src/frontend/src/tables/company/ContactTable.tsx b/src/frontend/src/tables/company/ContactTable.tsx index 33082b96b3..b2dcbb95ce 100644 --- a/src/frontend/src/tables/company/ContactTable.tsx +++ b/src/frontend/src/tables/company/ContactTable.tsx @@ -12,6 +12,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { getDetailUrl } from '@lib/functions/Navigation'; +import useTable from '@lib/hooks/UseTable'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; import { useNavigate } from 'react-router-dom'; @@ -21,7 +22,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/general/AttachmentTable.tsx b/src/frontend/src/tables/general/AttachmentTable.tsx index 5b5e2ff58a..9608b79ace 100644 --- a/src/frontend/src/tables/general/AttachmentTable.tsx +++ b/src/frontend/src/tables/general/AttachmentTable.tsx @@ -22,6 +22,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import type { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -33,7 +34,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/general/BarcodeScanTable.tsx b/src/frontend/src/tables/general/BarcodeScanTable.tsx index 60b2546e73..ad67ff523d 100644 --- a/src/frontend/src/tables/general/BarcodeScanTable.tsx +++ b/src/frontend/src/tables/general/BarcodeScanTable.tsx @@ -1,5 +1,6 @@ import { ActionButton } from '@lib/components/ActionButton'; import { type RowAction, RowViewAction } from '@lib/components/RowActions'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { t } from '@lingui/core/macro'; import { IconTrash } from '@tabler/icons-react'; @@ -7,7 +8,6 @@ import { useCallback, useEffect, useMemo } from 'react'; import { useNavigate } from 'react-router-dom'; import type { BarcodeScanItem } from '../../components/barcodes/BarcodeScanItem'; import { RenderInstance } from '../../components/render/Instance'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/general/ExtraLineItemTable.tsx b/src/frontend/src/tables/general/ExtraLineItemTable.tsx index 299a7b07ef..88b490a21f 100644 --- a/src/frontend/src/tables/general/ExtraLineItemTable.tsx +++ b/src/frontend/src/tables/general/ExtraLineItemTable.tsx @@ -11,6 +11,7 @@ import { import type { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import type { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { formatCurrency } from '../../defaults/formatters'; import { extraLineItemFields } from '../../forms/CommonForms'; @@ -19,7 +20,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DecimalColumn, diff --git a/src/frontend/src/tables/general/ParameterTable.tsx b/src/frontend/src/tables/general/ParameterTable.tsx index 71ced6820f..6883682ab0 100644 --- a/src/frontend/src/tables/general/ParameterTable.tsx +++ b/src/frontend/src/tables/general/ParameterTable.tsx @@ -1,3 +1,4 @@ +import useTable from '@lib/hooks/UseTable'; import { ApiEndpoints, ModelType, @@ -20,7 +21,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useImporterState } from '../../states/ImporterState'; import { useUserState } from '../../states/UserState'; import { diff --git a/src/frontend/src/tables/general/ParameterTemplateTable.tsx b/src/frontend/src/tables/general/ParameterTemplateTable.tsx index ee37a464b5..e95bf90421 100644 --- a/src/frontend/src/tables/general/ParameterTemplateTable.tsx +++ b/src/frontend/src/tables/general/ParameterTemplateTable.tsx @@ -1,3 +1,4 @@ +import useTable from '@lib/hooks/UseTable'; import { AddItemButton, ApiEndpoints, @@ -18,7 +19,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/general/ParametricDataTable.tsx b/src/frontend/src/tables/general/ParametricDataTable.tsx index 0bfa12a62c..5d22505190 100644 --- a/src/frontend/src/tables/general/ParametricDataTable.tsx +++ b/src/frontend/src/tables/general/ParametricDataTable.tsx @@ -1,4 +1,5 @@ import { cancelEvent } from '@lib/functions/Events'; +import useTable from '@lib/hooks/UseTable'; import { ApiEndpoints, type ApiFormFieldSet, @@ -25,7 +26,6 @@ import { useCreateApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; import { TableHoverCard } from '../TableHoverCard'; diff --git a/src/frontend/src/tables/machine/MachineListTable.tsx b/src/frontend/src/tables/machine/MachineListTable.tsx index 7ded77a8cf..eaceffa7a3 100644 --- a/src/frontend/src/tables/machine/MachineListTable.tsx +++ b/src/frontend/src/tables/machine/MachineListTable.tsx @@ -26,6 +26,7 @@ import { AddItemButton } from '@lib/components/AddItemButton'; import { YesNoButton } from '@lib/components/YesNoButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { RowDeleteAction, RowEditAction, formatDecimal } from '@lib/index'; import type { RowAction, TableColumn } from '@lib/types/Tables'; import type { InvenTreeTableProps } from '@lib/types/Tables'; @@ -54,7 +55,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { BooleanColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; import type { MachineDriverI, MachineTypeI } from './MachineTypeTable'; diff --git a/src/frontend/src/tables/machine/MachineTypeTable.tsx b/src/frontend/src/tables/machine/MachineTypeTable.tsx index c9aebc29e8..c3cd11998a 100644 --- a/src/frontend/src/tables/machine/MachineTypeTable.tsx +++ b/src/frontend/src/tables/machine/MachineTypeTable.tsx @@ -20,12 +20,12 @@ import { useNavigate } from 'react-router-dom'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import type { InvenTreeTableProps } from '@lib/types/Tables'; import { InfoItem } from '../../components/items/InfoItem'; import { StylishText } from '../../components/items/StylishText'; import { DetailDrawer } from '../../components/nav/DetailDrawer'; -import { useTable } from '../../hooks/UseTable'; import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; import { MachineListTable, useMachineTypeDriver } from './MachineListTable'; diff --git a/src/frontend/src/tables/part/PartBuildAllocationsTable.tsx b/src/frontend/src/tables/part/PartBuildAllocationsTable.tsx index ee4b58f650..47b2dc5d42 100644 --- a/src/frontend/src/tables/part/PartBuildAllocationsTable.tsx +++ b/src/frontend/src/tables/part/PartBuildAllocationsTable.tsx @@ -10,10 +10,10 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { IconCircleCheck } from '@tabler/icons-react'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn, diff --git a/src/frontend/src/tables/part/PartCategoryTable.tsx b/src/frontend/src/tables/part/PartCategoryTable.tsx index 3505b45da6..6c972f6321 100644 --- a/src/frontend/src/tables/part/PartCategoryTable.tsx +++ b/src/frontend/src/tables/part/PartCategoryTable.tsx @@ -10,6 +10,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { ActionDropdown } from '../../components/items/ActionDropdown'; @@ -21,7 +22,6 @@ import { useCreateApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/part/PartCategoryTemplateTable.tsx b/src/frontend/src/tables/part/PartCategoryTemplateTable.tsx index 604e18609a..362c863e23 100644 --- a/src/frontend/src/tables/part/PartCategoryTemplateTable.tsx +++ b/src/frontend/src/tables/part/PartCategoryTemplateTable.tsx @@ -11,6 +11,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -19,7 +20,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/part/PartPurchaseOrdersTable.tsx b/src/frontend/src/tables/part/PartPurchaseOrdersTable.tsx index 213d081c7a..f4cff53948 100644 --- a/src/frontend/src/tables/part/PartPurchaseOrdersTable.tsx +++ b/src/frontend/src/tables/part/PartPurchaseOrdersTable.tsx @@ -6,10 +6,10 @@ import { ProgressBar } from '@lib/components/ProgressBar'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { formatCurrency, formatDecimal } from '../../defaults/formatters'; -import { useTable } from '../../hooks/UseTable'; import { DateColumn, ReferenceColumn, StatusColumn } from '../ColumnRenderers'; import { IncludeVariantsFilter, StatusFilterOptions } from '../Filter'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/part/PartSalesAllocationsTable.tsx b/src/frontend/src/tables/part/PartSalesAllocationsTable.tsx index 516bb456de..e74d4d7dad 100644 --- a/src/frontend/src/tables/part/PartSalesAllocationsTable.tsx +++ b/src/frontend/src/tables/part/PartSalesAllocationsTable.tsx @@ -10,9 +10,9 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn, diff --git a/src/frontend/src/tables/part/PartTable.tsx b/src/frontend/src/tables/part/PartTable.tsx index 27fa146186..0041e77ae8 100644 --- a/src/frontend/src/tables/part/PartTable.tsx +++ b/src/frontend/src/tables/part/PartTable.tsx @@ -7,6 +7,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -33,7 +34,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import { usePluginsWithMixin } from '../../hooks/UsePlugins'; -import { useTable } from '../../hooks/UseTable'; import { useImporterState } from '../../states/ImporterState'; import { useGlobalSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; diff --git a/src/frontend/src/tables/part/PartTestResultTable.tsx b/src/frontend/src/tables/part/PartTestResultTable.tsx index 6a67fb4a20..a2079ee6a7 100644 --- a/src/frontend/src/tables/part/PartTestResultTable.tsx +++ b/src/frontend/src/tables/part/PartTestResultTable.tsx @@ -15,6 +15,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; import { cancelEvent } from '@lib/functions/Events'; +import useTable from '@lib/hooks/UseTable'; import { AddItemButton } from '@lib/index'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; @@ -25,7 +26,6 @@ import { useApi } from '../../contexts/ApiContext'; import { formatDate } from '../../defaults/formatters'; import { useTestResultFields } from '../../forms/StockForms'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { LocationColumn, PartColumn } from '../ColumnRenderers'; import { BatchFilter, diff --git a/src/frontend/src/tables/part/PartTestTemplateTable.tsx b/src/frontend/src/tables/part/PartTestTemplateTable.tsx index f1779b8b05..fc8bb02081 100644 --- a/src/frontend/src/tables/part/PartTestTemplateTable.tsx +++ b/src/frontend/src/tables/part/PartTestTemplateTable.tsx @@ -17,6 +17,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { getDetailUrl } from '@lib/functions/Navigation'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -25,7 +26,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/part/RelatedPartTable.tsx b/src/frontend/src/tables/part/RelatedPartTable.tsx index ab9f098e5f..1714239287 100644 --- a/src/frontend/src/tables/part/RelatedPartTable.tsx +++ b/src/frontend/src/tables/part/RelatedPartTable.tsx @@ -12,6 +12,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; import { Thumbnail } from '../../components/images/Thumbnail'; @@ -20,7 +21,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { NoteColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/part/SelectionListTable.tsx b/src/frontend/src/tables/part/SelectionListTable.tsx index 0914639314..a63b84670a 100644 --- a/src/frontend/src/tables/part/SelectionListTable.tsx +++ b/src/frontend/src/tables/part/SelectionListTable.tsx @@ -10,6 +10,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { selectionListFields } from '../../forms/selectionListFields'; import { @@ -17,7 +18,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/plugin/PluginErrorTable.tsx b/src/frontend/src/tables/plugin/PluginErrorTable.tsx index 4f3d5212da..bec6fda561 100644 --- a/src/frontend/src/tables/plugin/PluginErrorTable.tsx +++ b/src/frontend/src/tables/plugin/PluginErrorTable.tsx @@ -4,8 +4,8 @@ import { useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; -import { useTable } from '../../hooks/UseTable'; import { InvenTreeTable } from '../InvenTreeTable'; export interface PluginRegistryErrorI { diff --git a/src/frontend/src/tables/plugin/PluginListTable.tsx b/src/frontend/src/tables/plugin/PluginListTable.tsx index 580414ffaa..ab5f462f74 100644 --- a/src/frontend/src/tables/plugin/PluginListTable.tsx +++ b/src/frontend/src/tables/plugin/PluginListTable.tsx @@ -17,6 +17,7 @@ import { ActionButton } from '@lib/components/ActionButton'; import type { RowAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { DetailDrawer } from '../../components/nav/DetailDrawer'; import PluginDrawer from '../../components/plugins/PluginDrawer'; @@ -27,7 +28,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useServerApiState } from '../../states/ServerApiState'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, LinkColumn } from '../ColumnRenderers'; diff --git a/src/frontend/src/tables/purchasing/ManufacturerPartTable.tsx b/src/frontend/src/tables/purchasing/ManufacturerPartTable.tsx index 4c371ad104..34db4ccab7 100644 --- a/src/frontend/src/tables/purchasing/ManufacturerPartTable.tsx +++ b/src/frontend/src/tables/purchasing/ManufacturerPartTable.tsx @@ -12,6 +12,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { useManufacturerPartFields } from '../../forms/CompanyForms'; @@ -20,7 +21,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { CompanyColumn, diff --git a/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx b/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx index b3dc66dd34..3eb214f0af 100644 --- a/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx +++ b/src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx @@ -18,6 +18,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { formatDecimal } from '@lib/functions/Formatting'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { useNavigate } from 'react-router-dom'; @@ -34,7 +35,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import useStatusCodes from '../../hooks/UseStatusCodes'; -import { useTable } from '../../hooks/UseTable'; import { useImporterState } from '../../states/ImporterState'; import { useUserState } from '../../states/UserState'; import { diff --git a/src/frontend/src/tables/purchasing/PurchaseOrderTable.tsx b/src/frontend/src/tables/purchasing/PurchaseOrderTable.tsx index 7f9b4e1465..9775391b05 100644 --- a/src/frontend/src/tables/purchasing/PurchaseOrderTable.tsx +++ b/src/frontend/src/tables/purchasing/PurchaseOrderTable.tsx @@ -6,11 +6,11 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import { formatCurrency } from '../../defaults/formatters'; import { usePurchaseOrderFields } from '../../forms/PurchaseOrderForms'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { CompanyColumn, diff --git a/src/frontend/src/tables/purchasing/SupplierPartTable.tsx b/src/frontend/src/tables/purchasing/SupplierPartTable.tsx index ef75f6ade5..4cae53fa9f 100644 --- a/src/frontend/src/tables/purchasing/SupplierPartTable.tsx +++ b/src/frontend/src/tables/purchasing/SupplierPartTable.tsx @@ -14,6 +14,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { IconPackageImport } from '@tabler/icons-react'; @@ -25,7 +26,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import { usePluginsWithMixin } from '../../hooks/UsePlugins'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, diff --git a/src/frontend/src/tables/purchasing/SupplierPriceBreakTable.tsx b/src/frontend/src/tables/purchasing/SupplierPriceBreakTable.tsx index 489a19bf0c..4328a71db7 100644 --- a/src/frontend/src/tables/purchasing/SupplierPriceBreakTable.tsx +++ b/src/frontend/src/tables/purchasing/SupplierPriceBreakTable.tsx @@ -13,6 +13,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { getDetailUrl } from '@lib/functions/Navigation'; +import useTable from '@lib/hooks/UseTable'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; import { formatCurrency } from '../../defaults/formatters'; @@ -21,7 +22,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { CompanyColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/sales/ReturnOrderLineItemTable.tsx b/src/frontend/src/tables/sales/ReturnOrderLineItemTable.tsx index 6189338798..23cef54278 100644 --- a/src/frontend/src/tables/sales/ReturnOrderLineItemTable.tsx +++ b/src/frontend/src/tables/sales/ReturnOrderLineItemTable.tsx @@ -13,6 +13,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { formatCurrency } from '../../defaults/formatters'; @@ -26,7 +27,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import useStatusCodes from '../../hooks/UseStatusCodes'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DateColumn, diff --git a/src/frontend/src/tables/sales/ReturnOrderTable.tsx b/src/frontend/src/tables/sales/ReturnOrderTable.tsx index 2f50cdab10..7e17782ed2 100644 --- a/src/frontend/src/tables/sales/ReturnOrderTable.tsx +++ b/src/frontend/src/tables/sales/ReturnOrderTable.tsx @@ -6,11 +6,11 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import { formatCurrency } from '../../defaults/formatters'; import { useReturnOrderFields } from '../../forms/ReturnOrderForms'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { CompanyColumn, diff --git a/src/frontend/src/tables/sales/SalesOrderAllocationTable.tsx b/src/frontend/src/tables/sales/SalesOrderAllocationTable.tsx index a5726d5759..d684c19dca 100644 --- a/src/frontend/src/tables/sales/SalesOrderAllocationTable.tsx +++ b/src/frontend/src/tables/sales/SalesOrderAllocationTable.tsx @@ -11,6 +11,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { StockOperationProps } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -25,7 +26,6 @@ import { useEditApiFormModal } from '../../hooks/UseForm'; import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn, diff --git a/src/frontend/src/tables/sales/SalesOrderLineItemTable.tsx b/src/frontend/src/tables/sales/SalesOrderLineItemTable.tsx index 115f7f59b9..e3ab149f9e 100644 --- a/src/frontend/src/tables/sales/SalesOrderLineItemTable.tsx +++ b/src/frontend/src/tables/sales/SalesOrderLineItemTable.tsx @@ -25,6 +25,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { RenderPart } from '../../components/render/Part'; @@ -41,7 +42,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DateColumn, diff --git a/src/frontend/src/tables/sales/SalesOrderShipmentTable.tsx b/src/frontend/src/tables/sales/SalesOrderShipmentTable.tsx index 6de278adf2..69922d0589 100644 --- a/src/frontend/src/tables/sales/SalesOrderShipmentTable.tsx +++ b/src/frontend/src/tables/sales/SalesOrderShipmentTable.tsx @@ -19,6 +19,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { @@ -33,7 +34,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { CompanyColumn, diff --git a/src/frontend/src/tables/sales/SalesOrderTable.tsx b/src/frontend/src/tables/sales/SalesOrderTable.tsx index 6f679f728f..55612f5168 100644 --- a/src/frontend/src/tables/sales/SalesOrderTable.tsx +++ b/src/frontend/src/tables/sales/SalesOrderTable.tsx @@ -7,11 +7,11 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import { formatCurrency } from '../../defaults/formatters'; import { useSalesOrderFields } from '../../forms/SalesOrderForms'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { AllocatedLinesProgressColumn, diff --git a/src/frontend/src/tables/settings/ApiTokenTable.tsx b/src/frontend/src/tables/settings/ApiTokenTable.tsx index 5a70d1ec66..cb1f080b3d 100644 --- a/src/frontend/src/tables/settings/ApiTokenTable.tsx +++ b/src/frontend/src/tables/settings/ApiTokenTable.tsx @@ -1,7 +1,9 @@ import { AddItemButton } from '@lib/components/AddItemButton'; +import { CopyButton } from '@lib/components/CopyButton'; import type { RowAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import { t } from '@lingui/core/macro'; import { Trans } from '@lingui/react/macro'; @@ -10,11 +12,9 @@ import { useDisclosure } from '@mantine/hooks'; import { IconCircleX } from '@tabler/icons-react'; import { useCallback, useMemo, useState } from 'react'; import { api } from '../../App'; -import { CopyButton } from '../../components/buttons/CopyButton'; import { StylishText } from '../../components/items/StylishText'; import { showApiErrorMessage } from '../../functions/notifications'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { BooleanColumn, UserColumn } from '../ColumnRenderers'; import { UserFilter } from '../Filter'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/BarcodeScanHistoryTable.tsx b/src/frontend/src/tables/settings/BarcodeScanHistoryTable.tsx index e7266b640d..369b752549 100644 --- a/src/frontend/src/tables/settings/BarcodeScanHistoryTable.tsx +++ b/src/frontend/src/tables/settings/BarcodeScanHistoryTable.tsx @@ -14,19 +14,19 @@ import { useDisclosure } from '@mantine/hooks'; import { IconExclamationCircle } from '@tabler/icons-react'; import { useCallback, useMemo, useState } from 'react'; +import { CopyButton } from '@lib/components/CopyButton'; import { RowDeleteAction } from '@lib/components/RowActions'; import { PassFailButton } from '@lib/components/YesNoButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import { shortenString } from '@lib/functions/String'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; -import { CopyButton } from '../../components/buttons/CopyButton'; import { StylishText } from '../../components/items/StylishText'; import { RenderUser } from '../../components/render/User'; -import { shortenString } from '../../functions/tables'; import { useDeleteApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useGlobalSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; import { UserFilter } from '../Filter'; diff --git a/src/frontend/src/tables/settings/CustomStateTable.tsx b/src/frontend/src/tables/settings/CustomStateTable.tsx index b6914df467..668875a8e2 100644 --- a/src/frontend/src/tables/settings/CustomStateTable.tsx +++ b/src/frontend/src/tables/settings/CustomStateTable.tsx @@ -12,6 +12,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import type { @@ -25,7 +26,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useGlobalStatusState } from '../../states/GlobalStatusState'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/CustomUnitsTable.tsx b/src/frontend/src/tables/settings/CustomUnitsTable.tsx index 92ae0b6c5b..e0e89f357d 100644 --- a/src/frontend/src/tables/settings/CustomUnitsTable.tsx +++ b/src/frontend/src/tables/settings/CustomUnitsTable.tsx @@ -10,6 +10,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { customUnitsFields } from '../../forms/CommonForms'; import { @@ -17,7 +18,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/EmailTable.tsx b/src/frontend/src/tables/settings/EmailTable.tsx index 87526a2e27..a36b4e4e52 100644 --- a/src/frontend/src/tables/settings/EmailTable.tsx +++ b/src/frontend/src/tables/settings/EmailTable.tsx @@ -2,6 +2,7 @@ import { ActionButton } from '@lib/components/ActionButton'; import { RowDeleteAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { t } from '@lingui/core/macro'; import { ActionIcon, Alert, Badge, Group, HoverCard } from '@mantine/core'; import { IconExclamationCircle, IconTestPipe } from '@tabler/icons-react'; @@ -10,7 +11,6 @@ import { useCreateApiFormModal, useDeleteApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DateColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/ErrorTable.tsx b/src/frontend/src/tables/settings/ErrorTable.tsx index 293b4b043f..545c46bc3d 100644 --- a/src/frontend/src/tables/settings/ErrorTable.tsx +++ b/src/frontend/src/tables/settings/ErrorTable.tsx @@ -3,15 +3,15 @@ import { Group, Loader, Stack, Table, Text } from '@mantine/core'; import { useCallback, useMemo, useState } from 'react'; import { useNavigate, useParams } from 'react-router-dom'; +import { CopyButton } from '@lib/components/CopyButton'; import { type RowAction, RowDeleteAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; -import { CopyButton } from '../../components/buttons/CopyButton'; import { DetailDrawer } from '../../components/nav/DetailDrawer'; import { useDeleteApiFormModal } from '../../hooks/UseForm'; import { useInstance } from '../../hooks/UseInstance'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/ExportSessionTable.tsx b/src/frontend/src/tables/settings/ExportSessionTable.tsx index 862cfa40b4..06819f2354 100644 --- a/src/frontend/src/tables/settings/ExportSessionTable.tsx +++ b/src/frontend/src/tables/settings/ExportSessionTable.tsx @@ -1,6 +1,7 @@ import { type RowAction, RowDeleteAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { t } from '@lingui/core/macro'; @@ -8,7 +9,6 @@ import { useCallback, useMemo, useState } from 'react'; import { AttachmentLink } from '../../components/items/AttachmentLink'; import { RenderUser } from '../../components/render/User'; import { useDeleteApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { DateColumn } from '../ColumnRenderers'; import { UserFilter } from '../Filter'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/FailedTasksTable.tsx b/src/frontend/src/tables/settings/FailedTasksTable.tsx index ab8a3e5613..c99b3d40ce 100644 --- a/src/frontend/src/tables/settings/FailedTasksTable.tsx +++ b/src/frontend/src/tables/settings/FailedTasksTable.tsx @@ -7,9 +7,9 @@ import { useMemo, useState } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { StylishText } from '../../components/items/StylishText'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/GroupTable.tsx b/src/frontend/src/tables/settings/GroupTable.tsx index 98cf7c20f8..c91fb88065 100644 --- a/src/frontend/src/tables/settings/GroupTable.tsx +++ b/src/frontend/src/tables/settings/GroupTable.tsx @@ -13,6 +13,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { type ApiFormModalProps, getDetailUrl } from '@lib/index'; import type { TableColumn, TableState } from '@lib/types/Tables'; import { IconUsersGroup } from '@tabler/icons-react'; @@ -26,7 +27,6 @@ import { useDeleteApiFormModal } from '../../hooks/UseForm'; import { useInstance } from '../../hooks/UseInstance'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/ImportSessionTable.tsx b/src/frontend/src/tables/settings/ImportSessionTable.tsx index 29d906cdfc..39df628147 100644 --- a/src/frontend/src/tables/settings/ImportSessionTable.tsx +++ b/src/frontend/src/tables/settings/ImportSessionTable.tsx @@ -7,6 +7,7 @@ import { type RowAction, RowDeleteAction } from '@lib/components/RowActions'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { AttachmentLink } from '../../components/items/AttachmentLink'; @@ -17,7 +18,6 @@ import { useCreateApiFormModal, useDeleteApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useImporterState } from '../../states/ImporterState'; import { DateColumn, StatusColumn } from '../ColumnRenderers'; import { StatusFilterOptions, UserFilter } from '../Filter'; diff --git a/src/frontend/src/tables/settings/PendingTasksTable.tsx b/src/frontend/src/tables/settings/PendingTasksTable.tsx index ffe8ee188e..7c31364d97 100644 --- a/src/frontend/src/tables/settings/PendingTasksTable.tsx +++ b/src/frontend/src/tables/settings/PendingTasksTable.tsx @@ -5,11 +5,11 @@ import { ActionButton } from '@lib/components/ActionButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { notifications, showNotification } from '@mantine/notifications'; import { IconTrashXFilled, IconX } from '@tabler/icons-react'; import { api } from '../../App'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/ProjectCodeTable.tsx b/src/frontend/src/tables/settings/ProjectCodeTable.tsx index 6d303aa02a..d6cdddf9e8 100644 --- a/src/frontend/src/tables/settings/ProjectCodeTable.tsx +++ b/src/frontend/src/tables/settings/ProjectCodeTable.tsx @@ -10,6 +10,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { projectCodeFields } from '../../forms/CommonForms'; import { @@ -17,7 +18,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn, ResponsibleColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/settings/ScheduledTasksTable.tsx b/src/frontend/src/tables/settings/ScheduledTasksTable.tsx index 1e0ae129b2..904632a1c2 100644 --- a/src/frontend/src/tables/settings/ScheduledTasksTable.tsx +++ b/src/frontend/src/tables/settings/ScheduledTasksTable.tsx @@ -5,8 +5,8 @@ import { useMemo } from 'react'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; -import { useTable } from '../../hooks/UseTable'; import { InvenTreeTable } from '../InvenTreeTable'; export default function ScheduledTasksTable() { diff --git a/src/frontend/src/tables/settings/TemplateTable.tsx b/src/frontend/src/tables/settings/TemplateTable.tsx index 4c75b10b4f..6aa4db3af5 100644 --- a/src/frontend/src/tables/settings/TemplateTable.tsx +++ b/src/frontend/src/tables/settings/TemplateTable.tsx @@ -15,6 +15,7 @@ import type { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import type { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; import { identifierString } from '@lib/functions/Conversion'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -47,7 +48,6 @@ import { } from '../../hooks/UseForm'; import { useInstance } from '../../hooks/UseInstance'; import { usePluginUIFeature } from '../../hooks/UsePluginUIFeature'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, diff --git a/src/frontend/src/tables/settings/UserTable.tsx b/src/frontend/src/tables/settings/UserTable.tsx index e70f106afe..55761b9881 100644 --- a/src/frontend/src/tables/settings/UserTable.tsx +++ b/src/frontend/src/tables/settings/UserTable.tsx @@ -20,6 +20,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import { type ApiFormModalProps, getDetailUrl } from '@lib/index'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn, TableState } from '@lib/types/Tables'; @@ -41,7 +42,6 @@ import { useDeleteApiFormModal } from '../../hooks/UseForm'; import { useInstance } from '../../hooks/UseInstance'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/stock/InstalledItemsTable.tsx b/src/frontend/src/tables/stock/InstalledItemsTable.tsx index 3de11d245c..5ccbc10eef 100644 --- a/src/frontend/src/tables/stock/InstalledItemsTable.tsx +++ b/src/frontend/src/tables/stock/InstalledItemsTable.tsx @@ -8,13 +8,13 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableColumn } from '@lib/types/Tables'; import { useStockItemInstallFields, useStockItemUninstallFields } from '../../forms/StockForms'; import { useCreateApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { PartColumn, StatusColumn, StockColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/stock/LocationTypesTable.tsx b/src/frontend/src/tables/stock/LocationTypesTable.tsx index ad7dcc60f8..89b7cb747f 100644 --- a/src/frontend/src/tables/stock/LocationTypesTable.tsx +++ b/src/frontend/src/tables/stock/LocationTypesTable.tsx @@ -10,6 +10,7 @@ import { import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; import { ApiIcon } from '../../components/items/ApiIcon'; @@ -18,7 +19,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/stock/StockItemTable.tsx b/src/frontend/src/tables/stock/StockItemTable.tsx index e23cd60a4c..2f65c74edb 100644 --- a/src/frontend/src/tables/stock/StockItemTable.tsx +++ b/src/frontend/src/tables/stock/StockItemTable.tsx @@ -9,6 +9,7 @@ import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; import { getDetailUrl } from '@lib/functions/Navigation'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { StockOperationProps } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -18,7 +19,6 @@ import { useStockFields } from '../../forms/StockForms'; import { InvenTreeIcon } from '../../functions/icons'; import { useCreateApiFormModal } from '../../hooks/UseForm'; import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions'; -import { useTable } from '../../hooks/UseTable'; import { useGlobalSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; import { diff --git a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx index c2c81d2548..be4342ea8d 100644 --- a/src/frontend/src/tables/stock/StockItemTestResultTable.tsx +++ b/src/frontend/src/tables/stock/StockItemTestResultTable.tsx @@ -21,6 +21,7 @@ import { PassFailButton } from '@lib/components/YesNoButton'; import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { ApiFormFieldSet } from '@lib/types/Forms'; import type { TableColumn } from '@lib/types/Tables'; @@ -33,7 +34,6 @@ import { useDeleteApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useGlobalSettingsState } from '../../states/SettingsStates'; import { useUserState } from '../../states/UserState'; import { diff --git a/src/frontend/src/tables/stock/StockLocationTable.tsx b/src/frontend/src/tables/stock/StockLocationTable.tsx index a0915c65a3..d8d6c9acd8 100644 --- a/src/frontend/src/tables/stock/StockLocationTable.tsx +++ b/src/frontend/src/tables/stock/StockLocationTable.tsx @@ -8,6 +8,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { UserRoles } from '@lib/enums/Roles'; import { apiUrl } from '@lib/functions/Api'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { ActionDropdown } from '../../components/items/ActionDropdown'; @@ -19,7 +20,6 @@ import { useCreateApiFormModal, useEditApiFormModal } from '../../hooks/UseForm'; -import { useTable } from '../../hooks/UseTable'; import { useUserState } from '../../states/UserState'; import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers'; import { InvenTreeTable } from '../InvenTreeTable'; diff --git a/src/frontend/src/tables/stock/StockTrackingTable.tsx b/src/frontend/src/tables/stock/StockTrackingTable.tsx index 6019661760..748fde47f5 100644 --- a/src/frontend/src/tables/stock/StockTrackingTable.tsx +++ b/src/frontend/src/tables/stock/StockTrackingTable.tsx @@ -7,6 +7,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints'; import { ModelType } from '@lib/enums/ModelType'; import { apiUrl } from '@lib/functions/Api'; import { formatDecimal } from '@lib/functions/Formatting'; +import useTable from '@lib/hooks/UseTable'; import type { TableFilter } from '@lib/types/Filters'; import type { TableColumn } from '@lib/types/Tables'; import { RenderBuildOrder } from '../../components/render/Build'; @@ -23,7 +24,6 @@ import { RenderStockLocation } from '../../components/render/Stock'; import { RenderUser } from '../../components/render/User'; -import { useTable } from '../../hooks/UseTable'; import { DateColumn, DescriptionColumn,