Skip to content

fix(registry): sort group servers alphabetically #2411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fengjikui wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(registry): sort group servers alphabetically #2411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions renderer/src/routes/(registry)/registry-group_.$name.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,20 @@ function RegistryGroupDetail() {
const hasServers =
Object.keys(group?.servers ?? {}).length > 0 ||
Object.keys(group?.remote_servers ?? {}).length > 0
const groupServers = [
...Object.entries(group?.servers ?? {}).map(([key, srv]) => ({
key: `local-${key}`,
server: srv as RegistryImageMetadata,
})),
...Object.entries(group?.remote_servers ?? {}).map(([key, srv]) => ({
key: `remote-${key}`,
server: srv as RegistryRemoteServerMetadata,
})),
].sort((a, b) =>
(a.server.name ?? '').localeCompare(b.server.name ?? '', undefined, {
sensitivity: 'base',
})
)

return (
<div className="flex max-h-full w-full flex-1 flex-col">
Expand Down Expand Up @@ -73,26 +87,14 @@ function RegistryGroupDetail() {
</TableRow>
</TableHeader>
<TableBody>
{Object.entries(group?.servers ?? {}).map(
([key, srv]: [string, RegistryImageMetadata]) => (
<TableRow key={`local-${key}`}>
<TableCell className="text-foreground">
{srv.name}
</TableCell>
<TableCell>{srv.description}</TableCell>
</TableRow>
)
)}
{Object.entries(group?.remote_servers ?? {}).map(
([key, srv]: [string, RegistryRemoteServerMetadata]) => (
<TableRow key={`remote-${key}`}>
<TableCell className="text-foreground">
{srv.name}
</TableCell>
<TableCell>{srv.description}</TableCell>
</TableRow>
)
)}
{groupServers.map(({ key, server }) => (
<TableRow key={key}>
<TableCell className="text-foreground">
{server.name}
</TableCell>
<TableCell>{server.description}</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</div>
Expand Down
3 changes: 3 additions & 0 deletions renderer/src/routes/__tests__/registry-group_.$name.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,9 @@ describe('Registry Group Detail Route', () => {
const bodyRows = allRows.slice(1) // skip header row

expect(bodyRows).toHaveLength(3)
expect(
bodyRows.map((row) => within(row).getAllByRole('cell')[0]?.textContent)
).toEqual(['anthropic-server', 'huggingface-remote', 'openai-server'])

expect(screen.getByText('openai-server')).toBeVisible()
expect(screen.getByText('OpenAI API integration for Claude')).toBeVisible()
Expand Down