Skip to content

🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.

refactor(web): Migrate gateway models table to design system (#17984)

Ben Bachem0aa2672ecf91
diff --git a/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx b/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx
index 0dccf991e9..22b8053568 100644
--- a/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx
+++ b/web/src/components/design-system/table/columns/createBadgeListTableColumn.tsx
@@ -34,38 +34,50 @@ type NeutralBadgeVariant = Extract<
"default" | "secondary" | "tertiary"
>;
-type GetBadge<TData extends RowData, TVariant extends BadgeVariant> = (
- value: string,
- context: CellContext<TData, string[] | null | undefined>,
+type GetBadge<TData extends RowData, TItem, TVariant extends BadgeVariant> = (
+ value: TItem,
+ context: CellContext<TData, TItem[] | null | undefined>,
) => {
value: string;
variant: TVariant;
- icon?: LucideIcon;
-};
+ icon?:
+ | LucideIcon
+ | React.ElementType<{ className?: string; "aria-hidden"?: boolean }>;
+ ariaLabel?: string;
+} & ([TItem] extends [string] ? { key?: string } : { key: string });
-type BadgeListTableColumnOptions<TData extends RowData> =
- | (TableColumnOptions<TData, string[]> & {
- range: "decorative";
- getBadge: GetBadge<TData, DecorativeBadgeVariant>;
- })
- | (TableColumnOptions<TData, string[]> & {
- range?: "neutral";
- getBadge?: GetBadge<TData, NeutralBadgeVariant>;
- })
- | (TableColumnOptions<TData, string[]> & {
- range: "semantic";
- getBadge: GetBadge<TData, SemanticBadgeVariant>;
- });
+type BadgeListTableColumnOptions<
+ TData extends RowData,
+ TItem,
+> = TableColumnOptions<TData, TItem[]> &
+ (
+ | {
+ range: "decorative";
+ getBadge: GetBadge<TData, TItem, DecorativeBadgeVariant>;
+ }
+ | ({
+ range?: "neutral";
+ } & ([TItem] extends [string]
+ ? { getBadge?: GetBadge<TData, TItem, NeutralBadgeVariant> }
+ : { getBadge: GetBadge<TData, TItem, NeutralBadgeVariant> }))
+ | {
+ range: "semantic";
+ getBadge: GetBadge<TData, TItem, SemanticBadgeVariant>;
+ }
+ );
-export function createBadgeListTableColumn<TData extends RowData>({
+export function createBadgeListTableColumn<
+ TData extends RowData,
+ TItem = string,
+>({
getBadge,
nullValue,
range,
...options
-}: BadgeListTableColumnOptions<TData> & {
+}: BadgeListTableColumnOptions<TData, TItem> & {
nullValue?: string;
}) {
- return createTableColumn<TData, string[]>({
+ return createTableColumn<TData, TItem[]>({
...options,
loadingCell: <Skeleton className="h-5 w-16 shrink-0 rounded-sm" />,
renderCell: (values, context) => {
@@ -76,8 +88,10 @@ export function createBadgeListTableColumn<TData extends RowData>({
...(range === "semantic" || range === "decorative"
? getBadge(value, context)
: (getBadge?.(value, context) ?? {
- value,
+ value: String(value),
variant: "secondary" as const,
+ icon: undefined,
+ ariaLabel: undefined,
})),
}));
const renderBadge = (badge: (typeof badges)[number]) => {
@@ -87,6 +101,7 @@ export function createBadgeListTableColumn<TData extends RowData>({
variant={badge.variant}
className="max-w-fit gap-1 truncate rounded-sm px-1 font-normal"
title={badge.value}
+ aria-label={badge.ariaLabel}
>
{Icon && <Icon className="size-3 shrink-0" aria-hidden />}
<span className="truncate" title={badge.value}>
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx
index 331edf38ce..997910c486 100644
--- a/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx
@@ -2,27 +2,9 @@ import Header from "@/src/components/layouts/header";
import { Alert } from "@/src/components/design-system/Alert/Alert";
import { Button } from "@/src/components/ui/button";
import { Skeleton } from "@/src/components/ui/skeleton";
-import { GatewayModelsView } from "@/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView";
-import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";
-import { api, reportNonTrpcError, type RouterOutputs } from "@/src/utils/api";
-
-type Connection = RouterOutputs["aiGateway"]["listConnections"]["data"][number];
-type RefreshResult = RouterOutputs["aiGateway"]["refreshModels"][number];
-
-const providerFormats: Record<GatewayProvider, string[]> = {
- OPENAI: ["OpenAI Responses", "OpenAI Chat Completions"],
- ANTHROPIC: ["Anthropic Messages"],
-};
-
-type ModelRow = {
- id: string;
- availableVia: Array<{
- connectionId: string;
- connectionName: string;
- provider: GatewayProvider;
- }>;
- apiFormats: string[];
-};
+import { ConnectedGatewayModelsTable } from "@/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable";
+import { api, reportNonTrpcError } from "@/src/utils/api";
+import { aggregateModels } from "./aggregateModels";
export function GatewayModelsPage({
organizationId,
@@ -65,7 +47,7 @@ export function GatewayModelsPage({
.catch((error) => reportNonTrpcError(error, "ai-gateway-models"));
return (
- <GatewayModelsView
+ <ConnectedGatewayModelsTable
models={rows}
failedProviderCount={failedResults.length}
providerCount={results?.length ?? connections.length}
@@ -85,49 +67,6 @@ export function GatewayModelsPage({
);
}
-function aggregateModels(
- results: RefreshResult[],
- connections: Connection[],
-): ModelRow[] {
- const connectionsById = new Map(
- connections.map((connection) => [connection.id, connection]),
- );
- const models = new Map<string, ModelRow>();
-
- for (const result of results) {
- if (!result.success) continue;
- const connection = connectionsById.get(result.connectionId);
- if (!connection) continue;
- for (const modelId of result.models) {
- const existing = models.get(modelId);
- const availableVia = {
- connectionId: connection.id,
- connectionName: connection.name,
- provider: connection.provider,
- };
- if (existing) {
- existing.availableVia.push(availableVia);
- existing.apiFormats = [
- ...new Set([
- ...existing.apiFormats,
- ...providerFormats[connection.provider],
- ]),
- ];
- } else {
- models.set(modelId, {
- id: modelId,
- availableVia: [availableVia],
- apiFormats: [...providerFormats[connection.provider]],
- });
- }
- }
- }
-
- return [...models.values()].toSorted((left, right) =>
- left.id.localeCompare(right.id),
- );
-}
-
function ModelsLoadError({ retry }: { retry: () => void }) {
return (
<div className="flex flex-col gap-4">
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.clienttest.ts
new file mode 100644
index 0000000000..9500ec50b8
--- /dev/null
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.clienttest.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from "vitest";
+import { aggregateModels } from "./aggregateModels";
+
+type Connection = Parameters<typeof aggregateModels>[1][number];
+type Result = Parameters<typeof aggregateModels>[0][number];
+
+describe("aggregateModels", () => {
+ it("keeps existing model positions when another connection page loads", () => {
+ const first = {
+ id: "first",
+ name: "First",
+ provider: "OPENAI",
+ } as Connection;
+ const second = {
+ id: "second",
+ name: "Second",
+ provider: "ANTHROPIC",
+ } as Connection;
+ const results = [
+ { connectionId: "second", success: true, models: ["a-model"] },
+ { connectionId: "first", success: true, models: ["z-model", "b-model"] },
+ ] as Result[];
+
+ expect(aggregateModels(results, [first]).map((model) => model.id)).toEqual([
+ "b-model",
+ "z-model",
+ ]);
+ expect(
+ aggregateModels(results, [first, second]).map((model) => model.id),
+ ).toEqual(["b-model", "z-model", "a-model"]);
+ });
+
+ it("does not duplicate badges for connections repeated across pages", () => {
+ const connection = {
+ id: "first",
+ name: "First",
+ provider: "OPENAI",
+ } as Connection;
+ const result = {
+ connectionId: "first",
+ success: true,
+ models: ["model"],
+ } as Result;
+
+ expect(
+ aggregateModels([result], [connection, connection])[0]?.availableVia,
+ ).toEqual([
+ {
+ connectionId: "first",
+ connectionName: "First",
+ provider: "OPENAI",
+ },
+ ]);
+ });
+});
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.ts
new file mode 100644
index 0000000000..38433b41f1
--- /dev/null
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.ts
@@ -0,0 +1,67 @@
+import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";
+import type { RouterOutputs } from "@/src/utils/api";
+
+type Connection = RouterOutputs["aiGateway"]["listConnections"]["data"][number];
+type RefreshResult = RouterOutputs["aiGateway"]["refreshModels"][number];
+
+const providerFormats = {
+ OPENAI: ["OpenAI Responses", "OpenAI Chat Completions"],
+ ANTHROPIC: ["Anthropic Messages"],
+} as const satisfies Record<GatewayProvider, readonly string[]>;
+
+export type ApiFormat = (typeof providerFormats)[GatewayProvider][number];
+
+type ModelRow = {
+ id: string;
+ availableVia: Array<{
+ connectionId: string;
+ connectionName: string;
+ provider: GatewayProvider;
+ }>;
+ apiFormats: ApiFormat[];
+};
+
+export function aggregateModels(
+ results: RefreshResult[],
+ connections: Connection[],
+): ModelRow[] {
+ const resultsByConnectionId = new Map(
+ results.map((result) => [result.connectionId, result]),
+ );
+ const models = new Map<string, ModelRow>();
+ const seenConnectionIds = new Set<string>();
+
+ for (const connection of connections) {
+ if (seenConnectionIds.has(connection.id)) continue;
+ seenConnectionIds.add(connection.id);
+ const result = resultsByConnectionId.get(connection.id);
+ if (!result?.success) continue;
+ for (const modelId of result.models.toSorted((left, right) =>
+ left.localeCompare(right),
+ )) {
+ const existing = models.get(modelId);
+ const availableVia = {
+ connectionId: connection.id,
+ connectionName: connection.name,
+ provider: connection.provider,
+ };
+ if (existing) {
+ existing.availableVia.push(availableVia);
+ existing.apiFormats = [
+ ...new Set([
+ ...existing.apiFormats,
+ ...providerFormats[connection.provider],
+ ]),
+ ];
+ } else {
+ models.set(modelId, {
+ id: modelId,
+ availableVia: [availableVia],
+ apiFormats: [...providerFormats[connection.provider]],
+ });
+ }
+ }
+ }
+
+ return [...models.values()];
+}
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable.tsx
similarity index 60%
rename from web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView.tsx
rename to web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable.tsx
index 810442dd92..cc16c0ef24 100644
--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView.tsx
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable.tsx
@@ -1,29 +1,18 @@
-import { useMemo, useState } from "react";
-import { RefreshCw, Route } from "lucide-react";
-import { SiAnthropic, SiOpenai } from "react-icons/si";
+import { useEffect, useMemo, useState } from "react";
+import { RefreshCw } from "lucide-react";
import Header from "@/src/components/layouts/header";
import { Alert } from "@/src/components/design-system/Alert/Alert";
-import { SingleLineOverflowList } from "@/src/components/SingleLineOverflowList";
-import { Badge } from "@/src/components/ui/badge";
+import type { PaginationBarProps } from "@/src/components/design-system/PaginationBar/PaginationBar";
import { Button } from "@/src/components/ui/button";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/src/components/ui/tooltip";
-import { DataTable } from "@/src/components/table/data-table";
import {
DataTableControls,
DataTableControlsProvider,
} from "@/src/components/table/data-table-controls";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import { SearchableTableFilterLayout } from "@/src/components/table/resizable-filter-layout";
-import type { LangfuseColumnDef } from "@/src/components/table/types";
import { useSidebarFilterState } from "@/src/features/filters";
-import { providerLabels } from "@/src/features/ai-gateway/constants/providerLabels";
import { gatewayModelsFilterConfig } from "@/src/features/ai-gateway/constants/modelsFilterConfig";
-import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";
import { GATEWAY_MODELS_FIELD_REGISTRY } from "@/src/features/ai-gateway/constants/modelsSearchRegistry";
import {
TableSearchBar,
@@ -33,100 +22,13 @@ import {
import {
filterGatewayModels,
type GatewayModelRow,
-} from "./filterGatewayModels";
+} from "./fns/filterGatewayModels";
import { getGatewayModelConnectionSearchOptions } from "./fns/getGatewayModelConnectionSearchOptions";
+import { GatewayModelsTable, gatewayModelsColumns } from "./GatewayModelsTable";
const TABLE_NAME = gatewayModelsFilterConfig.tableName;
-const columns: LangfuseColumnDef<GatewayModelRow, unknown>[] = [
- {
- accessorKey: "id",
- id: "id",
- header: "Model",
- size: 200,
- cell: ({ row }) => (
- <span className="block truncate font-mono" title={row.original.id}>
- {row.original.id}
- </span>
- ),
- },
- {
- accessorKey: "availableVia",
- id: "availableVia",
- header: "Available via",
- size: 360,
- cell: ({ row }) => (
- <SingleLineOverflowList
- items={row.original.availableVia}
- additionalOverflowCount={0}
- getKey={(connection) => connection.connectionId}
- renderItem={(connection) => (
- <Badge
- variant="secondary"
- className="gap-1.5"
- aria-label={`${connection.connectionName}, ${providerLabels[connection.provider]}`}
- >
- <GatewayProviderIcon provider={connection.provider} />
- {connection.connectionName}
- </Badge>
- )}
- renderOverflow={({ hiddenItems, overflowItemCount }) => (
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="inline-flex" tabIndex={0}>
- <Badge variant="secondary">+{overflowItemCount}</Badge>
- </span>
- </TooltipTrigger>
- <TooltipContent className="max-w-xs">
- <div className="flex flex-col gap-1">
- {hiddenItems.map((connection) => (
- <span
- key={connection.connectionId}
- className="flex items-center gap-1.5"
- aria-label={`${connection.connectionName}, ${providerLabels[connection.provider]}`}
- >
- <GatewayProviderIcon provider={connection.provider} />
- {connection.connectionName}
- </span>
- ))}
- </div>
- </TooltipContent>
- </Tooltip>
- )}
- />
- ),
- },
- {
- accessorKey: "apiFormats",
- id: "apiFormats",
- header: "API formats",
- size: 280,
- cell: ({ row }) => (
- <SingleLineOverflowList
- items={row.original.apiFormats}
- additionalOverflowCount={0}
- getKey={(format) => format}
- renderItem={(format) => (
- <Badge variant="secondary">{getApiFormatLabel(format)}</Badge>
- )}
- renderOverflow={({ hiddenItems, overflowItemCount }) => (
- <Tooltip>
- <TooltipTrigger asChild>
- <span className="inline-flex" tabIndex={0}>
- <Badge variant="secondary">+{overflowItemCount}</Badge>
- </span>
- </TooltipTrigger>
- <TooltipContent className="max-w-xs">
- {hiddenItems.map(getApiFormatLabel).join(", ")}
- </TooltipContent>
- </Tooltip>
- )}
- />
- ),
- },
-];
-
-export function GatewayModelsView({
+export function ConnectedGatewayModelsTable({
models,
failedProviderCount,
providerCount,
@@ -152,6 +54,12 @@ export function GatewayModelsView({
onLoadMoreProviders: () => unknown;
}) {
const [searchQuery, setSearchQuery] = useState("");
+ const [pageIndex, setPageIndex] = useState(0);
+ const [pendingPage, setPendingPage] = useState<{
+ index: number;
+ filterKey: string;
+ } | null>(null);
+ const pageSize = 10;
const filterOptions = useMemo(
() => ({
connection: [
@@ -225,6 +133,40 @@ export function GatewayModelsView({
() => filterGatewayModels(models, searchQuery, queryFilter.filterState),
[models, queryFilter.filterState, searchQuery],
);
+ const filterKey = JSON.stringify([searchQuery, queryFilter.filterState]);
+ useEffect(() => {
+ if (pendingPage && pendingPage.filterKey !== filterKey) {
+ setPendingPage(null);
+ }
+ }, [filterKey, pendingPage]);
+ const lastAvailablePageIndex = Math.max(
+ 0,
+ Math.ceil(filteredModels.length / pageSize) - 1,
+ );
+ const currentPageIndex =
+ pendingPage?.filterKey === filterKey &&
+ pendingPage.index * pageSize < filteredModels.length
+ ? pendingPage.index
+ : Math.min(pageIndex, lastAvailablePageIndex);
+ const pagination: PaginationBarProps = {
+ mode: "cursor",
+ state: { pageIndex: currentPageIndex, pageSize },
+ hasNextPage:
+ (currentPageIndex + 1) * pageSize < filteredModels.length ||
+ hasMoreProviders,
+ isLoadingNextPage: isLoadingMoreProviders,
+ onChange: ({ pageIndex: nextPageIndex }) => {
+ if (nextPageIndex * pageSize < filteredModels.length) {
+ setPendingPage(null);
+ setPageIndex(nextPageIndex);
+ return;
+ }
+ if (!hasMoreProviders || isLoadingMoreProviders) return;
+ setPageIndex(currentPageIndex);
+ setPendingPage({ index: nextPageIndex, filterKey });
+ onLoadMoreProviders();
+ },
+ };
const emptyMessage = getEmptyMessage({
hasProviders,
hasSynced,
@@ -306,44 +248,27 @@ export function GatewayModelsView({
toolbar={
<DataTableToolbar
tableName={TABLE_NAME}
- columns={columns}
+ columns={gatewayModelsColumns}
filterState={queryFilter.filterState}
/>
}
>
<DataTableControls queryFilter={queryFilter} />
<div className="flex min-h-0 flex-1 flex-col overflow-hidden">
- <DataTable
- tableName={TABLE_NAME}
- columns={columns}
+ <GatewayModelsTable
data={
isLoading
- ? { isLoading: true, isError: false }
+ ? { status: "loading" }
: {
- isLoading: false,
- isError: false,
- data: filteredModels,
+ status: "success",
+ data: filteredModels.slice(
+ currentPageIndex * pageSize,
+ (currentPageIndex + 1) * pageSize,
+ ),
}
}
- hidePagination
- footer={
- hasMoreProviders ? (
- <Button
- variant="secondary"
- loading={isLoadingMoreProviders}
- disabled={isLoadingMoreProviders}
- aria-label="Load more"
- onClick={() => {
- onLoadMoreProviders();
- }}
- >
- Load more
- </Button>
- ) : undefined
- }
- className="min-h-0"
noResultsMessage={emptyMessage}
- cellPadding="comfortable"
+ pagination={pagination}
/>
</div>
</SearchableTableFilterLayout>
@@ -354,21 +279,6 @@ export function GatewayModelsView({
);
}
-function GatewayProviderIcon({ provider }: { provider: GatewayProvider }) {
- if (provider === "OPENAI")
- return <SiOpenai className="size-3" aria-hidden="true" />;
- if (provider === "ANTHROPIC")
- return <SiAnthropic className="size-3" aria-hidden="true" />;
- return <Route className="size-3" aria-hidden="true" />;
-}
-
-function getApiFormatLabel(format: string) {
- if (format === "Anthropic Messages") return "Messages";
- if (format === "OpenAI Chat Completions") return "Completions";
- if (format === "OpenAI Responses") return "Responses";
- return format;
-}
-
function uniqueSorted(values: string[]) {
return [...new Set(values)].toSorted((left, right) =>
left.localeCompare(right),
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.stories.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.stories.tsx
new file mode 100644
index 0000000000..74d889c1a4
--- /dev/null
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.stories.tsx
@@ -0,0 +1,66 @@
+import { fn } from "storybook/test";
+
+import preview from "@/.storybook/preview";
+import { GatewayModelsTable } from "./GatewayModelsTable";
+
+const meta = preview.meta({ component: GatewayModelsTable });
+
+const actions = {
+ noResultsMessage: "No models were returned by the configured providers.",
+ pagination: {
+ mode: "cursor" as const,
+ state: { pageIndex: 0, pageSize: 10 },
+ hasNextPage: true,
+ onChange: fn(),
+ },
+};
+
+export const Default = meta.story({
+ args: {
+ ...actions,
+ data: {
+ status: "success",
+ data: [
+ {
+ id: "gpt-5-mini",
+ availableVia: [
+ {
+ connectionId: "primary",
+ connectionName: "Primary",
+ provider: "OPENAI",
+ },
+ {
+ connectionId: "fallback",
+ connectionName: "Fallback",
+ provider: "OPENAI",
+ },
+ ],
+ apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],
+ },
+ {
+ id: "claude-sonnet-4-5",
+ availableVia: [
+ {
+ connectionId: "anthropic",
+ connectionName: "Anthropic production",
+ provider: "ANTHROPIC",
+ },
+ ],
+ apiFormats: ["Anthropic Messages"],
+ },
+ ],
+ },
+ },
+});
+
+export const Loading = meta.story({
+ args: { ...actions, data: { status: "loading" } },
+});
+
+export const Empty = meta.story({
+ args: {
+ ...actions,
+ pagination: { ...actions.pagination, hasNextPage: false },
+ data: { status: "success", data: [] },
+ },
+});
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.tsx
new file mode 100644
index 0000000000..26b9122224
--- /dev/null
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.tsx
@@ -0,0 +1,83 @@
+import { SiAnthropic, SiOpenai } from "react-icons/si";
+
+import {
+ Table,
+ type TableProps,
+} from "@/src/components/design-system/table/Table";
+import {
+ PaginationBar,
+ type PaginationBarProps,
+} from "@/src/components/design-system/PaginationBar/PaginationBar";
+import { createBadgeListTableColumn } from "@/src/components/design-system/table/columns/createBadgeListTableColumn";
+import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
+import { providerLabels } from "@/src/features/ai-gateway/constants/providerLabels";
+import { gatewayModelsFilterConfig } from "@/src/features/ai-gateway/constants/modelsFilterConfig";
+import type { ApiFormat } from "@/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels";
+import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";
+import type { LangfuseColumnDef } from "@/src/components/table/types";
+import type { GatewayModelRow } from "./fns/filterGatewayModels";
+
+export const gatewayModelsColumns: LangfuseColumnDef<GatewayModelRow>[] = [
+ createTextTableColumn<GatewayModelRow>({
+ accessorKey: "id",
+ header: "Model",
+ size: 200,
+ }),
+ createBadgeListTableColumn<
+ GatewayModelRow,
+ GatewayModelRow["availableVia"][number]
+ >({
+ accessorKey: "availableVia",
+ header: "Available via",
+ size: 360,
+ getBadge: (connection) => ({
+ key: connection.connectionId,
+ value: connection.connectionName,
+ variant: "secondary",
+ icon: providerIcons[connection.provider],
+ ariaLabel: `${connection.connectionName}, ${providerLabels[connection.provider]}`,
+ }),
+ }),
+ createBadgeListTableColumn<GatewayModelRow, ApiFormat>({
+ accessorKey: "apiFormats",
+ header: "API formats",
+ size: 280,
+ getBadge: (format) => ({
+ value: apiFormatLabels[format],
+ variant: "secondary",
+ }),
+ }),
+];
+
+export function GatewayModelsTable({
+ data,
+ noResultsMessage,
+ pagination,
+}: {
+ data: TableProps<GatewayModelRow>["data"];
+ noResultsMessage: string;
+ pagination: PaginationBarProps;
+}) {
+ return (
+ <>
+ <Table
+ tableName={gatewayModelsFilterConfig.tableName}
+ columns={gatewayModelsColumns}
+ data={data}
+ noResultsMessage={noResultsMessage}
+ />
+ <PaginationBar {...pagination} />
+ </>
+ );
+}
+
+const providerIcons = {
+ OPENAI: SiOpenai,
+ ANTHROPIC: SiAnthropic,
+} satisfies Record<GatewayProvider, typeof SiOpenai>;
+
+const apiFormatLabels = {
+ "Anthropic Messages": "Messages",
+ "OpenAI Chat Completions": "Completions",
+ "OpenAI Responses": "Responses",
+} satisfies Record<ApiFormat, string>;
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/filterGatewayModels.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.clienttest.ts
similarity index 100%
rename from web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/filterGatewayModels.clienttest.ts
rename to web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.clienttest.ts
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/filterGatewayModels.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.ts
similarity index 85%
rename from web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/filterGatewayModels.ts
rename to web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.ts
index bd9f34f12f..dfae49f9e9 100644
--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/filterGatewayModels.ts
+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.ts
@@ -1,15 +1,7 @@
import type { FilterState } from "@langfuse/shared";
-import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";
+import type { aggregateModels } from "@/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels";
-export type GatewayModelRow = {
- id: string;
- availableVia: Array<{
- connectionId: string;
- connectionName: string;
- provider: GatewayProvider;
- }>;
- apiFormats: string[];
-};
+export type GatewayModelRow = ReturnType<typeof aggregateModels>[number];
function getModelFilterValues(model: GatewayModelRow, column: string) {
switch (column) {
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/fns/getGatewayModelConnectionSearchOptions.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.clienttest.ts
similarity index 100%
rename from web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/fns/getGatewayModelConnectionSearchOptions.clienttest.ts
rename to web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.clienttest.ts
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/fns/getGatewayModelConnectionSearchOptions.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.ts
similarity index 100%
rename from web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/fns/getGatewayModelConnectionSearchOptions.ts
rename to web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.ts
diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView.stories.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView.stories.tsx
deleted file mode 100644
index d7e2a5478d..0000000000
--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsView/GatewayModelsView.stories.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import type { ComponentProps } from "react";
-import NextAdapterPages from "next-query-params/pages";
-import { fn } from "storybook/test";
-import { QueryParamProvider } from "use-query-params";
-
-import preview from "@/.storybook/preview";
-import { GatewayModelsView } from "./GatewayModelsView";
-
-const meta = preview.meta({
- component: GatewayModelsView,
- parameters: { layout: "fullscreen" },
- decorators: [
- (Story) => (
- <QueryParamProvider adapter={NextAdapterPages}>
- <Story />
- </QueryParamProvider>
- ),
- ],
-});
-
-const models = [
- {
- id: "gpt-5-mini",
- availableVia: [
- {
- connectionId: "connection-primary",
- connectionName: "Primary",
- provider: "OPENAI",
- },
- {
- connectionId: "connection-fallback",
- connectionName: "Fallback",
- provider: "OPENAI",
- },
- {
- connectionId: "connection-secondary",
- connectionName: "Secondary production",
- provider: "OPENAI",
- },
- ],
- apiFormats: [
- "OpenAI Responses",
- "OpenAI Chat Completions",
- "Anthropic Messages",
- ],
- },
- {
- id: "claude-sonnet-4-5",
- availableVia: [
- {
- connectionId: "connection-anthropic-production",
- connectionName: "Anthropic production",
- provider: "ANTHROPIC",
- },
- ],
- apiFormats: ["Anthropic Messages"],
- },
-] satisfies ComponentProps<typeof GatewayModelsView>["models"];
-
-const manyModels = Array.from({ length: 60 }, (_, index) => {
- const provider =
- index % 2 === 0 ? ("OPENAI" as const) : ("ANTHROPIC" as const);
-
- return {
- id: `gateway-model-${String(index + 1).padStart(3, "0")}`,
- availableVia: [
- {
- connectionId: `connection-${(index % 6) + 1}`,
- connectionName: `Credential ${(index % 6) + 1}`,
- provider,
- },
- ],
- apiFormats:
- provider === "ANTHROPIC"
- ? ["Anthropic Messages"]
- : ["OpenAI Responses", "OpenAI Chat Completions"],
- };
-}) satisfies ComponentProps<typeof GatewayModelsView>["models"];
-
-const defaultArgs = {
- models,
- failedProviderCount: 0,
- providerCount: 2,
- hasProviders: true,
- hasSynced: true,
- isLoading: false,
- syncError: false,
- onSync: fn(),
- hasMoreProviders: false,
- isLoadingMoreProviders: false,
- onLoadMoreProviders: fn(),
-} satisfies ComponentProps<typeof GatewayModelsView>;
-
-export const Populated = meta.story({
- args: defaultArgs,
-});
-
-export const ManyRowsWithMoreAvailable = meta.story({
- args: {
- ...defaultArgs,
- models: manyModels,
- hasMoreProviders: true,
- },
-});
-
-export const PartialFailure = meta.story({
- args: {
- ...defaultArgs,
- failedProviderCount: 1,
- },
-});
-
-export const Empty = meta.story({
- args: {
- ...defaultArgs,
- models: [],
- },
-});
-
-export const Loading = meta.story({
- args: {
- ...defaultArgs,
- models: [],
- hasSynced: false,
- isLoading: true,
- },
-});
-
-export const MoreProvidersAvailable = meta.story({
- args: {
- ...defaultArgs,
- hasMoreProviders: true,
- },
-});