Skip to content

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

fix(playground): close tools/schema popover when opening the create/edit dialog (#17046)

Nimarb01f962e5e3c
diff --git a/web/src/features/experiments/components/steps/PromptModelStep.tsx b/web/src/features/experiments/components/steps/PromptModelStep.tsx
index 1983c25f19..56f207bb28 100644
--- a/web/src/features/experiments/components/steps/PromptModelStep.tsx
+++ b/web/src/features/experiments/components/steps/PromptModelStep.tsx
@@ -73,6 +73,19 @@ export const PromptModelStep: React.FC<PromptModelStepProps> = ({
const [open, setOpen] = useState(false);
const [selectedSchema, setSelectedSchema] = useState<LlmSchema | null>(null);
const [schemaPopoverOpen, setSchemaPopoverOpen] = useState(false);
+ const [schemaDialogOpen, setSchemaDialogOpen] = useState(false);
+ const [schemaDialogRequest, setSchemaDialogRequest] = useState<{
+ id: number;
+ existingLlmSchema: LlmSchema | null;
+ }>();
+
+ const openSchemaDialog = (existingLlmSchema: LlmSchema | null) => {
+ setSchemaDialogRequest((previous) => ({
+ id: (previous?.id ?? 0) + 1,
+ existingLlmSchema,
+ }));
+ setSchemaDialogOpen(true);
+ };
const hasToolStructuredOutputConflict = hasPromptToolStructuredOutputConflict(
selectedPromptToolConfig,
structuredOutputEnabled,
@@ -375,46 +388,46 @@ export const PromptModelStep: React.FC<PromptModelStepProps> = ({
</Popover>
{selectedSchema && (
- <CreateOrEditLLMSchemaDialog
- projectId={projectId}
- existingLlmSchema={selectedSchema}
- onSave={(updatedSchema) => {
- setSelectedSchema(updatedSchema);
- setSelectedSchemaName(updatedSchema.name);
- field.onChange(
- updatedSchema.schema as Record<string, unknown>,
- );
- }}
- onDelete={() => {
- setSelectedSchema(null);
- setSelectedSchemaName(null);
- field.onChange(undefined);
- }}
+ <Button
+ variant="ghost"
+ size="icon"
+ aria-label={`View schema ${selectedSchema.name}`}
+ onClick={() => openSchemaDialog(selectedSchema)}
>
- <Button variant="ghost" size="icon">
- <EyeIcon className="h-4 w-4" />
- </Button>
- </CreateOrEditLLMSchemaDialog>
+ <EyeIcon className="h-4 w-4" />
+ </Button>
)}
</div>
) : (
+ <Button
+ variant="outline"
+ className="w-full"
+ onClick={() => openSchemaDialog(null)}
+ >
+ <PlusIcon className="mr-2 h-4 w-4" />
+ Add schema
+ </Button>
+ )}
+ {schemaDialogRequest && (
<CreateOrEditLLMSchemaDialog
+ key={schemaDialogRequest.id}
projectId={projectId}
- onSave={(newSchema) => {
- setSelectedSchema(newSchema);
- setSelectedSchemaName(newSchema.name);
- field.onChange(
- newSchema.schema as Record<string, unknown>,
- );
- // Toggle is already ON if we're seeing this button
- // No need to set it again
+ open={schemaDialogOpen}
+ onOpenChange={setSchemaDialogOpen}
+ existingLlmSchema={
+ schemaDialogRequest.existingLlmSchema ?? undefined
+ }
+ onSave={(schema) => {
+ setSelectedSchema(schema);
+ setSelectedSchemaName(schema.name);
+ field.onChange(schema.schema as Record<string, unknown>);
}}
- >
- <Button variant="outline" className="w-full">
- <PlusIcon className="mr-2 h-4 w-4" />
- Add schema
- </Button>
- </CreateOrEditLLMSchemaDialog>
+ onDelete={() => {
+ setSelectedSchema(null);
+ setSelectedSchemaName(null);
+ field.onChange(undefined);
+ }}
+ />
)}
</>
)}
diff --git a/web/src/features/playground/page/components/ConfigurationDropdowns.tsx b/web/src/features/playground/page/components/ConfigurationDropdowns.tsx
index bd6cff945d..4abd878e23 100644
--- a/web/src/features/playground/page/components/ConfigurationDropdowns.tsx
+++ b/web/src/features/playground/page/components/ConfigurationDropdowns.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
import { Button } from "@/src/components/ui/button";
import { Badge } from "@/src/components/ui/badge";
import { ChevronDown, Wrench, Braces, Variable } from "lucide-react";
@@ -9,13 +9,48 @@ import {
} from "@/src/components/ui/popover";
import { usePlaygroundContext } from "../context";
import { usePlaygroundWindowSize } from "../hooks/usePlaygroundWindowSize";
-import { PlaygroundTools, PlaygroundToolsPopover } from "./PlaygroundTools";
+import {
+ PlaygroundTools,
+ PlaygroundToolsPopover,
+ type PlaygroundToolDialogRequest,
+} from "./PlaygroundTools";
import {
StructuredOutputSchemaSection,
StructuredOutputSchemaPopover,
+ type StructuredOutputSchemaDialogRequest,
} from "./StructuredOutputSchemaSection";
import { Variables } from "./Variables";
import { MessagePlaceholders } from "./MessagePlaceholders";
+import { CreateOrEditLLMToolDialog } from "./CreateOrEditLLMToolDialog";
+import { CreateOrEditLLMSchemaDialog } from "./CreateOrEditLLMSchemaDialog";
+import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
+
+function usePopoverToDialog<T>() {
+ const [popoverOpen, setPopoverOpen] = useState(false);
+ const [dialogOpen, setDialogOpen] = useState(false);
+ const [request, setRequest] = useState<{ id: number; payload: T }>();
+
+ const openDialog = (payload: T) => {
+ setPopoverOpen(false);
+ setRequest((previous) => ({ id: (previous?.id ?? 0) + 1, payload }));
+ setDialogOpen(true);
+ };
+
+ const handleDialogOpenChange = (open: boolean) => {
+ if (open) return;
+ setDialogOpen(false);
+ setPopoverOpen(true);
+ };
+
+ return {
+ popoverOpen,
+ setPopoverOpen,
+ request,
+ dialogOpen,
+ openDialog,
+ handleDialogOpenChange,
+ };
+}
export const ConfigurationDropdowns: React.FC = () => {
const { containerRef, width, isVeryCompact, isCompact } =
@@ -26,6 +61,10 @@ export const ConfigurationDropdowns: React.FC = () => {
promptVariables,
messagePlaceholders,
} = usePlaygroundContext();
+ const projectId = useProjectIdFromURL();
+ const toolsOverlay = usePopoverToDialog<PlaygroundToolDialogRequest>();
+ const schemaOverlay =
+ usePopoverToDialog<StructuredOutputSchemaDialogRequest>();
const toolsCount = tools.length;
const hasSchema = structuredOutputSchema ? 1 : 0;
@@ -62,7 +101,10 @@ export const ConfigurationDropdowns: React.FC = () => {
<div ref={containerRef} className="bg-muted/25 shrink-0 border-b px-3 py-2">
<div className="flex items-center justify-start gap-2">
{/* Tools Dropdown */}
- <Popover>
+ <Popover
+ open={toolsOverlay.popoverOpen}
+ onOpenChange={toolsOverlay.setPopoverOpen}
+ >
<PopoverTrigger asChild>
<Button variant="outline" size="sm" className="h-8 gap-2">
{getResponsiveContent("Tools", Wrench)}
@@ -87,7 +129,7 @@ export const ConfigurationDropdowns: React.FC = () => {
</div>
{toolsCount > 0 ? (
<div className="mb-3">
- <PlaygroundTools />
+ <PlaygroundTools onOpenToolDialog={toolsOverlay.openDialog} />
</div>
) : (
<div className="mb-3">
@@ -97,13 +139,30 @@ export const ConfigurationDropdowns: React.FC = () => {
</div>
)}
<div className="border-t pt-3">
- <PlaygroundToolsPopover />
+ <PlaygroundToolsPopover
+ onOpenToolDialog={toolsOverlay.openDialog}
+ />
</div>
</PopoverContent>
</Popover>
+ {toolsOverlay.request && projectId && (
+ <CreateOrEditLLMToolDialog
+ key={`tool-${toolsOverlay.request.id}`}
+ projectId={projectId}
+ open={toolsOverlay.dialogOpen}
+ onOpenChange={toolsOverlay.handleDialogOpenChange}
+ onSave={toolsOverlay.request.payload.onSave}
+ onDelete={toolsOverlay.request.payload.onDelete}
+ existingLlmTool={toolsOverlay.request.payload.existingLlmTool}
+ defaultValues={toolsOverlay.request.payload.defaultValues}
+ />
+ )}
{/* Structured Output Dropdown */}
- <Popover>
+ <Popover
+ open={schemaOverlay.popoverOpen}
+ onOpenChange={schemaOverlay.setPopoverOpen}
+ >
<PopoverTrigger asChild>
<Button variant="outline" size="sm" className="h-8 gap-2">
{getResponsiveContent("Schema", Braces)}
@@ -124,7 +183,9 @@ export const ConfigurationDropdowns: React.FC = () => {
</div>
{structuredOutputSchema ? (
<div className="mb-3">
- <StructuredOutputSchemaSection />
+ <StructuredOutputSchemaSection
+ onOpenSchemaDialog={schemaOverlay.openDialog}
+ />
</div>
) : (
<div className="mb-3">
@@ -134,10 +195,24 @@ export const ConfigurationDropdowns: React.FC = () => {
</div>
)}
<div className="border-t pt-3">
- <StructuredOutputSchemaPopover />
+ <StructuredOutputSchemaPopover
+ onOpenSchemaDialog={schemaOverlay.openDialog}
+ />
</div>
</PopoverContent>
</Popover>
+ {schemaOverlay.request && projectId && (
+ <CreateOrEditLLMSchemaDialog
+ key={`schema-${schemaOverlay.request.id}`}
+ projectId={projectId}
+ open={schemaOverlay.dialogOpen}
+ onOpenChange={schemaOverlay.handleDialogOpenChange}
+ onSave={schemaOverlay.request.payload.onSave}
+ onDelete={schemaOverlay.request.payload.onDelete}
+ existingLlmSchema={schemaOverlay.request.payload.existingLlmSchema}
+ defaultValues={schemaOverlay.request.payload.defaultValues}
+ />
+ )}
{/* Variables & Placeholders Dropdown */}
<Popover>
diff --git a/web/src/features/playground/page/components/CreateOrEditLLMSchemaDialog.tsx b/web/src/features/playground/page/components/CreateOrEditLLMSchemaDialog.tsx
index b6caf283dd..210573ac78 100644
--- a/web/src/features/playground/page/components/CreateOrEditLLMSchemaDialog.tsx
+++ b/web/src/features/playground/page/components/CreateOrEditLLMSchemaDialog.tsx
@@ -1,5 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { ArrowUpRight } from "lucide-react";
@@ -14,7 +13,6 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
- DialogTrigger,
} from "@/src/components/ui/dialog";
import {
Form,
@@ -43,7 +41,6 @@ const formSchema = z.object({
type FormValues = z.infer<typeof formSchema>;
type CreateOrEditLLMSchemaDialog = {
- children: React.ReactNode;
projectId: string;
onSave: (llmSchema: LlmSchema) => void;
onDelete?: (llmSchema: LlmSchema) => void;
@@ -53,20 +50,20 @@ type CreateOrEditLLMSchemaDialog = {
description: string;
schema: string;
};
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
};
export const CreateOrEditLLMSchemaDialog: React.FC<
CreateOrEditLLMSchemaDialog
> = (props) => {
- const { children, projectId, onSave, existingLlmSchema } = props;
+ const { projectId, onSave, existingLlmSchema, open, onOpenChange } = props;
const utils = api.useUtils();
const createLlmSchema = api.llmSchemas.create.useMutation();
const updateLlmSchema = api.llmSchemas.update.useMutation();
const deleteLlmSchema = api.llmSchemas.delete.useMutation();
- const [open, setOpen] = useState(false);
-
const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: props.defaultValues ?? {
@@ -118,7 +115,7 @@ export const CreateOrEditLLMSchemaDialog: React.FC<
await utils.llmSchemas.getAll.invalidate({ projectId });
onSave(result);
- setOpen(false);
+ onOpenChange(false);
}
async function handleDelete() {
@@ -132,7 +129,7 @@ export const CreateOrEditLLMSchemaDialog: React.FC<
props.onDelete?.(existingLlmSchema);
await utils.llmSchemas.getAll.invalidate({ projectId });
- setOpen(false);
+ onOpenChange(false);
}
const prettifyJson = () => {
@@ -151,9 +148,11 @@ export const CreateOrEditLLMSchemaDialog: React.FC<
};
return (
- <Dialog open={open} onOpenChange={setOpen}>
- <DialogTrigger asChild>{children}</DialogTrigger>
- <DialogContent className="flex flex-col sm:min-w-128 md:min-w-160">
+ <Dialog open={open} onOpenChange={onOpenChange}>
+ <DialogContent
+ className="flex flex-col sm:min-w-128 md:min-w-160"
+ onClick={(e) => e.stopPropagation()}
+ >
<DialogHeader>
<DialogTitle>
{existingLlmSchema ? "Edit LLM Schema" : "Create LLM Schema"}
@@ -279,7 +278,7 @@ export const CreateOrEditLLMSchemaDialog: React.FC<
<Button
type="button"
variant="outline"
- onClick={() => setOpen(false)}
+ onClick={() => onOpenChange(false)}
>
Cancel
</Button>
diff --git a/web/src/features/playground/page/components/CreateOrEditLLMToolDialog.tsx b/web/src/features/playground/page/components/CreateOrEditLLMToolDialog.tsx
index c77bb1bd95..de0ab37891 100644
--- a/web/src/features/playground/page/components/CreateOrEditLLMToolDialog.tsx
+++ b/web/src/features/playground/page/components/CreateOrEditLLMToolDialog.tsx
@@ -1,5 +1,4 @@
-/* eslint-disable @repo/no-abstracted-overlay-trigger */
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from "react";
import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { ArrowUpRight } from "lucide-react";
@@ -14,7 +13,6 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
- DialogTrigger,
} from "@/src/components/ui/dialog";
import {
Form,
@@ -43,7 +41,6 @@ const formSchema = z.object({
type FormValues = z.infer<typeof formSchema>;
type CreateOrEditLLMToolDialog = {
- children: React.ReactNode;
projectId: string;
onSave: (llmTool: LlmTool) => void;
onDelete?: (llmTool: LlmTool) => void;
@@ -53,20 +50,20 @@ type CreateOrEditLLMToolDialog = {
description: string;
parameters: string;
};
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
};
export const CreateOrEditLLMToolDialog: React.FC<CreateOrEditLLMToolDialog> = (
props,
) => {
- const { children, projectId, onSave, existingLlmTool } = props;
+ const { projectId, onSave, existingLlmTool, open, onOpenChange } = props;
const utils = api.useUtils();
const createLlmTool = api.llmTools.create.useMutation();
const updateLlmTool = api.llmTools.update.useMutation();
const deleteLlmTool = api.llmTools.delete.useMutation();
- const [open, setOpen] = useState(false);
-
const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: props.defaultValues ?? {
@@ -118,7 +115,7 @@ export const CreateOrEditLLMToolDialog: React.FC<CreateOrEditLLMToolDialog> = (
await utils.llmTools.getAll.invalidate({ projectId });
onSave(result);
- setOpen(false);
+ onOpenChange(false);
}
async function handleDelete() {
@@ -132,7 +129,7 @@ export const CreateOrEditLLMToolDialog: React.FC<CreateOrEditLLMToolDialog> = (
props.onDelete?.(existingLlmTool);
await utils.llmTools.getAll.invalidate({ projectId });
- setOpen(false);
+ onOpenChange(false);
}
const prettifyJson = () => {
@@ -151,10 +148,7 @@ export const CreateOrEditLLMToolDialog: React.FC<CreateOrEditLLMToolDialog> = (
};
return (
- <Dialog open={open} onOpenChange={setOpen}>
- <DialogTrigger asChild onClick={(e) => e.stopPropagation()}>
- {children}
- </DialogTrigger>
+ <Dialog open={open} onOpenChange={onOpenChange}>
<DialogContent
className="flex flex-col sm:min-w-128 md:min-w-160"
onClick={(e) => e.stopPropagation()}
@@ -283,7 +277,7 @@ export const CreateOrEditLLMToolDialog: React.FC<CreateOrEditLLMToolDialog> = (
<Button
type="button"
variant="outline"
- onClick={() => setOpen(false)}
+ onClick={() => onOpenChange(false)}
>
Cancel
</Button>
diff --git a/web/src/features/playground/page/components/PlaygroundTools/index.tsx b/web/src/features/playground/page/components/PlaygroundTools/index.tsx
index 93aec7d2de..1c0b0b1b1c 100644
--- a/web/src/features/playground/page/components/PlaygroundTools/index.tsx
+++ b/web/src/features/playground/page/components/PlaygroundTools/index.tsx
@@ -7,7 +7,6 @@ import { PlusIcon, PencilIcon, MinusCircle, WrenchIcon } from "lucide-react";
import { type LlmTool } from "@prisma/client";
import { api } from "@/src/utils/api";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
-import { CreateOrEditLLMToolDialog } from "@/src/features/playground/page/components/CreateOrEditLLMToolDialog";
import {
Command,
CommandEmpty,
@@ -20,8 +19,25 @@ import {
import { type PlaygroundTool } from "@/src/features/playground/page/types";
+export type PlaygroundToolDialogRequest = {
+ existingLlmTool?: LlmTool;
+ defaultValues?: {
+ name: string;
+ description: string;
+ parameters: string;
+ };
+ onSave: (llmTool: LlmTool) => void;
+ onDelete?: (llmTool: LlmTool) => void;
+};
+
+type PlaygroundToolsPopoverProps = {
+ onOpenToolDialog: (request: PlaygroundToolDialogRequest) => void;
+};
+
// Popover content component for use in CollapsibleSection action buttons
-export const PlaygroundToolsPopover = () => {
+export const PlaygroundToolsPopover = ({
+ onOpenToolDialog,
+}: PlaygroundToolsPopoverProps) => {
const { setTools } = usePlaygroundContext();
const projectId = useProjectIdFromURL();
@@ -105,43 +121,52 @@ export const PlaygroundToolsPopover = () => {
</div>
</div>
</div>
- <CreateOrEditLLMToolDialog
- projectId={projectId as string}
- onSave={handleSelectTool}
- onDelete={() => handleRemoveTool(tool.id)}
- existingLlmTool={tool}
+ <Button
+ variant="ghost"
+ size="icon"
+ className="ml-2 h-7 w-7 shrink-0"
+ aria-label={`Edit tool ${tool.name}`}
+ onClick={(e) => {
+ e.stopPropagation();
+ onOpenToolDialog({
+ existingLlmTool: tool,
+ onSave: handleSelectTool,
+ onDelete: () => handleRemoveTool(tool.id),
+ });
+ }}
>
- <Button
- variant="ghost"
- size="icon"
- className="ml-2 h-7 w-7 shrink-0"
- onClick={(e) => e.stopPropagation()}
- >
- <PencilIcon className="h-3.5 w-3.5" />
- </Button>
- </CreateOrEditLLMToolDialog>
+ <PencilIcon className="h-3.5 w-3.5" />
+ </Button>
</CommandItem>
))}
</CommandGroup>
<CommandSeparator />
</CommandList>
<div className="mt-auto p-1">
- <CreateOrEditLLMToolDialog
- projectId={projectId as string}
- onSave={handleSelectTool}
+ <Button
+ variant="outline"
+ size="default"
+ className="w-full"
+ onClick={() =>
+ onOpenToolDialog({
+ onSave: handleSelectTool,
+ })
+ }
>
- <Button variant="outline" size="default" className="w-full">
- <PlusIcon className="mr-2 h-4 w-4" />
- Create new tool
- </Button>
- </CreateOrEditLLMToolDialog>
+ <PlusIcon className="mr-2 h-4 w-4" />
+ Create new tool
+ </Button>
</div>
</Command>
);
};
+type PlaygroundToolsProps = {
+ onOpenToolDialog: (request: PlaygroundToolDialogRequest) => void;
+};
+
// Main component for embedding in CollapsibleSection content
-export const PlaygroundTools = () => {
+export const PlaygroundTools = ({ onOpenToolDialog }: PlaygroundToolsProps) => {
const { tools, setTools } = usePlaygroundContext();
const projectId = useProjectIdFromURL();
@@ -236,24 +261,27 @@ export const PlaygroundTools = () => {
</div>
) : (
<div className="space-y-1">
- {tools.map((tool) => (
- <CreateOrEditLLMToolDialog
- key={tool.id}
- projectId={projectId as string}
- onSave={handleSelectTool}
- onDelete={() => handleRemoveTool(tool.id)}
- existingLlmTool={tool.existingLlmTool}
- defaultValues={
- !isToolSaved(tool)
+ {tools.map((tool) => {
+ const openAttachedTool = () =>
+ onOpenToolDialog({
+ existingLlmTool: tool.existingLlmTool,
+ defaultValues: !isToolSaved(tool)
? {
name: tool.name,
description: tool.description,
parameters: JSON.stringify(tool.parameters, null, 2),
}
- : undefined
- }
- >
- <div className="bg-background hover:bg-accent/50 relative cursor-pointer rounded-md border p-2 pr-10 transition-colors duration-200">
+ : undefined,
+ onSave: handleSelectTool,
+ onDelete: () => handleRemoveTool(tool.id),
+ });
+
+ return (
+ <div
+ key={tool.id}
+ className="bg-background hover:bg-accent/50 relative cursor-pointer rounded-md border p-2 pr-10 transition-colors duration-200"
+ onClick={openAttachedTool}
+ >
<Button
variant="ghost"
size="sm"
@@ -290,8 +318,8 @@ export const PlaygroundTools = () => {
</p>
</div>
</div>
- </CreateOrEditLLMToolDialog>
- ))}
+ );
+ })}
</div>
)}
</ScrollArea>
diff --git a/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx b/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx
index 6070358e34..fe3f7f1410 100644
--- a/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx
+++ b/web/src/features/playground/page/components/StructuredOutputSchemaSection.tsx
@@ -7,7 +7,6 @@ import { PlusIcon, PencilIcon, MinusCircle, BoxIcon } from "lucide-react";
import { type LlmSchema } from "@langfuse/shared";
import { api } from "@/src/utils/api";
import useProjectIdFromURL from "@/src/hooks/useProjectIdFromURL";
-import { CreateOrEditLLMSchemaDialog } from "@/src/features/playground/page/components/CreateOrEditLLMSchemaDialog";
import {
Command,
CommandEmpty,
@@ -19,8 +18,25 @@ import {
} from "@/src/components/ui/command";
import { type PlaygroundSchema } from "@/src/features/playground/page/types";
+export type StructuredOutputSchemaDialogRequest = {
+ existingLlmSchema?: LlmSchema;
+ defaultValues?: {
+ name: string;
+ description: string;
+ schema: string;
+ };
+ onSave: (llmSchema: LlmSchema) => void;
+ onDelete?: (llmSchema: LlmSchema) => void;
+};
+
+type StructuredOutputSchemaProps = {
+ onOpenSchemaDialog: (request: StructuredOutputSchemaDialogRequest) => void;
+};
+
// Popover content component for use in CollapsibleSection action buttons
-export const StructuredOutputSchemaPopover = () => {
+export const StructuredOutputSchemaPopover = ({
+ onOpenSchemaDialog,
+}: StructuredOutputSchemaProps) => {
const { structuredOutputSchema, setStructuredOutputSchema } =
usePlaygroundContext();
const projectId = useProjectIdFromURL();
@@ -117,43 +133,46 @@ export const StructuredOutputSchemaPopover = () => {
</div>
</div>
</div>
- <CreateOrEditLLMSchemaDialog
- projectId={projectId as string}
- onSave={handleSelectSchema}
- onDelete={() => handleRemoveSchema()}
- existingLlmSchema={schema}
+ <Button
+ variant="ghost"
+ size="icon"
+ className="ml-2 h-7 w-7 shrink-0"
+ aria-label={`Edit schema ${schema.name}`}
+ onClick={(e) => {
+ e.stopPropagation();
+ onOpenSchemaDialog({
+ existingLlmSchema: schema,
+ onSave: handleSelectSchema,
+ onDelete: () => handleRemoveSchema(),
+ });
+ }}
>
- <Button
- variant="ghost"
- size="icon"
- className="ml-2 h-7 w-7 shrink-0"
- onClick={(e) => e.stopPropagation()}
- >
- <PencilIcon className="h-3.5 w-3.5" />
- </Button>
- </CreateOrEditLLMSchemaDialog>
+ <PencilIcon className="h-3.5 w-3.5" />
+ </Button>
</CommandItem>
))}
</CommandGroup>
<CommandSeparator />
</CommandList>
<div className="mt-auto p-1">
- <CreateOrEditLLMSchemaDialog
- projectId={projectId as string}
- onSave={handleSelectSchema}
+ <Button
+ variant="outline"
+ size="default"
+ className="w-full"
+ onClick={() => onOpenSchemaDialog({ onSave: handleSelectSchema })}
>
- <Button variant="outline" size="default" className="w-full">
- <PlusIcon className="mr-2 h-4 w-4" />
- Create new schema
- </Button>
- </CreateOrEditLLMSchemaDialog>
+ <PlusIcon className="mr-2 h-4 w-4" />
+ Create new schema
+ </Button>
</div>
</Command>
);
};
// Main component for embedding in CollapsibleSection content
-export const StructuredOutputSchemaSection = () => {
+export const StructuredOutputSchemaSection = ({
+ onOpenSchemaDialog,
+}: StructuredOutputSchemaProps) => {
const { structuredOutputSchema, setStructuredOutputSchema } =
usePlaygroundContext();
const projectId = useProjectIdFromURL();
@@ -239,6 +258,23 @@ export const StructuredOutputSchemaSection = () => {
setStructuredOutputSchema(null);
};
+ const openAttachedSchema = () => {
+ if (!structuredOutputSchema) return;
+
+ onOpenSchemaDialog({
+ existingLlmSchema: structuredOutputSchema.existingLlmSchema,
+ defaultValues: !isSchemaSaved(structuredOutputSchema)
+ ? {
+ name: structuredOutputSchema.name,
+ description: structuredOutputSchema.description,
+ schema: JSON.stringify(structuredOutputSchema.schema, null, 2),
+ }
+ : undefined,
+ onSave: handleSelectSchema,
+ onDelete: () => handleRemoveSchema(),
+ });
+ };
+
return (
<ScrollArea className="max-h-[min(45vh,18rem)]">
{!structuredOutputSchema ? (
@@ -247,63 +283,46 @@ export const StructuredOutputSchemaSection = () => {
</div>
) : (
<div className="space-y-1">
- <CreateOrEditLLMSchemaDialog
- projectId={projectId as string}
- onSave={handleSelectSchema}
- onDelete={() => handleRemoveSchema()}
- existingLlmSchema={structuredOutputSchema.existingLlmSchema}
- defaultValues={
- !isSchemaSaved(structuredOutputSchema)
- ? {
- name: structuredOutputSchema.name,
- description: structuredOutputSchema.description,
- schema: JSON.stringify(
- structuredOutputSchema.schema,
- null,
- 2,
- ),
- }
- : undefined
- }
+ <div
+ className="bg-background hover:bg-accent/50 relative cursor-pointer rounded-md border p-2 pr-10 transition-colors duration-200"
+ onClick={openAttachedSchema}
>
- <div className="bg-background hover:bg-accent/50 relative cursor-pointer rounded-md border p-2 pr-10 transition-colors duration-200">
- <Button
- variant="ghost"
- size="sm"
- className="absolute top-2 right-3 h-6 w-6 p-0"
- aria-label={`Remove schema ${structuredOutputSchema.name}`}
- onClick={(e) => {
- e.stopPropagation();
- e.preventDefault();
- handleRemoveSchema();
- }}
- >
- <MinusCircle className="h-4 w-4" />
- </Button>
- <div className="grid min-w-0 grid-cols-[auto_minmax(0,1fr)] gap-x-2 gap-y-1">
- <BoxIcon className="text-muted-foreground mt-0.5 h-4 w-4 shrink-0" />
- <div className="min-w-0">
- <h3
- className="truncate text-sm font-bold"
- title={structuredOutputSchema.name}
- >
- {structuredOutputSchema.name}
- </h3>
- {!isSchemaSaved(structuredOutputSchema) ? (
- <span className="bg-muted text-muted-foreground mt-1 inline-flex rounded px-1 py-0.5 text-xs">
- Unsaved
- </span>
- ) : null}
- </div>
- <p
- className="text-muted-foreground col-start-2 line-clamp-2 text-xs break-words"
- title={structuredOutputSchema.description}
+ <Button
+ variant="ghost"
+ size="sm"
+ className="absolute top-2 right-3 h-6 w-6 p-0"
+ aria-label={`Remove schema ${structuredOutputSchema.name}`}
+ onClick={(e) => {
+ e.stopPropagation();
+ e.preventDefault();
+ handleRemoveSchema();
+ }}
+ >
+ <MinusCircle className="h-4 w-4" />
+ </Button>
+ <div className="grid min-w-0 grid-cols-[auto_minmax(0,1fr)] gap-x-2 gap-y-1">
+ <BoxIcon className="text-muted-foreground mt-0.5 h-4 w-4 shrink-0" />
+ <div className="min-w-0">
+ <h3
+ className="truncate text-sm font-bold"
+ title={structuredOutputSchema.name}
>
- {structuredOutputSchema.description}
- </p>
+ {structuredOutputSchema.name}
+ </h3>
+ {!isSchemaSaved(structuredOutputSchema) ? (
+ <span className="bg-muted text-muted-foreground mt-1 inline-flex rounded px-1 py-0.5 text-xs">
+ Unsaved
+ </span>
+ ) : null}
</div>
+ <p
+ className="text-muted-foreground col-start-2 line-clamp-2 text-xs break-words"
+ title={structuredOutputSchema.description}
+ >
+ {structuredOutputSchema.description}
+ </p>
</div>
- </CreateOrEditLLMSchemaDialog>
+ </div>
</div>
)}
</ScrollArea>