Skip to content

A modern and easy to use dashboard. 80+ integrations. 20K+ icons built in. Authentication out of the box. No YAML, drag and drop configuration.

fix(widgets): repair table column controls (#7374)

Thomas73dda1565586
diff --git a/packages/widgets/src/beszel-system-table/display.ts b/packages/widgets/src/beszel-system-table/display.ts
index 2321997ab..327785d07 100644
--- a/packages/widgets/src/beszel-system-table/display.ts
+++ b/packages/widgets/src/beszel-system-table/display.ts
@@ -3,11 +3,31 @@ import { beszelMetricOptionKeys } from "@homarr/definitions/beszel";
export const beszelTableMetricOptionKeys = beszelMetricOptionKeys;
-export const getBeszelTableVisibleMetricKeys = (options: BeszelMetricOptions, width: number, isAdvanced: boolean) => {
- const enabled = isAdvanced
- ? [...beszelTableMetricOptionKeys]
- : beszelTableMetricOptionKeys.filter((key) => options[key]);
- const budget = isAdvanced ? enabled.length : width < 360 ? 1 : width < 560 ? 2 : width < 760 ? 4 : enabled.length;
+export const normalizeBeszelTableOptions = (options: Record<string, unknown>): Record<string, unknown> => {
+ if (Array.isArray(options.columns)) return options;
+
+ return {
+ ...options,
+ columns: beszelTableMetricOptionKeys.filter((key) => options[key] !== false),
+ };
+};
+
+export const getBeszelTableVisibleMetricKeys = (
+ options: Partial<BeszelMetricOptions> & { columns?: readonly string[] },
+ width: number,
+ isAdvanced: boolean,
+) => {
+ const enabled = beszelTableMetricOptionKeys.filter((key) => {
+ if (isAdvanced) return true;
+ if (options.columns) return options.columns.includes(key);
+ return options[key] !== false;
+ });
+ let budget = enabled.length;
+ if (!isAdvanced) {
+ if (width < 360) budget = 1;
+ else if (width < 560) budget = 2;
+ else if (width < 760) budget = 4;
+ }
return new Set(enabled.slice(0, budget));
};
diff --git a/packages/widgets/src/beszel-system-table/index.ts b/packages/widgets/src/beszel-system-table/index.ts
index fe20f14cc..e051fc51f 100644
--- a/packages/widgets/src/beszel-system-table/index.ts
+++ b/packages/widgets/src/beszel-system-table/index.ts
@@ -4,8 +4,9 @@ import { getWidgetIntegrationConfig, invariantTechnicalLabels } from "@homarr/de
import { createWidgetDefinition, matchesWidgetRuntimeQuery, widgetQueryInputMatches } from "../definition";
import type { SelectOption } from "../_inputs/widget-select-input";
-import { createBeszelMetricOptions, statusOptions } from "../beszel/_shared/options";
+import { statusOptions } from "../beszel/_shared/options";
import { optionsBuilder } from "../options";
+import { beszelTableMetricOptionKeys } from "./display";
const sortOptions = [
{ value: "name", label: (t) => t("widget.beszel.metric.system") },
@@ -37,6 +38,23 @@ export const { definition, componentLoader } = createWidgetDefinition("beszelSys
createOptions() {
return optionsBuilder.from(
(factory) => ({
+ columns: factory.multiSelect({
+ defaultValue: [...beszelTableMetricOptionKeys],
+ options: [
+ { value: "showCpu", label: invariantTechnicalLabels.cpu },
+ { value: "showMemory", label: (t) => t("widget.beszel.metric.memory") },
+ { value: "showDisk", label: (t) => t("widget.beszel.metric.disk") },
+ { value: "showGpu", label: invariantTechnicalLabels.gpu },
+ { value: "showLoadAvg", label: (t) => t("widget.beszel.metric.loadAvg") },
+ { value: "showNet", label: (t) => t("widget.beszel.metric.net") },
+ { value: "showTemp", label: (t) => t("widget.beszel.metric.temp") },
+ { value: "showBattery", label: (t) => t("widget.beszel.metric.battery") },
+ { value: "showServices", label: (t) => t("common.services") },
+ { value: "showUptime", label: (t) => t("widget.beszel.metric.uptime") },
+ { value: "showAgent", label: (t) => t("widget.beszel.metric.agent") },
+ ],
+ searchable: true,
+ }),
statusFilter: factory.select({
defaultValue: "all",
options: statusOptions,
@@ -46,7 +64,6 @@ export const { definition, componentLoader } = createWidgetDefinition("beszelSys
defaultValue: "asc",
options: sortDirectionOptions,
}),
- ...createBeszelMetricOptions(() => factory.switch({ defaultValue: true })),
columnOrder: factory.text({ defaultValue: "" }),
columnWidths: factory.text({ defaultValue: "" }),
}),
diff --git a/packages/widgets/src/downloads/component.tsx b/packages/widgets/src/downloads/component.tsx
index 314f82296..4455096e5 100644
--- a/packages/widgets/src/downloads/component.tsx
+++ b/packages/widgets/src/downloads/component.tsx
@@ -29,6 +29,7 @@ import {
IconCopy,
IconDatabase,
IconDownload,
+ IconDots,
IconFilter,
IconFilterOff,
IconInfoCircle,
@@ -693,11 +694,33 @@ export default function DownloadClientsWidget({
</Text>
),
},
+ includeColumn("actions") && {
+ accessor: "actions",
+ title: "",
+ width: 40,
+ textAlign: "right",
+ render: (record) => (
+ <Tooltip label={t("items.actions.columnTitle")} withArrow>
+ <ActionIcon
+ variant="subtle"
+ size="sm"
+ aria-label={t("items.actions.columnTitle")}
+ onClick={(event) => {
+ event.stopPropagation();
+ const { right, bottom } = event.currentTarget.getBoundingClientRect();
+ setContextMenu({ x: right, y: bottom, item: record });
+ }}
+ >
+ <IconDots size={size.iconSize} />
+ </ActionIcon>
+ </Tooltip>
+ ),
+ },
];
return cols.filter(Boolean) as DataTableColumn<ExtendedDownloadClientItem>[];
}, [columnContext, displayMode, formatByteRate, formatBytes, formatBytesPair, progressColumnWidth, size, t]);
- const { effectiveColumns, storeKey } = usePersistedTableLayout({
+ const { effectiveColumns, storeKey, setMultipleColumnWidths } = usePersistedTableLayout({
columns,
columnAccessors: DOWNLOAD_COLUMN_ACCESSORS,
columnOrder: options.columnOrder,
@@ -706,6 +729,7 @@ export default function DownloadClientsWidget({
storeKeyPrefix: "downloads",
onLayoutChange: persistOption,
});
+ const fillColumnAccessor = columns.find(({ accessor }) => accessor === "name")?.accessor ?? columns[0]?.accessor;
const handleContextMenu = useCallback(
({ record, event }: { record: ExtendedDownloadClientItem; event: React.MouseEvent }) => {
@@ -782,6 +806,9 @@ export default function DownloadClientsWidget({
</Box>
<HomarrDataTable
preserveColumnWidths
+ fillColumnAccessor={fillColumnAccessor}
+ defaultColumnWidths={columns}
+ onColumnWidthsChange={setMultipleColumnWidths}
isEditMode={isEditMode}
cellPadding={`${size.cellPadding}px 8px`}
fetching={isFetching && (currentItems?.length ?? 0) === 0}
diff --git a/packages/widgets/src/downloads/helpers.ts b/packages/widgets/src/downloads/helpers.ts
index 6e7cce778..f2e50fb1a 100644
--- a/packages/widgets/src/downloads/helpers.ts
+++ b/packages/widgets/src/downloads/helpers.ts
@@ -18,6 +18,7 @@ export const DOWNLOAD_COLUMN_ACCESSORS = [
"integration",
"index",
"type",
+ "actions",
] as const satisfies readonly (keyof ExtendedDownloadClientItem)[];
export const ADVANCED_DOWNLOAD_COLUMN_ACCESSORS = [
@@ -29,6 +30,7 @@ export const ADVANCED_DOWNLOAD_COLUMN_ACCESSORS = [
"time",
"state",
"integration",
+ "actions",
] as const satisfies readonly (typeof DOWNLOAD_COLUMN_ACCESSORS)[number][];
type DownloadColumnAccessor = (typeof DOWNLOAD_COLUMN_ACCESSORS)[number];
diff --git a/packages/widgets/src/manifest.ts b/packages/widgets/src/manifest.ts
index 1e7961f1c..47c82cf13 100644
--- a/packages/widgets/src/manifest.ts
+++ b/packages/widgets/src/manifest.ts
@@ -7,6 +7,7 @@ import type { SettingsContextProps } from "@homarr/settings/creator";
import { normalizeAppWidgetOptions } from "@homarr/validation/app";
import type { WidgetComponentProps, WidgetDefinition } from "./definition";
+import { normalizeBeszelTableOptions } from "./beszel-system-table/display";
import type { WidgetOptionDefinition } from "./options";
import type { WidgetImports } from "./registry";
import { widgetComponentLoaders, widgetModuleLoaders } from "./registry";
@@ -150,6 +151,9 @@ export const reduceWidgetOptionsWithDefinition = (
if ("kind" in definition && definition.kind === "app") {
currentValue = normalizeAppWidgetOptions(currentValue);
}
+ if ("kind" in definition && definition.kind === "beszelSystemTable") {
+ currentValue = normalizeBeszelTableOptions(currentValue);
+ }
const options: Record<string, WidgetOptionDefinition> = definition.createOptions(settings);
const result: Record<string, unknown> = {};
for (const [key, value] of objectEntries(options)) {