ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.
Python astracloudflarecontrol-panelcyberpaneldnsfablehosting-control-panelhosting-panelkimi-k3server-managementserverkitubuntu-web-panelwebserver
refactor(ds): drop the toolbar Sort/Columns menus -- the column menu already does that
Juan Denis8eacb30c5fa1
diff --git a/frontend/src/components/docker/ContainersTab.jsx b/frontend/src/components/docker/ContainersTab.jsxindex f09dd593..353ac026 100644--- a/frontend/src/components/docker/ContainersTab.jsx+++ b/frontend/src/components/docker/ContainersTab.jsx@@ -6,7 +6,7 @@ import LogToolbar from '../log-viewer/LogToolbar';import LogContent from '../log-viewer/LogContent';import EmptyState from '../EmptyState';import Modal from '@/components/Modal';-import { Drawer, DataTable, DataTableFooter, SortMenu, ColumnsMenu } from '@/components/ds';+import { Drawer, DataTable, DataTableFooter } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { Button } from '@/components/ui/button';@@ -74,7 +74,7 @@ const ContainersTab = ({ onStatsChange }) => {storageKey: 'serverkit-table-docker-containers-sort',});const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-docker-containers-cols' });const statsRequestSeq = useRef(0);@@ -446,13 +446,6 @@ const ContainersTab = ({ onStatsChange }) => {))}</div><div className="dx-tab-toolbar-right">- <SortMenu columns={columns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={columns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /><label className="dx-toggle"><inputtype="checkbox"@@ -506,6 +499,7 @@ const ContainersTab = ({ onStatsChange }) => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}onRowClick={(container) => setSelectedContainer(container)}rowClassName={(container) => (`${isContainerRunning(container) ? 'is-running' : 'is-stopped'} ${getContainerId(selectedContainer) === getContainerId(container) ? 'is-selected' : ''}`diff --git a/frontend/src/components/ds/index.js b/frontend/src/components/ds/index.jsindex 1174525e..2122b3f5 100644--- a/frontend/src/components/ds/index.js+++ b/frontend/src/components/ds/index.js@@ -19,12 +19,24 @@ export {} from './FilterDrawer';export { PageTopbar } from './PageTopbar';export { DataTable } from './DataTable';-export { SortMenu } from './SortMenu';export { SortChipBar } from './SortChipBar';-export { ColumnsMenu } from './ColumnsMenu';export { DataTableFooter } from './DataTableFooter';-export { ViewMenu } from './ViewMenu';export { ListToolbar } from './ListToolbar';++// DEPRECATED toolbar menus — ZERO render sites left in the app.+//+// Each one is a toolbar-level copy of something DataTable's per-column "⋮"+// menu now does next to the column it acts on: SortMenu -> sort, ColumnsMenu ->+// hide/show, GroupMenu -> group by (that one never had a render site at all).+// ViewMenu is replaced by grid/GridViewPicker, which renders the active view as+// the page HEADING rather than as one more button among buttons.+//+// Still exported because extensions may deep-import '@/components/ds' (see the+// note in plugins/sdk/index.js) — none of the four is on the SDK's blessed+// list, so they can go in the next SDK major. Do not reach for them in core.+export { SortMenu } from './SortMenu';+export { ColumnsMenu } from './ColumnsMenu';export { GroupMenu } from './GroupMenu';+export { ViewMenu } from './ViewMenu';export { ResourceCard, ResourceList } from './ResourceCard';export { svcGrad, initials, gaugeColor } from './utils';diff --git a/frontend/src/components/monitoring/FleetAlertsPanel.jsx b/frontend/src/components/monitoring/FleetAlertsPanel.jsxindex 5545e27e..1eb78402 100644--- a/frontend/src/components/monitoring/FleetAlertsPanel.jsx+++ b/frontend/src/components/monitoring/FleetAlertsPanel.jsx@@ -3,7 +3,7 @@ import { CheckCircle, Eye } from 'lucide-react';import api from '../../services/api';import { useToast } from '../../contexts/ToastContext';import { Button } from '@/components/ui/button';-import { ColumnsMenu, DataTable, DataTableFooter, Pill, SegControl, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter, Pill, SegControl } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { METRIC_LABELS } from './fleetMetrics';@@ -49,7 +49,7 @@ export default function FleetAlertsPanel({ scope, refreshKey = 0 }) {const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-fleet-alerts-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-fleet-alerts-cols' });// Columns for the shared DataTable; cell markup is identical to the@@ -154,13 +154,6 @@ export default function FleetAlertsPanel({ scope, refreshKey = 0 }) {<h3>Fleet alerts</h3><div><SegControl value={filter} onChange={setFilter} options={ALERT_FILTERS} />- <SortMenu columns={alertColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={alertColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /></div></div>@@ -172,6 +165,7 @@ export default function FleetAlertsPanel({ scope, refreshKey = 0 }) {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}className="mon-table-scroll"footer={(<DataTableFooterdiff --git a/frontend/src/components/monitoring/FleetThresholdsPanel.jsx b/frontend/src/components/monitoring/FleetThresholdsPanel.jsxindex 4f9fc37d..cc752d2c 100644--- a/frontend/src/components/monitoring/FleetThresholdsPanel.jsx+++ b/frontend/src/components/monitoring/FleetThresholdsPanel.jsx@@ -5,7 +5,7 @@ import { useToast } from '../../contexts/ToastContext';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';-import { ColumnsMenu, DataTable, DataTableFooter, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { METRIC_LABELS } from './fleetMetrics';@@ -60,7 +60,7 @@ export default function FleetThresholdsPanel({ servers = [], refreshKey = 0 }) {const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-fleet-thresholds-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-fleet-thresholds-cols' });// Columns for the shared DataTable; cell markup is identical to the@@ -127,13 +127,6 @@ export default function FleetThresholdsPanel({ servers = [], refreshKey = 0 }) {<span className="mon-panel-sub">Limits applied to paired servers by their agents</span></div><div>- <SortMenu columns={thresholdColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={thresholdColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /><Button size="sm" variant={adding ? 'outline' : 'default'} onClick={() => setAdding((v) => !v)}><Plus size={14} /> {adding ? 'Cancel' : 'Add rule'}</Button>@@ -204,6 +197,7 @@ export default function FleetThresholdsPanel({ servers = [], refreshKey = 0 }) {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}className="mon-table-scroll"footer={(<DataTableFooterdiff --git a/frontend/src/components/security/Fail2banTab.jsx b/frontend/src/components/security/Fail2banTab.jsxindex d8bf6780..3ed2b389 100644--- a/frontend/src/components/security/Fail2banTab.jsx+++ b/frontend/src/components/security/Fail2banTab.jsx@@ -8,7 +8,7 @@ import Modal from '../Modal';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';-import { ColumnsMenu, DataTable, DataTableFooter, Pill, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter, Pill } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from '@/components/ui/select';@@ -26,7 +26,7 @@ const Fail2banTab = () => {const { confirm } = useConfirm();const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-fail2ban-bans-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-fail2ban-bans-cols' });useEffect(() => {@@ -234,15 +234,6 @@ const Fail2banTab = () => {<div className="card sec-flush"><div className="card-header"><h3>Banned IPs {bans.length > 0 && <span className="sec-count">· {bans.length}</span>}</h3>- <div className="sec-tableactions">- <SortMenu columns={banColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={banColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- />- </div></div>{bans.length === 0 ? (<div className="card-body">@@ -256,6 +247,7 @@ const Fail2banTab = () => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}footer={(<DataTableFootershown={bans.length}diff --git a/frontend/src/components/security/FirewallTab.jsx b/frontend/src/components/security/FirewallTab.jsxindex d02b0288..f557b16a 100644--- a/frontend/src/components/security/FirewallTab.jsx+++ b/frontend/src/components/security/FirewallTab.jsx@@ -8,7 +8,7 @@ import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';import { Switch } from '@/components/ui/switch';-import { ColumnsMenu, DataTable, DataTableFooter, Pill, SegControl, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter, Pill, SegControl } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { Ban, Shield } from 'lucide-react';@@ -39,7 +39,7 @@ const FirewallTab = () => {const { confirm } = useConfirm();const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-firewall-rules-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-firewall-rules-cols' });const commonPorts = [@@ -410,13 +410,6 @@ const FirewallTab = () => {<div className="card-header"><h3>Firewall Rules</h3><div className="sec-tableactions">- <SortMenu columns={ruleColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={ruleColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /><Button variant="default" size="sm" onClick={() => setShowPortModal(true)}>Add Rule</Button></div></div>@@ -432,6 +425,7 @@ const FirewallTab = () => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}footer={(<DataTableFootershown={rules.length}diff --git a/frontend/src/components/security/IPListsTab.jsx b/frontend/src/components/security/IPListsTab.jsxindex 37ebde5c..75166824 100644--- a/frontend/src/components/security/IPListsTab.jsx+++ b/frontend/src/components/security/IPListsTab.jsx@@ -6,7 +6,7 @@ import Modal from '../Modal';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Label } from '@/components/ui/label';-import { ColumnsMenu, DataTable, DataTableFooter, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';@@ -142,13 +142,6 @@ const IPListsTab = () => {{title} <span className="sec-count">· {items.length}</span></h3><div className="sec-tableactions">- <SortMenu columns={columns} sorts={sortState.sorts} onChange={sortState.setSorts} />- <ColumnsMenu- columns={columns}- hiddenKeys={colState.hiddenKeys}- onToggle={colState.toggleColumn}- onShowAll={colState.showAllColumns}- /><Button variant="default" size="sm" onClick={() => setShowAddModal(listType)}>Add IP</Button>@@ -166,6 +159,7 @@ const IPListsTab = () => {sorts={sortState.sorts}onSortsChange={sortState.setSorts}hiddenKeys={colState.hiddenKeys}+ onHiddenKeysChange={colState.setHiddenKeys}footer={(<DataTableFootershown={items.length}diff --git a/frontend/src/components/security/QuarantineTab.jsx b/frontend/src/components/security/QuarantineTab.jsxindex dd778f91..07454e63 100644--- a/frontend/src/components/security/QuarantineTab.jsx+++ b/frontend/src/components/security/QuarantineTab.jsx@@ -3,7 +3,7 @@ import { ShieldCheck } from 'lucide-react';import api from '../../services/api';import EmptyState from '@/components/EmptyState';import { Button } from '@/components/ui/button';-import { ColumnsMenu, DataTable, DataTableFooter, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { formatBytes } from '@/utils/formatBytes';@@ -14,7 +14,7 @@ const QuarantineTab = () => {const [message, setMessage] = useState(null);const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-quarantine-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-quarantine-cols' });useEffect(() => {@@ -139,13 +139,6 @@ const QuarantineTab = () => {<div className="card-header"><h3>Quarantined Files {!loading && files.length > 0 && <span className="sec-count">· {files.length}</span>}</h3><div className="sec-tableactions">- <SortMenu columns={columns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={columns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /><Button variant="outline" size="sm" onClick={loadFiles}>Refresh</Button></div></div>@@ -169,6 +162,7 @@ const QuarantineTab = () => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}footer={(<DataTableFootershown={files.length}diff --git a/frontend/src/components/security/SSHKeysTab.jsx b/frontend/src/components/security/SSHKeysTab.jsxindex 4889a3e0..b8a19663 100644--- a/frontend/src/components/security/SSHKeysTab.jsx+++ b/frontend/src/components/security/SSHKeysTab.jsx@@ -8,7 +8,7 @@ import Modal from '../Modal';import { Button } from '@/components/ui/button';import { Textarea } from '@/components/ui/textarea';import { Label } from '@/components/ui/label';-import { ColumnsMenu, DataTable, DataTableFooter, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';@@ -22,7 +22,7 @@ const SSHKeysTab = () => {const { confirm } = useConfirm();const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-ssh-keys-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-ssh-keys-cols' });useEffect(() => {@@ -118,13 +118,6 @@ const SSHKeysTab = () => {<div className="card-header"><h3>SSH Authorized Keys {!loading && keys.length > 0 && <span className="sec-count">· {keys.length}</span>}</h3><div className="card-actions">- <SortMenu columns={columns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={columns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /><Button variant="default" size="sm" onClick={() => setShowAddModal(true)}>Add Key</Button>@@ -157,6 +150,7 @@ const SSHKeysTab = () => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}footer={(<DataTableFootershown={keys.length}diff --git a/frontend/src/components/security/ScannerTab.jsx b/frontend/src/components/security/ScannerTab.jsxindex c63fe003..75a14833 100644--- a/frontend/src/components/security/ScannerTab.jsx+++ b/frontend/src/components/security/ScannerTab.jsx@@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from 'react';import api from '../../services/api';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';-import { ColumnsMenu, DataTable, DataTableFooter, Pill, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter, Pill } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { Zap, Radar, FolderSearch, Download, Box, ShieldAlert, FileCode2, Trash2, Search } from 'lucide-react';@@ -544,13 +544,6 @@ const ScannerTab = () => {Findings <span className="sec-count">· {findings.length}</span></h3><div className="sec-tableactions">- <SortMenu columns={findingColumns} sorts={findingsSorts.sorts} onChange={findingsSorts.setSorts} />- <ColumnsMenu- columns={findingColumns}- hiddenKeys={findingsCols.hiddenKeys}- onToggle={findingsCols.toggleColumn}- onShowAll={findingsCols.showAllColumns}- /><Button variant="outline" size="sm" onClick={() => setFindings([])}>Dismiss</Button></div></div>@@ -561,6 +554,7 @@ const ScannerTab = () => {sorts={findingsSorts.sorts}onSortsChange={findingsSorts.setSorts}hiddenKeys={findingsCols.hiddenKeys}+ onHiddenKeysChange={findingsCols.setHiddenKeys}footer={(<DataTableFootershown={findings.length}@@ -576,13 +570,6 @@ const ScannerTab = () => {<div className="card-header"><h3>Scan History</h3><div className="sec-tableactions">- <SortMenu columns={historyColumns} sorts={historySorts.sorts} onChange={historySorts.setSorts} />- <ColumnsMenu- columns={historyColumns}- hiddenKeys={historyCols.hiddenKeys}- onToggle={historyCols.toggleColumn}- onShowAll={historyCols.showAllColumns}- /><Button variant="outline" size="sm" onClick={loadHistory}>Refresh</Button></div></div>@@ -602,6 +589,7 @@ const ScannerTab = () => {sorts={historySorts.sorts}onSortsChange={historySorts.setSorts}hiddenKeys={historyCols.hiddenKeys}+ onHiddenKeysChange={historyCols.setHiddenKeys}footer={(<DataTableFootershown={history.length}diff --git a/frontend/src/components/serverdetail/CloudflaredTab.jsx b/frontend/src/components/serverdetail/CloudflaredTab.jsxindex 5b537565..574acfe5 100644--- a/frontend/src/components/serverdetail/CloudflaredTab.jsx+++ b/frontend/src/components/serverdetail/CloudflaredTab.jsx@@ -4,7 +4,7 @@ import { useToast } from '../../contexts/ToastContext';import { useConfirm } from '../../hooks/useConfirm';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';-import { ColumnsMenu, DataTable, DataTableFooter, Pill, SortMenu } from '../ds';+import { DataTable, DataTableFooter, Pill } from '../ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import EmptyState from '../EmptyState';@@ -47,7 +47,7 @@ const CloudflaredTab = ({ serverId, serverStatus }) => {const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-sd-cloudflared-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-sd-cloudflared-cols' });const loadStatus = useCallback(async () => {@@ -293,13 +293,6 @@ const CloudflaredTab = ({ serverId, serverStatus }) => {<Button onClick={() => setShowCreateModal(true)} disabled={notInstalled || notAuthed}>Create Tunnel</Button>- <SortMenu columns={tunnelColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={tunnelColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /></div></div>@@ -348,6 +341,7 @@ const CloudflaredTab = ({ serverId, serverStatus }) => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}tableClassName="data-table"footer={(<DataTableFooterdiff --git a/frontend/src/components/serverdetail/CronTab.jsx b/frontend/src/components/serverdetail/CronTab.jsxindex 4cf576ad..c54c43e8 100644--- a/frontend/src/components/serverdetail/CronTab.jsx+++ b/frontend/src/components/serverdetail/CronTab.jsx@@ -5,7 +5,7 @@ import { useConfirm } from '../../hooks/useConfirm';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Textarea } from '@/components/ui/textarea';-import { ColumnsMenu, DataTable, DataTableFooter, Pill, SortMenu } from '../ds';+import { DataTable, DataTableFooter, Pill } from '../ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import EmptyState from '../EmptyState';@@ -44,7 +44,7 @@ const CronTab = ({ serverId, serverStatus }) => {});const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-sd-cron-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-sd-cron-cols' });const loadJobs = useCallback(async () => {@@ -237,13 +237,6 @@ const CronTab = ({ serverId, serverStatus }) => {<Button onClick={() => setShowAddModal(true)} disabled={status?.available === false}>Add Job</Button>- <SortMenu columns={cronColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={cronColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /></div></div>@@ -265,6 +258,7 @@ const CronTab = ({ serverId, serverStatus }) => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}rowClassName={(job) => (!job.enabled ? 'row-disabled' : '')}tableClassName="data-table"footer={(diff --git a/frontend/src/components/serverdetail/ServicesTab.jsx b/frontend/src/components/serverdetail/ServicesTab.jsxindex d3c60bf5..2021bfa7 100644--- a/frontend/src/components/serverdetail/ServicesTab.jsx+++ b/frontend/src/components/serverdetail/ServicesTab.jsx@@ -3,7 +3,7 @@ import api from '../../services/api';import { useToast } from '../../contexts/ToastContext';import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';-import { Pill, ColumnsMenu, DataTable, DataTableFooter, ListToolbar, SortMenu } from '../ds';+import { Pill, DataTable, DataTableFooter, ListToolbar } from '../ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import Modal from '../Modal';@@ -38,7 +38,7 @@ const ServicesTab = ({ serverId, serverStatus }) => {const [logsFor, setLogsFor] = useState(null); // { unit, entries, raw }const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-sd-services-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-sd-services-cols' });const loadUnits = useCallback(async () => {@@ -188,13 +188,6 @@ const ServicesTab = ({ serverId, serverStatus }) => {>Reload daemon</Button>- <SortMenu columns={unitColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={unitColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /></div>)}>@@ -230,6 +223,7 @@ const ServicesTab = ({ serverId, serverStatus }) => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}tableClassName="server-services__table"footer={(<DataTableFooterdiff --git a/frontend/src/pages/Backups.jsx b/frontend/src/pages/Backups.jsxindex e1f86e1f..c72eebb9 100644--- a/frontend/src/pages/Backups.jsx+++ b/frontend/src/pages/Backups.jsx@@ -12,7 +12,7 @@ import { Button } from '@/components/ui/button';import { Input } from '@/components/ui/input';import { Textarea } from '@/components/ui/textarea';import {- Pill, SearchField, SegControl, DataTable, SortMenu, ColumnsMenu, SortChipBar, DataTableFooter,+ Pill, SearchField, SegControl, DataTable, SortChipBar, DataTableFooter,ListToolbar,} from '@/components/ds';import BackupsOverview from '../components/backups/BackupsOverview';@@ -47,7 +47,7 @@ const Backups = () => {const [search, setSearch] = useState('');const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-backups-sort' });const {- hiddenKeys, toggleColumn, showAllColumns,+ hiddenKeys, setHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-backups-cols' });// Modal states@@ -614,19 +614,10 @@ const Backups = () => {/>)}tools={(- <>- <SortMenu columns={snapshotColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={snapshotColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- />- <Button size="sm" variant="outline" onClick={loadData}>- <RefreshCw size={14} />- Refresh- </Button>- </>+ <Button size="sm" variant="outline" onClick={loadData}>+ <RefreshCw size={14} />+ Refresh+ </Button>)}/><SortChipBar columns={snapshotColumns} sorts={sorts} onChange={setSorts} />@@ -653,6 +644,7 @@ const Backups = () => {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}tableClassName="bk-table"footer={(<DataTableFooterdiff --git a/frontend/src/pages/FTPServer.jsx b/frontend/src/pages/FTPServer.jsxindex c7b80e21..def0e7fd 100644--- a/frontend/src/pages/FTPServer.jsx+++ b/frontend/src/pages/FTPServer.jsx@@ -6,7 +6,7 @@ import {import useTabParam from '../hooks/useTabParam';import { useTopbarActions } from '@/hooks/useTopbarActions';import { api } from '../services/api';-import { ColumnsMenu, DataTable, DataTableFooter, MetricCard, Pill, SortMenu } from '@/components/ds';+import { DataTable, DataTableFooter, MetricCard, Pill } from '@/components/ds';import { useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { useToast } from '../contexts/ToastContext';@@ -44,16 +44,14 @@ function FTPServer() {});const {hiddenKeys: userHiddenKeys,- toggleColumn: toggleUserColumn,- showAllColumns: showAllUserColumns,+ setHiddenKeys: setUserHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-ftp-users-cols' });const { sorts: connSorts, setSorts: setConnSorts } = useTableSort({storageKey: 'serverkit-table-ftp-connections-sort',});const {hiddenKeys: connHiddenKeys,- toggleColumn: toggleConnColumn,- showAllColumns: showAllConnColumns,+ setHiddenKeys: setConnHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-ftp-connections-cols' });useEffect(() => {@@ -574,13 +572,6 @@ function FTPServer() {<div className="section-header"><h3>FTP Users</h3><div className="section-header__actions">- <SortMenu columns={userColumns} sorts={userSorts} onChange={setUserSorts} />- <ColumnsMenu- columns={userColumns}- hiddenKeys={userHiddenKeys}- onToggle={toggleUserColumn}- onShowAll={showAllUserColumns}- /><Button onClick={() => setShowUserModal(true)}>Add User</Button>@@ -600,6 +591,7 @@ function FTPServer() {sorts={userSorts}onSortsChange={setUserSorts}hiddenKeys={userHiddenKeys}+ onHiddenKeysChange={setUserHiddenKeys}className="users-table"footer={(<DataTableFooter@@ -618,13 +610,6 @@ function FTPServer() {<div className="section-header"><h3>Active Connections</h3><div className="section-header__actions">- <SortMenu columns={connectionColumns} sorts={connSorts} onChange={setConnSorts} />- <ColumnsMenu- columns={connectionColumns}- hiddenKeys={connHiddenKeys}- onToggle={toggleConnColumn}- onShowAll={showAllConnColumns}- /><Button variant="outline" onClick={loadConnections}><RefreshCw size={14} />Refresh@@ -641,6 +626,7 @@ function FTPServer() {sorts={connSorts}onSortsChange={setConnSorts}hiddenKeys={connHiddenKeys}+ onHiddenKeysChange={setConnHiddenKeys}className="connections-table"footer={(<DataTableFooterdiff --git a/frontend/src/pages/Git.jsx b/frontend/src/pages/Git.jsxindex e876fd0e..f114ace4 100644--- a/frontend/src/pages/Git.jsx+++ b/frontend/src/pages/Git.jsx@@ -7,7 +7,7 @@ import { DangerZone } from '../components/DangerZone';import EmptyState from '../components/EmptyState';import Modal from '@/components/Modal';import {- Pill, MetricCard, SegControl, Drawer, DataTable, SortMenu, ColumnsMenu, DataTableFooter,+ Pill, MetricCard, SegControl, Drawer, DataTable, DataTableFooter,ListToolbar,} from '../components/ds';import { useTableSort } from '@/hooks/useTableSort';@@ -283,11 +283,11 @@ function Git({ basePath = '/git' }) {const { sorts: repoSorts, setSorts: setRepoSorts } = useTableSort({ storageKey: 'serverkit-table-git-repos-sort' });const {- hiddenKeys: repoHiddenKeys, toggleColumn: toggleRepoColumn, showAllColumns: showAllRepoColumns,+ hiddenKeys: repoHiddenKeys, setHiddenKeys: setRepoHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-git-repos-cols' });const { sorts: webhookSorts, setSorts: setWebhookSorts } = useTableSort({ storageKey: 'serverkit-table-git-webhooks-sort' });const {- hiddenKeys: webhookHiddenKeys, toggleColumn: toggleWebhookColumn, showAllColumns: showAllWebhookColumns,+ hiddenKeys: webhookHiddenKeys, setHiddenKeys: setWebhookHiddenKeys,} = useColumnVisibility({ storageKey: 'serverkit-table-git-webhooks-cols' });const toast = useToast();@@ -866,17 +866,6 @@ function Git({ basePath = '/git' }) {]}/>)}- tools={(- <>- <SortMenu columns={REPO_COLUMNS} sorts={repoSorts} onChange={setRepoSorts} />- <ColumnsMenu- columns={REPO_COLUMNS}- hiddenKeys={repoHiddenKeys}- onToggle={toggleRepoColumn}- onShowAll={showAllRepoColumns}- />- </>- )}/>{filteredRepos.length === 0 ? (<EmptyState icon={FolderGit2} title="No repositories match this filter." />@@ -889,6 +878,7 @@ function Git({ basePath = '/git' }) {sorts={repoSorts}onSortsChange={setRepoSorts}hiddenKeys={repoHiddenKeys}+ onHiddenKeysChange={setRepoHiddenKeys}onRowClick={openRepoDrawer}tableClassName="git-repos-table"footer={(@@ -962,17 +952,6 @@ function Git({ basePath = '/git' }) {]}/>)}- tools={(- <>- <SortMenu columns={WEBHOOK_COLUMNS} sorts={webhookSorts} onChange={setWebhookSorts} />- <ColumnsMenu- columns={WEBHOOK_COLUMNS}- hiddenKeys={webhookHiddenKeys}- onToggle={toggleWebhookColumn}- onShowAll={showAllWebhookColumns}- />- </>- )}/>{filteredWebhooks.length === 0 ? (<EmptyState icon={Webhook} title="No webhooks match this filter." />@@ -985,6 +964,7 @@ function Git({ basePath = '/git' }) {sorts={webhookSorts}onSortsChange={setWebhookSorts}hiddenKeys={webhookHiddenKeys}+ onHiddenKeysChange={setWebhookHiddenKeys}onRowClick={setDrawerWebhook}rowClassName={(webhook) => (!webhook.is_active ? 'is-disabled' : '')}tableClassName="git-webhooks-table"diff --git a/frontend/src/pages/MonitorDetail.jsx b/frontend/src/pages/MonitorDetail.jsxindex 58ea1210..aa81607c 100644--- a/frontend/src/pages/MonitorDetail.jsx+++ b/frontend/src/pages/MonitorDetail.jsx@@ -20,8 +20,8 @@ import EmptyState from '../components/EmptyState';import UptimeBars from '../components/monitoring/UptimeBars';import { monitorStateOf } from '../components/monitoring/monitorShared';import {- AreaChart, ColumnsMenu, DataTable, DataTableFooter, KpiBand, MetricCard,- Pill, SegControl, SortMenu,+ AreaChart, DataTable, DataTableFooter, KpiBand, MetricCard,+ Pill, SegControl,} from '@/components/ds';import PageLayout from '../layouts/PageLayout';import { Button } from '@/components/ui/button';@@ -84,7 +84,7 @@ export default function MonitorDetail() {// Sort/column state for the check log lives above the early returns so the// hook order never changes; storageKey keeps the choices across visits.const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-monitor-checks-sort' });- const { hiddenKeys, toggleColumn, showAllColumns } = useColumnVisibility({+ const { hiddenKeys, setHiddenKeys } = useColumnVisibility({storageKey: 'serverkit-table-monitor-checks-cols',});@@ -448,13 +448,6 @@ export default function MonitorDetail() {{frozen && newSinceFreeze > 0 && (<Pill kind="cyan">{newSinceFreeze} new</Pill>)}- <SortMenu columns={checkColumns} sorts={sorts} onChange={setSorts} />- <ColumnsMenu- columns={checkColumns}- hiddenKeys={hiddenKeys}- onToggle={toggleColumn}- onShowAll={showAllColumns}- /><Button variant="outline" size="sm" onClick={() => setFrozen(frozen ? null : checks)}>{frozen ? <><Play size={14} /> Resume</> : <><Pause size={14} /> Hold</>}</Button>@@ -467,6 +460,7 @@ export default function MonitorDetail() {sorts={sorts}onSortsChange={setSorts}hiddenKeys={hiddenKeys}+ onHiddenKeysChange={setHiddenKeys}rowClassName={(c) => (c.status === 'up' ? undefined : 'is-bad')}emptyState={(<EmptyState