Table refactor (#12309)

* Refactor table components

- Move underlying components into src/components/tables
- Actual table implementation stay in src/tables

* Fix vite warnings

src/frontend/src/components/calendar/Calendar.tsx

@@ -52,7 +52,7 @@ import {
 import type { CalendarState } from '../../hooks/UseCalendar';
 import { useLocalState } from '../../states/LocalState';
 import { useGlobalSettingsState } from '../../states/SettingsStates';
-import { FilterSelectDrawer } from '../../tables/FilterSelectDrawer';
+import { FilterSelectDrawer } from '../tables/FilterSelectDrawer';
 
 export interface InvenTreeCalendarProps extends CalendarOptions {
   enableDownload?: boolean;

src/frontend/src/components/calendar/OrderCalendar.tsx

@@ -23,14 +23,14 @@ import { useNavigate } from 'react-router-dom';
 import { api } from '../../App';
 import useCalendar from '../../hooks/UseCalendar';
 import { useUserState } from '../../states/UserState';
+import { StatusRenderer, getStatusColor } from '../render/StatusRenderer';
 import {
   AssignedToMeFilter,
   HasProjectCodeFilter,
   OrderStatusFilter,
   ProjectCodeFilter,
   ResponsibleFilter
-} from '../../tables/Filter';
+} from '../tables/Filter';
-import { StatusRenderer, getStatusColor } from '../render/StatusRenderer';
 import Calendar from './Calendar';
 
 /**

src/frontend/src/components/importer/ImportDataSelector.tsx

@@ -30,8 +30,8 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import type { ImportSessionState } from '../../hooks/UseImportSession';
-import { InvenTreeTable } from '../../tables/InvenTreeTable';
 import { RenderRemoteInstance } from '../render/Instance';
+import { InvenTreeTable } from '../tables/InvenTreeTable';
 
 function ImporterDataCell({
   session,

src/frontend/src/components/plugins/PluginContext.tsx

@@ -47,11 +47,11 @@ import {
 } from '../../states/ImporterState';
 import { usePluginState } from '../../states/PluginState';
 import { useServerApiState } from '../../states/ServerApiState';
-import { InvenTreeTableInternal } from '../../tables/InvenTreeTable';
 import { EditApiForm } from '../forms/ApiForm';
 import { Thumbnail } from '../images/Thumbnail';
 import { RenderInstance, RenderRemoteInstance } from '../render/Instance';
 import { RenderInlineModel } from '../render/Instance';
+import { InvenTreeTableInternal } from '../tables/InvenTreeTable';
 
 export const useInvenTreeContext = () => {
   const [locale, host] = useLocalState(useShallow((s) => [s.language, s.host]));

src/frontend/src/components/render/Part.tsx

@@ -6,8 +6,8 @@ import { ModelType } from '@lib/enums/ModelType';
 import { formatDecimal } from '@lib/functions/Formatting';
 import { getDetailUrl } from '@lib/functions/Navigation';
 import { shortenString } from '@lib/functions/String';
-import { TableHoverCard } from '../../tables/TableHoverCard';
 import { ApiIcon } from '../items/ApiIcon';
+import { TableHoverCard } from '../tables/TableHoverCard';
 import { type InstanceRenderInterface, RenderInlineModel } from './Instance';
 
 /**

src/frontend/src/components/render/Stock.tsx

@@ -6,8 +6,8 @@ import { ModelType } from '@lib/enums/ModelType';
 import { formatDecimal } from '@lib/functions/Formatting';
 import { getDetailUrl } from '@lib/functions/Navigation';
 import { shortenString } from '@lib/functions/String';
-import { TableHoverCard } from '../../tables/TableHoverCard';
 import { ApiIcon } from '../items/ApiIcon';
+import { TableHoverCard } from '../tables/TableHoverCard';
 import {
   InlineSecondaryBadge,
   type InstanceRenderInterface,

src/frontend/src/components/tables/ColumnRenderers.tsx

@@ -25,18 +25,18 @@ import { resolveItem } from '@lib/functions/Conversion';
 import { cancelEvent } from '@lib/functions/Events';
 import type { TableColumn, TableColumnProps } from '@lib/types/Tables';
 import type { ReactNode } from 'react';
-import { Thumbnail } from '../components/images/Thumbnail';
-import { TableStatusRenderer } from '../components/render/StatusRenderer';
-import { RenderOwner } from '../components/render/User';
 import {
   formatCurrency,
   formatDate,
   formatDecimal
-} from '../defaults/formatters';
+} from '../../defaults/formatters';
 import {
   useGlobalSettingsState,
   useUserSettingsState
-} from '../states/SettingsStates';
+} from '../../states/SettingsStates';
+import { Thumbnail } from '../images/Thumbnail';
+import { TableStatusRenderer } from '../render/StatusRenderer';
+import { RenderOwner } from '../render/User';
 import { ProjectCodeHoverCard, TableHoverCard } from './TableHoverCard';
 
 export type PartColumnProps = TableColumnProps & {

src/frontend/src/components/tables/Filter.tsx

@@ -5,15 +5,15 @@ import { ModelType } from '@lib/enums/ModelType';
 import { apiUrl } from '@lib/functions/Api';
 import { isTrue } from '@lib/functions/Conversion';
 import type { TableFilter, TableFilterChoice } from '@lib/types/Filters';
-import type {
-  StatusCodeInterface,
-  StatusCodeListInterface
-} from '../components/render/StatusRenderer';
 import {
   type StatusLookup,
   useGlobalStatusState
-} from '../states/GlobalStatusState';
+} from '../../states/GlobalStatusState';
-import { useGlobalSettingsState } from '../states/SettingsStates';
+import { useGlobalSettingsState } from '../../states/SettingsStates';
+import type {
+  StatusCodeInterface,
+  StatusCodeListInterface
+} from '../render/StatusRenderer';
 
 // Determine the appropriate display label for a given filter, based on its name and the list of available filters
 export function filterDisplayLabel(

src/frontend/src/components/tables/FilterSelectDrawer.tsx

@@ -34,8 +34,8 @@ import {
   IconReload,
   IconX
 } from '@tabler/icons-react';
-import { api } from '../App';
+import { api } from '../../App';
-import { StandaloneField } from '../components/forms/StandaloneField';
+import { StandaloneField } from '../forms/StandaloneField';
 import {
   filterDisplayLabel,
   filterDisplayValue,

src/frontend/src/components/tables/InvenTreeTable.tsx

@@ -33,11 +33,11 @@ import {
 import type React from 'react';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate, useSearchParams } from 'react-router-dom';
-import { useApi } from '../contexts/ApiContext';
+import { useApi } from '../../contexts/ApiContext';
-import { extractAvailableFields } from '../functions/forms';
+import { extractAvailableFields } from '../../functions/forms';
-import { showApiErrorMessage } from '../functions/notifications';
+import { showApiErrorMessage } from '../../functions/notifications';
-import { useLocalState } from '../states/LocalState';
+import { useLocalState } from '../../states/LocalState';
-import { useUserSettingsState } from '../states/SettingsStates';
+import { useUserSettingsState } from '../../states/SettingsStates';
 import { ColumnFilterPopover } from './FilterSelectDrawer';
 import InvenTreeTableHeader from './InvenTreeTableHeader';
 

src/frontend/src/components/tables/InvenTreeTableHeader.tsx

@@ -33,9 +33,9 @@ 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 { PrintingActions } from '../components/buttons/PrintingActions';
+import useDataExport from '../../hooks/UseDataExport';
-import useDataExport from '../hooks/UseDataExport';
+import { useDeleteApiFormModal } from '../../hooks/UseForm';
-import { useDeleteApiFormModal } from '../hooks/UseForm';
+import { PrintingActions } from '../buttons/PrintingActions';
 import { FilterPreview, FilterSelectDrawer } from './FilterSelectDrawer';
 
 /**

src/frontend/src/components/tables/TableHoverCard.tsx

@@ -10,7 +10,7 @@ import {
 import { type ReactNode, useMemo } from 'react';
 
 import type { InvenTreeIconType } from '@lib/types/Icons';
-import { InvenTreeIcon } from '../functions/icons';
+import { InvenTreeIcon } from '../../functions/icons';
 
 /*
  * A custom hovercard element for displaying extra information in a table cell.

src/frontend/src/components/wizards/OrderPartsWizard.tsx

@@ -32,10 +32,10 @@ import { usePurchaseOrderFields } from '../../forms/PurchaseOrderForms';
 import { useCreateApiFormModal } from '../../hooks/UseForm';
 import { useInstance } from '../../hooks/UseInstance';
 import useWizard from '../../hooks/UseWizard';
-import { RenderPartColumn } from '../../tables/ColumnRenderers';
 import RemoveRowButton from '../buttons/RemoveRowButton';
 import { StandaloneField } from '../forms/StandaloneField';
 import Expand from '../items/Expand';
+import { RenderPartColumn } from '../tables/ColumnRenderers';
 
 /**
  * Render the "requirements" info for a part

src/frontend/src/forms/BuildForms.tsx

@@ -29,13 +29,13 @@ import {
   RenderStockItem,
   RenderStockLocation
 } from '../components/render/Stock';
+import { RenderPartColumn } from '../components/tables/ColumnRenderers';
 import { useCreateApiFormModal } from '../hooks/UseForm';
 import {
   useBatchCodeGenerator,
   useSerialNumberGenerator
 } from '../hooks/UseGenerator';
 import { useGlobalSettingsState } from '../states/SettingsStates';
-import { RenderPartColumn } from '../tables/ColumnRenderers';
 import { DuplicateField, ProjectCodeField, TagsField } from './CommonFields';
 
 /**

src/frontend/src/forms/ReturnOrderForms.tsx

@@ -20,9 +20,9 @@ import type {
 } from '@lib/types/Forms';
 import type { TableFieldRowProps } from '../components/forms/fields/TableField';
 import { Thumbnail } from '../components/images/Thumbnail';
+import { StatusFilterOptions } from '../components/tables/Filter';
 import { useCreateApiFormModal } from '../hooks/UseForm';
 import { useGlobalSettingsState } from '../states/SettingsStates';
-import { StatusFilterOptions } from '../tables/Filter';
 import { ProjectCodeField, TagsField } from './CommonFields';
 
 export function useReturnOrderFields({

src/frontend/src/forms/SalesOrderForms.tsx

@@ -29,11 +29,11 @@ import {
   TableFieldQuantityInput,
   type TableFieldRowProps
 } from '../components/forms/fields/TableField';
+import { RenderPartColumn } from '../components/tables/ColumnRenderers';
 import useBackgroundTask from '../hooks/UseBackgroundTask';
 import { useCreateApiFormModal, useEditApiFormModal } from '../hooks/UseForm';
 import { useGlobalSettingsState } from '../states/SettingsStates';
 import { useUserState } from '../states/UserState';
-import { RenderPartColumn } from '../tables/ColumnRenderers';
 import { ProjectCodeField, TagsField } from './CommonFields';
 
 export function useSalesOrderFields({

src/frontend/src/forms/StockForms.tsx

@@ -56,6 +56,7 @@ import {
 import { Thumbnail } from '../components/images/Thumbnail';
 import { StatusRenderer } from '../components/render/StatusRenderer';
 import { RenderStockLocation } from '../components/render/Stock';
+import { StatusFilterOptions } from '../components/tables/Filter';
 import { InvenTreeIcon } from '../functions/icons';
 import {
   useApiFormModal,
@@ -69,7 +70,6 @@ import {
 } from '../hooks/UseGenerator';
 import useStatusCodes from '../hooks/UseStatusCodes';
 import { useGlobalSettingsState } from '../states/SettingsStates';
-import { StatusFilterOptions } from '../tables/Filter';
 import { TagsField } from './CommonFields';
 
 /**

src/frontend/src/forms/TransferOrderForms.tsx

@@ -10,9 +10,9 @@ import {
   TableFieldQuantityInput,
   type TableFieldRowProps
 } from '../components/forms/fields/TableField';
+import { RenderPartColumn } from '../components/tables/ColumnRenderers';
 import { useCreateApiFormModal } from '../hooks/UseForm';
 import { useGlobalSettingsState } from '../states/SettingsStates';
-import { RenderPartColumn } from '../tables/ColumnRenderers';
 import { ProjectCodeField, TagsField } from './CommonFields';
 
 export function useTransferOrderFields({

src/frontend/src/pages/Index/Settings/AdminCenter/CurrencyManagementPanel.tsx

@@ -11,8 +11,8 @@ import useTable from '@lib/hooks/UseTable';
 import { api } from '../../../../App';
 import { FactCollection } from '../../../../components/settings/FactCollection';
 import { GlobalSettingList } from '../../../../components/settings/SettingList';
+import { InvenTreeTable } from '../../../../components/tables/InvenTreeTable';
 import { showApiErrorMessage } from '../../../../functions/notifications';
-import { InvenTreeTable } from '../../../../tables/InvenTreeTable';
 
 /*
  * Table for displaying available currencies

src/frontend/src/pages/Index/Settings/AdminCenter/UnitManagementPanel.tsx

@@ -6,8 +6,8 @@ import { StylishText } from '@lib/components/StylishText';
 import { ApiEndpoints } from '@lib/enums/ApiEndpoints';
 import { apiUrl } from '@lib/functions/Api';
 import useTable from '@lib/hooks/UseTable';
-import { BooleanColumn } from '../../../../tables/ColumnRenderers';
+import { BooleanColumn } from '../../../../components/tables/ColumnRenderers';
-import { InvenTreeTable } from '../../../../tables/InvenTreeTable';
+import { InvenTreeTable } from '../../../../components/tables/InvenTreeTable';
 import CustomUnitsTable from '../../../../tables/settings/CustomUnitsTable';
 
 function AllUnitTable() {

src/frontend/src/pages/part/PartStockHistoryDetail.tsx

@@ -19,6 +19,11 @@ import {
 } from '@mantine/core';
 import dayjs from 'dayjs';
 import { useCallback, useMemo, useState } from 'react';
+import {
+  DateColumn,
+  DecimalColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { formatDate, formatPriceRange } from '../../defaults/formatters';
 import { partStocktakeFields } from '../../forms/PartForms';
 import {
@@ -27,8 +32,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { DateColumn, DecimalColumn } from '../../tables/ColumnRenderers';
-import { InvenTreeTable } from '../../tables/InvenTreeTable';
 import { StockTrackingTable } from '../../tables/stock/StockTrackingTable';
 
 /*

src/frontend/src/pages/part/bom/BomCompare.tsx

@@ -26,7 +26,7 @@ import { useSearchParams } from 'react-router-dom';
 import { api } from '../../../App';
 import { StandaloneField } from '../../../components/forms/StandaloneField';
 import Expand from '../../../components/items/Expand';
-import { RenderPartColumn } from '../../../tables/ColumnRenderers';
+import { RenderPartColumn } from '../../../components/tables/ColumnRenderers';
 
 // Field to check for differences when comparing BOM items
 const DELTA_FIELDS = {

src/frontend/src/pages/part/pricing/BomPricingPanel.tsx

@@ -17,9 +17,12 @@ 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 {
+  DateColumn,
+  PartColumn
+} from '../../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../../components/tables/InvenTreeTable';
 import { formatDecimal, formatPriceRange } from '../../../defaults/formatters';
-import { DateColumn, PartColumn } from '../../../tables/ColumnRenderers';
-import { InvenTreeTable } from '../../../tables/InvenTreeTable';
 import { LoadingPricingData, NoPricingData } from './PricingPanel';
 
 // Display BOM data as a pie chart

src/frontend/src/pages/part/pricing/PriceBreakPanel.tsx

@@ -16,6 +16,7 @@ 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';
+import { InvenTreeTable } from '../../../components/tables/InvenTreeTable';
 import { formatCurrency } from '../../../defaults/formatters';
 import {
   useCreateApiFormModal,
@@ -23,7 +24,6 @@ import {
   useEditApiFormModal
 } from '../../../hooks/UseForm';
 import { useUserState } from '../../../states/UserState';
-import { InvenTreeTable } from '../../../tables/InvenTreeTable';
 import { NoPricingData } from './PricingPanel';
 
 export default function PriceBreakPanel({

src/frontend/src/pages/part/pricing/PurchaseHistoryPanel.tsx

@@ -8,8 +8,8 @@ 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 { InvenTreeTable } from '../../../components/tables/InvenTreeTable';
 import { formatCurrency, formatDate } from '../../../defaults/formatters';
-import { InvenTreeTable } from '../../../tables/InvenTreeTable';
 import { NoPricingData } from './PricingPanel';
 
 export default function PurchaseHistoryPanel({

src/frontend/src/pages/part/pricing/SaleHistoryPanel.tsx

@@ -8,9 +8,9 @@ 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 { DateColumn } from '../../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../../components/tables/InvenTreeTable';
 import { formatCurrency } from '../../../defaults/formatters';
-import { DateColumn } from '../../../tables/ColumnRenderers';
-import { InvenTreeTable } from '../../../tables/InvenTreeTable';
 import { NoPricingData } from './PricingPanel';
 
 export default function SaleHistoryPanel({

src/frontend/src/pages/part/pricing/SupplierPricingPanel.tsx

@@ -8,7 +8,7 @@ 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 { InvenTreeTable } from '../../../tables/InvenTreeTable';
+import { InvenTreeTable } from '../../../components/tables/InvenTreeTable';
 import {
   SupplierPriceBreakColumns,
   calculateSupplierPartUnitPrice

src/frontend/src/pages/part/pricing/VariantPricingPanel.tsx

@@ -9,9 +9,12 @@ 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 {
+  DateColumn,
+  PartColumn
+} from '../../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../../components/tables/InvenTreeTable';
 import { formatCurrency } from '../../../defaults/formatters';
-import { DateColumn, PartColumn } from '../../../tables/ColumnRenderers';
-import { InvenTreeTable } from '../../../tables/InvenTreeTable';
 import { NoPricingData } from './PricingPanel';
 
 export default function VariantPricingPanel({

src/frontend/src/tables/bom/BomSubassemblyTable.tsx

@@ -4,14 +4,14 @@ import { Group, Paper } from '@mantine/core';
 import { IconCornerLeftUp } from '@tabler/icons-react';
 import { useMemo } from 'react';
 import Expand from '../../components/items/Expand';
-import { useUserSettingsState } from '../../states/SettingsStates';
 import {
   IPNColumn,
   ReferenceColumn,
   RenderPartColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
-import RowExpansionIcon from '../RowExpansionIcon';
+import RowExpansionIcon from '../../components/tables/RowExpansionIcon';
+import { useUserSettingsState } from '../../states/SettingsStates';
 
 export function subassemblyRowExpansion({
   table

src/frontend/src/tables/bom/BomTable.tsx

@@ -30,6 +30,19 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { ActionDropdown } from '../../components/items/ActionDropdown';
 import { RenderPart } from '../../components/render/Part';
+import {
+  BooleanColumn,
+  CategoryColumn,
+  DescriptionColumn,
+  IPNColumn,
+  NoteColumn,
+  ReferenceColumn,
+  RenderPartColumn
+} from '../../components/tables/ColumnRenderers';
+import { PartCategoryFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import RowExpansionIcon from '../../components/tables/RowExpansionIcon';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import { useApi } from '../../contexts/ApiContext';
 import { formatDecimal, formatPriceRange } from '../../defaults/formatters';
 import { bomItemFields, useEditBomSubstitutesForm } from '../../forms/BomForms';
@@ -45,19 +58,6 @@ import {
   useUserSettingsState
 } from '../../states/SettingsStates';
 import { useUserState } from '../../states/UserState';
-import {
-  BooleanColumn,
-  CategoryColumn,
-  DescriptionColumn,
-  IPNColumn,
-  NoteColumn,
-  ReferenceColumn,
-  RenderPartColumn
-} from '../ColumnRenderers';
-import { PartCategoryFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
-import RowExpansionIcon from '../RowExpansionIcon';
-import { TableHoverCard } from '../TableHoverCard';
 import { subassemblyRowExpansion } from './BomSubassemblyTable';
 
 // Calculate the total stock quantity available for a given BomItem

src/frontend/src/tables/bom/UsedInTable.tsx

@@ -11,6 +11,14 @@ import { ActionButton, UserRoles } from '@lib/index';
 import type { TableFilter } from '@lib/types/Filters';
 import type { RowAction, TableColumn } from '@lib/types/Tables';
 import { IconExclamationCircle, IconReplace } from '@tabler/icons-react';
+import {
+  DescriptionColumn,
+  IPNColumn,
+  PartColumn,
+  ReferenceColumn,
+  RenderPartColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { formatDecimal } from '../../defaults/formatters';
 import { bomItemFields } from '../../forms/BomForms';
 import {
@@ -18,14 +26,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  DescriptionColumn,
-  IPNColumn,
-  PartColumn,
-  ReferenceColumn,
-  RenderPartColumn
-} from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /*
  * For a given part, render a table showing all the assemblies the part is used in

src/frontend/src/tables/build/BuildAllocatedStockTable.tsx

@@ -13,14 +13,6 @@ import type { StockOperationProps } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
 import { Alert } from '@mantine/core';
 import { IconCircleDashedCheck, IconCircleX } from '@tabler/icons-react';
-import { useConsumeBuildItemsForm } from '../../forms/BuildForms';
-import useBackgroundTask from '../../hooks/UseBackgroundTask';
-import {
-  useDeleteApiFormModal,
-  useEditApiFormModal
-} from '../../hooks/UseForm';
-import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions';
-import { useUserState } from '../../states/UserState';
 import {
   DecimalColumn,
   IPNColumn,
@@ -29,9 +21,20 @@ import {
   ReferenceColumn,
   StatusColumn,
   StockColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { IncludeVariantsFilter, StockLocationFilter } from '../Filter';
+import {
-import { InvenTreeTable } from '../InvenTreeTable';
+  IncludeVariantsFilter,
+  StockLocationFilter
+} from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { useConsumeBuildItemsForm } from '../../forms/BuildForms';
+import useBackgroundTask from '../../hooks/UseBackgroundTask';
+import {
+  useDeleteApiFormModal,
+  useEditApiFormModal
+} from '../../hooks/UseForm';
+import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions';
+import { useUserState } from '../../states/UserState';
 
 /**
  * Render a table of allocated stock for a build.

src/frontend/src/tables/build/BuildLineTable.tsx

@@ -25,6 +25,20 @@ import {
 import type { DataTableRowExpansionProps } from 'mantine-datatable';
 import { useCallback, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import {
+  BooleanColumn,
+  CategoryColumn,
+  DecimalColumn,
+  DescriptionColumn,
+  IPNColumn,
+  LocationColumn,
+  PartColumn,
+  RenderPartColumn
+} from '../../components/tables/ColumnRenderers';
+import { PartCategoryFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import RowExpansionIcon from '../../components/tables/RowExpansionIcon';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import OrderPartsWizard from '../../components/wizards/OrderPartsWizard';
 import {
   useAllocateStockToBuildForm,
@@ -40,20 +54,6 @@ import {
 } from '../../hooks/UseForm';
 import useStatusCodes from '../../hooks/UseStatusCodes';
 import { useUserState } from '../../states/UserState';
-import {
-  BooleanColumn,
-  CategoryColumn,
-  DecimalColumn,
-  DescriptionColumn,
-  IPNColumn,
-  LocationColumn,
-  PartColumn,
-  RenderPartColumn
-} from '../ColumnRenderers';
-import { PartCategoryFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
-import RowExpansionIcon from '../RowExpansionIcon';
-import { TableHoverCard } from '../TableHoverCard';
 
 /**
  * Return true if the given build line record is "effectively consumable" -

src/frontend/src/tables/build/BuildOrderFilters.tsx

@@ -25,7 +25,7 @@ import {
   TagsFilter,
   TargetDateAfterFilter,
   TargetDateBeforeFilter
-} from '../Filter';
+} from '../../components/tables/Filter';
 
 /**
  * Generate a set of common filters for the build order views

src/frontend/src/tables/build/BuildOrderParametricTable.tsx

@@ -3,12 +3,12 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { t } from '@lingui/core/macro';
 import { type ReactNode, useMemo } from 'react';
-import { useGlobalSettingsState } from '../../states/SettingsStates';
 import {
   DescriptionColumn,
   PartColumn,
   ReferenceColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
+import { useGlobalSettingsState } from '../../states/SettingsStates';
 import ParametricDataTable from '../general/ParametricDataTable';
 import BuildOrderFilters from './BuildOrderFilters';
 

src/frontend/src/tables/build/BuildOrderTable.tsx

@@ -9,10 +9,6 @@ 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 { useGlobalSettingsState } from '../../states/SettingsStates';
-import { useUserState } from '../../states/UserState';
 import {
   BooleanColumn,
   CompletionDateColumn,
@@ -28,8 +24,12 @@ import {
   StatusColumn,
   TargetDateColumn,
   UserColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { useBuildOrderFields } from '../../forms/BuildForms';
+import { useCreateApiFormModal } from '../../hooks/UseForm';
+import { useGlobalSettingsState } from '../../states/SettingsStates';
+import { useUserState } from '../../states/UserState';
 import BuildOrderFilters from './BuildOrderFilters';
 
 /*

src/frontend/src/tables/build/BuildOutputTable.tsx

@@ -33,6 +33,24 @@ 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';
+import {
+  LocationColumn,
+  PartColumn,
+  RenderPartColumn,
+  StatusColumn
+} from '../../components/tables/ColumnRenderers';
+import {
+  BatchFilter,
+  HasBatchCodeFilter,
+  IsSerializedFilter,
+  SerialFilter,
+  SerialGTEFilter,
+  SerialLTEFilter,
+  StatusFilterOptions,
+  StockLocationFilter
+} from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import { useApi } from '../../contexts/ApiContext';
 import {
   useBuildAutoAllocateFields,
@@ -54,24 +72,6 @@ import {
 import useStatusCodes from '../../hooks/UseStatusCodes';
 import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions';
 import { useUserState } from '../../states/UserState';
-import {
-  LocationColumn,
-  PartColumn,
-  RenderPartColumn,
-  StatusColumn
-} from '../ColumnRenderers';
-import {
-  BatchFilter,
-  HasBatchCodeFilter,
-  IsSerializedFilter,
-  SerialFilter,
-  SerialGTEFilter,
-  SerialLTEFilter,
-  StatusFilterOptions,
-  StockLocationFilter
-} from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 import BuildLineTable from './BuildLineTable';
 
 type TestResultOverview = {

src/frontend/src/tables/company/AddressTable.tsx

@@ -14,14 +14,14 @@ 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 { LinkColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal,
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { LinkColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export function AddressTable({
   companyId,

src/frontend/src/tables/company/CompanyTable.tsx

@@ -11,19 +11,19 @@ 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 {
+  BooleanColumn,
+  CompanyColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { TagsFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { companyFields } from '../../forms/CompanyForms';
 import {
   useCreateApiFormModal,
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  BooleanColumn,
-  CompanyColumn,
-  DescriptionColumn
-} from '../ColumnRenderers';
-import { TagsFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * A table which displays a list of company records,

src/frontend/src/tables/company/ContactTable.tsx

@@ -17,13 +17,13 @@ import type { ApiFormFieldSet } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
 import { useNavigate } from 'react-router-dom';
 import { RenderInlineModel } from '../../components/render/Instance';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal,
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export function ContactTable({
   companyId,

src/frontend/src/tables/company/ParametricCompanyTable.tsx

@@ -4,7 +4,10 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { t } from '@lingui/core/macro';
 import { useMemo } from 'react';
-import { CompanyColumn, DescriptionColumn } from '../ColumnRenderers';
+import {
+  CompanyColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 
 export default function ParametricCompanyTable({

src/frontend/src/tables/general/AttachmentTable.tsx

@@ -27,6 +27,7 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { ApiFormFieldSet } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
 import { AttachmentLink } from '../../components/items/AttachmentLink';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useApi } from '../../contexts/ApiContext';
 import { formatFileSize } from '../../defaults/formatters';
 import {
@@ -35,7 +36,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Define set of columns to display for the attachment table

src/frontend/src/tables/general/BarcodeScanTable.tsx

@@ -8,8 +8,8 @@ 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 { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * A table for showing barcode scan history data on the scan index page

src/frontend/src/tables/general/ExtraLineItemTable.tsx

@@ -13,6 +13,15 @@ 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 {
+  DecimalColumn,
+  DescriptionColumn,
+  LineItemColumn,
+  LinkColumn,
+  NoteColumn,
+  ProjectCodeColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { formatCurrency } from '../../defaults/formatters';
 import { extraLineItemFields } from '../../forms/CommonForms';
 import {
@@ -21,15 +30,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  DecimalColumn,
-  DescriptionColumn,
-  LineItemColumn,
-  LinkColumn,
-  NoteColumn,
-  ProjectCodeColumn
-} from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function ExtraLineItemTable({
   endpoint,

src/frontend/src/tables/general/ParameterTable.tsx

@@ -13,6 +13,15 @@ import { t } from '@lingui/core/macro';
 import { IconFileUpload, IconPlus } from '@tabler/icons-react';
 import { useCallback, useMemo, useState } from 'react';
 import { ActionDropdown } from '../../components/items/ActionDropdown';
+import {
+  DateColumn,
+  DescriptionColumn,
+  NoteColumn,
+  UserColumn
+} from '../../components/tables/ColumnRenderers';
+import { UserFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import { useParameterFields } from '../../forms/CommonForms';
 import { dataImporterSessionFields } from '../../forms/ImporterForms';
 import {
@@ -22,15 +31,6 @@ import {
 } from '../../hooks/UseForm';
 import { useImporterState } from '../../states/ImporterState';
 import { useUserState } from '../../states/UserState';
-import {
-  DateColumn,
-  DescriptionColumn,
-  NoteColumn,
-  UserColumn
-} from '../ColumnRenderers';
-import { UserFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 
 /**
  * Construct a table listing parameters

src/frontend/src/tables/general/ParameterTemplateTable.tsx

@@ -15,6 +15,11 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { RowAction, TableColumn } from '@lib/types/Tables';
 import { t } from '@lingui/core/macro';
 import { useCallback, useMemo, useState } from 'react';
+import {
+  BooleanColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useParameterTemplateFields } from '../../forms/CommonForms';
 import { useFilters } from '../../hooks/UseFilter';
 import {
@@ -23,8 +28,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Render a table of ParameterTemplate objects

src/frontend/src/tables/general/ParametricDataTable.tsx

@@ -1,4 +1,5 @@
 import { cancelEvent } from '@lib/functions/Events';
+import { getDetailUrl, navigateToLink } from '@lib/functions/Navigation';
 import useTable from '@lib/hooks/UseTable';
 import {
   ApiEndpoints,
@@ -7,9 +8,7 @@ import {
   UserRoles,
   YesNoButton,
   apiUrl,
-  formatDecimal,
+  formatDecimal
-  getDetailUrl,
-  navigateToLink
 } from '@lib/index';
 import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
@@ -20,6 +19,8 @@ import { IconCirclePlus } from '@tabler/icons-react';
 import { useQuery } from '@tanstack/react-query';
 import { type ReactNode, useCallback, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import { useApi } from '../../contexts/ApiContext';
 import { formatDate } from '../../defaults/formatters';
 import { useParameterFields } from '../../forms/CommonForms';
@@ -28,8 +29,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 import {
   PARAMETER_FILTER_OPERATORS,
   ParameterFilter

src/frontend/src/tables/machine/MachineListTable.tsx

@@ -50,14 +50,14 @@ import {
   TableStatusRenderer
 } from '../../components/render/StatusRenderer';
 import { MachineSettingList } from '../../components/settings/SettingList';
+import { BooleanColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useApi } from '../../contexts/ApiContext';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal,
   useEditApiFormModal
 } from '../../hooks/UseForm';
-import { BooleanColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 import type { MachineDriverI, MachineTypeI } from './MachineTypeTable';
 
 interface MachineI {

src/frontend/src/tables/machine/MachineTypeTable.tsx

@@ -26,8 +26,11 @@ 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 { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
+import {
-import { InvenTreeTable } from '../InvenTreeTable';
+  BooleanColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { MachineListTable, useMachineTypeDriver } from './MachineListTable';
 
 export interface MachineTypeI {

src/frontend/src/tables/notifications/NotificationTable.tsx

@@ -6,7 +6,7 @@ import { ApiEndpoints } from '@lib/enums/ApiEndpoints';
 import { apiUrl } from '@lib/functions/Api';
 import type { TableState } from '@lib/types/Tables';
 import type { TableColumn } from '@lib/types/Tables';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 
 export function NotificationTable({
   params,

src/frontend/src/tables/part/ParametricPartTable.tsx

@@ -3,7 +3,10 @@ import { ModelType } from '@lib/enums/ModelType';
 import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { useMemo } from 'react';
-import { DescriptionColumn, PartColumn } from '../ColumnRenderers';
+import {
+  DescriptionColumn,
+  PartColumn
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 import { PartTableFilters } from './PartTableFilters';
 

src/frontend/src/tables/part/PartBuildAllocationsTable.tsx

@@ -14,16 +14,16 @@ 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 { useUserState } from '../../states/UserState';
 import {
   DescriptionColumn,
   PartColumn,
   ProjectCodeColumn,
   StatusColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { IncludeVariantsFilter } from '../Filter';
+import { IncludeVariantsFilter } from '../../components/tables/Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
-import RowExpansionIcon from '../RowExpansionIcon';
+import RowExpansionIcon from '../../components/tables/RowExpansionIcon';
+import { useUserState } from '../../states/UserState';
 import { BuildLineSubTable } from '../build/BuildLineTable';
 
 /**

src/frontend/src/tables/part/PartCategoryTable.tsx

@@ -14,6 +14,11 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { ActionDropdown } from '../../components/items/ActionDropdown';
 import { ApiIcon } from '../../components/items/ApiIcon';
+import {
+  BooleanColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { partCategoryFields } from '../../forms/PartForms';
 import { InvenTreeIcon } from '../../functions/icons';
 import {
@@ -22,8 +27,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * PartCategoryTable - Displays a table of part categories

src/frontend/src/tables/part/PartCategoryTemplateTable.tsx

@@ -16,6 +16,7 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { ApiFormFieldSet } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
 import { IconInfoCircle } from '@tabler/icons-react';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useDynamicParameterValueField } from '../../forms/CommonForms';
 import {
   useCreateApiFormModal,
@@ -23,7 +24,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function PartCategoryTemplateTable({
   categoryId

src/frontend/src/tables/part/PartPurchaseOrdersTable.tsx

@@ -9,11 +9,18 @@ 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 {
+  DateColumn,
+  ReferenceColumn,
+  StatusColumn
+} from '../../components/tables/ColumnRenderers';
+import {
+  IncludeVariantsFilter,
+  StatusFilterOptions
+} from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import { formatCurrency, formatDecimal } from '../../defaults/formatters';
-import { DateColumn, ReferenceColumn, StatusColumn } from '../ColumnRenderers';
-import { IncludeVariantsFilter, StatusFilterOptions } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 
 export default function PartPurchaseOrdersTable({
   partId

src/frontend/src/tables/part/PartSalesAllocationsTable.tsx

@@ -13,17 +13,17 @@ 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 { useUserState } from '../../states/UserState';
 import {
   DescriptionColumn,
   IPNColumn,
   PartColumn,
   ProjectCodeColumn,
   StatusColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { IncludeVariantsFilter } from '../Filter';
+import { IncludeVariantsFilter } from '../../components/tables/Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
-import RowExpansionIcon from '../RowExpansionIcon';
+import RowExpansionIcon from '../../components/tables/RowExpansionIcon';
+import { useUserState } from '../../states/UserState';
 import SalesOrderAllocationTable from '../sales/SalesOrderAllocationTable';
 
 export default function PartSalesAllocationsTable({

src/frontend/src/tables/part/PartTable.tsx

@@ -21,6 +21,17 @@ import {
 } from '@tabler/icons-react';
 import { type ReactNode, useCallback, useMemo, useState } from 'react';
 import { ActionDropdown } from '../../components/items/ActionDropdown';
+import {
+  BooleanColumn,
+  CategoryColumn,
+  DefaultLocationColumn,
+  DescriptionColumn,
+  IPNColumn,
+  LinkColumn,
+  PartColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import ImportPartWizard from '../../components/wizards/ImportPartWizard';
 import OrderPartsWizard from '../../components/wizards/OrderPartsWizard';
 import { formatDecimal, formatPriceRange } from '../../defaults/formatters';
@@ -37,17 +48,6 @@ import { usePluginsWithMixin } from '../../hooks/UsePlugins';
 import { useImporterState } from '../../states/ImporterState';
 import { useGlobalSettingsState } from '../../states/SettingsStates';
 import { useUserState } from '../../states/UserState';
-import {
-  BooleanColumn,
-  CategoryColumn,
-  DefaultLocationColumn,
-  DescriptionColumn,
-  IPNColumn,
-  LinkColumn,
-  PartColumn
-} from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 import { PartTableFilters } from './PartTableFilters';
 
 /**

src/frontend/src/tables/part/PartTableFilters.tsx

@@ -1,7 +1,7 @@
 import { ModelType } from '@lib/enums/ModelType';
 import type { TableFilter } from '@lib/types/Filters';
 import { t } from '@lingui/core/macro';
-import { TagsFilter } from '../Filter';
+import { TagsFilter } from '../../components/tables/Filter';
 
 /**
  * Construct a set of filters for the part table

src/frontend/src/tables/part/PartTestResultTable.tsx

@@ -22,11 +22,11 @@ import type { ApiFormFieldSet } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
 import type { UseFormReturn } from 'react-hook-form';
 import { RenderUser } from '../../components/render/User';
-import { useApi } from '../../contexts/ApiContext';
+import {
-import { formatDate } from '../../defaults/formatters';
+  LocationColumn,
-import { useTestResultFields } from '../../forms/StockForms';
+  PartColumn,
-import { useCreateApiFormModal } from '../../hooks/UseForm';
+  StatusColumn
-import { LocationColumn, PartColumn, StatusColumn } from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
 import {
   BatchFilter,
   HasBatchCodeFilter,
@@ -36,9 +36,13 @@ import {
   SerialGTEFilter,
   SerialLTEFilter,
   StatusFilterOptions
-} from '../Filter';
+} from '../../components/tables/Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
+import { useApi } from '../../contexts/ApiContext';
+import { formatDate } from '../../defaults/formatters';
+import { useTestResultFields } from '../../forms/StockForms';
+import { useCreateApiFormModal } from '../../hooks/UseForm';
 
 /**
  * A table which displays all "test results" for the outputs generated by a build order.

src/frontend/src/tables/part/PartTestTemplateTable.tsx

@@ -21,15 +21,18 @@ 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';
+import {
+  BooleanColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal,
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 
 export default function PartTestTemplateTable({
   partId,

src/frontend/src/tables/part/RelatedPartTable.tsx

@@ -16,14 +16,14 @@ 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';
+import { NoteColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal,
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { NoteColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Construct a table listing related parts for a given part

src/frontend/src/tables/plugin/PluginErrorTable.tsx

@@ -6,7 +6,7 @@ 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 { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 
 export interface PluginRegistryErrorI {
   id: number;

src/frontend/src/tables/plugin/PluginListTable.tsx

@@ -22,6 +22,11 @@ import useTable from '@lib/hooks/UseTable';
 import type { TableColumn } from '@lib/types/Tables';
 import PluginDrawer from '../../components/plugins/PluginDrawer';
 import type { PluginInterface } from '../../components/plugins/PluginInterface';
+import {
+  BooleanColumn,
+  LinkColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useApi } from '../../contexts/ApiContext';
 import {
   useCreateApiFormModal,
@@ -30,8 +35,6 @@ import {
 } from '../../hooks/UseForm';
 import { useServerApiState } from '../../states/ServerApiState';
 import { useUserState } from '../../states/UserState';
-import { BooleanColumn, LinkColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Construct an indicator icon for a single plugin

src/frontend/src/tables/purchasing/ManufacturerPartParametricTable.tsx

@@ -3,7 +3,11 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { t } from '@lingui/core/macro';
 import { type ReactNode, useMemo } from 'react';
-import { CompanyColumn, IPNColumn, PartColumn } from '../ColumnRenderers';
+import {
+  CompanyColumn,
+  IPNColumn,
+  PartColumn
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 
 export default function ManufacturerPartParametricTable({

src/frontend/src/tables/purchasing/ManufacturerPartTable.tsx

@@ -15,6 +15,15 @@ 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 {
+  CompanyColumn,
+  DescriptionColumn,
+  IPNColumn,
+  LinkColumn,
+  PartColumn
+} from '../../components/tables/ColumnRenderers';
+import { TagsFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useManufacturerPartFields } from '../../forms/CompanyForms';
 import {
   useCreateApiFormModal,
@@ -22,15 +31,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  CompanyColumn,
-  DescriptionColumn,
-  IPNColumn,
-  LinkColumn,
-  PartColumn
-} from '../ColumnRenderers';
-import { TagsFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /*
  * Construct a table listing manufacturer parts

src/frontend/src/tables/purchasing/PurchaseOrderFilters.tsx

@@ -24,7 +24,7 @@ import {
   TargetDateBeforeFilter,
   UpdatedAfterFilter,
   UpdatedBeforeFilter
-} from '../Filter';
+} from '../../components/tables/Filter';
 
 export default function PurchaseOrderFilters({
   includeDateFilters = true

src/frontend/src/tables/purchasing/PurchaseOrderLineItemTable.tsx

@@ -23,6 +23,20 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { useNavigate } from 'react-router-dom';
 import { RenderInstance } from '../../components/render/Instance';
+import {
+  CurrencyColumn,
+  DescriptionColumn,
+  LineItemColumn,
+  LinkColumn,
+  LocationColumn,
+  NoteColumn,
+  PartColumn,
+  ProjectCodeColumn,
+  ReferenceColumn,
+  TargetDateColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import { formatCurrency } from '../../defaults/formatters';
 import { dataImporterSessionFields } from '../../forms/ImporterForms';
 import {
@@ -37,20 +51,6 @@ import {
 import useStatusCodes from '../../hooks/UseStatusCodes';
 import { useImporterState } from '../../states/ImporterState';
 import { useUserState } from '../../states/UserState';
-import {
-  CurrencyColumn,
-  DescriptionColumn,
-  LineItemColumn,
-  LinkColumn,
-  LocationColumn,
-  NoteColumn,
-  PartColumn,
-  ProjectCodeColumn,
-  ReferenceColumn,
-  TargetDateColumn
-} from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
 
 /*
  * Display a table of purchase order line items, for a specific order

src/frontend/src/tables/purchasing/PurchaseOrderParametricTable.tsx

@@ -8,7 +8,7 @@ import {
   CompanyColumn,
   DescriptionColumn,
   ReferenceColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 import PurchaseOrderFilters from './PurchaseOrderFilters';
 

src/frontend/src/tables/purchasing/PurchaseOrderTable.tsx

@@ -8,10 +8,6 @@ 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 { useUserState } from '../../states/UserState';
 import {
   CompanyColumn,
   CompletionDateColumn,
@@ -27,8 +23,12 @@ import {
   StatusColumn,
   TargetDateColumn,
   UpdatedAtColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { formatCurrency } from '../../defaults/formatters';
+import { usePurchaseOrderFields } from '../../forms/PurchaseOrderForms';
+import { useCreateApiFormModal } from '../../hooks/UseForm';
+import { useUserState } from '../../states/UserState';
 import PurchaseOrderFilters from './PurchaseOrderFilters';
 
 /**

src/frontend/src/tables/purchasing/SupplierPartParametricTable.tsx

@@ -3,7 +3,10 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { t } from '@lingui/core/macro';
 import { type ReactNode, useMemo } from 'react';
-import { CompanyColumn, PartColumn } from '../ColumnRenderers';
+import {
+  CompanyColumn,
+  PartColumn
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 
 export default function SupplierPartParametricTable({

src/frontend/src/tables/purchasing/SupplierPartTable.tsx

@@ -18,15 +18,6 @@ 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';
-import ImportPartWizard from '../../components/wizards/ImportPartWizard';
-import { useSupplierPartFields } from '../../forms/CompanyForms';
-import {
-  useCreateApiFormModal,
-  useDeleteApiFormModal,
-  useEditApiFormModal
-} from '../../hooks/UseForm';
-import { usePluginsWithMixin } from '../../hooks/UsePlugins';
-import { useUserState } from '../../states/UserState';
 import {
   BooleanColumn,
   CompanyColumn,
@@ -36,10 +27,19 @@ import {
   LinkColumn,
   NoteColumn,
   PartColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { TagsFilter } from '../Filter';
+import { TagsFilter } from '../../components/tables/Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
-import { TableHoverCard } from '../TableHoverCard';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
+import ImportPartWizard from '../../components/wizards/ImportPartWizard';
+import { useSupplierPartFields } from '../../forms/CompanyForms';
+import {
+  useCreateApiFormModal,
+  useDeleteApiFormModal,
+  useEditApiFormModal
+} from '../../hooks/UseForm';
+import { usePluginsWithMixin } from '../../hooks/UsePlugins';
+import { useUserState } from '../../states/UserState';
 
 /*
  * Construct a table listing supplier parts

src/frontend/src/tables/purchasing/SupplierPriceBreakTable.tsx

@@ -16,6 +16,8 @@ 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 { CompanyColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { formatCurrency } from '../../defaults/formatters';
 import {
   useCreateApiFormModal,
@@ -23,8 +25,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { CompanyColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export function calculateSupplierPartUnitPrice(record: any) {
   const pack_quantity = record?.part_detail?.pack_quantity_native ?? 1;

src/frontend/src/tables/sales/ReturnOrderFilters.tsx

@@ -25,7 +25,7 @@ import {
   TargetDateBeforeFilter,
   UpdatedAfterFilter,
   UpdatedBeforeFilter
-} from '../Filter';
+} from '../../components/tables/Filter';
 
 export default function ReturnOrderFilters({
   partId,

src/frontend/src/tables/sales/ReturnOrderLineItemTable.tsx

@@ -16,6 +16,20 @@ 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 {
+  DateColumn,
+  DescriptionColumn,
+  LineItemColumn,
+  LinkColumn,
+  NoteColumn,
+  PartColumn,
+  ProjectCodeColumn,
+  ReferenceColumn,
+  StatusColumn,
+  StockColumn
+} from '../../components/tables/ColumnRenderers';
+import { StatusFilterOptions } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { formatCurrency } from '../../defaults/formatters';
 import {
   useReceiveReturnOrderLineItems,
@@ -28,20 +42,6 @@ import {
 } from '../../hooks/UseForm';
 import useStatusCodes from '../../hooks/UseStatusCodes';
 import { useUserState } from '../../states/UserState';
-import {
-  DateColumn,
-  DescriptionColumn,
-  LineItemColumn,
-  LinkColumn,
-  NoteColumn,
-  PartColumn,
-  ProjectCodeColumn,
-  ReferenceColumn,
-  StatusColumn,
-  StockColumn
-} from '../ColumnRenderers';
-import { StatusFilterOptions } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function ReturnOrderLineItemTable({
   orderId,

src/frontend/src/tables/sales/ReturnOrderParametricTable.tsx

@@ -8,7 +8,7 @@ import {
   CompanyColumn,
   DescriptionColumn,
   ReferenceColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 import ReturnOrderFilters from './ReturnOrderFilters';
 

src/frontend/src/tables/sales/ReturnOrderTable.tsx

@@ -8,10 +8,6 @@ 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 { useUserState } from '../../states/UserState';
 import {
   CompanyColumn,
   CompletionDateColumn,
@@ -27,8 +23,12 @@ import {
   StatusColumn,
   TargetDateColumn,
   UpdatedAtColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { formatCurrency } from '../../defaults/formatters';
+import { useReturnOrderFields } from '../../forms/ReturnOrderForms';
+import { useCreateApiFormModal } from '../../hooks/UseForm';
+import { useUserState } from '../../states/UserState';
 import ReturnOrderFilters from './ReturnOrderFilters';
 
 export function ReturnOrderTable({

src/frontend/src/tables/sales/SalesOrderAllocationTable.tsx

@@ -18,6 +18,19 @@ import type { TableColumn } from '@lib/types/Tables';
 import { Alert } from '@mantine/core';
 import { IconCircleX, IconTruckDelivery } from '@tabler/icons-react';
 import { useNavigate } from 'react-router-dom';
+import {
+  DescriptionColumn,
+  IPNColumn,
+  LocationColumn,
+  PartColumn,
+  ReferenceColumn,
+  StatusColumn
+} from '../../components/tables/ColumnRenderers';
+import {
+  IncludeVariantsFilter,
+  StockLocationFilter
+} from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { formatDate } from '../../defaults/formatters';
 import { useSalesOrderAllocationFields } from '../../forms/SalesOrderForms';
 import {
@@ -27,16 +40,6 @@ import {
 } from '../../hooks/UseForm';
 import { useStockAdjustActions } from '../../hooks/UseStockAdjustActions';
 import { useUserState } from '../../states/UserState';
-import {
-  DescriptionColumn,
-  IPNColumn,
-  LocationColumn,
-  PartColumn,
-  ReferenceColumn,
-  StatusColumn
-} from '../ColumnRenderers';
-import { IncludeVariantsFilter, StockLocationFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function SalesOrderAllocationTable({
   partId,

src/frontend/src/tables/sales/SalesOrderFilters.tsx

@@ -25,7 +25,7 @@ import {
   TargetDateBeforeFilter,
   UpdatedAfterFilter,
   UpdatedBeforeFilter
-} from '../Filter';
+} from '../../components/tables/Filter';
 
 export default function SalesOrderFilters({
   partId,

src/frontend/src/tables/sales/SalesOrderLineItemTable.tsx

@@ -30,6 +30,20 @@ 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';
+import {
+  DateColumn,
+  DecimalColumn,
+  DescriptionColumn,
+  IPNColumn,
+  LineItemColumn,
+  LinkColumn,
+  ProjectCodeColumn,
+  ReferenceColumn,
+  RenderPartColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import RowExpansionIcon from '../../components/tables/RowExpansionIcon';
+import { TableHoverCard } from '../../components/tables/TableHoverCard';
 import OrderPartsWizard from '../../components/wizards/OrderPartsWizard';
 import { formatCurrency, formatDecimal } from '../../defaults/formatters';
 import { useBuildOrderFields } from '../../forms/BuildForms';
@@ -46,20 +60,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  DateColumn,
-  DecimalColumn,
-  DescriptionColumn,
-  IPNColumn,
-  LineItemColumn,
-  LinkColumn,
-  ProjectCodeColumn,
-  ReferenceColumn,
-  RenderPartColumn
-} from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
-import RowExpansionIcon from '../RowExpansionIcon';
-import { TableHoverCard } from '../TableHoverCard';
 import SalesOrderAllocationTable from './SalesOrderAllocationTable';
 
 export default function SalesOrderLineItemTable({

src/frontend/src/tables/sales/SalesOrderParametricTable.tsx

@@ -8,7 +8,7 @@ import {
   CompanyColumn,
   DescriptionColumn,
   ReferenceColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
 import ParametricDataTable from '../general/ParametricDataTable';
 import SalesOrderFilters from './SalesOrderFilters';
 

src/frontend/src/tables/sales/SalesOrderShipmentTable.tsx

@@ -22,6 +22,14 @@ 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 {
+  CompanyColumn,
+  DateColumn,
+  LinkColumn,
+  StatusColumn
+} from '../../components/tables/ColumnRenderers';
+import { TagsFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCheckShipmentForm,
   useCompleteShipmentForm,
@@ -34,14 +42,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  CompanyColumn,
-  DateColumn,
-  LinkColumn,
-  StatusColumn
-} from '../ColumnRenderers';
-import { TagsFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function SalesOrderShipmentTable({
   showOrderInfo = false,

src/frontend/src/tables/sales/SalesOrderTable.tsx

@@ -9,10 +9,6 @@ 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 { useUserState } from '../../states/UserState';
 import {
   AllocatedLinesProgressColumn,
   CompanyColumn,
@@ -29,8 +25,12 @@ import {
   StatusColumn,
   TargetDateColumn,
   UpdatedAtColumn
-} from '../ColumnRenderers';
+} from '../../components/tables/ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
+import { formatCurrency } from '../../defaults/formatters';
+import { useSalesOrderFields } from '../../forms/SalesOrderForms';
+import { useCreateApiFormModal } from '../../hooks/UseForm';
+import { useUserState } from '../../states/UserState';
 import SalesOrderFilters from './SalesOrderFilters';
 
 export function SalesOrderTable({

src/frontend/src/tables/settings/ApiTokenTable.tsx

@@ -13,11 +13,14 @@ import { useDisclosure } from '@mantine/hooks';
 import { IconCircleX } from '@tabler/icons-react';
 import { useCallback, useMemo, useState } from 'react';
 import { api } from '../../App';
+import {
+  BooleanColumn,
+  UserColumn
+} from '../../components/tables/ColumnRenderers';
+import { UserFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { showApiErrorMessage } from '../../functions/notifications';
 import { useCreateApiFormModal } from '../../hooks/UseForm';
-import { BooleanColumn, UserColumn } from '../ColumnRenderers';
-import { UserFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export function ApiTokenTable({
   only_myself = true

src/frontend/src/tables/settings/AssetTable.tsx

@@ -10,13 +10,13 @@ import { Alert, Text } from '@mantine/core';
 import { IconInfoCircle } from '@tabler/icons-react';
 import { type ReactNode, useCallback, useMemo, useState } from 'react';
 import { AttachmentLink } from '../../components/items/AttachmentLink';
+import { DescriptionColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export type AssetI = {
   pk: number;

src/frontend/src/tables/settings/BarcodeScanHistoryTable.tsx

@@ -26,11 +26,11 @@ import useTable from '@lib/hooks/UseTable';
 import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { RenderUser } from '../../components/render/User';
+import { UserFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useDeleteApiFormModal } from '../../hooks/UseForm';
 import { useGlobalSettingsState } from '../../states/SettingsStates';
 import { useUserState } from '../../states/UserState';
-import { UserFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /*
  * Render detail information for a particular barcode scan result.

src/frontend/src/tables/settings/CustomStateTable.tsx

@@ -19,6 +19,7 @@ import type {
   StatusCodeInterface,
   StatusCodeListInterface
 } from '../../components/render/StatusRenderer';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { statusColorMap } from '../../defaults/backendMappings';
 import { useCustomStateFields } from '../../forms/CommonForms';
 import {
@@ -28,7 +29,6 @@ import {
 } from '../../hooks/UseForm';
 import { useGlobalStatusState } from '../../states/GlobalStatusState';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Table for displaying list of custom states

src/frontend/src/tables/settings/CustomUnitsTable.tsx

@@ -12,6 +12,7 @@ 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 { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { customUnitsFields } from '../../forms/CommonForms';
 import {
   useCreateApiFormModal,
@@ -19,7 +20,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Table for displaying list of custom physical units

src/frontend/src/tables/settings/EmailTable.tsx

@@ -7,13 +7,13 @@ import { t } from '@lingui/core/macro';
 import { ActionIcon, Alert, Badge, Group, HoverCard } from '@mantine/core';
 import { IconExclamationCircle, IconTestPipe } from '@tabler/icons-react';
 import { type ReactNode, useCallback, useMemo, useState } from 'react';
+import { DateColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { DateColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 function EmailStatusBadge({
   status

src/frontend/src/tables/settings/ErrorTable.tsx

@@ -10,10 +10,10 @@ 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 { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useDeleteApiFormModal } from '../../hooks/UseForm';
 import { useInstance } from '../../hooks/UseInstance';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 function ErrorDetail({ errorId }: Readonly<{ errorId?: number }>) {
   const { id } = useParams();

src/frontend/src/tables/settings/ExportSessionTable.tsx

@@ -8,10 +8,10 @@ import { t } from '@lingui/core/macro';
 import { useCallback, useMemo, useState } from 'react';
 import { AttachmentLink } from '../../components/items/AttachmentLink';
 import { RenderUser } from '../../components/render/User';
+import { DateColumn } from '../../components/tables/ColumnRenderers';
+import { UserFilter } from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useDeleteApiFormModal } from '../../hooks/UseForm';
-import { DateColumn } from '../ColumnRenderers';
-import { UserFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function ExportSessionTable() {
   const table = useTable('exportsession');

src/frontend/src/tables/settings/FailedTasksTable.tsx

@@ -10,8 +10,8 @@ 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 { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function FailedTasksTable({
   onRecordsUpdated

src/frontend/src/tables/settings/GroupTable.tsx

@@ -23,13 +23,13 @@ import { IconUsersGroup } from '@tabler/icons-react';
 import { useNavigate } from 'react-router-dom';
 import { EditApiForm } from '../../components/forms/ApiForm';
 import { RoleTable, type RuleSet } from '../../components/items/RoleTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal
 } from '../../hooks/UseForm';
 import { useInstance } from '../../hooks/UseInstance';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export interface GroupDetailI {
   pk: number;

src/frontend/src/tables/settings/ImportSessionTable.tsx

@@ -12,6 +12,15 @@ import type { TableFilter } from '@lib/types/Filters';
 import type { TableColumn } from '@lib/types/Tables';
 import { AttachmentLink } from '../../components/items/AttachmentLink';
 import { RenderUser } from '../../components/render/User';
+import {
+  DateColumn,
+  StatusColumn
+} from '../../components/tables/ColumnRenderers';
+import {
+  StatusFilterOptions,
+  UserFilter
+} from '../../components/tables/Filter';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { dataImporterSessionFields } from '../../forms/ImporterForms';
 import { useFilters } from '../../hooks/UseFilter';
 import {
@@ -20,9 +29,6 @@ import {
 } from '../../hooks/UseForm';
 import useStatusCodes from '../../hooks/UseStatusCodes';
 import { useImporterState } from '../../states/ImporterState';
-import { DateColumn, StatusColumn } from '../ColumnRenderers';
-import { StatusFilterOptions, UserFilter } from '../Filter';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function ImportSessionTable() {
   const table = useTable('importsession');

src/frontend/src/tables/settings/PendingTasksTable.tsx

@@ -10,8 +10,8 @@ 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 { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { useUserState } from '../../states/UserState';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 export default function PendingTasksTable({
   onRecordsUpdated

src/frontend/src/tables/settings/ProjectCodeTable.tsx

@@ -13,6 +13,12 @@ import { apiUrl } from '@lib/functions/Api';
 import useTable from '@lib/hooks/UseTable';
 import type { TableFilter } from '@lib/index';
 import type { TableColumn } from '@lib/types/Tables';
+import {
+  BooleanColumn,
+  DescriptionColumn,
+  ResponsibleColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { projectCodeFields } from '../../forms/CommonForms';
 import {
   useCreateApiFormModal,
@@ -20,12 +26,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import {
-  BooleanColumn,
-  DescriptionColumn,
-  ResponsibleColumn
-} from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 /**
  * Table for displaying list of project codes

src/frontend/src/tables/settings/ScheduledTasksTable.tsx

@@ -7,7 +7,7 @@ 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 { InvenTreeTable } from '../InvenTreeTable';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 
 export default function ScheduledTasksTable() {
   const table = useTable('tasks-scheduled');

src/frontend/src/tables/settings/SelectionListDrawer.tsx

@@ -12,6 +12,11 @@ import type { ApiFormFieldSet } from '@lib/types/Forms';
 import type { TableColumn } from '@lib/types/Tables';
 import { IconLock } from '@tabler/icons-react';
 import { EditApiForm } from '../../components/forms/ApiForm';
+import {
+  BooleanColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   selectionEntryFields,
   selectionListFields
@@ -22,8 +27,6 @@ import {
   useEditApiFormModal
 } from '../../hooks/UseForm';
 import { useInstance } from '../../hooks/UseInstance';
-import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 
 function SelectionListEntriesTable({
   id,

src/frontend/src/tables/settings/SelectionListTable.tsx

@@ -14,14 +14,17 @@ 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 {
+  BooleanColumn,
+  DescriptionColumn
+} from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import { selectionListFields } from '../../forms/CommonForms';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal
 } from '../../hooks/UseForm';
 import { useUserState } from '../../states/UserState';
-import { BooleanColumn, DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 import SelectionListDrawer from './SelectionListDrawer';
 
 /**

src/frontend/src/tables/settings/SnippetTable.tsx

@@ -28,6 +28,8 @@ import {
   TemplateEditor
 } from '../../components/editors/TemplateEditor';
 import { AttachmentLink } from '../../components/items/AttachmentLink';
+import { DescriptionColumn } from '../../components/tables/ColumnRenderers';
+import { InvenTreeTable } from '../../components/tables/InvenTreeTable';
 import {
   useCreateApiFormModal,
   useDeleteApiFormModal,
@@ -35,8 +37,6 @@ import {
 } from '../../hooks/UseForm';
 import { useInstance } from '../../hooks/UseInstance';
 import { useUserState } from '../../states/UserState';
-import { DescriptionColumn } from '../ColumnRenderers';
-import { InvenTreeTable } from '../InvenTreeTable';
 import type { TemplateI } from './TemplateTable';
 
 export type SnippetI = {