Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: use shared select for page size control (#20544)

p0nyb9a677e10592
diff --git a/frontend/src/react/components/ui/select.test.tsx b/frontend/src/react/components/ui/select.test.tsx
index 95f6597a72..61999404ba 100644
--- a/frontend/src/react/components/ui/select.test.tsx
+++ b/frontend/src/react/components/ui/select.test.tsx
@@ -1,7 +1,7 @@
import { act, type ReactNode } from "react";
import { createRoot } from "react-dom/client";
import { afterEach, describe, expect, test, vi } from "vitest";
-import { Select, SelectContent } from "./select";
+import { Select, SelectContent, SelectTrigger } from "./select";
(
globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }
@@ -14,8 +14,16 @@ const selectMocks = vi.hoisted(() => ({
vi.mock("@base-ui/react/select", () => ({
Select: {
Root: ({ children }: { children: ReactNode }) => <div>{children}</div>,
- Trigger: ({ children }: { children: ReactNode }) => (
- <button type="button">{children}</button>
+ Trigger: ({
+ children,
+ ...props
+ }: {
+ children: ReactNode;
+ className?: string;
+ }) => (
+ <button type="button" {...props}>
+ {children}
+ </button>
),
Icon: ({ children }: { children: ReactNode }) => <>{children}</>,
Value: ({ children }: { children: ReactNode }) => <>{children}</>,
@@ -97,3 +105,31 @@ describe("SelectContent", () => {
});
});
});
+
+describe("SelectTrigger", () => {
+ afterEach(() => {
+ document.body.innerHTML = "";
+ });
+
+ test("uses pointer cursor", async () => {
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(
+ <Select>
+ <SelectTrigger>Role</SelectTrigger>
+ </Select>
+ );
+ });
+
+ expect(container.querySelector("button")?.className).toContain(
+ "cursor-pointer"
+ );
+
+ await act(async () => {
+ root.unmount();
+ });
+ });
+});
diff --git a/frontend/src/react/components/ui/select.tsx b/frontend/src/react/components/ui/select.tsx
index 19359b5f8f..dac9d59af5 100644
--- a/frontend/src/react/components/ui/select.tsx
+++ b/frontend/src/react/components/ui/select.tsx
@@ -12,6 +12,7 @@ const Select = BaseSelect.Root;
const selectTriggerVariants = cva(
cn(
"inline-flex items-center justify-between gap-1 rounded-xs border border-control-border bg-background text-control whitespace-nowrap",
+ "cursor-pointer",
"hover:bg-control-bg focus:outline-hidden focus-visible:ring-2 focus-visible:ring-accent",
"disabled:pointer-events-none disabled:opacity-50"
),
diff --git a/frontend/src/react/hooks/usePagedData.test.tsx b/frontend/src/react/hooks/usePagedData.test.tsx
index 9504b3a6be..e14c46d93e 100644
--- a/frontend/src/react/hooks/usePagedData.test.tsx
+++ b/frontend/src/react/hooks/usePagedData.test.tsx
@@ -1,7 +1,7 @@
import { act } from "react";
import { createRoot, type Root } from "react-dom/client";
import { afterEach, describe, expect, test, vi } from "vitest";
-import { usePagedData } from "./usePagedData";
+import { PagedTableFooter, usePagedData } from "./usePagedData";
vi.mock("@/react/hooks/useSessionPageSize", () => ({
getPageSizeOptions: () => [50, 100],
@@ -89,3 +89,37 @@ describe("usePagedData", () => {
);
});
});
+
+describe("PagedTableFooter", () => {
+ afterEach(() => {
+ document.body.innerHTML = "";
+ });
+
+ test("uses the shared select trigger for page size", async () => {
+ const container = document.createElement("div");
+ document.body.appendChild(container);
+ const root = createRoot(container);
+
+ await act(async () => {
+ root.render(
+ <PagedTableFooter
+ pageSize={10}
+ pageSizeOptions={[10, 20]}
+ onPageSizeChange={vi.fn()}
+ hasMore={false}
+ isFetchingMore={false}
+ onLoadMore={vi.fn()}
+ />
+ );
+ });
+
+ expect(container.querySelector("select")).toBeNull();
+ expect(container.querySelector("button")?.className).toContain(
+ "cursor-pointer"
+ );
+
+ await act(async () => {
+ root.unmount();
+ });
+ });
+});
diff --git a/frontend/src/react/hooks/usePagedData.tsx b/frontend/src/react/hooks/usePagedData.tsx
index 1588fe6d17..17e7c7ea14 100644
--- a/frontend/src/react/hooks/usePagedData.tsx
+++ b/frontend/src/react/hooks/usePagedData.tsx
@@ -1,6 +1,13 @@
import { useCallback, useEffect, useReducer, useRef } from "react";
import { useTranslation } from "react-i18next";
import { Button } from "@/react/components/ui/button";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/react/components/ui/select";
import {
getPageSizeOptions,
useSessionPageSize,
@@ -242,17 +249,21 @@ export function PagedTableFooter({
<span className="text-sm text-control-light">
{t("common.rows-per-page")}
</span>
- <select
- value={pageSize}
- onChange={(e) => onPageSizeChange(Number(e.target.value))}
- className="border border-control-border rounded-sm text-sm pl-2 pr-6 py-1 min-w-[5rem]"
+ <Select
+ value={String(pageSize)}
+ onValueChange={(value) => onPageSizeChange(Number(value))}
>
- {pageSizeOptions.map((opt) => (
- <option key={opt} value={opt}>
- {opt}
- </option>
- ))}
- </select>
+ <SelectTrigger size="sm" className="min-w-[5rem] text-control">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {pageSizeOptions.map((opt) => (
+ <SelectItem key={opt} value={String(opt)}>
+ {opt}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
</div>
{hasMore && (
<Button