🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
refactor(web): Add design system `DropdownMenu` component (#17443)
Ben Bachem50ea01a2d6cc
diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 27e8f61fc9..ab4e8e95e9 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -544,6 +544,9 @@ importers:'@ferrucc-io/emoji-picker':specifier: ^0.1.2version: 0.1.2(@babel/[email protected]([email protected]))(@babel/[email protected])(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])+ '@floating-ui/react':+ specifier: 0.27.20'@hookform/resolvers':specifier: ^5.2.2version: 5.2.2([email protected]([email protected]))@@ -2223,6 +2226,18 @@ packages:react: '>=16.8.0'react-dom: '>=16.8.0'+ '@floating-ui/[email protected]':+ resolution: {integrity: sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==}+ peerDependencies:+ react: '>=16.8.0'+ react-dom: '>=16.8.0'++ '@floating-ui/[email protected]':+ resolution: {integrity: sha512-CMqMy7OaXl9W0eq1Uy7L7i2Y/anPvHmFmESd2CEw0t5YvZhcVCeo4MBevAmswRllX7Y2dEidA4ozGPunLSTQpw==}+ peerDependencies:+ react: '>=17.0.0'+ react-dom: '>=17.0.0'+'@floating-ui/[email protected]':resolution: {integrity: sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==}@@ -13438,6 +13453,20 @@ snapshots:react: 19.2.4react-dom: 19.2.4([email protected])+ dependencies:+ '@floating-ui/dom': 1.8.0+ react: 19.2.4+ react-dom: 19.2.4([email protected])++ dependencies:+ '@floating-ui/utils': 0.2.12+ react: 19.2.4+ react-dom: 19.2.4([email protected])+ tabbable: 6.5.0+'@floating-ui/[email protected]': {}'@floating-ui/[email protected]': {}diff --git a/web/package.json b/web/package.jsonindex 4d09069014..7cec7c96c8 100644--- a/web/package.json+++ b/web/package.json@@ -54,6 +54,7 @@"@dnd-kit/sortable": "^8.0.0","@dnd-kit/utilities": "^3.2.2","@ferrucc-io/emoji-picker": "^0.1.2",+ "@floating-ui/react": "0.27.20","@hookform/resolvers": "^5.2.2","@langfuse/shared": "workspace:*","@lezer/highlight": "^1.2.3",diff --git a/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.stories.tsx b/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.stories.tsxindex 1407f44a56..9478bfcfb3 100644--- a/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.stories.tsx+++ b/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.stories.tsx@@ -1,9 +1,5 @@import type { ComponentProps } from "react";import preview from "../../../.storybook/preview";-import {- DropdownMenu,- DropdownMenuTrigger,-} from "@/src/components/ui/dropdown-menu";import { OrganizationDropdownMenu } from "./OrganizationDropdownMenu";type Organization = Extract<@@ -36,14 +32,18 @@ const organizations = [const meta = preview.meta({component: OrganizationDropdownMenu,args: {+ children: () => null,canCreateOrganizations: true,getOrgPath: (organizationId) => `/organization/${organizationId}`,},render: (args) => (- <DropdownMenu defaultOpen>- <DropdownMenuTrigger>Trigger</DropdownMenuTrigger>- <OrganizationDropdownMenu {...args} />- </DropdownMenu>+ <OrganizationDropdownMenu {...args}>+ {({ getTriggerProps }) => (+ <button type="button" {...getTriggerProps()}>+ Trigger+ </button>+ )}+ </OrganizationDropdownMenu>),});diff --git a/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx b/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsxindex e89d04a79c..260beaacef 100644--- a/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx+++ b/web/src/components/OrganizationDropdownMenu/OrganizationDropdownMenu.tsx@@ -1,18 +1,14 @@-import {- DropdownMenuContent,- DropdownMenuItemWithSecondaryAction,- DropdownMenuSeparator,- DropdownMenuLoadingItem,-} from "@/src/components/ui/dropdown-menu";+import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";import { PlusIcon, Settings } from "lucide-react";import { type Session } from "next-auth";-import { Fragment } from "react";+import { type ComponentProps, useMemo } from "react";import { env } from "@/src/env.mjs";import { createOrganizationRoute } from "@/src/features/setup/setupRoutes";type Organization = NonNullable<Session["user"]>["organizations"][number];type OrganizationDropdownMenuProps = {+ children: ComponentProps<typeof DropdownMenu>["children"];canCreateOrganizations: boolean;getOrgPath: (organizationId: string) => string;} & (@@ -24,50 +20,56 @@ type OrganizationDropdownMenuProps = {);export function OrganizationDropdownMenu(props: OrganizationDropdownMenuProps) {- const { canCreateOrganizations, getOrgPath } = props;+ const { canCreateOrganizations, children, getOrgPath } = props;+ const organizations = props.state === "loaded" ? props.organizations : null;- return (- <DropdownMenuContent align="start" header="Organizations" maxHeight="15rem">- {props.state === "loaded" ? (- [...props.organizations]- .sort((a, b) => {- // sort demo org to the bottom- const isDemoA = env.NEXT_PUBLIC_DEMO_ORG_ID === a.id;- const isDemoB = env.NEXT_PUBLIC_DEMO_ORG_ID === b.id;- if (isDemoA) return 1;- if (isDemoB) return -1;- return 0;- })- .map((dropdownOrg) => (- <Fragment key={dropdownOrg.id}>- {env.NEXT_PUBLIC_DEMO_ORG_ID === dropdownOrg.id && (- <DropdownMenuSeparator />- )}- <DropdownMenuItemWithSecondaryAction- title={dropdownOrg.name}- href={getOrgPath(dropdownOrg.id)}- secondaryAction={{- href: `/organization/${dropdownOrg.id}/settings`,- ariaLabel: `Go to settings for ${dropdownOrg.name}`,+ const items = useMemo<ComponentProps<typeof DropdownMenu>["items"]>(+ () => [+ ...(organizations+ ? [...organizations]+ .sort((a, b) => {+ const isDemoA = env.NEXT_PUBLIC_DEMO_ORG_ID === a.id;+ const isDemoB = env.NEXT_PUBLIC_DEMO_ORG_ID === b.id;+ if (isDemoA) return 1;+ if (isDemoB) return -1;+ return 0;+ })+ .flatMap((organization) => [+ ...(env.NEXT_PUBLIC_DEMO_ORG_ID === organization.id+ ? [{ type: "separator" as const, id: "demo-separator" }]+ : []),+ {+ type: "item" as const,+ id: organization.id,+ title: organization.name,+ href: getOrgPath(organization.id),+ secondaryAction: {+ href: `/organization/${organization.id}/settings`,+ ariaLabel: `Go to settings for ${organization.name}`,icon: Settings,- }}- />- </Fragment>- ))- ) : (- <DropdownMenuLoadingItem />- )}+ },+ },+ ])+ : [{ type: "loading" as const, id: "loading" }]),+ ...(canCreateOrganizations+ ? [+ { type: "separator" as const, id: "create-separator" },+ {+ type: "item" as const,+ id: "create",+ title: "New Organization",+ href: createOrganizationRoute,+ icon: PlusIcon,+ },+ ]+ : []),+ ],+ [canCreateOrganizations, getOrgPath, organizations],+ );- {canCreateOrganizations && (- <>- <DropdownMenuSeparator />- <DropdownMenuItemWithSecondaryAction- title="New Organization"- href={createOrganizationRoute}- icon={PlusIcon}- />- </>- )}- </DropdownMenuContent>+ return (+ <DropdownMenu title="Organizations" items={items}>+ {children}+ </DropdownMenu>);}diff --git a/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.stories.tsx b/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.stories.tsxindex 2afccd6bb3..387a6a3d49 100644--- a/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.stories.tsx+++ b/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.stories.tsx@@ -1,10 +1,5 @@import type { ComponentProps } from "react";-import { expect, fn, userEvent, waitFor, within } from "storybook/test";import preview from "../../../.storybook/preview";-import {- DropdownMenu,- DropdownMenuTrigger,-} from "@/src/components/ui/dropdown-menu";import { ProjectDropdownMenu } from "./ProjectDropdownMenu";type Project = Extract<@@ -36,15 +31,19 @@ const projects = [const meta = preview.meta({component: ProjectDropdownMenu,args: {+ children: () => null,organizationId: "org-acme",canCreateProjects: true,getProjectPath: (projectId) => `/project/${projectId}`,},render: (args) => (- <DropdownMenu defaultOpen>- <DropdownMenuTrigger>Trigger</DropdownMenuTrigger>- <ProjectDropdownMenu {...args} />- </DropdownMenu>+ <ProjectDropdownMenu {...args}>+ {({ getTriggerProps }) => (+ <button type="button" {...getTriggerProps()}>+ Trigger+ </button>+ )}+ </ProjectDropdownMenu>),});@@ -77,95 +76,3 @@ export const Loading = meta.story({state: "loading",},});--// TODO: Move these regression tests to a generic dropdown component story once one exists.-const getAnalyticsActions = async (canvasElement: HTMLElement) => {- const body = within(canvasElement.ownerDocument.body);- const primaryAction = await body.findByRole("link", { name: "Analytics" });- const secondaryAction = body.getByRole("link", {- name: "Go to settings for Analytics",- });- const menuItem = primaryAction.closest('[role="menuitem"]');-- // Every primary action must be owned by a Radix menu item for keyboard navigation.- await expect(menuItem).not.toBeNull();- if (!(menuItem instanceof HTMLElement)) {- throw new Error("Expected Analytics to be rendered inside a menu item");- }-- return { menuItem, primaryAction, secondaryAction };-};--export const TestSecondaryActionLayout = meta.story({- name: "(Test) Secondary action layout",- args: {- state: "loaded",- projects,- },- play: async ({ canvasElement }) => {- const { menuItem, secondaryAction } =- await getAnalyticsActions(canvasElement);-- // Both actions must share one menu item so its highlight spans the full row.- await expect(menuItem).toContainElement(secondaryAction);-- const menuItemRect = menuItem.getBoundingClientRect();- const secondaryActionRect = secondaryAction.getBoundingClientRect();- const centerDifference = Math.abs(- menuItemRect.top +- menuItemRect.height / 2 -- (secondaryActionRect.top + secondaryActionRect.height / 2),- );- // The secondary action must remain vertically centered in the row.- await expect(centerDifference).toBeLessThanOrEqual(1);-- await userEvent.hover(secondaryAction);-- // Hovering the secondary action must highlight the shared menu item.- await waitFor(() => expect(menuItem).toHaveAttribute("data-highlighted"));- },-});--export const TestActionsRemainIndependent = meta.story({- name: "(Test) Actions remain independent",- args: {- state: "loaded",- projects,- },- play: async ({ canvasElement }) => {- const { primaryAction, secondaryAction } =- await getAnalyticsActions(canvasElement);- const onPrimaryClick = fn((event: MouseEvent) => event.preventDefault());- const onSecondaryClick = fn((event: MouseEvent) => event.preventDefault());- primaryAction.addEventListener("click", onPrimaryClick);- secondaryAction.addEventListener("click", onSecondaryClick);-- await userEvent.click(secondaryAction);-- // The secondary action handles the click itself without triggering the primary link.- await expect(onSecondaryClick).toHaveBeenCalledOnce();- await expect(onPrimaryClick).not.toHaveBeenCalled();- },-});--export const TestKeyboardActivation = meta.story({- name: "(Test) Keyboard activation",- args: {- state: "loaded",- projects,- },- play: async ({ canvasElement }) => {- const { menuItem, primaryAction } =- await getAnalyticsActions(canvasElement);- const onPrimaryClick = fn((event: MouseEvent) => event.preventDefault());- primaryAction.addEventListener("click", onPrimaryClick);-- menuItem.focus();- await userEvent.keyboard("{Enter}");- menuItem.focus();- await userEvent.keyboard(" ");-- // Radix forwards both supported activation keys to the primary action exactly once.- await expect(onPrimaryClick).toHaveBeenCalledTimes(2);- },-});diff --git a/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx b/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsxindex fbc2d62ac5..baf94f2b9b 100644--- a/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx+++ b/web/src/components/ProjectDropdownMenu/ProjectDropdownMenu.tsx@@ -1,18 +1,15 @@-import {- DropdownMenuContent,- DropdownMenuItemWithSecondaryAction,- DropdownMenuSeparator,- DropdownMenuLoadingItem,-} from "@/src/components/ui/dropdown-menu";+import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";import { createProjectRoute } from "@/src/features/setup/setupRoutes";import { PlusIcon, Settings } from "lucide-react";import { type Session } from "next-auth";+import { type ComponentProps, useMemo } from "react";type Project = NonNullable<Session["user"]>["organizations"][number]["projects"][number];type ProjectDropdownMenuProps = {+ children: ComponentProps<typeof DropdownMenu>["children"];organizationId: string;canCreateProjects: boolean;getProjectPath: (projectId: string) => string;@@ -25,41 +22,46 @@ type ProjectDropdownMenuProps = {);export function ProjectDropdownMenu(props: ProjectDropdownMenuProps) {- const { organizationId, canCreateProjects, getProjectPath } = props;+ const { children, organizationId, canCreateProjects, getProjectPath } = props;+ const projects = props.state === "loaded" ? props.projects : null;- return (- <DropdownMenuContent align="start" header="Projects" maxHeight="15rem">- {props.state === "loaded" ? (- props.projects.map((dropdownProject) => (- <DropdownMenuItemWithSecondaryAction- key={dropdownProject.id}- title={dropdownProject.name}- href={getProjectPath(dropdownProject.id)}- secondaryAction={{- href: `/project/${dropdownProject.id}/settings`,- ariaLabel: `Go to settings for ${dropdownProject.name}`,+ const items = useMemo<ComponentProps<typeof DropdownMenu>["items"]>(+ () => [+ ...(projects+ ? projects.map((project) => ({+ type: "item" as const,+ id: project.id,+ title: project.name,+ href: getProjectPath(project.id),+ secondaryAction: {+ href: `/project/${project.id}/settings`,+ ariaLabel: `Go to settings for ${project.name}`,icon: Settings,- }}- />- ))- ) : (- <>- <DropdownMenuLoadingItem />- <DropdownMenuLoadingItem />- <DropdownMenuLoadingItem />- </>- )}+ },+ }))+ : Array.from({ length: 3 }, (_, index) => ({+ type: "loading" as const,+ id: `loading-${index}`,+ }))),+ ...(canCreateProjects+ ? [+ { type: "separator" as const, id: "create-separator" },+ {+ type: "item" as const,+ id: "create",+ title: "New Project",+ href: createProjectRoute(organizationId),+ icon: PlusIcon,+ },+ ]+ : []),+ ],+ [canCreateProjects, getProjectPath, organizationId, projects],+ );- {canCreateProjects && (- <>- <DropdownMenuSeparator />- <DropdownMenuItemWithSecondaryAction- title="New Project"- href={createProjectRoute(organizationId)}- icon={PlusIcon}- />- </>- )}- </DropdownMenuContent>+ return (+ <DropdownMenu title="Projects" items={items}>+ {children}+ </DropdownMenu>);}diff --git a/web/src/components/deleteButton.tsx b/web/src/components/deleteButton.tsxindex dd0d06d178..8ed0889b05 100644--- a/web/src/components/deleteButton.tsx+++ b/web/src/components/deleteButton.tsx@@ -270,48 +270,6 @@ export function DeleteTraceButton(props: DeleteButtonProps) {);}-export function DeleteDatasetButton(props: DeleteButtonProps) {- const utils = api.useUtils();- const {- itemId,- projectId,- scope = "datasets:CUD",- invalidateFunc = () => utils.datasets.invalidate(),- } = props;- const datasetMutation = api.datasets.deleteDataset.useMutation();- const executeDeleteMutation = async (onSuccess: () => void) => {- try {- await datasetMutation.mutateAsync({- datasetId: itemId,- projectId,- });- } catch (error) {- return Promise.reject(error);- }- onSuccess();- };- return (- <DeleteButton- {...props}- scope={scope}- invalidateFunc={invalidateFunc}- captureDeleteOpen={(capture, isTableAction) =>- capture("datasets:delete_form_open", {- source: isTableAction ? "table-single-row" : "dataset",- })- }- captureDeleteSuccess={(capture, isTableAction) =>- capture("datasets:delete_dataset_button_click", {- source: isTableAction ? "table-single-row" : "dataset",- })- }- entityToDeleteName="dataset"- executeDeleteMutation={executeDeleteMutation}- isDeleteMutationLoading={datasetMutation.isPending}- />- );-}-/** DeleteMonitorButton deletes a monitor through the shared confirm-then-delete pattern. */export function DeleteMonitorButton(props: DeleteButtonProps) {const utils = api.useUtils();diff --git a/web/src/components/design-system/DropdownMenu/DropdownMenu.stories.tsx b/web/src/components/design-system/DropdownMenu/DropdownMenu.stories.tsxnew file mode 100644index 0000000000..ac681a1722--- /dev/null+++ b/web/src/components/design-system/DropdownMenu/DropdownMenu.stories.tsx@@ -0,0 +1,246 @@+import { Settings } from "lucide-react";+import { type ComponentProps } from "react";+import { expect, fn, userEvent, waitFor, within } from "storybook/test";++import preview from "../../../../.storybook/preview";+import { DropdownMenu } from "./DropdownMenu";++const items: ComponentProps<typeof DropdownMenu>["items"] = [+ {+ type: "item",+ id: "view-item",+ title: "View item",+ href: "/items/example",+ secondaryAction: {+ ariaLabel: "Configure item",+ href: "/items/example/settings",+ icon: Settings,+ },+ },+];++const meta = preview.meta({+ component: DropdownMenu,+ args: {+ children: () => null,+ items,+ title: "Actions",+ },+ render: (args) => (+ <DropdownMenu {...args}>+ {({ getTriggerProps }) => (+ <button type="button" {...getTriggerProps()}>+ Open menu+ </button>+ )}+ </DropdownMenu>+ ),+});++export const Default = meta.story({});++export const ManyItems = meta.story({+ args: {+ items: Array.from({ length: 20 }, (_, index) => ({+ type: "item" as const,+ id: `item-${index + 1}`,+ title: `Item ${index + 1}`,+ onClick: fn(),+ })),+ },+});++const getMenuActions = async (canvasElement: HTMLElement) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = canvas.getByRole("button", { name: "Open menu" });+ await userEvent.click(trigger);++ const menu = await body.findByRole("menu", { name: "Actions" });+ const menuItem = body.getByRole("menuitem", { name: /View item/ });+ const primaryAction = body.getByRole("link", { name: "View item" });+ const secondaryAction = body.getByRole("link", {+ name: "Configure item",+ });++ return { menu, menuItem, primaryAction, secondaryAction, trigger };+};++export const TestTriggerAndItems = meta.story({+ name: "(Test) Trigger and items",+ play: async ({ canvasElement }) => {+ const { menu, primaryAction, trigger } =+ await getMenuActions(canvasElement);++ await waitFor(() => expect(menu).toBeVisible());+ await expect(primaryAction).toHaveAttribute("href", "/items/example");+ await expect(trigger).toHaveAttribute("aria-haspopup", "menu");+ await expect(trigger).toHaveAttribute("aria-expanded", "true");++ await waitFor(() => {+ const menuRect = menu.getBoundingClientRect();+ const triggerRect = trigger.getBoundingClientRect();++ expect(menuRect.left).toBeLessThan(triggerRect.right);+ expect(menuRect.right).toBeGreaterThan(triggerRect.left);+ expect(menuRect.top).toBeGreaterThan(triggerRect.bottom);+ });+ },+});++export const TestSecondaryActionLayout = meta.story({+ name: "(Test) Secondary action layout",+ play: async ({ canvasElement }) => {+ const { menuItem, secondaryAction } = await getMenuActions(canvasElement);++ await expect(menuItem).toContainElement(secondaryAction);++ const menuItemRect = menuItem.getBoundingClientRect();+ const secondaryActionRect = secondaryAction.getBoundingClientRect();+ const centerDifference = Math.abs(+ menuItemRect.top ++ menuItemRect.height / 2 -+ (secondaryActionRect.top + secondaryActionRect.height / 2),+ );+ await expect(centerDifference).toBeLessThanOrEqual(1);++ await userEvent.hover(secondaryAction);+ await waitFor(() => expect(menuItem).toHaveAttribute("data-active"));+ },+});++export const TestActionsRemainIndependent = meta.story({+ name: "(Test) Actions remain independent",+ play: async ({ canvasElement }) => {+ const { primaryAction, secondaryAction } =+ await getMenuActions(canvasElement);+ const onPrimaryClick = fn((event: MouseEvent) => event.preventDefault());+ const onSecondaryClick = fn((event: MouseEvent) => event.preventDefault());+ primaryAction.addEventListener("click", onPrimaryClick);+ secondaryAction.addEventListener("click", onSecondaryClick);++ await userEvent.click(secondaryAction);++ await expect(onSecondaryClick).toHaveBeenCalledOnce();+ await expect(onPrimaryClick).not.toHaveBeenCalled();+ },+});++export const TestKeyboardActivation = meta.story({+ name: "(Test) Keyboard activation",+ play: async ({ canvasElement }) => {+ const firstOpen = await getMenuActions(canvasElement);+ const onPrimaryClick = fn((event: MouseEvent) => event.preventDefault());+ firstOpen.primaryAction.addEventListener("click", onPrimaryClick);++ firstOpen.menuItem.focus();+ await expect(firstOpen.menuItem).toHaveFocus();+ await userEvent.keyboard("{Enter}");++ const secondOpen = await getMenuActions(canvasElement);+ secondOpen.primaryAction.addEventListener("click", onPrimaryClick);+ secondOpen.menuItem.focus();+ await expect(secondOpen.menuItem).toHaveFocus();+ await userEvent.keyboard(" ");++ await expect(onPrimaryClick).toHaveBeenCalledTimes(2);+ },+});++const onPrimaryAction = fn();+const onSecondaryAction = fn();++export const TestClickActions = meta.story({+ name: "(Test) Click actions",+ args: {+ items: [+ {+ type: "item",+ id: "action",+ title: "Run action",+ onClick: onPrimaryAction,+ secondaryAction: {+ ariaLabel: "Run secondary action",+ icon: Settings,+ onClick: onSecondaryAction,+ },+ },+ ],+ },+ play: async ({ canvasElement }) => {+ onPrimaryAction.mockClear();+ onSecondaryAction.mockClear();+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);+ const trigger = canvas.getByRole("button", { name: "Open menu" });++ await userEvent.click(trigger);+ await userEvent.click(+ body.getByRole("button", { name: "Run secondary action" }),+ );+ await expect(onSecondaryAction).toHaveBeenCalledOnce();+ await expect(onPrimaryAction).not.toHaveBeenCalled();++ await userEvent.click(trigger);+ await userEvent.click(body.getByRole("button", { name: "Run action" }));+ await expect(onPrimaryAction).toHaveBeenCalledOnce();+ await expect(body.queryByRole("menu", { name: "Actions" })).toBeNull();+ },+});++const onDisabledAction = fn();++export const TestDisabledAction = meta.story({+ name: "(Test) Disabled action",+ args: {+ items: [+ {+ type: "item",+ id: "disabled",+ title: "Edit",+ disabled: { reason: "You don't have permission to edit this item." },+ onClick: onDisabledAction,+ },+ ],+ },+ play: async ({ canvasElement }) => {+ onDisabledAction.mockClear();+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(canvas.getByRole("button", { name: "Open menu" }));+ const menuItem = await body.findByRole("menuitem", { name: "Edit" });+ await expect(menuItem).toHaveAttribute("aria-disabled", "true");+ await expect(menuItem).toHaveAttribute(+ "title",+ "You don't have permission to edit this item.",+ );++ await userEvent.click(body.getByRole("button", { name: "Edit" }));+ await expect(onDisabledAction).not.toHaveBeenCalled();+ },+});++export const TestDisabledLink = meta.story({+ name: "(Test) Disabled link",+ args: {+ items: [+ {+ type: "item",+ id: "disabled-link",+ title: "View item",+ disabled: { reason: "You don't have permission to view this item." },+ href: "/items/example",+ },+ ],+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(canvas.getByRole("button", { name: "Open menu" }));+ const link = await body.findByRole("link", { name: "View item" });+ await expect(link).toHaveAttribute("aria-disabled", "true");+ await expect(link).toHaveAttribute("tabindex", "-1");+ },+});diff --git a/web/src/components/design-system/DropdownMenu/DropdownMenu.tsx b/web/src/components/design-system/DropdownMenu/DropdownMenu.tsxnew file mode 100644index 0000000000..0768ff0c5f--- /dev/null+++ b/web/src/components/design-system/DropdownMenu/DropdownMenu.tsx@@ -0,0 +1,359 @@+/* eslint-disable boundaries/dependencies */+"use client";++import {+ autoUpdate,+ flip,+ FloatingFocusManager,+ FloatingPortal,+ offset,+ shift,+ useClick,+ useDismiss,+ useFloating,+ useInteractions,+ useListNavigation,+ useRole,+ useTypeahead,+ type Placement,+} from "@floating-ui/react";+import { cva } from "class-variance-authority";+import { type LucideIcon } from "lucide-react";+import Link from "next/link";+import * as React from "react";++import { useScrollGradients } from "@/src/hooks/useScrollGradients";+import { useLayerContainer } from "../../ui/layer";++const menuVariants = cva(+ "bg-popover text-popover-foreground animate-in fade-in-0 zoom-in-95 min-w-32 overflow-y-auto rounded-md border shadow-md outline-hidden",+);++const menuBodyVariants = cva(+ "before:from-popover after:from-popover p-1 before:pointer-events-none before:sticky before:z-2 before:-mx-1 before:-mb-6 before:block before:h-6 before:bg-linear-to-b before:to-transparent before:content-[''] after:pointer-events-none after:sticky after:bottom-0 after:z-2 after:-mx-1 after:-mt-6 after:block after:h-6 after:bg-linear-to-t after:to-transparent after:content-['']",+ {+ variants: {+ showTopGradient: {+ true: "before:opacity-100",+ false: "before:opacity-0",+ },+ showBottomGradient: {+ true: "after:opacity-100",+ false: "after:opacity-0",+ },+ hasTitle: {+ true: "before:top-[calc(2.5rem-1px)]",+ false: "before:top-0",+ },+ },+ },+);++const menuItemVariants = cva(+ "focus:bg-accent data-[active]:bg-accent data-[disabled]:cursor-not-allowed data-[disabled]:opacity-50 relative flex h-8 min-w-0 cursor-pointer items-center rounded-sm text-sm outline-hidden transition-colors",+);++const primaryActionVariants = cva(+ "flex min-w-0 flex-1 cursor-pointer items-center px-2 py-1.5",+);++const secondaryActionVariants = cva(+ "hover:bg-border dark:hover:bg-white/10 mr-1 flex size-6 shrink-0 cursor-pointer items-center justify-center rounded",+);++type MenuAction =+ | { href: string; onClick?: never }+ | { href?: never; onClick: () => void };++type DropdownMenuItem = {+ disabled?: { reason: string };+ id: string;+ title: string;+ icon?: LucideIcon;+ type: "item";+ secondaryAction?: MenuAction & {+ ariaLabel: string;+ icon: LucideIcon;+ };+} & MenuAction;++type DropdownMenuItemDefinition =+ | DropdownMenuItem+ | { id: string; type: "loading" }+ | { id: string; type: "separator" };++type DropdownMenuProps = {+ children: (controls: {+ getTriggerProps: () => ReturnType<+ ReturnType<typeof useInteractions>["getReferenceProps"]+ >;+ }) => React.ReactNode;+ items: DropdownMenuItemDefinition[];+ maxHeight?: React.CSSProperties["maxHeight"];+ placement?: Placement;+ title?: string;+};++function DropdownMenu({+ children,+ items,+ maxHeight = "15rem",+ placement = "bottom-start",+ title,+}: DropdownMenuProps) {+ const [isOpen, setIsOpen] = React.useState(false);+ const [activeIndex, setActiveIndex] = React.useState<number | null>(null);+ const layerContainer = useLayerContainer("popover");+ const listRef = React.useRef<Array<HTMLElement | null>>([]);+ const labelsRef = React.useRef<Array<string | null>>([]);+ const { register, recompute, top, bottom } =+ useScrollGradients<HTMLDivElement>(true);+ const { context, floatingStyles, refs } = useFloating({+ open: isOpen,+ onOpenChange: setIsOpen,+ placement,+ middleware: [offset(4), flip(), shift({ padding: 8 })],+ transform: false,+ whileElementsMounted: autoUpdate,+ });+ const click = useClick(context);+ const dismiss = useDismiss(context);+ const role = useRole(context, { role: "menu" });+ const listNavigation = useListNavigation(context, {+ activeIndex,+ listRef,+ loop: true,+ onNavigate: setActiveIndex,+ });+ const typeahead = useTypeahead(context, {+ activeIndex,+ listRef: labelsRef,+ onMatch: setActiveIndex,+ });+ const { getFloatingProps, getItemProps, getReferenceProps } = useInteractions(+ [click, dismiss, role, listNavigation, typeahead],+ );++ return (+ <>+ {children({+ getTriggerProps: () =>+ getReferenceProps({+ ref: refs.setReference,+ }),+ })}+ {isOpen ? (+ <FloatingPortal root={layerContainer}>+ <FloatingFocusManager context={context} modal={false}>+ <div+ ref={(element) => {+ refs.setFloating(element);+ register(element);+ }}+ className={menuVariants()}+ style={{ ...floatingStyles, maxHeight }}+ {...getFloatingProps({ onScroll: recompute })}+ {...(title+ ? { "aria-label": title, "aria-labelledby": undefined }+ : {})}+ >+ {title ? (+ <div className="border-border bg-popover sticky top-0 z-1 border-b px-3 py-2.5 text-sm font-bold">+ {title}+ </div>+ ) : null}+ <div+ className={menuBodyVariants({+ hasTitle: Boolean(title),+ showBottomGradient: bottom,+ showTopGradient: top,+ })}+ >+ {items.map((item, index) => {+ if (item.type === "separator") {+ labelsRef.current[index] = null;+ listRef.current[index] = null;+ return (+ <div+ key={item.id}+ role="separator"+ className="bg-border -mx-1 my-1 h-px"+ />+ );+ }++ if (item.type === "loading") {+ labelsRef.current[index] = null;+ listRef.current[index] = null;+ return (+ <div+ key={item.id}+ role="menuitem"+ aria-label="Loading"+ aria-disabled="true"+ className="flex h-8 items-center px-2 py-1.5"+ >+ <div className="bg-muted-foreground/20 h-4 w-24 animate-pulse rounded-md" />+ </div>+ );+ }++ const ItemIcon = item.icon;+ const SecondaryIcon = item.secondaryAction?.icon;+ labelsRef.current[index] = item.title;+ let renderedSecondaryAction: React.ReactNode = null;++ if (item.secondaryAction && SecondaryIcon) {+ const secondaryAction = item.secondaryAction;+ const interactionProps = {+ onMouseEnter: () => {+ if (!item.disabled) setActiveIndex(index);+ },+ onMouseLeave: () => setActiveIndex(null),+ };++ if (secondaryAction.href) {+ renderedSecondaryAction = (+ <Link+ data-secondary-action=""+ href={secondaryAction.href}+ aria-label={secondaryAction.ariaLabel}+ aria-disabled={item.disabled ? "true" : undefined}+ tabIndex={-1}+ className={secondaryActionVariants()}+ onClick={(event) => {+ event.stopPropagation();+ if (item.disabled) {+ event.preventDefault();+ return;+ }+ setIsOpen(false);+ }}+ {...interactionProps}+ >+ <SecondaryIcon size={12} aria-hidden="true" />+ </Link>+ );+ } else {+ renderedSecondaryAction = (+ <button+ type="button"+ disabled={Boolean(item.disabled)}+ data-secondary-action=""+ aria-label={secondaryAction.ariaLabel}+ tabIndex={-1}+ className={secondaryActionVariants()}+ onClick={(event) => {+ event.stopPropagation();+ setIsOpen(false);+ secondaryAction.onClick?.();+ }}+ {...interactionProps}+ >+ <SecondaryIcon size={12} aria-hidden="true" />+ </button>+ );+ }+ }++ return (+ <div+ key={item.id}+ role="menuitem"+ tabIndex={activeIndex === index ? 0 : -1}+ aria-disabled={item.disabled ? "true" : undefined}+ title={item.disabled?.reason}+ ref={(element) => {+ listRef.current[index] = element;+ }}+ data-active={activeIndex === index ? "" : undefined}+ data-disabled={item.disabled ? "" : undefined}+ className={menuItemVariants()}+ {...getItemProps({+ onClick: (event) => {+ if (item.disabled) return;+ if (event.target !== event.currentTarget) return;+ event.preventDefault();+ event.currentTarget+ .querySelector<HTMLElement>("[data-primary-action]")+ ?.click();+ },+ onKeyDown: (event) => {+ if (item.disabled) return;+ if (event.target !== event.currentTarget) return;+ if (event.key !== "Enter" && event.key !== " ")+ return;+ event.preventDefault();+ event.currentTarget+ .querySelector<HTMLElement>("[data-primary-action]")+ ?.click();+ },+ })}+ >+ {item.href ? (+ <Link+ data-primary-action=""+ href={item.href}+ aria-disabled={item.disabled ? "true" : undefined}+ tabIndex={item.disabled ? -1 : undefined}+ className={primaryActionVariants()}+ onClick={(event) => {+ if (item.disabled) {+ event.preventDefault();+ return;+ }+ setIsOpen(false);+ }}+ >+ {ItemIcon ? (+ <ItemIcon+ className="mr-1.5 size-4"+ aria-hidden="true"+ />+ ) : null}+ <span+ className="min-w-0 flex-1 overflow-hidden text-left text-ellipsis whitespace-nowrap"+ title={item.title}+ >+ {item.title}+ </span>+ </Link>+ ) : (+ <button+ type="button"+ disabled={Boolean(item.disabled)}+ data-primary-action=""+ className={primaryActionVariants()}+ onClick={() => {+ setIsOpen(false);+ item.onClick?.();+ }}+ >+ {ItemIcon ? (+ <ItemIcon+ className="mr-1.5 size-4"+ aria-hidden="true"+ />+ ) : null}+ <span+ className="min-w-0 flex-1 overflow-hidden text-left text-ellipsis whitespace-nowrap"+ title={item.title}+ >+ {item.title}+ </span>+ </button>+ )}+ {renderedSecondaryAction}+ </div>+ );+ })}+ </div>+ </div>+ </FloatingFocusManager>+ </FloatingPortal>+ ) : null}+ </>+ );+}++export { DropdownMenu };diff --git a/web/src/components/layouts/breadcrumb.tsx b/web/src/components/layouts/breadcrumb.tsxindex ba77a0096d..34101f2220 100644--- a/web/src/components/layouts/breadcrumb.tsx+++ b/web/src/components/layouts/breadcrumb.tsx@@ -7,10 +7,6 @@ import {BreadcrumbSeparator,} from "@/src/components/ui/breadcrumb";import { Fragment } from "react";-import {- DropdownMenu,- DropdownMenuTrigger,-} from "@/src/components/ui/dropdown-menu";import { ChevronDownIcon, Slash } from "lucide-react";import { env } from "@/src/env.mjs";import {@@ -48,53 +44,63 @@ const BreadcrumbComponent = ({<Breadcrumb className={className}><BreadcrumbList>{organization && (- <DropdownMenu>- <DropdownMenuTrigger className="text-primary flex h-5 items-center gap-1 p-0 text-sm leading-none">- {organization?.name ?? "Organization"}- {isCloudPlan(organization?.plan) &&- organization.id !== env.NEXT_PUBLIC_DEMO_ORG_ID && (- <Badge- className="ml-1 px-1 py-0 text-xs font-normal"- variant="secondary"- >- {planLabels[organization.plan]}- </Badge>- )}- <ChevronDownIcon className="h-4 w-4" />- </DropdownMenuTrigger>- <OrganizationDropdownMenu- {...(organizations- ? { state: "loaded", organizations }- : { state: "loading" })}- canCreateOrganizations={!!canCreateOrganizations}- getOrgPath={getOrgPath}- />- </DropdownMenu>+ <OrganizationDropdownMenu+ {...(organizations+ ? { state: "loaded", organizations }+ : { state: "loading" })}+ canCreateOrganizations={!!canCreateOrganizations}+ getOrgPath={getOrgPath}+ >+ {({ getTriggerProps }) => (+ <button+ type="button"+ className="text-primary flex h-5 items-center gap-1 p-0 text-sm leading-none"+ {...getTriggerProps()}+ >+ {organization?.name ?? "Organization"}+ {isCloudPlan(organization?.plan) &&+ organization.id !== env.NEXT_PUBLIC_DEMO_ORG_ID && (+ <Badge+ className="ml-1 px-1 py-0 text-xs font-normal"+ variant="secondary"+ >+ {planLabels[organization.plan]}+ </Badge>+ )}+ <ChevronDownIcon className="h-4 w-4" />+ </button>+ )}+ </OrganizationDropdownMenu>)}{organization && project && (<><BreadcrumbSeparator><Slash /></BreadcrumbSeparator>- <DropdownMenu>- <DropdownMenuTrigger className="text-primary flex h-5 items-center gap-1 p-0 leading-none">- {project?.name ?? "Project"}- <ChevronDownIcon className="h-4 w-4" />- </DropdownMenuTrigger>- <ProjectDropdownMenu- organizationId={organization.id}- {...(organizations- ? {- state: "loaded",- projects:- organizations.find((org) => org.id === organization.id)- ?.projects ?? [],- }- : { state: "loading" })}- canCreateProjects={!!canCreateProjects}- getProjectPath={getProjectPath}- />- </DropdownMenu>+ <ProjectDropdownMenu+ organizationId={organization.id}+ {...(organizations+ ? {+ state: "loaded",+ projects:+ organizations.find((org) => org.id === organization.id)+ ?.projects ?? [],+ }+ : { state: "loading" })}+ canCreateProjects={!!canCreateProjects}+ getProjectPath={getProjectPath}+ >+ {({ getTriggerProps }) => (+ <button+ type="button"+ className="text-primary flex h-5 items-center gap-1 p-0 leading-none"+ {...getTriggerProps()}+ >+ {project.name}+ <ChevronDownIcon className="h-4 w-4" />+ </button>+ )}+ </ProjectDropdownMenu></>)}{items?.map((item, index) => (diff --git a/web/src/components/nav/AppSidebar/AppSidebar.tsx b/web/src/components/nav/AppSidebar/AppSidebar.tsxindex 2056c7fe74..866f379b8c 100644--- a/web/src/components/nav/AppSidebar/AppSidebar.tsx+++ b/web/src/components/nav/AppSidebar/AppSidebar.tsx@@ -276,9 +276,15 @@ function MobileNavSwitcher({<SidebarGroupContent><SidebarMenu><SidebarMenuItem>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <SidebarMenuButton>+ <OrganizationDropdownMenu+ {...(organizations+ ? { state: "loaded", organizations }+ : { state: "loading" })}+ canCreateOrganizations={canCreateOrganizations}+ getOrgPath={getOrgPath}+ >+ {({ getTriggerProps }) => (+ <SidebarMenuButton {...getTriggerProps()}><spanclassName="min-w-0 flex-1 truncate text-left"title={organization.name}@@ -287,21 +293,27 @@ function MobileNavSwitcher({</span><ChevronDownIcon className="ml-auto h-4 w-4 shrink-0" /></SidebarMenuButton>- </DropdownMenuTrigger>- <OrganizationDropdownMenu- {...(organizations- ? { state: "loaded", organizations }- : { state: "loading" })}- canCreateOrganizations={canCreateOrganizations}- getOrgPath={getOrgPath}- />- </DropdownMenu>+ )}+ </OrganizationDropdownMenu></SidebarMenuItem>{project && (<SidebarMenuItem>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <SidebarMenuButton>+ <ProjectDropdownMenu+ organizationId={organization.id}+ {...(organizations+ ? {+ state: "loaded",+ projects:+ organizations.find(+ (item) => item.id === organization.id,+ )?.projects ?? [],+ }+ : { state: "loading" })}+ canCreateProjects={canCreateProjects}+ getProjectPath={getProjectPath}+ >+ {({ getTriggerProps }) => (+ <SidebarMenuButton {...getTriggerProps()}><spanclassName="min-w-0 flex-1 truncate text-left"title={project.name}@@ -310,22 +322,8 @@ function MobileNavSwitcher({</span><ChevronDownIcon className="ml-auto h-4 w-4 shrink-0" /></SidebarMenuButton>- </DropdownMenuTrigger>- <ProjectDropdownMenu- organizationId={organization.id}- {...(organizations- ? {- state: "loaded",- projects:- organizations.find(- (item) => item.id === organization.id,- )?.projects ?? [],- }- : { state: "loading" })}- canCreateProjects={canCreateProjects}- getProjectPath={getProjectPath}- />- </DropdownMenu>+ )}+ </ProjectDropdownMenu></SidebarMenuItem>)}</SidebarMenu>diff --git a/web/src/components/ui/dropdown-menu.tsx b/web/src/components/ui/dropdown-menu.tsxindex 17a0708b61..6f2e665cad 100644--- a/web/src/components/ui/dropdown-menu.tsx+++ b/web/src/components/ui/dropdown-menu.tsx@@ -15,7 +15,6 @@ import Link from "next/link";import { cn } from "@/src/utils/tailwind";import { useLayerContainer } from "@/src/components/ui/layer";-import { Skeleton } from "@/src/components/ui/skeleton";import { useScrollGradients } from "@/src/hooks/useScrollGradients";const DropdownMenu = DropdownMenuPrimitive.Root;@@ -510,12 +509,6 @@ const DropdownMenuItemWithSecondaryAction = ();};-const DropdownMenuLoadingItem = () => (- <DropdownMenuItem disabled aria-label="Loading">- <Skeleton variant="contrast" className="h-4 w-24" />- </DropdownMenuItem>-);-const DropdownMenuCheckboxItem = React.forwardRef<React.ComponentRef<typeof DropdownMenuPrimitive.CheckboxItem>,React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.CheckboxItem>@@ -609,7 +602,6 @@ export {DropdownMenuContent,DropdownMenuItem,DropdownMenuItemWithSecondaryAction,- DropdownMenuLoadingItem,DropdownMenuCheckboxItem,DropdownMenuRadioItem,DropdownMenuLabel,diff --git a/web/src/features/datasets/components/DatasetActionMenu.tsx b/web/src/features/datasets/components/DatasetActionMenu.tsxnew file mode 100644index 0000000000..10f6e3e094--- /dev/null+++ b/web/src/features/datasets/components/DatasetActionMenu.tsx@@ -0,0 +1,119 @@+import { Bot, Copy, Edit, LockIcon, Trash } from "lucide-react";+import { type ComponentProps, useMemo } from "react";++import { DropdownMenu } from "@/src/components/design-system/DropdownMenu/DropdownMenu";+import { DeleteDatasetDialogController } from "@/src/features/datasets/components/DeleteDatasetDialogController";+import { DuplicateDatasetDialogController } from "@/src/features/datasets/components/DuplicateDatasetDialogController";+import { UpdateDatasetDialogController } from "@/src/features/datasets/components/UpdateDatasetDialogController";++type DatasetActionMenuProps = Omit<+ ComponentProps<typeof UpdateDatasetDialogController>,+ "children" | "source"+> & {+ children: ComponentProps<typeof DropdownMenu>["children"];+ manageEvaluatorsHref?: string;+};++type ActionControl = {+ disabled: { reason: string } | undefined;+ openDialog: () => void;+};++function DatasetActionDropdown({+ deleteControl,+ duplicateControl,+ children,+ manageEvaluatorsHref,+ updateControl,+}: {+ deleteControl: ActionControl;+ duplicateControl: ActionControl;+ children: ComponentProps<typeof DropdownMenu>["children"];+ manageEvaluatorsHref?: string;+ updateControl: ActionControl;+}) {+ const items = useMemo<ComponentProps<typeof DropdownMenu>["items"]>(+ () => [+ {+ type: "item",+ id: "edit",+ title: "Edit",+ icon: updateControl.disabled ? LockIcon : Edit,+ disabled: updateControl.disabled,+ onClick: updateControl.openDialog,+ },+ {+ type: "item",+ id: "duplicate",+ title: "Duplicate",+ icon: duplicateControl.disabled ? LockIcon : Copy,+ disabled: duplicateControl.disabled,+ onClick: duplicateControl.openDialog,+ },+ {+ type: "item",+ id: "delete",+ title: "Delete",+ icon: deleteControl.disabled ? LockIcon : Trash,+ disabled: deleteControl.disabled,+ onClick: deleteControl.openDialog,+ },+ ...(manageEvaluatorsHref+ ? [+ {+ type: "item" as const,+ id: "manage-evaluators",+ title: "Manage Evaluators",+ icon: Bot,+ href: manageEvaluatorsHref,+ },+ ]+ : []),+ ],+ [deleteControl, duplicateControl, manageEvaluatorsHref, updateControl],+ );++ return (+ <DropdownMenu items={items} placement="bottom-end">+ {children}+ </DropdownMenu>+ );+}++export function DatasetActionMenu({+ children,+ manageEvaluatorsHref,+ ...datasetProps+}: DatasetActionMenuProps) {+ return (+ <UpdateDatasetDialogController {...datasetProps} source="dataset">+ {(updateControl) => (+ <DuplicateDatasetDialogController+ projectId={datasetProps.projectId}+ datasetId={datasetProps.datasetId}+ >+ {(duplicateControl) => (+ <DeleteDatasetDialogController+ projectId={datasetProps.projectId}+ datasetId={datasetProps.datasetId}+ datasetName={datasetProps.datasetName}+ redirectUrl={`/project/${datasetProps.projectId}/datasets`}+ source="dataset"+ >+ {(deleteControl) => (+ <DatasetActionDropdown+ updateControl={updateControl}+ duplicateControl={duplicateControl}+ deleteControl={deleteControl}+ manageEvaluatorsHref={manageEvaluatorsHref}+ >+ {children}+ </DatasetActionDropdown>+ )}+ </DeleteDatasetDialogController>+ )}+ </DuplicateDatasetDialogController>+ )}+ </UpdateDatasetDialogController>+ );+}diff --git a/web/src/features/datasets/components/DeleteDatasetDialog.tsx b/web/src/features/datasets/components/DeleteDatasetDialog.tsxindex 93c67124d0..03a1b3485e 100644--- a/web/src/features/datasets/components/DeleteDatasetDialog.tsx+++ b/web/src/features/datasets/components/DeleteDatasetDialog.tsx@@ -1,71 +1,89 @@import { ConfirmDialog } from "@/src/components/ui/confirm-dialog";import { Input } from "@/src/components/ui/input";import { Label } from "@/src/components/ui/label";+import { DialogController } from "@/src/features/in-app-agent/components/dialog-controller";import { usePostHogClientCapture } from "@/src/features/posthog-analytics";import { api } from "@/src/utils/api";-import { useState } from "react";+import { type ReactNode, useState } from "react";+import { useRouter } from "next/router";export interface DeleteDatasetDialogDataProps {projectId: string;datasetId: string;datasetName: string;-}--interface DeleteDatasetDialogProps extends DeleteDatasetDialogDataProps {- open: boolean;- onOpenChange: (open: boolean) => void;+ redirectUrl?: string;}export function DeleteDatasetDialog({+ children,projectId,datasetId,datasetName,- open,- onOpenChange,-}: DeleteDatasetDialogProps) {+ redirectUrl,+}: DeleteDatasetDialogDataProps & {+ children: (control: { openDialog: () => void }) => ReactNode;+}) {+ const router = useRouter();const capture = usePostHogClientCapture();const [deleteConfirmationInput, setDeleteConfirmationInput] = useState("");const utils = api.useUtils();const deleteMutation = api.datasets.deleteDataset.useMutation();- const handleDelete = async () => {+ const handleDelete = async (close: () => void) => {capture("datasets:delete_form_submit");try {await deleteMutation.mutateAsync({ projectId, datasetId });- utils.datasets.invalidate();- setDeleteConfirmationInput("");- onOpenChange(false);} catch {// The tRPC error handler owns mutation failures; keep the dialog open.+ return;+ }++ capture("datasets:delete_dataset_button_click");+ setDeleteConfirmationInput("");+ close();++ if (redirectUrl) {+ await router.push(redirectUrl);+ } else {+ await utils.datasets.invalidate();}};return (- <ConfirmDialog- open={open}- onOpenChange={(isOpen) => {- onOpenChange(isOpen);- if (!isOpen) setDeleteConfirmationInput("");- }}- size="lg"- title="Please confirm"- description="This action cannot be undone and removes all the data associated with this dataset."- confirmLabel="Delete dataset"- confirmDisabled={deleteConfirmationInput !== datasetName}- loading={deleteMutation.isPending}- onConfirm={handleDelete}+ <DialogController<true>+ dialog={(close, value) => (+ <ConfirmDialog+ open={value !== null}+ onOpenChange={(open) => {+ if (open) return;+ setDeleteConfirmationInput("");+ close();+ }}+ size="lg"+ title="Please confirm"+ description="This action cannot be undone and removes all the data associated with this dataset."+ confirmLabel="Delete dataset"+ confirmDisabled={deleteConfirmationInput !== datasetName}+ loading={deleteMutation.isPending}+ onConfirm={() => handleDelete(close)}+ >+ <div className="grid w-full gap-1.5">+ <Label htmlFor="delete-confirmation">+ Type "{datasetName}" to confirm deletion+ </Label>+ <Input+ id="delete-confirmation"+ value={deleteConfirmationInput}+ onChange={(event) =>+ setDeleteConfirmationInput(event.target.value)+ }+ />+ </div>+ </ConfirmDialog>+ )}>- <div className="grid w-full gap-1.5">- <Label htmlFor="delete-confirmation">- Type "{datasetName}" to confirm deletion- </Label>- <Input- id="delete-confirmation"- value={deleteConfirmationInput}- onChange={(event) => setDeleteConfirmationInput(event.target.value)}- />- </div>- </ConfirmDialog>+ {({ open }) => children({ openDialog: () => open(true) })}+ </DialogController>);}diff --git a/web/src/features/datasets/components/DeleteDatasetDialogController.tsx b/web/src/features/datasets/components/DeleteDatasetDialogController.tsxindex 4e2d5f9919..c1599a86f8 100644--- a/web/src/features/datasets/components/DeleteDatasetDialogController.tsx+++ b/web/src/features/datasets/components/DeleteDatasetDialogController.tsx@@ -4,7 +4,7 @@ import {type DeleteDatasetDialogDataProps,} from "@/src/features/datasets/components/DeleteDatasetDialog";import { usePostHogClientCapture } from "@/src/features/posthog-analytics";-import { type ReactNode, useState } from "react";+import { type ReactNode } from "react";export type DeleteDatasetDialogSource = "dataset" | "table-single-row";@@ -20,7 +20,6 @@ export function DeleteDatasetDialogController({}) => ReactNode;}) {const capture = usePostHogClientCapture();- const [open, setOpen] = useState(false);const hasAccess = useHasProjectAccess({projectId: props.projectId,scope: "datasets:CUD",@@ -30,21 +29,19 @@ export function DeleteDatasetDialogController({? undefined: { reason: "You don't have permission to delete this dataset." };- const openDialog = () => {- if (!hasAccess) return;-- setOpen(true);- capture("datasets:delete_form_open", { source });- };-return (- <>- {children({ disabled, openDialog })}- <DeleteDatasetDialog- {...props}- open={hasAccess && open}- onOpenChange={setOpen}- />- </>+ <DeleteDatasetDialog {...props}>+ {({ openDialog }) =>+ children({+ disabled,+ openDialog: () => {+ if (!hasAccess) return;++ openDialog();+ capture("datasets:delete_form_open", { source });+ },+ })+ }+ </DeleteDatasetDialog>);}diff --git a/web/src/features/datasets/components/DuplicateDatasetButton.tsx b/web/src/features/datasets/components/DuplicateDatasetButton.tsxdeleted file mode 100644index 9f2eb1531c..0000000000--- a/web/src/features/datasets/components/DuplicateDatasetButton.tsx+++ /dev/null@@ -1,44 +0,0 @@-import { useRouter } from "next/router";-import { Button } from "@/src/components/ui/button";-import { api } from "@/src/utils/api";-import { Copy } from "lucide-react";-import { useHasProjectAccess } from "@/src/features/rbac";--export const DuplicateDatasetButton: React.FC<{- projectId: string;- datasetId: string;-}> = ({ projectId, datasetId }) => {- const router = useRouter();- const hasAccess = useHasProjectAccess({- projectId,- scope: "datasets:CUD",- });- const duplicateDataset = api.datasets.duplicateDataset.useMutation({- onSuccess: ({ id }) => {- router.push(`/project/${projectId}/datasets/${id}/items`);- },- });-- const handleDuplicate = () => {- if (- confirm(- "Are you sure you want to duplicate this dataset and all of its items?",- )- ) {- duplicateDataset.mutate({ projectId, datasetId });- }- };-- return (- <Button- onClick={handleDuplicate}- variant="ghost"- title="Duplicate dataset"- loading={duplicateDataset.isPending}- disabled={!hasAccess}- >- <Copy className="mr-2 h-4 w-4" />- Duplicate- </Button>- );-};diff --git a/web/src/features/datasets/components/DuplicateDatasetDialogController.tsx b/web/src/features/datasets/components/DuplicateDatasetDialogController.tsxnew file mode 100644index 0000000000..615dfbd94e--- /dev/null+++ b/web/src/features/datasets/components/DuplicateDatasetDialogController.tsx@@ -0,0 +1,68 @@+import { useRouter } from "next/router";+import { type ReactNode } from "react";++import { ConfirmDialog } from "@/src/components/ui/confirm-dialog";+import { DialogController } from "@/src/features/in-app-agent/components/dialog-controller";+import { useHasProjectAccess } from "@/src/features/rbac";+import { api } from "@/src/utils/api";++export function DuplicateDatasetDialogController({+ children,+ datasetId,+ projectId,+}: {+ children: (control: {+ disabled: { reason: string } | undefined;+ openDialog: () => void;+ }) => ReactNode;+ datasetId: string;+ projectId: string;+}) {+ const router = useRouter();+ const hasAccess = useHasProjectAccess({+ projectId,+ scope: "datasets:CUD",+ });+ const duplicateDataset = api.datasets.duplicateDataset.useMutation();++ const disabled = hasAccess+ ? undefined+ : { reason: "You don't have permission to duplicate this dataset." };++ return (+ <DialogController<true>+ dialog={(close, value) => (+ <ConfirmDialog+ open={hasAccess && value !== null}+ onOpenChange={(open) => {+ if (!open) close();+ }}+ title="Duplicate dataset?"+ description="This creates a copy of the dataset and all of its items."+ confirmLabel="Duplicate dataset"+ loading={duplicateDataset.isPending}+ onConfirm={() =>+ duplicateDataset.mutate(+ { projectId, datasetId },+ {+ onSuccess: ({ id }) => {+ close();+ router.push(`/project/${projectId}/datasets/${id}/items`);+ },+ },+ )+ }+ />+ )}+ >+ {({ open }) =>+ children({+ disabled,+ openDialog: () => {+ if (hasAccess) open(true);+ },+ })+ }+ </DialogController>+ );+}diff --git a/web/src/pages/project/[projectId]/datasets/[datasetId]/experiments/index.tsx b/web/src/pages/project/[projectId]/datasets/[datasetId]/experiments/index.tsxindex a08170820e..8f906351e3 100644--- a/web/src/pages/project/[projectId]/datasets/[datasetId]/experiments/index.tsx+++ b/web/src/pages/project/[projectId]/datasets/[datasetId]/experiments/index.tsx@@ -1,19 +1,8 @@import { DatasetRunsTable } from "@/src/features/datasets/components/DatasetRunsTable";import { api } from "@/src/utils/api";-import Link from "next/link";import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";-import { UpdateDatasetDialogController } from "@/src/features/datasets/components/UpdateDatasetDialogController";-import {- DropdownMenu,- DropdownMenuContent,- DropdownMenuItemWithSecondaryAction,- DropdownMenuTrigger,- DropdownMenuItem,-} from "@/src/components/ui/dropdown-menu";-import { DeleteDatasetButton } from "@/src/components/deleteButton";-import { DuplicateDatasetButton } from "@/src/features/datasets/components/DuplicateDatasetButton";import { useState, useCallback } from "react";-import { Bot, Edit, FlaskConical, LockIcon, MoreVertical } from "lucide-react";+import { FlaskConical, MoreVertical } from "lucide-react";import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";import {Dialog,@@ -50,6 +39,7 @@ import {RouteParamsPendingFallback,useReadyRouteParams,} from "@/src/hooks/useReadyRouteParams";+import { DatasetActionMenu } from "@/src/features/datasets/components/DatasetActionMenu";export default function DatasetExperimentsPage() {const route = useReadyRouteParams(["projectId", "datasetId"]);@@ -335,7 +325,7 @@ function DatasetExperimentsView({}listKey="datasets"/>- <UpdateDatasetDialogController+ <DatasetActionMenuprojectId={projectId}datasetId={datasetId}datasetName={dataset.data?.name ?? ""}@@ -345,56 +335,23 @@ function DatasetExperimentsView({datasetExpectedOutputSchema={dataset.data?.expectedOutputSchema ?? undefined}- source="dataset"+ manageEvaluatorsHref={+ hasReadAccess+ ? `/project/${projectId}/evals?target=dataset`+ : undefined+ }>- {({ disabled, openDialog }) => (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="outline" size="icon">- <MoreVertical className="h-4 w-4" />- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent className="flex flex-col *:w-full *:justify-start">- <DropdownMenuItemWithSecondaryAction- disabled={disabled}- icon={disabled === undefined ? Edit : LockIcon}- title="Edit"- onClick={openDialog}- />- <DropdownMenuItem asChild>- <DuplicateDatasetButton- datasetId={datasetId}- projectId={projectId}- />- </DropdownMenuItem>- <DropdownMenuItem- asChild- onSelect={(event) => {- event.preventDefault();- return false;- }}- >- <DeleteDatasetButton- itemId={datasetId}- projectId={projectId}- redirectUrl={`/project/${projectId}/datasets`}- deleteConfirmation={dataset.data?.name}- />- </DropdownMenuItem>- {hasReadAccess && (- <DropdownMenuItem asChild>- <Link- href={`/project/${projectId}/evals?target=dataset`}- >- <Bot className="mr-2 ml-1 h-4 w-4" />- Manage Evaluators- </Link>- </DropdownMenuItem>- )}- </DropdownMenuContent>- </DropdownMenu>+ {({ getTriggerProps }) => (+ <Button+ variant="outline"+ size="icon"+ aria-label="Dataset actions"+ {...getTriggerProps()}+ >+ <MoreVertical className="h-4 w-4" />+ </Button>)}- </UpdateDatasetDialogController>+ </DatasetActionMenu></>),}}diff --git a/web/src/pages/project/[projectId]/datasets/[datasetId]/items/index.tsx b/web/src/pages/project/[projectId]/datasets/[datasetId]/items/index.tsxindex 5e0b550f52..21f9c89bdb 100644--- a/web/src/pages/project/[projectId]/datasets/[datasetId]/items/index.tsx+++ b/web/src/pages/project/[projectId]/datasets/[datasetId]/items/index.tsx@@ -5,21 +5,11 @@ import {} from "@/src/features/navigation/utils/dataset-tabs";import { DatasetItemsTable } from "@/src/features/datasets/components/DatasetItemsTable";import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";-import { UpdateDatasetDialogController } from "@/src/features/datasets/components/UpdateDatasetDialogController";-import { DeleteDatasetButton } from "@/src/components/deleteButton";import { NewDatasetItemButton } from "@/src/features/datasets/components/NewDatasetItemButton";-import { DuplicateDatasetButton } from "@/src/features/datasets/components/DuplicateDatasetButton";import { UploadDatasetCsvButton } from "@/src/features/datasets/components/UploadDatasetCsvButton";import { Button } from "@/src/components/ui/button";-import { Edit, History, LockIcon, MoreVertical } from "lucide-react";+import { History, MoreVertical } from "lucide-react";import Page from "@/src/components/layouts/page";-import {- DropdownMenu,- DropdownMenuTrigger,- DropdownMenuContent,- DropdownMenuItem,- DropdownMenuItemWithSecondaryAction,-} from "@/src/components/ui/dropdown-menu";import { DatasetItemsOnboarding } from "@/src/components/onboarding/DatasetItemsOnboarding";import { SidePanel, SidePanelContent } from "@/src/components/ui/side-panel";import { DatasetVersionHistoryPanel } from "@/src/features/datasets/components/DatasetVersionHistoryPanel";@@ -31,6 +21,7 @@ import {RouteParamsPendingFallback,useReadyRouteParams,} from "@/src/hooks/useReadyRouteParams";+import { DatasetActionMenu } from "@/src/features/datasets/components/DatasetActionMenu";export default function DatasetItemsPage() {const route = useReadyRouteParams(["projectId", "datasetId"]);@@ -127,7 +118,7 @@ function DatasetItemsView({}listKey="datasets"/>- <UpdateDatasetDialogController+ <DatasetActionMenuprojectId={projectId}datasetId={datasetId}datasetName={dataset.data?.name ?? ""}@@ -137,46 +128,18 @@ function DatasetItemsView({datasetExpectedOutputSchema={dataset.data?.expectedOutputSchema ?? undefined}- source="dataset">- {({ disabled, openDialog }) => (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button variant="outline" size="icon">- <MoreVertical className="h-4 w-4" />- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent className="flex flex-col *:w-full *:justify-start">- <DropdownMenuItemWithSecondaryAction- disabled={disabled}- icon={disabled === undefined ? Edit : LockIcon}- title="Edit"- onClick={openDialog}- />- <DropdownMenuItem asChild>- <DuplicateDatasetButton- datasetId={datasetId}- projectId={projectId}- />- </DropdownMenuItem>- <DropdownMenuItem- asChild- onSelect={(event) => {- event.preventDefault();- return false;- }}- >- <DeleteDatasetButton- itemId={datasetId}- projectId={projectId}- redirectUrl={`/project/${projectId}/datasets`}- deleteConfirmation={dataset.data?.name}- />- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>+ {({ getTriggerProps }) => (+ <Button+ variant="outline"+ size="icon"+ aria-label="Dataset actions"+ {...getTriggerProps()}+ >+ <MoreVertical className="h-4 w-4" />+ </Button>)}- </UpdateDatasetDialogController>+ </DatasetActionMenu><Buttonvariant="outline"size="icon"