Skip to content

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

TypeScript

fix(control-ui): group discovery models by provider

Josuéc570df0c2893
diff --git a/control-ui/components/LlmDiscoveryPanel/index.tsx b/control-ui/components/LlmDiscoveryPanel/index.tsx
index a97d190aa..f331e6a4a 100644
--- a/control-ui/components/LlmDiscoveryPanel/index.tsx
+++ b/control-ui/components/LlmDiscoveryPanel/index.tsx
@@ -1,7 +1,13 @@
'use client'
import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { DataTable, TableStateRow, TableViewport, useTableSort } from '@clerum/frontend-components'
+import {
+ DataTable,
+ GroupedTableBody,
+ TableStateRow,
+ TableViewport,
+ useTableSort,
+} from '@clerum/frontend-components'
import { LlmProviderIcon } from '@components/LlmProviderIcon'
import { IconModels } from '@components/Sidebar/icons'
import { TableHeaderRow } from '@components/TableHeaderRow'
@@ -18,7 +24,7 @@ import {
syncDiscovery,
updateLlmModel,
} from '@lib/api'
-import { formatContextWindow, getProviderDisplayLabel } from '@lib/llm'
+import { catalogGroupKey, formatContextWindow, getProviderDisplayLabel } from '@lib/llm'
import type { LlmDiscoveryPanelProps } from './types'
const CONFIGMAP_DEFERRED_WARNING =
@@ -50,6 +56,7 @@ export function LlmDiscoveryPanel({
const [syncing, setSyncing] = useState(false)
const [pendingId, setPendingId] = useState<string | null>(null)
const [bulkEnabling, setBulkEnabling] = useState(false)
+ const [expandedProviders, setExpandedProviders] = useState<Set<string>>(new Set())
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
const statusRequestGeneration = useRef(0)
@@ -76,6 +83,27 @@ export function LlmDiscoveryPanel({
[reviewQueue, selectedIds]
)
const allSelected = reviewQueue.length > 0 && selectedCount === reviewQueue.length
+ const groupedReviewRows = useMemo(() => {
+ const groups = new Map<string, LlmAllowedModel[]>()
+ for (const model of reviewSort.sortedRows) {
+ const provider = catalogGroupKey(model.provider)
+ const group = groups.get(provider)
+ if (group) group.push(model)
+ else groups.set(provider, [model])
+ }
+ return Array.from(groups.entries()).sort(([left], [right]) =>
+ getProviderDisplayLabel(left).localeCompare(getProviderDisplayLabel(right))
+ )
+ }, [reviewSort.sortedRows])
+
+ function setProviderExpanded(provider: string, expanded: boolean) {
+ setExpandedProviders(current => {
+ const next = new Set(current)
+ if (expanded) next.add(provider)
+ else next.delete(provider)
+ return next
+ })
+ }
useEffect(() => {
let active = true
@@ -250,7 +278,6 @@ export function LlmDiscoveryPanel({
/>
),
},
- { key: 'provider', label: 'Provider', minWidth: '9rem' },
{ key: 'model', label: 'Model', minWidth: '12rem' },
{ key: 'vendor', label: 'Vendor', width: '10rem' },
{
@@ -272,6 +299,13 @@ export function LlmDiscoveryPanel({
}
)
+ const providerColumns: TableHeaderColumn[] = [
+ { key: 'provider', label: 'Provider', colSpan: 2 },
+ { key: 'models', label: 'Models' },
+ { key: 'details', label: 'Details' },
+ { key: 'actions', label: 'Actions', align: 'right' },
+ ]
+
return (
<>
{error ? (
@@ -357,60 +391,88 @@ export function LlmDiscoveryPanel({
<TableViewport className="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} />
+ <TableHeaderRow columns={providerColumns} />
</thead>
- <tbody className="cu-llm-model-group">
- {isInitialLoad ? (
+ {isInitialLoad ? (
+ <tbody>
<TableStateRow
colSpan={reviewColumns.length}
kind="loading"
message="Loading discovery review…"
/>
- ) : reviewQueue.length === 0 ? (
+ </tbody>
+ ) : reviewQueue.length === 0 ? (
+ <tbody>
<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
- type="checkbox"
- checked={selectedIds.has(model.id)}
- onChange={() => toggleRow(model.id)}
- disabled={bulkEnabling}
- aria-label={`Select ${modelLabel(model)}`}
- />
- </td>
- <td className="cu-llm-provider-cell">
- <span className="cu-inline-icon-label">
- <LlmProviderIcon
- provider={model.provider}
- label={getProviderDisplayLabel(model.provider)}
- />
- {getProviderDisplayLabel(model.provider)}
- </span>
- </td>
- <td className="cu-px-model">{model.model}</td>
- <td>{model.vendor || '—'}</td>
- <td className="cu-px-num">
- {formatContextWindow(model.context_window_tokens)}
- </td>
- <td className="cu-px-actions">
- <button
- type="button"
- className="cu-btn cu-btn--primary cu-btn--sm"
- onClick={() => void handleEnable(model)}
- disabled={pendingId === model.id || bulkEnabling}
- >
- {pendingId === model.id ? 'Enabling…' : 'Enable'}
- </button>
- </td>
- </tr>
- ))
- )}
- </tbody>
+ </tbody>
+ ) : (
+ groupedReviewRows.map(([provider, models]) => {
+ const providerLabel = getProviderDisplayLabel(provider)
+ const expanded = expandedProviders.has(provider)
+
+ return (
+ <GroupedTableBody
+ childBodyClassName="cu-llm-model-group__children"
+ childHeader={<TableHeaderRow columns={reviewColumns} />}
+ className="cu-llm-model-group"
+ colSpan={reviewColumns.length}
+ disclosureClassName="cu-llm-model-group__toggle"
+ disclosureLabel={isExpanded =>
+ `${isExpanded ? 'Collapse' : 'Expand'} ${providerLabel} review models`
+ }
+ expanded={expanded}
+ groupId={provider}
+ key={provider}
+ onExpandedChange={nextExpanded => setProviderExpanded(provider, nextExpanded)}
+ summary={
+ <>
+ <LlmProviderIcon provider={provider} label={providerLabel} />
+ <span className="cu-llm-model-group__provider">{providerLabel}</span>
+ <span className="cu-llm-model-group__count">
+ {models.length} model{models.length === 1 ? '' : 's'}
+ </span>
+ <span className="cu-llm-model-group__summary">Awaiting review</span>
+ <span className="cu-llm-model-group__action" aria-hidden="true">
+ {expanded ? 'Hide models' : 'Show models'}
+ </span>
+ </>
+ }
+ >
+ {models.map(model => (
+ <tr key={model.id} className="cu-table__row cu-llm-model-row">
+ <td>
+ <input
+ type="checkbox"
+ checked={selectedIds.has(model.id)}
+ onChange={() => toggleRow(model.id)}
+ disabled={bulkEnabling}
+ aria-label={`Select ${modelLabel(model)}`}
+ />
+ </td>
+ <td className="cu-px-model">{model.model}</td>
+ <td>{model.vendor || '—'}</td>
+ <td className="cu-px-num">
+ {formatContextWindow(model.context_window_tokens)}
+ </td>
+ <td className="cu-px-actions">
+ <button
+ type="button"
+ className="cu-btn cu-btn--primary cu-btn--sm"
+ onClick={() => void handleEnable(model)}
+ disabled={pendingId === model.id || bulkEnabling}
+ >
+ {pendingId === model.id ? 'Enabling…' : 'Enable'}
+ </button>
+ </td>
+ </tr>
+ ))}
+ </GroupedTableBody>
+ )
+ })
+ )}
</DataTable>
</TableViewport>
</div>
diff --git a/control-ui/components/LlmModelTable.tsx b/control-ui/components/LlmModelTable.tsx
index 7f3d0d76f..e6d1a2a74 100644
--- a/control-ui/components/LlmModelTable.tsx
+++ b/control-ui/components/LlmModelTable.tsx
@@ -260,6 +260,13 @@ export function LlmModelTable({
}
)
+ const providerColumns: TableHeaderColumn[] = [
+ { key: 'provider', label: 'Provider' },
+ { key: 'models', label: 'Models' },
+ { key: 'availability', label: 'Availability', colSpan: 4 },
+ { key: 'actions', label: 'Actions', align: 'right', colSpan: 2 },
+ ]
+
return (
<div className="cu-card cu-card--viewport-fill cu-section-card">
<TablePanelHeader
@@ -343,7 +350,7 @@ export function LlmModelTable({
<TableViewport className="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} />
+ <TableHeaderRow columns={providerColumns} />
</thead>
{isInitialLoad ? (
<tbody>
@@ -379,6 +386,7 @@ export function LlmModelTable({
return (
<GroupedTableBody
childBodyClassName="cu-llm-model-group__children"
+ childHeader={<TableHeaderRow columns={modelColumns} />}
className="cu-llm-model-group"
colSpan={modelColumns.length}
disclosureClassName="cu-llm-model-group__toggle"
diff --git a/control-ui/components/TableHeaderRow/index.tsx b/control-ui/components/TableHeaderRow/index.tsx
index f508400f9..60747178a 100644
--- a/control-ui/components/TableHeaderRow/index.tsx
+++ b/control-ui/components/TableHeaderRow/index.tsx
@@ -10,6 +10,7 @@ export function TableHeaderRow({ columns }: { columns: TableHeaderColumn[] }) {
<TableHeaderCell
key={column.key}
aria-label={column.ariaLabel}
+ colSpan={column.colSpan}
title={column.title}
label={column.label}
kind={column.kind}
diff --git a/control-ui/components/TableHeaderRow/types.ts b/control-ui/components/TableHeaderRow/types.ts
index 8f7e9299f..272bb21b2 100644
--- a/control-ui/components/TableHeaderRow/types.ts
+++ b/control-ui/components/TableHeaderRow/types.ts
@@ -3,6 +3,7 @@ import type { CellKind, SortDirection, TableHeaderCellProps } from '@clerum/fron
export type TableHeaderColumn = {
align?: 'left' | 'right' | 'center'
ariaLabel?: string
+ colSpan?: number
key: string
kind?: CellKind
label?: TableHeaderCellProps['label']
diff --git a/control-ui/components/__tests__/LlmDiscoveryPanel.test.tsx b/control-ui/components/__tests__/LlmDiscoveryPanel.test.tsx
index 0ca1099e5..dce8661c8 100644
--- a/control-ui/components/__tests__/LlmDiscoveryPanel.test.tsx
+++ b/control-ui/components/__tests__/LlmDiscoveryPanel.test.tsx
@@ -94,9 +94,13 @@ describe('LlmDiscoveryPanel merged lifecycle workflow', () => {
expect(screen.getByText(/Newly synced models land here disabled/)).toBeInTheDocument()
expect(screen.getByRole('columnheader', { name: /Provider/i })).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: 'Expand OpenAI review models' })).toHaveAttribute(
+ 'aria-expanded',
+ 'false'
+ )
+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI review models' }))
expect(screen.getByText('gpt-5')).toBeInTheDocument()
expect(screen.queryByText('claude-retired')).toBeNull()
- expect(screen.queryByRole('button', { name: /Expand .* review models/ })).toBeNull()
await waitFor(() => expect(screen.getByText('Live catalog')).toBeInTheDocument())
expect(screen.getByText('+3 new')).toBeInTheDocument()
@@ -108,6 +112,7 @@ describe('LlmDiscoveryPanel merged lifecycle workflow', () => {
const onRefresh = vi.fn().mockResolvedValue(undefined)
render(<LlmDiscoveryPanel items={[reviewModel]} loading={false} onRefresh={onRefresh} />)
+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI review models' }))
fireEvent.click(screen.getByRole('button', { name: 'Enable' }))
await waitFor(() =>
@@ -125,6 +130,7 @@ describe('LlmDiscoveryPanel merged lifecycle workflow', () => {
/>
)
+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI review models' }))
const actionCell = screen.getByRole('button', { name: 'Enable' }).closest('td')
expect(actionCell).toHaveClass('cu-px-actions')
expect(actionCell).not.toHaveClass('cu-table__cell-actions')
@@ -189,7 +195,7 @@ describe('LlmDiscoveryPanel sorting', () => {
}
function expandOpenAi() {
- // Review rows are always visible; retained as a no-op for the sorting tests.
+ fireEvent.click(screen.getByRole('button', { name: 'Expand OpenAI review models' }))
}
const discoveryModel = (overrides: Partial<LlmAllowedModel>): LlmAllowedModel => ({
diff --git a/control-ui/components/__tests__/LlmModelTable.test.tsx b/control-ui/components/__tests__/LlmModelTable.test.tsx
index 4c38a3a1b..f418b109c 100644
--- a/control-ui/components/__tests__/LlmModelTable.test.tsx
+++ b/control-ui/components/__tests__/LlmModelTable.test.tsx
@@ -358,6 +358,11 @@ describe('LlmModelTable provider groups', () => {
it('renders one collapsed summary per provider family and expands independently', () => {
renderTable([baseModel, openAiModel])
+ expect(screen.getByRole('columnheader', { name: 'Provider' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Models' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Availability' })).toBeInTheDocument()
+ expect(screen.queryByRole('columnheader', { name: 'Credential' })).toBeNull()
+
expect(screen.getByRole('button', { name: 'Expand Anthropic models' })).toHaveAttribute(
'aria-expanded',
'false'
@@ -371,6 +376,7 @@ describe('LlmModelTable provider groups', () => {
expandAnthropicModels()
+ expect(screen.getByRole('columnheader', { name: 'Credential' })).toBeInTheDocument()
expect(screen.getByText('claude-sonnet-4-6')).toBeInTheDocument()
expect(screen.queryByText('gpt-5')).toBeNull()
expect(screen.getByRole('button', { name: 'Collapse Anthropic models' })).toHaveAttribute(
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index e87bc35a0..9877eade8 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.580",
+ "version": "0.1.581",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.580",
+ "version": "0.1.581",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/frontend-components": "file:../packages/frontend-components",
diff --git a/control-ui/package.json b/control-ui/package.json
index 6c016c73b..ea964a647 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.580",
+ "version": "0.1.581",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",
diff --git a/packages/frontend-components/src/table/grouped.tsx b/packages/frontend-components/src/table/grouped.tsx
index 1b247b70e..2c490de7b 100644
--- a/packages/frontend-components/src/table/grouped.tsx
+++ b/packages/frontend-components/src/table/grouped.tsx
@@ -6,6 +6,7 @@ import { classNames } from './utils'
export function GroupedTableBody({
childBodyClassName,
+ childHeader,
children,
className,
colSpan,
@@ -51,7 +52,12 @@ export function GroupedTableBody({
className={classNames('eft-table-group__children', childBodyClassName)}
id={childRowsId}
>
- {expanded ? children : null}
+ {expanded ? (
+ <>
+ {childHeader}
+ {children}
+ </>
+ ) : null}
</tbody>
</Fragment>
)
diff --git a/packages/frontend-components/src/table/types.ts b/packages/frontend-components/src/table/types.ts
index c79cc95e9..d98d52ae3 100644
--- a/packages/frontend-components/src/table/types.ts
+++ b/packages/frontend-components/src/table/types.ts
@@ -32,6 +32,7 @@ export type TableStateRowProps = {
export type GroupedTableBodyProps = {
childBodyClassName?: string
+ childHeader?: ReactNode
children: ReactNode
className?: string
colSpan: number