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
feat(cron,domains): sortable columns, table menus, footers
Juan Denis2fbacb2fd144
diff --git a/frontend/src/pages/CronJobs.jsx b/frontend/src/pages/CronJobs.jsxindex c04c0b92..f0fec3b7 100644--- a/frontend/src/pages/CronJobs.jsx+++ b/frontend/src/pages/CronJobs.jsx@@ -10,7 +10,12 @@ import {} from 'lucide-react';import { Button } from '@/components/ui/button';import { Switch } from '@/components/ui/switch';-import { Pill, SegControl, SearchField, DataTable, Drawer } from '@/components/ds';+import {+ Pill, SegControl, SearchField, DataTable, Drawer,+ SortMenu, ColumnsMenu, DataTableFooter,+} from '@/components/ds';+import { useTableSort } from '@/hooks/useTableSort';+import { useColumnVisibility } from '@/hooks/useColumnVisibility';import SchedulePicker from '../components/SchedulePicker';import PageLayout from '../layouts/PageLayout';@@ -65,6 +70,14 @@ function formatWhen(iso) {return ago ? `${rel} ago` : `in ${rel}`;}+// Sort value for an ISO timestamp: epoch ms, or null (sorts last) when the+// job/run has no usable time.+function timeValue(iso) {+ if (!iso) return null;+ const t = new Date(iso).getTime();+ return Number.isNaN(t) ? null : t;+}+function formatDuration(seconds) {if (seconds == null) return '—';if (seconds < 10) return `${Number(seconds).toFixed(1)}s`;@@ -97,6 +110,12 @@ const CronJobs = () => {const [filter, setFilter] = useState('all');const [search, setSearch] = useState('');+ // Table sort + column visibility (persisted, mirrored by the toolbar menus)+ const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-cronjobs-sort' });+ const { hiddenKeys, toggleColumn, showAllColumns } = useColumnVisibility({+ storageKey: 'serverkit-table-cronjobs-cols',+ });+// Drawer + modal statesconst [drawerJob, setDrawerJob] = useState(null);const [showJobDrawer, setShowJobDrawer] = useState(false);@@ -218,6 +237,110 @@ const CronJobs = () => {? (status?.running ? null : 'cron daemon stopped'): (status?.type === 'serverkit_scheduler' ? 'internal scheduler' : null);+ const jobColumns = [+ {+ key: 'name',+ header: 'Job',+ sortable: true,+ hideable: false,+ sortValue: (job) => (job.name || 'Unnamed job').toLowerCase(),+ render: (job) => (+ <div className="sk-cell-name">+ <span className="cron-ico"><Clock size={15} /></span>+ <div className="cron-jobcell">+ <div className="cron-jobcell__name">+ {job.name || 'Unnamed job'}+ </div>+ <div className="sk-cell-sub cron-jobcell__cmd" title={job.command}>+ {job.command}+ </div>+ </div>+ </div>+ ),+ },+ {+ key: 'schedule',+ header: 'Schedule',+ sortable: true,+ sortValue: (job) => describeSchedule(job),+ render: (job) => (+ <>+ <span className="cron-sched">+ <Clock size={11} />{job.schedule}+ </span>+ <div className="cron-sched-readable">+ {describeSchedule(job)}+ </div>+ </>+ ),+ },+ {+ key: 'last_run',+ header: 'Last run',+ sortable: true,+ sortValue: (job) => timeValue(job.last_run),+ cellClassName: 'cron-cell-mono',+ render: (job) => formatWhen(job.last_run),+ },+ {+ key: 'next_run',+ header: 'Next run',+ cellClassName: 'cron-cell-mono',+ render: (job) => (+ job.enabled ? formatWhen(job.next_run) : 'paused'+ ),+ },+ {+ key: 'status',+ header: 'Status',+ sortable: true,+ sortValue: (job) => jobState(job).label,+ render: (job) => {+ const state = jobState(job);+ return <Pill kind={state.kind}>{state.label}</Pill>;+ },+ },+ {+ key: 'enabled',+ header: 'On',+ hideable: false,+ render: (job) => (+ <span+ className="cron-switch"+ onClick={(e) => e.stopPropagation()}+ role="presentation"+ >+ <Switch+ checked={!!job.enabled}+ onCheckedChange={() => handleToggleJob(job.id, job.enabled)}+ aria-label={job.enabled ? 'Disable job' : 'Enable job'}+ />+ </span>+ ),+ },+ {+ key: 'run',+ header: '',+ hideable: false,+ cellClassName: 'cron-cell-actions',+ render: (job) => (+ <span onClick={(e) => e.stopPropagation()} role="presentation">+ <Button+ variant="outline"+ size="sm"+ onClick={() => handleRunJob(job.id)}+ disabled={runningJobId === job.id}+ title="Run now"+ >+ {runningJobId === job.id+ ? <span className="spinner-inline" />+ : <Play size={14} />}+ </Button>+ </span>+ ),+ },+ ];+return (<PageLayoutclassName="cron-page"@@ -274,6 +397,13 @@ const CronJobs = () => {{shown.length} of {jobs.length} jobs</span><SegControl value={filter} onChange={setFilter} options={filterOptions} />+ <SortMenu columns={jobColumns} sorts={sorts} onChange={setSorts} />+ <ColumnsMenu+ columns={jobColumns}+ hiddenKeys={hiddenKeys}+ onToggle={toggleColumn}+ onShowAll={showAllColumns}+ /></div></div>@@ -285,103 +415,21 @@ const CronJobs = () => {<div className="cron-card"><DataTabletableClassName="sk-dtable cron-table"- sortable={false}data={shown}keyField="id"+ columns={jobColumns}+ sorts={sorts}+ onSortsChange={setSorts}+ hiddenKeys={hiddenKeys}onRowClick={setDrawerJob}rowClassName={(job) => (job.enabled ? undefined : 'is-disabled')}- columns={[- {- key: 'name',- header: 'Job',- render: (job) => (- <div className="sk-cell-name">- <span className="cron-ico"><Clock size={15} /></span>- <div className="cron-jobcell">- <div className="cron-jobcell__name">- {job.name || 'Unnamed job'}- </div>- <div className="sk-cell-sub cron-jobcell__cmd" title={job.command}>- {job.command}- </div>- </div>- </div>- ),- },- {- key: 'schedule',- header: 'Schedule',- render: (job) => (- <>- <span className="cron-sched">- <Clock size={11} />{job.schedule}- </span>- <div className="cron-sched-readable">- {describeSchedule(job)}- </div>- </>- ),- },- {- key: 'last_run',- header: 'Last run',- cellClassName: 'cron-cell-mono',- render: (job) => formatWhen(job.last_run),- },- {- key: 'next_run',- header: 'Next run',- cellClassName: 'cron-cell-mono',- render: (job) => (- job.enabled ? formatWhen(job.next_run) : 'paused'- ),- },- {- key: 'status',- header: 'Status',- render: (job) => {- const state = jobState(job);- return <Pill kind={state.kind}>{state.label}</Pill>;- },- },- {- key: 'enabled',- header: 'On',- render: (job) => (- <span- className="cron-switch"- onClick={(e) => e.stopPropagation()}- role="presentation"- >- <Switch- checked={!!job.enabled}- onCheckedChange={() => handleToggleJob(job.id, job.enabled)}- aria-label={job.enabled ? 'Disable job' : 'Enable job'}- />- </span>- ),- },- {- key: 'run',- header: '',- cellClassName: 'cron-cell-actions',- render: (job) => (- <span onClick={(e) => e.stopPropagation()} role="presentation">- <Button- variant="outline"- size="sm"- onClick={() => handleRunJob(job.id)}- disabled={runningJobId === job.id}- title="Run now"- >- {runningJobId === job.id- ? <span className="spinner-inline" />- : <Play size={14} />}- </Button>- </span>- ),- },- ]}+ footer={(+ <DataTableFooter+ shown={shown.length}+ total={jobs.length}+ noun="job"+ />+ )}/></div>)}@@ -602,18 +650,22 @@ function CronDrawer({ job, isAdmin, running, onClose, onRefresh, onRun, onEdit,<div className="cron-drawer__table"><DataTabletableClassName="sk-dtable"- sortable={false}+ storageKey="serverkit-table-cron-runs"data={runs}keyField="id"columns={[{key: 'when',header: 'When',+ sortable: true,+ sortValue: (r) => timeValue(r.finished_at || r.started_at),render: (r) => formatWhen(r.finished_at || r.started_at),},{key: 'duration',header: 'Duration',+ sortable: true,+ sortValue: (r) => r.duration_seconds,render: (r) => formatDuration(r.duration_seconds),},{@@ -628,6 +680,8 @@ function CronDrawer({ job, isAdmin, running, onClose, onRefresh, onRun, onEdit,{key: 'status',header: 'Status',+ sortable: true,+ sortValue: (r) => r.status,render: (r) => (<Pill kind={r.status === 'success' ? 'green' : 'red'}>{r.status}@@ -635,6 +689,13 @@ function CronDrawer({ job, isAdmin, running, onClose, onRefresh, onRun, onEdit,),},]}+ footer={(+ <DataTableFooter+ shown={runs.length}+ total={runs.length}+ noun="run"+ />+ )}/></div></>diff --git a/frontend/src/pages/Domains.jsx b/frontend/src/pages/Domains.jsxindex ebd76588..ef12afe3 100644--- a/frontend/src/pages/Domains.jsx+++ b/frontend/src/pages/Domains.jsx@@ -16,7 +16,9 @@ import { Checkbox } from '@/components/ui/checkbox';import {Select, SelectTrigger, SelectContent, SelectItem, SelectValue,} from '@/components/ui/select';-import { SegControl, SearchField, Pill, Drawer, DataTable } from '@/components/ds';+import { SegControl, SearchField, Pill, Drawer, DataTable, SortMenu, ColumnsMenu, DataTableFooter } from '@/components/ds';+import { useTableSort } from '@/hooks/useTableSort';+import { useColumnVisibility } from '@/hooks/useColumnVisibility';import { useTopbarActions } from '@/hooks/useTopbarActions';import RegistrarPortfolio from '../components/domains/RegistrarPortfolio';import { ProviderBrandIcon } from '../components/icons/ProviderBrands';@@ -35,6 +37,12 @@ const Domains = () => {const [error, setError] = useState('');const [filter, setFilter] = useState('all');const [search, setSearch] = useState('');++ // Table sort + column visibility (persisted, mirrored by the toolbar menus)+ const { sorts, setSorts } = useTableSort({ storageKey: 'serverkit-table-domains-sort' });+ const { hiddenKeys, toggleColumn, showAllColumns } = useColumnVisibility({+ storageKey: 'serverkit-table-domains-cols',+ });const [drawerDomain, setDrawerDomain] = useState(null);const [regInfo, setRegInfo] = useState(null); // lazy registration lookup for the open drawerconst [searchParams, setSearchParams] = useSearchParams();@@ -302,6 +310,85 @@ const Domains = () => {}}, [loading, searchParams]); // eslint-disable-line react-hooks/exhaustive-deps+ const domainColumns = [+ {+ key: 'name',+ header: 'Domain',+ sortable: true,+ hideable: false,+ sortValue: (d) => norm(d.name),+ render: (d) => (+ <div className="sk-cell-name">+ <span className="dom-fav">+ {d.provider+ ? <ProviderBrandIcon provider={d.provider} size={15} />+ : <Globe size={15} />}+ </span>+ <span>+ {d.name}+ {d.is_primary && <span className="dom-primary">Primary</span>}+ {d.source === 'provider' && d.adopted && <span className="dom-managed">Managed</span>}+ </span>+ </div>+ ),+ },+ {+ key: 'site',+ header: 'Linked site',+ sortable: true,+ sortValue: (d) => (d.application_id ? getAppName(d.application_id) : null),+ render: (d) => (+ d.application_id+ ? <span className="sk-tag">{getAppName(d.application_id)}</span>+ : <span className="dom-dash">—</span>+ ),+ },+ {+ key: 'expiry',+ header: 'Expires',+ sortable: true,+ sortValue: (d) => {+ if (!d.expires_at) return null;+ const t = new Date(d.expires_at).getTime();+ return Number.isNaN(t) ? null : t;+ },+ render: (d) => {+ const exp = formatExpiry(d.expires_at);+ if (!exp) return <span className="dom-dash">—</span>;+ return (+ <span className={`dom-expiry dom-expiry--${exp.tone}`} title={exp.relative}>+ {exp.absolute}+ </span>+ );+ },+ },+ {+ key: 'ssl',+ header: 'SSL',+ sortable: true,+ sortValue: (d) => sslState(d),+ render: (d) => d.source === 'provider' ? <span className="dom-dash">—</span> : sslPill(d),+ },+ {+ key: 'autoRenew',+ header: 'Auto-renew',+ sortable: true,+ sortValue: (d) => (d.auto_renew == null ? null : d.auto_renew ? 1 : 0),+ render: (d) => (+ d.auto_renew == null+ ? <span className="dom-dash">—</span>+ : d.auto_renew ? <Pill kind="green">on</Pill> : <Pill kind="gray">off</Pill>+ ),+ },+ {+ key: 'chevron',+ header: '',+ width: 30,+ hideable: false,+ render: () => <ChevronRight size={16} className="dom-chev" />,+ },+ ];+useTopbarActions(() =><><Button variant="outline" size="sm" onClick={loadData}>@@ -349,6 +436,15 @@ const Domains = () => {onChange={setFilter}options={filterOptions}/>+ <div className="dom-listhead__tools">+ <SortMenu columns={domainColumns} sorts={sorts} onChange={setSorts} />+ <ColumnsMenu+ columns={domainColumns}+ hiddenKeys={hiddenKeys}+ onToggle={toggleColumn}+ onShowAll={showAllColumns}+ />+ </div></div>{portfolioErrors.length > 0 && (@@ -371,72 +467,20 @@ const Domains = () => {<div className="dom-card"><DataTabletableClassName="sk-dtable"- sortable={false}data={shown}keyField="key"+ columns={domainColumns}+ sorts={sorts}+ onSortsChange={setSorts}+ hiddenKeys={hiddenKeys}onRowClick={setDrawerDomain}- columns={[- {- key: 'name',- header: 'Domain',- render: (d) => (- <div className="sk-cell-name">- <span className="dom-fav">- {d.provider- ? <ProviderBrandIcon provider={d.provider} size={15} />- : <Globe size={15} />}- </span>- <span>- {d.name}- {d.is_primary && <span className="dom-primary">Primary</span>}- {d.source === 'provider' && d.adopted && <span className="dom-managed">Managed</span>}- </span>- </div>- ),- },- {- key: 'site',- header: 'Linked site',- render: (d) => (- d.application_id- ? <span className="sk-tag">{getAppName(d.application_id)}</span>- : <span className="dom-dash">—</span>- ),- },- {- key: 'expiry',- header: 'Expires',- render: (d) => {- const exp = formatExpiry(d.expires_at);- if (!exp) return <span className="dom-dash">—</span>;- return (- <span className={`dom-expiry dom-expiry--${exp.tone}`} title={exp.relative}>- {exp.absolute}- </span>- );- },- },- {- key: 'ssl',- header: 'SSL',- render: (d) => d.source === 'provider' ? <span className="dom-dash">—</span> : sslPill(d),- },- {- key: 'autoRenew',- header: 'Auto-renew',- render: (d) => (- d.auto_renew == null- ? <span className="dom-dash">—</span>- : d.auto_renew ? <Pill kind="green">on</Pill> : <Pill kind="gray">off</Pill>- ),- },- {- key: 'chevron',- header: '',- width: 30,- render: () => <ChevronRight size={16} className="dom-chev" />,- },- ]}+ footer={(+ <DataTableFooter+ shown={shown.length}+ total={mergedRows.length}+ noun="domain"+ />+ )}/></div>)}diff --git a/frontend/src/styles/pages/_domains.scss b/frontend/src/styles/pages/_domains.scssindex 9b542769..5e0ba3e2 100644--- a/frontend/src/styles/pages/_domains.scss+++ b/frontend/src/styles/pages/_domains.scss@@ -21,6 +21,13 @@align-items: center;gap: $space-4;margin-bottom: $space-3;++ &__tools {+ display: flex;+ align-items: center;+ gap: $space-2;+ margin-left: auto;+ }}// Table card