Skip to content

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

refactor(web): Clean up `CreateNewAnnotationQueueItem` (#16556)

Ben Bachem71a1337505c7
diff --git a/web/src/components/session/SessionTraceActionButtons.tsx b/web/src/components/session/SessionTraceActionButtons.tsx
index 2722c7e1b0..6d8584e829 100644
--- a/web/src/components/session/SessionTraceActionButtons.tsx
+++ b/web/src/components/session/SessionTraceActionButtons.tsx
@@ -4,7 +4,10 @@ import { getNumberFromMap } from "@/src/utils/map-utils";
import { AnnotateDrawer } from "@/src/features/scores/components/AnnotateDrawer";
import { CommentDrawerButton } from "@/src/features/comments/CommentDrawerButton";
import { NewDatasetItemFromTraceId } from "@/src/components/session/NewDatasetItemFromTrace";
-import { CreateNewAnnotationQueueItem } from "@/src/features/annotation-queues/components/CreateNewAnnotationQueueItem";
+import { Button } from "@/src/components/ui/button";
+import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
+import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
+import { ChevronDown } from "lucide-react";
import { cn } from "@/src/utils/tailwind";
type TraceScores =
@@ -60,13 +63,28 @@ export function SessionTraceActionButtons({
environment: environment ?? undefined,
}}
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={traceId}
objectType="TRACE"
- variant="outline"
- size={size}
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="outline"
+ size={size}
+ disabled={disabled !== undefined}
+ className="rounded-l-none rounded-r-md border-l-2"
+ >
+ <span className="relative mr-1 text-xs">
+ <ChevronDown className="h-3 w-3" />
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="toolbar"
+ />
+ </span>
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</div>
<CommentDrawerButton
projectId={projectId}
diff --git a/web/src/components/session/index.tsx b/web/src/components/session/index.tsx
index 3aff58ba09..d093c1bfbc 100644
--- a/web/src/components/session/index.tsx
+++ b/web/src/components/session/index.tsx
@@ -25,6 +25,7 @@ import {
CopyIcon,
Download,
ExternalLinkIcon,
+ ListPlus,
MoreVertical,
} from "lucide-react";
import { useCopyToClipboard } from "@/src/hooks/useCopyToClipboard";
@@ -44,7 +45,8 @@ import {
TableViewPresetTableName,
normalizeLegacySessionPositionInTraceFilters,
} from "@langfuse/shared";
-import { CreateNewAnnotationQueueItem } from "@/src/features/annotation-queues/components/CreateNewAnnotationQueueItem";
+import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
+import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
import { WebCalloutButton } from "@/src/features/web-callouts/components/WebCalloutMenuItem";
import { TablePeekViewTraceDetail } from "@/src/components/table/peek/peek-trace-detail";
import { usePeekNavigation } from "@/src/components/table/peek/hooks/usePeekNavigation";
@@ -568,12 +570,27 @@ export const SessionPage: React.FC<{
}}
buttonVariant="outline"
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={sessionId}
objectType="SESSION"
- variant="outline"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="outline"
+ disabled={disabled !== undefined}
+ className="rounded-l-none rounded-r-md border-l-2"
+ >
+ <span className="relative mr-1 text-xs">
+ <ChevronDown className="h-3 w-3" />
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="toolbar"
+ />
+ </span>
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</div>
<div className="flex items-center">
<div className="mx-1">
@@ -623,13 +640,27 @@ export const SessionPage: React.FC<{
buttonVariant="outline"
layout="menu"
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={sessionId}
objectType="SESSION"
- variant="outline"
- layout="menu"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={disabled !== undefined}
+ className="w-full justify-start gap-2 font-normal"
+ >
+ <ListPlus className="h-4 w-4" />
+ <span className="text-sm">Add to queue</span>
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="menu"
+ />
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
<WebCalloutButton
projectId={projectId}
traceId={null}
@@ -1452,12 +1483,27 @@ const LoadedSessionEventsPage: React.FC<{
buttonVariant="outline"
showAnnotationCount={isModernSessionEnabled}
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={sessionId}
objectType="SESSION"
- variant="outline"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="outline"
+ disabled={disabled !== undefined}
+ className="rounded-l-none rounded-r-md border-l-2"
+ >
+ <span className="relative mr-1 text-xs">
+ <ChevronDown className="h-3 w-3" />
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="toolbar"
+ />
+ </span>
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</div>
{!isModernSessionEnabled ? (
<label className="flex items-center gap-1.5">
@@ -1530,13 +1576,27 @@ const LoadedSessionEventsPage: React.FC<{
layout="menu"
showAnnotationCount={isModernSessionEnabled}
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={sessionId}
objectType="SESSION"
- variant="outline"
- layout="menu"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={disabled !== undefined}
+ className="w-full justify-start gap-2 font-normal"
+ >
+ <ListPlus className="h-4 w-4" />
+ <span className="text-sm">Add to queue</span>
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="menu"
+ />
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
<WebCalloutButton
projectId={projectId}
traceId={null}
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.stories.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.stories.tsx
new file mode 100644
index 0000000000..e930b4c12b
--- /dev/null
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.stories.tsx
@@ -0,0 +1,40 @@
+import preview from "../../../../.storybook/preview";
+import { expect, within } from "storybook/test";
+
+import { AnnotationQueueItemCountBadge } from "./AnnotationQueueItemCountBadge";
+
+const meta = preview.meta({
+ component: AnnotationQueueItemCountBadge,
+});
+
+export const Toolbar = meta.story({
+ args: {
+ totalCount: 3,
+ layout: "toolbar",
+ },
+});
+
+export const Menu = meta.story({
+ args: {
+ totalCount: 3,
+ layout: "menu",
+ },
+});
+
+export const Empty = meta.story({
+ args: {
+ totalCount: 0,
+ layout: "toolbar",
+ },
+});
+
+export const CountIsCapped = meta.story({
+ name: "(Test) Caps Queue Count",
+ args: {
+ totalCount: 100,
+ layout: "menu",
+ },
+ play: async ({ canvasElement }) => {
+ await expect(within(canvasElement).getByText("99+")).toBeVisible();
+ },
+});
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx
new file mode 100644
index 0000000000..681aed491b
--- /dev/null
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemCountBadge.tsx
@@ -0,0 +1,26 @@
+import { cn } from "@/src/utils/tailwind";
+
+type AnnotationQueueItemCountBadgeProps = {
+ totalCount: number;
+ layout: "toolbar" | "menu";
+};
+
+export function AnnotationQueueItemCountBadge({
+ totalCount,
+ layout,
+}: AnnotationQueueItemCountBadgeProps) {
+ if (totalCount <= 0) return null;
+
+ return (
+ <span
+ className={cn(
+ "bg-primary text-primary-foreground flex items-center justify-center rounded-sm font-bold shadow-xs",
+ layout === "toolbar"
+ ? "absolute -top-1 left-2.5 h-3 min-w-3 px-0.5 text-[8px]"
+ : "ml-auto h-3.5 w-fit px-1 text-xs font-normal",
+ )}
+ >
+ {totalCount > 99 ? "99+" : totalCount}
+ </span>
+ );
+}
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx
new file mode 100644
index 0000000000..815547a2b0
--- /dev/null
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController.tsx
@@ -0,0 +1,123 @@
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+} from "@/src/components/ui/dropdown-menu";
+import {
+ AnnotationQueueItemMenuContent,
+ type AnnotationQueueItemMenuQueue,
+} from "@/src/features/annotation-queues/components/AnnotationQueueItemMenuContent";
+import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
+import { api, reportNonTrpcError } from "@/src/utils/api";
+import { type AnnotationQueueObjectType } from "@langfuse/shared";
+import { type ReactNode, useCallback, useState } from "react";
+import { useSession } from "next-auth/react";
+
+type AnnotationQueueItemDropdownMenuControllerProps = {
+ projectId: string;
+ objectId: string;
+ objectType: AnnotationQueueObjectType;
+ children: (control: {
+ disabled: { reason: string } | undefined;
+ totalCount: number;
+ }) => ReactNode;
+};
+
+export function AnnotationQueueItemDropdownMenuController({
+ projectId,
+ objectId,
+ objectType,
+ children,
+}: AnnotationQueueItemDropdownMenuControllerProps) {
+ const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+ const session = useSession();
+ const hasAccess = useHasProjectAccess({
+ projectId,
+ scope: "annotationQueues:CUD",
+ });
+ const queues = api.annotationQueues.byObjectId.useQuery(
+ { projectId, objectId, objectType },
+ {
+ enabled:
+ session.status === "authenticated" &&
+ Boolean(projectId) &&
+ Boolean(objectId),
+ },
+ );
+ const utils = api.useUtils();
+ const addToQueueMutation = api.annotationQueueItems.createMany.useMutation();
+ const removeFromQueueMutation =
+ api.annotationQueueItems.deleteMany.useMutation();
+
+ const handleQueueItemToggle = useCallback(
+ async (queueId: string, queueName: string, itemId?: string) => {
+ try {
+ if (!itemId) {
+ await addToQueueMutation.mutateAsync({
+ projectId,
+ objectIds: [objectId],
+ objectType,
+ queueId,
+ });
+ } else if (
+ confirm(
+ `Are you sure you want to remove this item from the queue "${queueName}"?`,
+ )
+ ) {
+ await removeFromQueueMutation.mutateAsync({
+ projectId,
+ itemIds: [itemId],
+ });
+ }
+
+ await utils.annotationQueues.byObjectId.invalidate({
+ projectId,
+ objectId,
+ objectType,
+ });
+ } catch (error) {
+ reportNonTrpcError(error, "annotation-queues");
+ }
+ },
+ [
+ addToQueueMutation,
+ objectId,
+ objectType,
+ projectId,
+ removeFromQueueMutation,
+ utils.annotationQueues,
+ ],
+ );
+
+ const isLoading = session.status !== "authenticated" || queues.isLoading;
+ const disabled =
+ !hasAccess || isLoading
+ ? {
+ reason: !hasAccess
+ ? "You don't have permission to add items to annotation queues."
+ : "Annotation queues are loading.",
+ }
+ : undefined;
+ const totalCount = queues.data?.totalCount ?? 0;
+
+ return (
+ <DropdownMenu
+ open={hasAccess && isDropdownOpen}
+ onOpenChange={(open) => {
+ if (hasAccess) setIsDropdownOpen(open);
+ }}
+ >
+ <DropdownMenuTrigger asChild>
+ {children({ disabled, totalCount })}
+ </DropdownMenuTrigger>
+ {!isLoading ? (
+ <AnnotationQueueItemMenuContent
+ projectId={projectId}
+ queues={
+ (queues.data?.queues ?? []) satisfies AnnotationQueueItemMenuQueue[]
+ }
+ onQueueItemToggle={handleQueueItemToggle}
+ />
+ ) : null}
+ </DropdownMenu>
+ );
+}
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemMenuContent.stories.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemMenuContent.stories.tsx
new file mode 100644
index 0000000000..c52b4ad5ab
--- /dev/null
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemMenuContent.stories.tsx
@@ -0,0 +1,90 @@
+import preview from "../../../../.storybook/preview";
+import {
+ DropdownMenu,
+ DropdownMenuTrigger,
+} from "@/src/components/ui/dropdown-menu";
+import { expect, fn, userEvent, within } from "storybook/test";
+
+import {
+ AnnotationQueueItemMenuContent,
+ type AnnotationQueueItemMenuQueue,
+} from "./AnnotationQueueItemMenuContent";
+
+const meta = preview.meta({
+ component: AnnotationQueueItemMenuContent,
+});
+
+const queues: AnnotationQueueItemMenuQueue[] = [
+ { id: "queue-1", name: "Support review", status: "ACTIVE" },
+ {
+ id: "queue-2",
+ name: "Quality audit",
+ itemId: "item-2",
+ status: "COMPLETED",
+ },
+];
+
+export const WithQueues = meta.story({
+ render: (args) => (
+ <DropdownMenu defaultOpen>
+ <DropdownMenuTrigger>Open queues</DropdownMenuTrigger>
+ <AnnotationQueueItemMenuContent {...args} />
+ </DropdownMenu>
+ ),
+ args: {
+ projectId: "project-1",
+ queues,
+ onQueueItemToggle: fn(),
+ },
+});
+
+export const Empty = meta.story({
+ render: (args) => (
+ <DropdownMenu defaultOpen>
+ <DropdownMenuTrigger>Open queues</DropdownMenuTrigger>
+ <AnnotationQueueItemMenuContent {...args} />
+ </DropdownMenu>
+ ),
+ args: {
+ projectId: "project-1",
+ queues: [],
+ onQueueItemToggle: fn(),
+ },
+});
+
+export const QueueCanBeToggled = meta.story({
+ name: "(Test) Toggles Queue",
+ render: (args) => (
+ <DropdownMenu defaultOpen>
+ <DropdownMenuTrigger>Open queues</DropdownMenuTrigger>
+ <AnnotationQueueItemMenuContent {...args} />
+ </DropdownMenu>
+ ),
+ args: {
+ projectId: "project-1",
+ queues,
+ onQueueItemToggle: fn(),
+ },
+ play: async ({ canvasElement, args }) => {
+ await userEvent.click(
+ within(canvasElement.ownerDocument.body).getByRole("menuitemcheckbox", {
+ name: /Support review/,
+ }),
+ );
+ await expect(args.onQueueItemToggle).toHaveBeenCalledWith(
+ "queue-1",
+ "Support review",
+ undefined,
+ );
+ await userEvent.click(
+ within(canvasElement.ownerDocument.body).getByRole("menuitemcheckbox", {
+ name: /Quality audit/,
+ }),
+ );
+ await expect(args.onQueueItemToggle).toHaveBeenCalledWith(
+ "queue-2",
+ "Quality audit",
+ "item-2",
+ );
+ },
+});
diff --git a/web/src/features/annotation-queues/components/AnnotationQueueItemMenuContent.tsx b/web/src/features/annotation-queues/components/AnnotationQueueItemMenuContent.tsx
new file mode 100644
index 0000000000..b026b66f9e
--- /dev/null
+++ b/web/src/features/annotation-queues/components/AnnotationQueueItemMenuContent.tsx
@@ -0,0 +1,79 @@
+import {
+ DropdownMenuCheckboxItem,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuSeparator,
+} from "@/src/components/ui/dropdown-menu";
+import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
+import { ExternalLink } from "lucide-react";
+import Link from "next/link";
+import { type MouseEvent } from "react";
+
+export type AnnotationQueueItemMenuQueue = {
+ id: string;
+ name: string;
+ itemId?: string;
+ status?: string;
+};
+
+type AnnotationQueueItemMenuContentProps = {
+ projectId: string;
+ queues: AnnotationQueueItemMenuQueue[];
+ onQueueItemToggle: (
+ queueId: string,
+ queueName: string,
+ itemId?: string,
+ ) => void;
+};
+
+export function AnnotationQueueItemMenuContent({
+ projectId,
+ queues,
+ onQueueItemToggle,
+}: AnnotationQueueItemMenuContentProps) {
+ const preventMenuItemAction = (event: MouseEvent) => {
+ event.preventDefault();
+ event.stopPropagation();
+ };
+
+ return (
+ <DropdownMenuContent className="max-h-[min(300px,var(--radix-dropdown-menu-content-available-height))] overflow-y-auto">
+ <DropdownMenuLabel>In queue(s)</DropdownMenuLabel>
+ {queues.length ? (
+ queues.map((queue) => (
+ <DropdownMenuCheckboxItem
+ key={queue.id}
+ className="hover:bg-accent"
+ checked={!!queue.itemId}
+ onSelect={(event) => event.preventDefault()}
+ onClick={(event) => {
+ preventMenuItemAction(event);
+ onQueueItemToggle(queue.id, queue.name, queue.itemId);
+ }}
+ >
+ {queue.name}
+ {queue.status ? (
+ <span className="ml-2">
+ <StatusBadge type={queue.status.toLowerCase()} isLive={false} />
+ </span>
+ ) : null}
+ </DropdownMenuCheckboxItem>
+ ))
+ ) : (
+ <DropdownMenuItem onClick={preventMenuItemAction}>
+ No queues defined
+ </DropdownMenuItem>
+ )}
+ <DropdownMenuSeparator />
+ <DropdownMenuItem className="hover:bg-accent" asChild>
+ <div>
+ <ExternalLink className="mr-2 h-4 w-4" />
+ <Link href={`/project/${projectId}/annotation-queues`}>
+ Manage queues
+ </Link>
+ </div>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ );
+}
diff --git a/web/src/features/annotation-queues/components/CreateNewAnnotationQueueItem.tsx b/web/src/features/annotation-queues/components/CreateNewAnnotationQueueItem.tsx
deleted file mode 100644
index 755146ea09..0000000000
--- a/web/src/features/annotation-queues/components/CreateNewAnnotationQueueItem.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
-import { StatusBadge } from "@/src/components/ui/StatusBadge/StatusBadge";
-import { Button, type ButtonProps } from "@/src/components/ui/button";
-import {
- DropdownMenuItem,
- DropdownMenu,
- DropdownMenuTrigger,
- DropdownMenuContent,
- DropdownMenuSeparator,
- DropdownMenuCheckboxItem,
- DropdownMenuLabel,
-} from "@/src/components/ui/dropdown-menu";
-import { useHasProjectAccess } from "@/src/features/rbac/utils/checkProjectAccess";
-import { api, reportNonTrpcError } from "@/src/utils/api";
-import { type AnnotationQueueObjectType } from "@langfuse/shared";
-import { ChevronDown, ExternalLink, ListPlus } from "lucide-react";
-import { useSession } from "next-auth/react";
-import Link from "next/link";
-import { useState, useCallback } from "react";
-
-export const CreateNewAnnotationQueueItem = ({
- projectId,
- objectId,
- objectType,
- variant = "secondary",
- size = "default",
- layout = "toolbar",
-}: {
- projectId: string;
- objectId: string;
- objectType: AnnotationQueueObjectType;
- variant?: ButtonProps["variant"];
- size?: ButtonProps["size"];
- /**
- * "toolbar" (default) is the inline split-button chevron; "menu" renders the
- * same dropdown trigger as a full-width labeled row ("Add to queue") for the
- * mobile header overflow popover.
- */
- layout?: "toolbar" | "menu";
-}) => {
- const isMenu = layout === "menu";
- const [isDropdownOpen, setIsDropdownOpen] = useState(false);
- const session = useSession();
- const hasAccess = useHasProjectAccess({
- projectId: projectId,
- scope: "annotationQueues:CUD",
- });
- const queues = api.annotationQueues.byObjectId.useQuery(
- {
- projectId,
- objectId,
- objectType,
- },
- {
- enabled:
- session.status === "authenticated" &&
- Boolean(projectId) &&
- Boolean(objectId),
- },
- );
- const utils = api.useUtils();
- const addToQueueMutation = api.annotationQueueItems.createMany.useMutation();
- const removeFromQueueMutation =
- api.annotationQueueItems.deleteMany.useMutation();
-
- const handleQueueItemToggle = useCallback(
- async (queueId: string, queueName: string, itemId?: string) => {
- try {
- if (!itemId) {
- await addToQueueMutation.mutateAsync({
- projectId,
- objectIds: [objectId],
- objectType,
- queueId,
- });
- } else {
- const confirmRemoval = confirm(
- `Are you sure you want to remove this item from the queue "${queueName}"?`,
- );
- if (confirmRemoval) {
- await removeFromQueueMutation.mutateAsync({
- projectId,
- itemIds: [itemId],
- });
- }
- }
- // Manually invalidate the query to refresh the data
- await utils.annotationQueues.byObjectId.invalidate({
- projectId,
- objectId,
- objectType,
- });
- } catch (error) {
- reportNonTrpcError(error, "annotation-queues");
- }
- },
- [
- addToQueueMutation,
- removeFromQueueMutation,
- projectId,
- objectId,
- objectType,
- utils.annotationQueues,
- ],
- );
-
- if (session.status !== "authenticated" || queues.isLoading) {
- return (
- <Button
- variant={isMenu ? "ghost" : variant}
- size={isMenu ? "sm" : size}
- disabled={session.status !== "authenticated"}
- className={
- isMenu
- ? "w-full justify-start gap-2 font-normal"
- : "rounded-l-none rounded-r-md border-l-2"
- }
- >
- {isMenu ? (
- <>
- <ListPlus className="h-4 w-4" />
- <span className="text-sm">Add to queue</span>
- </>
- ) : (
- <span className="relative mr-1 text-xs">
- <ChevronDown className="h-3 w-3" />
- </span>
- )}
- </Button>
- );
- }
-
- return (
- <DropdownMenu
- key="queue"
- open={isDropdownOpen}
- onOpenChange={() => {
- if (hasAccess) {
- setIsDropdownOpen(!isDropdownOpen);
- }
- }}
- >
- <DropdownMenuTrigger asChild>
- <Button
- variant={isMenu ? "ghost" : variant}
- size={isMenu ? "sm" : size}
- disabled={!hasAccess}
- className={
- isMenu
- ? "w-full justify-start gap-2 font-normal"
- : "rounded-l-none rounded-r-md border-l-2"
- }
- >
- {isMenu ? (
- <>
- <ListPlus className="h-4 w-4" />
- <span className="text-sm">Add to queue</span>
- {!!queues.data?.totalCount && (
- <span className="bg-primary/50 text-primary-foreground ml-auto flex h-3.5 w-fit items-center justify-center rounded-sm px-1 text-xs shadow-xs">
- {queues.data.totalCount > 99 ? "99+" : queues.data.totalCount}
- </span>
- )}
- </>
- ) : queues.data?.totalCount ? (
- <span className="relative mr-1 text-xs">
- <ChevronDown className="text-secondary-foreground h-3 w-3" />
- <span className="bg-primary text-primary-foreground absolute -top-1 left-2.5 flex h-3 min-w-3 items-center justify-center rounded-sm px-0.5 text-[8px] font-bold shadow-xs">
- {queues.data?.totalCount > 99 ? "99+" : queues.data?.totalCount}
- </span>
- </span>
- ) : (
- <span className="relative mr-1 text-xs">
- <ChevronDown className="h-3 w-3" />
- </span>
- )}
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent className="max-h-[min(300px,var(--radix-dropdown-menu-content-available-height))] overflow-y-auto">
- <DropdownMenuLabel>In queue(s)</DropdownMenuLabel>
- {queues.data?.queues.length ? (
- queues.data?.queues.map((queue) => (
- <DropdownMenuCheckboxItem
- key={queue.id}
- className="hover:bg-accent"
- checked={!!queue.itemId}
- onSelect={(event) => {
- event.preventDefault();
- }}
- onClick={(event) => {
- event.preventDefault();
- event.stopPropagation();
- handleQueueItemToggle(queue.id, queue.name, queue.itemId);
- }}
- >
- {queue.name}
- {queue.status && (
- <span className="ml-2">
- <StatusBadge
- type={queue.status.toLowerCase()}
- isLive={false}
- />
- </span>
- )}
- </DropdownMenuCheckboxItem>
- ))
- ) : (
- <DropdownMenuItem
- onClick={(event) => {
- event.preventDefault();
- event.stopPropagation();
- }}
- >
- No queues defined
- </DropdownMenuItem>
- )}
- <DropdownMenuSeparator />
- <DropdownMenuItem
- key="manage-queues"
- className="hover:bg-accent"
- asChild
- >
- <div>
- <ExternalLink className="mr-2 h-4 w-4" />
- <Link href={`/project/${projectId}/annotation-queues`}>
- Manage queues
- </Link>
- </div>
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
- );
-};
diff --git a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx
index b5b0cc7226..974be85f27 100644
--- a/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx
+++ b/web/src/features/traces/components/ObservationDetailView/components/ObservationDetailViewHeader.tsx
@@ -22,7 +22,8 @@ import { ItemBadge } from "@/src/components/ItemBadge";
import { LocalIsoDate } from "@/src/components/LocalIsoDate";
import { NewDatasetItemFromExistingObject } from "@/src/features/datasets/components/NewDatasetItemFromExistingObject";
import { AnnotateDrawer } from "@/src/features/scores/components/AnnotateDrawer";
-import { CreateNewAnnotationQueueItem } from "@/src/features/annotation-queues/components/CreateNewAnnotationQueueItem";
+import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
+import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
import { CommentDrawerButton } from "@/src/features/comments/CommentDrawerButton";
import { JumpToPlaygroundButton } from "@/src/features/playground/page/components/JumpToPlaygroundButton";
import { PromptBadge } from "@/src/features/traces/components/PromptBadge";
@@ -50,7 +51,13 @@ import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferenc
import { useV4Beta } from "@/src/features/events/hooks/useV4Beta";
import { useTraceData } from "@/src/features/traces/contexts/TraceDataContext";
import { Button } from "@/src/components/ui/button";
-import { LockIcon, MoreHorizontal, SquarePen } from "lucide-react";
+import {
+ ChevronDown,
+ ListPlus,
+ LockIcon,
+ MoreHorizontal,
+ SquarePen,
+} from "lucide-react";
import {
Drawer,
DrawerContent,
@@ -243,12 +250,27 @@ export const ObservationDetailViewHeader = memo(
layout="menu"
/>
)}
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={observation.id}
objectType={AnnotationQueueObjectType.OBSERVATION}
- layout="menu"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={disabled !== undefined}
+ className="w-full justify-start gap-2 font-normal"
+ >
+ <ListPlus className="h-4 w-4" />
+ <span className="text-sm">Add to queue</span>
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="menu"
+ />
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</>
)}
{observationWithIO &&
@@ -339,12 +361,28 @@ export const ObservationDetailViewHeader = memo(
size="sm"
/>
)}
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={observation.id}
objectType={AnnotationQueueObjectType.OBSERVATION}
- size="sm"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="secondary"
+ size="sm"
+ disabled={disabled !== undefined}
+ className="rounded-l-none rounded-r-md border-l-2"
+ >
+ <span className="relative mr-1 text-xs">
+ <ChevronDown className="h-3 w-3" />
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="toolbar"
+ />
+ </span>
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</div>
)}
{observationWithIO &&
diff --git a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
index b3b4213ac8..b16a68a4aa 100644
--- a/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
+++ b/web/src/features/traces/components/TraceDetailView/components/TraceDetailViewHeader.tsx
@@ -24,7 +24,8 @@ import { LocalIsoDate } from "@/src/components/LocalIsoDate";
import { DetailHeaderActionsMenu } from "@/src/features/traces/components/DetailHeaderActionsMenu";
import { NewDatasetItemFromExistingObject } from "@/src/features/datasets/components/NewDatasetItemFromExistingObject";
import { AnnotateDrawer } from "@/src/features/scores/components/AnnotateDrawer";
-import { CreateNewAnnotationQueueItem } from "@/src/features/annotation-queues/components/CreateNewAnnotationQueueItem";
+import { AnnotationQueueItemDropdownMenuController } from "@/src/features/annotation-queues/components/AnnotationQueueItemDropdownMenuController";
+import { AnnotationQueueItemCountBadge } from "@/src/features/annotation-queues/components/AnnotationQueueItemCountBadge";
import { CommentDrawerButton } from "@/src/features/comments/CommentDrawerButton";
import {
SessionBadge,
@@ -42,7 +43,7 @@ import { useViewPreferences } from "@/src/features/traces/contexts/ViewPreferenc
import { CollapsibleBadgeRow } from "@/src/features/traces/components/CollapsibleBadgeRow";
import { useIsMobile } from "@/src/hooks/use-mobile";
import { Button } from "@/src/components/ui/button";
-import { MoreHorizontal } from "lucide-react";
+import { ChevronDown, ListPlus, MoreHorizontal } from "lucide-react";
import {
Popover,
PopoverContent,
@@ -161,12 +162,27 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
}}
layout="menu"
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={trace.id}
objectType={AnnotationQueueObjectType.TRACE}
- layout="menu"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="ghost"
+ size="sm"
+ disabled={disabled !== undefined}
+ className="w-full justify-start gap-2 font-normal"
+ >
+ <ListPlus className="h-4 w-4" />
+ <span className="text-sm">Add to queue</span>
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="menu"
+ />
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</>
)}
<CommentDrawerButton
@@ -213,12 +229,28 @@ export const TraceDetailViewHeader = memo(function TraceDetailViewHeader({
}}
size="sm"
/>
- <CreateNewAnnotationQueueItem
+ <AnnotationQueueItemDropdownMenuController
projectId={projectId}
objectId={trace.id}
objectType={AnnotationQueueObjectType.TRACE}
- size="sm"
- />
+ >
+ {({ disabled, totalCount }) => (
+ <Button
+ variant="secondary"
+ size="sm"
+ disabled={disabled !== undefined}
+ className="rounded-l-none rounded-r-md border-l-2"
+ >
+ <span className="relative mr-1 text-xs">
+ <ChevronDown className="h-3 w-3" />
+ <AnnotationQueueItemCountBadge
+ totalCount={totalCount}
+ layout="toolbar"
+ />
+ </span>
+ </Button>
+ )}
+ </AnnotationQueueItemDropdownMenuController>
</div>
)}
<CommentDrawerButton