Skip to content

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

refactor(web): Extract `createDropdownTableColumn` (#16830)

Ben Bachema88f14d00de3
diff --git a/web/.storybook/main.ts b/web/.storybook/main.ts
index 4f17b3f844..7e8f87aab9 100644
--- a/web/.storybook/main.ts
+++ b/web/.storybook/main.ts
@@ -29,6 +29,7 @@ const DESIGN_COMPONENT_STORIES = [
"table/components/IOTableCell/IOTableCell",
"table/columns/createBadgeTableColumn",
"table/columns/createDateTableColumn",
+ "table/columns/createDropdownTableColumn",
"table/columns/createDurationTableColumn",
"table/columns/createIdTableColumn",
"table/columns/createItemBadgeTableColumn",
diff --git a/web/src/components/design-system/table/columns/createDropdownTableColumn.stories.tsx b/web/src/components/design-system/table/columns/createDropdownTableColumn.stories.tsx
new file mode 100644
index 0000000000..6f4c1de676
--- /dev/null
+++ b/web/src/components/design-system/table/columns/createDropdownTableColumn.stories.tsx
@@ -0,0 +1,114 @@
+import { expect, fn, userEvent, within } from "storybook/test";
+
+import preview from "../../../../../.storybook/preview";
+
+import {
+ DataTable,
+ type AsyncTableData,
+} from "@/src/components/table/data-table";
+import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
+import { createDropdownTableColumn } from "./createDropdownTableColumn";
+
+type Row = {
+ id: string | null;
+};
+
+function DropdownTableColumnStory({
+ data,
+ onDelete = fn(),
+}: {
+ data: AsyncTableData<Row[]>;
+ onDelete?: (id: string) => void;
+}) {
+ const columns = [
+ createDropdownTableColumn<Row, string>({
+ id: "actions",
+ accessorFn: (row) => row.id,
+ header: "Actions",
+ size: 70,
+ renderMenu: (id) =>
+ id ? (
+ <DropdownMenuItem onClick={() => onDelete(id)}>
+ Delete
+ </DropdownMenuItem>
+ ) : null,
+ }),
+ ];
+
+ return (
+ <DataTable
+ tableName="dropdown-column-story"
+ columns={columns}
+ data={data}
+ hidePagination
+ cellPadding="comfortable"
+ />
+ );
+}
+
+const meta = preview.meta({
+ component: DropdownTableColumnStory,
+ parameters: {
+ layout: "fullscreen",
+ },
+});
+
+export const Default = meta.story({
+ args: {
+ data: {
+ isLoading: false,
+ isError: false,
+ data: [{ id: "trace-1" }],
+ },
+ onDelete: fn(),
+ },
+});
+
+export const EmptyValue = meta.story({
+ name: "Empty Value",
+ args: {
+ data: {
+ isLoading: false,
+ isError: false,
+ data: [{ id: null }],
+ },
+ onDelete: fn(),
+ },
+});
+
+export const Loading = meta.story({
+ args: {
+ data: {
+ isLoading: true,
+ isError: false,
+ },
+ onDelete: fn(),
+ },
+});
+
+export const TestOpensMenu = meta.story({
+ name: "(Test) Opens Menu",
+ args: {
+ data: {
+ isLoading: false,
+ isError: false,
+ data: [{ id: "trace-1" }],
+ },
+ onDelete: fn(),
+ },
+ play: async ({ args, canvasElement }) => {
+ const canvas = within(canvasElement);
+ const trigger = canvas.getByRole("button", { name: "Open menu" });
+
+ await userEvent.click(trigger);
+
+ const menu = await within(canvasElement.ownerDocument.body).findByRole(
+ "menu",
+ );
+ const item = within(menu).getByRole("menuitem", { name: "Delete" });
+ await expect(item).toBeInTheDocument();
+
+ await userEvent.click(item);
+ await expect(args.onDelete).toHaveBeenCalledWith("trace-1");
+ },
+});
diff --git a/web/src/components/design-system/table/columns/createDropdownTableColumn.tsx b/web/src/components/design-system/table/columns/createDropdownTableColumn.tsx
new file mode 100644
index 0000000000..09cc993468
--- /dev/null
+++ b/web/src/components/design-system/table/columns/createDropdownTableColumn.tsx
@@ -0,0 +1,47 @@
+/* eslint-disable boundaries/dependencies */
+import { type CellContext, type RowData } from "@tanstack/react-table";
+import { MoreVertical } from "lucide-react";
+
+import { Button } from "@/src/components/ui/button";
+import { DropdownMenuController } from "@/src/components/ui/dropdown-menu";
+import { Skeleton } from "@/src/components/ui/skeleton";
+import {
+ createTableColumn,
+ type TableColumnOptions,
+} from "./utils/createTableColumn";
+
+export function createDropdownTableColumn<
+ TData extends RowData,
+ TValue = unknown,
+>({
+ renderMenu,
+ ...options
+}: TableColumnOptions<TData, TValue> & {
+ renderMenu: (
+ value: TValue | null | undefined,
+ context: CellContext<TData, TValue | null | undefined>,
+ ) => React.ReactNode;
+}) {
+ return createTableColumn<TData, TValue>({
+ ...options,
+ loadingCell: <Skeleton className="h-8 w-8 shrink-0 rounded-md" />,
+ renderCell: (value, context) => {
+ const items = renderMenu(value, context);
+ if (!items) return null;
+
+ return (
+ <div onClick={(event) => event.stopPropagation()}>
+ <DropdownMenuController align="end" renderMenu={() => items}>
+ {({ Trigger }) => (
+ <Trigger asChild>
+ <Button variant="ghost" size="icon" aria-label="Open menu">
+ <MoreVertical className="h-4 w-4" />
+ </Button>
+ </Trigger>
+ )}
+ </DropdownMenuController>
+ </div>
+ );
+ },
+ });
+}
diff --git a/web/src/components/table/DataTable.stories.tsx b/web/src/components/table/DataTable.stories.tsx
index 66a071bfb9..69d080b8ad 100644
--- a/web/src/components/table/DataTable.stories.tsx
+++ b/web/src/components/table/DataTable.stories.tsx
@@ -25,6 +25,7 @@ import { createIdTableColumn } from "@/src/components/design-system/table/column
import { createNumberTableColumn } from "@/src/components/design-system/table/columns/createNumberTableColumn";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
import { createIOTableColumn } from "@/src/components/design-system/table/columns/createIOTableColumn";
+import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createTokenUsageTableColumn } from "@/src/components/design-system/table/columns/createTokenUsageTableColumn";
import { Skeleton } from "@/src/components/ui/skeleton";
import { TextLink } from "@/src/components/design-system/TextLink/TextLink";
@@ -40,12 +41,7 @@ import {
import { formatAsLabel, LevelSymbols } from "@/src/components/level-colors";
import TagList from "@/src/features/tag/components/TagList";
import { BreakdownTooltip } from "@/src/features/traces/components/BreakdownTooltip";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@/src/components/ui/dropdown-menu";
+import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
import { formatIntervalSeconds } from "@/src/utils/dates";
import { numberFormatter, usdFormatter } from "@/src/utils/numbers";
import {
@@ -53,7 +49,6 @@ import {
Folder,
InfoIcon,
ListTree,
- MoreVertical,
PlusCircle,
Trash,
} from "lucide-react";
@@ -86,8 +81,8 @@ const renderMediaReference = (descriptor: MediaDescriptor) => (
// the standalone visual part with identical DOM/classes:
// - tags: real TagList in the real `flex gap-x-2 gap-y-1` wrapper,
// instead of TagPromptPopover/TagManager (same visible children).
-// - actions: real DropdownMenu + ghost MoreVertical, with a plain menu item
-// instead of the tRPC-bound DeleteTraceButton / DeletePrompt.
+// - actions: createDropdownTableColumn (ghost MoreVertical trigger), with a
+// plain menu item instead of the tRPC-bound DeleteTraceButton.
// Everything else (TextLink, Badge, IOTableCell, LocalIsoDate, TableIdOrName,
// createTokenUsageTableColumn, LevelCountsDisplay, folder links, Skeleton, the
// loading cells) is the actual production component.
@@ -442,31 +437,19 @@ function buildTraceColumns(
defaultHidden: true,
enableSorting: true,
}),
- {
- accessorKey: "action",
- header: "Action",
+ createDropdownTableColumn<TraceRow, string>({
id: "action",
+ accessorFn: (row) => row.id,
+ header: "Action",
size: 70,
isFixedPosition: true,
- // Real action menu: ghost MoreVertical trigger + dropdown. The destructive
- // item is a plain menu item (the real one renders DeleteTraceButton, which
- // needs tRPC) but the trigger DOM/spacing is identical.
- cell: () => (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="ghost">
- <MoreVertical className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem className="text-destructive">
- <Trash className="mr-2 h-4 w-4" />
- Delete trace
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ renderMenu: () => (
+ <DropdownMenuItem className="text-destructive">
+ <Trash className="mr-2 h-4 w-4" />
+ Delete trace
+ </DropdownMenuItem>
),
- },
+ }),
];
}
diff --git a/web/src/components/table/use-cases/traces.tsx b/web/src/components/table/use-cases/traces.tsx
index 5934e6fb61..d8763f8225 100644
--- a/web/src/components/table/use-cases/traces.tsx
+++ b/web/src/components/table/use-cases/traces.tsx
@@ -7,6 +7,7 @@ import {
import { Skeleton } from "@/src/components/ui/skeleton";
import { createBadgeTableColumn } from "@/src/components/design-system/table/columns/createBadgeTableColumn";
import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";
+import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createNumberTableColumn } from "@/src/components/design-system/table/columns/createNumberTableColumn";
import { createTagsTableColumn } from "@/src/components/design-system/table/columns/createTagsTableColumn";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
@@ -66,7 +67,7 @@ import { joinTableCoreAndMetrics } from "@/src/components/table/utils/joinTableC
import useColumnOrder from "@/src/features/column-visibility/hooks/useColumnOrder";
import { BatchExportTableButton } from "@/src/components/BatchExportTableButton";
import { BreakdownTooltip } from "@/src/features/traces/components/BreakdownTooltip";
-import { InfoIcon, MoreVertical } from "lucide-react";
+import { InfoIcon } from "lucide-react";
import { useHasEntitlement } from "@/src/features/entitlements/hooks";
import { TableActionMenu } from "@/src/features/table/components/TableActionMenu";
import { useSelectAll } from "@/src/features/table/hooks/useSelectAll";
@@ -77,13 +78,7 @@ import {
LevelCountsDisplay,
type LevelCount,
} from "@/src/components/level-counts-display";
-import {
- DropdownMenuContent,
- DropdownMenu,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@/src/components/ui/dropdown-menu";
-import { Button } from "@/src/components/ui/button";
+import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
import TableIdOrName from "@/src/components/table/table-id";
import {
type UseSidebarFilterStateOptions,
@@ -1203,38 +1198,25 @@ export default function TracesTable({
},
...(hideControls
? []
- : ([
- {
- accessorKey: "action",
+ : [
+ createDropdownTableColumn<TracesTableRow, TracesTableRow["id"]>({
+ id: "action",
+ accessorFn: (row) => row.id,
header: "Action",
size: 70,
isFixedPosition: true,
- cell: ({ row }) => {
- const traceId: TracesTableRow["id"] = row.getValue("id");
- return (
- traceId &&
- typeof traceId === "string" && (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="ghost">
- <MoreVertical className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem asChild>
- <DeleteTraceButton
- itemId={traceId}
- projectId={projectId}
- isTableAction
- />
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- )
- );
- },
- },
- ] satisfies LangfuseColumnDef<TracesTableRow>[])),
+ renderMenu: (traceId) =>
+ typeof traceId === "string" ? (
+ <DropdownMenuItem asChild>
+ <DeleteTraceButton
+ itemId={traceId}
+ projectId={projectId}
+ isTableAction
+ />
+ </DropdownMenuItem>
+ ) : null,
+ }),
+ ]),
];
const [columnVisibility, setColumnVisibility] =
diff --git a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx
index 6f054b461f..5c8a1ab18f 100644
--- a/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx
+++ b/web/src/ee/features/billing/components/SpendAlerts/SpendAlertsTable.tsx
@@ -1,13 +1,7 @@
import { useMemo, useState } from "react";
-import { Button } from "@/src/components/ui/button";
import { Badge } from "@/src/components/ui/badge";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@/src/components/ui/dropdown-menu";
-import { MoreHorizontal, Edit, Trash2 } from "lucide-react";
+import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
+import { Edit, Trash2 } from "lucide-react";
import { api } from "@/src/utils/api";
import { useHasOrganizationAccess } from "@/src/features/rbac/utils/checkOrganizationAccess";
import { formatDistanceToNow } from "date-fns";
@@ -16,6 +10,7 @@ import { DeleteSpendAlertDialog } from "./DeleteSpendAlertDialog";
import { DataTable } from "@/src/components/table/data-table";
import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";
import { type LangfuseColumnDef } from "@/src/components/table/types";
+import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createNumberTableColumn } from "@/src/components/design-system/table/columns/createNumberTableColumn";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
import { costFormatter } from "@/src/utils/numbers";
@@ -108,34 +103,28 @@ export function SpendAlertsTable({ orgId }: SpendAlertsTableProps) {
})
: "Never",
},
- {
- accessorKey: "actions",
+ createDropdownTableColumn<AlertRow, string>({
id: "actions",
+ accessorFn: (row) => row.id,
header: "Actions",
size: 120,
- cell: ({ row }) => (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="ghost" className="h-8 w-8 p-0">
- <MoreHorizontal className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuItem onClick={() => setEditingAlert(row.original.id)}>
+ renderMenu: (id) =>
+ id ? (
+ <>
+ <DropdownMenuItem onClick={() => setEditingAlert(id)}>
<Edit className="mr-2 h-4 w-4" />
Edit
</DropdownMenuItem>
<DropdownMenuItem
- onClick={() => setDeletingAlert(row.original.id)}
+ onClick={() => setDeletingAlert(id)}
className="text-destructive"
>
<Trash2 className="mr-2 h-4 w-4" />
Delete
</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- ),
- },
+ </>
+ ) : null,
+ }),
];
const editingAlertData = spendAlerts?.find((a) => a.id === editingAlert);
diff --git a/web/src/features/dashboard/components/DashboardTable.tsx b/web/src/features/dashboard/components/DashboardTable.tsx
index 0214b54b52..6a96f4f16d 100644
--- a/web/src/features/dashboard/components/DashboardTable.tsx
+++ b/web/src/features/dashboard/components/DashboardTable.tsx
@@ -8,21 +8,17 @@ import { DataTable } from "@/src/components/table/data-table";
import { type LangfuseColumnDef } from "@/src/components/table/types";
import { createColumnHelper } from "@tanstack/react-table";
import { createDateTableColumn } from "@/src/components/design-system/table/columns/createDateTableColumn";
+import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createLinkTableColumn } from "@/src/components/design-system/table/columns/createLinkTableColumn";
import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";
import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
import { Button } from "@/src/components/ui/button";
import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
-import { Copy, Edit, MoreVertical, User as UserIcon } from "lucide-react";
+import { Copy, Edit, User as UserIcon } from "lucide-react";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
import { showErrorToast } from "@/src/features/notifications/showErrorToast";
import { showSuccessToast } from "@/src/features/notifications/showSuccessToast";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@/src/components/ui/dropdown-menu";
+import { DropdownMenuItem } from "@/src/components/ui/dropdown-menu";
import { DeleteDashboardButton } from "@/src/components/deleteButton";
import { EditDashboardDialog } from "@/src/features/dashboard/components/EditDashboardDialog";
import { CloneFirstDialog } from "@/src/features/dashboard/components/CloneFirstDialog";
@@ -37,6 +33,9 @@ type DashboardTableRow = {
owner: "PROJECT" | "LANGFUSE";
};
+const dashboardMenuButtonWrapperClassName = "w-full";
+const dashboardMenuButtonClassName = "w-full justify-start";
+
function CloneDashboardButton({
dashboardId,
projectId,
@@ -81,15 +80,18 @@ function CloneDashboardButton({
};
return (
- <Button
- variant="ghost"
- size="default"
- disabled={!hasAccess}
- onClick={handleCloneDashboard}
- >
- <Copy className="mr-2 h-4 w-4" />
- Clone
- </Button>
+ <div className={dashboardMenuButtonWrapperClassName}>
+ <Button
+ variant="ghost"
+ size="default"
+ className={dashboardMenuButtonClassName}
+ disabled={!hasAccess}
+ onClick={handleCloneDashboard}
+ >
+ <Copy className="mr-2 h-4 w-4" />
+ Clone
+ </Button>
+ </div>
);
}
@@ -108,10 +110,11 @@ function EditDashboardButton({
const hasAccess = useHasProjectAccess({ projectId, scope: "dashboards:CUD" });
return (
- <>
+ <div className={dashboardMenuButtonWrapperClassName}>
<Button
variant="ghost"
size="default"
+ className={dashboardMenuButtonClassName}
disabled={!hasAccess}
onClick={() => setIsDialogOpen(true)}
>
@@ -127,7 +130,7 @@ function EditDashboardButton({
initialName={dashboardName}
initialDescription={dashboardDescription}
/>
- </>
+ </div>
);
}
@@ -145,10 +148,11 @@ function LockedEditDashboardButton({
const capture = usePostHogClientCapture();
return (
- <>
+ <div className={dashboardMenuButtonWrapperClassName}>
<Button
variant="ghost"
size="default"
+ className={dashboardMenuButtonClassName}
disabled={!hasAccess}
onClick={() => {
capture("dashboard:locked_edit_attempt", {
@@ -170,7 +174,7 @@ function LockedEditDashboardButton({
dashboardId={dashboardId}
dashboardName={dashboardName}
/>
- </>
+ </div>
);
}
@@ -272,61 +276,59 @@ export function DashboardTable() {
enableSorting: true,
size: 150,
}),
- columnHelper.display({
+ createDropdownTableColumn<DashboardTableRow, string>({
id: "actions",
+ accessorFn: (row) => row.id,
header: "Actions",
size: 70,
- cell: (row) => {
- const id = row.row.original.id;
- const name = row.row.original.name;
- const description = row.row.original.description;
- const owner = row.row.original.owner;
+ renderMenu: (id, { row }) => {
+ if (!id) return null;
+ const { name, description, owner } = row.original;
return (
- <div onClick={(e) => e.stopPropagation()}>
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button size="xs" variant="ghost">
- <MoreVertical className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="flex flex-col *:w-full *:justify-start">
- {owner === "PROJECT" ? (
- <DropdownMenuItem asChild>
- <EditDashboardButton
- dashboardId={id}
- projectId={projectId}
- dashboardName={name}
- dashboardDescription={description}
- />
- </DropdownMenuItem>
- ) : (
- <DropdownMenuItem asChild>
- <LockedEditDashboardButton
- dashboardId={id}
- projectId={projectId}
- dashboardName={name}
- />
- </DropdownMenuItem>
- )}
- <DropdownMenuItem asChild>
- <CloneDashboardButton
- dashboardId={id}
+ <>
+ {owner === "PROJECT" ? (
+ <DropdownMenuItem className="w-full p-0">
+ <EditDashboardButton
+ dashboardId={id}
+ projectId={projectId}
+ dashboardName={name}
+ dashboardDescription={description}
+ />
+ </DropdownMenuItem>
+ ) : (
+ <DropdownMenuItem className="w-full p-0">
+ <LockedEditDashboardButton
+ dashboardId={id}
+ projectId={projectId}
+ dashboardName={name}
+ />
+ </DropdownMenuItem>
+ )}
+ <DropdownMenuItem className="w-full p-0">
+ <CloneDashboardButton
+ dashboardId={id}
+ projectId={projectId}
+ owner={owner}
+ />
+ </DropdownMenuItem>
+ {owner === "PROJECT" ? (
+ <DropdownMenuItem
+ className="w-full p-0"
+ onSelect={(event) => {
+ event.preventDefault();
+ }}
+ >
+ <div className={dashboardMenuButtonWrapperClassName}>
+ <DeleteDashboardButton
+ itemId={id}
projectId={projectId}
- owner={owner}
+ isTableAction
+ className={dashboardMenuButtonClassName}
/>
- </DropdownMenuItem>
- {owner === "PROJECT" && (
- <DropdownMenuItem asChild>
- <DeleteDashboardButton
- itemId={id}
- projectId={projectId}
- isTableAction
- />
- </DropdownMenuItem>
- )}
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
+ </div>
+ </DropdownMenuItem>
+ ) : null}
+ </>
);
},
}),
diff --git a/web/src/features/datasets/components/DatasetItemsTable.tsx b/web/src/features/datasets/components/DatasetItemsTable.tsx
index cbd57b5e9d..11df742418 100644
--- a/web/src/features/datasets/components/DatasetItemsTable.tsx
+++ b/web/src/features/datasets/components/DatasetItemsTable.tsx
@@ -1,18 +1,15 @@
import { DataTable } from "@/src/components/table/data-table";
+import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createLinkTableColumn } from "@/src/components/design-system/table/columns/createLinkTableColumn";
import { api } from "@/src/utils/api";
import { safeExtract } from "@/src/utils/map-utils";
import { type RouterOutput } from "@/src/utils/types";
import {
- DropdownMenu,
- DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
- DropdownMenuTrigger,
} from "@/src/components/ui/dropdown-menu";
import { useQueryParams, withDefault, NumberParam } from "use-query-params";
-import { Archive, Edit, ListTree, MoreVertical, Trash2 } from "lucide-react";
-import { Button } from "@/src/components/ui/button";
+import { Archive, Edit, ListTree, Trash2 } from "lucide-react";
import {
datasetItemFilterColumns,
DatasetStatus,
@@ -234,83 +231,75 @@ export function DatasetItemsTable({
enableHiding: true,
singleLine: rowHeight === "s",
}),
- {
+ createDropdownTableColumn<RowData, string>({
id: "actions",
- accessorKey: "actions",
+ accessorFn: (row) => row.id,
header: "Actions",
size: 70,
- cell: ({ row }) => {
- const id: string = row.getValue("id");
- const status: DatasetStatus = row.getValue("status");
+ renderMenu: (id, { row }) => {
+ if (!id) return null;
+ const status = row.original.status;
return (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="ghost" className="h-8 w-8 p-0">
- <span className="sr-only relative">Open menu</span>
- <MoreVertical className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuLabel>Actions</DropdownMenuLabel>
- <DropdownMenuItem
- disabled={!hasAccess || !!selectedVersion}
- onClick={() => {
- setSelectedItemForEdit(id);
- setEditDialogOpen(true);
- }}
- >
- <Edit className="mr-2 h-4 w-4" />
- Edit
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={!hasAccess || !!selectedVersion}
- onClick={() => {
- capture("dataset_item:archive_toggle", {
- status:
- status === DatasetStatus.ARCHIVED
- ? "unarchived"
- : "archived",
- });
- mutUpdate.mutate({
+ <>
+ <DropdownMenuLabel>Actions</DropdownMenuLabel>
+ <DropdownMenuItem
+ disabled={!hasAccess || !!selectedVersion}
+ onClick={() => {
+ setSelectedItemForEdit(id);
+ setEditDialogOpen(true);
+ }}
+ >
+ <Edit className="mr-2 h-4 w-4" />
+ Edit
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ disabled={!hasAccess || !!selectedVersion}
+ onClick={() => {
+ capture("dataset_item:archive_toggle", {
+ status:
+ status === DatasetStatus.ARCHIVED
+ ? "unarchived"
+ : "archived",
+ });
+ mutUpdate.mutate({
+ projectId: projectId,
+ datasetId: datasetId,
+ datasetItemId: id,
+ status:
+ status === DatasetStatus.ARCHIVED
+ ? DatasetStatus.ACTIVE
+ : DatasetStatus.ARCHIVED,
+ });
+ }}
+ >
+ <Archive className="mr-2 h-4 w-4" />
+ {status === DatasetStatus.ARCHIVED ? "Unarchive" : "Archive"}
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ disabled={!hasAccess || !!selectedVersion}
+ className="text-destructive"
+ onClick={() => {
+ if (
+ window.confirm(
+ "Are you sure you want to delete this item? This will also delete all run items that belong to this item.",
+ )
+ ) {
+ capture("dataset_item:delete");
+ mutDelete.mutate({
projectId: projectId,
datasetId: datasetId,
datasetItemId: id,
- status:
- status === DatasetStatus.ARCHIVED
- ? DatasetStatus.ACTIVE
- : DatasetStatus.ARCHIVED,
});
- }}
- >
- <Archive className="mr-2 h-4 w-4" />
- {status === DatasetStatus.ARCHIVED ? "Unarchive" : "Archive"}
- </DropdownMenuItem>
- <DropdownMenuItem
- disabled={!hasAccess || !!selectedVersion}
- className="text-destructive"
- onClick={() => {
- if (
- window.confirm(
- "Are you sure you want to delete this item? This will also delete all run items that belong to this item.",
- )
- ) {
- capture("dataset_item:delete");
- mutDelete.mutate({
- projectId: projectId,
- datasetId: datasetId,
- datasetItemId: id,
- });
- }
- }}
- >
- <Trash2 className="mr-2 h-4 w-4" />
- Delete
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ }
+ }}
+ >
+ <Trash2 className="mr-2 h-4 w-4" />
+ Delete
+ </DropdownMenuItem>
+ </>
);
},
- },
+ }),
];
const convertToTableRow = (
diff --git a/web/src/features/datasets/components/DatasetRunsTable.tsx b/web/src/features/datasets/components/DatasetRunsTable.tsx
index ee96be2761..60bf6b4d06 100644
--- a/web/src/features/datasets/components/DatasetRunsTable.tsx
+++ b/web/src/features/datasets/components/DatasetRunsTable.tsx
@@ -1,5 +1,6 @@
import { DataTable } from "@/src/components/table/data-table";
import { type LangfuseColumnDef } from "@/src/components/table/types";
+import { createDropdownTableColumn } from "@/src/components/design-system/table/columns/createDropdownTableColumn";
import { createLinkTableColumn } from "@/src/components/design-system/table/columns/createLinkTableColumn";
import { useDetailPageLists } from "@/src/features/navigate-detail-pages/context";
import { api } from "@/src/utils/api";
@@ -19,7 +20,7 @@ import { useQueryFilterState } from "@/src/features/filters/hooks/useFilterState
import { useDebounce } from "@/src/hooks/useDebounce";
import { useRowHeightLocalStorage } from "@/src/components/table/data-table-row-height-switch";
import { createIOTableColumn } from "@/src/components/design-system/table/columns/createIOTableColumn";
-import { ChevronDown, Columns3, MoreVertical, Trash } from "lucide-react";
+import { ChevronDown, Columns3, Trash } from "lucide-react";
import {
DropdownMenu,
DropdownMenuContent,
@@ -507,34 +508,23 @@ export function DatasetRunsTable(props: {
getCell: (value) => value || undefined,
singleLine: rowHeight === "s",
}),
- {
+ createDropdownTableColumn<DatasetRunRowData, DatasetRunRowData["id"]>({
id: "actions",
- accessorKey: "actions",
+ accessorFn: (row) => row.id,
header: "Actions",
size: 70,
- cell: ({ row }) => {
- const id: DatasetRunRowData["id"] = row.getValue("id");
-
- return (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="ghost" className="h-8 w-8 p-0">
- <span className="sr-only relative">Open menu</span>
- <MoreVertical className="h-4 w-4" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuLabel>Actions</DropdownMenuLabel>
- <DeleteDatasetRunButton
- projectId={props.projectId}
- datasetRunId={id}
- datasetId={props.datasetId}
- />
- </DropdownMenuContent>
- </DropdownMenu>
- );
- },
- },
+ renderMenu: (id) =>
+ id ? (
+ <>
+ <DropdownMenuLabel>Actions</DropdownMenuLabel>
+ <DeleteDatasetRunButton
+ projectId={props.projectId}
+ datasetRunId={id}
+ datasetId={props.datasetId}
+ />
+ </>
+ ) : null,
+ }),
];
const convertToTableRow = (