Skip to content

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.

feat(monitors): enable sortable columns and table footers

Juan Denisa394bc38c643
diff --git a/frontend/src/pages/MonitorDetail.jsx b/frontend/src/pages/MonitorDetail.jsx
index 4f850486..a7b380f6 100644
--- a/frontend/src/pages/MonitorDetail.jsx
+++ b/frontend/src/pages/MonitorDetail.jsx
@@ -18,10 +18,13 @@ import EmptyState from '../components/EmptyState';
import UptimeBars from '../components/monitoring/UptimeBars';
import { monitorStateOf } from '../components/monitoring/monitorShared';
import {
- AreaChart, DataTable, KpiBand, MetricCard, Pill, SegControl,
+ AreaChart, ColumnsMenu, DataTable, DataTableFooter, KpiBand, MetricCard,
+ Pill, SegControl, SortMenu,
} from '@/components/ds';
import PageLayout from '../layouts/PageLayout';
import { Button } from '@/components/ui/button';
+import { useTableSort } from '@/hooks/useTableSort';
+import { useColumnVisibility } from '@/hooks/useColumnVisibility';
const POLL_MS = 15000;
@@ -73,6 +76,12 @@ export default function MonitorDetail() {
const [frozen, setFrozen] = useState(null);
const [busy, setBusy] = useState(false);
const pollRef = useRef(null);
+ // 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({
+ storageKey: 'serverkit-table-monitor-checks-cols',
+ });
const load = useCallback(async () => {
try {
@@ -149,6 +158,39 @@ export default function MonitorDetail() {
), 0)
: null;
+ const checkColumns = [
+ {
+ key: 'checked_at',
+ header: 'Time',
+ sortable: true,
+ hideable: false,
+ render: (c) => new Date(c.checked_at).toLocaleTimeString(),
+ },
+ {
+ key: 'status',
+ header: 'Result',
+ sortable: true,
+ sortValue: (c) => c.status,
+ render: (c) => (
+ <span className={`mon-code mon-code--${c.status === 'up' ? 'ok' : 'bad'}`}>
+ {c.status_code ?? c.status}
+ </span>
+ ),
+ },
+ {
+ key: 'response_time',
+ header: 'Latency',
+ sortable: true,
+ render: (c) => (c.response_time == null ? '—' : `${c.response_time} ms`),
+ },
+ {
+ key: 'error',
+ header: 'Detail',
+ cellClassName: 'mon-checkdetail',
+ render: (c) => c.error || `${monitor.check_method || 'GET'} ${monitor.check_target}`,
+ },
+ ];
+
const act = async (fn, successMessage) => {
setBusy(true);
try {
@@ -400,6 +442,13 @@ 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>
@@ -407,42 +456,19 @@ export default function MonitorDetail() {
</div>
<DataTable
tableClassName="sk-dtable monitor-checks-table"
- sortable={false}
data={rows}
keyField="id"
+ sorts={sorts}
+ onSortsChange={setSorts}
+ hiddenKeys={hiddenKeys}
rowClassName={(c) => (c.status === 'up' ? undefined : 'is-bad')}
emptyState={(
<div className="mon-empty">
<p>No checks in this window yet.</p>
</div>
)}
- columns={[
- {
- key: 'checked_at',
- header: 'Time',
- render: (c) => new Date(c.checked_at).toLocaleTimeString(),
- },
- {
- key: 'status',
- header: 'Result',
- render: (c) => (
- <span className={`mon-code mon-code--${c.status === 'up' ? 'ok' : 'bad'}`}>
- {c.status_code ?? c.status}
- </span>
- ),
- },
- {
- key: 'response_time',
- header: 'Latency',
- render: (c) => (c.response_time == null ? '—' : `${c.response_time} ms`),
- },
- {
- key: 'error',
- header: 'Detail',
- cellClassName: 'mon-checkdetail',
- render: (c) => c.error || `${monitor.check_method || 'GET'} ${monitor.check_target}`,
- },
- ]}
+ columns={checkColumns}
+ footer={<DataTableFooter shown={rows.length} total={rows.length} noun="check" />}
/>
</div>
)}
diff --git a/frontend/src/pages/Monitors.jsx b/frontend/src/pages/Monitors.jsx
index cec00037..a1ee99c6 100644
--- a/frontend/src/pages/Monitors.jsx
+++ b/frontend/src/pages/Monitors.jsx
@@ -14,8 +14,8 @@ import api from '../services/api';
import { useToast } from '../contexts/ToastContext';
import EmptyState from '../components/EmptyState';
import {
- DataTable, Drawer, FilterButton, FilterDrawer, KpiBand, MetricCard, Pill,
- SearchField, Sparkline, countActiveFilters,
+ DataTable, DataTableFooter, Drawer, FilterButton, FilterDrawer, KpiBand,
+ MetricCard, Pill, SearchField, Sparkline, countActiveFilters,
} from '@/components/ds';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -201,6 +201,9 @@ export default function Monitors() {
{
key: 'name',
header: 'Monitor',
+ sortable: true,
+ hideable: false,
+ sortValue: (m) => m.name,
render: (m) => (
<div className="sk-cell-name">
<span className="mon-ico"><Globe size={15} /></span>
@@ -214,11 +217,14 @@ export default function Monitors() {
{
key: 'check_type',
header: 'Type',
+ sortable: true,
render: (m) => <span className="mon-type">{m.check_type}</span>,
},
{
key: 'status',
header: 'Status',
+ sortable: true,
+ sortValue: (m) => monitorStateOf(m).label,
render: (m) => {
const state = monitorStateOf(m);
return <Pill kind={state.tone}>{state.label}</Pill>;
@@ -227,6 +233,8 @@ export default function Monitors() {
{
key: 'response',
header: 'Response',
+ sortable: true,
+ sortValue: (m) => m.last_response_time,
render: (m) => {
if (m.last_response_time == null) return <span className="mon-muted">—</span>;
const slow = m.last_response_time > 300;
@@ -250,11 +258,13 @@ export default function Monitors() {
{
key: 'uptime_30d',
header: 'Uptime (30d)',
+ sortable: true,
render: (m) => <span className="mon-uptime">{formatUptime(m.uptime_30d)}</span>,
},
{
key: 'last_check_at',
header: 'Last check',
+ sortable: true,
render: (m) => (
<span className="mon-muted">{m.is_paused ? 'paused' : relativeTime(m.last_check_at)}</span>
),
@@ -269,6 +279,7 @@ export default function Monitors() {
header: '',
className: 'mon-actions-col',
cellClassName: 'mon-actions-cell',
+ hideable: false,
render: (m) => (
<div className="mon-actions" onClick={(e) => e.stopPropagation()}>
<Button variant="ghost" size="sm" onClick={() => onCheckNow(m)} title="Check now">
@@ -335,12 +346,13 @@ export default function Monitors() {
<div className="mon-card">
<DataTable
tableClassName="sk-dtable monitors-table"
- sortable={false}
+ storageKey="serverkit-table-monitors"
data={monitors}
keyField="id"
columns={columns}
onRowClick={(m) => navigate(`/monitoring/monitors/${m.id}`)}
rowClassName={(m) => (m.is_paused ? 'is-disabled' : undefined)}
+ footer={<DataTableFooter shown={monitors.length} total={monitors.length} noun="monitor" />}
/>
</div>
)}