Skip to content

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

refactor(web): Clean up `NewDatasetItemFromExistingObject` (#16782)

Ben Bachem3bb7c17096f4
diff --git a/web/src/components/session/NewDatasetItemFromTrace.tsx b/web/src/components/session/NewDatasetItemFromTrace.tsx
deleted file mode 100644
index 491580bdf6..0000000000
--- a/web/src/components/session/NewDatasetItemFromTrace.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { type ButtonProps } from "@/src/components/ui/button";
-import { NewDatasetItemFromExistingObject } from "@/src/features/datasets/components/NewDatasetItemFromExistingObject";
-import { api } from "@/src/utils/api";
-
-export const NewDatasetItemFromTraceId = (props: {
- projectId: string;
- traceId: string;
- timestamp: Date;
- buttonVariant?: ButtonProps["variant"];
- size?: ButtonProps["size"];
-}) => {
- // SessionIO already fetches the trace, so this doesn't add an extra request
- const trace = api.traces.byId.useQuery(
- {
- traceId: props.traceId,
- projectId: props.projectId,
- timestamp: props.timestamp,
- },
- {
- enabled: typeof props.traceId === "string",
- trpc: {
- context: {
- skipBatch: true,
- },
- },
- refetchOnMount: false,
- },
- );
-
- if (!trace.data) return null;
-
- return (
- <NewDatasetItemFromExistingObject
- projectId={props.projectId}
- traceId={props.traceId}
- input={trace.data.input ?? null}
- output={trace.data.output ?? null}
- metadata={trace.data.metadata ?? null}
- buttonVariant={props.buttonVariant}
- size={props.size}
- />
- );
-};
diff --git a/web/src/components/session/SessionTraceActionButtons.tsx b/web/src/components/session/SessionTraceActionButtons.tsx
index f6b003da44..dd7cfabf04 100644
--- a/web/src/components/session/SessionTraceActionButtons.tsx
+++ b/web/src/components/session/SessionTraceActionButtons.tsx
@@ -1,11 +1,13 @@
/* eslint-disable @repo/no-style-props */
-import { type RouterOutputs } from "@/src/utils/api";
+import { api, type RouterOutputs } from "@/src/utils/api";
import { getNumberFromMap } from "@/src/utils/map-utils";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
import { Button } from "@/src/components/ui/button";
import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
-import { NewDatasetItemFromTraceId } from "@/src/components/session/NewDatasetItemFromTrace";
+import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
+import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
+import { useDatasetItemFromTraceOrObservation } from "@/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation";
import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
import { cn } from "@/src/utils/tailwind";
@@ -14,6 +16,7 @@ import {
LockIcon,
MessageSquare,
MessageSquareOff,
+ PlusIcon,
SquarePen,
} from "lucide-react";
@@ -41,16 +44,89 @@ export function SessionTraceActionButtons({
}) {
const size = density === "compact" ? "xs" : "default";
const commentCount = getNumberFromMap(traceCommentCounts, traceId);
+ // SessionIO already fetches the trace, so this doesn't add an extra request
+ const trace = api.traces.byId.useQuery(
+ {
+ traceId,
+ projectId,
+ timestamp,
+ },
+ {
+ enabled: typeof traceId === "string",
+ trpc: {
+ context: {
+ skipBatch: true,
+ },
+ },
+ refetchOnMount: false,
+ },
+ );
+ const {
+ existingDatasetItems,
+ hasAccess: hasDatasetAccess,
+ captureNewDatasetItemFormOpen,
+ } = useDatasetItemFromTraceOrObservation({
+ projectId,
+ traceId,
+ enabled: Boolean(trace.data),
+ });
+ const datasetCount = existingDatasetItems.length;
+ const hasExistingDatasetItems = datasetCount > 0;
return (
<div className={cn("flex flex-wrap items-start gap-2", className)}>
- <NewDatasetItemFromTraceId
- projectId={projectId}
- traceId={traceId}
- timestamp={timestamp}
- buttonVariant="outline"
- size={size}
- />
+ {trace.data ? (
+ <NewDatasetItemFromExistingObjectDialogController
+ projectId={projectId}
+ traceId={traceId}
+ input={trace.data.input ?? null}
+ output={trace.data.output ?? null}
+ metadata={trace.data.metadata ?? null}
+ >
+ {({ openDialog }) => (
+ <ExistingDatasetItemsDropdownMenuController
+ projectId={projectId}
+ datasetItems={existingDatasetItems}
+ disabled={!hasDatasetAccess}
+ onOpenDialog={openDialog}
+ >
+ {({ Anchor, openDropdown }) => (
+ <Anchor>
+ <Button
+ onClick={() => {
+ if (hasExistingDatasetItems) {
+ openDropdown();
+ return;
+ }
+
+ captureNewDatasetItemFormOpen();
+ openDialog();
+ }}
+ variant={hasExistingDatasetItems ? "secondary" : "outline"}
+ size={size}
+ disabled={!hasDatasetAccess}
+ >
+ {!hasExistingDatasetItems && hasDatasetAccess ? (
+ <PlusIcon
+ className="mr-1.5 -ml-0.5 h-4 w-4"
+ aria-hidden="true"
+ />
+ ) : null}
+ {hasExistingDatasetItems
+ ? `In ${datasetCount} dataset(s)`
+ : "Add to datasets"}
+ {hasExistingDatasetItems ? (
+ <ChevronDown className="ml-2 h-3 w-3" />
+ ) : !hasDatasetAccess ? (
+ <LockIcon className="ml-1.5 h-3 w-3" aria-hidden="true" />
+ ) : null}
+ </Button>
+ </Anchor>
+ )}
+ </ExistingDatasetItemsDropdownMenuController>
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
+ ) : null}
<div className="flex items-start">
<AnnotateDrawerController
key={`annotation-drawer-${traceId}`}
diff --git a/web/src/components/ui/dialog.tsx b/web/src/components/ui/dialog.tsx
index 92121cfdca..b22ec8dc23 100644
--- a/web/src/components/ui/dialog.tsx
+++ b/web/src/components/ui/dialog.tsx
@@ -173,11 +173,14 @@ DialogContent.displayName = DialogPrimitive.Content.displayName;
/**
* Owns dialog open state while callers retain trigger and content presentation.
- * Use the supplied Trigger to preserve Radix behavior.
+ * Prefer Trigger for direct user actions so Radix can provide trigger semantics,
+ * keyboard behavior, and focus restoration. Use openDialog when the dialog must
+ * open indirectly.
*/
type DialogControllerProps = {
children: (control: {
isOpen: boolean;
+ openDialog: () => void;
Trigger: typeof DialogTrigger;
}) => React.ReactNode;
closeOnInteractionOutside: boolean;
@@ -195,7 +198,11 @@ const DialogController = ({
return (
<Dialog open={isOpen} onOpenChange={setIsOpen}>
- {children({ isOpen, Trigger: DialogTrigger })}
+ {children({
+ isOpen,
+ openDialog: () => setIsOpen(true),
+ Trigger: DialogTrigger,
+ })}
<DialogContent
size={size}
closeOnInteractionOutside={closeOnInteractionOutside}
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index d6b7ba60d4..9043bc38f6 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -1,9 +1,10 @@
import Page from "@/src/components/layouts/page";
+import { ActionButton } from "@/src/components/ActionButton";
import { Button } from "@/src/components/ui/button";
-import { NewDatasetItemFromExistingObject } from "@/src/features/datasets/components/NewDatasetItemFromExistingObject";
+import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
import { DetailPageNav } from "@/src/features/navigate-detail-pages/DetailPageNav";
import { api } from "@/src/utils/api";
-import { ListTree, MoreVertical, Pencil, Trash2 } from "lucide-react";
+import { CopyIcon, ListTree, MoreVertical, Pencil, Trash2 } from "lucide-react";
import Link from "next/link";
import { useRouter } from "next/router";
import { DatasetStatus } from "@langfuse/shared";
@@ -212,7 +213,7 @@ export const DatasetItemDetailPage = ({
listKey="datasetItems"
/>
{item.data ? (
- <NewDatasetItemFromExistingObject
+ <NewDatasetItemFromExistingObjectDialogController
projectId={projectId}
fromDatasetId={item.data.datasetId}
traceId={item.data.sourceTraceId ?? undefined}
@@ -220,8 +221,21 @@ export const DatasetItemDetailPage = ({
input={JSON.stringify(item.data.input)}
output={JSON.stringify(item.data.expectedOutput)}
metadata={JSON.stringify(item.data.metadata)}
- isCopyItem
- />
+ >
+ {({ Trigger }) => (
+ <Trigger asChild>
+ <ActionButton
+ variant="outline"
+ size="icon"
+ hasAccess={hasAccess}
+ title="Copy item"
+ aria-label="Copy item"
+ >
+ <CopyIcon className="size-3" />
+ </ActionButton>
+ </Trigger>
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
) : (
<Button variant="outline" size="icon" disabled>
<Skeleton className="h-5 w-5" />
diff --git a/web/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController.clienttest.tsx b/web/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController.clienttest.tsx
new file mode 100644
index 0000000000..d37f0af7c1
--- /dev/null
+++ b/web/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController.clienttest.tsx
@@ -0,0 +1,204 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import {
+ cloneElement,
+ type KeyboardEventHandler,
+ type PointerEventHandler,
+ type ReactElement,
+ type ReactNode,
+} from "react";
+import { vi } from "vitest";
+
+import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
+import { type RouterOutputs } from "@/src/utils/api";
+
+const { radixKeyDown, radixPointerDown } = vi.hoisted(() => ({
+ radixKeyDown: vi.fn(),
+ radixPointerDown: vi.fn(),
+}));
+
+vi.mock("@/src/components/ui/dropdown-menu", () => ({
+ DropdownMenu: ({
+ children,
+ open,
+ }: {
+ children: ReactNode;
+ open: boolean;
+ }) => (
+ <div data-testid="dropdown-root" data-open={String(open)}>
+ {children}
+ </div>
+ ),
+ DropdownMenuTrigger: ({
+ children,
+ }: {
+ children: ReactElement<{
+ "aria-haspopup"?: string;
+ onKeyDown?: KeyboardEventHandler;
+ onPointerDown?: PointerEventHandler;
+ }>;
+ }) =>
+ cloneElement(children, {
+ "aria-haspopup": "menu",
+ onKeyDown: radixKeyDown,
+ onPointerDown: radixPointerDown,
+ }),
+ DropdownMenuContent: ({ children }: { children: ReactNode }) => (
+ <div>{children}</div>
+ ),
+ DropdownMenuItem: ({
+ asChild,
+ children,
+ onSelect,
+ }: {
+ asChild?: boolean;
+ children: ReactNode;
+ onSelect?: () => void;
+ }) =>
+ asChild ? (
+ <>{children}</>
+ ) : (
+ <button type="button" onClick={onSelect}>
+ {children}
+ </button>
+ ),
+ DropdownMenuSeparator: () => <hr />,
+}));
+
+const datasetItems = [
+ {
+ id: "dataset-item-id",
+ datasetId: "dataset-id",
+ datasetName: "Dataset name",
+ },
+] as RouterOutputs["datasets"]["datasetItemsBasedOnTraceOrObservation"];
+
+function renderController(props: {
+ datasetItems: RouterOutputs["datasets"]["datasetItemsBasedOnTraceOrObservation"];
+ disabled: boolean;
+ onOpenDialog: () => void;
+ onButtonClick?: () => void;
+}) {
+ return render(
+ <ExistingDatasetItemsDropdownMenuController
+ projectId="project-id"
+ datasetItems={props.datasetItems}
+ disabled={props.disabled}
+ onOpenDialog={props.onOpenDialog}
+ >
+ {({ Anchor, openDropdown }) => (
+ <Anchor>
+ <button
+ type="button"
+ disabled={props.disabled}
+ onClick={() => {
+ props.onButtonClick?.();
+
+ if (props.datasetItems.length > 0) {
+ openDropdown();
+ return;
+ }
+
+ props.onOpenDialog();
+ }}
+ >
+ Add to datasets
+ </button>
+ </Anchor>
+ )}
+ </ExistingDatasetItemsDropdownMenuController>,
+ );
+}
+
+describe("ExistingDatasetItemsDropdownMenuController", () => {
+ beforeEach(() => {
+ vi.clearAllMocks();
+ });
+
+ it("leaves direct opening to the button when the dropdown is inactive", () => {
+ const onOpenDialog = vi.fn();
+ const onButtonClick = vi.fn();
+
+ renderController({
+ datasetItems: [],
+ disabled: false,
+ onOpenDialog,
+ onButtonClick,
+ });
+ fireEvent.click(screen.getByRole("button", { name: "Add to datasets" }));
+
+ expect(onButtonClick).toHaveBeenCalledOnce();
+ expect(onOpenDialog).toHaveBeenCalledOnce();
+ expect(screen.queryByText("Add to more datasets")).not.toBeInTheDocument();
+ });
+
+ it("uses the trigger only as an anchor and opens programmatically", () => {
+ const onOpenDialog = vi.fn();
+
+ renderController({
+ datasetItems,
+ disabled: false,
+ onOpenDialog,
+ });
+ const button = screen.getByRole("button", { name: "Add to datasets" });
+
+ expect(button).toHaveAttribute("aria-haspopup", "menu");
+ fireEvent.pointerDown(button);
+ expect(radixPointerDown).not.toHaveBeenCalled();
+ expect(screen.getByTestId("dropdown-root")).toHaveAttribute(
+ "data-open",
+ "false",
+ );
+
+ fireEvent.click(button);
+
+ expect(onOpenDialog).not.toHaveBeenCalled();
+ expect(screen.getByTestId("dropdown-root")).toHaveAttribute(
+ "data-open",
+ "true",
+ );
+ expect(screen.getByRole("link", { name: "Dataset name" })).toHaveAttribute(
+ "href",
+ "/project/project-id/datasets/dataset-id/items/dataset-item-id",
+ );
+
+ fireEvent.click(
+ screen.getByRole("button", { name: "Add to more datasets" }),
+ );
+ expect(onOpenDialog).toHaveBeenCalledOnce();
+ expect(screen.getByTestId("dropdown-root")).toHaveAttribute(
+ "data-open",
+ "false",
+ );
+ });
+
+ it("opens from ArrowDown without running Radix trigger handlers", () => {
+ renderController({
+ datasetItems,
+ disabled: false,
+ onOpenDialog: vi.fn(),
+ });
+
+ fireEvent.keyDown(screen.getByRole("button", { name: "Add to datasets" }), {
+ key: "ArrowDown",
+ });
+
+ expect(radixKeyDown).not.toHaveBeenCalled();
+ expect(screen.getByTestId("dropdown-root")).toHaveAttribute(
+ "data-open",
+ "true",
+ );
+ });
+
+ it("does not open either overlay when disabled", () => {
+ const onOpenDialog = vi.fn();
+
+ renderController({
+ datasetItems: [],
+ disabled: true,
+ onOpenDialog,
+ });
+ fireEvent.click(screen.getByRole("button", { name: "Add to datasets" }));
+
+ expect(onOpenDialog).not.toHaveBeenCalled();
+ });
+});
diff --git a/web/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController.tsx b/web/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController.tsx
new file mode 100644
index 0000000000..229cdb9542
--- /dev/null
+++ b/web/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController.tsx
@@ -0,0 +1,143 @@
+import { Slot } from "@radix-ui/react-slot";
+import {
+ createContext,
+ forwardRef,
+ type ComponentPropsWithoutRef,
+ type ReactElement,
+ type ReactNode,
+ useContext,
+ useState,
+} from "react";
+import Link from "next/link";
+import { PlusIcon } from "lucide-react";
+
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from "@/src/components/ui/dropdown-menu";
+import { type RouterOutputs } from "@/src/utils/api";
+
+const ExistingDatasetItemsDropdownMenuContext = createContext<{
+ isDropdownEnabled: boolean;
+ openDropdown: () => void;
+} | null>(null);
+
+const PositionOnlyAnchorProxy = forwardRef<
+ HTMLButtonElement,
+ ComponentPropsWithoutRef<"button"> & {
+ children: ReactElement;
+ openDropdown: () => void;
+ }
+>(function PositionOnlyAnchorProxy(props, ref) {
+ const { children, openDropdown, ...radixTriggerProps } = props;
+
+ return (
+ <Slot
+ {...radixTriggerProps}
+ ref={ref}
+ // Radix DropdownMenu has no public positioning-only anchor. Its Trigger
+ // currently injects opening behavior through these two handlers, so strip
+ // them while retaining its positioning ref and accessibility attributes.
+ onPointerDown={undefined}
+ onKeyDown={(event) => {
+ if (event.key === "ArrowDown") {
+ openDropdown();
+ event.preventDefault();
+ }
+ }}
+ >
+ {children}
+ </Slot>
+ );
+});
+
+function ExistingDatasetItemsDropdownMenuAnchor(props: {
+ children: ReactElement;
+}) {
+ const context = useContext(ExistingDatasetItemsDropdownMenuContext);
+
+ if (!context) {
+ throw new Error(
+ "ExistingDatasetItemsDropdownMenuAnchor must be used within ExistingDatasetItemsDropdownMenuController",
+ );
+ }
+
+ if (context.isDropdownEnabled) {
+ return (
+ <DropdownMenuTrigger asChild>
+ <PositionOnlyAnchorProxy openDropdown={context.openDropdown}>
+ {props.children}
+ </PositionOnlyAnchorProxy>
+ </DropdownMenuTrigger>
+ );
+ }
+
+ return <Slot>{props.children}</Slot>;
+}
+
+export function ExistingDatasetItemsDropdownMenuController(props: {
+ projectId: string;
+ datasetItems: RouterOutputs["datasets"]["datasetItemsBasedOnTraceOrObservation"];
+ disabled: boolean;
+ onOpenDialog: () => void;
+ children: (control: {
+ Anchor: typeof ExistingDatasetItemsDropdownMenuAnchor;
+ openDropdown: () => void;
+ }) => ReactNode;
+}) {
+ const [isOpen, setIsOpen] = useState(false);
+ const hasDatasetItems = props.datasetItems.length > 0;
+ const isDropdownEnabled = hasDatasetItems && !props.disabled;
+ const openDialog = () => {
+ setIsOpen(false);
+ props.onOpenDialog();
+ };
+ const openDropdown = () => {
+ if (isDropdownEnabled) {
+ setIsOpen(true);
+ }
+ };
+
+ return (
+ <ExistingDatasetItemsDropdownMenuContext.Provider
+ value={{
+ isDropdownEnabled,
+ openDropdown,
+ }}
+ >
+ <DropdownMenu open={isDropdownEnabled && isOpen} onOpenChange={setIsOpen}>
+ {props.children({
+ Anchor: ExistingDatasetItemsDropdownMenuAnchor,
+ openDropdown,
+ })}
+ {isDropdownEnabled ? (
+ <DropdownMenuContent align="end">
+ {props.datasetItems.map(
+ ({ id: datasetItemId, datasetName, datasetId }) => (
+ <DropdownMenuItem
+ key={datasetItemId}
+ className="capitalize"
+ asChild
+ >
+ <Link
+ href={`/project/${props.projectId}/datasets/${datasetId}/items/${datasetItemId}`}
+ >
+ {datasetName}
+ </Link>
+ </DropdownMenuItem>
+ ),
+ )}
+ <DropdownMenuSeparator />
+ <DropdownMenuItem className="capitalize" onSelect={openDialog}>
+ <PlusIcon size={16} className="mr-2" aria-hidden="true" />
+ Add to more datasets
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ ) : null}
+ </DropdownMenu>
+ </ExistingDatasetItemsDropdownMenuContext.Provider>
+ );
+}
diff --git a/web/src/features/datasets/components/NewDatasetItemFromExistingObject.tsx b/web/src/features/datasets/components/NewDatasetItemFromExistingObject.tsx
deleted file mode 100644
index b6d1eddbcc..0000000000
--- a/web/src/features/datasets/components/NewDatasetItemFromExistingObject.tsx
+++ /dev/null
@@ -1,227 +0,0 @@
-import { ChevronDown, CopyIcon, LockIcon, PlusIcon } from "lucide-react";
-import {
- Dialog,
- DialogContent,
- DialogHeader,
- DialogTitle,
-} from "@/src/components/ui/dialog";
-import { api } from "@/src/utils/api";
-import { cn } from "@/src/utils/tailwind";
-import { useState } from "react";
-import {
- DropdownMenuItem,
- DropdownMenuSeparator,
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from "@/src/components/ui/dropdown-menu";
-import Link from "next/link";
-import { NewDatasetItemForm } from "@/src/features/datasets/components/NewDatasetItemForm";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
-import { Button, type ButtonProps } from "@/src/components/ui/button";
-import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
-import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth/hooks";
-import { parseJsonPrioritised, type Prisma } from "@langfuse/shared";
-import { ActionButton } from "@/src/components/ActionButton";
-import { type MetadataDomainClient } from "@/src/utils/clientSideDomainTypes";
-
-/**
- * Component for creating a new dataset item from an existing object.
- *
- * This component can be used in two different contexts:
- * 1. From a trace/observation: Creates a dataset item using data from a trace or observation
- * (requires traceId and optionally observationId)
- * 2. From an existing dataset item: Creates a new dataset item based on an existing one
- * (requires fromDatasetId) -> isCopyItem
- */
-export const NewDatasetItemFromExistingObject = (props: {
- projectId: string;
- traceId?: string;
- observationId?: string;
- fromDatasetId?: string;
- input: Prisma.JsonValue | null;
- output: Prisma.JsonValue | null;
- metadata: MetadataDomainClient;
- isCopyItem?: boolean;
- buttonVariant?: ButtonProps["variant"];
- size?: ButtonProps["size"];
- /**
- * "toolbar" (default) is the inline button; "menu" renders the same trigger
- * as a full-width labeled row for the mobile header overflow popover.
- */
- layout?: "toolbar" | "menu";
-}) => {
- const isMenu = props.layout === "menu";
- const normalizePrefillValue = (
- value: Prisma.JsonValue | null,
- ): Prisma.JsonValue | null => {
- if (value === null || value === undefined) {
- return null;
- }
-
- if (typeof value === "string") {
- const parsed = parseJsonPrioritised(value);
- return parsed !== undefined ? parsed : value;
- }
-
- return value;
- };
-
- const parsedInput = normalizePrefillValue(props.input);
- const parsedOutput = normalizePrefillValue(props.output);
-
- const [isFormOpen, setIsFormOpen] = useState(false);
- const isAuthenticatedAndProjectMember = useIsAuthenticatedAndProjectMember(
- props.projectId,
- );
- const observationInDatasets =
- api.datasets.datasetItemsBasedOnTraceOrObservation.useQuery(
- {
- projectId: props.projectId,
- traceId: props.traceId as string,
- observationId: props.observationId,
- },
- {
- enabled: isAuthenticatedAndProjectMember && !!props.traceId,
- },
- );
- const hasAccess = useHasProjectAccess({
- projectId: props.projectId,
- scope: "datasets:CUD",
- });
- const capture = usePostHogClientCapture();
- const buttonVariant = props.buttonVariant || "secondary";
- const buttonSize = props.size || "default";
-
- return (
- <>
- {props.isCopyItem ? (
- <ActionButton
- variant="outline"
- size={buttonSize === "sm" ? "icon-xs" : "icon"}
- hasAccess={hasAccess}
- title="Copy item"
- aria-label="Copy item"
- onClick={() => {
- setIsFormOpen(true);
- }}
- >
- <CopyIcon className="size-3" />
- </ActionButton>
- ) : observationInDatasets.data &&
- observationInDatasets.data.length > 0 ? (
- <div>
- <DropdownMenu open={hasAccess ? undefined : false}>
- <DropdownMenuTrigger asChild>
- <Button
- variant={isMenu ? "ghost" : "secondary"}
- size={isMenu ? "sm" : buttonSize}
- disabled={!hasAccess}
- className={
- isMenu ? "w-full justify-start gap-2 font-normal" : undefined
- }
- >
- {isMenu ? (
- <PlusIcon className="h-4 w-4" aria-hidden="true" />
- ) : null}
- <span className={isMenu ? "text-sm" : undefined}>
- {`In ${observationInDatasets.data.length} dataset(s)`}
- </span>
- <ChevronDown
- className={isMenu ? "ml-auto h-3 w-3" : "ml-2 h-3 w-3"}
- />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- {observationInDatasets.data.map(
- ({ id: datasetItemId, datasetName, datasetId }) => (
- <DropdownMenuItem
- key={datasetItemId}
- className="capitalize"
- asChild
- >
- <Link
- href={`/project/${props.projectId}/datasets/${datasetId}/items/${datasetItemId}`}
- >
- {datasetName}
- </Link>
- </DropdownMenuItem>
- ),
- )}
- <DropdownMenuSeparator />
- <DropdownMenuItem
- className="capitalize"
- onClick={() => {
- setIsFormOpen(true);
- }}
- >
- <PlusIcon size={16} className="mr-2" aria-hidden="true" />
- Add to more datasets
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- </div>
- ) : (
- <Button
- onClick={() => {
- setIsFormOpen(true);
- capture("dataset_item:new_from_trace_form_open", {
- object: props.observationId ? "observation" : "trace",
- });
- }}
- variant={isMenu ? "ghost" : buttonVariant}
- size={isMenu ? "sm" : buttonSize}
- disabled={!hasAccess}
- className={
- isMenu ? "w-full justify-start gap-2 font-normal" : undefined
- }
- >
- {hasAccess ? (
- <PlusIcon
- className={cn(
- isMenu
- ? "h-4 w-4"
- : cn(
- "mr-1.5 -ml-0.5",
- buttonSize === "sm" ? "h-3.5 w-3.5" : "h-4 w-4",
- ),
- )}
- aria-hidden="true"
- />
- ) : null}
- {isMenu ? (
- <span className="text-sm">Add to datasets</span>
- ) : (
- "Add to datasets"
- )}
- {!hasAccess ? (
- <LockIcon
- className={isMenu ? "ml-auto h-3 w-3" : "ml-1.5 h-3 w-3"}
- aria-hidden="true"
- />
- ) : null}
- </Button>
- )}
- <Dialog open={hasAccess && isFormOpen} onOpenChange={setIsFormOpen}>
- <DialogContent className="h-[calc(100vh-5rem)] max-h-none w-[calc(100vw-5rem)] max-w-none">
- <DialogHeader>
- <DialogTitle>Add item to datasets</DialogTitle>
- </DialogHeader>
- {isFormOpen && (
- <NewDatasetItemForm
- traceId={props.traceId}
- observationId={props.observationId}
- projectId={props.projectId}
- input={parsedInput}
- output={parsedOutput}
- metadata={props.metadata}
- onFormSuccess={() => setIsFormOpen(false)}
- className="h-full overflow-y-auto"
- currentDatasetId={props.fromDatasetId}
- />
- )}
- </DialogContent>
- </Dialog>
- </>
- );
-};
diff --git a/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx b/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx
new file mode 100644
index 0000000000..b22246120d
--- /dev/null
+++ b/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx
@@ -0,0 +1,68 @@
+import { type ReactNode } from "react";
+
+import { parseJsonPrioritised, type Prisma } from "@langfuse/shared";
+
+import {
+ DialogController,
+ DialogHeader,
+ DialogTitle,
+ type DialogTrigger,
+} from "@/src/components/ui/dialog";
+import { NewDatasetItemForm } from "@/src/features/datasets/components/NewDatasetItemForm";
+import { type MetadataDomainClient } from "@/src/utils/clientSideDomainTypes";
+
+export function NewDatasetItemFromExistingObjectDialogController(props: {
+ projectId: string;
+ traceId?: string;
+ observationId?: string;
+ fromDatasetId?: string;
+ input: Prisma.JsonValue | null;
+ output: Prisma.JsonValue | null;
+ metadata: MetadataDomainClient;
+ children: (control: {
+ openDialog: () => void;
+ Trigger: typeof DialogTrigger;
+ }) => ReactNode;
+}) {
+ const normalizePrefillValue = (
+ value: Prisma.JsonValue | null,
+ ): Prisma.JsonValue | null => {
+ if (value === null || value === undefined) {
+ return null;
+ }
+
+ if (typeof value === "string") {
+ const parsed = parseJsonPrioritised(value);
+ return parsed !== undefined ? parsed : value;
+ }
+
+ return value;
+ };
+
+ return (
+ <DialogController
+ closeOnInteractionOutside={false}
+ size="xxl"
+ renderContent={({ closeDialog }) => (
+ <>
+ <DialogHeader>
+ <DialogTitle>Add item to datasets</DialogTitle>
+ </DialogHeader>
+ <NewDatasetItemForm
+ traceId={props.traceId}
+ observationId={props.observationId}
+ projectId={props.projectId}
+ input={normalizePrefillValue(props.input)}
+ output={normalizePrefillValue(props.output)}
+ metadata={props.metadata}
+ onFormSuccess={closeDialog}
+ className="h-full overflow-y-auto"
+ currentDatasetId={props.fromDatasetId}
+ />
+ </>
+ )}
+ >
+ {({ openDialog, Trigger }) => props.children({ openDialog, Trigger })}
+ </DialogController>
+ );
+}
diff --git a/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts b/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts
new file mode 100644
index 0000000000..e64b7ad385
--- /dev/null
+++ b/web/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation.ts
@@ -0,0 +1,40 @@
+import { useIsAuthenticatedAndProjectMember } from "@/src/features/auth/hooks";
+import { usePostHogClientCapture } from "@/src/features/posthog-analytics/usePostHogClientCapture";
+import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { api } from "@/src/utils/api";
+
+export const useDatasetItemFromTraceOrObservation = (props: {
+ projectId: string;
+ traceId: string;
+ observationId?: string;
+ enabled?: boolean;
+}) => {
+ const isAuthenticatedAndProjectMember = useIsAuthenticatedAndProjectMember(
+ props.projectId,
+ );
+ const existingDatasetItems =
+ api.datasets.datasetItemsBasedOnTraceOrObservation.useQuery(
+ {
+ projectId: props.projectId,
+ traceId: props.traceId,
+ observationId: props.observationId,
+ },
+ {
+ enabled: (props.enabled ?? true) && isAuthenticatedAndProjectMember,
+ },
+ ).data ?? [];
+ const hasAccess = useHasProjectAccess({
+ projectId: props.projectId,
+ scope: "datasets:CUD",
+ });
+ const capture = usePostHogClientCapture();
+
+ return {
+ existingDatasetItems,
+ hasAccess,
+ captureNewDatasetItemFormOpen: () =>
+ capture("dataset_item:new_from_trace_form_open", {
+ object: props.observationId ? "observation" : "trace",
+ }),
+ };
+};
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx
index 500c675dd0..cbbdef671f 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx
@@ -20,7 +20,9 @@ import { type SelectionData } from "@/src/features/comments/contexts/InlineComme
import { type ObservationReturnTypeWithMetadata } from "@/src/server/api/routers/traces";
import { ItemBadge } from "@/src/components/ItemBadge";
import { LocalIsoDate } from "@/src/components/LocalIsoDate";
-import { NewDatasetItemFromExistingObject } from "@/src/features/datasets/components/NewDatasetItemFromExistingObject";
+import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
+import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
+import { useDatasetItemFromTraceOrObservation } from "@/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation";
import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
@@ -59,6 +61,7 @@ import {
MessageSquare,
MessageSquareOff,
MoreHorizontal,
+ PlusIcon,
SquarePen,
Terminal,
} from "lucide-react";
@@ -134,6 +137,18 @@ export const ObservationDetailViewHeader = memo(
projectId,
scope: "scores:CUD",
});
+ const {
+ existingDatasetItems,
+ hasAccess: hasDatasetAccess,
+ captureNewDatasetItemFormOpen,
+ } = useDatasetItemFromTraceOrObservation({
+ projectId,
+ traceId,
+ observationId: observation.id,
+ enabled: Boolean(observationWithIO),
+ });
+ const datasetCount = existingDatasetItems.length;
+ const hasExistingDatasetItems = datasetCount > 0;
// Format cost and usage values
const totalCost = observation.totalCost;
@@ -208,15 +223,63 @@ export const ObservationDetailViewHeader = memo(
className="flex w-auto min-w-44 flex-col gap-0.5 p-1 data-[state=closed]:hidden"
>
{observationWithIO && (
- <NewDatasetItemFromExistingObject
+ <NewDatasetItemFromExistingObjectDialogController
traceId={traceId}
observationId={observation.id}
projectId={projectId}
input={observationWithIO.input}
output={observationWithIO.output}
metadata={observationWithIO.metadata}
- layout="menu"
- />
+ >
+ {({ openDialog }) => (
+ <ExistingDatasetItemsDropdownMenuController
+ projectId={projectId}
+ datasetItems={existingDatasetItems}
+ disabled={!hasDatasetAccess}
+ onOpenDialog={openDialog}
+ >
+ {({ Anchor, openDropdown }) => (
+ <Anchor>
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={!hasDatasetAccess}
+ className="w-full justify-start gap-2 font-normal"
+ onClick={() => {
+ if (hasExistingDatasetItems) {
+ openDropdown();
+ return;
+ }
+
+ captureNewDatasetItemFormOpen();
+ openDialog();
+ }}
+ >
+ {hasExistingDatasetItems || hasDatasetAccess ? (
+ <PlusIcon
+ className="h-4 w-4"
+ aria-hidden="true"
+ />
+ ) : null}
+ <span className="text-sm">
+ {hasExistingDatasetItems
+ ? `In ${datasetCount} dataset(s)`
+ : "Add to datasets"}
+ </span>
+ {hasExistingDatasetItems ? (
+ <ChevronDown className="ml-auto h-3 w-3" />
+ ) : !hasDatasetAccess ? (
+ <LockIcon
+ className="ml-auto h-3 w-3"
+ aria-hidden="true"
+ />
+ ) : null}
+ </Button>
+ </Anchor>
+ )}
+ </ExistingDatasetItemsDropdownMenuController>
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
)}
{!isAnnotationMode && (
<>
@@ -376,7 +439,7 @@ export const ObservationDetailViewHeader = memo(
{!isMobile && (
<div className="flex h-full flex-wrap content-start items-start justify-start gap-0.5 @2xl:mr-1 @2xl:justify-end">
{observationWithIO && (
- <NewDatasetItemFromExistingObject
+ <NewDatasetItemFromExistingObjectDialogController
traceId={traceId}
observationId={observation.id}
projectId={projectId}
@@ -384,8 +447,53 @@ export const ObservationDetailViewHeader = memo(
output={observationWithIO.output}
metadata={observationWithIO.metadata}
key={observation.id}
- size="sm"
- />
+ >
+ {({ openDialog }) => (
+ <ExistingDatasetItemsDropdownMenuController
+ projectId={projectId}
+ datasetItems={existingDatasetItems}
+ disabled={!hasDatasetAccess}
+ onOpenDialog={openDialog}
+ >
+ {({ Anchor, openDropdown }) => (
+ <Anchor>
+ <Button
+ variant="secondary"
+ size="sm"
+ disabled={!hasDatasetAccess}
+ onClick={() => {
+ if (hasExistingDatasetItems) {
+ openDropdown();
+ return;
+ }
+
+ captureNewDatasetItemFormOpen();
+ openDialog();
+ }}
+ >
+ {!hasExistingDatasetItems && hasDatasetAccess ? (
+ <PlusIcon
+ className="mr-1.5 -ml-0.5 h-3.5 w-3.5"
+ aria-hidden="true"
+ />
+ ) : null}
+ {hasExistingDatasetItems
+ ? `In ${datasetCount} dataset(s)`
+ : "Add to datasets"}
+ {hasExistingDatasetItems ? (
+ <ChevronDown className="ml-2 h-3 w-3" />
+ ) : !hasDatasetAccess ? (
+ <LockIcon
+ className="ml-1.5 h-3 w-3"
+ aria-hidden="true"
+ />
+ ) : null}
+ </Button>
+ </Anchor>
+ )}
+ </ExistingDatasetItemsDropdownMenuController>
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
)}
{/* Hide annotation buttons in annotation mode (panel shown separately) */}
{!isAnnotationMode && (
diff --git a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
index fc9339a6d0..0b7b4618a1 100644
--- a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
+++ b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
@@ -22,7 +22,9 @@ import { type ObservationReturnTypeWithMetadata } from "@/src/server/api/routers
import { ItemBadge } from "@/src/components/ItemBadge";
import { LocalIsoDate } from "@/src/components/LocalIsoDate";
import { DetailHeaderActionsMenuController } from "@/src/features/traces/components/DetailHeaderActionsMenuController";
-import { NewDatasetItemFromExistingObject } from "@/src/features/datasets/components/NewDatasetItemFromExistingObject";
+import { ExistingDatasetItemsDropdownMenuController } from "@/src/features/datasets/components/ExistingDatasetItemsDropdownMenuController";
+import { NewDatasetItemFromExistingObjectDialogController } from "@/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController";
+import { useDatasetItemFromTraceOrObservation } from "@/src/features/datasets/hooks/useDatasetItemFromTraceOrObservation";
import { AnnotateDrawerController } from "@/src/features/scores/components/AnnotateDrawerController";
import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
@@ -52,6 +54,7 @@ import {
MessageSquare,
MessageSquareOff,
MoreHorizontal,
+ PlusIcon,
SquarePen,
} from "lucide-react";
import {
@@ -97,6 +100,16 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
() => aggregateTraceMetrics(observations),
[observations],
);
+ const {
+ existingDatasetItems,
+ hasAccess: hasDatasetAccess,
+ captureNewDatasetItemFormOpen,
+ } = useDatasetItemFromTraceOrObservation({
+ projectId,
+ traceId: trace.id,
+ });
+ const datasetCount = existingDatasetItems.length;
+ const hasExistingDatasetItems = datasetCount > 0;
const targetTraceId =
trace.environment === LangfuseInternalTraceEnvironment.LLMJudge
@@ -163,14 +176,62 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
forceMount
className="flex w-auto min-w-44 flex-col gap-0.5 p-1 data-[state=closed]:hidden"
>
- <NewDatasetItemFromExistingObject
+ <NewDatasetItemFromExistingObjectDialogController
traceId={trace.id}
projectId={projectId}
input={trace.input}
output={trace.output}
metadata={trace.metadata}
- layout="menu"
- />
+ >
+ {({ openDialog }) => (
+ <ExistingDatasetItemsDropdownMenuController
+ projectId={projectId}
+ datasetItems={existingDatasetItems}
+ disabled={!hasDatasetAccess}
+ onOpenDialog={openDialog}
+ >
+ {({ Anchor, openDropdown }) => (
+ <Anchor>
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={!hasDatasetAccess}
+ className="w-full justify-start gap-2 font-normal"
+ onClick={() => {
+ if (hasExistingDatasetItems) {
+ openDropdown();
+ return;
+ }
+
+ captureNewDatasetItemFormOpen();
+ openDialog();
+ }}
+ >
+ {hasExistingDatasetItems || hasDatasetAccess ? (
+ <PlusIcon
+ className="h-4 w-4"
+ aria-hidden="true"
+ />
+ ) : null}
+ <span className="text-sm">
+ {hasExistingDatasetItems
+ ? `In ${datasetCount} dataset(s)`
+ : "Add to datasets"}
+ </span>
+ {hasExistingDatasetItems ? (
+ <ChevronDown className="ml-auto h-3 w-3" />
+ ) : !hasDatasetAccess ? (
+ <LockIcon
+ className="ml-auto h-3 w-3"
+ aria-hidden="true"
+ />
+ ) : null}
+ </Button>
+ </Anchor>
+ )}
+ </ExistingDatasetItemsDropdownMenuController>
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
{!isAnnotationMode && (
<>
<AnnotateDrawerController
@@ -263,15 +324,60 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
{/* Action buttons (desktop inline cluster) */}
{!isMobile && (
<div className="flex h-full flex-wrap content-start items-start justify-start gap-0.5 @2xl:mr-1 @2xl:justify-end">
- <NewDatasetItemFromExistingObject
+ <NewDatasetItemFromExistingObjectDialogController
traceId={trace.id}
projectId={projectId}
input={trace.input}
output={trace.output}
metadata={trace.metadata}
key={trace.id}
- size="sm"
- />
+ >
+ {({ openDialog }) => (
+ <ExistingDatasetItemsDropdownMenuController
+ projectId={projectId}
+ datasetItems={existingDatasetItems}
+ disabled={!hasDatasetAccess}
+ onOpenDialog={openDialog}
+ >
+ {({ Anchor, openDropdown }) => (
+ <Anchor>
+ <Button
+ variant="secondary"
+ size="sm"
+ disabled={!hasDatasetAccess}
+ onClick={() => {
+ if (hasExistingDatasetItems) {
+ openDropdown();
+ return;
+ }
+
+ captureNewDatasetItemFormOpen();
+ openDialog();
+ }}
+ >
+ {!hasExistingDatasetItems && hasDatasetAccess ? (
+ <PlusIcon
+ className="mr-1.5 -ml-0.5 h-3.5 w-3.5"
+ aria-hidden="true"
+ />
+ ) : null}
+ {hasExistingDatasetItems
+ ? `In ${datasetCount} dataset(s)`
+ : "Add to datasets"}
+ {hasExistingDatasetItems ? (
+ <ChevronDown className="ml-2 h-3 w-3" />
+ ) : !hasDatasetAccess ? (
+ <LockIcon
+ className="ml-1.5 h-3 w-3"
+ aria-hidden="true"
+ />
+ ) : null}
+ </Button>
+ </Anchor>
+ )}
+ </ExistingDatasetItemsDropdownMenuController>
+ )}
+ </NewDatasetItemFromExistingObjectDialogController>
{/* Hide annotation buttons in annotation mode (panel shown separately) */}
{!isAnnotationMode && (
<div className="flex items-start">