Skip to content

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

TypeScript

fix(control-ui): r2-m3 preserve version chronology

Josuéee926e61a27f
diff --git a/control-ui/components/PublisherView/OwnedEntries.tsx b/control-ui/components/PublisherView/OwnedEntries.tsx
index 3c71fe7cd..bc1a6cc76 100644
--- a/control-ui/components/PublisherView/OwnedEntries.tsx
+++ b/control-ui/components/PublisherView/OwnedEntries.tsx
@@ -39,6 +39,18 @@ function entryKey(e: OwnedRegistryEntry): string {
return `${e.name}@${e.version}`
}
+function compareVersionDesc(a: string, b: string): number {
+ const pa = a.split('.')
+ const pb = b.split('.')
+ for (let index = 0; index < Math.max(pa.length, pb.length); index += 1) {
+ const left = Number.parseInt(pa[index] ?? '0', 10)
+ const right = Number.parseInt(pb[index] ?? '0', 10)
+ if (Number.isNaN(left) || Number.isNaN(right)) return b.localeCompare(a)
+ if (left !== right) return right - left
+ }
+ return b.localeCompare(a)
+}
+
// The registry's owned-entries payload carries `serverMode` but not `entry_type`
// (mcp-servers always have a serverMode; recipes don't). Prefer an explicit
// entry_type if the registry ever starts sending it, else infer from serverMode.
@@ -186,6 +198,14 @@ export function OwnedEntries({
entrySort.sortBy(column.key as 'name' | 'type' | 'version' | 'visibility' | 'status'),
}
)
+ const sortedEntries = useMemo(() => {
+ if (entrySort.key !== 'name') return entrySort.sortedRows
+ const direction = entrySort.direction === 'asc' ? 1 : -1
+ return [...entrySort.sortedRows].sort((left, right) => {
+ const byName = left.name.localeCompare(right.name, undefined, { sensitivity: 'base' })
+ return byName === 0 ? compareVersionDesc(left.version, right.version) : byName * direction
+ })
+ }, [entrySort.direction, entrySort.key, entrySort.sortedRows])
return (
<section>
@@ -232,7 +252,7 @@ export function OwnedEntries({
<TableHeaderRow columns={columns} />
</thead>
<tbody>
- {entrySort.sortedRows.map(e => {
+ {sortedEntries.map(e => {
const isPrivate = e.visibility === 'private'
const detailRoute = CONTROL_ROUTES.marketplace.entry(e.name, e.version)
const rowActions: RowActionMenuItem[] = [
diff --git a/control-ui/components/RegistryCatalog.tsx b/control-ui/components/RegistryCatalog.tsx
index 72e69f769..e4addb34a 100644
--- a/control-ui/components/RegistryCatalog.tsx
+++ b/control-ui/components/RegistryCatalog.tsx
@@ -190,7 +190,7 @@ export default function RegistryCatalog() {
return
}
setSortKey(key)
- setSortDirection('asc')
+ setSortDirection(key === 'version' ? 'desc' : 'asc')
}
function isEntryInstalled(entry: RegistryEntry): boolean {
diff --git a/control-ui/components/__tests__/OwnedEntries.test.tsx b/control-ui/components/__tests__/OwnedEntries.test.tsx
index 17ff898cb..8515e5b01 100644
--- a/control-ui/components/__tests__/OwnedEntries.test.tsx
+++ b/control-ui/components/__tests__/OwnedEntries.test.tsx
@@ -338,6 +338,11 @@ describe('OwnedEntries', () => {
expect(screen.getByText('1.1.0')).toBeInTheDocument()
expect(screen.getByText('1.0.0')).toBeInTheDocument()
expect(screen.queryByText('Previous versions')).toBeNull()
+ expect(Array.from(document.querySelectorAll('tbody tr')).map(row => row.textContent)).toEqual([
+ expect.stringContaining('1.2.0'),
+ expect.stringContaining('1.1.0'),
+ expect.stringContaining('1.0.0'),
+ ])
})
it('each version row installs that exact published version', async () => {
diff --git a/control-ui/components/__tests__/RegistryCatalog.test.tsx b/control-ui/components/__tests__/RegistryCatalog.test.tsx
index a4d7dc427..087af44ce 100644
--- a/control-ui/components/__tests__/RegistryCatalog.test.tsx
+++ b/control-ui/components/__tests__/RegistryCatalog.test.tsx
@@ -233,10 +233,10 @@ describe('RegistryCatalog tabs and columns', () => {
)
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 Version descending' }))
expect(listedNames()).toEqual(['alpha-search', 'zebra-search', 'brave-search'])
+
+ fireEvent.click(screen.getByRole('button', { name: 'Sort by Version ascending' }))
+ expect(listedNames()).toEqual(['brave-search', 'zebra-search', 'alpha-search'])
})
})
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 96fdb48c5..4ab993793 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.490",
+ "version": "0.1.491",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.490",
+ "version": "0.1.491",
"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 1ea51d5c5..5c0fdbb67 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.490",
+ "version": "0.1.491",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",