Skip to content

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

refactor: react table (#19943)

ecmadao2d97c3b57dce
diff --git a/frontend/src/react/components/database/DatabaseTable.tsx b/frontend/src/react/components/database/DatabaseTable.tsx
index 9cc57a3328..3345b96f29 100644
--- a/frontend/src/react/components/database/DatabaseTable.tsx
+++ b/frontend/src/react/components/database/DatabaseTable.tsx
@@ -1,9 +1,17 @@
-import { CheckCircle, ChevronDown, XCircle } from "lucide-react";
+import { CheckCircle, XCircle } from "lucide-react";
import { useCallback, useEffect, useRef, useState } from "react";
import { useTranslation } from "react-i18next";
import { EngineIconPath } from "@/components/InstanceForm/constants";
import { EnvironmentLabel } from "@/react/components/EnvironmentLabel";
import { LabelsDisplay } from "@/react/components/LabelsDisplay";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { PagedTableFooter } from "@/react/hooks/usePagedData";
import {
getPageSizeOptions,
@@ -186,20 +194,6 @@ export function DatabaseTable({
}
}, []);
- const renderSortIndicator = (columnKey: string) => {
- if (sortKey !== columnKey) {
- return <ChevronDown className="h-3 w-3 text-gray-300" />;
- }
- return (
- <ChevronDown
- className={cn(
- "h-3 w-3 text-accent transition-transform",
- sortOrder === "asc" && "rotate-180"
- )}
- />
- );
- };
-
const allSelected =
databases.length > 0 && (selectedNames?.size ?? 0) === databases.length;
const someSelected =
@@ -219,11 +213,11 @@ export function DatabaseTable({
<>
<div className="border rounded-sm">
<div className="overflow-x-auto">
- <table className="w-full text-sm min-w-[800px]">
- <thead>
- <tr className="bg-gray-50 border-b border-control-border">
+ <Table className="min-w-[800px]">
+ <TableHeader>
+ <TableRow className="bg-gray-50">
{showSelection && (
- <th className="w-12 px-4 py-2">
+ <TableHead className="w-12">
<input
ref={headerCheckboxRef}
type="checkbox"
@@ -231,93 +225,86 @@ export function DatabaseTable({
onChange={toggleSelectAll}
className="rounded-xs border-control-border"
/>
- </th>
+ </TableHead>
)}
- <th
- className="px-4 py-2 text-left font-medium cursor-pointer select-none"
- onClick={() => toggleSort("name")}
+ <TableHead
+ sortable
+ sortActive={sortKey === "name"}
+ sortDir={sortOrder}
+ onSort={() => toggleSort("name")}
>
- <div className="flex items-center gap-x-1">
- {t("common.name")}
- {renderSortIndicator("name")}
- </div>
- </th>
- <th className="px-4 py-2 text-left font-medium">
- {t("common.environment")}
- </th>
+ {t("common.name")}
+ </TableHead>
+ <TableHead>{t("common.environment")}</TableHead>
{!showProjectColumn && (
- <th className="px-4 py-2 text-left font-medium">
- {t("common.release")}
- </th>
+ <TableHead>{t("common.release")}</TableHead>
)}
{showProjectColumn && (
- <th
- className="px-4 py-2 text-left font-medium cursor-pointer select-none"
- onClick={() => toggleSort("project")}
+ <TableHead
+ sortable
+ sortActive={sortKey === "project"}
+ sortDir={sortOrder}
+ onSort={() => toggleSort("project")}
>
- <div className="flex items-center gap-x-1">
- {t("common.project")}
- {renderSortIndicator("project")}
- </div>
- </th>
+ {t("common.project")}
+ </TableHead>
)}
- <th
- className="px-4 py-2 text-left font-medium cursor-pointer select-none"
- onClick={() => toggleSort("instance")}
+ <TableHead
+ sortable
+ sortActive={sortKey === "instance"}
+ sortDir={sortOrder}
+ onSort={() => toggleSort("instance")}
>
- <div className="flex items-center gap-x-1">
- {t("common.instance")}
- {renderSortIndicator("instance")}
- </div>
- </th>
- <th className="px-4 py-2 text-left font-medium hidden md:table-cell">
+ {t("common.instance")}
+ </TableHead>
+ <TableHead className="hidden md:table-cell">
{t("common.address")}
- </th>
- <th className="px-4 py-2 text-left font-medium hidden md:table-cell">
+ </TableHead>
+ <TableHead className="hidden md:table-cell">
{t("common.labels")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ </TableHead>
+ <TableHead className="whitespace-nowrap">
{t("common.status")}
- </th>
- </tr>
- </thead>
- <tbody>
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{loading && databases.length === 0 ? (
- <tr>
- <td
+ <TableRow>
+ <TableCell
colSpan={8}
- className="px-4 py-8 text-center text-control-placeholder"
+ className="py-8 text-center text-control-placeholder"
>
<div className="flex items-center justify-center gap-x-2">
<div className="animate-spin h-4 w-4 border-2 border-accent border-t-transparent rounded-full" />
{t("common.loading")}
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
) : databases.length === 0 ? (
- <tr>
- <td
+ <TableRow>
+ <TableCell
colSpan={8}
- className="px-4 py-8 text-center text-control-placeholder"
+ className="py-8 text-center text-control-placeholder"
>
{t("common.no-data")}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
) : (
databases.map((db, i) => {
const isSelected = selectedNames?.has(db.name) ?? false;
const instanceResource = getInstanceResource(db);
return (
- <tr
+ <TableRow
key={db.name}
className={cn(
- "border-b last:border-b-0 cursor-pointer hover:bg-gray-50",
+ "cursor-pointer",
i % 2 === 1 && "bg-gray-50/50"
)}
onClick={(e) => handleRowClick(db, e)}
>
{showSelection && (
- <td className="w-12 px-4 py-2">
+ <TableCell className="w-12">
<input
type="checkbox"
checked={isSelected}
@@ -325,9 +312,9 @@ export function DatabaseTable({
onClick={(e) => e.stopPropagation()}
className="rounded-xs border-control-border"
/>
- </td>
+ </TableCell>
)}
- <td className="px-4 py-2">
+ <TableCell>
<div className="flex items-center gap-x-2">
<img
className="h-5 w-5 shrink-0"
@@ -338,42 +325,42 @@ export function DatabaseTable({
{extractDatabaseResourceName(db.name).databaseName}
</span>
</div>
- </td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell>
<EnvironmentLabel
environmentName={getDatabaseEnvironment(db).name}
/>
- </td>
+ </TableCell>
{!showProjectColumn && (
- <td className="px-4 py-2">
+ <TableCell>
<span className="truncate">
{db.release ? extractReleaseUID(db.release) : "-"}
</span>
- </td>
+ </TableCell>
)}
{showProjectColumn && (
- <td className="px-4 py-2">
+ <TableCell>
<span className="truncate">
{extractProjectResourceName(
getDatabaseProject(db).name
)}
</span>
- </td>
+ </TableCell>
)}
- <td className="px-4 py-2 max-w-[200px]">
+ <TableCell className="max-w-[200px]">
<span className="block truncate">
{instanceResource.title}
</span>
- </td>
- <td className="px-4 py-2 hidden md:table-cell">
+ </TableCell>
+ <TableCell className="hidden md:table-cell">
<span className="truncate">
{hostPortOfInstanceV1(instanceResource)}
</span>
- </td>
- <td className="px-4 py-2 hidden md:table-cell">
+ </TableCell>
+ <TableCell className="hidden md:table-cell">
<LabelsDisplay labels={db.labels} />
- </td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell>
{db.syncStatus === SyncStatus.FAILED ? (
<span
title={
@@ -385,13 +372,13 @@ export function DatabaseTable({
) : (
<CheckCircle className="w-4 h-4 text-success" />
)}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
);
})
)}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
</div>
diff --git a/frontend/src/react/components/instance/InstanceRoleTable.tsx b/frontend/src/react/components/instance/InstanceRoleTable.tsx
index 9b36d94ab9..af728d9c3c 100644
--- a/frontend/src/react/components/instance/InstanceRoleTable.tsx
+++ b/frontend/src/react/components/instance/InstanceRoleTable.tsx
@@ -1,4 +1,12 @@
import { useTranslation } from "react-i18next";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import type { InstanceRole } from "@/types/proto-es/v1/instance_role_service_pb";
interface InstanceRoleTableProps {
@@ -11,43 +19,34 @@ export function InstanceRoleTable({
const { t } = useTranslation();
return (
- <table className="w-full text-sm border border-block-border rounded-sm">
- <thead>
- <tr className="bg-gray-50 border-b border-block-border">
- <th className="text-left px-4 py-2 w-[200px] font-medium">
- {t("common.user")}
- </th>
- <th className="text-left px-4 py-2 font-medium">
- {t("instance.grants")}
- </th>
- </tr>
- </thead>
- <tbody>
+ <Table className="border border-block-border rounded-sm">
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="w-[200px]">{t("common.user")}</TableHead>
+ <TableHead>{t("instance.grants")}</TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{instanceRoleList.length === 0 ? (
- <tr>
- <td
+ <TableRow>
+ <TableCell
colSpan={2}
- className="px-4 py-8 text-center text-control-light"
+ className="py-8 text-center text-control-light"
>
{t("common.no-data")}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
) : (
- instanceRoleList.map((role, index) => (
- <tr
- key={role.roleName}
- className={index % 2 === 1 ? "bg-gray-50/50" : ""}
- >
- <td className="px-4 py-2 border-b border-block-border">
- {role.roleName}
- </td>
- <td className="px-4 py-2 border-b border-block-border whitespace-pre-wrap break-all">
+ instanceRoleList.map((role) => (
+ <TableRow key={role.roleName}>
+ <TableCell>{role.roleName}</TableCell>
+ <TableCell className="whitespace-pre-wrap break-all">
{(role.attribute ?? "").replaceAll("\n", "\n\n")}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
))
)}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
);
}
diff --git a/frontend/src/react/components/sql-review/RuleTable.tsx b/frontend/src/react/components/sql-review/RuleTable.tsx
index 0f494b6d53..46b7103bde 100644
--- a/frontend/src/react/components/sql-review/RuleTable.tsx
+++ b/frontend/src/react/components/sql-review/RuleTable.tsx
@@ -4,6 +4,14 @@ import { useTranslation } from "react-i18next";
import { getRuleKey } from "@/components/SQLReview/components/utils";
import { Button } from "@/react/components/ui/button";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Tabs, TabsList, TabsTrigger } from "@/react/components/ui/tabs";
import type { Engine } from "@/types/proto-es/v1/common_pb";
import { SQLReviewRule_Level } from "@/types/proto-es/v1/review_config_service_pb";
@@ -321,28 +329,28 @@ export function RuleTable({
{/* Desktop table */}
<div className="hidden lg:block border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="w-8 px-3 py-2" />
- {supportSelect && <th className="w-8 px-3 py-2" />}
- <th className="text-left px-4 py-2 font-medium whitespace-nowrap">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="w-8" />
+ {supportSelect && <TableHead className="w-8" />}
+ <TableHead className="whitespace-nowrap">
{t("common.name")}
- </th>
+ </TableHead>
{!hideLevel && (
- <th className="text-left px-4 py-2 font-medium whitespace-nowrap w-[12rem]">
+ <TableHead className="whitespace-nowrap w-[12rem]">
{t("sql-review.level.name")}
- </th>
+ </TableHead>
)}
{!supportSelect && (
- <th className="text-right px-4 py-2 font-medium whitespace-nowrap w-48">
+ <TableHead className="text-right whitespace-nowrap w-48">
{t("common.operations")}
- </th>
+ </TableHead>
)}
- </tr>
- </thead>
- <tbody>
- {category.ruleList.map((rule, idx) => {
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {category.ruleList.map((rule) => {
const key = getRuleKey(rule);
const loc = getRuleLocalization(
ruleTypeToString(rule.type),
@@ -358,7 +366,6 @@ export function RuleTable({
loc={loc}
expanded={expanded}
expandable={expandable}
- striped={idx % 2 === 1}
supportSelect={supportSelect}
hideLevel={hideLevel}
editable={editable}
@@ -371,8 +378,8 @@ export function RuleTable({
/>
);
})}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
{/* Mobile cards */}
@@ -464,7 +471,6 @@ interface RuleTableRowProps {
loc: { title: string; description: string };
expanded: boolean;
expandable: boolean;
- striped: boolean;
supportSelect: boolean;
hideLevel: boolean;
editable: boolean;
@@ -481,7 +487,6 @@ function RuleTableRow({
loc,
expanded,
expandable,
- striped,
supportSelect,
hideLevel,
editable,
@@ -499,11 +504,11 @@ function RuleTableRow({
return (
<>
- <tr
- className={`border-b last:border-b-0 ${striped ? "bg-gray-50" : ""} ${supportSelect ? "cursor-pointer hover:bg-gray-50" : ""}`}
+ <TableRow
+ className={supportSelect ? "cursor-pointer" : ""}
onClick={supportSelect ? onToggleRule : undefined}
>
- <td className="px-3 py-2 w-8" onClick={(e) => e.stopPropagation()}>
+ <TableCell className="w-8" onClick={(e) => e.stopPropagation()}>
{expandable && (
<button
type="button"
@@ -517,18 +522,18 @@ function RuleTableRow({
)}
</button>
)}
- </td>
+ </TableCell>
{supportSelect && (
- <td className="px-3 py-2 w-8" onClick={(e) => e.stopPropagation()}>
+ <TableCell className="w-8" onClick={(e) => e.stopPropagation()}>
<input
type="checkbox"
checked={isSelected}
onChange={onToggleRule}
className="h-4 w-4 rounded-xs border-control-border accent-accent"
/>
- </td>
+ </TableCell>
)}
- <td className="px-4 py-2">
+ <TableCell>
<div className="flex items-center gap-x-2">
<span>{loc.title}</span>
<a
@@ -540,18 +545,18 @@ function RuleTableRow({
<ExternalLink className="w-4 h-4" />
</a>
</div>
- </td>
+ </TableCell>
{!hideLevel && (
- <td className="px-4 py-2" onClick={(e) => e.stopPropagation()}>
+ <TableCell onClick={(e) => e.stopPropagation()}>
<RuleLevelSwitch
level={rule.level}
disabled={!editable}
onLevelChange={onLevelChange}
/>
- </td>
+ </TableCell>
)}
{!supportSelect && (
- <td className="px-4 py-2" onClick={(e) => e.stopPropagation()}>
+ <TableCell onClick={(e) => e.stopPropagation()}>
<div className="flex items-center justify-end gap-x-2">
<Button variant="outline" size="sm" onClick={onEdit}>
{editable ? t("common.edit") : t("common.view")}
@@ -562,14 +567,14 @@ function RuleTableRow({
</Button>
)}
</div>
- </td>
+ </TableCell>
)}
- </tr>
+ </TableRow>
{expanded && (
- <tr className="border-b last:border-b-0">
- <td colSpan={colSpan} className="px-10 py-3 bg-gray-50/50">
+ <TableRow>
+ <TableCell colSpan={colSpan} className="px-10 bg-control-bg/40">
{loc.description && (
- <p className="text-gray-500">{loc.description}</p>
+ <p className="text-control-light">{loc.description}</p>
)}
{rule.componentList.length > 0 && loc.description && (
<hr className="my-4 border-control-border" />
@@ -577,8 +582,8 @@ function RuleTableRow({
{rule.componentList.length > 0 && (
<RuleConfig rule={rule} disabled size="small" />
)}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
)}
</>
);
diff --git a/frontend/src/react/components/ui/table.tsx b/frontend/src/react/components/ui/table.tsx
index cc74900e5f..2610207544 100644
--- a/frontend/src/react/components/ui/table.tsx
+++ b/frontend/src/react/components/ui/table.tsx
@@ -1,3 +1,4 @@
+import { ArrowDown, ArrowUp, ArrowUpDown } from "lucide-react";
import type { ComponentPropsWithoutRef } from "react";
import { cn } from "@/react/lib/utils";
@@ -35,14 +36,68 @@ function TableRow({ className, ...props }: ComponentPropsWithoutRef<"tr">) {
);
}
-function TableHead({ className, ...props }: ComponentPropsWithoutRef<"th">) {
+export type TableHeadSortDirection = "asc" | "desc";
+
+interface TableHeadProps extends ComponentPropsWithoutRef<"th"> {
+ /** Show a sort indicator and make the header clickable. */
+ sortable?: boolean;
+ /** Whether this column is the currently active sort column. */
+ sortActive?: boolean;
+ /** Current direction when `sortActive` is true. */
+ sortDir?: TableHeadSortDirection;
+ /** Called when the user clicks to toggle sort. */
+ onSort?: () => void;
+}
+
+function TableHead({
+ className,
+ children,
+ sortable,
+ sortActive,
+ sortDir,
+ onSort,
+ onClick,
+ ...props
+}: TableHeadProps) {
return (
<th
className={cn(
"h-10 px-4 py-2 text-left align-middle font-medium text-control-light",
+ sortable && "cursor-pointer select-none hover:text-control",
className
)}
+ onClick={(e) => {
+ onClick?.(e);
+ if (sortable) onSort?.();
+ }}
{...props}
+ >
+ {sortable ? (
+ <span className="inline-flex items-center gap-x-1">
+ {children}
+ <SortIndicator active={!!sortActive} dir={sortDir} />
+ </span>
+ ) : (
+ children
+ )}
+ </th>
+ );
+}
+
+function SortIndicator({
+ active,
+ dir,
+}: {
+ active: boolean;
+ dir?: TableHeadSortDirection;
+}) {
+ const Icon = active ? (dir === "asc" ? ArrowUp : ArrowDown) : ArrowUpDown;
+ return (
+ <Icon
+ className={cn(
+ "w-3.5 h-3.5",
+ active ? "text-accent" : "text-control-placeholder"
+ )}
/>
);
}
diff --git a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
index e63d79425d..4aef3111c6 100644
--- a/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
+++ b/frontend/src/react/pages/project/ProjectAccessGrantsPage.tsx
@@ -1,4 +1,3 @@
-import { ArrowDown, ArrowUp, ArrowUpDown } from "lucide-react";
import { useCallback, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { EngineIconPath } from "@/components/InstanceForm/constants";
@@ -19,6 +18,14 @@ import {
DialogContent,
DialogTitle,
} from "@/react/components/ui/dialog";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
@@ -400,62 +407,65 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
</div>
) : (
<div className="px-4">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b text-left text-control-light">
- <th className="py-2 pr-4 font-medium w-24">
- {t("common.status")}
- </th>
- <SortableHeader
- label={t("common.creator")}
- sortKey="creator"
- activeSortKey={sortKey}
- sortDir={sortDir}
- onSort={handleSort}
- className="w-44"
- />
- <SortableHeader
- label={t("common.created-at")}
- sortKey="create_time"
- activeSortKey={sortKey}
- sortDir={sortDir}
- onSort={handleSort}
- className="w-44 hidden xl:table-cell"
- />
- <SortableHeader
- label={t("common.expiration")}
- sortKey="expire_time"
- activeSortKey={sortKey}
- sortDir={sortDir}
- onSort={handleSort}
- className="w-44 hidden xl:table-cell"
- />
- <th className="py-2 pr-4 font-medium">
- {t("common.statement")}
- </th>
- <th className="py-2 pr-4 font-medium w-48">
- {t("common.databases")}
- </th>
- <th className="py-2 font-medium w-40" />
- </tr>
- </thead>
- <tbody>
- {paged.dataList.map((grant) => (
- <AccessGrantRow
- key={grant.name}
- grant={grant}
- canActivate={canActivate}
- canRevoke={canRevoke}
- onActivate={() =>
- setConfirmAction({ type: "activate", grant })
- }
- onRevoke={() =>
- setConfirmAction({ type: "revoke", grant })
- }
- />
- ))}
- </tbody>
- </table>
+ <div className="border rounded-sm overflow-hidden">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="w-24">
+ {t("common.status")}
+ </TableHead>
+ <TableHead
+ sortable
+ sortActive={sortKey === "creator"}
+ sortDir={sortDir}
+ onSort={() => handleSort("creator")}
+ className="w-44"
+ >
+ {t("common.creator")}
+ </TableHead>
+ <TableHead
+ sortable
+ sortActive={sortKey === "create_time"}
+ sortDir={sortDir}
+ onSort={() => handleSort("create_time")}
+ className="w-44 hidden xl:table-cell"
+ >
+ {t("common.created-at")}
+ </TableHead>
+ <TableHead
+ sortable
+ sortActive={sortKey === "expire_time"}
+ sortDir={sortDir}
+ onSort={() => handleSort("expire_time")}
+ className="w-44 hidden xl:table-cell"
+ >
+ {t("common.expiration")}
+ </TableHead>
+ <TableHead>{t("common.statement")}</TableHead>
+ <TableHead className="w-48">
+ {t("common.databases")}
+ </TableHead>
+ <TableHead className="w-40" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {paged.dataList.map((grant) => (
+ <AccessGrantRow
+ key={grant.name}
+ grant={grant}
+ canActivate={canActivate}
+ canRevoke={canRevoke}
+ onActivate={() =>
+ setConfirmAction({ type: "activate", grant })
+ }
+ onRevoke={() =>
+ setConfirmAction({ type: "revoke", grant })
+ }
+ />
+ ))}
+ </TableBody>
+ </Table>
+ </div>
<div className="mt-4">
<PagedTableFooter
@@ -511,47 +521,6 @@ export function ProjectAccessGrantsPage({ projectId }: { projectId: string }) {
);
}
-// ---------------------------------------------------------------------------
-// SortableHeader
-// ---------------------------------------------------------------------------
-
-function SortableHeader({
- label,
- sortKey,
- activeSortKey,
- sortDir,
- onSort,
- className,
-}: {
- label: string;
- sortKey: SortKey;
- activeSortKey: SortKey | "";
- sortDir: SortDir;
- onSort: (key: SortKey) => void;
- className?: string;
-}) {
- const isActive = activeSortKey === sortKey;
- const Icon = isActive
- ? sortDir === "asc"
- ? ArrowUp
- : ArrowDown
- : ArrowUpDown;
-
- return (
- <th
- className={`py-2 pr-4 font-medium cursor-pointer select-none hover:text-control ${className ?? ""}`}
- onClick={() => onSort(sortKey)}
- >
- <span className="inline-flex items-center gap-x-1">
- {label}
- <Icon
- className={`w-3.5 h-3.5 ${isActive ? "text-accent" : "text-control-placeholder"}`}
- />
- </span>
- </th>
- );
-}
-
// ---------------------------------------------------------------------------
// AccessGrantRow
// ---------------------------------------------------------------------------
@@ -581,18 +550,18 @@ function AccessGrantRow({
expirationInfo.type === "datetime" ? expirationInfo.value : "-";
return (
- <tr className="border-b">
- <td className="py-2 pr-4">
+ <TableRow>
+ <TableCell>
<Badge variant={statusTagVariant(status)}>
{getAccessGrantDisplayStatusText(grant)}
</Badge>
- </td>
- <td className="py-2 pr-4 truncate max-w-44">
+ </TableCell>
+ <TableCell className="truncate max-w-44">
{extractUserEmail(grant.creator)}
- </td>
- <td className="py-2 pr-4 text-sm hidden xl:table-cell">{createdAt}</td>
- <td className="py-2 pr-4 text-sm hidden xl:table-cell">{expiration}</td>
- <td className="py-2 pr-4">
+ </TableCell>
+ <TableCell className="hidden xl:table-cell">{createdAt}</TableCell>
+ <TableCell className="hidden xl:table-cell">{expiration}</TableCell>
+ <TableCell>
<Tooltip
content={
<pre className="max-w-lg whitespace-pre-wrap">{grant.query}</pre>
@@ -609,11 +578,11 @@ function AccessGrantRow({
)}
</div>
</Tooltip>
- </td>
- <td className="py-2 pr-4">
+ </TableCell>
+ <TableCell>
<DatabaseTargets targets={grant.targets} />
- </td>
- <td className="py-2">
+ </TableCell>
+ <TableCell>
<div className="flex items-center justify-end gap-x-1">
{status === "REVOKED" && canActivate && (
<Button variant="ghost" size="sm" onClick={onActivate}>
@@ -645,8 +614,8 @@ function AccessGrantRow({
</a>
)}
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
);
}
diff --git a/frontend/src/react/pages/settings/GroupsPage.tsx b/frontend/src/react/pages/settings/GroupsPage.tsx
index 2fe9cd25ea..ef37b2fe6a 100644
--- a/frontend/src/react/pages/settings/GroupsPage.tsx
+++ b/frontend/src/react/pages/settings/GroupsPage.tsx
@@ -19,6 +19,14 @@ import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
@@ -236,16 +244,16 @@ function GroupTable({
return (
<div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="whitespace-nowrap">
{t("common.groups")} / {t("common.users")}
- </th>
- <th className="px-4 py-2 text-right font-medium whitespace-nowrap w-16" />
- </tr>
- </thead>
- <tbody>
+ </TableHead>
+ <TableHead className="text-right whitespace-nowrap w-16" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{groups.map((group, i) => {
const isExpanded = expandedGroups.has(group.name);
const members = memberCache.get(group.name);
@@ -272,8 +280,8 @@ function GroupTable({
/>
);
})}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
);
}
@@ -306,8 +314,8 @@ function GroupRow({
return (
<>
- <tr className={`border-b last:border-b-0 ${stripeBg}`}>
- <td className="px-4 py-2">
+ <TableRow className={stripeBg}>
+ <TableCell className="py-2">
<div className="flex items-center gap-x-2">
<button
className="shrink-0 p-0.5 rounded-xs hover:bg-gray-200"
@@ -341,8 +349,8 @@ function GroupRow({
</span>
</div>
</div>
- </td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell className="py-2">
<div className="flex justify-end gap-x-1">
{canEdit && (
<Tooltip content={t("common.edit")}>
@@ -369,8 +377,8 @@ function GroupRow({
</Tooltip>
)}
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
{isExpanded &&
members &&
members.map((user) => {
@@ -380,11 +388,8 @@ function GroupRow({
const isOwner = memberInfo?.role === GroupMember_Role.OWNER;
return (
- <tr
- key={user.name}
- className={`border-b last:border-b-0 ${stripeBg}`}
- >
- <td className="px-4 py-2 pl-14">
+ <TableRow key={user.name} className={stripeBg}>
+ <TableCell className="py-2 pl-14">
<div className="flex items-center gap-x-2">
<span>{user.title}</span>
<span className="textinfolabel text-xs">{user.email}</span>
@@ -398,20 +403,20 @@ function GroupRow({
</Badge>
)}
</div>
- </td>
- <td />
- </tr>
+ </TableCell>
+ <TableCell />
+ </TableRow>
);
})}
{isExpanded && !members && (
- <tr className={stripeBg}>
- <td colSpan={2} className="px-4 py-2 pl-14">
+ <TableRow className={stripeBg}>
+ <TableCell colSpan={2} className="py-2 pl-14">
<div className="flex items-center gap-x-2 text-control-light text-sm">
<div className="animate-spin h-4 w-4 border-2 border-accent border-t-transparent rounded-full" />
{t("common.loading")}
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
)}
</>
);
diff --git a/frontend/src/react/pages/settings/IDPsPage.tsx b/frontend/src/react/pages/settings/IDPsPage.tsx
index df814bb17c..036c753cd5 100644
--- a/frontend/src/react/pages/settings/IDPsPage.tsx
+++ b/frontend/src/react/pages/settings/IDPsPage.tsx
@@ -26,6 +26,14 @@ import {
} from "@/react/components/ResourceIdField";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { useVueState } from "@/react/hooks/useVueState";
import { router } from "@/router";
import { WORKSPACE_ROUTE_IDENTITY_PROVIDER_DETAIL } from "@/router/dashboard/workspaceRoutes";
@@ -2041,55 +2049,47 @@ export function IDPsPage() {
{ready ? (
<div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium w-40">
- {t("common.id")}
- </th>
- <th className="px-4 py-2 text-left font-medium">
- {t("common.name")}
- </th>
- <th className="px-4 py-2 text-left font-medium w-32">
- {t("common.type")}
- </th>
- <th className="px-4 py-2 text-left font-medium w-48">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="w-40">{t("common.id")}</TableHead>
+ <TableHead>{t("common.name")}</TableHead>
+ <TableHead className="w-32">{t("common.type")}</TableHead>
+ <TableHead className="w-48">
{t("settings.sso.form.domain")}
- </th>
- </tr>
- </thead>
- <tbody>
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{identityProviderList.length === 0 ? (
- <tr>
- <td
+ <TableRow>
+ <TableCell
colSpan={4}
- className="px-4 py-8 text-center text-control-light"
+ className="py-8 text-center text-control-light"
>
{t("common.no-data")}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
) : (
- identityProviderList.map((idp, i) => (
- <tr
+ identityProviderList.map((idp) => (
+ <TableRow
key={idp.name}
- className={`border-b last:border-b-0 cursor-pointer hover:bg-gray-50 ${
- i % 2 === 1 ? "bg-gray-50/50" : ""
- }`}
+ className="cursor-pointer"
onClick={() => handleRowClick(idp)}
>
- <td className="px-4 py-2">
+ <TableCell>
{getIdentityProviderResourceId(idp.name)}
- </td>
- <td className="px-4 py-2">{idp.title}</td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell>{idp.title}</TableCell>
+ <TableCell>
{identityProviderTypeToString(idp.type)}
- </td>
- <td className="px-4 py-2">{idp.domain || "-"}</td>
- </tr>
+ </TableCell>
+ <TableCell>{idp.domain || "-"}</TableCell>
+ </TableRow>
))
)}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
) : (
<div className="flex items-center justify-center h-32">
diff --git a/frontend/src/react/pages/settings/RolesPage.tsx b/frontend/src/react/pages/settings/RolesPage.tsx
index 3f46bb5ee7..004a18e7d9 100644
--- a/frontend/src/react/pages/settings/RolesPage.tsx
+++ b/frontend/src/react/pages/settings/RolesPage.tsx
@@ -22,6 +22,14 @@ import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Textarea } from "@/react/components/ui/textarea";
import { BlockTooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
@@ -825,45 +833,42 @@ export function RolesPage() {
{/* Roles Table */}
{ready ? (
<div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm table-fixed">
+ <Table className="table-fixed">
<colgroup>
<col className="w-1/3" />
<col />
<col className="w-24" />
</colgroup>
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="whitespace-nowrap">
{t("role.title")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ </TableHead>
+ <TableHead className="whitespace-nowrap">
{t("common.description")}
- </th>
- <th className="px-4 py-2 text-right font-medium whitespace-nowrap" />
- </tr>
- </thead>
- <tbody>
- {filteredRoleList.map((role, i) => (
- <tr
- key={role.name}
- className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-gray-50" : ""}`}
- >
- <td className="px-4 py-2 whitespace-nowrap">
+ </TableHead>
+ <TableHead className="text-right whitespace-nowrap" />
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {filteredRoleList.map((role) => (
+ <TableRow key={role.name}>
+ <TableCell className="whitespace-nowrap">
<span>{displayRoleTitle(role.name)}</span>
{!isCustomRole(role.name) && (
<Badge variant="secondary" className="ml-2 text-xs">
{t("common.system")}
</Badge>
)}
- </td>
- <td className="px-4 py-2 text-control-light overflow-hidden">
+ </TableCell>
+ <TableCell className="text-control-light overflow-hidden">
<BlockTooltip content={displayRoleDescription(role.name)}>
<span className="block truncate">
{displayRoleDescription(role.name)}
</span>
</BlockTooltip>
- </td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell>
{isCustomRole(role.name) && (
<div className="flex justify-end gap-x-2">
{canDelete && (
@@ -886,11 +891,11 @@ export function RolesPage() {
</Button>
</div>
)}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
))}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
) : (
<div className="flex items-center justify-center h-32">
diff --git a/frontend/src/react/pages/settings/SQLReviewPage.tsx b/frontend/src/react/pages/settings/SQLReviewPage.tsx
index 6ef3fea3b9..0e9833ad6b 100644
--- a/frontend/src/react/pages/settings/SQLReviewPage.tsx
+++ b/frontend/src/react/pages/settings/SQLReviewPage.tsx
@@ -6,6 +6,14 @@ import { ResourceLink } from "@/react/components/sql-review/ResourceLink";
import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useVueState } from "@/react/hooks/useVueState";
import { router } from "@/router";
@@ -89,34 +97,31 @@ function PolicyTable({
<>
{/* Desktop table */}
<div className="hidden lg:block border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap w-[200px]">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="whitespace-nowrap w-[200px]">
{t("common.name")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap w-[250px]">
+ </TableHead>
+ <TableHead className="whitespace-nowrap w-[250px]">
{t("common.resource")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ </TableHead>
+ <TableHead className="whitespace-nowrap">
{t("sql-review.enabled-rules")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap capitalize w-[7rem]">
+ </TableHead>
+ <TableHead className="whitespace-nowrap capitalize w-[7rem]">
{t("common.enabled")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap w-[10rem]">
+ </TableHead>
+ <TableHead className="whitespace-nowrap w-[10rem]">
{t("common.operations")}
- </th>
- </tr>
- </thead>
- <tbody>
- {policies.map((policy, i) => (
- <tr
- key={policy.id}
- className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-gray-50" : ""}`}
- >
- <td className="px-4 py-2">{highlight(policy.name)}</td>
- <td className="px-4 py-2">
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
+ {policies.map((policy) => (
+ <TableRow key={policy.id}>
+ <TableCell>{highlight(policy.name)}</TableCell>
+ <TableCell>
<div className="flex flex-wrap gap-2">
{policy.resources.length === 0 && <span>-</span>}
{policy.resources.map((resource) => (
@@ -125,9 +130,9 @@ function PolicyTable({
</Badge>
))}
</div>
- </td>
- <td className="px-4 py-2">{policy.ruleList.length}</td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell>{policy.ruleList.length}</TableCell>
+ <TableCell>
{hasUpdatePermission ? (
<input
type="checkbox"
@@ -140,8 +145,8 @@ function PolicyTable({
) : (
<X className="w-4 h-4 text-control-light" />
)}
- </td>
- <td className="px-4 py-2">
+ </TableCell>
+ <TableCell>
<div className="flex items-center gap-x-2">
{hasDeletePermission &&
(confirmingDelete === policy.id ? (
@@ -196,11 +201,11 @@ function PolicyTable({
</Button>
</Tooltip>
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
))}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
{/* Mobile card layout */}
diff --git a/frontend/src/react/pages/settings/UsersPage.tsx b/frontend/src/react/pages/settings/UsersPage.tsx
index aec3952b8c..79d8d4fdf2 100644
--- a/frontend/src/react/pages/settings/UsersPage.tsx
+++ b/frontend/src/react/pages/settings/UsersPage.tsx
@@ -23,6 +23,14 @@ import { Badge } from "@/react/components/ui/badge";
import { Button } from "@/react/components/ui/button";
import { Input } from "@/react/components/ui/input";
import { SearchInput } from "@/react/components/ui/search-input";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
import { useEscapeKey } from "@/react/hooks/useEscapeKey";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
@@ -215,33 +223,33 @@ function UserTable({
return (
<div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="whitespace-nowrap">
{t("settings.members.table.account")}
- </th>
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ </TableHead>
+ <TableHead className="whitespace-nowrap">
{t("settings.members.table.groups")}
- </th>
- <th className="px-4 py-2 text-right font-medium whitespace-nowrap">
+ </TableHead>
+ <TableHead className="text-right whitespace-nowrap">
{t("common.operations")}
- </th>
- </tr>
- </thead>
- <tbody>
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{users.map((user, i) => {
const accountType = getAccountTypeByEmail(user.email);
const isDeleted = user.state === State.DELETED;
const isSelf = currentUser.name === user.name;
return (
- <tr
+ <TableRow
key={user.name}
- className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-gray-50" : ""}`}
+ className={i % 2 === 1 ? "bg-gray-50" : ""}
>
{/* Account column */}
- <td className="px-4 py-2">
+ <TableCell className="py-2">
<div className="flex items-center gap-x-3">
<UserAvatar title={user.title || user.email} />
<div className="flex flex-col">
@@ -287,18 +295,18 @@ function UserTable({
</span>
</div>
</div>
- </td>
+ </TableCell>
{/* Groups column */}
- <td className="px-4 py-2">
+ <TableCell className="py-2">
<UserGroupsCell
user={user}
onGroupSelected={onGroupSelected}
/>
- </td>
+ </TableCell>
{/* Operations column */}
- <td className="px-4 py-2">
+ <TableCell className="py-2">
<div className="flex justify-end gap-x-1">
{!isDeleted && (
<>
@@ -367,12 +375,12 @@ function UserTable({
</Tooltip>
)}
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
);
})}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
);
}
diff --git a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
index 545944829c..0a5c93d4a9 100644
--- a/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
+++ b/frontend/src/react/pages/settings/WorkloadIdentitiesPage.tsx
@@ -5,6 +5,14 @@ import { CreateWorkloadIdentityDrawer } from "@/react/components/CreateWorkloadI
import { PermissionGuard } from "@/react/components/PermissionGuard";
import { UserAvatar } from "@/react/components/UserAvatar";
import { Button } from "@/react/components/ui/button";
+import {
+ Table,
+ TableBody,
+ TableCell,
+ TableHead,
+ TableHeader,
+ TableRow,
+} from "@/react/components/ui/table";
import { Tooltip } from "@/react/components/ui/tooltip";
import { PagedTableFooter, usePagedData } from "@/react/hooks/usePagedData";
import { useVueState } from "@/react/hooks/useVueState";
@@ -82,38 +90,35 @@ function WorkloadIdentityTable({
return (
<div className="border rounded-sm overflow-hidden">
- <table className="w-full text-sm">
- <thead>
- <tr className="border-b bg-control-bg">
- <th className="px-4 py-2 text-left font-medium whitespace-nowrap">
+ <Table>
+ <TableHeader>
+ <TableRow className="bg-control-bg">
+ <TableHead className="whitespace-nowrap">
{t("settings.members.table.account")}
- </th>
- <th className="px-4 py-2 text-right font-medium whitespace-nowrap">
+ </TableHead>
+ <TableHead className="text-right whitespace-nowrap">
{t("common.operations")}
- </th>
- </tr>
- </thead>
- <tbody>
+ </TableHead>
+ </TableRow>
+ </TableHeader>
+ <TableBody>
{users.length === 0 ? (
- <tr>
- <td
+ <TableRow>
+ <TableCell
colSpan={2}
- className="py-8 text-center text-control-light text-sm"
+ className="py-8 text-center text-control-light"
>
{t("common.no-data")}
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
) : (
- users.map((user, i) => {
+ users.map((user) => {
const isDeleted = user.state === State.DELETED;
return (
- <tr
- key={user.name}
- className={`border-b last:border-b-0 ${i % 2 === 1 ? "bg-gray-50" : ""}`}
- >
+ <TableRow key={user.name}>
{/* Account column */}
- <td className="px-4 py-2">
+ <TableCell>
<div className="flex items-center gap-x-3">
<UserAvatar title={user.title || user.email} />
<div className="flex flex-col">
@@ -131,10 +136,10 @@ function WorkloadIdentityTable({
</span>
</div>
</div>
- </td>
+ </TableCell>
{/* Operations column */}
- <td className="px-4 py-2">
+ <TableCell>
<div className="flex justify-end gap-x-1">
{!isDeleted && (
<>
@@ -208,13 +213,13 @@ function WorkloadIdentityTable({
</Tooltip>
)}
</div>
- </td>
- </tr>
+ </TableCell>
+ </TableRow>
);
})
)}
- </tbody>
- </table>
+ </TableBody>
+ </Table>
</div>
);
}