Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(frontend): r6-m1 keep table headers mounted

Josuéd6a092736a97
diff --git a/control-ui/app/outputs/page.tsx b/control-ui/app/outputs/page.tsx
index 4d21f4dde..c379607cf 100644
--- a/control-ui/app/outputs/page.tsx
+++ b/control-ui/app/outputs/page.tsx
@@ -2,14 +2,18 @@
import React, { useEffect, useMemo, useState } from 'react'
import { useParams } from 'next/navigation'
-import { DataTable, TableHeaderCell, useTableSort } from '@clerum/frontend-table-system'
+import {
+ DataTable,
+ TableHeaderCell,
+ TableStateRow,
+ useTableSort,
+} from '@clerum/frontend-table-system'
import { CONTROL_ROUTES } from '@constants/routes'
import { AuthGate } from '../../components/AuthGate'
import { DashboardLayout } from '../../components/DashboardLayout'
import { RowActionsMenu } from '../../components/RowActionsMenu'
import { SectionSearchInput } from '../../components/SectionSearchInput'
import { IconOutputs } from '../../components/Sidebar/icons'
-import { SkeletonTableRows } from '../../components/SkeletonTableRows'
import { TabBar } from '../../components/TabBar'
import { TablePanelHeader } from '../../components/TablePanelHeader'
import { IconRefresh } from '../../components/icons'
@@ -35,30 +39,6 @@ function formatBytes(bytes: number): string {
return `${value.toFixed(i === 0 ? 0 : 1)} ${units[i]}`
}
-function OutputsSkeletonTable({ headers }: { headers: string[] }) {
- return (
- <div
- className="eft-table-viewport cu-table-wrap"
- role="status"
- aria-label="Loading outputs"
- aria-live="polite"
- >
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- {headers.map(header => (
- <th key={header}>{header}</th>
- ))}
- </tr>
- </thead>
- <tbody>
- <SkeletonTableRows columns={headers.length} />
- </tbody>
- </DataTable>
- </div>
- )
-}
-
function OutputsPageContent() {
const params = useParams<{ tab?: string }>()
const [loading, setLoading] = useState(true)
@@ -272,42 +252,45 @@ function OutputsPageContent() {
<div className="cu-card__body cu-outputs-content">
{activeTab === 'workflow' ? (
- showInitialLoading ? (
- <OutputsSkeletonTable
- headers={['File', 'Format', 'Recipe', 'Run', 'Completed', 'Action']}
- />
- ) : filteredWorkflowOutputs.length === 0 ? (
- <div className="cu-empty">
- {normalizedSearch
- ? 'No workflow artifacts match this search.'
- : 'No workflow artifacts found. Run a plugin with document generation tools to see outputs here.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- {(
- [
- ['file', 'File'],
- ['format', 'Format'],
- ['recipe', 'Recipe'],
- ['run', 'Run'],
- ['completed', 'Completed'],
- ] as const
- ).map(([key, label]) => (
- <TableHeaderCell
- activeDirection={workflowSort.key === key ? workflowSort.direction : null}
- key={key}
- label={label}
- onSort={() => workflowSort.sortBy(key)}
- />
- ))}
- <TableHeaderCell label="Actions" />
- </tr>
- </thead>
- <tbody>
- {workflowSort.sortedRows.map(output => (
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <tr>
+ {(
+ [
+ ['file', 'File'],
+ ['format', 'Format'],
+ ['recipe', 'Recipe'],
+ ['run', 'Run'],
+ ['completed', 'Completed'],
+ ] as const
+ ).map(([key, label]) => (
+ <TableHeaderCell
+ activeDirection={workflowSort.key === key ? workflowSort.direction : null}
+ key={key}
+ label={label}
+ onSort={() => workflowSort.sortBy(key)}
+ />
+ ))}
+ <TableHeaderCell label="Actions" />
+ </tr>
+ </thead>
+ <tbody>
+ {showInitialLoading ? (
+ <TableStateRow colSpan={6} kind="loading" message="Loading recipe artifacts…" />
+ ) : error && filteredWorkflowOutputs.length === 0 ? (
+ <TableStateRow colSpan={6} kind="error" message={error} />
+ ) : filteredWorkflowOutputs.length === 0 ? (
+ <TableStateRow
+ colSpan={6}
+ message={
+ normalizedSearch
+ ? 'No workflow artifacts match this search.'
+ : 'No workflow artifacts found. Run a plugin with document generation tools to see outputs here.'
+ }
+ />
+ ) : (
+ workflowSort.sortedRows.map(output => (
<tr
key={`${output.namespace}-${output.recipeName}-${output.runId}-${output.fileName}`}
>
@@ -349,100 +332,101 @@ function OutputsPageContent() {
/>
</td>
</tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- )
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
) : (
- <>
- {showInitialLoading ? (
- <OutputsSkeletonTable
- headers={['File', 'Format', 'Size', 'Host', 'Created', 'Action']}
- />
- ) : filteredChatArtifacts.length === 0 ? (
- <div className="cu-empty">
- {normalizedSearch
- ? 'No desktop app artifacts match this search.'
- : 'No desktop app artifacts found. Use internal tools (`clerum__generate_pdf`, etc.) during chat to generate files.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- {(
- [
- ['file', 'File'],
- ['format', 'Format'],
- ['size', 'Size'],
- ['host', 'Host'],
- ['created', 'Created'],
- ] as const
- ).map(([key, label]) => (
- <TableHeaderCell
- activeDirection={
- artifactSort.key === key ? artifactSort.direction : null
- }
- key={key}
- label={label}
- onSort={() => artifactSort.sortBy(key)}
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <tr>
+ {(
+ [
+ ['file', 'File'],
+ ['format', 'Format'],
+ ['size', 'Size'],
+ ['host', 'Host'],
+ ['created', 'Created'],
+ ] as const
+ ).map(([key, label]) => (
+ <TableHeaderCell
+ activeDirection={artifactSort.key === key ? artifactSort.direction : null}
+ key={key}
+ label={label}
+ onSort={() => artifactSort.sortBy(key)}
+ />
+ ))}
+ <TableHeaderCell label="Actions" />
+ </tr>
+ </thead>
+ <tbody>
+ {showInitialLoading ? (
+ <TableStateRow
+ colSpan={6}
+ kind="loading"
+ message="Loading desktop app artifacts…"
+ />
+ ) : error && filteredChatArtifacts.length === 0 ? (
+ <TableStateRow colSpan={6} kind="error" message={error} />
+ ) : filteredChatArtifacts.length === 0 ? (
+ <TableStateRow
+ colSpan={6}
+ message={
+ normalizedSearch
+ ? 'No desktop app artifacts match this search.'
+ : 'No desktop app artifacts found. Use internal tools (`clerum__generate_pdf`, etc.) during chat to generate files.'
+ }
+ />
+ ) : (
+ artifactSort.sortedRows.map(artifact => (
+ <tr key={`${artifact.hostRef}-${artifact.fileName}-${artifact.createdAt}`}>
+ <td style={{ fontFamily: 'monospace', fontSize: 13 }}>
+ {artifact.fileName}
+ </td>
+ <td>
+ <span
+ style={{
+ display: 'inline-block',
+ padding: '2px 8px',
+ borderRadius: 4,
+ fontSize: 11,
+ fontWeight: 600,
+ background: 'var(--cu-bg-elevated)',
+ color: getFormatColor(artifact.format),
+ border: '1px solid var(--cu-border-subtle)',
+ }}
+ >
+ {artifact.format.toUpperCase()}
+ </span>
+ </td>
+ <td style={{ fontSize: 13, color: 'var(--cu-text-muted)' }}>
+ {artifact.sizeBytes > 0 ? formatBytes(artifact.sizeBytes) : '—'}
+ </td>
+ <td style={{ fontSize: 13 }}>{artifact.hostRef}</td>
+ <td style={{ fontSize: 13, color: 'var(--cu-text-muted)' }}>
+ {artifact.createdAt ? new Date(artifact.createdAt).toLocaleString() : '—'}
+ </td>
+ <td className="cu-table__cell-actions">
+ <RowActionsMenu
+ ariaLabel={`Actions for desktop artifact ${artifact.fileName}`}
+ horizontalTrigger
+ actions={[
+ {
+ key: 'download',
+ label: 'Download',
+ onClick: () => void downloadChatArtifact(artifact),
+ },
+ ]}
/>
- ))}
- <TableHeaderCell label="Actions" />
+ </td>
</tr>
- </thead>
- <tbody>
- {artifactSort.sortedRows.map(artifact => (
- <tr key={`${artifact.hostRef}-${artifact.fileName}-${artifact.createdAt}`}>
- <td style={{ fontFamily: 'monospace', fontSize: 13 }}>
- {artifact.fileName}
- </td>
- <td>
- <span
- style={{
- display: 'inline-block',
- padding: '2px 8px',
- borderRadius: 4,
- fontSize: 11,
- fontWeight: 600,
- background: 'var(--cu-bg-elevated)',
- color: getFormatColor(artifact.format),
- border: '1px solid var(--cu-border-subtle)',
- }}
- >
- {artifact.format.toUpperCase()}
- </span>
- </td>
- <td style={{ fontSize: 13, color: 'var(--cu-text-muted)' }}>
- {artifact.sizeBytes > 0 ? formatBytes(artifact.sizeBytes) : '—'}
- </td>
- <td style={{ fontSize: 13 }}>{artifact.hostRef}</td>
- <td style={{ fontSize: 13, color: 'var(--cu-text-muted)' }}>
- {artifact.createdAt
- ? new Date(artifact.createdAt).toLocaleString()
- : '—'}
- </td>
- <td className="cu-table__cell-actions">
- <RowActionsMenu
- ariaLabel={`Actions for desktop artifact ${artifact.fileName}`}
- horizontalTrigger
- actions={[
- {
- key: 'download',
- label: 'Download',
- onClick: () => void downloadChatArtifact(artifact),
- },
- ]}
- />
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
- </>
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
)}
</div>
</div>
diff --git a/control-ui/components/CodexSubscriptionHub/index.tsx b/control-ui/components/CodexSubscriptionHub/index.tsx
index 977b12cbd..7cdc513ac 100644
--- a/control-ui/components/CodexSubscriptionHub/index.tsx
+++ b/control-ui/components/CodexSubscriptionHub/index.tsx
@@ -1,7 +1,12 @@
'use client'
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { DataTable, TableHeaderCell, useTableSort } from '@clerum/frontend-table-system'
+import {
+ DataTable,
+ TableHeaderCell,
+ TableStateRow,
+ useTableSort,
+} from '@clerum/frontend-table-system'
import { copyTextToClipboard } from '@lib/clipboard'
import {
CODEX_DEVICE_VERIFICATION_URI,
@@ -452,63 +457,47 @@ export function CodexSubscriptionHub() {
</div>
) : null}
- {initialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- <TableHeaderCell label="Name" />
- <TableHeaderCell label="Status" />
- <th style={{ width: '8rem', textAlign: 'right' }} aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {Array.from({ length: 3 }).map((_, idx) => (
- <tr key={idx}>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '55%' }} />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '40%' }} />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '4rem' }} />
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- ) : filtered.length === 0 ? (
- <div className="cu-empty">
- {searchQuery.trim()
- ? 'No ChatGPT subscriptions match this search.'
- : 'No ChatGPT subscriptions found.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- <TableHeaderCell
- activeDirection={
- subscriptionSort.key === 'name' ? subscriptionSort.direction : null
- }
- label="Name"
- onSort={() => subscriptionSort.sortBy('name')}
- />
- <TableHeaderCell
- activeDirection={
- subscriptionSort.key === 'status' ? subscriptionSort.direction : null
- }
- label="Status"
- onSort={() => subscriptionSort.sortBy('status')}
- />
- <th style={{ width: '8rem', textAlign: 'right' }} aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {subscriptionSort.sortedRows.map(row => {
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <tr>
+ <TableHeaderCell
+ activeDirection={
+ subscriptionSort.key === 'name' ? subscriptionSort.direction : null
+ }
+ label="Name"
+ onSort={() => subscriptionSort.sortBy('name')}
+ />
+ <TableHeaderCell
+ activeDirection={
+ subscriptionSort.key === 'status' ? subscriptionSort.direction : null
+ }
+ label="Status"
+ onSort={() => subscriptionSort.sortBy('status')}
+ />
+ <th style={{ width: '8rem', textAlign: 'right' }} aria-label="Actions" />
+ </tr>
+ </thead>
+ <tbody>
+ {initialLoad ? (
+ <TableStateRow
+ colSpan={3}
+ kind="loading"
+ message="Loading ChatGPT subscriptions…"
+ />
+ ) : error && filtered.length === 0 ? (
+ <TableStateRow colSpan={3} kind="error" message={error} />
+ ) : filtered.length === 0 ? (
+ <TableStateRow
+ colSpan={3}
+ message={
+ searchQuery.trim()
+ ? 'No ChatGPT subscriptions match this search.'
+ : 'No ChatGPT subscriptions found.'
+ }
+ />
+ ) : (
+ subscriptionSort.sortedRows.map(row => {
const mapped = mapConnectionStatus(row.status)
return (
<tr key={row.connectionKey}>
@@ -538,11 +527,11 @@ export function CodexSubscriptionHub() {
</td>
</tr>
)
- })}
- </tbody>
- </DataTable>
- </div>
- )}
+ })
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
{creating || editing ? (
<div
diff --git a/control-ui/components/CommunicationChannelsTable.tsx b/control-ui/components/CommunicationChannelsTable.tsx
index 17cf90695..c47f25da3 100644
--- a/control-ui/components/CommunicationChannelsTable.tsx
+++ b/control-ui/components/CommunicationChannelsTable.tsx
@@ -1,7 +1,7 @@
'use client'
import { useMemo, useState } from 'react'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import {
COMMUNICATION_CHANNEL_PROVIDERS,
type CommunicationChannelProvider,
@@ -13,7 +13,6 @@ import { useConfirmDialog } from './ConfirmDialog'
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconBroadcast } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
import { TablePanelHeader } from './TablePanelHeader'
@@ -237,29 +236,27 @@ export function CommunicationChannelsTable({
{error}
</div>
) : null}
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={columns.length} rows={3} />
- </tbody>
- </DataTable>
- </div>
- ) : filteredRows.length === 0 ? (
- <div className="cu-empty">
- {normalizedSearch ? 'No channels match this search.' : 'No resources found.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- {channelSort.sortedRows.map(({ key, item }) => {
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={columns} />
+ </thead>
+ <tbody>
+ {isInitialLoad ? (
+ <TableStateRow
+ colSpan={columns.length}
+ kind="loading"
+ message="Loading communication channels…"
+ />
+ ) : filteredRows.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={
+ normalizedSearch ? 'No channels match this search.' : 'No resources found.'
+ }
+ />
+ ) : (
+ channelSort.sortedRows.map(({ key, item }) => {
const name = item.metadata?.name || '-'
const spec = item.spec || {}
const configuredProviderTypes = configuredProviders(item)
@@ -321,11 +318,11 @@ export function CommunicationChannelsTable({
</td>
</TableRow>
)
- })}
- </tbody>
- </DataTable>
- </div>
- )}
+ })
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
{confirmDialog}
</>
diff --git a/control-ui/components/ContextTable.tsx b/control-ui/components/ContextTable.tsx
index f8660be08..991812ada 100644
--- a/control-ui/components/ContextTable.tsx
+++ b/control-ui/components/ContextTable.tsx
@@ -1,12 +1,11 @@
'use client'
import React, { useMemo, useState } from 'react'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { ContextResource } from '../lib/api'
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconGroupWork } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
import { TablePanelHeader } from './TablePanelHeader'
@@ -140,29 +139,25 @@ export function ContextTable({
</>
}
/>
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={contextColumns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={contextColumns.length} rows={4} />
- </tbody>
- </DataTable>
- </div>
- ) : filteredRows.length === 0 ? (
- <div className="cu-empty">
- {normalizedSearch ? 'No contexts match this search.' : 'No contexts found.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={contextColumns} />
- </thead>
- <tbody>
- {contextSort.sortedRows.map(({ key, name, displayName, item, mcpServers }) => (
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={contextColumns} />
+ </thead>
+ <tbody>
+ {isInitialLoad ? (
+ <TableStateRow
+ colSpan={contextColumns.length}
+ kind="loading"
+ message="Loading contexts…"
+ />
+ ) : filteredRows.length === 0 ? (
+ <TableStateRow
+ colSpan={contextColumns.length}
+ message={normalizedSearch ? 'No contexts match this search.' : 'No contexts found.'}
+ />
+ ) : (
+ contextSort.sortedRows.map(({ key, name, displayName, item, mcpServers }) => (
<TableRow
key={key}
className="cu-table__row cu-table__row--clickable"
@@ -207,11 +202,11 @@ export function ContextTable({
</div>
</td>
</TableRow>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
)
}
diff --git a/control-ui/components/ControlAdminsPanel/index.tsx b/control-ui/components/ControlAdminsPanel/index.tsx
index 3ab993309..fe63447d0 100644
--- a/control-ui/components/ControlAdminsPanel/index.tsx
+++ b/control-ui/components/ControlAdminsPanel/index.tsx
@@ -2,11 +2,15 @@
import { useEffect, useMemo, useState } from 'react'
import { useRouter } from 'next/navigation'
-import { DataTable, TableHeaderCell, useTableSort } from '@clerum/frontend-table-system'
+import {
+ DataTable,
+ TableHeaderCell,
+ TableStateRow,
+ useTableSort,
+} from '@clerum/frontend-table-system'
import { useAuth } from '@components/AuthContext'
import { useConfirmDialog } from '@components/ConfirmDialog'
import { RowActionsMenu } from '@components/RowActionsMenu'
-import { SkeletonTableRows } from '@components/SkeletonTableRows'
import { useToast } from '@components/Toast'
import { IconAlertTriangle } from '@components/icons'
import { CONTROL_ROUTES } from '@constants/routes'
@@ -355,74 +359,77 @@ export function ControlAdminsPanel({
return (
<div className="cu-profile-section">
{error ? <div className="cu-banner cu-banner--error">{error}</div> : null}
- {loading || filteredInvitations.length > 0 ? (
- <div className="eft-table-viewport cu-table-wrap cu-table-wrap--border-top">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- <TableHeaderCell
- activeDirection={invitationSort.key === 'email' ? invitationSort.direction : null}
- label="Pending invitation"
- onSort={() => invitationSort.sortBy('email')}
- />
- <TableHeaderCell
- activeDirection={
- invitationSort.key === 'status' ? invitationSort.direction : null
- }
- label="Status"
- onSort={() => invitationSort.sortBy('status')}
- />
- <TableHeaderCell
- activeDirection={
- invitationSort.key === 'expires' ? invitationSort.direction : null
- }
- label="Expires"
- onSort={() => invitationSort.sortBy('expires')}
- />
- <TableHeaderCell
- activeDirection={
- invitationSort.key === 'created' ? invitationSort.direction : null
- }
- label="Created"
- onSort={() => invitationSort.sortBy('created')}
- />
- <th aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {loading ? (
- <SkeletonTableRows columns={5} rows={2} />
- ) : (
- invitationSort.sortedRows.map(invitation => (
- <tr key={invitation.id}>
- <td>{invitation.email}</td>
- <td>{invitation.status}</td>
- <td>{formatDate(invitation.expiresAt)}</td>
- <td>{formatDate(invitation.createdAt)}</td>
- <td className="cu-table__cell-actions">
- <RowActionsMenu
- ariaLabel={`Actions for invitation ${invitation.email}`}
- actions={[
- {
- key: 'cancel',
- label:
- cancellingInvitationId === invitation.id
- ? 'Canceling…'
- : 'Cancel invitation',
- disabled: cancellingInvitationId === invitation.id,
- onClick: () => void handleCancelInvitation(invitation),
- danger: true,
- },
- ]}
- />
- </td>
- </tr>
- ))
- )}
- </tbody>
- </DataTable>
- </div>
- ) : null}
+ <div className="eft-table-viewport cu-table-wrap cu-table-wrap--border-top">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <tr>
+ <TableHeaderCell
+ activeDirection={invitationSort.key === 'email' ? invitationSort.direction : null}
+ label="Pending invitation"
+ onSort={() => invitationSort.sortBy('email')}
+ />
+ <TableHeaderCell
+ activeDirection={invitationSort.key === 'status' ? invitationSort.direction : null}
+ label="Status"
+ onSort={() => invitationSort.sortBy('status')}
+ />
+ <TableHeaderCell
+ activeDirection={invitationSort.key === 'expires' ? invitationSort.direction : null}
+ label="Expires"
+ onSort={() => invitationSort.sortBy('expires')}
+ />
+ <TableHeaderCell
+ activeDirection={invitationSort.key === 'created' ? invitationSort.direction : null}
+ label="Created"
+ onSort={() => invitationSort.sortBy('created')}
+ />
+ <th aria-label="Actions" />
+ </tr>
+ </thead>
+ <tbody>
+ {loading ? (
+ <TableStateRow colSpan={5} kind="loading" message="Loading invitations…" />
+ ) : error && filteredInvitations.length === 0 ? (
+ <TableStateRow colSpan={5} kind="error" message={error} />
+ ) : filteredInvitations.length === 0 ? (
+ <TableStateRow
+ colSpan={5}
+ message={
+ normalizedSearch
+ ? 'No pending invitations match this search.'
+ : 'No pending invitations.'
+ }
+ />
+ ) : (
+ invitationSort.sortedRows.map(invitation => (
+ <tr key={invitation.id}>
+ <td>{invitation.email}</td>
+ <td>{invitation.status}</td>
+ <td>{formatDate(invitation.expiresAt)}</td>
+ <td>{formatDate(invitation.createdAt)}</td>
+ <td className="cu-table__cell-actions">
+ <RowActionsMenu
+ ariaLabel={`Actions for invitation ${invitation.email}`}
+ actions={[
+ {
+ key: 'cancel',
+ label:
+ cancellingInvitationId === invitation.id
+ ? 'Canceling…'
+ : 'Cancel invitation',
+ disabled: cancellingInvitationId === invitation.id,
+ onClick: () => void handleCancelInvitation(invitation),
+ danger: true,
+ },
+ ]}
+ />
+ </td>
+ </tr>
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
<div className="eft-table-viewport cu-table-wrap cu-table-wrap--border-top">
<DataTable className="eft-table cu-table cu-table--header-band">
<thead>
@@ -457,7 +464,9 @@ export function ControlAdminsPanel({
</thead>
<tbody>
{loading ? (
- <SkeletonTableRows columns={6} rows={5} />
+ <TableStateRow colSpan={6} kind="loading" message="Loading administrators…" />
+ ) : error && filteredAdmins.length === 0 ? (
+ <TableStateRow colSpan={6} kind="error" message={error} />
) : filteredAdmins.length > 0 ? (
adminSort.sortedRows.map(admin => {
const currentAdmin = isCurrentAdmin(admin)
@@ -575,11 +584,10 @@ export function ControlAdminsPanel({
)
})
) : (
- <tr>
- <td colSpan={6}>
- {normalizedSearch ? 'No admins match this search.' : 'No admins found.'}
- </td>
- </tr>
+ <TableStateRow
+ colSpan={6}
+ message={normalizedSearch ? 'No admins match this search.' : 'No admins found.'}
+ />
)}
</tbody>
</DataTable>
diff --git a/control-ui/components/HostTable.tsx b/control-ui/components/HostTable.tsx
index 053f5024d..3b7294c20 100644
--- a/control-ui/components/HostTable.tsx
+++ b/control-ui/components/HostTable.tsx
@@ -1,14 +1,13 @@
'use client'
import React, { useMemo, useState } from 'react'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { getProviderLabel } from '../lib/llm'
import type { HostItem, HostRef } from './HostTable.types'
import { LlmProviderIcon } from './LlmProviderIcon'
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconRobot } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TableEmptyRow } from './TableEmptyRow'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
@@ -230,24 +229,19 @@ export function HostTable({
</>
}
/>
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={hostColumns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={hostColumns.length} rows={4} />
- </tbody>
- </DataTable>
- </div>
- ) : filteredRows.length === 0 ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={hostColumns} />
- </thead>
- <tbody>
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={hostColumns} />
+ </thead>
+ <tbody>
+ {isInitialLoad ? (
+ <TableStateRow
+ colSpan={hostColumns.length}
+ kind="loading"
+ message="Loading agents…"
+ />
+ ) : filteredRows.length === 0 ? (
<TableEmptyRow
colSpan={hostColumns.length}
message={normalizedSearch ? 'No agents match this search.' : 'No agents found.'}
@@ -257,17 +251,8 @@ export function HostTable({
: undefined
}
/>
- </tbody>
- </DataTable>
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={hostColumns} />
- </thead>
- <tbody>
- {hostSort.sortedRows.map(({ key, namespace, name, displayName, item }) => {
+ ) : (
+ hostSort.sortedRows.map(({ key, namespace, name, displayName, item }) => {
const rawContext = String(item.spec?.contextRef || '').trim()
const contextRef = rawContext || '-'
const contextServers = contextsByRef?.[rawContext]
@@ -346,11 +331,11 @@ export function HostTable({
</td>
</TableRow>
)
- })}
- </tbody>
- </DataTable>
- </div>
- )}
+ })
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
)
}
diff --git a/control-ui/components/LlmDiscoveryPanel/index.tsx b/control-ui/components/LlmDiscoveryPanel/index.tsx
index 2016c677b..399b2ef4d 100644
--- a/control-ui/components/LlmDiscoveryPanel/index.tsx
+++ b/control-ui/components/LlmDiscoveryPanel/index.tsx
@@ -1,10 +1,9 @@
'use client'
import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { DataTable, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { LlmProviderIcon } from '@components/LlmProviderIcon'
import { IconModels } from '@components/Sidebar/icons'
-import { SkeletonTableRows } from '@components/SkeletonTableRows'
import { TableHeaderRow } from '@components/TableHeaderRow'
import type { TableHeaderColumn } from '@components/TableHeaderRow/types'
import { TablePanelHeader } from '@components/TablePanelHeader'
@@ -355,29 +354,25 @@ export function LlmDiscoveryPanel({
</div>
) : null}
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap cu-table-wrap--sticky-header">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={reviewColumns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={reviewColumns.length} rows={4} />
- </tbody>
- </DataTable>
- </div>
- ) : reviewQueue.length === 0 ? (
- <div className="cu-empty">
- No models awaiting review. Sync the catalog to pull newly released models.
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap cu-table-wrap--sticky-header">
- <DataTable className="eft-table cu-table cu-table--header-band cu-llm-review-table">
- <thead>
- <TableHeaderRow columns={reviewColumns} />
- </thead>
- <tbody className="cu-llm-model-group">
- {reviewSort.sortedRows.map(model => (
+ <div className="eft-table-viewport cu-table-wrap cu-table-wrap--sticky-header">
+ <DataTable className="eft-table cu-table cu-table--header-band cu-llm-review-table">
+ <thead>
+ <TableHeaderRow columns={reviewColumns} />
+ </thead>
+ <tbody className="cu-llm-model-group">
+ {isInitialLoad ? (
+ <TableStateRow
+ colSpan={reviewColumns.length}
+ kind="loading"
+ message="Loading discovery review…"
+ />
+ ) : reviewQueue.length === 0 ? (
+ <TableStateRow
+ colSpan={reviewColumns.length}
+ message="No models awaiting review. Sync the catalog to pull newly released models."
+ />
+ ) : (
+ reviewSort.sortedRows.map(model => (
<tr key={model.id} className="cu-table__row cu-llm-model-row">
<td>
<input
@@ -413,11 +408,11 @@ export function LlmDiscoveryPanel({
</button>
</td>
</tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
</>
)
diff --git a/control-ui/components/LlmModelTable.tsx b/control-ui/components/LlmModelTable.tsx
index 4920c9b0e..64263c81a 100644
--- a/control-ui/components/LlmModelTable.tsx
+++ b/control-ui/components/LlmModelTable.tsx
@@ -1,7 +1,7 @@
'use client'
import React, { useEffect, useMemo, useState } from 'react'
-import { DataTable, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import type { LlmAllowedModel } from '@lib/api'
import { catalogGroupKey, formatContextWindow, getProviderDisplayLabel } from '@lib/llm'
import { isUnpricedAllowedModel } from '@lib/llmModelUnpriced'
@@ -12,7 +12,6 @@ import { MissingPriceWarning } from './MissingPriceWarning'
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconModels } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
import { TablePanelHeader } from './TablePanelHeader'
@@ -292,31 +291,29 @@ export function LlmModelTable({
}
/>
{navigation}
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap cu-table-wrap--sticky-header">
- <DataTable className="eft-table cu-table cu-table--header-band cu-llm-model-table">
- <thead>
- <TableHeaderRow columns={modelColumns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={modelColumns.length} rows={4} />
- </tbody>
- </DataTable>
- </div>
- ) : filteredItems.length === 0 ? (
- <div className="cu-empty">
- {hasActiveFilter
- ? 'No models match this filter.'
- : 'No models in the allowlist yet. Add one to let agents and runtime use it.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap cu-table-wrap--sticky-header">
- <DataTable className="eft-table cu-table cu-table--header-band cu-llm-model-table">
- <thead>
- <TableHeaderRow columns={modelColumns} />
- </thead>
- <tbody className="cu-llm-model-group">
- {modelSort.sortedRows.map((model: DisplayModel) => (
+ <div className="eft-table-viewport cu-table-wrap cu-table-wrap--sticky-header">
+ <DataTable className="eft-table cu-table cu-table--header-band cu-llm-model-table">
+ <thead>
+ <TableHeaderRow columns={modelColumns} />
+ </thead>
+ <tbody className="cu-llm-model-group">
+ {isInitialLoad ? (
+ <TableStateRow
+ colSpan={modelColumns.length}
+ kind="loading"
+ message="Loading models…"
+ />
+ ) : filteredItems.length === 0 ? (
+ <TableStateRow
+ colSpan={modelColumns.length}
+ message={
+ hasActiveFilter
+ ? 'No models match this filter.'
+ : 'No models in the allowlist yet. Add one to let agents and runtime use it.'
+ }
+ />
+ ) : (
+ modelSort.sortedRows.map((model: DisplayModel) => (
<tr key={model.id} className="cu-table__row cu-llm-model-row">
<td>
<span className="cu-inline-icon-label">
@@ -425,11 +422,11 @@ export function LlmModelTable({
/>
</td>
</tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
)
}
diff --git a/control-ui/components/LlmPriceTable.tsx b/control-ui/components/LlmPriceTable.tsx
index 64439ecfe..5bfbd3522 100644
--- a/control-ui/components/LlmPriceTable.tsx
+++ b/control-ui/components/LlmPriceTable.tsx
@@ -1,7 +1,7 @@
'use client'
import React, { useMemo, useState } from 'react'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import type { LlmModelPrice, UnpricedModel } from '@lib/api'
import { getProviderDisplayLabel } from '@lib/llm'
import type { LlmPriceTableProps } from './LlmPriceTable.types'
@@ -10,7 +10,6 @@ import { MissingPriceWarning } from './MissingPriceWarning'
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconPrice } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
import { TablePanelHeader } from './TablePanelHeader'
@@ -189,31 +188,25 @@ export function LlmPriceTable({
</>
}
/>
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={columns.length} rows={4} />
- </tbody>
- </DataTable>
- </div>
- ) : visibleRowCount === 0 ? (
- <div className="cu-empty">
- {normalizedSearch
- ? 'No prices match this search.'
- : 'No model prices configured yet. Add one to start tracking cost.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- {tableSort.sortedRows.map(row => {
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={columns} />
+ </thead>
+ <tbody>
+ {isInitialLoad ? (
+ <TableStateRow colSpan={columns.length} kind="loading" message="Loading prices…" />
+ ) : visibleRowCount === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={
+ normalizedSearch
+ ? 'No prices match this search.'
+ : 'No model prices configured yet. Add one to start tracking cost.'
+ }
+ />
+ ) : (
+ tableSort.sortedRows.map(row => {
if (row.kind === 'missing') {
const { item } = row
const label = item.provider
@@ -337,11 +330,11 @@ export function LlmPriceTable({
</td>
</TableRow>
)
- })}
- </tbody>
- </DataTable>
- </div>
- )}
+ })
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
)
}
diff --git a/control-ui/components/MarketplaceOrgImages/index.tsx b/control-ui/components/MarketplaceOrgImages/index.tsx
index 22e5a7bf9..654d3fa67 100644
--- a/control-ui/components/MarketplaceOrgImages/index.tsx
+++ b/control-ui/components/MarketplaceOrgImages/index.tsx
@@ -1,10 +1,9 @@
'use client'
import { useCallback, useEffect, useState } from 'react'
-import { DataTable, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { CONTROL_ROUTES } from '@constants/routes'
import { type OrgImage, listOrgImages } from '../../lib/api'
-import { RetryBanner } from '../PublisherView/RetryBanner'
import {
DEFAULT_REGISTRY_HOST,
buildImageCoordinate,
@@ -100,56 +99,74 @@ export function MarketplaceOrgImages({ orgScope }: { orgScope: string }) {
}
/>
<div className="cu-card__body">
- {view.kind === 'loading' ? <p>Loading your images…</p> : null}
- {view.kind === 'error' ? (
- <RetryBanner message="Could not load your images." onRetry={() => void load()} />
- ) : null}
- {view.kind === 'unavailable' ? (
- <p className="cu-banner cu-banner--info">
- Image listing isn’t available on this registry yet. Your pushed images still work —
- the list will appear here once the registry exposes it.
- </p>
- ) : null}
-
- {view.kind === 'ready' && rows.length === 0 ? (
- <p>
- No images yet. Push a connector or plugin image under{' '}
- <code>
- {DEFAULT_REGISTRY_HOST}/{namespace}/
- </code>{' '}
- and it appears here.
- </p>
- ) : null}
-
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table">
+ <thead>
+ <TableHeaderRow columns={columns} />
+ </thead>
+ <tbody>
+ {view.kind === 'loading' ? (
+ <TableStateRow
+ colSpan={columns.length}
+ kind="loading"
+ message="Loading images…"
+ />
+ ) : view.kind === 'error' ? (
+ <TableStateRow
+ action={
+ <button
+ type="button"
+ className="cu-btn cu-btn--ghost cu-btn--sm"
+ onClick={() => void load()}
+ >
+ Retry
+ </button>
+ }
+ colSpan={columns.length}
+ kind="error"
+ message="Could not load your images."
+ />
+ ) : view.kind === 'unavailable' ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message="Image listing isn’t available on this registry yet. Your pushed images still work."
+ />
+ ) : rows.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={
+ <>
+ No images yet. Push a connector or plugin image under{' '}
+ <code>
+ {DEFAULT_REGISTRY_HOST}/{namespace}/
+ </code>{' '}
+ and it appears here.
+ </>
+ }
+ />
+ ) : (
+ imageSort.sortedRows.map(r => (
+ <tr key={`${r.name}:${r.tag}`}>
+ <td>
+ <code>{r.name}</code>
+ </td>
+ <td>{r.tag}</td>
+ <td>
+ <code>
+ {buildImageCoordinate(DEFAULT_REGISTRY_HOST, orgScope, r.name, r.tag)}
+ </code>
+ </td>
+ </tr>
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
{view.kind === 'ready' && rows.length > 0 ? (
- <>
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- {imageSort.sortedRows.map(r => (
- <tr key={`${r.name}:${r.tag}`}>
- <td>
- <code>{r.name}</code>
- </td>
- <td>{r.tag}</td>
- <td>
- <code>
- {buildImageCoordinate(DEFAULT_REGISTRY_HOST, orgScope, r.name, r.tag)}
- </code>
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- <p className="cu-muted-note cu-muted-note--spaced">
- A push can still be rejected if the credential lacks publish permission or the org
- has reached its image quota — those surface at push time.
- </p>
- </>
+ <p className="cu-muted-note cu-muted-note--spaced">
+ A push can still be rejected if the credential lacks publish permission or the org has
+ reached its image quota — those surface at push time.
+ </p>
) : null}
</div>
</div>
diff --git a/control-ui/components/ProfileAdminHome.tsx b/control-ui/components/ProfileAdminHome.tsx
index 6b1b25089..2ade664a9 100644
--- a/control-ui/components/ProfileAdminHome.tsx
+++ b/control-ui/components/ProfileAdminHome.tsx
@@ -2,7 +2,7 @@
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useRouter } from 'next/navigation'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { CONTROL_ROUTES } from '@constants/routes'
import {
AdminPendingInvitationListItem,
@@ -27,7 +27,6 @@ import type { ProfileAdminHomeProps, ProfileAdminTab } from './ProfileAdminHome.
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconShield, IconUsers } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TabBar } from './TabBar'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
@@ -572,35 +571,231 @@ export function ProfileAdminHome({ activeTab, highlightedAdminId = '' }: Profile
onLoadingChange={handleAdminLoadingChange}
/>
) : activeTab === 'teams' ? (
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={teamColumns} />
+ </thead>
+ <tbody>
+ {busy && !loaded ? (
+ <TableStateRow
+ colSpan={teamColumns.length}
+ kind="loading"
+ message="Loading teams…"
+ />
+ ) : error && filteredTeams.length === 0 ? (
+ <TableStateRow colSpan={teamColumns.length} kind="error" message={error} />
+ ) : filteredTeams.length === 0 ? (
+ <TableStateRow
+ colSpan={teamColumns.length}
+ message={
+ teamSearchInput.trim() ? 'No teams match this search.' : 'No teams yet.'
+ }
+ />
+ ) : (
+ teamSort.sortedRows.map(team => (
+ <TableRow
+ key={team.id}
+ className="cu-table__row cu-table__row--clickable"
+ onNavigate={() => openTeam(team)}
+ aria-label={`Open team ${team.name}`}
+ >
+ <td>
+ <button
+ type="button"
+ className="cu-link"
+ onClick={event => {
+ event.stopPropagation()
+ openTeam(team)
+ }}
+ onKeyDown={event => event.stopPropagation()}
+ >
+ {team.name}
+ </button>
+ </td>
+ <td
+ style={{
+ fontVariantNumeric: 'tabular-nums',
+ color: 'var(--cu-text-muted)',
+ textAlign: 'right',
+ }}
+ >
+ {team.memberCount}
+ </td>
+ <td
+ style={{
+ fontVariantNumeric: 'tabular-nums',
+ color: 'var(--cu-text-muted)',
+ textAlign: 'right',
+ }}
+ >
+ {teamAgentCounts[team.id] ?? 0}
+ </td>
+ <td
+ style={{
+ fontVariantNumeric: 'tabular-nums',
+ color: 'var(--cu-text-muted)',
+ textAlign: 'right',
+ }}
+ >
+ {teamContextCounts[team.id] ?? 0}
+ </td>
+ <td className="cu-table__cell-actions">
+ <RowActionsMenu
+ ariaLabel={`Actions for team ${team.name}`}
+ horizontalTrigger
+ actions={[
+ {
+ key: 'view',
+ label: 'View team details',
+ onClick: () => openTeam(team),
+ },
+ {
+ key: 'delete',
+ label: 'Delete',
+ danger: true,
+ disabled: busy && !loaded,
+ onClick: () => {
+ setDeleteDialogError('')
+ setTeamToDelete(team)
+ },
+ },
+ ]}
+ />
+ </td>
+ </TableRow>
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
+ ) : (
<>
- {busy && !loaded ? (
+ <div className="cu-profile-section">
+ <p className="cu-profile-section__label">Pending invitations</p>
<div className="eft-table-viewport cu-table-wrap">
<DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
<thead>
- <TableHeaderRow columns={teamColumns} />
+ <tr>
+ <th>Team</th>
+ <th>Email</th>
+ <th className="cu-table__col-role">Role</th>
+ <th className="cu-table__col-date">Invited</th>
+ <th className="cu-table__col-actions" aria-label="Actions" />
+ </tr>
</thead>
<tbody>
- <SkeletonTableRows columns={5} rows={5} />
+ {busy && !loaded ? (
+ <TableStateRow
+ colSpan={5}
+ kind="loading"
+ message="Loading pending invitations…"
+ />
+ ) : error && filteredPendingInvitations.length === 0 ? (
+ <TableStateRow colSpan={5} kind="error" message={error} />
+ ) : filteredPendingInvitations.length === 0 ? (
+ <TableStateRow
+ colSpan={5}
+ message={
+ searchInput.trim()
+ ? 'No pending invitations match this search.'
+ : 'No pending invitations.'
+ }
+ />
+ ) : (
+ filteredPendingInvitations.map(invitation => (
+ <tr key={invitation.id}>
+ <td>
+ {invitation.team_id ? (
+ <button
+ type="button"
+ className="cu-link"
+ onClick={() =>
+ router.push(
+ CONTROL_ROUTES.usersAndTeams.team(invitation.team_id)
+ )
+ }
+ >
+ {pendingInvitationTeamLabel(invitation)}
+ </button>
+ ) : (
+ <span className="cu-muted">No team</span>
+ )}
+ </td>
+ <td className="cu-table__cell-soft">{invitation.email}</td>
+ <td>{formatTeamRole(invitation.role)}</td>
+ <td className="cu-table__cell-muted">
+ {new Date(invitation.created_at).toLocaleString()}
+ </td>
+ <td className="cu-table__cell-actions">
+ <RowActionsMenu
+ ariaLabel={`Actions for invitation to ${invitation.email}`}
+ horizontalTrigger
+ actions={[
+ {
+ key: 'resend',
+ label:
+ resendingInvitationId === invitation.id
+ ? 'Sending…'
+ : 'Resend',
+ disabled:
+ (busy && !loaded) || resendingInvitationId === invitation.id,
+ onClick: () => void resendPendingInvitation(invitation),
+ },
+ {
+ key: 'cancel',
+ label:
+ revokingInvitationId === invitation.id
+ ? 'Cancelling…'
+ : 'Cancel',
+ danger: true,
+ disabled:
+ (busy && !loaded) || revokingInvitationId === invitation.id,
+ onClick: () => {
+ setDeleteDialogError('')
+ setInvitationToCancel(invitation)
+ },
+ },
+ ]}
+ />
+ </td>
+ </tr>
+ ))
+ )}
</tbody>
</DataTable>
</div>
- ) : filteredTeams.length === 0 ? (
- <div className="cu-empty">
- {teamSearchInput.trim() ? 'No teams match this search.' : 'No teams yet.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
- <thead>
- <TableHeaderRow columns={teamColumns} />
- </thead>
- <tbody>
- {teamSort.sortedRows.map(team => (
+ </div>
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={memberColumns} />
+ </thead>
+ <tbody>
+ {busy && !loaded ? (
+ <TableStateRow
+ colSpan={memberColumns.length}
+ kind="loading"
+ message="Loading members…"
+ />
+ ) : error && visibleUsers.length === 0 ? (
+ <TableStateRow colSpan={memberColumns.length} kind="error" message={error} />
+ ) : visibleUsers.length === 0 ? (
+ <TableStateRow
+ colSpan={memberColumns.length}
+ message={
+ searchInput.trim()
+ ? 'No registered members match this search.'
+ : 'No registered members yet.'
+ }
+ />
+ ) : (
+ memberSort.sortedRows.map(user => (
<TableRow
- key={team.id}
+ key={user.id}
className="cu-table__row cu-table__row--clickable"
- onNavigate={() => openTeam(team)}
- aria-label={`Open team ${team.name}`}
+ onNavigate={() => openUser(user)}
+ aria-label={`Open member ${user.name || user.email}`}
>
<td>
<button
@@ -608,289 +803,87 @@ export function ProfileAdminHome({ activeTab, highlightedAdminId = '' }: Profile
className="cu-link"
onClick={event => {
event.stopPropagation()
- openTeam(team)
+ openUser(user)
}}
onKeyDown={event => event.stopPropagation()}
>
- {team.name}
+ {user.name || '—'}
</button>
</td>
- <td
- style={{
- fontVariantNumeric: 'tabular-nums',
- color: 'var(--cu-text-muted)',
- textAlign: 'right',
- }}
- >
- {team.memberCount}
- </td>
- <td
- style={{
- fontVariantNumeric: 'tabular-nums',
- color: 'var(--cu-text-muted)',
- textAlign: 'right',
- }}
- >
- {teamAgentCounts[team.id] ?? 0}
+ <td className="cu-table__cell-soft">
+ <span className="cu-member-email">
+ <span>{user.email}</span>
+ {user.passwordPendingFromAcceptedInvitation ? (
+ <span
+ className="cu-member-email__alert"
+ title="Invitation accepted, but this user still needs to set a password."
+ aria-label="Invitation accepted, password setup pending"
+ >
+ <IconAlertTriangle width={14} height={14} />
+ </span>
+ ) : null}
+ </span>
</td>
- <td
- style={{
- fontVariantNumeric: 'tabular-nums',
- color: 'var(--cu-text-muted)',
- textAlign: 'right',
- }}
- >
- {teamContextCounts[team.id] ?? 0}
+ <td className="cu-table__cell-numeric">
+ <button
+ type="button"
+ className="cu-link cu-link--sm"
+ title={memberTeamsTooltip(user)}
+ onClick={() => openUserTeams(user)}
+ aria-label={`Open teams for ${user.name || user.email}`}
+ >
+ {user.activeTeamCount}
+ </button>
</td>
<td className="cu-table__cell-actions">
<RowActionsMenu
- ariaLabel={`Actions for team ${team.name}`}
+ ariaLabel={`Actions for member ${user.name || user.email}`}
horizontalTrigger
actions={[
{
key: 'view',
- label: 'View team details',
- onClick: () => openTeam(team),
+ label: 'View member details',
+ onClick: () => openUser(user),
+ },
+ ...(user.passwordPendingFromAcceptedInvitation
+ ? [
+ {
+ key: 'resend',
+ label:
+ resendingPasswordSetupUserId === user.id
+ ? 'Sending…'
+ : 'Resend invite',
+ disabled:
+ (busy && !loaded) ||
+ resendingPasswordSetupUserId === user.id,
+ onClick: () => void resendPasswordSetupInvitation(user),
+ },
+ ]
+ : []),
+ {
+ key: 'admin',
+ label: user.controlAdminId
+ ? 'View administrator access'
+ : 'Create administrator access',
+ disabled: busy && !loaded,
+ onClick: () => openAdminAccessForUser(user),
},
{
key: 'delete',
- label: 'Delete',
+ label: 'Delete member',
danger: true,
disabled: busy && !loaded,
- onClick: () => {
- setDeleteDialogError('')
- setTeamToDelete(team)
- },
+ onClick: () => void openDeleteUserDialog(user),
},
]}
/>
</td>
</TableRow>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
- </>
- ) : (
- <>
- {busy && !loaded ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
- <thead>
- <TableHeaderRow columns={memberColumns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={4} rows={5} />
- </tbody>
- </DataTable>
- </div>
- ) : (
- <>
- {filteredPendingInvitations.length > 0 && (
- <div className="cu-profile-section">
- <p className="cu-profile-section__label">Pending invitations</p>
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
- <thead>
- <tr>
- <th>Team</th>
- <th>Email</th>
- <th className="cu-table__col-role">Role</th>
- <th className="cu-table__col-date">Invited</th>
- <th className="cu-table__col-actions" aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {filteredPendingInvitations.map(invitation => (
- <tr key={invitation.id}>
- <td>
- {invitation.team_id ? (
- <button
- type="button"
- className="cu-link"
- onClick={() =>
- router.push(
- CONTROL_ROUTES.usersAndTeams.team(invitation.team_id)
- )
- }
- >
- {pendingInvitationTeamLabel(invitation)}
- </button>
- ) : (
- <span className="cu-muted">No team</span>
- )}
- </td>
- <td className="cu-table__cell-soft">{invitation.email}</td>
- <td>{formatTeamRole(invitation.role)}</td>
- <td className="cu-table__cell-muted">
- {new Date(invitation.created_at).toLocaleString()}
- </td>
- <td className="cu-table__cell-actions">
- <RowActionsMenu
- ariaLabel={`Actions for invitation to ${invitation.email}`}
- horizontalTrigger
- actions={[
- {
- key: 'resend',
- label:
- resendingInvitationId === invitation.id
- ? 'Sending…'
- : 'Resend',
- disabled:
- (busy && !loaded) ||
- resendingInvitationId === invitation.id,
- onClick: () => void resendPendingInvitation(invitation),
- },
- {
- key: 'cancel',
- label:
- revokingInvitationId === invitation.id
- ? 'Cancelling…'
- : 'Cancel',
- danger: true,
- disabled:
- (busy && !loaded) ||
- revokingInvitationId === invitation.id,
- onClick: () => {
- setDeleteDialogError('')
- setInvitationToCancel(invitation)
- },
- },
- ]}
- />
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- </div>
- )}
- {searchInput.trim() &&
- pendingInvitations.length > 0 &&
- filteredPendingInvitations.length === 0 && (
- <div className="cu-empty cu-empty--spaced-bottom">
- No pending invitations match this search.
- </div>
+ ))
)}
- {visibleUsers.length === 0 && filteredPendingInvitations.length === 0 ? (
- <div className="cu-empty">
- {searchInput.trim()
- ? 'No members or pending invitations match this search.'
- : 'No members yet.'}
- </div>
- ) : visibleUsers.length === 0 ? (
- <div
- className={`cu-empty${filteredPendingInvitations.length ? ' cu-empty--spaced-top' : ''}`}
- >
- {searchInput.trim()
- ? 'No registered members match this search.'
- : 'No registered members yet.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--profile cu-table--header-band">
- <thead>
- <TableHeaderRow columns={memberColumns} />
- </thead>
- <tbody>
- {memberSort.sortedRows.map(user => (
- <TableRow
- key={user.id}
- className="cu-table__row cu-table__row--clickable"
- onNavigate={() => openUser(user)}
- aria-label={`Open member ${user.name || user.email}`}
- >
- <td>
- <button
- type="button"
- className="cu-link"
- onClick={event => {
- event.stopPropagation()
- openUser(user)
- }}
- onKeyDown={event => event.stopPropagation()}
- >
- {user.name || '—'}
- </button>
- </td>
- <td className="cu-table__cell-soft">
- <span className="cu-member-email">
- <span>{user.email}</span>
- {user.passwordPendingFromAcceptedInvitation ? (
- <span
- className="cu-member-email__alert"
- title="Invitation accepted, but this user still needs to set a password."
- aria-label="Invitation accepted, password setup pending"
- >
- <IconAlertTriangle width={14} height={14} />
- </span>
- ) : null}
- </span>
- </td>
- <td className="cu-table__cell-numeric">
- <button
- type="button"
- className="cu-link cu-link--sm"
- title={memberTeamsTooltip(user)}
- onClick={() => openUserTeams(user)}
- aria-label={`Open teams for ${user.name || user.email}`}
- >
- {user.activeTeamCount}
- </button>
- </td>
- <td className="cu-table__cell-actions">
- <RowActionsMenu
- ariaLabel={`Actions for member ${user.name || user.email}`}
- horizontalTrigger
- actions={[
- {
- key: 'view',
- label: 'View member details',
- onClick: () => openUser(user),
- },
- ...(user.passwordPendingFromAcceptedInvitation
- ? [
- {
- key: 'resend',
- label:
- resendingPasswordSetupUserId === user.id
- ? 'Sending…'
- : 'Resend invite',
- disabled:
- (busy && !loaded) ||
- resendingPasswordSetupUserId === user.id,
- onClick: () => void resendPasswordSetupInvitation(user),
- },
- ]
- : []),
- {
- key: 'admin',
- label: user.controlAdminId
- ? 'View administrator access'
- : 'Create administrator access',
- disabled: busy && !loaded,
- onClick: () => openAdminAccessForUser(user),
- },
- {
- key: 'delete',
- label: 'Delete member',
- danger: true,
- disabled: busy && !loaded,
- onClick: () => void openDeleteUserDialog(user),
- },
- ]}
- />
- </td>
- </TableRow>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
- </>
- )}
+ </tbody>
+ </DataTable>
+ </div>
</>
)}
{error ? (
diff --git a/control-ui/components/PublisherView/GrantedToMe.tsx b/control-ui/components/PublisherView/GrantedToMe.tsx
index c7b3a98df..442001408 100644
--- a/control-ui/components/PublisherView/GrantedToMe.tsx
+++ b/control-ui/components/PublisherView/GrantedToMe.tsx
@@ -1,14 +1,12 @@
'use client'
import Link from 'next/link'
-import { DataTable, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { CONTROL_ROUTES } from '@constants/routes'
import type { GrantedToMeItem } from '../../lib/api'
import type { InboundGrantsStatus } from '../../lib/hooks/useInboundGrants'
-import { SectionLoadingSkeleton } from '../SectionLoadingSkeleton'
import { TableHeaderRow } from '../TableHeaderRow'
import type { TableHeaderColumn } from '../TableHeaderRow/types'
-import { RetryBanner } from './RetryBanner'
const COLUMNS: TableHeaderColumn[] = [
{ key: 'plugin', label: 'Plugin' },
@@ -51,25 +49,6 @@ export function GrantedToMe({
activeDirection: grantSort.key === column.key ? grantSort.direction : null,
onSort: () => grantSort.sortBy(column.key as 'plugin' | 'owner' | 'since'),
}))
- if (status === 'loading') {
- return <SectionLoadingSkeleton label="Loading shared plugins" rows={3} />
- }
- if (status === 'unavailable') {
- return (
- <p className="cu-banner cu-banner--warn">
- Plugins shared with your org appear in your{' '}
- <Link href={CONTROL_ROUTES.marketplace.root}>Marketplace catalog</Link> and can be installed
- from there.
- </p>
- )
- }
- if (status === 'error') {
- return <RetryBanner message="Could not load inbound grants." onRetry={reload} />
- }
- if (grants.length === 0) {
- return <p>No plugins have been shared with your org yet.</p>
- }
-
return (
<div className="eft-table-viewport cu-table-wrap">
<DataTable className="eft-table cu-table">
@@ -77,15 +56,50 @@ export function GrantedToMe({
<TableHeaderRow columns={columns} />
</thead>
<tbody>
- {grantSort.sortedRows.map(g => (
- <tr key={`${g.ownerOrg}/${g.pluginName}`}>
- <td>
- <code>{g.pluginName}</code>
- </td>
- <td>{g.ownerOrg}</td>
- <td>{fmt(g.createdAt)}</td>
- </tr>
- ))}
+ {status === 'loading' ? (
+ <TableStateRow
+ colSpan={columns.length}
+ kind="loading"
+ message="Loading shared plugins…"
+ />
+ ) : status === 'error' ? (
+ <TableStateRow
+ action={
+ <button type="button" className="cu-btn cu-btn--ghost cu-btn--sm" onClick={reload}>
+ Retry
+ </button>
+ }
+ colSpan={columns.length}
+ kind="error"
+ message="Could not load inbound grants."
+ />
+ ) : status === 'unavailable' ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={
+ <>
+ Plugins shared with your org appear in your{' '}
+ <Link href={CONTROL_ROUTES.marketplace.root}>Marketplace catalog</Link> and can be
+ installed from there.
+ </>
+ }
+ />
+ ) : grants.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message="No plugins have been shared with your org yet."
+ />
+ ) : (
+ grantSort.sortedRows.map(g => (
+ <tr key={`${g.ownerOrg}/${g.pluginName}`}>
+ <td>
+ <code>{g.pluginName}</code>
+ </td>
+ <td>{g.ownerOrg}</td>
+ <td>{fmt(g.createdAt)}</td>
+ </tr>
+ ))
+ )}
</tbody>
</DataTable>
</div>
diff --git a/control-ui/components/PublisherView/OwnedEntries.tsx b/control-ui/components/PublisherView/OwnedEntries.tsx
index bc1a6cc76..f3ab05211 100644
--- a/control-ui/components/PublisherView/OwnedEntries.tsx
+++ b/control-ui/components/PublisherView/OwnedEntries.tsx
@@ -2,7 +2,7 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react'
import { useRouter, useSearchParams } from 'next/navigation'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { MARKETPLACE_ENTRY_TYPE_LABELS } from '@constants/marketplaceEntryTypes'
import { CONTROL_ROUTES } from '@constants/routes'
import {
@@ -13,13 +13,11 @@ import {
} from '../../lib/api'
import { useConfirmDialog } from '../ConfirmDialog'
import { type RowActionMenuItem, RowActionsMenu } from '../RowActionsMenu'
-import { SectionLoadingSkeleton } from '../SectionLoadingSkeleton'
import { TableHeaderRow } from '../TableHeaderRow'
import type { TableHeaderColumn } from '../TableHeaderRow/types'
import { TablePanelHeader } from '../TablePanelHeader'
import { useToast } from '../Toast'
import { GrantAccessModal } from './GrantAccessModal'
-import { RetryBanner } from './RetryBanner'
type GrantTarget = {
entryName: string
@@ -219,13 +217,6 @@ export function OwnedEntries({
}
/>
<div className="cu-card__body">
- {loading ? <SectionLoadingSkeleton label="Loading published entries" /> : null}
- {error ? (
- <RetryBanner
- message="Could not load your published entries."
- onRetry={() => void load()}
- />
- ) : null}
{!loading && !error && activeTypeLabel ? (
<p className="cu-banner cu-banner--info">
Showing {activeTypeLabel.toLowerCase()} only.{' '}
@@ -238,106 +229,128 @@ export function OwnedEntries({
</button>
</p>
) : null}
- {!loading && !error && entries.length === 0 ? (
- <p>You haven’t published any registry entries yet.</p>
- ) : null}
- {!loading && !error && entries.length > 0 && visibleEntries.length === 0 ? (
- <p>No {activeTypeLabel?.toLowerCase() ?? 'entries'} published yet.</p>
- ) : null}
- {!loading && !error && visibleEntries.length > 0 ? (
- <>
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- {sortedEntries.map(e => {
- const isPrivate = e.visibility === 'private'
- const detailRoute = CONTROL_ROUTES.marketplace.entry(e.name, e.version)
- const rowActions: RowActionMenuItem[] = [
- {
- key: 'view',
- label: 'View details',
- onClick: () => router.push(detailRoute),
- },
- ...(isInstalled(e)
- ? [
- {
- key: 'installed',
- label: 'Installed',
- disabled: true,
- onClick: () => undefined,
- },
- ]
- : [
- {
- key: 'install',
- label: 'Install',
- onClick: () =>
- router.push(
- CONTROL_ROUTES.marketplace.install({
- entry: e.name,
- version: e.version,
- })
- ),
- },
- ]),
- ...(isPrivate && canShare
- ? [
- {
- key: 'share',
- label: 'Share access',
- onClick: () =>
- setGrantTarget({
- entryName: e.name,
- opener: document.activeElement as HTMLButtonElement,
- }),
- },
- ]
- : []),
- {
- key: 'edit',
- label: 'Edit',
- onClick: () =>
- router.push(CONTROL_ROUTES.marketplace.editEntry(e.name, e.version)),
- },
- {
- key: 'remove',
- label: 'Remove from Marketplace',
- danger: true,
- onClick: () => void handleRemove(e),
- },
- ]
- return (
- <TableRow key={entryKey(e)} onNavigate={() => router.push(detailRoute)}>
- <td>
- <code>{e.name}</code>
- </td>
- <td>{entryTypeLabel(e)}</td>
- <td>{e.version}</td>
- <td>
- <span
- className={`cu-registry-chip cu-registry-chip--visibility-${e.visibility}`}
- >
- {e.visibility}
- </span>
- </td>
- <td>{e.status}</td>
- <td className="cu-table__cell-actions">
- <RowActionsMenu
- ariaLabel={`Actions for ${e.name} v${e.version}`}
- actions={rowActions}
- />
- </td>
- </TableRow>
- )
- })}
- </tbody>
- </DataTable>
- </div>
- </>
- ) : null}
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table">
+ <thead>
+ <TableHeaderRow columns={columns} />
+ </thead>
+ <tbody>
+ {loading ? (
+ <TableStateRow
+ colSpan={columns.length}
+ kind="loading"
+ message="Loading published entries…"
+ />
+ ) : error ? (
+ <TableStateRow
+ action={
+ <button
+ type="button"
+ className="cu-btn cu-btn--ghost cu-btn--sm"
+ onClick={() => void load()}
+ >
+ Retry
+ </button>
+ }
+ colSpan={columns.length}
+ kind="error"
+ message="Could not load your published entries."
+ />
+ ) : visibleEntries.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={
+ entries.length === 0
+ ? 'You haven’t published any registry entries yet.'
+ : `No ${activeTypeLabel?.toLowerCase() ?? 'entries'} published yet.`
+ }
+ />
+ ) : (
+ sortedEntries.map(e => {
+ const isPrivate = e.visibility === 'private'
+ const detailRoute = CONTROL_ROUTES.marketplace.entry(e.name, e.version)
+ const rowActions: RowActionMenuItem[] = [
+ {
+ key: 'view',
+ label: 'View details',
+ onClick: () => router.push(detailRoute),
+ },
+ ...(isInstalled(e)
+ ? [
+ {
+ key: 'installed',
+ label: 'Installed',
+ disabled: true,
+ onClick: () => undefined,
+ },
+ ]
+ : [
+ {
+ key: 'install',
+ label: 'Install',
+ onClick: () =>
+ router.push(
+ CONTROL_ROUTES.marketplace.install({
+ entry: e.name,
+ version: e.version,
+ })
+ ),
+ },
+ ]),
+ ...(isPrivate && canShare
+ ? [
+ {
+ key: 'share',
+ label: 'Share access',
+ onClick: () =>
+ setGrantTarget({
+ entryName: e.name,
+ opener: document.activeElement as HTMLButtonElement,
+ }),
+ },
+ ]
+ : []),
+ {
+ key: 'edit',
+ label: 'Edit',
+ onClick: () =>
+ router.push(CONTROL_ROUTES.marketplace.editEntry(e.name, e.version)),
+ },
+ {
+ key: 'remove',
+ label: 'Remove from Marketplace',
+ danger: true,
+ onClick: () => void handleRemove(e),
+ },
+ ]
+ return (
+ <TableRow key={entryKey(e)} onNavigate={() => router.push(detailRoute)}>
+ <td>
+ <code>{e.name}</code>
+ </td>
+ <td>{entryTypeLabel(e)}</td>
+ <td>{e.version}</td>
+ <td>
+ <span
+ className={`cu-registry-chip cu-registry-chip--visibility-${e.visibility}`}
+ >
+ {e.visibility}
+ </span>
+ </td>
+ <td>{e.status}</td>
+ <td className="cu-table__cell-actions">
+ <RowActionsMenu
+ ariaLabel={`Actions for ${e.name} v${e.version}`}
+ actions={rowActions}
+ />
+ </td>
+ </TableRow>
+ )
+ })
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
</div>
{grantTarget ? (
diff --git a/control-ui/components/RegistryApiKeysPanel.tsx b/control-ui/components/RegistryApiKeysPanel.tsx
index 0766b220a..598cba111 100644
--- a/control-ui/components/RegistryApiKeysPanel.tsx
+++ b/control-ui/components/RegistryApiKeysPanel.tsx
@@ -2,7 +2,7 @@
import { useCallback, useEffect, useState } from 'react'
import Link from 'next/link'
-import { DataTable, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import { CONTROL_ROUTES } from '@constants/routes'
import {
type CreateRegistryApiKeyInput,
@@ -18,7 +18,6 @@ import CreateApiKeyModal from './CreateApiKeyModal'
import type { RegistryApiKeysPanelProps } from './RegistryApiKeysPanel.types'
import RevealApiKeyModal from './RevealApiKeyModal'
import { RowActionsMenu } from './RowActionsMenu'
-import { SectionLoadingSkeleton } from './SectionLoadingSkeleton'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
import { TablePanelHeader } from './TablePanelHeader'
@@ -188,9 +187,6 @@ export default function RegistryApiKeysPanel({ embedded = false }: RegistryApiKe
/>
<div className="cu-card__body">
- {view.kind === 'loading' ? (
- <SectionLoadingSkeleton label="Loading registry API keys" />
- ) : null}
{view.kind === 'not-owner' ? (
<p className="cu-banner cu-banner--warn">
You must be an org owner to manage API keys
@@ -225,26 +221,37 @@ export default function RegistryApiKeysPanel({ embedded = false }: RegistryApiKe
managing API keys.
</p>
) : null}
- {view.kind === 'error' ? (
- <p className="cu-banner cu-banner--warn">
- Could not load API keys.{' '}
- <Button type="button" variant="ghost" size="sm" onClick={() => void load()}>
- Retry
- </Button>
- </p>
- ) : null}
-
- {view.kind === 'ready' ? (
- view.keys.length === 0 ? (
- <p>No API keys yet. Create one to publish to @{view.org} from CI or scripts.</p>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- {keySort.sortedRows.map(k => (
+ {view.kind === 'loading' || view.kind === 'error' || view.kind === 'ready' ? (
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table">
+ <thead>
+ <TableHeaderRow columns={columns} />
+ </thead>
+ <tbody>
+ {view.kind === 'loading' ? (
+ <TableStateRow
+ colSpan={columns.length}
+ kind="loading"
+ message="Loading registry API keys…"
+ />
+ ) : view.kind === 'error' ? (
+ <TableStateRow
+ action={
+ <Button type="button" variant="ghost" size="sm" onClick={() => void load()}>
+ Retry
+ </Button>
+ }
+ colSpan={columns.length}
+ kind="error"
+ message="Could not load API keys."
+ />
+ ) : view.keys.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={`No API keys yet. Create one to publish to @${view.org} from CI or scripts.`}
+ />
+ ) : (
+ keySort.sortedRows.map(k => (
<tr key={k.id}>
<td>
<code>{k.key_prefix}</code>
@@ -270,11 +277,11 @@ export default function RegistryApiKeysPanel({ embedded = false }: RegistryApiKe
/>
</td>
</tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- )
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
) : null}
</div>
</>
diff --git a/control-ui/components/RegistryCatalog.tsx b/control-ui/components/RegistryCatalog.tsx
index 5a705bb87..70a399e2a 100644
--- a/control-ui/components/RegistryCatalog.tsx
+++ b/control-ui/components/RegistryCatalog.tsx
@@ -3,13 +3,12 @@
import { Fragment, useEffect, useMemo, useState } from 'react'
import Link from 'next/link'
import { useRouter } from 'next/navigation'
-import { DataTable, TableRow } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow } from '@clerum/frontend-table-system'
import { FilterSelect } from '@components/FilterSelect'
import { MarketplaceTabs } from '@components/MarketplaceTabs'
import { type RowActionMenuItem, RowActionsMenu } from '@components/RowActionsMenu'
import { SectionSearchInput } from '@components/SectionSearchInput'
import { IconStore } from '@components/Sidebar/icons'
-import { SkeletonTableRows } from '@components/SkeletonTableRows'
import { TableHeaderRow } from '@components/TableHeaderRow'
import type { TableHeaderColumn } from '@components/TableHeaderRow/types'
import { TablePanelHeader } from '@components/TablePanelHeader'
@@ -210,8 +209,7 @@ export default function RegistryCatalog() {
const showConnectBanner =
connectionMode === 'self-hosted' &&
(connectionState === 'disconnected' || connectionState === 'rejected')
- // Computed once, rendered in BOTH the error early-return and the normal branch
- // so the connect prompt survives a catalog browse failure (DRY).
+ // Keep the connect prompt visible even when the catalog request fails.
const connectBanner = showConnectBanner ? (
<div className="cu-banner cu-banner--info" role="status">
<span>
@@ -228,19 +226,6 @@ export default function RegistryCatalog() {
</div>
) : null
- if (error) {
- return (
- <div className="cu-registry-layout">
- {connectBanner}
- <div className="cu-card cu-card--viewport-fill cu-section-card">
- <div className="cu-card__body">
- <div className="cu-banner cu-banner--error">Error: {error}</div>
- </div>
- </div>
- </div>
- )
- }
-
return (
<div className="cu-registry-layout">
{connectBanner}
@@ -305,6 +290,7 @@ export default function RegistryCatalog() {
}
/>
<MarketplaceTabs active="connectors" />
+ {error ? <div className="cu-banner cu-banner--error">Error: {error}</div> : null}
<div className="eft-table-viewport cu-table-wrap cu-marketplace-table-wrap">
<DataTable className="eft-table cu-table cu-table--header-band cu-marketplace-table">
<thead>
@@ -312,7 +298,18 @@ export default function RegistryCatalog() {
</thead>
<tbody>
{isInitialLoad ? (
- <SkeletonTableRows columns={columns.length} rows={5} />
+ <TableStateRow
+ colSpan={columns.length}
+ kind="loading"
+ message="Loading Marketplace connectors…"
+ />
+ ) : error ? (
+ <TableStateRow colSpan={columns.length} kind="error" message={error} />
+ ) : filtered.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message="No connectors match your filters."
+ />
) : (
filtered.map(entry => {
const typeMeta = entry.server_mode
@@ -437,13 +434,6 @@ export default function RegistryCatalog() {
)
})
)}
- {!isInitialLoad && filtered.length === 0 ? (
- <tr>
- <td colSpan={columns.length} className="cu-empty">
- No connectors match your filters.
- </td>
- </tr>
- ) : null}
</tbody>
</DataTable>
</div>
diff --git a/control-ui/components/SecretsTable.tsx b/control-ui/components/SecretsTable.tsx
index 4a24bdb71..7aa1d8d14 100644
--- a/control-ui/components/SecretsTable.tsx
+++ b/control-ui/components/SecretsTable.tsx
@@ -2,7 +2,12 @@
import React, { useEffect, useMemo, useState } from 'react'
import { useRouter } from 'next/navigation'
-import { DataTable, TableHeaderCell, useTableSort } from '@clerum/frontend-table-system'
+import {
+ DataTable,
+ TableHeaderCell,
+ TableStateRow,
+ useTableSort,
+} from '@clerum/frontend-table-system'
import { CONTROL_ROUTES } from '@constants/routes'
import {
type RecipeSecretItem,
@@ -521,44 +526,7 @@ export function SecretsTable({
</div>
)}
- {scope === 'llm' && isLlmInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- <TableHeaderCell label="Name" />
- <TableHeaderCell label="Providers" />
- <th style={{ width: '8rem', textAlign: 'right' }} aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {Array.from({ length: 3 }).map((_, idx) => (
- <tr key={idx}>
- <td>
- <div
- className="cu-skeleton cu-skeleton--cell"
- style={{ width: `${55 + ((idx * 13) % 25)}%` }}
- />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '8rem' }} />
- </td>
- <td>
- <div
- className="cu-skeleton cu-skeleton--cell"
- style={{ width: '4rem', marginLeft: 'auto' }}
- />
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- ) : scope === 'llm' && filteredRows.length === 0 ? (
- <div className="cu-empty">
- {normalizedLlmSearch ? 'No LLM secrets match this search.' : <>No LLM secrets found.</>}
- </div>
- ) : scope === 'llm' ? (
+ {scope === 'llm' ? (
<div className="eft-table-viewport cu-table-wrap">
<DataTable className="eft-table cu-table cu-table--header-band">
<thead>
@@ -577,93 +545,73 @@ export function SecretsTable({
</tr>
</thead>
<tbody>
- {llmSort.sortedRows.map(name => {
- const providers = getProvidersWithCompleteCredentials(keysByName.get(name) ?? [])
- return (
- <tr key={name}>
- <td>{name}</td>
- <td>
- {providers.length > 0 ? (
- <div className="cu-chip-row" aria-label={`Providers for ${name}`}>
- {providers.map(provider => {
- const label = getProviderLabel(provider)
- return (
- <span key={provider} className="cu-chip">
- <LlmProviderIcon provider={provider} label={label} />
- {label}
- </span>
- )
- })}
+ {isLlmInitialLoad ? (
+ <TableStateRow colSpan={3} kind="loading" message="Loading LLM secrets…" />
+ ) : error && filteredRows.length === 0 ? (
+ <TableStateRow colSpan={3} kind="error" message={error} />
+ ) : filteredRows.length === 0 ? (
+ <TableStateRow
+ colSpan={3}
+ message={
+ normalizedLlmSearch
+ ? 'No LLM secrets match this search.'
+ : 'No LLM secrets found.'
+ }
+ />
+ ) : (
+ llmSort.sortedRows.map(name => {
+ const providers = getProvidersWithCompleteCredentials(
+ keysByName.get(name) ?? []
+ )
+ return (
+ <tr key={name}>
+ <td>{name}</td>
+ <td>
+ {providers.length > 0 ? (
+ <div className="cu-chip-row" aria-label={`Providers for ${name}`}>
+ {providers.map(provider => {
+ const label = getProviderLabel(provider)
+ return (
+ <span key={provider} className="cu-chip">
+ <LlmProviderIcon provider={provider} label={label} />
+ {label}
+ </span>
+ )
+ })}
+ </div>
+ ) : (
+ <span style={{ color: 'var(--cu-text-soft)' }}>—</span>
+ )}
+ </td>
+ <td style={{ textAlign: 'right' }}>
+ <div style={{ display: 'inline-flex', gap: '0.35rem' }}>
+ <RowActionsMenu
+ ariaLabel={`Actions for LLM secret ${name}`}
+ horizontalTrigger
+ actions={[
+ {
+ key: 'update',
+ label: 'Update',
+ onClick: () => openUpdate(name),
+ },
+ {
+ key: 'delete',
+ label: deletingName === name ? 'Deleting…' : 'Delete',
+ danger: true,
+ disabled: deletingName === name,
+ onClick: () => void deleteSecret(name),
+ },
+ ]}
+ />
</div>
- ) : (
- <span style={{ color: 'var(--cu-text-soft)' }}>—</span>
- )}
- </td>
- <td style={{ textAlign: 'right' }}>
- <div style={{ display: 'inline-flex', gap: '0.35rem' }}>
- <RowActionsMenu
- ariaLabel={`Actions for LLM secret ${name}`}
- horizontalTrigger
- actions={[
- {
- key: 'update',
- label: 'Update',
- onClick: () => openUpdate(name),
- },
- {
- key: 'delete',
- label: deletingName === name ? 'Deleting…' : 'Delete',
- danger: true,
- disabled: deletingName === name,
- onClick: () => void deleteSecret(name),
- },
- ]}
- />
- </div>
- </td>
- </tr>
- )
- })}
+ </td>
+ </tr>
+ )
+ })
+ )}
</tbody>
</DataTable>
</div>
- ) : scope === 'mcp' && isMcpInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- <TableHeaderCell label="Name" />
- <TableHeaderCell label="Attached connectors" style={{ width: '36%' }} />
- <TableHeaderCell label="Marketplace Source" style={{ width: '34%' }} />
- <th style={{ width: '8rem', textAlign: 'right' }} aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {Array.from({ length: 3 }).map((_, idx) => (
- <tr key={idx}>
- <td>
- <div
- className="cu-skeleton cu-skeleton--cell"
- style={{ width: `${52 + ((idx * 14) % 28)}%` }}
- />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '70%' }} />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '55%' }} />
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- ) : scope === 'mcp' && filteredMcpRows.length === 0 ? (
- <div className="cu-empty">
- {normalizedMcpSearch
- ? 'No connector secrets match this search.'
- : 'No connector secrets found.'}
- </div>
) : scope === 'mcp' ? (
<div className="eft-table-viewport cu-table-wrap">
<DataTable className="eft-table cu-table cu-table--header-band">
@@ -690,88 +638,60 @@ export function SecretsTable({
</tr>
</thead>
<tbody>
- {mcpSort.sortedRows.map(row => (
- <tr key={row.name}>
- <td>{row.name}</td>
- <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
- {row.servers.length > 0
- ? `${row.servers.length} server(s): ${row.servers.join(', ')}`
- : 'Not yet attached to a connector.'}
- </td>
- <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
- {row.registryEntries.length > 0
- ? row.registryEntries.join(', ')
- : 'Created manually or source unknown.'}
- </td>
- <td style={{ textAlign: 'right' }}>
- <button
- type="button"
- className="cu-btn cu-btn--primary cu-btn--sm"
- onClick={() => {
- const source =
- row.registrySources.length === 1 ? row.registrySources[0] : undefined
- router.push(
- CONTROL_ROUTES.secrets.new({
- scope: 'mcp',
- name: row.name,
- registryEntry: source?.name,
- registryVersion: source?.version,
- })
- )
- }}
- aria-label={`Add connector secret ${row.name}`}
- >
- Add
- </button>
- </td>
- </tr>
- ))}
- </tbody>
- </DataTable>
- </div>
- ) : isRecipeInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <tr>
- <TableHeaderCell label="Name" />
- <TableHeaderCell label="Keys" style={{ width: '32%' }} />
- <TableHeaderCell label="Used by recipes" style={{ width: '32%' }} />
- <th style={{ width: '8rem', textAlign: 'right' }} aria-label="Actions" />
- </tr>
- </thead>
- <tbody>
- {Array.from({ length: 3 }).map((_, idx) => (
- <tr key={idx}>
- <td>
- <div
- className="cu-skeleton cu-skeleton--cell"
- style={{ width: `${48 + ((idx * 11) % 30)}%` }}
- />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '60%' }} />
- </td>
- <td>
- <div className="cu-skeleton cu-skeleton--cell" style={{ width: '50%' }} />
- </td>
- <td>
- <div
- className="cu-skeleton cu-skeleton--cell"
- style={{ width: '4rem', marginLeft: 'auto' }}
- />
- </td>
- </tr>
- ))}
+ {isMcpInitialLoad ? (
+ <TableStateRow colSpan={4} kind="loading" message="Loading connector secrets…" />
+ ) : mcpError && filteredMcpRows.length === 0 ? (
+ <TableStateRow colSpan={4} kind="error" message={mcpError} />
+ ) : filteredMcpRows.length === 0 ? (
+ <TableStateRow
+ colSpan={4}
+ message={
+ normalizedMcpSearch
+ ? 'No connector secrets match this search.'
+ : 'No connector secrets found.'
+ }
+ />
+ ) : (
+ mcpSort.sortedRows.map(row => (
+ <tr key={row.name}>
+ <td>{row.name}</td>
+ <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
+ {row.servers.length > 0
+ ? `${row.servers.length} server(s): ${row.servers.join(', ')}`
+ : 'Not yet attached to a connector.'}
+ </td>
+ <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
+ {row.registryEntries.length > 0
+ ? row.registryEntries.join(', ')
+ : 'Created manually or source unknown.'}
+ </td>
+ <td style={{ textAlign: 'right' }}>
+ <button
+ type="button"
+ className="cu-btn cu-btn--primary cu-btn--sm"
+ onClick={() => {
+ const source =
+ row.registrySources.length === 1 ? row.registrySources[0] : undefined
+ router.push(
+ CONTROL_ROUTES.secrets.new({
+ scope: 'mcp',
+ name: row.name,
+ registryEntry: source?.name,
+ registryVersion: source?.version,
+ })
+ )
+ }}
+ aria-label={`Add connector secret ${row.name}`}
+ >
+ Add
+ </button>
+ </td>
+ </tr>
+ ))
+ )}
</tbody>
</DataTable>
</div>
- ) : filteredRecipeRows.length === 0 ? (
- <div className="cu-empty">
- {normalizedRecipeSearch
- ? 'No recipe secrets match this search.'
- : 'No recipe secrets found.'}
- </div>
) : (
<div className="eft-table-viewport cu-table-wrap">
<DataTable className="eft-table cu-table cu-table--header-band">
@@ -798,109 +718,127 @@ export function SecretsTable({
</tr>
</thead>
<tbody>
- {recipeSort.sortedRows.map(row => (
- <tr key={`${row.status}:${row.namespace}:${row.name}`}>
- <td>
- <div style={{ display: 'inline-flex', alignItems: 'center', gap: '0.5rem' }}>
- <span>{row.name}</span>
- <span className="cu-chip" title={`Secret namespace: ${row.namespace}`}>
- {row.namespace}
- </span>
- {row.status === 'missing' ? (
- <span
- className="cu-chip"
- style={{
- color: 'var(--cu-warn-text, var(--cu-text-soft))',
- borderColor: 'var(--cu-warn-border, var(--cu-border-subtle))',
- }}
- >
- Missing
- </span>
- ) : null}
- {row.ownership?.kind === 'shared' ? (
- <span className="cu-chip" title="Any recipe can reference this secret">
- Shared
- </span>
- ) : null}
- {row.ownership?.kind === 'owner-recipe' ? (
- <span
- className="cu-chip"
- title={`Only ${row.ownership.recipeName} can reference this secret`}
- >
- Owner: {row.ownership.recipeName}
- </span>
- ) : null}
- {row.ownership?.kind === 'unlabeled' ? (
- <span
- className="cu-chip"
- style={{
- color: 'var(--cu-warn-text, var(--cu-text-soft))',
- borderColor: 'var(--cu-warn-border, var(--cu-border-subtle))',
- }}
- title="Secret has neither owner-recipe nor shared label — WRC will refuse to project it"
- >
- Unlabeled
- </span>
- ) : null}
- </div>
- </td>
- <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
- {row.keys.length > 0
- ? row.keys.join(', ')
- : row.status === 'missing'
- ? 'No keys declared by recipe.'
- : 'No keys defined.'}
- </td>
- <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
- {row.recipes.length > 0
- ? `${row.recipes.length} recipe(s): ${row.recipes.join(', ')}`
- : 'Not yet referenced by a recipe.'}
- </td>
- <td style={{ textAlign: 'right' }}>
- {row.status === 'missing' ? (
- <button
- type="button"
- className="cu-btn cu-btn--primary cu-btn--sm"
- onClick={() =>
- onCreateRecipeSecretFor(
- row.name,
- row.keys,
- row.recipes.length === 1 ? row.recipes[0] : undefined,
- row.namespace
- )
- }
- aria-label={`Add recipe secret ${row.name}`}
+ {isRecipeInitialLoad ? (
+ <TableStateRow colSpan={4} kind="loading" message="Loading recipe secrets…" />
+ ) : recipeError && filteredRecipeRows.length === 0 ? (
+ <TableStateRow colSpan={4} kind="error" message={recipeError} />
+ ) : filteredRecipeRows.length === 0 ? (
+ <TableStateRow
+ colSpan={4}
+ message={
+ normalizedRecipeSearch
+ ? 'No recipe secrets match this search.'
+ : 'No recipe secrets found.'
+ }
+ />
+ ) : (
+ recipeSort.sortedRows.map(row => (
+ <tr key={`${row.status}:${row.namespace}:${row.name}`}>
+ <td>
+ <div
+ style={{ display: 'inline-flex', alignItems: 'center', gap: '0.5rem' }}
>
- Add
- </button>
- ) : (
- <div style={{ display: 'inline-flex', gap: '0.35rem' }}>
- <RowActionsMenu
- ariaLabel={`Actions for recipe secret ${row.name}`}
- horizontalTrigger
- actions={[
- {
- key: 'update',
- label: 'Update',
- onClick: () => navigateToRecipeEdit(row.name, row.namespace),
- },
- {
- key: 'delete',
- label:
- recipeDeletingName === `${row.namespace}/${row.name}`
- ? 'Deleting…'
- : 'Delete',
- danger: true,
- disabled: recipeDeletingName === `${row.namespace}/${row.name}`,
- onClick: () => void deleteRecipeSecretRow(row.name, row.namespace),
- },
- ]}
- />
+ <span>{row.name}</span>
+ <span className="cu-chip" title={`Secret namespace: ${row.namespace}`}>
+ {row.namespace}
+ </span>
+ {row.status === 'missing' ? (
+ <span
+ className="cu-chip"
+ style={{
+ color: 'var(--cu-warn-text, var(--cu-text-soft))',
+ borderColor: 'var(--cu-warn-border, var(--cu-border-subtle))',
+ }}
+ >
+ Missing
+ </span>
+ ) : null}
+ {row.ownership?.kind === 'shared' ? (
+ <span className="cu-chip" title="Any recipe can reference this secret">
+ Shared
+ </span>
+ ) : null}
+ {row.ownership?.kind === 'owner-recipe' ? (
+ <span
+ className="cu-chip"
+ title={`Only ${row.ownership.recipeName} can reference this secret`}
+ >
+ Owner: {row.ownership.recipeName}
+ </span>
+ ) : null}
+ {row.ownership?.kind === 'unlabeled' ? (
+ <span
+ className="cu-chip"
+ style={{
+ color: 'var(--cu-warn-text, var(--cu-text-soft))',
+ borderColor: 'var(--cu-warn-border, var(--cu-border-subtle))',
+ }}
+ title="Secret has neither owner-recipe nor shared label — WRC will refuse to project it"
+ >
+ Unlabeled
+ </span>
+ ) : null}
</div>
- )}
- </td>
- </tr>
- ))}
+ </td>
+ <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
+ {row.keys.length > 0
+ ? row.keys.join(', ')
+ : row.status === 'missing'
+ ? 'No keys declared by recipe.'
+ : 'No keys defined.'}
+ </td>
+ <td style={{ color: 'var(--cu-text-soft)', fontSize: '0.8125rem' }}>
+ {row.recipes.length > 0
+ ? `${row.recipes.length} recipe(s): ${row.recipes.join(', ')}`
+ : 'Not yet referenced by a recipe.'}
+ </td>
+ <td style={{ textAlign: 'right' }}>
+ {row.status === 'missing' ? (
+ <button
+ type="button"
+ className="cu-btn cu-btn--primary cu-btn--sm"
+ onClick={() =>
+ onCreateRecipeSecretFor(
+ row.name,
+ row.keys,
+ row.recipes.length === 1 ? row.recipes[0] : undefined,
+ row.namespace
+ )
+ }
+ aria-label={`Add recipe secret ${row.name}`}
+ >
+ Add
+ </button>
+ ) : (
+ <div style={{ display: 'inline-flex', gap: '0.35rem' }}>
+ <RowActionsMenu
+ ariaLabel={`Actions for recipe secret ${row.name}`}
+ horizontalTrigger
+ actions={[
+ {
+ key: 'update',
+ label: 'Update',
+ onClick: () => navigateToRecipeEdit(row.name, row.namespace),
+ },
+ {
+ key: 'delete',
+ label:
+ recipeDeletingName === `${row.namespace}/${row.name}`
+ ? 'Deleting…'
+ : 'Delete',
+ danger: true,
+ disabled: recipeDeletingName === `${row.namespace}/${row.name}`,
+ onClick: () =>
+ void deleteRecipeSecretRow(row.name, row.namespace),
+ },
+ ]}
+ />
+ </div>
+ )}
+ </td>
+ </tr>
+ ))
+ )}
</tbody>
</DataTable>
</div>
diff --git a/control-ui/components/TokenBudgetTable.tsx b/control-ui/components/TokenBudgetTable.tsx
index 205aefa54..cf9c193b2 100644
--- a/control-ui/components/TokenBudgetTable.tsx
+++ b/control-ui/components/TokenBudgetTable.tsx
@@ -1,7 +1,7 @@
'use client'
import React, { useMemo, useState } from 'react'
-import { DataTable, TableRow, useTableSort } from '@clerum/frontend-table-system'
+import { DataTable, TableRow, TableStateRow, useTableSort } from '@clerum/frontend-table-system'
import type { TokenBudget } from '@lib/api'
import {
budgetProgressPercent,
@@ -13,7 +13,6 @@ import {
import { RowActionsMenu } from './RowActionsMenu'
import { SectionSearchInput } from './SectionSearchInput'
import { IconBudget } from './Sidebar/icons'
-import { SkeletonTableRows } from './SkeletonTableRows'
import { TableHeaderRow } from './TableHeaderRow'
import type { TableHeaderColumn } from './TableHeaderRow/types'
import { TablePanelHeader } from './TablePanelHeader'
@@ -146,31 +145,25 @@ export function TokenBudgetTable({
</>
}
/>
- {isInitialLoad ? (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- <SkeletonTableRows columns={columns.length} rows={4} />
- </tbody>
- </DataTable>
- </div>
- ) : filteredItems.length === 0 ? (
- <div className="cu-empty">
- {normalizedSearch
- ? 'No budgets match this search.'
- : 'No token budgets defined yet. Create one to start tracking spend against a limit.'}
- </div>
- ) : (
- <div className="eft-table-viewport cu-table-wrap">
- <DataTable className="eft-table cu-table cu-table--header-band">
- <thead>
- <TableHeaderRow columns={columns} />
- </thead>
- <tbody>
- {budgetSort.sortedRows.map((budget: TokenBudget) => (
+ <div className="eft-table-viewport cu-table-wrap">
+ <DataTable className="eft-table cu-table cu-table--header-band">
+ <thead>
+ <TableHeaderRow columns={columns} />
+ </thead>
+ <tbody>
+ {isInitialLoad ? (
+ <TableStateRow colSpan={columns.length} kind="loading" message="Loading budgets…" />
+ ) : filteredItems.length === 0 ? (
+ <TableStateRow
+ colSpan={columns.length}
+ message={
+ normalizedSearch
+ ? 'No budgets match this search.'
+ : 'No token budgets defined yet. Create one to start tracking spend against a limit.'
+ }
+ />
+ ) : (
+ budgetSort.sortedRows.map((budget: TokenBudget) => (
<BudgetRow
key={budget.id}
budget={budget}
@@ -181,11 +174,11 @@ export function TokenBudgetTable({
deleting={deletingId === budget.id}
toggling={togglingId === budget.id}
/>
- ))}
- </tbody>
- </DataTable>
- </div>
- )}
+ ))
+ )}
+ </tbody>
+ </DataTable>
+ </div>
</div>
)
}
diff --git a/control-ui/components/__tests__/GrantedToMe.test.tsx b/control-ui/components/__tests__/GrantedToMe.test.tsx
index a67a4f11b..d9ef64388 100644
--- a/control-ui/components/__tests__/GrantedToMe.test.tsx
+++ b/control-ui/components/__tests__/GrantedToMe.test.tsx
@@ -5,11 +5,11 @@ import { GrantedToMe } from '../PublisherView/GrantedToMe'
afterEach(cleanup)
describe('GrantedToMe (presentational)', () => {
- it('renders a skeleton while inbound grants load', () => {
- const view = render(<GrantedToMe status="loading" grants={[]} reload={vi.fn()} />)
+ it('keeps headers mounted while inbound grants load', () => {
+ render(<GrantedToMe status="loading" grants={[]} reload={vi.fn()} />)
expect(screen.getByRole('status', { name: /loading shared plugins/i })).toBeInTheDocument()
- expect(screen.queryByText(/^Loading/i)).toBeNull()
- expect(view.container.querySelectorAll('.cu-skeleton').length).toBeGreaterThan(0)
+ expect(screen.getByRole('columnheader', { name: /plugin/i })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /shared by/i })).toBeInTheDocument()
})
it('renders inbound grants read-only (no revoke)', () => {
diff --git a/control-ui/components/__tests__/LlmPriceTable.test.tsx b/control-ui/components/__tests__/LlmPriceTable.test.tsx
index 2b4fe45af..7a0a0e133 100644
--- a/control-ui/components/__tests__/LlmPriceTable.test.tsx
+++ b/control-ui/components/__tests__/LlmPriceTable.test.tsx
@@ -94,6 +94,8 @@ describe('LlmPriceTable', () => {
fireEvent.change(screen.getByLabelText('Search prices'), { target: { value: 'openai' } })
expect(screen.queryByText('claude-sonnet-4-6')).not.toBeInTheDocument()
expect(screen.getByText('No prices match this search.')).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /provider/i })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /model/i })).toBeInTheDocument()
})
it('renders an unpriced model as a compact missing row with an add-price warning', () => {
diff --git a/control-ui/components/__tests__/OutputsPage.test.tsx b/control-ui/components/__tests__/OutputsPage.test.tsx
index 194a47c03..3c034b4ae 100644
--- a/control-ui/components/__tests__/OutputsPage.test.tsx
+++ b/control-ui/components/__tests__/OutputsPage.test.tsx
@@ -80,28 +80,30 @@ afterEach(() => {
})
describe('OutputsPage', () => {
- it('shows workflow artifact skeleton rows while the workflow tab is loading', () => {
+ it('keeps workflow artifact headers mounted while the workflow tab is loading', () => {
mockGetAdminOutputsOverview.mockReturnValue(new Promise<never>(() => {}))
- const { container } = render(<OutputsPage />)
+ render(<OutputsPage />)
expect(screen.getByText('Agent Outputs')).toBeInTheDocument()
expect(screen.getByRole('columnheader', { name: 'File' })).toBeInTheDocument()
expect(screen.getByRole('columnheader', { name: 'Recipe' })).toBeInTheDocument()
expect(screen.queryByText(/No workflow artifacts found/)).not.toBeInTheDocument()
- expect(container.querySelectorAll('.cu-skeleton')).toHaveLength(24)
+ expect(screen.getByRole('status', { name: 'Loading recipe artifacts…' })).toBeInTheDocument()
})
- it('shows desktop artifact skeleton rows while the desktop tab is loading', () => {
+ it('keeps desktop artifact headers mounted while the desktop tab is loading', () => {
navigationState.params = { tab: 'desktop-app-artifacts' }
mockGetAdminOutputsOverview.mockReturnValue(new Promise<never>(() => {}))
- const { container } = render(<OutputsPage />)
+ render(<OutputsPage />)
expect(screen.getByRole('columnheader', { name: 'File' })).toBeInTheDocument()
expect(screen.getByRole('columnheader', { name: 'Host' })).toBeInTheDocument()
expect(screen.queryByText(/No desktop app artifacts found/)).not.toBeInTheDocument()
- expect(container.querySelectorAll('.cu-skeleton')).toHaveLength(24)
+ expect(
+ screen.getByRole('status', { name: 'Loading desktop app artifacts…' })
+ ).toBeInTheDocument()
})
it('loads workflow artifacts from exact runs and downloads through the run-scoped URL', async () => {
diff --git a/control-ui/components/__tests__/OwnedEntries.test.tsx b/control-ui/components/__tests__/OwnedEntries.test.tsx
index 8515e5b01..9b0c16111 100644
--- a/control-ui/components/__tests__/OwnedEntries.test.tsx
+++ b/control-ui/components/__tests__/OwnedEntries.test.tsx
@@ -48,14 +48,14 @@ beforeEach(() => {
})
describe('OwnedEntries', () => {
- it('renders a skeleton while owned entries load', () => {
+ it('keeps headers mounted while owned entries load', () => {
vi.mocked(api.getOwnedRegistryEntries).mockReturnValue(
new Promise(() => undefined) as ReturnType<typeof api.getOwnedRegistryEntries>
)
- const view = render(<OwnedEntries orgScope="acme" />)
+ render(<OwnedEntries orgScope="acme" />)
expect(screen.getByRole('status', { name: /loading published entries/i })).toBeInTheDocument()
- expect(screen.queryByText(/Loading your published entries/i)).toBeNull()
- expect(view.container.querySelectorAll('.cu-skeleton').length).toBeGreaterThan(0)
+ expect(screen.getByRole('columnheader', { name: /name/i })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /visibility/i })).toBeInTheDocument()
})
it('renders owned entries with visibility + status', async () => {
diff --git a/control-ui/components/__tests__/RegistryApiKeysPanel.test.tsx b/control-ui/components/__tests__/RegistryApiKeysPanel.test.tsx
index d49d2d0cc..88b76727c 100644
--- a/control-ui/components/__tests__/RegistryApiKeysPanel.test.tsx
+++ b/control-ui/components/__tests__/RegistryApiKeysPanel.test.tsx
@@ -42,14 +42,14 @@ const key = {
}
describe('RegistryApiKeysPanel', () => {
- it('renders a skeleton while registry API keys load', () => {
+ it('keeps headers mounted while registry API keys load', () => {
vi.mocked(api.listRegistryApiKeys).mockReturnValue(
new Promise(() => undefined) as ReturnType<typeof api.listRegistryApiKeys>
)
- const view = render(<RegistryApiKeysPanel />)
+ render(<RegistryApiKeysPanel />)
expect(screen.getByRole('status', { name: /loading registry api keys/i })).toBeInTheDocument()
- expect(screen.queryByText(/^Loading/i)).toBeNull()
- expect(view.container.querySelectorAll('.cu-skeleton').length).toBeGreaterThan(0)
+ expect(screen.getByRole('columnheader', { name: /prefix/i })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /last used/i })).toBeInTheDocument()
})
it('renders the org header and table on success', async () => {
diff --git a/control-ui/components/__tests__/RegistryCatalog.test.tsx b/control-ui/components/__tests__/RegistryCatalog.test.tsx
index 84b0ad85c..d2e5bc062 100644
--- a/control-ui/components/__tests__/RegistryCatalog.test.tsx
+++ b/control-ui/components/__tests__/RegistryCatalog.test.tsx
@@ -343,15 +343,19 @@ describe('RegistryCatalog controls', () => {
})
describe('RegistryCatalog state handling', () => {
- it('renders a skeleton across the compact columns while capability is resolving', () => {
+ it('keeps catalog headers mounted while capability is resolving', () => {
vi.mocked(api.getRegistryCatalog).mockReturnValue(new Promise(() => {}))
// Role is unknown while capability resolves, so the curator-only actions
// column is absent and the four visible columns render 20 skeleton cells
// across five rows.
vi.mocked(api.getPublishScope).mockReturnValue(new Promise(() => {}))
- const { container } = render(<RegistryCatalog />)
+ render(<RegistryCatalog />)
- expect(container.querySelectorAll('.cu-skeleton')).toHaveLength(40)
+ expect(
+ screen.getByRole('status', { name: /loading marketplace connectors/i })
+ ).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Name' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Version' })).toBeInTheDocument()
})
it('shows an API error', async () => {
@@ -359,12 +363,15 @@ describe('RegistryCatalog state handling', () => {
render(<RegistryCatalog />)
expect(await screen.findByText('Error: Network error')).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Name' })).toBeInTheDocument()
+ expect(screen.getByRole('alert', { name: 'Network error' })).toBeInTheDocument()
})
it('shows the empty state when no entries match', async () => {
mockApiSuccess([MOCK_RECIPE_ENTRY])
render(<RegistryCatalog />)
expect(await screen.findByText('No connectors match your filters.')).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Name' })).toBeInTheDocument()
})
})
diff --git a/control-ui/components/__tests__/TokenBudgetTable.test.tsx b/control-ui/components/__tests__/TokenBudgetTable.test.tsx
index 47f347ce3..2068968c1 100644
--- a/control-ui/components/__tests__/TokenBudgetTable.test.tsx
+++ b/control-ui/components/__tests__/TokenBudgetTable.test.tsx
@@ -108,5 +108,7 @@ describe('TokenBudgetTable', () => {
fireEvent.change(screen.getByLabelText('Search budgets'), { target: { value: 'tokens-only' } })
expect(screen.queryByText('Monthly OpenAI cap')).not.toBeInTheDocument()
expect(screen.getByText('No budgets match this search.')).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /name/i })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: /spent \/ limit/i })).toBeInTheDocument()
})
})
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index da62f094b..60970e484 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.504",
+ "version": "0.1.505",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.504",
+ "version": "0.1.505",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-table-system": "file:../packages/frontend-table-system",
diff --git a/control-ui/package.json b/control-ui/package.json
index bbc48fdea..632ee8645 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.504",
+ "version": "0.1.505",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",
diff --git a/packages/frontend-table-system/src/index.tsx b/packages/frontend-table-system/src/index.tsx
index 74e4550ee..df148736c 100644
--- a/packages/frontend-table-system/src/index.tsx
+++ b/packages/frontend-table-system/src/index.tsx
@@ -247,7 +247,12 @@ export function TableStateRow({
return (
<tr>
<td className={classNames('eft-table__state', `eft-table__state--${kind}`)} colSpan={colSpan}>
- <div>{message}</div>
+ <div
+ aria-label={kind !== 'empty' && typeof message === 'string' ? message : undefined}
+ role={kind === 'loading' ? 'status' : kind === 'error' ? 'alert' : undefined}
+ >
+ {message}
+ </div>
{action ? <span className="eft-table__state-action">{action}</span> : null}
</td>
</tr>
diff --git a/scripts/style-rules/rules.test.mjs b/scripts/style-rules/rules.test.mjs
index 295e84c05..de4ee208d 100644
--- a/scripts/style-rules/rules.test.mjs
+++ b/scripts/style-rules/rules.test.mjs
@@ -14,6 +14,31 @@ function violationsFor(file, content) {
)
}
+const PRIMARY_RECORD_TABLES = [
+ 'control-ui/app/outputs/page.tsx',
+ 'control-ui/app/shared-filesystems/page.tsx',
+ 'control-ui/components/CodexSubscriptionHub/index.tsx',
+ 'control-ui/components/CommunicationChannelsTable.tsx',
+ 'control-ui/components/ContextTable.tsx',
+ 'control-ui/components/ControlAdminsPanel/index.tsx',
+ 'control-ui/components/GuardrailHooksTable.tsx',
+ 'control-ui/components/HostTable.tsx',
+ 'control-ui/components/LlmDiscoveryPanel/index.tsx',
+ 'control-ui/components/LlmModelTable.tsx',
+ 'control-ui/components/LlmPriceTable.tsx',
+ 'control-ui/components/MarketplaceOrgImages/index.tsx',
+ 'control-ui/components/McpServerTable.tsx',
+ 'control-ui/components/ProfileAdminHome.tsx',
+ 'control-ui/components/PublisherView/GrantedToMe.tsx',
+ 'control-ui/components/PublisherView/OwnedEntries.tsx',
+ 'control-ui/components/RecipesTab.tsx',
+ 'control-ui/components/RegistryApiKeysPanel.tsx',
+ 'control-ui/components/RegistryCatalog.tsx',
+ 'control-ui/components/SecretsTable.tsx',
+ 'control-ui/components/TokenBudgetTable.tsx',
+ 'profile-ui/app/members/page.tsx',
+]
+
test('rejects raw production tables in Control UI and Profile UI', () => {
assert.equal(
violationsFor('control-ui/app/agents/page.tsx', '<table><tbody /></table>').length,
@@ -95,30 +120,7 @@ test('shared table typography uses each web app contract', () => {
})
test('ordinary web record tables keep an explicit sorting model', () => {
- const ordinaryRecordTables = [
- 'control-ui/app/outputs/page.tsx',
- 'control-ui/app/shared-filesystems/page.tsx',
- 'control-ui/components/CodexSubscriptionHub/index.tsx',
- 'control-ui/components/CommunicationChannelsTable.tsx',
- 'control-ui/components/ControlAdminsPanel/index.tsx',
- 'control-ui/components/GuardrailHooksTable.tsx',
- 'control-ui/components/LlmDiscoveryPanel/index.tsx',
- 'control-ui/components/LlmModelTable.tsx',
- 'control-ui/components/LlmPriceTable.tsx',
- 'control-ui/components/MarketplaceOrgImages/index.tsx',
- 'control-ui/components/McpServerTable.tsx',
- 'control-ui/components/ProfileAdminHome.tsx',
- 'control-ui/components/PublisherView/GrantedToMe.tsx',
- 'control-ui/components/PublisherView/OwnedEntries.tsx',
- 'control-ui/components/RecipesTab.tsx',
- 'control-ui/components/RegistryApiKeysPanel.tsx',
- 'control-ui/components/RegistryCatalog.tsx',
- 'control-ui/components/SecretsTable.tsx',
- 'control-ui/components/TokenBudgetTable.tsx',
- 'profile-ui/app/members/page.tsx',
- ]
-
- for (const file of ordinaryRecordTables) {
+ for (const file of PRIMARY_RECORD_TABLES) {
const source = readFileSync(file, 'utf8')
assert.match(source, /useTableSort|sortKey/, `${file} must declare its sorting model`)
assert.match(source, /onSort/, `${file} must expose sortable headers`)
@@ -126,19 +128,19 @@ test('ordinary web record tables keep an explicit sorting model', () => {
})
test('primary record tables keep headers mounted through data states', () => {
- const statefulTables = [
- 'control-ui/app/shared-filesystems/page.tsx',
- 'control-ui/components/GuardrailHooksTable.tsx',
- 'control-ui/components/McpServerTable.tsx',
- 'control-ui/components/RecipesTab.tsx',
- 'profile-ui/app/members/page.tsx',
- ]
+ for (const file of PRIMARY_RECORD_TABLES) {
+ const source = readFileSync(file, 'utf8')
+ const tableBodies = [
+ ...source.matchAll(/<DataTable\b[\s\S]*?<tbody(?:\s[^>]*)?>([\s\S]*?)<\/tbody>/g),
+ ]
- for (const file of statefulTables) {
- assert.match(
- readFileSync(file, 'utf8'),
- /TableStateRow/,
- `${file} must render table state rows`
- )
+ assert.ok(tableBodies.length > 0, `${file} must render a shared DataTable`)
+ for (const [, body] of tableBodies) {
+ assert.match(
+ body,
+ /<Table(?:State|Empty)Row/,
+ `${file} must keep each DataTable mounted with an in-body state row`
+ )
+ }
}
})