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(jobs,telemetry): standard table footer replaces ad-hoc pagers

Juan Denis11460670e9a4
diff --git a/frontend/src/pages/Jobs.jsx b/frontend/src/pages/Jobs.jsx
index d0cc3aa1..9bc173d5 100644
--- a/frontend/src/pages/Jobs.jsx
+++ b/frontend/src/pages/Jobs.jsx
@@ -12,10 +12,10 @@
// Wired to the real ApiService job methods (see frontend/src/services/api/jobs.js).
import { useState, useEffect, useCallback, useRef } from 'react';
import { useLocation, useNavigate } from 'react-router-dom';
-import { ListChecks, RefreshCw, RotateCcw, XCircle, Play, Clock, ChevronLeft, ChevronRight } from 'lucide-react';
+import { ListChecks, RefreshCw, RotateCcw, XCircle, Play, Clock } from 'lucide-react';
import api from '../services/api';
import {
- MetricCard, KpiBand, Pill, DataTable, SegControl,
+ MetricCard, KpiBand, Pill, DataTable, DataTableFooter, SegControl,
SearchField, FilterDrawer, FilterButton, countActiveFilters,
} from '@/components/ds';
import { Button } from '@/components/ui/button';
@@ -178,8 +178,7 @@ export default function Jobs() {
const byStatus = stats?.by_status || {};
const hasFilters = Boolean(filters.status || filters.kind || q);
- const hasPrev = page > 0;
- const hasNext = (page + 1) * PAGE_SIZE < total;
+ const totalPages = Math.max(1, Math.ceil(total / PAGE_SIZE));
const kindOptions = kinds
.map((k) => (typeof k === 'string' ? k : k.kind || k.name))
@@ -201,9 +200,9 @@ export default function Jobs() {
];
const jobColumns = [
- { key: 'status', header: 'Status', render: (j) => <Pill kind={statusKind(j.status)}>{j.status}</Pill> },
- { key: 'kind', header: 'Kind', cellClassName: 'sk-jobs__kind', render: (j) => j.kind || '—' },
- { key: 'owner', header: 'Owner', cellClassName: 'sk-jobs__owner', render: ownerLabel },
+ { key: 'status', header: 'Status', sortable: true, render: (j) => <Pill kind={statusKind(j.status)}>{j.status}</Pill> },
+ { key: 'kind', header: 'Kind', sortable: true, cellClassName: 'sk-jobs__kind', render: (j) => j.kind || '—' },
+ { key: 'owner', header: 'Owner', sortable: true, sortValue: (j) => j.owner_type || null, cellClassName: 'sk-jobs__owner', render: ownerLabel },
{
key: 'progress',
header: 'Progress',
@@ -216,7 +215,17 @@ export default function Jobs() {
</>
),
},
- { key: 'when', header: 'When', cellClassName: 'sk-jobs__when', render: (j) => timeAgo(j.created_at || j.updated_at) },
+ {
+ key: 'when',
+ header: 'When',
+ sortable: true,
+ sortValue: (j) => {
+ const stamp = j.created_at || j.updated_at;
+ return stamp ? new Date(stamp).getTime() : null;
+ },
+ cellClassName: 'sk-jobs__when',
+ render: (j) => timeAgo(j.created_at || j.updated_at),
+ },
{
key: 'actions',
header: '',
@@ -240,9 +249,9 @@ export default function Jobs() {
];
const scheduledColumns = [
- { key: 'name', header: 'Name', render: (s) => s.name || s.kind || `#${s.id}` },
- { key: 'kind', header: 'Kind', cellClassName: 'sk-jobs__kind', render: (s) => s.kind || '—' },
- { key: 'schedule', header: 'Schedule', cellClassName: 'sk-jobs__owner', render: (s) => s.schedule || s.cron || (s.interval_seconds ? `every ${s.interval_seconds}s` : '—') },
+ { key: 'name', header: 'Name', sortable: true, sortValue: (s) => s.name || s.kind || null, render: (s) => s.name || s.kind || `#${s.id}` },
+ { key: 'kind', header: 'Kind', sortable: true, cellClassName: 'sk-jobs__kind', render: (s) => s.kind || '—' },
+ { key: 'schedule', header: 'Schedule', sortable: true, sortValue: (s) => s.schedule || s.cron || null, cellClassName: 'sk-jobs__owner', render: (s) => s.schedule || s.cron || (s.interval_seconds ? `every ${s.interval_seconds}s` : '—') },
{ key: 'next', header: 'Next run', cellClassName: 'sk-jobs__when', render: (s) => (s.next_run_at ? timeAgo(s.next_run_at) : '—') },
{ key: 'enabled', header: 'Enabled', render: (s) => <Pill kind={s.enabled ? 'green' : 'gray'}>{s.enabled ? 'On' : 'Off'}</Pill> },
{
@@ -284,7 +293,7 @@ export default function Jobs() {
columns={scheduledColumns}
data={scheduled}
keyField="id"
- sortable={false}
+ storageKey="serverkit-table-jobs-scheduled"
loading={loading && scheduled.length === 0}
emptyState={(
<div className="sk-jobs__empty">
@@ -318,8 +327,18 @@ export default function Jobs() {
columns={jobColumns}
data={jobs}
keyField="id"
- sortable={false}
+ storageKey="serverkit-table-jobs-activity"
loading={loading && jobs.length === 0}
+ footer={(
+ <DataTableFooter
+ shown={jobs.length}
+ total={total}
+ noun="job"
+ page={page + 1}
+ totalPages={totalPages}
+ onPageChange={(next) => setPage(next - 1)}
+ />
+ )}
emptyState={(
<div className="sk-jobs__empty">
<ListChecks size={24} aria-hidden="true" />
@@ -327,18 +346,6 @@ export default function Jobs() {
</div>
)}
/>
-
- {(hasPrev || hasNext) && (
- <div className="sk-jobs__pager">
- <Button variant="outline" size="sm" disabled={!hasPrev} onClick={() => setPage((p) => Math.max(0, p - 1))}>
- <ChevronLeft size={14} /> Prev
- </Button>
- <span className="sk-jobs__pager-label">Page {page + 1}</span>
- <Button variant="outline" size="sm" disabled={!hasNext} onClick={() => setPage((p) => p + 1)}>
- Next <ChevronRight size={14} />
- </Button>
- </div>
- )}
</>
)}
</div>
diff --git a/frontend/src/pages/Telemetry.jsx b/frontend/src/pages/Telemetry.jsx
index 7ac71686..34dc4af7 100644
--- a/frontend/src/pages/Telemetry.jsx
+++ b/frontend/src/pages/Telemetry.jsx
@@ -17,8 +17,8 @@ import {
} from 'lucide-react';
import api from '../services/api';
import {
- DataTable, Drawer, FilterButton, FilterDrawer, KpiBand, MetricCard, Pill,
- SearchField, countActiveFilters,
+ DataTable, DataTableFooter, Drawer, FilterButton, FilterDrawer, KpiBand,
+ MetricCard, Pill, SearchField, countActiveFilters,
} from '@/components/ds';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -202,6 +202,11 @@ export default function Telemetry() {
{
key: 'severity',
header: 'Severity',
+ sortable: true,
+ sortValue: (event) => {
+ const rank = SEVERITY_ORDER.indexOf(event.severity);
+ return rank === -1 ? null : rank;
+ },
render: (event) => {
const config = SEVERITY_CONFIG[event.severity] || SEVERITY_CONFIG.info;
return <Pill kind={config.pill}>{config.label}</Pill>;
@@ -210,6 +215,8 @@ export default function Telemetry() {
{
key: 'message',
header: 'Event',
+ sortable: true,
+ sortValue: (event) => event.message || event.event_type || null,
render: (event) => (
<div className="telemetry-cell">
<div className="telemetry-cell__message">{event.message || event.event_type}</div>
@@ -248,6 +255,8 @@ export default function Telemetry() {
{
key: 'timestamp',
header: 'When',
+ sortable: true,
+ sortValue: (event) => (event.timestamp ? new Date(event.timestamp).getTime() : null),
cellClassName: 'telemetry-cell__when',
render: (event) => new Date(event.timestamp).toLocaleString(),
},
@@ -335,26 +344,28 @@ export default function Telemetry() {
<>
<DataTable
tableClassName="sk-dtable telemetry-table"
- sortable={false}
+ storageKey="serverkit-table-telemetry"
data={events}
keyField="id"
loading={loading && events.length === 0}
onRowClick={setSelectedEvent}
rowClassName={(event) => `is-${event.severity}`}
columns={columns}
+ footer={(
+ <DataTableFooter
+ shown={events.length}
+ total={null}
+ noun="event"
+ hasMore={hasMore}
+ onLoadMore={() => fetchEvents(page + 1, false)}
+ loading={loading}
+ />
+ )}
/>
{loading && events.length > 0 && (
<div className="telemetry-loading"><Loader2 size={20} className="spin" /></div>
)}
-
- {hasMore && !loading && (
- <div className="telemetry-more">
- <Button variant="outline" onClick={() => fetchEvents(page + 1, false)}>
- Load more
- </Button>
- </div>
- )}
</>
)}
diff --git a/frontend/src/styles/pages/_jobs.scss b/frontend/src/styles/pages/_jobs.scss
index 31b2ae3a..dbd38484 100644
--- a/frontend/src/styles/pages/_jobs.scss
+++ b/frontend/src/styles/pages/_jobs.scss
@@ -1,8 +1,8 @@
// Jobs page (plan 39) — host-idiom table-with-search, the /servers–/domains
// pattern. Most weight is carried by shared primitives: .sk-dtable (DataTable),
// .sk-kpiband (KpiBand), .sk-seg (SegControl) and the global .search-box. This
-// file only lays out the page shell, the command bar, pagination, the
-// scheduled-jobs section, and the row cell tints.
+// file only lays out the page shell, the command bar, the scheduled-jobs
+// section, and the row cell tints (pagination is the shared DataTableFooter).
// The page shell (.page-container in Jobs.jsx) handles max-width + centering and
// .main-content supplies the outer padding — matching /cron and /domains — so
@@ -61,17 +61,6 @@
white-space: nowrap;
}
-// ── Pagination ──────────────────────────────────────────────────────────
-.sk-jobs__pager {
- display: flex;
- align-items: center;
- justify-content: flex-end;
- gap: $space-3;
- margin-top: $space-4;
-
- &-label { color: $text-tertiary; font-size: $font-size-sm; }
-}
-
.sk-jobs__empty {
display: flex;
flex-direction: column;
diff --git a/frontend/src/styles/pages/_telemetry.scss b/frontend/src/styles/pages/_telemetry.scss
index 3fc351e5..baa0b1a3 100644
--- a/frontend/src/styles/pages/_telemetry.scss
+++ b/frontend/src/styles/pages/_telemetry.scss
@@ -79,8 +79,7 @@
tr.is-warning { box-shadow: inset 3px 0 0 var(--amber); }
tr.is-debug { opacity: 0.72; }
- .telemetry-loading,
- .telemetry-more {
+ .telemetry-loading {
display: flex;
justify-content: center;
padding: 18px 0;