fix: remove useDataTableColumns (crash on options change), fix delete confirmation, simplify

This commit is contained in:
Thomas Camlong committed 2026-07-21 16:05:59 +02:00
1 parent 32aa26db65
commit 5acf6cef32
1 file changed
+4 -62
+4 -62
View File
@@ -26,7 +26,6 @@ import { useDisclosure } from "@mantine/hooks";
import { import {
IconChevronDown, IconChevronDown,
IconChevronUp, IconChevronUp,
IconColumns,
IconCopy, IconCopy,
IconDatabase, IconDatabase,
IconDownload, IconDownload,
@@ -42,7 +41,7 @@ import {
import dayjs from "dayjs"; import dayjs from "dayjs";
import relativeTime from "dayjs/plugin/relativeTime"; import relativeTime from "dayjs/plugin/relativeTime";
import type { DataTableColumn, DataTableSortStatus } from "mantine-datatable"; import type { DataTableColumn, DataTableSortStatus } from "mantine-datatable";
import { DataTable, useDataTableColumns } from "mantine-datatable"; import { DataTable } from "mantine-datatable";
import { clientApi } from "@homarr/api/client"; import { clientApi } from "@homarr/api/client";
import { useIntegrationsWithInteractAccess } from "@homarr/auth/client"; import { useIntegrationsWithInteractAccess } from "@homarr/auth/client";
@@ -87,8 +86,6 @@ const stateColorMap: Record<ExtendedDownloadClientItem["state"], string> = {
unknown: "gray", unknown: "gray",
}; };
const DOWNLOADS_TABLE_STORE_KEY = "homarr-downloads-datatable";
const progressColor = (state: ExtendedDownloadClientItem["state"], progress: number): string => { const progressColor = (state: ExtendedDownloadClientItem["state"], progress: number): string => {
if (state === "paused") return "yellow"; if (state === "paused") return "yellow";
if (progress >= 1) return "green"; if (progress >= 1) return "green";
@@ -264,22 +261,12 @@ export default function DownloadClientsWidget({
[optionsColumnSet, hasTorrents, hasMultipleClients, hasMultipleTypes, size], [optionsColumnSet, hasTorrents, hasMultipleClients, hasMultipleTypes, size],
); );
const getColumnMeta = useCallback(
(accessor: string) => ({
toggleable: false as const,
draggable: true as const,
resizable: accessor !== "integration" && accessor !== "index",
}),
[],
);
const columns = useMemo((): DataTableColumn<ExtendedDownloadClientItem>[] => { const columns = useMemo((): DataTableColumn<ExtendedDownloadClientItem>[] => {
const cols: (DataTableColumn<ExtendedDownloadClientItem> | false)[] = [ const cols: (DataTableColumn<ExtendedDownloadClientItem> | false)[] = [
shouldIncludeColumn("integration") && { shouldIncludeColumn("integration") && {
accessor: "integration", accessor: "integration",
title: "", title: "",
width: 36, width: 36,
...getColumnMeta("integration"),
render: (record) => ( render: (record) => (
<Tooltip label={record.integration.name} withArrow> <Tooltip label={record.integration.name} withArrow>
<Avatar size={20} radius={0} src={getIconUrl(record.integration.kind)} /> <Avatar size={20} radius={0} src={getIconUrl(record.integration.kind)} />
@@ -292,7 +279,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
ellipsis: true, ellipsis: true,
width: "50%", width: "50%",
...getColumnMeta("name"),
render: (record) => ( render: (record) => (
<Tooltip <Tooltip
label={buildHoverTooltip(record, t)} label={buildHoverTooltip(record, t)}
@@ -316,7 +302,6 @@ export default function DownloadClientsWidget({
title: t("items.progress.columnTitle"), title: t("items.progress.columnTitle"),
sortable: true, sortable: true,
width: width < 400 ? 80 : 120, width: width < 400 ? 80 : 120,
...getColumnMeta("progress"),
render: (record) => { render: (record) => {
const pct = Math.floor(record.progress * 100); const pct = Math.floor(record.progress * 100);
const tooltipLabel = [ const tooltipLabel = [
@@ -347,7 +332,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 80, width: 80,
noWrap: true, noWrap: true,
...getColumnMeta("size"),
render: (record) => <Text size={size.fontSize}>{formatBytes(record.size)}</Text>, render: (record) => <Text size={size.fontSize}>{formatBytes(record.size)}</Text>,
}, },
shouldIncludeColumn("downSpeed") && { shouldIncludeColumn("downSpeed") && {
@@ -356,7 +340,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 90, width: 90,
noWrap: true, noWrap: true,
...getColumnMeta("downSpeed"),
render: (record) => record.downSpeed ? ( render: (record) => record.downSpeed ? (
<Group gap={4} wrap="nowrap"> <Group gap={4} wrap="nowrap">
<IconDownload size={12} style={{ flexShrink: 0, opacity: 0.5 }} /> <IconDownload size={12} style={{ flexShrink: 0, opacity: 0.5 }} />
@@ -370,7 +353,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 90, width: 90,
noWrap: true, noWrap: true,
...getColumnMeta("upSpeed"),
render: (record) => record.upSpeed ? ( render: (record) => record.upSpeed ? (
<Group gap={4} wrap="nowrap"> <Group gap={4} wrap="nowrap">
<IconUpload size={12} style={{ flexShrink: 0, opacity: 0.5 }} /> <IconUpload size={12} style={{ flexShrink: 0, opacity: 0.5 }} />
@@ -384,7 +366,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 100, width: 100,
noWrap: true, noWrap: true,
...getColumnMeta("time"),
render: (record) => { render: (record) => {
if (record.time === 0) return <Text size={size.fontSize} c="dimmed">∞</Text>; if (record.time === 0) return <Text size={size.fontSize} c="dimmed">∞</Text>;
return <Text size={size.fontSize}>{dayjs().add(record.time).fromNow(true)}</Text>; return <Text size={size.fontSize}>{dayjs().add(record.time).fromNow(true)}</Text>;
@@ -394,7 +375,6 @@ export default function DownloadClientsWidget({
accessor: "state", accessor: "state",
title: t("items.state.columnTitle"), title: t("items.state.columnTitle"),
width: 90, width: 90,
...getColumnMeta("state"),
render: (record) => ( render: (record) => (
<Badge size="xs" variant="light" color={stateColorMap[record.state]}> <Badge size="xs" variant="light" color={stateColorMap[record.state]}>
{t(`states.${record.state}`)} {t(`states.${record.state}`)}
@@ -407,7 +387,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 90, width: 90,
noWrap: true, noWrap: true,
...getColumnMeta("added"),
render: (record) => <Text size={size.fontSize}>{record.added ? dayjs(record.added).fromNow() : "—"}</Text>, render: (record) => <Text size={size.fontSize}>{record.added ? dayjs(record.added).fromNow() : "—"}</Text>,
}, },
shouldIncludeColumn("ratio") && { shouldIncludeColumn("ratio") && {
@@ -415,7 +394,6 @@ export default function DownloadClientsWidget({
title: t("items.ratio.columnTitle"), title: t("items.ratio.columnTitle"),
sortable: true, sortable: true,
width: 60, width: 60,
...getColumnMeta("ratio"),
render: (record) => record.ratio !== undefined ? ( render: (record) => record.ratio !== undefined ? (
<Text size={size.fontSize}>{record.ratio.toFixed(record.ratio >= 100 ? 0 : record.ratio >= 10 ? 1 : 2)}</Text> <Text size={size.fontSize}>{record.ratio.toFixed(record.ratio >= 100 ? 0 : record.ratio >= 10 ? 1 : 2)}</Text>
) : null, ) : null,
@@ -426,7 +404,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 80, width: 80,
noWrap: true, noWrap: true,
...getColumnMeta("received"),
render: (record) => <Text size={size.fontSize}>{formatBytes(record.received)}</Text>, render: (record) => <Text size={size.fontSize}>{formatBytes(record.received)}</Text>,
}, },
shouldIncludeColumn("sent") && { shouldIncludeColumn("sent") && {
@@ -435,7 +412,6 @@ export default function DownloadClientsWidget({
sortable: true, sortable: true,
width: 80, width: 80,
noWrap: true, noWrap: true,
...getColumnMeta("sent"),
render: (record) => record.sent ? <Text size={size.fontSize}>{formatBytes(record.sent)}</Text> : null, render: (record) => record.sent ? <Text size={size.fontSize}>{formatBytes(record.sent)}</Text> : null,
}, },
shouldIncludeColumn("category") && { shouldIncludeColumn("category") && {
@@ -443,7 +419,6 @@ export default function DownloadClientsWidget({
title: t("items.category.columnTitle"), title: t("items.category.columnTitle"),
width: 80, width: 80,
ellipsis: true, ellipsis: true,
...getColumnMeta("category"),
render: (record) => record.category ? ( render: (record) => record.category ? (
<Text size={size.fontSize} truncate> <Text size={size.fontSize} truncate>
{Array.isArray(record.category) ? record.category.join(", ") : record.category} {Array.isArray(record.category) ? record.category.join(", ") : record.category}
@@ -455,7 +430,6 @@ export default function DownloadClientsWidget({
title: t("items.index.columnTitle"), title: t("items.index.columnTitle"),
sortable: true, sortable: true,
width: 40, width: 40,
...getColumnMeta("index"),
render: (record) => <Text size={size.fontSize}>{record.index}</Text>, render: (record) => <Text size={size.fontSize}>{record.index}</Text>,
}, },
shouldIncludeColumn("type") && { shouldIncludeColumn("type") && {
@@ -463,21 +437,11 @@ export default function DownloadClientsWidget({
title: t("items.type.columnTitle"), title: t("items.type.columnTitle"),
sortable: true, sortable: true,
width: 70, width: 70,
...getColumnMeta("type"),
render: (record) => <Text size={size.fontSize} tt="capitalize">{record.type}</Text>, render: (record) => <Text size={size.fontSize} tt="capitalize">{record.type}</Text>,
}, },
]; ];
return cols.filter(Boolean) as DataTableColumn<ExtendedDownloadClientItem>[]; return cols.filter(Boolean) as DataTableColumn<ExtendedDownloadClientItem>[];
}, [shouldIncludeColumn, getColumnMeta, t, size, width]); }, [shouldIncludeColumn, t, size, width]);
const {
effectiveColumns,
resetColumnsOrder,
resetColumnsWidth,
} = useDataTableColumns<ExtendedDownloadClientItem>({
key: DOWNLOADS_TABLE_STORE_KEY,
columns,
});
const handleContextMenu = useCallback( const handleContextMenu = useCallback(
({ record, event }: { record: ExtendedDownloadClientItem; event: React.MouseEvent }) => { ({ record, event }: { record: ExtendedDownloadClientItem; event: React.MouseEvent }) => {
@@ -552,8 +516,7 @@ export default function DownloadClientsWidget({
loaderBackgroundBlur={2} loaderBackgroundBlur={2}
fz={size.fontSize} fz={size.fontSize}
records={sortedData} records={sortedData}
columns={effectiveColumns} columns={columns}
storeColumnsKey={DOWNLOADS_TABLE_STORE_KEY}
textSelectionDisabled textSelectionDisabled
sortStatus={sortStatus} sortStatus={sortStatus}
onSortStatusChange={setSortStatus} onSortStatusChange={setSortStatus}
@@ -601,8 +564,6 @@ export default function DownloadClientsWidget({
itemCount={sortedData.length} itemCount={sortedData.length}
showStats={showStats} showStats={showStats}
toggleStats={toggleStats} toggleStats={toggleStats}
resetColumnsOrder={resetColumnsOrder}
resetColumnsWidth={resetColumnsWidth}
/> />
{contextMenu && ( {contextMenu && (
@@ -821,7 +782,7 @@ function RowContextMenu({ state, onClose, t }: {
onClick={onClose} onClick={onClose}
onContextMenu={(e) => { e.preventDefault(); onClose(); }} onContextMenu={(e) => { e.preventDefault(); onClose(); }}
> >
<Menu opened shadow="md" position="bottom-start" withinPortal={false} onClose={onClose}> <Menu opened shadow="md" position="bottom-start" withinPortal={false} onClose={onClose} closeOnItemClick={false}>
<Menu.Target> <Menu.Target>
<Box pos="fixed" style={{ left: state.x, top: state.y, width: 1, height: 1 }} /> <Box pos="fixed" style={{ left: state.x, top: state.y, width: 1, height: 1 }} />
</Menu.Target> </Menu.Target>
@@ -905,8 +866,6 @@ interface WidgetFooterProps {
itemCount: number; itemCount: number;
showStats: boolean; showStats: boolean;
toggleStats: () => void; toggleStats: () => void;
resetColumnsOrder: () => void;
resetColumnsWidth: () => void;
} }
function WidgetFooter({ function WidgetFooter({
@@ -925,8 +884,6 @@ function WidgetFooter({
itemCount, itemCount,
showStats, showStats,
toggleStats, toggleStats,
resetColumnsOrder,
resetColumnsWidth,
}: WidgetFooterProps) { }: WidgetFooterProps) {
const t = useScopedI18n("widget.downloads"); const t = useScopedI18n("widget.downloads");
const [filterOpen, { toggle: toggleFilter }] = useDisclosure(false); const [filterOpen, { toggle: toggleFilter }] = useDisclosure(false);
@@ -1025,21 +982,6 @@ function WidgetFooter({
</ActionIcon> </ActionIcon>
</Tooltip> </Tooltip>
<Menu position="top-start" withinPortal shadow="md">
<Menu.Target>
<Tooltip label={t("columns.settings")}>
<ActionIcon size="xs" variant="subtle">
<IconColumns size={14} />
</ActionIcon>
</Tooltip>
</Menu.Target>
<Menu.Dropdown>
<Menu.Label>{t("columns.settings")}</Menu.Label>
<Menu.Item onClick={resetColumnsOrder}>{t("columns.resetOrder")}</Menu.Item>
<Menu.Item onClick={resetColumnsWidth}>{t("columns.resetWidth")}</Menu.Item>
</Menu.Dropdown>
</Menu>
<Group gap={2}> <Group gap={2}>
{clients.map(({ integration }) => ( {clients.map(({ integration }) => (
<ClientIndicator key={integration.id} integration={integration} /> <ClientIndicator key={integration.id} integration={integration} />