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(datatable): row grouping, keyboard nav, native selection
Juan Denis99dbef56add6
diff --git a/frontend/src/components/ds/DataTable.jsx b/frontend/src/components/ds/DataTable.jsxindex 756efb16..9a0d44ad 100644--- a/frontend/src/components/ds/DataTable.jsx+++ b/frontend/src/components/ds/DataTable.jsx@@ -1,5 +1,5 @@-import { useMemo } from 'react';-import { ChevronUp, ChevronDown } from 'lucide-react';+import { useEffect, useMemo, useRef, useState } from 'react';+import { ChevronUp, ChevronDown, ChevronRight } from 'lucide-react';import {Table,TableBody,@@ -8,6 +8,7 @@ import {TableHeader,TableRow,} from '@/components/ui/table';+import { Checkbox } from '@/components/ui/checkbox';import { cn } from '@/lib/utils';import { applyTableSorts, nextSorts, useTableSort } from '@/hooks/useTableSort';import { useColumnVisibility } from '@/hooks/useColumnVisibility';@@ -23,12 +24,24 @@ import EmptyState from '../EmptyState';* Column visibility works the same way via `hiddenKeys` + `onHiddenKeysChange`* and ds/ColumnsMenu. `storageKey` persists both to localStorage.*+ * Grouping: pass `groupBy` (a column key) — rows collapse under sticky group+ * headers with counts. Columns opt in with `groupable: true` and may define+ * `groupValue(row)` / `groupLabel(value, rows)`. Pair with ds/GroupMenu.+ *+ * Selection: `selectable` + controlled `selectedKeys` / `onToggleRow` /+ * `onToggleAll` renders a real checkbox column (header box goes+ * indeterminate when partially selected).+ *+ * Keyboard nav: `keyboardNav` adds a row cursor — j/k (or arrows) move,+ * Enter triggers onRowClick, x toggles the cursor row's selection. Keys are+ * ignored while typing in a field or while a dialog holds focus.+ ** Example:* <DataTable* columns={[* { key: 'name', header: 'Server', sortable: true, hideable: false,* render: s => <ServerCell server={s} /> },- * { key: 'status', header: 'Status', sortable: true,+ * { key: 'status', header: 'Status', sortable: true, groupable: true,* render: s => <Pill kind={s.status}>{s.status}</Pill> },* { key: 'actions', header: '', className: 'text-right', sortable: false,* hideable: false, render: s => <Actions server={s} /> },@@ -36,6 +49,7 @@ import EmptyState from '../EmptyState';* data={servers}* keyField="id"* storageKey="serverkit-table-servers"+ * keyboardNav* footer={<DataTableFooter shown={rows.length} total={rows.length} />}* emptyTitle="No servers"* emptyMessage="Add your first server to start monitoring."@@ -54,6 +68,16 @@ export function DataTable({onSortsChange,// Controlled column visibility (optional).hiddenKeys: controlledHiddenKeys,+ // Grouping (optional; controlled via groupBy + onGroupByChange).+ groupBy: controlledGroupBy,+ onGroupByChange,+ // Selection (optional, controlled).+ selectable = false,+ selectedKeys,+ onToggleRow,+ onToggleAll,+ // j/k/Enter/x row cursor.+ keyboardNav = false,storageKey,emptyState,emptyTitle = 'No results',@@ -82,6 +106,9 @@ export function DataTable({});const hiddenKeys = controlledHiddenKeys ?? internalCols.hiddenKeys;+ const [internalGroupBy, setInternalGroupBy] = useState(null);+ const groupBy = controlledGroupBy !== undefined ? controlledGroupBy : internalGroupBy;+const visibleColumns = useMemo(() => columns.filter((c) => !hiddenKeys.includes(c.key)),[columns, hiddenKeys],@@ -92,6 +119,89 @@ export function DataTable({[data, sorts, sortable, columns],);+ // ---- grouping ----------------------------------------------------------+ const groupColumn = useMemo(+ () => columns.find((c) => c.key === groupBy && c.groupable),+ [columns, groupBy],+ );+ const groups = useMemo(() => {+ if (!groupColumn) return null;+ const getValue = groupColumn.groupValue || ((row) => row[groupColumn.key]);+ const byKey = new Map();+ for (const row of sortedData) {+ const value = getValue(row);+ const key = value == null || value === '' ? '__none__' : String(value);+ if (!byKey.has(key)) byKey.set(key, { key, value, rows: [] });+ byKey.get(key).rows.push(row);+ }+ // Group order follows the sorted data (first appearance), so the active+ // sort decides which group leads; the "no value" group always trails.+ const ordered = [...byKey.values()];+ ordered.sort((a, b) => (a.key === '__none__') - (b.key === '__none__'));+ return ordered;+ }, [sortedData, groupColumn]);+ const [collapsedGroups, setCollapsedGroups] = useState(() => new Set());+ const toggleGroup = (key) => setCollapsedGroups((prev) => {+ const next = new Set(prev);+ if (next.has(key)) next.delete(key);+ else next.add(key);+ return next;+ });++ // Rows in display order (groups expanded) — the cursor space for keyboardNav.+ const flatRows = useMemo(() => {+ if (!groups) return sortedData;+ return groups.flatMap((g) => (collapsedGroups.has(g.key) ? [] : g.rows));+ }, [groups, sortedData, collapsedGroups]);+ const rowIndexByKey = useMemo(() => {+ const map = new Map();+ flatRows.forEach((row, index) => {+ const key = typeof keyField === 'function' ? keyField(row) : row[keyField];+ map.set(key, index);+ });+ return map;+ }, [flatRows, keyField]);++ // ---- keyboard navigation ----------------------------------------------+ const [cursor, setCursor] = useState(-1);+ const wrapRef = useRef(null);++ useEffect(() => {+ if (!keyboardNav) return undefined;+ const onKey = (event) => {+ const target = event.target;+ if (target instanceof Element && target.closest('input, textarea, select, [contenteditable="true"], [role="dialog"]')) {+ return;+ }+ if (event.metaKey || event.ctrlKey || event.altKey) return;+ const rowCount = flatRows.length;+ if (!rowCount) return;+ if (event.key === 'j' || event.key === 'ArrowDown') {+ event.preventDefault();+ setCursor((c) => Math.min(c + 1, rowCount - 1));+ } else if (event.key === 'k' || event.key === 'ArrowUp') {+ event.preventDefault();+ setCursor((c) => Math.max(c - 1, 0));+ } else if (event.key === 'Enter' && cursor >= 0 && onRowClick) {+ event.preventDefault();+ onRowClick(flatRows[cursor]);+ } else if (event.key === 'x' && selectable && cursor >= 0) {+ event.preventDefault();+ const row = flatRows[cursor];+ const key = typeof keyField === 'function' ? keyField(row) : row[keyField];+ onToggleRow?.(key, !selectedKeys?.includes(key));+ }+ };+ document.addEventListener('keydown', onKey);+ return () => document.removeEventListener('keydown', onKey);+ }, [keyboardNav, flatRows, cursor, onRowClick, selectable, selectedKeys, onToggleRow, keyField]);++ // Keep the cursor row on screen.+ useEffect(() => {+ if (cursor < 0 || !wrapRef.current) return;+ wrapRef.current.querySelector('tr.is-cursor')?.scrollIntoView({ block: 'nearest' });+ }, [cursor]);+const handleHeaderClick = (event, column) => {if (!sortable || !column.sortable) return;toggleSort(column.key, event.shiftKey);@@ -107,12 +217,77 @@ export function DataTable({}const multiSort = sorts.length > 1;+ const columnCount = visibleColumns.length + (selectable ? 1 : 0);++ const allSelected = selectable && flatRows.length > 0 && flatRows.every((row) => {+ const key = typeof keyField === 'function' ? keyField(row) : row[keyField];+ return selectedKeys?.includes(key);+ });+ const someSelected = selectable && !allSelected && flatRows.some((row) => {+ const key = typeof keyField === 'function' ? keyField(row) : row[keyField];+ return selectedKeys?.includes(key);+ });++ const renderDataRow = (row) => {+ const key = typeof keyField === 'function' ? keyField(row) : row[keyField];+ const computedRowClass = typeof rowClassName === 'function'+ ? rowClassName(row)+ : rowClassName;+ const rowIndex = rowIndexByKey.get(key) ?? -1;+ const isSelected = selectable && selectedKeys?.includes(key);++ if (renderRow) {+ return renderRow(row, { key, className: computedRowClass });+ }++ return (+ <TableRow+ key={key}+ className={cn(+ computedRowClass,+ onRowClick && 'is-clickable',+ isSelected && 'is-selected',+ keyboardNav && rowIndex === cursor && 'is-cursor',+ )}+ onClick={onRowClick ? () => onRowClick(row) : undefined}+ >+ {selectable && (+ <TableCell className="sk-dtable__check" onClick={(e) => e.stopPropagation()}>+ <Checkbox+ checked={isSelected}+ onCheckedChange={(checked) => onToggleRow?.(key, !!checked)}+ aria-label="Select row"+ />+ </TableCell>+ )}+ {visibleColumns.map((column) => (+ <TableCell+ key={`${key}-${column.key}`}+ className={column.cellClassName}+ >+ {column.render+ ? column.render(row)+ : row[column.key]}+ </TableCell>+ ))}+ </TableRow>+ );+ };return (- <div className={cn('sk-dtable-wrap', className)}>+ <div className={cn('sk-dtable-wrap', className)} ref={wrapRef}><Table className={cn('sk-dtable', tableClassName)}><TableHeader><TableRow>+ {selectable && (+ <TableHead className="sk-dtable__check">+ <Checkbox+ checked={allSelected ? true : someSelected ? 'indeterminate' : false}+ onCheckedChange={(checked) => onToggleAll?.(!!checked)}+ aria-label="Select all rows"+ />+ </TableHead>+ )}{visibleColumns.map((column) => {const sortIndex = sorts.findIndex((s) => s.key === column.key);const isSorted = sortIndex !== -1;@@ -159,38 +334,30 @@ export function DataTable({</TableRow></TableHeader><TableBody>- {sortedData.map((row) => {- const key = typeof keyField === 'function' ? keyField(row) : row[keyField];- const computedRowClass = typeof rowClassName === 'function'- ? rowClassName(row)- : rowClassName;-- if (renderRow) {- return renderRow(row, { key, className: computedRowClass });- }-- return (- <TableRow- key={key}- className={cn(- computedRowClass,- onRowClick && 'is-clickable'- )}- onClick={onRowClick ? () => onRowClick(row) : undefined}- >- {visibleColumns.map((column) => (- <TableCell- key={`${key}-${column.key}`}- className={column.cellClassName}- >- {column.render- ? column.render(row)- : row[column.key]}+ {groups+ ? groups.map((group) => {+ const isCollapsed = collapsedGroups.has(group.key);+ const label = groupColumn.groupLabel+ ? groupColumn.groupLabel(group.value, group.rows)+ : (group.value ?? 'None');+ return [+ <TableRow+ key={`group-${group.key}`}+ className={cn('sk-dtable__group', isCollapsed && 'is-collapsed')}+ onClick={() => toggleGroup(group.key)}+ >+ <TableCell colSpan={columnCount}>+ <span className="sk-dtable__group-inner">+ <ChevronRight size={14} className="sk-dtable__group-chev" />+ <span className="sk-dtable__group-label">{label}</span>+ <span className="sk-dtable__group-count">{group.rows.length}</span>+ </span></TableCell>- ))}- </TableRow>- );- })}+ </TableRow>,+ ...(isCollapsed ? [] : group.rows.map(renderDataRow)),+ ];+ })+ : sortedData.map(renderDataRow)}</TableBody></Table>{footer}diff --git a/frontend/src/components/ds/GroupMenu.jsx b/frontend/src/components/ds/GroupMenu.jsxnew file mode 100644index 00000000..4691b933--- /dev/null+++ b/frontend/src/components/ds/GroupMenu.jsx@@ -0,0 +1,58 @@+import { Group } from 'lucide-react';+import { Button } from '@/components/ui/button';+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';+import { cn } from '@/lib/utils';++// Toolbar popover for row grouping (Huly/Frappe "Group by"). Lists the+// table's groupable columns plus "No grouping"; the trigger shows the active+// grouping. Pair with DataTable's groupBy prop.+//+// <GroupMenu columns={columns} groupBy={groupBy} onChange={setGroupBy} />+export function GroupMenu({ columns = [], groupBy = null, onChange, className }) {+ const groupable = columns.filter((c) => c.groupable);+ if (!groupable.length) return null;++ const labelFor = (column) => (+ typeof column.header === 'string' && column.header ? column.header : column.key+ );+ const active = groupable.find((c) => c.key === groupBy);++ return (+ <Popover>+ <PopoverTrigger asChild>+ <Button+ variant="outline"+ size="sm"+ className={cn('sk-filter-btn', active && 'sk-filter-btn--active', className)}+ >+ <Group aria-hidden="true" />+ {active ? labelFor(active) : 'Group'}+ </Button>+ </PopoverTrigger>+ <PopoverContent align="end" className="sk-tablemenu">+ <div className="sk-tablemenu__title">Group by</div>+ <div className="sk-tablemenu__list">+ <button+ type="button"+ className={cn('sk-tablemenu__item', !active && 'is-on')}+ onClick={() => onChange?.(null)}+ >+ No grouping+ </button>+ {groupable.map((column) => (+ <button+ key={column.key}+ type="button"+ className={cn('sk-tablemenu__item', active?.key === column.key && 'is-on')}+ onClick={() => onChange?.(column.key)}+ >+ {labelFor(column)}+ </button>+ ))}+ </div>+ </PopoverContent>+ </Popover>+ );+}++export default GroupMenu;diff --git a/frontend/src/components/ds/index.js b/frontend/src/components/ds/index.jsindex 03b48876..1174525e 100644--- a/frontend/src/components/ds/index.js+++ b/frontend/src/components/ds/index.js@@ -25,5 +25,6 @@ export { ColumnsMenu } from './ColumnsMenu';export { DataTableFooter } from './DataTableFooter';export { ViewMenu } from './ViewMenu';export { ListToolbar } from './ListToolbar';+export { GroupMenu } from './GroupMenu';export { ResourceCard, ResourceList } from './ResourceCard';export { svcGrad, initials, gaugeColor } from './utils';diff --git a/frontend/src/styles/components/_design-system.scss b/frontend/src/styles/components/_design-system.scssindex 777f3959..31983aa5 100644--- a/frontend/src/styles/components/_design-system.scss+++ b/frontend/src/styles/components/_design-system.scss@@ -386,6 +386,59 @@ $sk-tones: ('accent', 'green', 'cyan', 'amber', 'red', 'violet');opacity: 0.85;transform: translateY(-3px);}++ // Native selection column (selectable tables).+ &__check { width: 36px; padding-right: 0 !important; }++ // Keyboard-nav cursor row (j/k). Distinct from hover: it follows the keys,+ // not the mouse.+ tbody tr.is-cursor {+ background: var(--accent-bg-soft);+ box-shadow: inset 2px 0 0 var(--accent-bright);+ }++ // Group header row (groupBy). Click collapses/expands the group.+ &__group {+ cursor: pointer;+ user-select: none;++ td {+ padding: 7px 16px !important;+ background: var(--surface-2);+ border-bottom: 1px solid var(--border-soft);+ }++ &:hover td { background: var(--surface-3); }+ }++ &__group-inner { display: inline-flex; align-items: center; gap: 7px; }++ &__group-chev {+ color: var(--text-faint);+ transition: transform 0.14s;+ transform: rotate(90deg);++ .is-collapsed & { transform: rotate(0deg); }+ }++ &__group-label {+ font-family: var(--mono);+ font-size: 10.5px;+ font-weight: 600;+ letter-spacing: 0.06em;+ text-transform: uppercase;+ color: var(--text-dim);+ }++ &__group-count {+ font-family: var(--mono);+ font-size: 10px;+ color: var(--text-faint);+ background: var(--surface);+ border: 1px solid var(--border-soft);+ border-radius: 999px;+ padding: 1px 7px;+ }}.sk-dtable-wrap { overflow-x: auto; }@@ -497,6 +550,8 @@ $sk-tones: ('accent', 'green', 'cyan', 'amber', 'red', 'violet');&:hover { background: var(--surface-2); color: var(--text); }+ &.is-on { color: var(--accent-bright); font-weight: 550; }+&--toggle svg { color: var(--text-faint); flex-shrink: 0; }&--toggle.is-off { color: var(--text-faint); }}@@ -647,6 +702,16 @@ $sk-tones: ('accent', 'green', 'cyan', 'amber', 'red', 'violet');// adds view rows (apply / default-star / delete) plus the save-current form.// ------------------------------------------------------------.sk-viewmenu {+ // "Modified" dot on the trigger when the live state differs from the view.+ &__dot {+ width: 7px;+ height: 7px;+ border-radius: 999px;+ background: var(--amber);+ margin-left: 2px;+ flex-shrink: 0;+ }+&__row {display: flex;align-items: center;@@ -711,6 +776,9 @@ $sk-tones: ('accent', 'green', 'cyan', 'amber', 'red', 'violet');}&__update {+ display: flex;+ justify-content: flex-end;+ gap: 4px;padding: 6px 2px 2px;border-top: 1px solid var(--border-soft);margin-top: 4px;