Skip to content

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

TypeScript

fix(control-ui): simplify marketplace connector columns

Josuéa3de5be6ffde
diff --git a/control-ui/components/RegistryCatalog.tsx b/control-ui/components/RegistryCatalog.tsx
index 1f0153ab2..11dc34077 100644
--- a/control-ui/components/RegistryCatalog.tsx
+++ b/control-ui/components/RegistryCatalog.tsx
@@ -3,7 +3,7 @@
import { Fragment, useEffect, useMemo, useState } from 'react'
import Link from 'next/link'
import { useRouter } from 'next/navigation'
-import { DataTable, TableRow, TableStateRow } from '@clerum/frontend-components'
+import { DataTable, TableRow, TableStateRow, TruncatedText } from '@clerum/frontend-components'
import { FilterSelect } from '@components/FilterSelect'
import { MarketplaceTabs } from '@components/MarketplaceTabs'
import { type RowActionMenuItem, RowActionsMenu } from '@components/RowActionsMenu'
@@ -16,36 +16,17 @@ import { useToast } from '@components/Toast'
import { CONTROL_ROUTES } from '@constants/routes'
import { type RegistryEntry, deleteRegistryEntry, getRegistryCatalog } from '../lib/api'
import { useRegistryCapability } from '../lib/hooks/useRegistryCapability'
-import { trustBgColor, trustColor } from '../lib/trustLevel'
-type CatalogSortKey = 'name' | 'description' | 'type' | 'tags' | 'trust' | 'quality' | 'version'
+type CatalogSortKey = 'name' | 'description' | 'quality'
type SortDirection = 'asc' | 'desc'
const REGISTRY_COLUMNS: TableHeaderColumn[] = [
- { key: 'name', label: 'Name' },
+ { key: 'name', label: 'Name', width: '24%' },
{ key: 'description', label: 'Description' },
- { key: 'type', label: 'Type' },
- { key: 'tags', label: 'Tags' },
- { key: 'trust', label: 'Trust' },
- { key: 'quality', label: 'Verification' },
- { key: 'version', label: 'Version' },
- { key: 'actions', align: 'right', ariaLabel: 'Actions' },
+ { key: 'quality', label: 'Verification', width: '9rem' },
+ { key: 'actions', align: 'right', ariaLabel: 'Actions', width: '3.5rem' },
]
-function compareVersions(left: string, right: string): number {
- const leftParts = left.split('.')
- const rightParts = right.split('.')
- for (let index = 0; index < Math.max(leftParts.length, rightParts.length); index += 1) {
- const leftPart = Number.parseInt(leftParts[index] ?? '0', 10)
- const rightPart = Number.parseInt(rightParts[index] ?? '0', 10)
- if (Number.isNaN(leftPart) || Number.isNaN(rightPart)) {
- return left.localeCompare(right, undefined, { numeric: true, sensitivity: 'base' })
- }
- if (leftPart !== rightPart) return leftPart - rightPart
- }
- return left.localeCompare(right, undefined, { numeric: true, sensitivity: 'base' })
-}
-
export default function RegistryCatalog() {
const router = useRouter()
const { showToast } = useToast()
@@ -75,19 +56,10 @@ export default function RegistryCatalog() {
// Curators administer the shared catalog, so they keep inline edit/remove;
// everyone else manages their own entries from the ownership area (§5.4).
const columns: TableHeaderColumn[] = REGISTRY_COLUMNS.map(column => {
- if (
- column.key === 'name' ||
- column.key === 'description' ||
- column.key === 'type' ||
- column.key === 'tags' ||
- column.key === 'trust' ||
- column.key === 'quality' ||
- column.key === 'version'
- ) {
+ if (column.key === 'name' || column.key === 'description' || column.key === 'quality') {
return {
...column,
activeDirection: sortKey === column.key ? sortDirection : null,
- defaultDirection: column.key === 'version' ? 'desc' : 'asc',
onSort: () => toggleSort(column.key as CatalogSortKey),
}
}
@@ -162,21 +134,11 @@ export default function RegistryCatalog() {
const direction = sortDirection === 'asc' ? 1 : -1
return [...visibleEntries].sort((left, right) => {
const comparison =
- sortKey === 'version'
- ? compareVersions(left.version, right.version)
- : sortKey === 'description'
- ? left.description.localeCompare(right.description, undefined, { sensitivity: 'base' })
- : sortKey === 'type'
- ? `${left.server_mode ?? ''}/${left.transport ?? ''}`.localeCompare(
- `${right.server_mode ?? ''}/${right.transport ?? ''}`
- )
- : sortKey === 'tags'
- ? left.tags.join(',').localeCompare(right.tags.join(','))
- : sortKey === 'trust'
- ? left.trust_level.localeCompare(right.trust_level)
- : sortKey === 'quality'
- ? left.quality_tier.localeCompare(right.quality_tier)
- : left.name.localeCompare(right.name, undefined, { sensitivity: 'base' })
+ sortKey === 'description'
+ ? left.description.localeCompare(right.description, undefined, { sensitivity: 'base' })
+ : sortKey === 'quality'
+ ? left.quality_tier.localeCompare(right.quality_tier)
+ : left.name.localeCompare(right.name, undefined, { sensitivity: 'base' })
if (comparison !== 0) return comparison * direction
return `${left.name}@${left.version}`.localeCompare(`${right.name}@${right.version}`)
})
@@ -190,7 +152,7 @@ export default function RegistryCatalog() {
return
}
setSortKey(key)
- setSortDirection(key === 'version' ? 'desc' : 'asc')
+ setSortDirection('asc')
}
function isEntryInstalled(entry: RegistryEntry): boolean {
@@ -314,9 +276,6 @@ export default function RegistryCatalog() {
/>
) : (
filtered.map(entry => {
- const typeMeta = entry.server_mode
- ? `${entry.server_mode}${entry.transport ? ` / ${entry.transport}` : ''}`
- : '—'
const detailRoute = CONTROL_ROUTES.marketplace.entry(entry.name, entry.version)
const installed = isEntryInstalled(entry)
return (
@@ -332,23 +291,7 @@ export default function RegistryCatalog() {
) : null}
</td>
<td>
- <span className="cu-cell-truncate" title={entry.description}>
- {entry.description || '—'}
- </span>
- </td>
- <td className="cu-registry-type-meta">{typeMeta}</td>
- <td>{entry.tags.join(', ') || '—'}</td>
- <td>
- <span
- className="cu-registry-chip"
- style={{
- color: trustColor(entry.trust_level),
- background: trustBgColor(entry.trust_level),
- borderColor: trustColor(entry.trust_level),
- }}
- >
- {entry.trust_level.toUpperCase()}
- </span>
+ <TruncatedText value={entry.description} />
</td>
<td>
<span
@@ -357,7 +300,6 @@ export default function RegistryCatalog() {
{entry.quality_tier}
</span>
</td>
- <td className="cu-code-text">{entry.version}</td>
<td
className="cu-table__cell-actions"
onClick={event => event.stopPropagation()}
diff --git a/control-ui/components/__tests__/RegistryCatalog.test.tsx b/control-ui/components/__tests__/RegistryCatalog.test.tsx
index d2e5bc062..d0f076cd4 100644
--- a/control-ui/components/__tests__/RegistryCatalog.test.tsx
+++ b/control-ui/components/__tests__/RegistryCatalog.test.tsx
@@ -151,17 +151,12 @@ describe('RegistryCatalog tabs and columns', () => {
render(<RegistryCatalog />)
await screen.findByText('brave-search')
- for (const heading of [
- 'Name',
- 'Description',
- 'Type',
- 'Tags',
- 'Trust',
- 'Verification',
- 'Version',
- ]) {
+ for (const heading of ['Name', 'Description', 'Verification']) {
expect(screen.getByRole('columnheader', { name: heading })).toBeInTheDocument()
}
+ for (const heading of ['Type', 'Tags', 'Trust', 'Version']) {
+ expect(screen.queryByRole('columnheader', { name: heading })).toBeNull()
+ }
expect(screen.getByRole('columnheader', { name: 'Actions' })).toBeInTheDocument()
})
@@ -212,7 +207,7 @@ describe('RegistryCatalog tabs and columns', () => {
expect(navigation.push).toHaveBeenCalledWith('/marketplace/entries/brave-search/1.0.0')
})
- it('sorts connectors by name and version from their headers', async () => {
+ it('sorts connectors by name from its header', async () => {
mockApiSuccess([
MOCK_MCP_ENTRY,
{ ...MOCK_MCP_ENTRY, id: '3', name: 'zebra-search', version: '1.2.0' },
@@ -232,11 +227,11 @@ describe('RegistryCatalog tabs and columns', () => {
'ascending'
)
- fireEvent.click(screen.getByRole('button', { name: 'Sort by Version descending' }))
- expect(listedNames()).toEqual(['alpha-search', 'zebra-search', 'brave-search'])
+ fireEvent.click(screen.getByRole('button', { name: 'Sort by Name descending' }))
+ expect(listedNames()).toEqual(['zebra-search', 'brave-search', 'alpha-search'])
- fireEvent.click(screen.getByRole('button', { name: 'Sort by Version ascending' }))
- expect(listedNames()).toEqual(['brave-search', 'zebra-search', 'alpha-search'])
+ fireEvent.click(screen.getByRole('button', { name: 'Sort by Name ascending' }))
+ expect(listedNames()).toEqual(['alpha-search', 'brave-search', 'zebra-search'])
})
})
@@ -254,15 +249,15 @@ describe('RegistryCatalog record navigation and actions', () => {
expect(screen.getByRole('menuitem', { name: 'Install' })).toBeInTheDocument()
})
- it('shows former detail metadata in ordinary columns without expansion', async () => {
+ it('keeps requested catalog metadata columns without expansion', async () => {
mockApiSuccess()
render(<RegistryCatalog />)
const row = (await screen.findByText('brave-search')).closest('tr')!
- expect(within(row).getByText('local / streamableHttp')).toBeInTheDocument()
- expect(within(row).getByText('HIGH')).toBeInTheDocument()
expect(within(row).getByText('verified')).toBeInTheDocument()
- expect(within(row).getByText('search, web')).toBeInTheDocument()
+ expect(within(row).queryByText('local / streamableHttp')).toBeNull()
+ expect(within(row).queryByText('HIGH')).toBeNull()
+ expect(within(row).queryByText('search, web')).toBeNull()
expect(row).not.toHaveAttribute('aria-expanded')
})
@@ -355,7 +350,7 @@ describe('RegistryCatalog state handling', () => {
screen.getByRole('status', { name: /loading marketplace connectors/i })
).toBeInTheDocument()
expect(screen.getByRole('columnheader', { name: 'Name' })).toBeInTheDocument()
- expect(screen.getByRole('columnheader', { name: 'Version' })).toBeInTheDocument()
+ expect(screen.getByRole('columnheader', { name: 'Verification' })).toBeInTheDocument()
})
it('shows an API error', async () => {
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 829f19677..00bf52306 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.527",
+ "version": "0.1.528",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.527",
+ "version": "0.1.528",
"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 682800405..1387b3a89 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.527",
+ "version": "0.1.528",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",