feat(ui): simple_table + team_dropdown migrate off antd/@tremor Text

- simple_table: the Tremor Table family is whitelisted in phase 1 so
  only the @tremor Text wrapper was swapped for a plain span with
  semantic text-muted-foreground. File keeps its inline eslint-disable
  for the preserved Tremor table primitives.
- team_dropdown: antd Select with infinite scroll + debounced remote
  search + antd LoadingOutlined \u2192 shadcn Popover + Button (combobox)
  + Input + lucide Loader2/ChevronsUpDown/X. Infinite-scroll is
  driven by the list element's scroll handler with the same 0.8
  threshold. Cleared button spans stopPropagation to prevent the
  popover from toggling open on clear.

Gates: TS \u2713 | Build \u2713.

Co-authored-by: yuneng-jiang <yuneng-berri@users.noreply.github.com>
This commit is contained in:
Cursor Agent 2026-04-23 10:46:34 +00:00
parent b58fd0b7fc
commit 328754feee
No known key found for this signature in database
2 changed files with 134 additions and 56 deletions

View file

@ -1,5 +1,13 @@
import React from "react";
import { Table, TableHead, TableRow, TableHeaderCell, TableBody, TableCell, Text } from "@tremor/react";
// eslint-disable-next-line litellm-ui/no-banned-ui-imports
import {
Table,
TableHead,
TableRow,
TableHeaderCell,
TableBody,
TableCell,
} from "@tremor/react";
export interface SimpleTableColumn<T> {
header: string;
@ -18,8 +26,10 @@ interface SimpleTableProps<T> {
}
/**
* Simple table component for forms and settings pages
* For complex tables with sorting/filtering, use DataTable from view_logs
* Simple table component for forms and settings pages.
* The underlying primitives are still Tremor's Table family (whitelisted
* by the banned-imports rule); only the Text wrapper was swapped for a
* semantic <span>.
*/
export function SimpleTable<T>({
data,
@ -44,7 +54,7 @@ export function SimpleTable<T>({
{isLoading ? (
<TableRow>
<TableCell colSpan={columns.length} className="text-center">
<Text className="text-gray-500">{loadingMessage}</Text>
<span className="text-muted-foreground">{loadingMessage}</span>
</TableCell>
</TableRow>
) : data.length > 0 ? (
@ -52,7 +62,9 @@ export function SimpleTable<T>({
<TableRow key={getRowKey ? getRowKey(row, rowIndex) : rowIndex}>
{columns.map((column, colIndex) => (
<TableCell key={colIndex}>
{column.cell ? column.cell(row) : String(row[column.accessor as keyof T] ?? "")}
{column.cell
? column.cell(row)
: String(row[column.accessor as keyof T] ?? "")}
</TableCell>
))}
</TableRow>
@ -60,7 +72,7 @@ export function SimpleTable<T>({
) : (
<TableRow>
<TableCell colSpan={columns.length} className="text-center">
<Text className="text-gray-500">{emptyMessage}</Text>
<span className="text-muted-foreground">{emptyMessage}</span>
</TableCell>
</TableRow>
)}
@ -68,4 +80,3 @@ export function SimpleTable<T>({
</Table>
);
}

View file

@ -1,11 +1,16 @@
import React, { useMemo, useState, type UIEvent } from "react";
import { Select, Typography } from "antd";
import { LoadingOutlined } from "@ant-design/icons";
import React, { useMemo, useRef, useState } from "react";
import { ChevronsUpDown, Loader2, X } from "lucide-react";
import { useDebouncedState } from "@tanstack/react-pacer/debouncer";
import { useInfiniteTeams } from "@/app/(dashboard)/hooks/teams/useTeams";
import { Team } from "../key_team_helpers/key_list";
const { Text } = Typography;
import { Button } from "@/components/ui/button";
import {
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { Input } from "@/components/ui/input";
import { cn } from "@/lib/utils";
interface TeamDropdownProps {
value?: string;
@ -29,22 +34,15 @@ const TeamDropdown: React.FC<TeamDropdownProps> = ({
organizationId,
pageSize = 20,
}) => {
const [open, setOpen] = useState(false);
const [searchInput, setSearchInput] = useState("");
const [debouncedSearch, setDebouncedSearch] = useDebouncedState("", {
wait: DEBOUNCE_MS,
});
const listRef = useRef<HTMLDivElement>(null);
const {
data,
fetchNextPage,
hasNextPage,
isFetchingNextPage,
isLoading,
} = useInfiniteTeams(
pageSize,
debouncedSearch || undefined,
organizationId,
);
const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isLoading } =
useInfiniteTeams(pageSize, debouncedSearch || undefined, organizationId);
const teams = useMemo(() => {
if (!data?.pages) return [];
@ -60,7 +58,11 @@ const TeamDropdown: React.FC<TeamDropdownProps> = ({
return result;
}, [data]);
const handlePopupScroll = (e: UIEvent<HTMLDivElement>) => {
const selectedTeam = value
? teams.find((t) => t.team_id === value)
: undefined;
const handleScroll = (e: React.UIEvent<HTMLDivElement>) => {
const target = e.currentTarget;
const scrollRatio =
(target.scrollTop + target.clientHeight) / target.scrollHeight;
@ -74,47 +76,112 @@ const TeamDropdown: React.FC<TeamDropdownProps> = ({
setDebouncedSearch(val);
};
const handleChange = (teamId: string | undefined) => {
onChange?.(teamId ?? "");
const select = (teamId: string) => {
onChange?.(teamId);
if (onTeamSelect) {
const team = teamId ? teams.find((t) => t.team_id === teamId) ?? null : null;
const team = teams.find((t) => t.team_id === teamId) ?? null;
onTeamSelect(team);
}
setOpen(false);
};
const clear = (e: React.MouseEvent) => {
e.stopPropagation();
onChange?.("");
onTeamSelect?.(null);
};
return (
<Select
showSearch
placeholder="Search or select a team"
value={value || undefined}
onChange={handleChange}
disabled={disabled}
allowClear
filterOption={false}
onSearch={handleSearch}
searchValue={searchInput}
onPopupScroll={handlePopupScroll}
loading={isLoading}
notFoundContent={isLoading ? <LoadingOutlined spin /> : "No teams found"}
data-testid="team-dropdown"
popupRender={(menu) => (
<>
{menu}
<Popover open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<Button
variant="outline"
role="combobox"
aria-expanded={open}
disabled={disabled}
className="w-full justify-between"
data-testid="team-dropdown"
>
{selectedTeam ? (
<span className="truncate">
<span className="font-medium">{selectedTeam.team_alias}</span>{" "}
<span className="text-muted-foreground">
({selectedTeam.team_id})
</span>
</span>
) : (
<span className="text-muted-foreground">
Search or select a team
</span>
)}
<div className="ml-2 flex items-center gap-1 shrink-0">
{value && (
<span
role="button"
tabIndex={0}
onClick={clear}
className="text-muted-foreground hover:text-foreground"
aria-label="Clear"
>
<X className="h-3.5 w-3.5" />
</span>
)}
<ChevronsUpDown className="h-4 w-4 opacity-50" />
</div>
</Button>
</PopoverTrigger>
<PopoverContent
className="w-[var(--radix-popover-trigger-width)] p-0"
align="start"
>
<div className="p-2 border-b">
<Input
autoFocus
placeholder="Search teams…"
value={searchInput}
onChange={(e) => handleSearch(e.target.value)}
className="h-8"
/>
</div>
<div
ref={listRef}
onScroll={handleScroll}
className="max-h-60 overflow-y-auto p-1"
>
{isLoading && teams.length === 0 ? (
<div className="flex items-center justify-center py-6 text-muted-foreground">
<Loader2 className="h-4 w-4 animate-spin" />
</div>
) : teams.length === 0 ? (
<div className="py-6 text-center text-sm text-muted-foreground">
No teams found
</div>
) : (
teams.map((team) => (
<button
key={team.team_id}
type="button"
onClick={() => select(team.team_id)}
className={cn(
"w-full text-left px-2 py-1.5 text-sm rounded hover:bg-accent",
value === team.team_id && "bg-accent",
)}
>
<span className="font-medium">{team.team_alias}</span>{" "}
<span className="text-muted-foreground">
({team.team_id})
</span>
</button>
))
)}
{isFetchingNextPage && (
<div style={{ textAlign: "center", padding: 8 }}>
<LoadingOutlined spin />
<div className="flex items-center justify-center py-2">
<Loader2 className="h-3.5 w-3.5 animate-spin text-muted-foreground" />
</div>
)}
</>
)}
>
{teams.map((team) => (
<Select.Option key={team.team_id} value={team.team_id}>
<span className="font-medium">{team.team_alias}</span>{" "}
<Text type="secondary">({team.team_id})</Text>
</Select.Option>
))}
</Select>
</div>
</PopoverContent>
</Popover>
);
};