Skip to content

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

refactor(web): Make dialog & drawer controllers hold generic state (#17252)

Ben Bachem3f50fa54a3f1
diff --git a/.agents/skills/react-component-guidelines/SKILL.md b/.agents/skills/react-component-guidelines/SKILL.md
index de1d91e4ce..5a9cd67a35 100644
--- a/.agents/skills/react-component-guidelines/SKILL.md
+++ b/.agents/skills/react-component-guidelines/SKILL.md
@@ -40,6 +40,7 @@ Components are useful because they act as an encapsulated unit and therefore pro
## Overlays
- Compose overlays with `DropdownMenuController`, `PopoverController`, or `DialogController`. Trigger presentation should remain in the caller and not be abstracted. If additional behavior is needed, add a feature-specific wrapper that handles things such as permissions, analytics, mutations, or other workflow behavior that should be shared.
+- When overlay content depends on the action that opened it, let the controller own that transient state. Pass the complete payload to `openDialog(payload)` or `openDrawer(payload)` and render content from the controller state instead of hoisting selection and open state into the parent.
- Keep the controller components outside transient overlays that can trigger it. A popover or dialog opened from a dropdown item must not be owned by `DropdownMenuContent`, which unmounts when the dropdown closes.
- Consume the controller's render-prop controls instead of duplicating their shape. Do not move the passed `Trigger` into components. Abstract trigger presentation through a ref-forwarding component with explicit variants, while keeping `<Trigger asChild>` at each call site.
- Compose `<Trigger asChild>` in the caller around a semantic child that forwards its ref and injected props. For example, use `DropdownMenuItem` directly rather than nesting a `Button` inside it.
diff --git a/web/src/components/ui/dialog.clienttest.tsx b/web/src/components/ui/dialog.clienttest.tsx
new file mode 100644
index 0000000000..5d3d77d954
--- /dev/null
+++ b/web/src/components/ui/dialog.clienttest.tsx
@@ -0,0 +1,94 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+
+import { DialogController, DialogTitle } from "@/src/components/ui/dialog";
+import { LAYER_ORDER } from "@/src/components/ui/layer";
+
+const installOverlayLayers = () => {
+ const overlayRoot = document.createElement("div");
+ overlayRoot.setAttribute("data-overlay-root", "");
+ for (const layer of LAYER_ORDER) {
+ const layerNode = document.createElement("div");
+ layerNode.setAttribute("data-layer", layer);
+ overlayRoot.appendChild(layerNode);
+ }
+ document.body.appendChild(overlayRoot);
+};
+
+describe("DialogController", () => {
+ beforeEach(() => {
+ installOverlayLayers();
+ });
+
+ afterEach(() => {
+ document.querySelector("[data-overlay-root]")?.remove();
+ });
+
+ it.each([null, undefined])(
+ "keeps %s as active state until closed",
+ (state) => {
+ render(
+ <DialogController<string | null | undefined>
+ closeOnInteractionOutside={false}
+ size="default"
+ renderContent={({ state: activeState, closeDialog }) => (
+ <>
+ <DialogTitle>Stateful dialog</DialogTitle>
+ <output>{String(activeState)}</output>
+ <button type="button" onClick={closeDialog}>
+ Close from content
+ </button>
+ </>
+ )}
+ >
+ {({ isOpen, openDialog }) => (
+ <>
+ <output>{isOpen ? "open" : "closed"}</output>
+ <button type="button" onClick={() => openDialog(state)}>
+ Open
+ </button>
+ </>
+ )}
+ </DialogController>,
+ );
+
+ expect(screen.queryByText("Stateful dialog")).not.toBeInTheDocument();
+ fireEvent.click(screen.getByRole("button", { name: "Open" }));
+ expect(screen.getByText(String(state))).toBeInTheDocument();
+ expect(screen.getByText("open")).toBeInTheDocument();
+
+ fireEvent.click(
+ screen.getByRole("button", { name: "Close from content" }),
+ );
+ expect(screen.queryByText("Stateful dialog")).not.toBeInTheDocument();
+ expect(screen.getByText("closed")).toBeInTheDocument();
+ },
+ );
+
+ it("preserves close veto and dismissal callbacks", () => {
+ const onBeforeClose = vi.fn(() => false);
+ const onDismiss = vi.fn();
+
+ render(
+ <DialogController
+ closeOnInteractionOutside
+ onBeforeClose={onBeforeClose}
+ onDismiss={onDismiss}
+ size="default"
+ renderContent={() => <DialogTitle>Vetoed dialog</DialogTitle>}
+ >
+ {({ openDialog }) => (
+ <button type="button" onClick={() => openDialog()}>
+ Open
+ </button>
+ )}
+ </DialogController>,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "Open" }));
+ fireEvent.keyDown(document, { key: "Escape" });
+
+ expect(onBeforeClose).toHaveBeenCalledOnce();
+ expect(onDismiss).not.toHaveBeenCalled();
+ expect(screen.getByText("Vetoed dialog")).toBeInTheDocument();
+ });
+});
diff --git a/web/src/components/ui/dialog.tsx b/web/src/components/ui/dialog.tsx
index 6820c38334..d915521f0d 100644
--- a/web/src/components/ui/dialog.tsx
+++ b/web/src/components/ui/dialog.tsx
@@ -173,60 +173,64 @@ DialogContent.displayName = DialogPrimitive.Content.displayName;
/**
* Owns dialog open state while callers retain trigger and content presentation.
- * 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 = {
+type DialogControllerProps<State = void> = {
children: (control: {
isOpen: boolean;
- openDialog: () => void;
- Trigger: typeof DialogTrigger;
+ openDialog: (...args: [State] extends [void] ? [] : [state: State]) => void;
}) => React.ReactNode;
closeOnInteractionOutside: boolean;
onBeforeClose?: () => boolean;
onDismiss?: () => void;
- renderContent: (control: { closeDialog: () => void }) => React.ReactNode;
+ renderContent: (control: {
+ state: State;
+ closeDialog: () => void;
+ }) => React.ReactNode;
size: React.ComponentProps<typeof DialogContent>["size"];
};
-const DialogController = ({
+const DialogController = <State = void,>({
children,
closeOnInteractionOutside,
onBeforeClose,
onDismiss,
renderContent,
size,
-}: DialogControllerProps) => {
- const [isOpen, setIsOpen] = React.useState(false);
+}: DialogControllerProps<State>) => {
+ const [controllerState, setControllerState] = React.useState<
+ { active: false } | { active: boolean; state: State }
+ >({ active: false });
const closeDialog = () => {
if (onBeforeClose?.() === false) return false;
- setIsOpen(false);
+ setControllerState((currentState) =>
+ "state" in currentState
+ ? { ...currentState, active: false }
+ : currentState,
+ );
return true;
};
return (
<Dialog
- open={isOpen}
+ open={controllerState.active}
onOpenChange={(open) => {
- if (open) {
- setIsOpen(true);
- return;
- }
+ if (open) return;
if (closeDialog()) onDismiss?.();
}}
>
{children({
- isOpen,
- openDialog: () => setIsOpen(true),
- Trigger: DialogTrigger,
+ isOpen: controllerState.active,
+ openDialog: (...args) =>
+ setControllerState({ active: true, state: args[0] as State }),
})}
- <DialogContent
- size={size}
- closeOnInteractionOutside={closeOnInteractionOutside}
- >
- {renderContent({ closeDialog })}
- </DialogContent>
+ {"state" in controllerState ? (
+ <DialogContent
+ size={size}
+ closeOnInteractionOutside={closeOnInteractionOutside}
+ >
+ {renderContent({ state: controllerState.state, closeDialog })}
+ </DialogContent>
+ ) : null}
</Dialog>
);
};
diff --git a/web/src/components/ui/drawer.clienttest.tsx b/web/src/components/ui/drawer.clienttest.tsx
index 689a2ca7b7..7d955feb7d 100644
--- a/web/src/components/ui/drawer.clienttest.tsx
+++ b/web/src/components/ui/drawer.clienttest.tsx
@@ -1,5 +1,10 @@
-import { render } from "@testing-library/react";
-import { Drawer, DrawerContent, DrawerTitle } from "@/src/components/ui/drawer";
+import { fireEvent, render, screen } from "@testing-library/react";
+import {
+ Drawer,
+ DrawerContent,
+ DrawerController,
+ DrawerTitle,
+} from "@/src/components/ui/drawer";
function mountOverlayRoot() {
const overlayRoot = document.createElement("div");
@@ -48,4 +53,136 @@ describe("Drawer", () => {
// scroll region under the last action.
expect(classes).not.toContain("overflow-y-auto");
});
+
+ it.each([null, undefined])(
+ "keeps %s as active state until closed",
+ (state) => {
+ render(
+ <DrawerController<string | null | undefined>
+ forceDirection="bottom"
+ renderContent={({ state: activeState, closeDrawer }) => (
+ <DrawerContent>
+ <DrawerTitle>Stateful drawer</DrawerTitle>
+ <output>{String(activeState)}</output>
+ <button type="button" onClick={closeDrawer}>
+ Close
+ </button>
+ </DrawerContent>
+ )}
+ >
+ {({ isOpen, openDrawer }) => (
+ <>
+ <output>{isOpen ? "open" : "closed"}</output>
+ <button type="button" onClick={() => openDrawer(state)}>
+ Open
+ </button>
+ </>
+ )}
+ </DrawerController>,
+ );
+
+ expect(screen.queryByText("Stateful drawer")).not.toBeInTheDocument();
+ fireEvent.click(screen.getByRole("button", { name: "Open" }));
+ expect(screen.getByText(String(state))).toBeInTheDocument();
+ expect(screen.getByText("open")).toBeInTheDocument();
+
+ fireEvent.click(screen.getByRole("button", { name: "Close" }));
+ expect(screen.getByRole("dialog")).toHaveAttribute(
+ "data-state",
+ "closed",
+ );
+ expect(screen.getByText("closed")).toBeInTheDocument();
+ },
+ );
+
+ it("replaces active state without closing", () => {
+ render(
+ <DrawerController<string | null>
+ forceDirection="bottom"
+ renderContent={({ state, replaceState }) => (
+ <DrawerContent>
+ <output>{state ?? "empty"}</output>
+ <button type="button" onClick={() => replaceState(null)}>
+ Clear
+ </button>
+ </DrawerContent>
+ )}
+ >
+ {({ isOpen, openDrawer }) => (
+ <>
+ <output>{isOpen ? "open" : "closed"}</output>
+ <button type="button" onClick={() => openDrawer("selection")}>
+ Open
+ </button>
+ </>
+ )}
+ </DrawerController>,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "Open" }));
+ fireEvent.click(screen.getByRole("button", { name: "Clear" }));
+
+ expect(screen.getByText("empty")).toBeInTheDocument();
+ expect(screen.getByText("open")).toBeInTheDocument();
+ });
+
+ it("ignores stale state replacements after closing", () => {
+ let replaceStateAfterClose: (() => void) | undefined;
+
+ render(
+ <DrawerController<string>
+ forceDirection="bottom"
+ renderContent={({ closeDrawer, replaceState }) => {
+ replaceStateAfterClose = () => replaceState("updated");
+ return (
+ <DrawerContent>
+ <button type="button" onClick={closeDrawer}>
+ Close
+ </button>
+ </DrawerContent>
+ );
+ }}
+ >
+ {({ isOpen, openDrawer }) => (
+ <>
+ <output>{isOpen ? "open" : "closed"}</output>
+ <button type="button" onClick={() => openDrawer("initial")}>
+ Open
+ </button>
+ </>
+ )}
+ </DrawerController>,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "Open" }));
+ fireEvent.click(screen.getByRole("button", { name: "Close" }));
+ replaceStateAfterClose?.();
+
+ expect(screen.getByText("closed")).toBeInTheDocument();
+ });
+
+ it("allows consumers to veto closing", () => {
+ render(
+ <DrawerController
+ forceDirection="bottom"
+ onOpenChange={(open) => (open ? undefined : false)}
+ renderContent={() => (
+ <DrawerContent>
+ <DrawerTitle>Stateful drawer</DrawerTitle>
+ </DrawerContent>
+ )}
+ >
+ {({ openDrawer }) => (
+ <button type="button" onClick={openDrawer}>
+ Open
+ </button>
+ )}
+ </DrawerController>,
+ );
+
+ fireEvent.click(screen.getByRole("button", { name: "Open" }));
+ fireEvent.keyDown(document, { key: "Escape" });
+
+ expect(screen.getByText("Stateful drawer")).toBeInTheDocument();
+ });
});
diff --git a/web/src/components/ui/drawer.tsx b/web/src/components/ui/drawer.tsx
index d74fe211b9..75090e1d35 100644
--- a/web/src/components/ui/drawer.tsx
+++ b/web/src/components/ui/drawer.tsx
@@ -229,8 +229,75 @@ const DrawerDescription = React.forwardRef<
));
DrawerDescription.displayName = DrawerPrimitive.Description.displayName;
+type DrawerControllerProps<State = void> = Pick<
+ DrawerProps,
+ | "blockTextSelection"
+ | "dismissible"
+ | "forceDirection"
+ | "modal"
+ | "shouldScaleBackground"
+> & {
+ onOpenChange?: (open: boolean) => boolean | void;
+ children: (control: {
+ isOpen: boolean;
+ openDrawer: (...args: [State] extends [void] ? [] : [state: State]) => void;
+ }) => React.ReactNode;
+ renderContent: (control: {
+ state: State;
+ closeDrawer: () => void;
+ replaceState: (state: State) => void;
+ }) => React.ReactNode;
+};
+
+const DrawerController = <State = void,>({
+ children,
+ onOpenChange,
+ renderContent,
+ ...drawerProps
+}: DrawerControllerProps<State>) => {
+ const [controllerState, setControllerState] = React.useState<
+ { active: false } | { active: boolean; state: State }
+ >({ active: false });
+ const closeDrawer = () =>
+ setControllerState((currentState) =>
+ "state" in currentState
+ ? { ...currentState, active: false }
+ : currentState,
+ );
+
+ return (
+ <Drawer
+ {...drawerProps}
+ open={controllerState.active}
+ onOpenChange={(open) => {
+ if (onOpenChange?.(open) === false) return;
+
+ if (open) return;
+ closeDrawer();
+ }}
+ >
+ {children({
+ isOpen: controllerState.active,
+ openDrawer: (...args) =>
+ setControllerState({ active: true, state: args[0] as State }),
+ })}
+ {"state" in controllerState
+ ? renderContent({
+ state: controllerState.state,
+ closeDrawer,
+ replaceState: (state) =>
+ setControllerState((currentState) =>
+ currentState.active ? { active: true, state } : currentState,
+ ),
+ })
+ : null}
+ </Drawer>
+ );
+};
+
export {
Drawer,
+ DrawerController,
DrawerTrigger,
DrawerClose,
DrawerContent,
diff --git a/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx b/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
index a4d1c14bb7..af033fc4ef 100644
--- a/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
+++ b/web/src/features/annotation-queues/components/processors/SessionAnnotationProcessor.tsx
@@ -147,7 +147,7 @@ export const SessionAnnotationProcessor: React.FC<
type="button"
variant="outline"
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="gap-1"
>
{disabled ? (
diff --git a/web/src/features/comments/CommentDrawerController.tsx b/web/src/features/comments/CommentDrawerController.tsx
index 2efe451d3c..d346f7f460 100644
--- a/web/src/features/comments/CommentDrawerController.tsx
+++ b/web/src/features/comments/CommentDrawerController.tsx
@@ -1,7 +1,7 @@
import Header from "@/src/components/layouts/header";
import {
- Drawer,
DrawerContent,
+ DrawerController,
DrawerHeader,
DrawerTitle,
} from "@/src/components/ui/drawer";
@@ -17,9 +17,8 @@ type CommentDrawerContentProps = {
objectId: string;
objectType: CommentObjectType;
objectStartTime?: Date | null;
- isOpen: boolean;
- pendingSelection?: SelectionData | null;
- onSelectionUsed?: () => void;
+ pendingSelection: SelectionData | null;
+ onSelectionUsed: () => void;
onCommentChange?: () => void | Promise<void>;
onMentionDropdownChange: (isOpen: boolean) => void;
};
@@ -29,7 +28,6 @@ function CommentDrawerContent({
objectId,
objectType,
objectStartTime,
- isOpen,
pendingSelection,
onSelectionUsed,
onCommentChange,
@@ -46,7 +44,7 @@ function CommentDrawerContent({
className="mx-auto flex h-full w-full flex-col overflow-hidden focus:ring-0 focus:outline-hidden focus-visible:ring-0 focus-visible:outline-hidden md:max-h-full"
tabIndex={-1}
ref={(element) => {
- if (element && isOpen && !hasFocusedRef.current) {
+ if (element && !hasFocusedRef.current) {
hasFocusedRef.current = true;
setTimeout(() => element.focus({ preventScroll: true }), 100);
}
@@ -67,7 +65,7 @@ function CommentDrawerContent({
objectType={objectType}
objectStartTime={objectStartTime}
onMentionDropdownChange={onMentionDropdownChange}
- isDrawerOpen={isOpen}
+ isDrawerOpen
pendingSelection={pendingSelection}
onSelectionUsed={onSelectionUsed}
onCommentChange={onCommentChange}
@@ -84,59 +82,47 @@ export type CommentDrawerControllerProps = {
objectType: CommentObjectType;
objectStartTime?: Date | null;
count?: number;
- pendingSelection?: SelectionData | null;
- onSelectionUsed?: () => void;
onCommentChange?: () => void | Promise<void>;
- isOpen?: boolean;
- onOpenChange?: (open: boolean) => void;
children: (control: {
disabled: boolean;
- openDrawer: () => void;
+ openDrawer: (state: CommentDrawerState) => void;
}) => ReactNode;
};
-export function CommentDrawerController({
+type CommentDrawerState =
+ | { type: "comments" }
+ | { type: "inline-comment"; selection: SelectionData };
+
+function CommentDrawerTriggers({
children,
- projectId,
+ disabled,
+ isOpen,
objectId,
objectType,
- objectStartTime,
- count,
- pendingSelection,
- onSelectionUsed,
- onCommentChange,
- isOpen: controlledIsOpen,
- onOpenChange: controlledOnOpenChange,
-}: CommentDrawerControllerProps) {
+ openDrawer,
+}: {
+ children: CommentDrawerControllerProps["children"];
+ disabled: boolean;
+ isOpen: boolean;
+ objectId: string;
+ objectType: CommentObjectType;
+ openDrawer: (state: CommentDrawerState) => void;
+}) {
const router = useRouter();
- const [isMentionDropdownOpen, setIsMentionDropdownOpen] = useState(false);
- const [internalIsOpen, setInternalIsOpen] = useState(false);
const hasAutoOpenedRef = useRef(false);
- const isOpen = controlledIsOpen ?? internalIsOpen;
- const setIsOpen = controlledOnOpenChange ?? setInternalIsOpen;
-
- const hasReadAccess = useHasProjectAccess({
- projectId,
- scope: "comments:read",
- });
- const hasWriteAccess = useHasProjectAccess({
- projectId,
- scope: "comments:CUD",
- });
- const disabled = !hasReadAccess || (!hasWriteAccess && !count);
useEffect(() => {
const shouldAutoOpen =
router.query.comments === "open" &&
router.query.commentObjectType === objectType &&
router.query.commentObjectId === objectId &&
- hasReadAccess &&
+ !disabled &&
!isOpen &&
!hasAutoOpenedRef.current;
if (shouldAutoOpen) {
hasAutoOpenedRef.current = true;
- setIsOpen(true);
+ openDrawer({ type: "comments" });
if (router.asPath.includes("#comment-")) {
setTimeout(() => {
@@ -152,27 +138,40 @@ export function CommentDrawerController({
if (router.query.comments !== "open" && hasAutoOpenedRef.current) {
hasAutoOpenedRef.current = false;
}
- }, [
- router.query.comments,
- router.query.commentObjectType,
- router.query.commentObjectId,
- router.asPath,
- hasReadAccess,
- objectType,
- objectId,
- isOpen,
- setIsOpen,
- ]);
+ }, [disabled, isOpen, objectId, objectType, openDrawer, router]);
- const openDrawer = () => {
- if (!disabled) setIsOpen(true);
- };
+ return children({
+ disabled,
+ openDrawer: (state) => {
+ if (!disabled) openDrawer(state);
+ },
+ });
+}
- const handleOpenChange = (open: boolean) => {
- if (!open && isMentionDropdownOpen) return;
+export function CommentDrawerController({
+ children,
+ projectId,
+ objectId,
+ objectType,
+ objectStartTime,
+ count,
+ onCommentChange,
+}: CommentDrawerControllerProps) {
+ const router = useRouter();
+ const [isMentionDropdownOpen, setIsMentionDropdownOpen] = useState(false);
- setIsOpen(open);
+ const hasReadAccess = useHasProjectAccess({
+ projectId,
+ scope: "comments:read",
+ });
+ const hasWriteAccess = useHasProjectAccess({
+ projectId,
+ scope: "comments:CUD",
+ });
+ const disabled = !hasReadAccess || (!hasWriteAccess && !count);
+ const handleOpenChange = (open: boolean) => {
+ if (!open && isMentionDropdownOpen) return false;
if (!open && router.query.comments === "open") {
const { comments, commentObjectType, commentObjectId, ...rest } =
router.query;
@@ -183,19 +182,36 @@ export function CommentDrawerController({
};
return (
- <Drawer open={hasReadAccess && isOpen} onOpenChange={handleOpenChange}>
- {children({ disabled, openDrawer })}
- <CommentDrawerContent
- projectId={projectId}
- objectId={objectId}
- objectType={objectType}
- objectStartTime={objectStartTime}
- isOpen={isOpen}
- pendingSelection={pendingSelection}
- onSelectionUsed={onSelectionUsed}
- onCommentChange={onCommentChange}
- onMentionDropdownChange={setIsMentionDropdownOpen}
- />
- </Drawer>
+ <DrawerController<CommentDrawerState>
+ key={hasReadAccess ? "allowed" : "denied"}
+ blockTextSelection={false}
+ onOpenChange={handleOpenChange}
+ renderContent={({ state, replaceState }) => (
+ <CommentDrawerContent
+ projectId={projectId}
+ objectId={objectId}
+ objectType={objectType}
+ objectStartTime={objectStartTime}
+ pendingSelection={
+ state.type === "inline-comment" ? state.selection : null
+ }
+ onSelectionUsed={() => replaceState({ type: "comments" })}
+ onCommentChange={onCommentChange}
+ onMentionDropdownChange={setIsMentionDropdownOpen}
+ />
+ )}
+ >
+ {({ isOpen, openDrawer }) => (
+ <CommentDrawerTriggers
+ disabled={disabled}
+ isOpen={hasReadAccess && isOpen}
+ objectId={objectId}
+ objectType={objectType}
+ openDrawer={openDrawer}
+ >
+ {children}
+ </CommentDrawerTriggers>
+ )}
+ </DrawerController>
);
}
diff --git a/web/src/features/datasets/components/DatasetItemDetailPage.tsx b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
index 503cee4047..7361ee0ef0 100644
--- a/web/src/features/datasets/components/DatasetItemDetailPage.tsx
+++ b/web/src/features/datasets/components/DatasetItemDetailPage.tsx
@@ -131,6 +131,17 @@ export const DatasetItemDetailPage = ({
}
};
+ const datasetItemDialogPayload = item.data
+ ? {
+ fromDatasetId: item.data.datasetId,
+ traceId: item.data.sourceTraceId ?? undefined,
+ observationId: item.data.sourceObservationId ?? undefined,
+ input: JSON.stringify(item.data.input),
+ output: JSON.stringify(item.data.expectedOutput),
+ metadata: JSON.stringify(item.data.metadata),
+ }
+ : null;
+
return (
<Page
withPadding={withPadding}
@@ -219,28 +230,21 @@ export const DatasetItemDetailPage = ({
}
listKey="datasetItems"
/>
- {item.data ? (
+ {datasetItemDialogPayload ? (
<NewDatasetItemFromExistingObjectDialogController
projectId={projectId}
- fromDatasetId={item.data.datasetId}
- traceId={item.data.sourceTraceId ?? undefined}
- observationId={item.data.sourceObservationId ?? undefined}
- input={JSON.stringify(item.data.input)}
- output={JSON.stringify(item.data.expectedOutput)}
- metadata={JSON.stringify(item.data.metadata)}
>
- {({ Trigger }) => (
- <Trigger asChild>
- <ActionButton
- variant="outline"
- size="icon"
- hasAccess={hasAccess}
- title="Copy item"
- aria-label="Copy item"
- >
- <CopyIcon className="size-3" />
- </ActionButton>
- </Trigger>
+ {({ openDialog }) => (
+ <ActionButton
+ variant="outline"
+ size="icon"
+ hasAccess={hasAccess}
+ title="Copy item"
+ aria-label="Copy item"
+ onClick={() => openDialog(datasetItemDialogPayload)}
+ >
+ <CopyIcon className="size-3" />
+ </ActionButton>
)}
</NewDatasetItemFromExistingObjectDialogController>
) : (
diff --git a/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx b/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx
index b22246120d..eae78e2a77 100644
--- a/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx
+++ b/web/src/features/datasets/components/NewDatasetItemFromExistingObjectDialogController.tsx
@@ -6,22 +6,23 @@ 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;
+type DatasetItemDialogState = {
traceId?: string;
observationId?: string;
fromDatasetId?: string;
input: Prisma.JsonValue | null;
output: Prisma.JsonValue | null;
metadata: MetadataDomainClient;
+};
+
+export function NewDatasetItemFromExistingObjectDialogController(props: {
+ projectId: string;
children: (control: {
- openDialog: () => void;
- Trigger: typeof DialogTrigger;
+ openDialog: (payload: DatasetItemDialogState) => void;
}) => ReactNode;
}) {
const normalizePrefillValue = (
@@ -40,29 +41,29 @@ export function NewDatasetItemFromExistingObjectDialogController(props: {
};
return (
- <DialogController
+ <DialogController<DatasetItemDialogState>
closeOnInteractionOutside={false}
size="xxl"
- renderContent={({ closeDialog }) => (
+ renderContent={({ state, closeDialog }) => (
<>
<DialogHeader>
<DialogTitle>Add item to datasets</DialogTitle>
</DialogHeader>
<NewDatasetItemForm
- traceId={props.traceId}
- observationId={props.observationId}
+ traceId={state.traceId}
+ observationId={state.observationId}
projectId={props.projectId}
- input={normalizePrefillValue(props.input)}
- output={normalizePrefillValue(props.output)}
- metadata={props.metadata}
+ input={normalizePrefillValue(state.input)}
+ output={normalizePrefillValue(state.output)}
+ metadata={state.metadata}
onFormSuccess={closeDialog}
className="h-full overflow-y-auto"
- currentDatasetId={props.fromDatasetId}
+ currentDatasetId={state.fromDatasetId}
/>
</>
)}
>
- {({ openDialog, Trigger }) => props.children({ openDialog, Trigger })}
+ {({ openDialog }) => props.children({ openDialog })}
</DialogController>
);
}
diff --git a/web/src/features/projects/ProjectSettingsPage.tsx b/web/src/features/projects/ProjectSettingsPage.tsx
index 538b6756b6..11f4295f5d 100644
--- a/web/src/features/projects/ProjectSettingsPage.tsx
+++ b/web/src/features/projects/ProjectSettingsPage.tsx
@@ -158,15 +158,14 @@ const getProjectSettingsPages = ({
"Once you delete a project, there is no going back. Please be certain.",
button: (
<DeleteProjectDialogController>
- {({ hasAccess, Trigger }) => (
- <Trigger asChild>
- <Button
- variant="destructive-secondary"
- disabled={!hasAccess}
- >
- Delete Project
- </Button>
- </Trigger>
+ {({ hasAccess, openDialog }) => (
+ <Button
+ variant="destructive-secondary"
+ disabled={!hasAccess}
+ onClick={openDialog}
+ >
+ Delete Project
+ </Button>
)}
</DeleteProjectDialogController>
),
diff --git a/web/src/features/projects/components/DeleteProjectDialogController.tsx b/web/src/features/projects/components/DeleteProjectDialogController.tsx
index d3d8d2f86c..3bca0e53ee 100644
--- a/web/src/features/projects/components/DeleteProjectDialogController.tsx
+++ b/web/src/features/projects/components/DeleteProjectDialogController.tsx
@@ -1,9 +1,6 @@
import { type ReactNode } from "react";
-import {
- DialogController,
- type DialogTrigger,
-} from "@/src/components/ui/dialog";
+import { DialogController } from "@/src/components/ui/dialog";
import { env } from "@/src/env.mjs";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import { useQueryProject } from "@/src/features/projects/hooks";
@@ -14,7 +11,7 @@ import { DeleteProjectDialog } from "./DeleteProjectDialog";
type DeleteProjectDialogControllerProps = {
children: (control: {
hasAccess: boolean;
- Trigger: typeof DialogTrigger;
+ openDialog: () => void;
}) => ReactNode;
};
@@ -58,7 +55,7 @@ export function DeleteProjectDialogController({
/>
)}
>
- {({ Trigger }) => children({ hasAccess, Trigger })}
+ {({ openDialog }) => children({ hasAccess, openDialog })}
</DialogController>
);
}
diff --git a/web/src/features/prompts/components/prompt-detail.tsx b/web/src/features/prompts/components/prompt-detail.tsx
index e784005325..176f4c448b 100644
--- a/web/src/features/prompts/components/prompt-detail.tsx
+++ b/web/src/features/prompts/components/prompt-detail.tsx
@@ -486,7 +486,7 @@ export const PromptDetail = ({
type="button"
variant="outline"
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="gap-1"
>
{disabled ? (
diff --git a/web/src/features/prompts/components/prompt-history.tsx b/web/src/features/prompts/components/prompt-history.tsx
index ae4840f40f..23a7ead073 100644
--- a/web/src/features/prompts/components/prompt-history.tsx
+++ b/web/src/features/prompts/components/prompt-history.tsx
@@ -167,24 +167,23 @@ const PromptHistoryTraceNode = (props: {
/>
)}
>
- {({ isOpen, Trigger }) =>
+ {({ isOpen, openDialog }) =>
isHovered ||
props.currentPromptVersion === prompt.version ||
isOpen ? (
- <Trigger asChild>
- <Button
- variant="outline"
- type="button"
- size="icon"
- className="h-7 w-7 px-0"
- onClick={(event) => {
- event.stopPropagation();
- }}
- title="Compare with selected prompt"
- >
- <FileDiffIcon className="h-4 w-4" />
- </Button>
- </Trigger>
+ <Button
+ variant="outline"
+ type="button"
+ size="icon"
+ className="h-7 w-7 px-0"
+ onClick={(event) => {
+ event.stopPropagation();
+ openDialog();
+ }}
+ title="Compare with selected prompt"
+ >
+ <FileDiffIcon className="h-4 w-4" />
+ </Button>
) : null
}
</DialogController>
diff --git a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx
index 2bcd1ae87f..aa377f3d58 100644
--- a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx
+++ b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx
@@ -4,7 +4,6 @@ import {
DialogController,
DialogHeader,
DialogTitle,
- type DialogTrigger,
} from "@/src/components/ui/dialog";
import { CreateProjectMemberDialogContent } from "@/src/features/rbac/components/CreateProjectMemberDialogContent";
import {
@@ -29,7 +28,7 @@ type CreateProjectMemberDialogControllerProps = {
max: number;
}
| undefined;
- Trigger: typeof DialogTrigger;
+ openDialog: () => void;
}) => ReactNode;
};
@@ -134,13 +133,13 @@ export function CreateProjectMemberDialogController({
</>
)}
>
- {({ Trigger }) =>
+ {({ openDialog }) =>
children({
hasAccess,
hasOnlySingleProjectAccess,
isSubmitting: createProjectMemberMutation.isPending,
usageLimit,
- Trigger,
+ openDialog,
})
}
</DialogController>
diff --git a/web/src/features/rbac/components/MembersTable.tsx b/web/src/features/rbac/components/MembersTable.tsx
index 2f2b9786d2..85963fc728 100644
--- a/web/src/features/rbac/components/MembersTable.tsx
+++ b/web/src/features/rbac/components/MembersTable.tsx
@@ -428,21 +428,20 @@ export function MembersTable({
hasOnlySingleProjectAccess,
isSubmitting,
usageLimit,
- Trigger,
+ openDialog,
}) => (
- <Trigger asChild>
- <ActionButton
- variant="secondary"
- loading={isSubmitting}
- hasAccess={hasAccess}
- usageLimit={usageLimit}
- icon={<PlusIcon className="h-5 w-5" aria-hidden="true" />}
- >
- {hasOnlySingleProjectAccess
- ? "Add project member"
- : "Add new member"}
- </ActionButton>
- </Trigger>
+ <ActionButton
+ variant="secondary"
+ loading={isSubmitting}
+ hasAccess={hasAccess}
+ usageLimit={usageLimit}
+ icon={<PlusIcon className="h-5 w-5" aria-hidden="true" />}
+ onClick={openDialog}
+ >
+ {hasOnlySingleProjectAccess
+ ? "Add project member"
+ : "Add new member"}
+ </ActionButton>
)}
</CreateProjectMemberDialogController>
}
diff --git a/web/src/features/scores/components/AnnotateDrawerController.tsx b/web/src/features/scores/components/AnnotateDrawerController.tsx
index 0f558797cb..66f19d6d18 100644
--- a/web/src/features/scores/components/AnnotateDrawerController.tsx
+++ b/web/src/features/scores/components/AnnotateDrawerController.tsx
@@ -1,23 +1,25 @@
import { useHasProjectAccess } from "@/src/features/rbac";
-import { Drawer } from "@/src/components/ui/drawer";
+import { DrawerController } from "@/src/components/ui/drawer";
import { usePostHogClientCapture } from "@/src/features/posthog-analytics";
import {
type AnalyticsData,
type ScoreTarget,
} from "@/src/features/scores/types";
-import { type ReactNode, useState } from "react";
+import { type ReactNode } from "react";
import { AnnotateDrawerContent } from "@/src/features/scores/components/AnnotateDrawerContent";
import { type ScoreDomain } from "@langfuse/shared";
import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes";
export type AnnotateDrawerControllerProps<Target extends ScoreTarget> = {
- analyticsData?: AnalyticsData;
children: (control: {
- annotationCount: number;
disabled: boolean;
- openDrawer: () => void;
+ openDrawer: (payload: AnnotateDrawerState<Target>) => void;
}) => ReactNode;
projectId: string;
+};
+
+type AnnotateDrawerState<Target extends ScoreTarget> = {
+ analyticsData: AnalyticsData;
scoreMetadata: {
projectId: string;
queueId?: string;
@@ -28,46 +30,43 @@ export type AnnotateDrawerControllerProps<Target extends ScoreTarget> = {
};
export function AnnotateDrawerController<Target extends ScoreTarget>({
- analyticsData = {
- type: "trace",
- source: "TraceDetail",
- },
children,
projectId,
- scoreMetadata,
- scoreTarget,
- scores,
}: AnnotateDrawerControllerProps<Target>) {
- const [isOpen, setIsOpen] = useState(false);
const capture = usePostHogClientCapture();
const hasAccess = useHasProjectAccess({
projectId,
scope: "scores:CUD",
});
- const annotationCount = scores.filter(
- (score) => score.source === "ANNOTATION",
- ).length;
const disabled = !hasAccess;
- const openDrawer = () => {
- if (disabled) return;
-
- capture(
- scores.length ? "score:update_form_open" : "score:create_form_open",
- analyticsData,
- );
- setIsOpen(true);
- };
-
return (
- <Drawer open={isOpen} onOpenChange={setIsOpen}>
- {children({ annotationCount, disabled, openDrawer })}
- <AnnotateDrawerContent
- analyticsData={analyticsData}
- scoreMetadata={scoreMetadata}
- scoreTarget={scoreTarget}
- scores={scores}
- />
- </Drawer>
+ <DrawerController<AnnotateDrawerState<Target>>
+ renderContent={({ state }) => (
+ <AnnotateDrawerContent
+ analyticsData={state.analyticsData}
+ scoreMetadata={state.scoreMetadata}
+ scoreTarget={state.scoreTarget}
+ scores={state.scores}
+ />
+ )}
+ >
+ {({ openDrawer }) =>
+ children({
+ disabled,
+ openDrawer: (payload) => {
+ if (disabled) return;
+
+ capture(
+ payload.scores.length
+ ? "score:update_form_open"
+ : "score:create_form_open",
+ payload.analyticsData,
+ );
+ openDrawer(payload);
+ },
+ })
+ }
+ </DrawerController>
);
}
diff --git a/web/src/features/sessions/SessionPages.tsx b/web/src/features/sessions/SessionPages.tsx
index 5cedd13508..bc81a8bb4b 100644
--- a/web/src/features/sessions/SessionPages.tsx
+++ b/web/src/features/sessions/SessionPages.tsx
@@ -574,7 +574,7 @@ export const SessionPage: React.FC<{
type="button"
variant="outline"
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="gap-1"
>
{disabled ? (
@@ -602,25 +602,27 @@ export const SessionPage: React.FC<{
)}
</CommentDrawerController>
<div className="flex items-start">
- <AnnotateDrawerController
- projectId={projectId}
- scoreTarget={{
- type: "session",
- sessionId,
- }}
- scores={session.data?.scores ?? []}
- scoreMetadata={{
- projectId: projectId,
- environment: session.data?.environment,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="outline"
size="default"
disabled={disabled}
className="rounded-r-none"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: { type: "session", sessionId },
+ scores: session.data?.scores ?? [],
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: session.data?.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="mr-1.5 h-3 w-3" />
@@ -693,7 +695,7 @@ export const SessionPage: React.FC<{
variant="ghost"
size="sm"
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="w-full justify-start gap-2 font-normal"
>
{disabled ? (
@@ -716,25 +718,27 @@ export const SessionPage: React.FC<{
</Button>
)}
</CommentDrawerController>
- <AnnotateDrawerController
- projectId={projectId}
- scoreTarget={{
- type: "session",
- sessionId,
- }}
- scores={session.data?.scores ?? []}
- scoreMetadata={{
- projectId: projectId,
- environment: session.data?.environment,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="ghost"
size="sm"
disabled={disabled}
className="w-full justify-start gap-2 font-normal"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: { type: "session", sessionId },
+ scores: session.data?.scores ?? [],
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: session.data?.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="h-3 w-3" />
@@ -990,6 +994,9 @@ const LoadedSessionEventsPage: React.FC<{
true,
);
const defaultPresetResolvedSessionRef = useRef<string | null>(null);
+ const annotationCount = session.scores.filter(
+ (score) => score.source === "ANNOTATION",
+ ).length;
const [showCorrections, setShowCorrections] = useLocalStorage(
"showCorrections",
@@ -1584,7 +1591,7 @@ const LoadedSessionEventsPage: React.FC<{
type="button"
variant="outline"
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="gap-1"
>
{disabled ? (
@@ -1612,25 +1619,27 @@ const LoadedSessionEventsPage: React.FC<{
)}
</CommentDrawerController>
<div className="flex items-start">
- <AnnotateDrawerController
- projectId={projectId}
- scoreTarget={{
- type: "session",
- sessionId,
- }}
- scores={session.scores}
- scoreMetadata={{
- projectId: projectId,
- environment: session.environment,
- }}
- >
- {({ annotationCount, disabled, openDrawer }) => (
+ <AnnotateDrawerController projectId={projectId}>
+ {({ disabled, openDrawer }) => (
<Button
variant="outline"
size="default"
disabled={disabled}
className="rounded-r-none"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: { type: "session", sessionId },
+ scores: session.scores,
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: session.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="mr-1.5 h-3 w-3" />
@@ -1735,7 +1744,7 @@ const LoadedSessionEventsPage: React.FC<{
variant="ghost"
size="sm"
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="w-full justify-start gap-2 font-normal"
>
{disabled ? (
@@ -1758,25 +1767,27 @@ const LoadedSessionEventsPage: React.FC<{
</Button>
)}
</CommentDrawerController>
- <AnnotateDrawerController
- projectId={projectId}
- scoreTarget={{
- type: "session",
- sessionId,
- }}
- scores={session.scores}
- scoreMetadata={{
- projectId: projectId,
- environment: session.environment,
- }}
- >
- {({ annotationCount, disabled, openDrawer }) => (
+ <AnnotateDrawerController projectId={projectId}>
+ {({ disabled, openDrawer }) => (
<Button
variant="ghost"
size="sm"
disabled={disabled}
className="w-full justify-start gap-2 font-normal"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: { type: "session", sessionId },
+ scores: session.scores,
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: session.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="h-3 w-3" />
diff --git a/web/src/features/sessions/SessionTraceActionButtons.tsx b/web/src/features/sessions/SessionTraceActionButtons.tsx
index be4b09b264..6289d613bf 100644
--- a/web/src/features/sessions/SessionTraceActionButtons.tsx
+++ b/web/src/features/sessions/SessionTraceActionButtons.tsx
@@ -76,19 +76,20 @@ export function SessionTraceActionButtons({
return (
<div className={cn("flex flex-wrap items-start gap-2", className)}>
{trace.data ? (
- <NewDatasetItemFromExistingObjectDialogController
- projectId={projectId}
- traceId={traceId}
- input={trace.data.input ?? null}
- output={trace.data.output ?? null}
- metadata={trace.data.metadata ?? null}
- >
+ <NewDatasetItemFromExistingObjectDialogController projectId={projectId}>
{({ openDialog }) => (
<ExistingDatasetItemsDropdownMenuController
projectId={projectId}
datasetItems={existingDatasetItems}
disabled={!hasDatasetAccess}
- onOpenDialog={openDialog}
+ onOpenDialog={() =>
+ openDialog({
+ traceId,
+ input: trace.data.input ?? null,
+ output: trace.data.output ?? null,
+ metadata: trace.data.metadata ?? null,
+ })
+ }
>
{({ Anchor, openDropdown }) => (
<Anchor>
@@ -100,7 +101,12 @@ export function SessionTraceActionButtons({
}
captureNewDatasetItemFormOpen();
- openDialog();
+ openDialog({
+ traceId,
+ input: trace.data.input ?? null,
+ output: trace.data.output ?? null,
+ metadata: trace.data.metadata ?? null,
+ });
}}
variant={hasExistingDatasetItems ? "secondary" : "outline"}
size={size}
@@ -128,30 +134,27 @@ export function SessionTraceActionButtons({
</NewDatasetItemFromExistingObjectDialogController>
) : null}
<div className="flex items-start">
- <AnnotateDrawerController
- key={`annotation-drawer-${traceId}`}
- projectId={projectId}
- scoreTarget={{
- type: "trace",
- traceId,
- }}
- scores={scores}
- analyticsData={{
- type: "trace",
- source: "SessionDetail",
- }}
- scoreMetadata={{
- projectId,
- environment: environment ?? undefined,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="outline"
size={size}
disabled={disabled}
className="rounded-r-none"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: { type: "trace", traceId },
+ scores,
+ analyticsData: {
+ type: "trace",
+ source: "SessionDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: environment ?? undefined,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="mr-1.5 h-3 w-3" />
@@ -199,7 +202,7 @@ export function SessionTraceActionButtons({
variant="outline"
size={size}
disabled={disabled}
- onClick={openDrawer}
+ onClick={() => openDrawer({ type: "comments" })}
className="gap-1"
>
{disabled ? (
diff --git a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
index 8e7f31d03c..35e455c32d 100644
--- a/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/ConnectedObservationDetailView.tsx
@@ -39,7 +39,7 @@ import {
TooltipProvider,
TooltipTrigger,
} from "@/src/components/ui/tooltip";
-import { type SelectionData } from "@/src/features/comments/contexts/InlineCommentSelectionContext";
+import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import ScoresTable from "@/src/components/table/use-cases/scores";
import { getMostRecentCorrection } from "@/src/features/corrections/utils/getMostRecentCorrection";
import { useJsonExpansion } from "@/src/features/traces/contexts/JsonExpansionContext";
@@ -201,20 +201,6 @@ export function ConnectedObservationDetailView({
[setJsonBetaEnabled, setJsonViewPreference],
);
- // states for the inline comments
- const [pendingSelection, setPendingSelection] =
- useState<SelectionData | null>(null);
- const [isCommentDrawerOpen, setIsCommentDrawerOpen] = useState(false);
-
- const handleAddInlineComment = useCallback((selection: SelectionData) => {
- setPendingSelection(selection);
- setIsCommentDrawerOpen(true);
- }, []);
-
- const handleSelectionUsed = useCallback(() => {
- setPendingSelection(null);
- }, []);
-
// Get comments, scores, corrections, and expansion state from contexts
const { comments, serverScores: scores, corrections } = useTraceData();
const {
@@ -306,239 +292,256 @@ export function ConnectedObservationDetailView({
}, [observation.latency, observation.startTime, observation.endTime]);
return (
- <div className="flex h-full flex-col overflow-hidden">
- <ObservationDetailViewHeader
- observation={observation}
- observationWithIO={observationWithIO}
- projectId={projectId}
- traceId={traceId}
- latencySeconds={latencySeconds}
- observationScores={observationScores}
- commentCount={comments.get(observation.id)}
- pendingSelection={pendingSelection}
- onSelectionUsed={handleSelectionUsed}
- isCommentDrawerOpen={isCommentDrawerOpen}
- onCommentDrawerOpenChange={setIsCommentDrawerOpen}
- subtreeMetrics={subtreeMetrics}
- treeNodeTotalCost={treeNode?.totalCost}
- />
-
- <TabsBar
- value={selectedTab}
- className="flex min-h-0 flex-1 flex-col overflow-hidden"
- onValueChange={(value) =>
- setSelectedTab(value as "preview" | "log" | "scores")
- }
- >
- {showTabsBar && (
- <TooltipProvider>
- <TabsBarList>
- <TabsBarTrigger value="preview">Preview</TabsBarTrigger>
- {showScoresTab ? (
- <TabsBarTrigger value="scores">Scores</TabsBarTrigger>
- ) : null}
- {showLogViewTab ? (
- <TabsBarTrigger value="log">
- <Tooltip>
- <TooltipTrigger asChild>
- <span>Log View</span>
- </TooltipTrigger>
- <TooltipContent className="text-xs">
- {isLogViewVirtualized
- ? `Shows all ${observations.length} observations with virtualization enabled.`
- : "Shows all observations concatenated. Great for quickly scanning through them."}
- </TooltipContent>
- </Tooltip>
- </TabsBarTrigger>
- ) : null}
-
- {(selectedTab === "log" ||
- (selectedTab === "preview" && isPrettyViewAvailable)) && (
- <>
- <div className="ml-auto h-fit px-2 py-0.5">
- <Tabs
- value={
- selectedTab === "log" && isLogViewVirtualized
- ? "pretty"
- : selectedViewTab
- }
- onValueChange={(value) => {
- if (
- selectedTab === "log" &&
- isLogViewVirtualized &&
- value === "json"
- ) {
- return;
- }
- handleViewTabChange(value);
- }}
- >
- <Tabs.List size="sm">
- <Tabs.Trigger
- value="pretty"
- size="sm"
- label="Formatted"
- />
- {selectedTab === "log" && isLogViewVirtualized ? (
- <HoverCard openDelay={200}>
- <HoverCardTrigger asChild>
- <span>
- <Tabs.Trigger
- value="json"
- size="sm"
- disabled
- label="JSON"
- />
- </span>
- </HoverCardTrigger>
- <HoverCardContent
- align="end"
- className="w-64 text-sm"
- sideOffset={8}
- >
- <p className="font-bold">JSON view unavailable</p>
- <p className="text-muted-foreground mt-1">
- Disabled for traces with{" "}
- {
- TRACE_VIEW_CONFIG.logView
- .virtualizationThreshold
- }
- + observations to maintain performance.
- </p>
- </HoverCardContent>
- </HoverCard>
- ) : (
- <Tabs.Trigger value="json" size="sm" label="JSON" />
- )}
- </Tabs.List>
- </Tabs>
- </div>
- {selectedViewTab === "json" &&
- !(selectedTab === "log" && isLogViewVirtualized) && (
- <div className="mr-1 flex items-center gap-1.5">
- <Switch
- size="sm"
- checked={jsonBetaEnabled}
- onCheckedChange={handleBetaToggle}
- />
- <span className="text-muted-foreground text-xs">
- Beta
- </span>
- </div>
- )}
- </>
- )}
- </TabsBarList>
- </TooltipProvider>
- )}
-
- <TabsBarContent
- value="preview"
- className="mt-0 flex max-h-full min-h-0 w-full flex-1"
- >
- <ObservationPreview
- currentView={currentView}
- tags={isRoot ? observation.traceTags : undefined}
- previewKey={observation.id}
- onPrettyViewAvailabilityChange={setIsPrettyViewAvailable}
- previewProps={{
- observationName: observation.name ?? undefined,
- input: observationWithIOCompat.data?.input ?? undefined,
- output: observationWithIOCompat.data?.output ?? undefined,
- status: observation.statusMessage
- ? {
- level: observation.level,
- message: observation.statusMessage,
- }
- : undefined,
- outputCorrection,
- metadata: observationWithIOCompat.data?.metadata ?? undefined,
- parsedInput,
- parsedOutput,
- parsedMetadata,
- isLoading: observationWithIOCompat.isLoading,
- isParsing: isWaitingForParsing,
- media: observationMedia.data,
- inputExpansionState: formattedExpansion.input,
- outputExpansionState: formattedExpansion.output,
- metadataExpansionState: formattedExpansion.metadata,
- onInputExpansionChange: (exp) =>
- setFormattedFieldExpansion(
- "input",
- exp as Record<string, boolean>,
- ),
- onOutputExpansionChange: (exp) =>
- setFormattedFieldExpansion(
- "output",
- exp as Record<string, boolean>,
- ),
- onMetadataExpansionChange: (exp) =>
- setFormattedFieldExpansion(
- "metadata",
- exp as Record<string, boolean>,
- ),
- advancedJsonExpansionState: advancedJsonExpansion,
- onAdvancedJsonExpansionChange: setAdvancedJsonExpansion,
- jsonInputExpanded: jsonExpansion.input,
- jsonOutputExpanded: jsonExpansion.output,
- jsonMetadataExpanded: jsonExpansion.metadata,
- onJsonInputExpandedChange: (expanded) =>
- setJsonFieldExpansion("input", expanded),
- onJsonOutputExpandedChange: (expanded) =>
- setJsonFieldExpansion("output", expanded),
- onJsonMetadataExpandedChange: (expanded) =>
- setJsonFieldExpansion("metadata", expanded),
- enableInlineComments: true,
- onAddInlineComment: handleAddInlineComment,
- commentedPathsByField,
- showMetadata: true,
- observationId: observation.id,
- projectId,
- traceId,
- environment: observation.environment,
+ <CommentDrawerController
+ projectId={projectId}
+ objectId={observation.id}
+ objectType="OBSERVATION"
+ objectStartTime={observation.startTime}
+ count={comments.get(observation.id)}
+ >
+ {({ disabled, openDrawer }) => (
+ <div className="flex h-full flex-col overflow-hidden">
+ <ObservationDetailViewHeader
+ observation={observation}
+ observationWithIO={observationWithIO}
+ projectId={projectId}
+ traceId={traceId}
+ latencySeconds={latencySeconds}
+ observationScores={observationScores}
+ commentCount={comments.get(observation.id)}
+ commentDrawerControl={{
+ disabled,
+ openDrawer: () => openDrawer({ type: "comments" }),
}}
+ subtreeMetrics={subtreeMetrics}
+ treeNodeTotalCost={treeNode?.totalCost}
/>
- </TabsBarContent>
- {showScoresTab ? (
- <TabsBarContent
- value="scores"
- className="mt-0 mr-4 mb-2 flex h-full min-h-0 flex-1 overflow-hidden"
+ <TabsBar
+ value={selectedTab}
+ className="flex min-h-0 flex-1 flex-col overflow-hidden"
+ onValueChange={(value) =>
+ setSelectedTab(value as "preview" | "log" | "scores")
+ }
>
- <div className="flex h-full min-h-0 w-full flex-1 flex-col overflow-hidden">
- <ScoresTable
- projectId={projectId}
- traceId={traceId}
- observationId={observation.id}
- includeTraceLevelScores={ownsTraceLevelScores}
- hiddenColumns={[
- "traceId",
- "observationId",
- "traceName",
- "traceTags",
- "jobConfigurationId",
- "userId",
- ]}
- localStorageSuffix="ObservationPreview"
- disableUrlPersistence={isPeekMode || isAnnotationMode}
+ {showTabsBar && (
+ <TooltipProvider>
+ <TabsBarList>
+ <TabsBarTrigger value="preview">Preview</TabsBarTrigger>
+ {showScoresTab ? (
+ <TabsBarTrigger value="scores">Scores</TabsBarTrigger>
+ ) : null}
+ {showLogViewTab ? (
+ <TabsBarTrigger value="log">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span>Log View</span>
+ </TooltipTrigger>
+ <TooltipContent className="text-xs">
+ {isLogViewVirtualized
+ ? `Shows all ${observations.length} observations with virtualization enabled.`
+ : "Shows all observations concatenated. Great for quickly scanning through them."}
+ </TooltipContent>
+ </Tooltip>
+ </TabsBarTrigger>
+ ) : null}
+
+ {(selectedTab === "log" ||
+ (selectedTab === "preview" && isPrettyViewAvailable)) && (
+ <>
+ <div className="ml-auto h-fit px-2 py-0.5">
+ <Tabs
+ value={
+ selectedTab === "log" && isLogViewVirtualized
+ ? "pretty"
+ : selectedViewTab
+ }
+ onValueChange={(value) => {
+ if (
+ selectedTab === "log" &&
+ isLogViewVirtualized &&
+ value === "json"
+ ) {
+ return;
+ }
+ handleViewTabChange(value);
+ }}
+ >
+ <Tabs.List size="sm">
+ <Tabs.Trigger
+ value="pretty"
+ size="sm"
+ label="Formatted"
+ />
+ {selectedTab === "log" && isLogViewVirtualized ? (
+ <HoverCard openDelay={200}>
+ <HoverCardTrigger asChild>
+ <span>
+ <Tabs.Trigger
+ value="json"
+ size="sm"
+ disabled
+ label="JSON"
+ />
+ </span>
+ </HoverCardTrigger>
+ <HoverCardContent
+ align="end"
+ className="w-64 text-sm"
+ sideOffset={8}
+ >
+ <p className="font-bold">
+ JSON view unavailable
+ </p>
+ <p className="text-muted-foreground mt-1">
+ Disabled for traces with{" "}
+ {
+ TRACE_VIEW_CONFIG.logView
+ .virtualizationThreshold
+ }
+ + observations to maintain performance.
+ </p>
+ </HoverCardContent>
+ </HoverCard>
+ ) : (
+ <Tabs.Trigger
+ value="json"
+ size="sm"
+ label="JSON"
+ />
+ )}
+ </Tabs.List>
+ </Tabs>
+ </div>
+ {selectedViewTab === "json" &&
+ !(selectedTab === "log" && isLogViewVirtualized) && (
+ <div className="mr-1 flex items-center gap-1.5">
+ <Switch
+ size="sm"
+ checked={jsonBetaEnabled}
+ onCheckedChange={handleBetaToggle}
+ />
+ <span className="text-muted-foreground text-xs">
+ Beta
+ </span>
+ </div>
+ )}
+ </>
+ )}
+ </TabsBarList>
+ </TooltipProvider>
+ )}
+
+ <TabsBarContent
+ value="preview"
+ className="mt-0 flex max-h-full min-h-0 w-full flex-1"
+ >
+ <ObservationPreview
+ currentView={currentView}
+ tags={isRoot ? observation.traceTags : undefined}
+ previewKey={observation.id}
+ onPrettyViewAvailabilityChange={setIsPrettyViewAvailable}
+ previewProps={{
+ observationName: observation.name ?? undefined,
+ input: observationWithIOCompat.data?.input ?? undefined,
+ output: observationWithIOCompat.data?.output ?? undefined,
+ status: observation.statusMessage
+ ? {
+ level: observation.level,
+ message: observation.statusMessage,
+ }
+ : undefined,
+ outputCorrection,
+ metadata: observationWithIOCompat.data?.metadata ?? undefined,
+ parsedInput,
+ parsedOutput,
+ parsedMetadata,
+ isLoading: observationWithIOCompat.isLoading,
+ isParsing: isWaitingForParsing,
+ media: observationMedia.data,
+ inputExpansionState: formattedExpansion.input,
+ outputExpansionState: formattedExpansion.output,
+ metadataExpansionState: formattedExpansion.metadata,
+ onInputExpansionChange: (exp) =>
+ setFormattedFieldExpansion(
+ "input",
+ exp as Record<string, boolean>,
+ ),
+ onOutputExpansionChange: (exp) =>
+ setFormattedFieldExpansion(
+ "output",
+ exp as Record<string, boolean>,
+ ),
+ onMetadataExpansionChange: (exp) =>
+ setFormattedFieldExpansion(
+ "metadata",
+ exp as Record<string, boolean>,
+ ),
+ advancedJsonExpansionState: advancedJsonExpansion,
+ onAdvancedJsonExpansionChange: setAdvancedJsonExpansion,
+ jsonInputExpanded: jsonExpansion.input,
+ jsonOutputExpanded: jsonExpansion.output,
+ jsonMetadataExpanded: jsonExpansion.metadata,
+ onJsonInputExpandedChange: (expanded) =>
+ setJsonFieldExpansion("input", expanded),
+ onJsonOutputExpandedChange: (expanded) =>
+ setJsonFieldExpansion("output", expanded),
+ onJsonMetadataExpandedChange: (expanded) =>
+ setJsonFieldExpansion("metadata", expanded),
+ enableInlineComments: true,
+ onAddInlineComment: (selection) =>
+ openDrawer({ type: "inline-comment", selection }),
+ commentedPathsByField,
+ showMetadata: true,
+ observationId: observation.id,
+ projectId,
+ traceId,
+ environment: observation.environment,
+ }}
/>
- </div>
- </TabsBarContent>
- ) : null}
-
- {showLogViewTab ? (
- <TabsBarContent
- value="log"
- className="mt-0 flex max-h-full min-h-0 w-full flex-1"
- >
- <TraceLogView
- traceId={traceId}
- projectId={projectId}
- currentView={isLogViewVirtualized ? "pretty" : currentView}
- />
- </TabsBarContent>
- ) : null}
- </TabsBar>
- </div>
+ </TabsBarContent>
+
+ {showScoresTab ? (
+ <TabsBarContent
+ value="scores"
+ className="mt-0 mr-4 mb-2 flex h-full min-h-0 flex-1 overflow-hidden"
+ >
+ <div className="flex h-full min-h-0 w-full flex-1 flex-col overflow-hidden">
+ <ScoresTable
+ projectId={projectId}
+ traceId={traceId}
+ observationId={observation.id}
+ includeTraceLevelScores={ownsTraceLevelScores}
+ hiddenColumns={[
+ "traceId",
+ "observationId",
+ "traceName",
+ "traceTags",
+ "jobConfigurationId",
+ "userId",
+ ]}
+ localStorageSuffix="ObservationPreview"
+ disableUrlPersistence={isPeekMode || isAnnotationMode}
+ />
+ </div>
+ </TabsBarContent>
+ ) : null}
+
+ {showLogViewTab ? (
+ <TabsBarContent
+ value="log"
+ className="mt-0 flex max-h-full min-h-0 w-full flex-1"
+ >
+ <TraceLogView
+ traceId={traceId}
+ projectId={projectId}
+ currentView={isLogViewVirtualized ? "pretty" : currentView}
+ />
+ </TabsBarContent>
+ ) : null}
+ </TabsBar>
+ </div>
+ )}
+ </CommentDrawerController>
);
}
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
index d88458d7f9..cd310f192a 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader/ObservationDetailViewHeader.tsx
@@ -17,7 +17,6 @@ import {
LangfuseInternalTraceEnvironment,
type ScoreDomain,
} from "@langfuse/shared";
-import { type SelectionData } from "@/src/features/comments/contexts/InlineCommentSelectionContext";
import { type ObservationReturnTypeWithMetadata } from "@/src/server/api/routers/traces";
import { ItemBadge } from "@/src/components/ItemBadge";
import {
@@ -29,7 +28,6 @@ import {
AnnotateDrawerController,
DualAnnotationContent,
} from "@/src/features/scores";
-import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
import { JumpToPlaygroundDropdownMenuController } from "@/src/features/playground/page/components/JumpToPlaygroundDropdownMenuController";
@@ -111,11 +109,10 @@ export interface ObservationDetailViewHeaderProps {
latencySeconds: number | null;
observationScores: WithStringifiedMetadata<ScoreDomain>[];
commentCount: number | undefined;
- // Inline comment props
- pendingSelection?: SelectionData | null;
- onSelectionUsed?: () => void;
- isCommentDrawerOpen?: boolean;
- onCommentDrawerOpenChange?: (open: boolean) => void;
+ commentDrawerControl: {
+ disabled: boolean;
+ openDrawer: () => void;
+ };
subtreeMetrics?: AggregatedTraceMetrics | null;
treeNodeTotalCost?: Decimal;
}
@@ -129,10 +126,7 @@ export const ObservationDetailViewHeader = memo(
latencySeconds,
observationScores,
commentCount,
- pendingSelection,
- onSelectionUsed,
- isCommentDrawerOpen,
- onCommentDrawerOpenChange,
+ commentDrawerControl,
subtreeMetrics,
treeNodeTotalCost,
}: ObservationDetailViewHeaderProps) {
@@ -288,19 +282,22 @@ export const ObservationDetailViewHeader = memo(
>
{observationWithIO && (
<NewDatasetItemFromExistingObjectDialogController
- traceId={traceId}
- observationId={observation.id}
projectId={projectId}
- input={observationWithIO.input}
- output={observationWithIO.output}
- metadata={observationWithIO.metadata}
>
{({ openDialog }) => (
<ExistingDatasetItemsDropdownMenuController
projectId={projectId}
datasetItems={existingDatasetItems}
disabled={!hasDatasetAccess}
- onOpenDialog={openDialog}
+ onOpenDialog={() =>
+ openDialog({
+ traceId,
+ observationId: observation.id,
+ input: observationWithIO.input,
+ output: observationWithIO.output,
+ metadata: observationWithIO.metadata,
+ })
+ }
>
{({ Anchor, openDropdown }) => (
<Anchor>
@@ -316,7 +313,13 @@ export const ObservationDetailViewHeader = memo(
}
captureNewDatasetItemFormOpen();
- openDialog();
+ openDialog({
+ traceId,
+ observationId: observation.id,
+ input: observationWithIO.input,
+ output: observationWithIO.output,
+ metadata: observationWithIO.metadata,
+ });
}}
>
{hasExistingDatasetItems || hasDatasetAccess ? (
@@ -379,27 +382,31 @@ export const ObservationDetailViewHeader = memo(
</DrawerContent>
</Drawer>
) : (
- <AnnotateDrawerController
- key={"annotation-drawer-menu-" + observation.id}
- projectId={projectId}
- scoreTarget={{
- type: "trace",
- traceId: traceId,
- observationId: observation.id,
- }}
- scores={observationScores}
- scoreMetadata={{
- projectId: projectId,
- environment: observation.environment,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="ghost"
size="sm"
disabled={disabled}
className="w-full justify-start gap-2 font-normal"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: {
+ type: "trace",
+ traceId,
+ observationId: observation.id,
+ },
+ scores: observationScores,
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: observation.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="h-3 w-3" />
@@ -466,38 +473,24 @@ export const ObservationDetailViewHeader = memo(
)}
</JumpToPlaygroundDropdownMenuController>
)}
- <CommentDrawerController
- projectId={projectId}
- objectId={observation.id}
- objectType="OBSERVATION"
- objectStartTime={observation.startTime}
- count={commentCount}
- pendingSelection={pendingSelection}
- onSelectionUsed={onSelectionUsed}
- isOpen={isCommentDrawerOpen}
- onOpenChange={onCommentDrawerOpenChange}
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ disabled={commentDrawerControl.disabled}
+ onClick={commentDrawerControl.openDrawer}
+ className="w-full justify-start gap-2 font-normal"
>
- {({ disabled, openDrawer }) => (
- <Button
- type="button"
- variant="ghost"
- size="sm"
- disabled={disabled}
- onClick={openDrawer}
- className="w-full justify-start gap-2 font-normal"
- >
- {disabled ? (
- <MessageSquareOff className="text-muted-foreground h-4 w-4" />
- ) : (
- <MessageSquare className="h-4 w-4" />
- )}
- <span className="text-sm">Add comment</span>
- {!disabled && commentCount ? (
- <ActionButtonCountBadge count={commentCount} />
- ) : null}
- </Button>
+ {commentDrawerControl.disabled ? (
+ <MessageSquareOff className="text-muted-foreground h-4 w-4" />
+ ) : (
+ <MessageSquare className="h-4 w-4" />
)}
- </CommentDrawerController>
+ <span className="text-sm">Add comment</span>
+ {!commentDrawerControl.disabled && commentCount ? (
+ <ActionButtonCountBadge count={commentCount} />
+ ) : null}
+ </Button>
</PopoverContent>
</Popover>
)}
@@ -507,12 +500,7 @@ export const ObservationDetailViewHeader = memo(
<div className="flex h-full flex-wrap content-start items-start justify-start gap-0.5 @2xl:mr-1 @2xl:justify-end">
{observationWithIO && (
<NewDatasetItemFromExistingObjectDialogController
- traceId={traceId}
- observationId={observation.id}
projectId={projectId}
- input={observationWithIO.input}
- output={observationWithIO.output}
- metadata={observationWithIO.metadata}
key={observation.id}
>
{({ openDialog }) => (
@@ -520,7 +508,15 @@ export const ObservationDetailViewHeader = memo(
projectId={projectId}
datasetItems={existingDatasetItems}
disabled={!hasDatasetAccess}
- onOpenDialog={openDialog}
+ onOpenDialog={() =>
+ openDialog({
+ traceId,
+ observationId: observation.id,
+ input: observationWithIO.input,
+ output: observationWithIO.output,
+ metadata: observationWithIO.metadata,
+ })
+ }
>
{({ Anchor, openDropdown }) => (
<Anchor>
@@ -535,7 +531,13 @@ export const ObservationDetailViewHeader = memo(
}
captureNewDatasetItemFormOpen();
- openDialog();
+ openDialog({
+ traceId,
+ observationId: observation.id,
+ input: observationWithIO.input,
+ output: observationWithIO.output,
+ metadata: observationWithIO.metadata,
+ });
}}
>
{!hasExistingDatasetItems && hasDatasetAccess ? (
@@ -595,27 +597,31 @@ export const ObservationDetailViewHeader = memo(
</DrawerContent>
</Drawer>
) : (
- <AnnotateDrawerController
- key={"annotation-drawer-" + observation.id}
- projectId={projectId}
- scoreTarget={{
- type: "trace",
- traceId: traceId,
- observationId: observation.id,
- }}
- scores={observationScores}
- scoreMetadata={{
- projectId: projectId,
- environment: observation.environment,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="secondary"
size="sm"
disabled={disabled}
className="rounded-r-none"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: {
+ type: "trace",
+ traceId,
+ observationId: observation.id,
+ },
+ scores: observationScores,
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: observation.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="mr-1.5 h-3 w-3" />
@@ -682,40 +688,26 @@ export const ObservationDetailViewHeader = memo(
)}
</JumpToPlaygroundDropdownMenuController>
)}
- <CommentDrawerController
- projectId={projectId}
- objectId={observation.id}
- objectType="OBSERVATION"
- objectStartTime={observation.startTime}
- count={commentCount}
- pendingSelection={pendingSelection}
- onSelectionUsed={onSelectionUsed}
- isOpen={isCommentDrawerOpen}
- onOpenChange={onCommentDrawerOpenChange}
+ <Button
+ type="button"
+ variant="secondary"
+ size="sm"
+ disabled={commentDrawerControl.disabled}
+ onClick={commentDrawerControl.openDrawer}
+ className="gap-1"
>
- {({ disabled, openDrawer }) => (
- <Button
- type="button"
- variant="secondary"
- size="sm"
- disabled={disabled}
- onClick={openDrawer}
- className="gap-1"
- >
- {disabled ? (
- <MessageSquareOff className="text-muted-foreground h-3.5 w-3.5" />
- ) : (
- <>
- <MessageSquare className="h-3.5 w-3.5" />
- <span>Add comment</span>
- {!!commentCount ? (
- <ActionButtonCountBadge count={commentCount} />
- ) : null}
- </>
- )}
- </Button>
+ {commentDrawerControl.disabled ? (
+ <MessageSquareOff className="text-muted-foreground h-3.5 w-3.5" />
+ ) : (
+ <>
+ <MessageSquare className="h-3.5 w-3.5" />
+ <span>Add comment</span>
+ {!!commentCount ? (
+ <ActionButtonCountBadge count={commentCount} />
+ ) : null}
+ </>
)}
- </CommentDrawerController>
+ </Button>
</div>
)}
</div>
diff --git a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
index d0dfaafb2e..bdc349472c 100644
--- a/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
+++ b/web/src/features/traces/components/TraceDetailView/TraceDetailView.tsx
@@ -14,7 +14,7 @@ import {
import { Tabs } from "@/src/components/design-system/Tabs/Tabs";
import { Switch } from "@/src/components/design-system/Switch/Switch";
import { useCallback, useMemo, useState } from "react";
-import { type SelectionData } from "@/src/features/comments/contexts/InlineCommentSelectionContext";
+import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { api } from "@/src/utils/api";
import {
Tooltip,
@@ -76,20 +76,6 @@ export function TraceDetailView({
const [isPrettyViewAvailable, setIsPrettyViewAvailable] = useState(true);
const [isJSONBetaVirtualized, setIsJSONBetaVirtualized] = useState(false);
- // Inline comment state
- const [pendingSelection, setPendingSelection] =
- useState<SelectionData | null>(null);
- const [isCommentDrawerOpen, setIsCommentDrawerOpen] = useState(false);
-
- const handleAddInlineComment = useCallback((selection: SelectionData) => {
- setPendingSelection(selection);
- setIsCommentDrawerOpen(true);
- }, []);
-
- const handleSelectionUsed = useCallback(() => {
- setPendingSelection(null);
- }, []);
-
// Get jsonViewPreference directly from ViewPreferencesContext for "json-beta" support
const {
jsonViewPreference,
@@ -218,257 +204,274 @@ export function TraceDetailView({
};
return (
- <div className="flex h-full flex-col overflow-hidden">
- {/* Header section (extracted component) */}
- <TraceDetailViewHeader
- trace={trace}
- observations={observations}
- parsedMetadata={parsedMetadata}
- projectId={projectId}
- traceScores={traceScores}
- commentCount={comments.get(trace.id)}
- pendingSelection={pendingSelection}
- onSelectionUsed={handleSelectionUsed}
- isCommentDrawerOpen={isCommentDrawerOpen}
- onCommentDrawerOpenChange={setIsCommentDrawerOpen}
- />
-
- {/* Tabs section */}
- <TabsBar
- value={selectedTab}
- className="flex min-h-0 flex-1 flex-col overflow-hidden"
- onValueChange={handleTabChange}
- >
- {/* Hide entire tabs bar when only Preview tab remains (annotation mode) */}
- {showTabsBar && (
- <TooltipProvider>
- <TabsBarList>
- <TabsBarTrigger value="preview">Preview</TabsBarTrigger>
- {showLogViewTab && (
- <TabsBarTrigger value="log">
- <Tooltip>
- <TooltipTrigger asChild>
- <span>Log View</span>
- </TooltipTrigger>
- <TooltipContent className="text-xs">
- {isLogViewVirtualized
- ? `Shows all ${observations.length} observations with virtualization enabled.`
- : "Shows all observations concatenated. Great for quickly scanning through them."}
- </TooltipContent>
- </Tooltip>
- </TabsBarTrigger>
- )}
- {showScoresTab && (
- <TabsBarTrigger value="scores">Scores</TabsBarTrigger>
- )}
-
- {/* View toggle (Formatted/JSON) - show for preview and log tabs when pretty view available */}
- {/* JSON views are disabled for virtualized log view (large traces) */}
- {(selectedTab === "log" ||
- (selectedTab === "preview" && isPrettyViewAvailable)) && (
- <>
- <div className="ml-auto h-fit px-2 py-0.5">
- <Tabs
- value={
- selectedTab === "log" && isLogViewVirtualized
- ? "pretty"
- : selectedViewTab
- }
- onValueChange={(value) => {
- // Don't allow JSON views for virtualized log view
- if (
- selectedTab === "log" &&
- isLogViewVirtualized &&
- value === "json"
- ) {
- return;
- }
- handleViewTabChange(value);
- }}
- >
- <Tabs.List size="sm">
- <Tabs.Trigger
- value="pretty"
- size="sm"
- label="Formatted"
- />
- {selectedTab === "log" && isLogViewVirtualized ? (
- <HoverCard openDelay={200}>
- <HoverCardTrigger asChild>
+ <CommentDrawerController
+ projectId={projectId}
+ objectId={trace.id}
+ objectType="TRACE"
+ count={comments.get(trace.id)}
+ >
+ {({ disabled, openDrawer }) => (
+ <div className="flex h-full flex-col overflow-hidden">
+ {/* Header section (extracted component) */}
+ <TraceDetailViewHeader
+ trace={trace}
+ observations={observations}
+ parsedMetadata={parsedMetadata}
+ projectId={projectId}
+ traceScores={traceScores}
+ commentCount={comments.get(trace.id)}
+ commentDrawerControl={{
+ disabled,
+ openDrawer: () => openDrawer({ type: "comments" }),
+ }}
+ />
+
+ {/* Tabs section */}
+ <TabsBar
+ value={selectedTab}
+ className="flex min-h-0 flex-1 flex-col overflow-hidden"
+ onValueChange={handleTabChange}
+ >
+ {/* Hide entire tabs bar when only Preview tab remains (annotation mode) */}
+ {showTabsBar && (
+ <TooltipProvider>
+ <TabsBarList>
+ <TabsBarTrigger value="preview">Preview</TabsBarTrigger>
+ {showLogViewTab && (
+ <TabsBarTrigger value="log">
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <span>Log View</span>
+ </TooltipTrigger>
+ <TooltipContent className="text-xs">
+ {isLogViewVirtualized
+ ? `Shows all ${observations.length} observations with virtualization enabled.`
+ : "Shows all observations concatenated. Great for quickly scanning through them."}
+ </TooltipContent>
+ </Tooltip>
+ </TabsBarTrigger>
+ )}
+ {showScoresTab && (
+ <TabsBarTrigger value="scores">Scores</TabsBarTrigger>
+ )}
+
+ {/* View toggle (Formatted/JSON) - show for preview and log tabs when pretty view available */}
+ {/* JSON views are disabled for virtualized log view (large traces) */}
+ {(selectedTab === "log" ||
+ (selectedTab === "preview" && isPrettyViewAvailable)) && (
+ <>
+ <div className="ml-auto h-fit px-2 py-0.5">
+ <Tabs
+ value={
+ selectedTab === "log" && isLogViewVirtualized
+ ? "pretty"
+ : selectedViewTab
+ }
+ onValueChange={(value) => {
+ // Don't allow JSON views for virtualized log view
+ if (
+ selectedTab === "log" &&
+ isLogViewVirtualized &&
+ value === "json"
+ ) {
+ return;
+ }
+ handleViewTabChange(value);
+ }}
+ >
+ <Tabs.List size="sm">
+ <Tabs.Trigger
+ value="pretty"
+ size="sm"
+ label="Formatted"
+ />
+ {selectedTab === "log" && isLogViewVirtualized ? (
+ <HoverCard openDelay={200}>
+ <HoverCardTrigger asChild>
+ <Tabs.Trigger
+ value="json"
+ size="sm"
+ disabled
+ label="JSON"
+ />
+ </HoverCardTrigger>
+ <HoverCardContent
+ align="end"
+ className="w-64 text-sm"
+ sideOffset={8}
+ >
+ <p className="font-bold">
+ JSON view unavailable
+ </p>
+ <p className="text-muted-foreground mt-1">
+ Disabled for traces with{" "}
+ {
+ TRACE_VIEW_CONFIG.logView
+ .virtualizationThreshold
+ }
+ + observations to maintain performance.
+ </p>
+ </HoverCardContent>
+ </HoverCard>
+ ) : (
<Tabs.Trigger
value="json"
size="sm"
- disabled
label="JSON"
/>
- </HoverCardTrigger>
- <HoverCardContent
- align="end"
- className="w-64 text-sm"
- sideOffset={8}
- >
- <p className="font-bold">JSON view unavailable</p>
- <p className="text-muted-foreground mt-1">
- Disabled for traces with{" "}
- {
- TRACE_VIEW_CONFIG.logView
- .virtualizationThreshold
- }
- + observations to maintain performance.
- </p>
- </HoverCardContent>
- </HoverCard>
- ) : (
- <Tabs.Trigger value="json" size="sm" label="JSON" />
- )}
- </Tabs.List>
- </Tabs>
- </div>
- {/* Beta toggle - only show when JSON is selected and not in virtualized log view */}
- {selectedViewTab === "json" &&
- !(selectedTab === "log" && isLogViewVirtualized) && (
- <div className="mr-1 flex items-center gap-1.5">
- <Switch
- size="sm"
- checked={jsonBetaEnabled}
- onCheckedChange={handleBetaToggle}
- />
- <span className="text-muted-foreground text-xs">
- Beta
- </span>
+ )}
+ </Tabs.List>
+ </Tabs>
</div>
- )}
- </>
- )}
- </TabsBarList>
- </TooltipProvider>
- )}
-
- {/* Preview tab content */}
- <TabsBarContent
- value="preview"
- className="mt-0 flex max-h-full min-h-0 w-full flex-1"
- >
- <div
- className={`flex min-h-0 w-full flex-1 flex-col ${
- currentView === "json-beta" && isJSONBetaVirtualized
- ? "overflow-hidden"
- : "overflow-auto pb-4"
- }`}
- >
- {/* Tags Section - scrolls with content except in JSON Beta (virtualized) */}
- {trace.tags.length > 0 && (
- <>
- <div
- className={`px-2 pt-2 text-sm font-bold ${!isPrettyLikeView ? "shrink-0" : ""}`}
- >
- Tags
- </div>
- <div
- className={`flex flex-wrap gap-x-1 gap-y-1 px-2 pb-2 ${!isPrettyLikeView ? "shrink-0" : ""}`}
- >
- <TagList selectedTags={trace.tags} isLoading={false} />
- </div>
- </>
+ {/* Beta toggle - only show when JSON is selected and not in virtualized log view */}
+ {selectedViewTab === "json" &&
+ !(selectedTab === "log" && isLogViewVirtualized) && (
+ <div className="mr-1 flex items-center gap-1.5">
+ <Switch
+ size="sm"
+ checked={jsonBetaEnabled}
+ onCheckedChange={handleBetaToggle}
+ />
+ <span className="text-muted-foreground text-xs">
+ Beta
+ </span>
+ </div>
+ )}
+ </>
+ )}
+ </TabsBarList>
+ </TooltipProvider>
)}
- {/* I/O Preview (includes metadata in both views) */}
- <IOPreview
- key={trace.id + "-io"}
- input={trace.input ?? undefined}
- output={trace.output ?? undefined}
- metadata={trace.metadata ?? undefined}
- outputCorrection={outputCorrection}
- parsedInput={parsedInput}
- parsedOutput={parsedOutput}
- parsedMetadata={parsedMetadata}
- isParsing={isParsing}
- media={traceMedia.data}
- currentView={currentView}
- setIsPrettyViewAvailable={setIsPrettyViewAvailable}
- inputExpansionState={formattedExpansion.input}
- outputExpansionState={formattedExpansion.output}
- metadataExpansionState={formattedExpansion.metadata}
- onInputExpansionChange={(exp) =>
- setFormattedFieldExpansion(
- "input",
- exp as Record<string, boolean>,
- )
- }
- onOutputExpansionChange={(exp) =>
- setFormattedFieldExpansion(
- "output",
- exp as Record<string, boolean>,
- )
- }
- onMetadataExpansionChange={(exp) =>
- setFormattedFieldExpansion(
- "metadata",
- exp as Record<string, boolean>,
- )
- }
- advancedJsonExpansionState={advancedJsonExpansion}
- onAdvancedJsonExpansionChange={setAdvancedJsonExpansion}
- jsonInputExpanded={jsonExpansion.input}
- jsonOutputExpanded={jsonExpansion.output}
- jsonMetadataExpanded={jsonExpansion.metadata}
- onJsonInputExpandedChange={(expanded) =>
- setJsonFieldExpansion("input", expanded)
- }
- onJsonOutputExpandedChange={(expanded) =>
- setJsonFieldExpansion("output", expanded)
- }
- onJsonMetadataExpandedChange={(expanded) =>
- setJsonFieldExpansion("metadata", expanded)
- }
- enableInlineComments={true}
- onAddInlineComment={handleAddInlineComment}
- commentedPathsByField={commentedPathsByField}
- showMetadata
- onVirtualizationChange={setIsJSONBetaVirtualized}
- projectId={projectId}
- traceId={trace.id}
- environment={trace.environment}
- />
- </div>
- </TabsBarContent>
-
- {/* Log View tab content */}
- <TabsBarContent
- value="log"
- className="mt-0 flex max-h-full min-h-0 w-full flex-1"
- >
- <TraceLogView
- traceId={trace.id}
- projectId={projectId}
- currentView={isLogViewVirtualized ? "pretty" : currentView}
- />
- </TabsBarContent>
-
- {/* Scores tab content */}
- {showScoresTab && (
- <TabsBarContent
- value="scores"
- className="mt-0 flex max-h-full min-h-0 w-full flex-1 overflow-hidden"
- >
- <div className="flex h-full min-h-0 w-full flex-col overflow-hidden pr-3">
- <ScoresTable
- projectId={projectId}
+ {/* Preview tab content */}
+ <TabsBarContent
+ value="preview"
+ className="mt-0 flex max-h-full min-h-0 w-full flex-1"
+ >
+ <div
+ className={`flex min-h-0 w-full flex-1 flex-col ${
+ currentView === "json-beta" && isJSONBetaVirtualized
+ ? "overflow-hidden"
+ : "overflow-auto pb-4"
+ }`}
+ >
+ {/* Tags Section - scrolls with content except in JSON Beta (virtualized) */}
+ {trace.tags.length > 0 && (
+ <>
+ <div
+ className={`px-2 pt-2 text-sm font-bold ${!isPrettyLikeView ? "shrink-0" : ""}`}
+ >
+ Tags
+ </div>
+ <div
+ className={`flex flex-wrap gap-x-1 gap-y-1 px-2 pb-2 ${!isPrettyLikeView ? "shrink-0" : ""}`}
+ >
+ <TagList selectedTags={trace.tags} isLoading={false} />
+ </div>
+ </>
+ )}
+
+ {/* I/O Preview (includes metadata in both views) */}
+ <IOPreview
+ key={trace.id + "-io"}
+ input={trace.input ?? undefined}
+ output={trace.output ?? undefined}
+ metadata={trace.metadata ?? undefined}
+ outputCorrection={outputCorrection}
+ parsedInput={parsedInput}
+ parsedOutput={parsedOutput}
+ parsedMetadata={parsedMetadata}
+ isParsing={isParsing}
+ media={traceMedia.data}
+ currentView={currentView}
+ setIsPrettyViewAvailable={setIsPrettyViewAvailable}
+ inputExpansionState={formattedExpansion.input}
+ outputExpansionState={formattedExpansion.output}
+ metadataExpansionState={formattedExpansion.metadata}
+ onInputExpansionChange={(exp) =>
+ setFormattedFieldExpansion(
+ "input",
+ exp as Record<string, boolean>,
+ )
+ }
+ onOutputExpansionChange={(exp) =>
+ setFormattedFieldExpansion(
+ "output",
+ exp as Record<string, boolean>,
+ )
+ }
+ onMetadataExpansionChange={(exp) =>
+ setFormattedFieldExpansion(
+ "metadata",
+ exp as Record<string, boolean>,
+ )
+ }
+ advancedJsonExpansionState={advancedJsonExpansion}
+ onAdvancedJsonExpansionChange={setAdvancedJsonExpansion}
+ jsonInputExpanded={jsonExpansion.input}
+ jsonOutputExpanded={jsonExpansion.output}
+ jsonMetadataExpanded={jsonExpansion.metadata}
+ onJsonInputExpandedChange={(expanded) =>
+ setJsonFieldExpansion("input", expanded)
+ }
+ onJsonOutputExpandedChange={(expanded) =>
+ setJsonFieldExpansion("output", expanded)
+ }
+ onJsonMetadataExpandedChange={(expanded) =>
+ setJsonFieldExpansion("metadata", expanded)
+ }
+ enableInlineComments={true}
+ onAddInlineComment={(selection) =>
+ openDrawer({ type: "inline-comment", selection })
+ }
+ commentedPathsByField={commentedPathsByField}
+ showMetadata
+ onVirtualizationChange={setIsJSONBetaVirtualized}
+ projectId={projectId}
+ traceId={trace.id}
+ environment={trace.environment}
+ />
+ </div>
+ </TabsBarContent>
+
+ {/* Log View tab content */}
+ <TabsBarContent
+ value="log"
+ className="mt-0 flex max-h-full min-h-0 w-full flex-1"
+ >
+ <TraceLogView
traceId={trace.id}
- hiddenColumns={[
- "traceId",
- "traceName",
- "traceTags",
- "jobConfigurationId",
- "userId",
- ]}
- localStorageSuffix="TracePreview"
- disableUrlPersistence={isPeekMode || isAnnotationMode}
+ projectId={projectId}
+ currentView={isLogViewVirtualized ? "pretty" : currentView}
/>
- </div>
- </TabsBarContent>
- )}
- </TabsBar>
- </div>
+ </TabsBarContent>
+
+ {/* Scores tab content */}
+ {showScoresTab && (
+ <TabsBarContent
+ value="scores"
+ className="mt-0 flex max-h-full min-h-0 w-full flex-1 overflow-hidden"
+ >
+ <div className="flex h-full min-h-0 w-full flex-col overflow-hidden pr-3">
+ <ScoresTable
+ projectId={projectId}
+ traceId={trace.id}
+ hiddenColumns={[
+ "traceId",
+ "traceName",
+ "traceTags",
+ "jobConfigurationId",
+ "userId",
+ ]}
+ localStorageSuffix="TracePreview"
+ disableUrlPersistence={isPeekMode || isAnnotationMode}
+ />
+ </div>
+ </TabsBarContent>
+ )}
+ </TabsBar>
+ </div>
+ )}
+ </CommentDrawerController>
);
}
diff --git a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
index 9662ed3205..22c4b37545 100644
--- a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
+++ b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
@@ -16,7 +16,6 @@ import {
AnnotationQueueObjectType,
LangfuseInternalTraceEnvironment,
} from "@langfuse/shared";
-import { type SelectionData } from "@/src/features/comments/contexts/InlineCommentSelectionContext";
import { type WithStringifiedMetadata } from "@/src/utils/clientSideDomainTypes";
import { type ObservationReturnTypeWithMetadata } from "@/src/server/api/routers/traces";
import { ItemBadge } from "@/src/components/ItemBadge";
@@ -27,7 +26,6 @@ import {
useDatasetItemFromTraceOrObservation,
} from "@/src/features/datasets";
import { AnnotateDrawerController } from "@/src/features/scores";
-import { CommentDrawerController } from "@/src/features/comments/CommentDrawerController";
import { ActionButtonCountBadge } from "@/src/components/ui/action-button-count-badge";
import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
@@ -77,11 +75,10 @@ export interface TraceDetailViewHeaderProps {
projectId: string;
traceScores: WithStringifiedMetadata<ScoreDomain>[];
commentCount: number | undefined;
- // Inline comment props
- pendingSelection?: SelectionData | null;
- onSelectionUsed?: () => void;
- isCommentDrawerOpen?: boolean;
- onCommentDrawerOpenChange?: (open: boolean) => void;
+ commentDrawerControl: {
+ disabled: boolean;
+ openDrawer: () => void;
+ };
}
export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
@@ -91,10 +88,7 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
projectId,
traceScores,
commentCount,
- pendingSelection,
- onSelectionUsed,
- isCommentDrawerOpen,
- onCommentDrawerOpenChange,
+ commentDrawerControl,
}: TraceDetailViewHeaderProps) {
const { isAnnotationMode } = useViewPreferences();
const isMobile = useIsMobile();
@@ -184,18 +178,21 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
className="flex w-auto min-w-44 flex-col gap-0.5 p-1 data-[state=closed]:hidden"
>
<NewDatasetItemFromExistingObjectDialogController
- traceId={trace.id}
projectId={projectId}
- input={trace.input}
- output={trace.output}
- metadata={trace.metadata}
>
{({ openDialog }) => (
<ExistingDatasetItemsDropdownMenuController
projectId={projectId}
datasetItems={existingDatasetItems}
disabled={!hasDatasetAccess}
- onOpenDialog={openDialog}
+ onOpenDialog={() =>
+ openDialog({
+ traceId: trace.id,
+ input: trace.input,
+ output: trace.output,
+ metadata: trace.metadata,
+ })
+ }
>
{({ Anchor, openDropdown }) => (
<Anchor>
@@ -211,7 +208,12 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
}
captureNewDatasetItemFormOpen();
- openDialog();
+ openDialog({
+ traceId: trace.id,
+ input: trace.input,
+ output: trace.output,
+ metadata: trace.metadata,
+ });
}}
>
{hasExistingDatasetItems || hasDatasetAccess ? (
@@ -241,25 +243,30 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
</NewDatasetItemFromExistingObjectDialogController>
{!isAnnotationMode && (
<>
- <AnnotateDrawerController
- projectId={projectId}
- scoreTarget={{
- type: "trace",
- traceId: trace.id,
- }}
- scores={traceScores}
- scoreMetadata={{
- projectId: projectId,
- environment: trace.environment,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="ghost"
size="sm"
disabled={disabled}
className="w-full justify-start gap-2 font-normal"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: {
+ type: "trace",
+ traceId: trace.id,
+ },
+ scores: traceScores,
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: trace.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="h-3 w-3" />
@@ -295,37 +302,24 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
</AnnotationQueueItemDropdownMenuController>
</>
)}
- <CommentDrawerController
- projectId={projectId}
- objectId={trace.id}
- objectType="TRACE"
- count={commentCount}
- pendingSelection={pendingSelection}
- onSelectionUsed={onSelectionUsed}
- isOpen={isCommentDrawerOpen}
- onOpenChange={onCommentDrawerOpenChange}
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ disabled={commentDrawerControl.disabled}
+ onClick={commentDrawerControl.openDrawer}
+ className="w-full justify-start gap-2 font-normal"
>
- {({ disabled, openDrawer }) => (
- <Button
- type="button"
- variant="ghost"
- size="sm"
- disabled={disabled}
- onClick={openDrawer}
- className="w-full justify-start gap-2 font-normal"
- >
- {disabled ? (
- <MessageSquareOff className="text-muted-foreground h-4 w-4" />
- ) : (
- <MessageSquare className="h-4 w-4" />
- )}
- <span className="text-sm">Add comment</span>
- {!disabled && commentCount ? (
- <ActionButtonCountBadge count={commentCount} />
- ) : null}
- </Button>
+ {commentDrawerControl.disabled ? (
+ <MessageSquareOff className="text-muted-foreground h-4 w-4" />
+ ) : (
+ <MessageSquare className="h-4 w-4" />
)}
- </CommentDrawerController>
+ <span className="text-sm">Add comment</span>
+ {!commentDrawerControl.disabled && commentCount ? (
+ <ActionButtonCountBadge count={commentCount} />
+ ) : null}
+ </Button>
</PopoverContent>
</Popover>
)}
@@ -334,11 +328,7 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
{!isMobile && (
<div className="flex h-full flex-wrap content-start items-start justify-start gap-0.5 @2xl:mr-1 @2xl:justify-end">
<NewDatasetItemFromExistingObjectDialogController
- traceId={trace.id}
projectId={projectId}
- input={trace.input}
- output={trace.output}
- metadata={trace.metadata}
key={trace.id}
>
{({ openDialog }) => (
@@ -346,7 +336,14 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
projectId={projectId}
datasetItems={existingDatasetItems}
disabled={!hasDatasetAccess}
- onOpenDialog={openDialog}
+ onOpenDialog={() =>
+ openDialog({
+ traceId: trace.id,
+ input: trace.input,
+ output: trace.output,
+ metadata: trace.metadata,
+ })
+ }
>
{({ Anchor, openDropdown }) => (
<Anchor>
@@ -361,7 +358,12 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
}
captureNewDatasetItemFormOpen();
- openDialog();
+ openDialog({
+ traceId: trace.id,
+ input: trace.input,
+ output: trace.output,
+ metadata: trace.metadata,
+ });
}}
>
{!hasExistingDatasetItems && hasDatasetAccess ? (
@@ -390,26 +392,30 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
{/* Hide annotation buttons in annotation mode (panel shown separately) */}
{!isAnnotationMode && (
<div className="flex items-start">
- <AnnotateDrawerController
- key={"annotation-drawer-" + trace.id}
- projectId={projectId}
- scoreTarget={{
- type: "trace",
- traceId: trace.id,
- }}
- scores={traceScores}
- scoreMetadata={{
- projectId: projectId,
- environment: trace.environment,
- }}
- >
+ <AnnotateDrawerController projectId={projectId}>
{({ disabled, openDrawer }) => (
<Button
variant="secondary"
size="sm"
disabled={disabled}
className="rounded-r-none"
- onClick={openDrawer}
+ onClick={() =>
+ openDrawer({
+ scoreTarget: {
+ type: "trace",
+ traceId: trace.id,
+ },
+ scores: traceScores,
+ analyticsData: {
+ type: "trace",
+ source: "TraceDetail",
+ },
+ scoreMetadata: {
+ projectId,
+ environment: trace.environment,
+ },
+ })
+ }
>
{disabled ? (
<LockIcon className="mr-1.5 h-3 w-3" />
@@ -446,39 +452,26 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
</AnnotationQueueItemDropdownMenuController>
</div>
)}
- <CommentDrawerController
- projectId={projectId}
- objectId={trace.id}
- objectType="TRACE"
- count={commentCount}
- pendingSelection={pendingSelection}
- onSelectionUsed={onSelectionUsed}
- isOpen={isCommentDrawerOpen}
- onOpenChange={onCommentDrawerOpenChange}
+ <Button
+ type="button"
+ variant="secondary"
+ size="sm"
+ disabled={commentDrawerControl.disabled}
+ onClick={commentDrawerControl.openDrawer}
+ className="gap-1"
>
- {({ disabled, openDrawer }) => (
- <Button
- type="button"
- variant="secondary"
- size="sm"
- disabled={disabled}
- onClick={openDrawer}
- className="gap-1"
- >
- {disabled ? (
- <MessageSquareOff className="text-muted-foreground h-3.5 w-3.5" />
- ) : (
- <>
- <MessageSquare className="h-3.5 w-3.5" />
- <span>Add comment</span>
- {!!commentCount ? (
- <ActionButtonCountBadge count={commentCount} />
- ) : null}
- </>
- )}
- </Button>
+ {commentDrawerControl.disabled ? (
+ <MessageSquareOff className="text-muted-foreground h-3.5 w-3.5" />
+ ) : (
+ <>
+ <MessageSquare className="h-3.5 w-3.5" />
+ <span>Add comment</span>
+ {!!commentCount ? (
+ <ActionButtonCountBadge count={commentCount} />
+ ) : null}
+ </>
)}
- </CommentDrawerController>
+ </Button>
</div>
)}
</div>