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.

refactor(workspaces,dns,packages): move remaining tab tables onto DataTable

Juan Denis1a0ca61c4149
diff --git a/frontend/src/components/domains/DomainDnsPanel.jsx b/frontend/src/components/domains/DomainDnsPanel.jsx
index 759e880b..e5f79943 100644
--- a/frontend/src/components/domains/DomainDnsPanel.jsx
+++ b/frontend/src/components/domains/DomainDnsPanel.jsx
@@ -15,6 +15,7 @@ import DdnsTokenCallout from './DdnsTokenCallout';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import { FormField, FormRow } from '../FormField';
+import { DataTable, DataTableFooter } from '@/components/ds';
import {
Select, SelectTrigger, SelectContent, SelectItem, SelectValue,
} from '@/components/ui/select';
@@ -241,6 +242,110 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
const showActions = isAdmin || records.some((r) => !!hostFor(r));
const canExport = state === 'ready' && records.length > 0 && (isAdmin || !!zoneId);
+ // DataTable columns. Cell markup and classNames mirror the hand-rolled table
+ // they replace, so _domains.scss keeps applying (.ddp__c-*, .ddp__content,
+ // .dns-rtype). The hover titles move from the <td> onto an inner <span>
+ // because DataTable renders the cells.
+ const columns = [
+ {
+ key: 'type',
+ header: 'Type',
+ sortable: true,
+ className: 'ddp__c-type',
+ sortValue: (r) => r.type || '',
+ render: (r) => <span className={`dns-rtype dns-rtype--${(r.type || '').toLowerCase()}`}>{r.type}</span>,
+ },
+ {
+ key: 'name',
+ header: 'Name',
+ sortable: true,
+ hideable: false,
+ className: 'ddp__c-name',
+ cellClassName: 'sk-cell-mono ddp__c-name',
+ sortValue: (r) => r.name || '',
+ render: (r) => <span title={r.name}>{r.name}</span>,
+ },
+ {
+ key: 'content',
+ header: 'Content',
+ sortable: true,
+ cellClassName: 'sk-cell-mono ddp__content',
+ sortValue: (r) => (r.priority ? `${r.priority} ${r.content || ''}` : r.content || ''),
+ render: (r) => (
+ <span title={r.content}>{r.priority ? `${r.priority} ` : ''}{r.content}</span>
+ ),
+ },
+ {
+ key: 'ttl',
+ header: 'TTL',
+ sortable: true,
+ className: 'ddp__c-ttl',
+ cellClassName: 'sk-cell-mono',
+ sortValue: (r) => (r.ttl ?? null),
+ render: (r) => (r.ttl === 1 ? 'Auto' : r.ttl),
+ },
+ ...(isCloudflare ? [{
+ key: 'proxy',
+ header: 'Proxy',
+ sortable: true,
+ className: 'ddp__c-proxy',
+ sortValue: (r) => (r.proxied ? 1 : 0),
+ render: (r) => (r.proxied
+ ? <span className="ddp__proxy ddp__proxy--on"><Cloud size={12} /> Proxied</span>
+ : <span className="ddp__proxy">DNS only</span>),
+ }] : []),
+ ...(canLive ? [{
+ key: 'source',
+ header: 'Source',
+ sortable: true,
+ className: 'ddp__c-src',
+ sortValue: (r) => (r.source === 'serverkit' ? 'ServerKit' : 'External'),
+ render: (r) => (r.source === 'serverkit'
+ ? <span className="ddp__src ddp__src--sk">ServerKit</span>
+ : <span className="ddp__src">External</span>),
+ }] : []),
+ ...(showActions ? [{
+ key: 'actions',
+ header: '',
+ sortable: false,
+ hideable: false,
+ className: 'ddp__c-act',
+ cellClassName: 'ddp__c-act',
+ render: (r) => {
+ const host = hostFor(r);
+ const dynamicable = DYNAMIC_TYPES.includes(r.type);
+ return host ? (
+ <span className="ddp__dynwrap">
+ <span className="ddp__dyn" title={host.last_ip ? `Last IP ${host.last_ip}` : 'No update yet'}>
+ <Radio size={11} /> Dynamic
+ </span>
+ {isAdmin && (
+ <>
+ <Button variant="ghost" size="sm" className="ddp__iconbtn" title="Regenerate token" onClick={() => handleRegenerate(host)}>
+ <RefreshCw size={13} />
+ </Button>
+ <Button variant="ghost" size="sm" className="ddp__stopbtn" title="Disable Dynamic DNS" onClick={() => handleStopDynamic(host)}>
+ Stop
+ </Button>
+ </>
+ )}
+ </span>
+ ) : (
+ isAdmin && dynamicable && (
+ <Button
+ variant="outline"
+ size="sm"
+ onClick={() => handleMakeDynamic(r)}
+ disabled={busyKey === recordFqdn(r)}
+ >
+ <Radio size={13} /> {busyKey === recordFqdn(r) ? 'Enabling…' : 'Make dynamic'}
+ </Button>
+ )
+ );
+ },
+ }] : []),
+ ];
+
return (
<div className="ddp">
<div className="ddp__head">
@@ -324,77 +429,15 @@ export default function DomainDnsPanel({ domain, isAdmin }) {
records.length === 0 ? (
<p className="ddp__msg">No DNS records yet.</p>
) : (
- <div className="ddp__table-wrap">
- <table className="sk-dtable ddp__table">
- <thead>
- <tr>
- <th className="ddp__c-type">Type</th>
- <th className="ddp__c-name">Name</th>
- <th>Content</th>
- <th className="ddp__c-ttl">TTL</th>
- {isCloudflare && <th className="ddp__c-proxy">Proxy</th>}
- {canLive && <th className="ddp__c-src">Source</th>}
- {showActions && <th className="ddp__c-act" />}
- </tr>
- </thead>
- <tbody>
- {records.map((r) => {
- const host = hostFor(r);
- const dynamicable = DYNAMIC_TYPES.includes(r.type);
- return (
- <tr key={r.id}>
- <td><span className={`dns-rtype dns-rtype--${(r.type || '').toLowerCase()}`}>{r.type}</span></td>
- <td className="sk-cell-mono ddp__c-name" title={r.name}>{r.name}</td>
- <td className="sk-cell-mono ddp__content" title={r.content}>{r.priority ? `${r.priority} ` : ''}{r.content}</td>
- <td className="sk-cell-mono">{r.ttl === 1 ? 'Auto' : r.ttl}</td>
- {isCloudflare && (
- <td>{r.proxied
- ? <span className="ddp__proxy ddp__proxy--on"><Cloud size={12} /> Proxied</span>
- : <span className="ddp__proxy">DNS only</span>}</td>
- )}
- {canLive && (
- <td>{r.source === 'serverkit'
- ? <span className="ddp__src ddp__src--sk">ServerKit</span>
- : <span className="ddp__src">External</span>}</td>
- )}
- {showActions && (
- <td className="ddp__c-act">
- {host ? (
- <span className="ddp__dynwrap">
- <span className="ddp__dyn" title={host.last_ip ? `Last IP ${host.last_ip}` : 'No update yet'}>
- <Radio size={11} /> Dynamic
- </span>
- {isAdmin && (
- <>
- <Button variant="ghost" size="sm" className="ddp__iconbtn" title="Regenerate token" onClick={() => handleRegenerate(host)}>
- <RefreshCw size={13} />
- </Button>
- <Button variant="ghost" size="sm" className="ddp__stopbtn" title="Disable Dynamic DNS" onClick={() => handleStopDynamic(host)}>
- Stop
- </Button>
- </>
- )}
- </span>
- ) : (
- isAdmin && dynamicable && (
- <Button
- variant="outline"
- size="sm"
- onClick={() => handleMakeDynamic(r)}
- disabled={busyKey === recordFqdn(r)}
- >
- <Radio size={13} /> {busyKey === recordFqdn(r) ? 'Enabling…' : 'Make dynamic'}
- </Button>
- )
- )}
- </td>
- )}
- </tr>
- );
- })}
- </tbody>
- </table>
- </div>
+ <DataTable
+ columns={columns}
+ data={records}
+ keyField="id"
+ storageKey="serverkit-table-domain-dns"
+ className="ddp__table-wrap"
+ tableClassName="ddp__table"
+ footer={<DataTableFooter shown={records.length} total={records.length} noun="record" />}
+ />
)
)}
diff --git a/frontend/src/components/service-detail/PackagesTab.jsx b/frontend/src/components/service-detail/PackagesTab.jsx
index fa08990f..1573efc3 100644
--- a/frontend/src/components/service-detail/PackagesTab.jsx
+++ b/frontend/src/components/service-detail/PackagesTab.jsx
@@ -4,6 +4,30 @@ import { useToast } from '../../contexts/ToastContext';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
import EmptyState from '../EmptyState';
+import { DataTable, DataTableFooter } from '@/components/ds';
+
+// DataTable columns. Cell markup and classNames are identical to the
+// hand-rolled table they replace, so _service-detail.scss keeps applying
+// (.sk-cell-mono, .svc-pkg-name).
+const PACKAGE_COLUMNS = [
+ {
+ key: 'name',
+ header: 'Package',
+ sortable: true,
+ hideable: false,
+ cellClassName: 'sk-cell-mono svc-pkg-name',
+ sortValue: (pkg) => pkg.name || '',
+ render: (pkg) => pkg.name,
+ },
+ {
+ key: 'version',
+ header: 'Version',
+ sortable: true,
+ cellClassName: 'sk-cell-mono',
+ sortValue: (pkg) => pkg.version || '',
+ render: (pkg) => pkg.version,
+ },
+];
const PackagesTab = ({ appId }) => {
const toast = useToast();
@@ -79,24 +103,16 @@ const PackagesTab = ({ appId }) => {
</Button>
</form>
- <div className="svc-card">
- <table className="sk-dtable">
- <thead>
- <tr>
- <th>Package</th>
- <th>Version</th>
- </tr>
- </thead>
- <tbody>
- {packages.map(pkg => (
- <tr key={pkg.name}>
- <td className="sk-cell-mono svc-pkg-name">{pkg.name}</td>
- <td className="sk-cell-mono">{pkg.version}</td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
+ <DataTable
+ columns={PACKAGE_COLUMNS}
+ data={packages}
+ keyField="name"
+ storageKey="serverkit-table-packages"
+ className="svc-card"
+ emptyTitle="No packages"
+ emptyMessage="Install a package above to get started."
+ footer={<DataTableFooter shown={packages.length} total={packages.length} noun="package" />}
+ />
</div>
);
};
diff --git a/frontend/src/components/workspaces/WorkspaceMembersTab.jsx b/frontend/src/components/workspaces/WorkspaceMembersTab.jsx
index e7e0cbfd..4d489dd5 100644
--- a/frontend/src/components/workspaces/WorkspaceMembersTab.jsx
+++ b/frontend/src/components/workspaces/WorkspaceMembersTab.jsx
@@ -1,54 +1,81 @@
-import { Users, Plus } from 'lucide-react';
-import { ServiceTile, Pill } from '@/components/ds';
+import { Plus } from 'lucide-react';
+import { ServiceTile, Pill, DataTable, DataTableFooter } from '@/components/ds';
import { Button } from '@/components/ui/button';
-const WorkspaceMembersTab = ({ wsId, members, allUsers, onAddMember, onRemoveMember }) => (
- <>
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead><tr><th>Member</th><th>Role</th><th style={{ width: 120 }} /></tr></thead>
- <tbody>
- {members.map(m => (
- <tr key={m.id}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={m.username || m.email || '?'} size={30} className="ws-row__av" />
- <div>
- <div>{m.username || m.email}</div>
- {m.username && m.email && <div className="sk-cell-sub">{m.email}</div>}
- </div>
- </div>
- </td>
- <td>
- {m.role === 'owner'
- ? <Pill kind="green">{m.role}</Pill>
- : <span className="sk-tag">{m.role}</span>}
- </td>
- <td>
- {m.role !== 'owner' && (
- <Button size="sm" variant="destructive" onClick={() => onRemoveMember(m.id)}>Remove</Button>
- )}
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
- {allUsers.filter(u => !members.find(m => m.user_id === u.id)).length > 0 && (
- <>
- <div className="ws-pick-label">Add a member</div>
- <div className="ws-pick">
- {allUsers.filter(u => !members.find(m => m.user_id === u.id)).map(u => (
- <div key={u.id} className="ws-pick__item" onClick={() => onAddMember(u.id)}>
- <ServiceTile name={u.username || u.email || '?'} size={24} className="ws-row__av" />
- <span className="ws-pick__name">{u.username || u.email}</span>
- <Plus size={14} className="ws-pick__plus" />
- </div>
- ))}
+const WorkspaceMembersTab = ({ wsId, members, allUsers, onAddMember, onRemoveMember }) => {
+ // DataTable columns. Cell markup and classNames are identical to the
+ // hand-rolled table they replace, so _workspaces.scss keeps applying
+ // (.sk-cell-name, .sk-cell-sub, .ws-row__av).
+ const columns = [
+ {
+ key: 'name',
+ header: 'Member',
+ sortable: true,
+ hideable: false,
+ sortValue: (m) => m.username || m.email || '',
+ render: (m) => (
+ <div className="sk-cell-name">
+ <ServiceTile name={m.username || m.email || '?'} size={30} className="ws-row__av" />
+ <div>
+ <div>{m.username || m.email}</div>
+ {m.username && m.email && <div className="sk-cell-sub">{m.email}</div>}
+ </div>
</div>
- </>
- )}
- </>
-);
+ ),
+ },
+ {
+ key: 'role',
+ header: 'Role',
+ sortable: true,
+ sortValue: (m) => m.role || '',
+ render: (m) => (
+ m.role === 'owner'
+ ? <Pill kind="green">{m.role}</Pill>
+ : <span className="sk-tag">{m.role}</span>
+ ),
+ },
+ {
+ key: 'actions',
+ header: '',
+ width: 120,
+ sortable: false,
+ hideable: false,
+ render: (m) => (
+ m.role !== 'owner' && (
+ <Button size="sm" variant="destructive" onClick={() => onRemoveMember(m.id)}>Remove</Button>
+ )
+ ),
+ },
+ ];
+
+ return (
+ <>
+ <DataTable
+ columns={columns}
+ data={members}
+ keyField="id"
+ storageKey="serverkit-table-ws-members"
+ className="ws-detail__tablecard"
+ emptyTitle="No members"
+ emptyMessage="This workspace has no members yet."
+ footer={<DataTableFooter shown={members.length} total={members.length} noun="member" />}
+ />
+ {allUsers.filter(u => !members.find(m => m.user_id === u.id)).length > 0 && (
+ <>
+ <div className="ws-pick-label">Add a member</div>
+ <div className="ws-pick">
+ {allUsers.filter(u => !members.find(m => m.user_id === u.id)).map(u => (
+ <div key={u.id} className="ws-pick__item" onClick={() => onAddMember(u.id)}>
+ <ServiceTile name={u.username || u.email || '?'} size={24} className="ws-row__av" />
+ <span className="ws-pick__name">{u.username || u.email}</span>
+ <Plus size={14} className="ws-pick__plus" />
+ </div>
+ ))}
+ </div>
+ </>
+ )}
+ </>
+ );
+};
export default WorkspaceMembersTab;
diff --git a/frontend/src/components/workspaces/WorkspaceServersTab.jsx b/frontend/src/components/workspaces/WorkspaceServersTab.jsx
index 82d57e01..3cf590a6 100644
--- a/frontend/src/components/workspaces/WorkspaceServersTab.jsx
+++ b/frontend/src/components/workspaces/WorkspaceServersTab.jsx
@@ -1,6 +1,6 @@
import { useNavigate } from 'react-router-dom';
import { Server, Plus } from 'lucide-react';
-import { ServiceTile, Pill } from '@/components/ds';
+import { ServiceTile, Pill, DataTable, DataTableFooter } from '@/components/ds';
import { Button } from '@/components/ui/button';
import EmptyState from '../EmptyState';
@@ -9,37 +9,61 @@ const SERVER_PILL = { online: 'green', pending: 'amber', offline: 'red' };
const WorkspaceServersTab = ({ wsId, srvIn, srvOut, onMoveServer }) => {
const navigate = useNavigate();
+ // DataTable columns. Cell markup and classNames are identical to the
+ // hand-rolled table they replace, so _workspaces.scss keeps applying
+ // (.sk-cell-name, .sk-cell-sub, .ws-detail__rowactions).
+ const columns = [
+ {
+ key: 'name',
+ header: 'Server',
+ sortable: true,
+ hideable: false,
+ sortValue: (s) => s.name || '',
+ render: (s) => (
+ <div className="sk-cell-name">
+ <ServiceTile name={s.name} size={30} />
+ <div>
+ <div>{s.name}</div>
+ <div className="sk-cell-sub">{s.ip_address || s.hostname || ''}</div>
+ </div>
+ </div>
+ ),
+ },
+ {
+ key: 'status',
+ header: 'Status',
+ sortable: true,
+ sortValue: (s) => s.status || 'unknown',
+ render: (s) => <Pill kind={SERVER_PILL[s.status] || 'gray'}>{s.status || 'unknown'}</Pill>,
+ },
+ {
+ key: 'actions',
+ header: '',
+ width: 160,
+ sortable: false,
+ hideable: false,
+ render: (s) => (
+ <div className="ws-detail__rowactions" onClick={e => e.stopPropagation()}>
+ <Button size="sm" variant="destructive" onClick={() => onMoveServer(s.id, null)}>Remove</Button>
+ </div>
+ ),
+ },
+ ];
+
return (
<>
{srvIn.length === 0 ? (
<EmptyState icon={Server} title="No servers in this workspace yet" description="Move one in below." />
) : (
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead><tr><th>Server</th><th>Status</th><th style={{ width: 160 }} /></tr></thead>
- <tbody>
- {srvIn.map(s => (
- <tr key={s.id} className="is-clickable" onClick={() => navigate(`/servers/${s.id}`)}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={s.name} size={30} />
- <div>
- <div>{s.name}</div>
- <div className="sk-cell-sub">{s.ip_address || s.hostname || ''}</div>
- </div>
- </div>
- </td>
- <td><Pill kind={SERVER_PILL[s.status] || 'gray'}>{s.status || 'unknown'}</Pill></td>
- <td onClick={e => e.stopPropagation()}>
- <div className="ws-detail__rowactions">
- <Button size="sm" variant="destructive" onClick={() => onMoveServer(s.id, null)}>Remove</Button>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
+ <DataTable
+ columns={columns}
+ data={srvIn}
+ keyField="id"
+ storageKey="serverkit-table-ws-servers"
+ onRowClick={(s) => navigate(`/servers/${s.id}`)}
+ className="ws-detail__tablecard"
+ footer={<DataTableFooter shown={srvIn.length} total={srvIn.length} noun="server" />}
+ />
)}
{srvOut.length > 0 && (
<>
diff --git a/frontend/src/components/workspaces/WorkspaceServicesTab.jsx b/frontend/src/components/workspaces/WorkspaceServicesTab.jsx
index 1907cdab..f4a1fdd6 100644
--- a/frontend/src/components/workspaces/WorkspaceServicesTab.jsx
+++ b/frontend/src/components/workspaces/WorkspaceServicesTab.jsx
@@ -1,6 +1,6 @@
import { useNavigate } from 'react-router-dom';
import { Box, Plus } from 'lucide-react';
-import { ServiceTile, Pill } from '@/components/ds';
+import { ServiceTile, Pill, DataTable, DataTableFooter } from '@/components/ds';
import { Button } from '@/components/ui/button';
import EmptyState from '../EmptyState';
@@ -9,38 +9,62 @@ const APP_PILL = { running: 'green', stopped: 'gray', failed: 'red' };
const WorkspaceServicesTab = ({ wsId, services, appsOut, onMoveApp, onShare }) => {
const navigate = useNavigate();
+ // DataTable columns. Cell markup and classNames are identical to the
+ // hand-rolled table they replace, so _workspaces.scss keeps applying
+ // (.sk-cell-name, .sk-cell-sub, .ws-detail__rowactions).
+ const columns = [
+ {
+ key: 'name',
+ header: 'Service',
+ sortable: true,
+ hideable: false,
+ sortValue: (a) => a.name || '',
+ render: (a) => (
+ <div className="sk-cell-name">
+ <ServiceTile name={a.name} size={30} />
+ <div>
+ <div>{a.name}</div>
+ <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
+ </div>
+ </div>
+ ),
+ },
+ {
+ key: 'status',
+ header: 'Status',
+ sortable: true,
+ sortValue: (a) => a.status || 'unknown',
+ render: (a) => <Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill>,
+ },
+ {
+ key: 'actions',
+ header: '',
+ width: 220,
+ sortable: false,
+ hideable: false,
+ render: (a) => (
+ <div className="ws-detail__rowactions" onClick={e => e.stopPropagation()}>
+ <Button size="sm" variant="outline" onClick={() => onShare(a)}>Share</Button>
+ <Button size="sm" variant="destructive" onClick={() => onMoveApp(a.id, null)}>Remove</Button>
+ </div>
+ ),
+ },
+ ];
+
return (
<>
{services.length === 0 ? (
<EmptyState icon={Box} title="No services in this workspace yet" description="Move one in below." />
) : (
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead><tr><th>Service</th><th>Status</th><th style={{ width: 220 }} /></tr></thead>
- <tbody>
- {services.map(a => (
- <tr key={a.id} className="is-clickable" onClick={() => navigate(`/services/${a.id}`)}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={a.name} size={30} />
- <div>
- <div>{a.name}</div>
- <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
- </div>
- </div>
- </td>
- <td><Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill></td>
- <td onClick={e => e.stopPropagation()}>
- <div className="ws-detail__rowactions">
- <Button size="sm" variant="outline" onClick={() => onShare(a)}>Share</Button>
- <Button size="sm" variant="destructive" onClick={() => onMoveApp(a.id, null)}>Remove</Button>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
+ <DataTable
+ columns={columns}
+ data={services}
+ keyField="id"
+ storageKey="serverkit-table-ws-services"
+ onRowClick={(a) => navigate(`/services/${a.id}`)}
+ className="ws-detail__tablecard"
+ footer={<DataTableFooter shown={services.length} total={services.length} noun="service" />}
+ />
)}
{appsOut.length > 0 && (
<>
diff --git a/frontend/src/components/workspaces/WorkspaceSitesTab.jsx b/frontend/src/components/workspaces/WorkspaceSitesTab.jsx
index 8b056560..438221e1 100644
--- a/frontend/src/components/workspaces/WorkspaceSitesTab.jsx
+++ b/frontend/src/components/workspaces/WorkspaceSitesTab.jsx
@@ -1,6 +1,6 @@
import { useNavigate } from 'react-router-dom';
import { Globe, Plus } from 'lucide-react';
-import { ServiceTile, Pill } from '@/components/ds';
+import { ServiceTile, Pill, DataTable, DataTableFooter } from '@/components/ds';
import { Button } from '@/components/ui/button';
import EmptyState from '../EmptyState';
@@ -9,38 +9,62 @@ const APP_PILL = { running: 'green', stopped: 'gray', failed: 'red' };
const WorkspaceSitesTab = ({ wsId, sites, appsOut, onMoveApp, onShare }) => {
const navigate = useNavigate();
+ // DataTable columns. Cell markup and classNames are identical to the
+ // hand-rolled table they replace, so _workspaces.scss keeps applying
+ // (.sk-cell-name, .sk-cell-sub, .ws-detail__rowactions).
+ const columns = [
+ {
+ key: 'name',
+ header: 'Site',
+ sortable: true,
+ hideable: false,
+ sortValue: (a) => a.name || '',
+ render: (a) => (
+ <div className="sk-cell-name">
+ <ServiceTile name={a.name} size={30} />
+ <div>
+ <div>{a.name}</div>
+ <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
+ </div>
+ </div>
+ ),
+ },
+ {
+ key: 'status',
+ header: 'Status',
+ sortable: true,
+ sortValue: (a) => a.status || 'unknown',
+ render: (a) => <Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill>,
+ },
+ {
+ key: 'actions',
+ header: '',
+ width: 220,
+ sortable: false,
+ hideable: false,
+ render: (a) => (
+ <div className="ws-detail__rowactions" onClick={e => e.stopPropagation()}>
+ <Button size="sm" variant="outline" onClick={() => onShare(a)}>Share</Button>
+ <Button size="sm" variant="destructive" onClick={() => onMoveApp(a.id, null)}>Remove</Button>
+ </div>
+ ),
+ },
+ ];
+
return (
<>
{sites.length === 0 ? (
<EmptyState icon={Globe} title="No sites in this workspace yet" description="Move one in below." />
) : (
- <div className="ws-detail__tablecard">
- <table className="sk-dtable">
- <thead><tr><th>Site</th><th>Status</th><th style={{ width: 220 }} /></tr></thead>
- <tbody>
- {sites.map(a => (
- <tr key={a.id} className="is-clickable" onClick={() => navigate(`/services/${a.id}`)}>
- <td>
- <div className="sk-cell-name">
- <ServiceTile name={a.name} size={30} />
- <div>
- <div>{a.name}</div>
- <div className="sk-cell-sub">{a.app_type}{a.domain ? ` · ${a.domain}` : ''}</div>
- </div>
- </div>
- </td>
- <td><Pill kind={APP_PILL[a.status] || 'amber'}>{a.status || 'unknown'}</Pill></td>
- <td onClick={e => e.stopPropagation()}>
- <div className="ws-detail__rowactions">
- <Button size="sm" variant="outline" onClick={() => onShare(a)}>Share</Button>
- <Button size="sm" variant="destructive" onClick={() => onMoveApp(a.id, null)}>Remove</Button>
- </div>
- </td>
- </tr>
- ))}
- </tbody>
- </table>
- </div>
+ <DataTable
+ columns={columns}
+ data={sites}
+ keyField="id"
+ storageKey="serverkit-table-ws-sites"
+ onRowClick={(a) => navigate(`/services/${a.id}`)}
+ className="ws-detail__tablecard"
+ footer={<DataTableFooter shown={sites.length} total={sites.length} noun="site" />}
+ />
)}
{appsOut.length > 0 && (
<>