diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.test.ts index 81de7b9d403..3ef8e88b2c9 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.test.ts +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.test.ts @@ -79,6 +79,22 @@ describe("useMCPServerTools", () => { ); }); + it("reports an error when a refetch fails for a server that had loaded no tools", async () => { + const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } }); + const sharedWrapper = ({ children }: { children: React.ReactNode }) => + React.createElement(QueryClientProvider, { client: queryClient }, children); + vi.mocked(networking.listMCPTools) + .mockResolvedValueOnce({ tools: [], error: null }) + .mockResolvedValueOnce({ tools: [], error: "http_502", message: "upstream down" }); + + const { result } = renderHook(() => useMCPServerTools(["a"], new Set(["a"])), { wrapper: sharedWrapper }); + await waitFor(() => expect(result.current.get("a")?.status).toBe("success")); + + await act(() => queryClient.refetchQueries({ queryKey: mcpServerToolKeys.detail("a") })); + + await waitFor(() => expect(result.current.get("a")).toEqual({ tools: [], status: "error" })); + }); + it("keeps showing the loaded tools when a later refetch fails", async () => { const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } }); const sharedWrapper = ({ children }: { children: React.ReactNode }) => diff --git a/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.ts b/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.ts index 3b62824cd8a..bc4a6696a6e 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.ts +++ b/ui/litellm-dashboard/src/app/(dashboard)/hooks/mcpServers/useMCPServerTools.ts @@ -40,8 +40,7 @@ const toStatus = ({ fetchStatus, data, }: Pick, "status" | "fetchStatus" | "data">): MCPServerToolsStatus => { - // A failed refetch keeps the tools that already loaded on screen. - if (status === "error" && data !== undefined) return "success"; + if (status === "error" && data !== undefined && data.length > 0) return "success"; if (status !== "pending") return status; return fetchStatus === "idle" ? "idle" : "loading"; }; diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.integration.test.tsx index 93bdeebda56..74c6f0771f0 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.integration.test.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.integration.test.tsx @@ -373,7 +373,11 @@ describe("MCPToolsetsTab tool search and bulk selection", () => { await act(() => queryClient.invalidateQueries({ queryKey: mcpServerToolKeys.all })); await new Promise((resolve) => setTimeout(resolve, 50)); + expect(networking.listMCPTools).toHaveBeenCalledTimes(callsWhileOpen); + const reopened = await openCreate(user); + expect(reopened.getByRole("textbox", { name: "Search tools or servers" })).toHaveValue(""); + await new Promise((resolve) => setTimeout(resolve, 50)); expect(networking.listMCPTools).toHaveBeenCalledTimes(callsWhileOpen); }); diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx index 600ae98aee3..0a122338545 100644 --- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx +++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/MCPToolsetsTab.tsx @@ -298,11 +298,17 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo }); }; + // Clearing the search on close keeps a reopen from fetching every server for one render. + const handleClose = () => { + setSearch(""); + onClose(); + }; + const handleSubmit = async (values: ToolsetFormValues) => { setSaving(true); try { await onSave(values.toolset_name, values.description, selectedTools); - onClose(); + handleClose(); } finally { setSaving(false); } @@ -316,7 +322,7 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo const matchingState = selectionState(selectedTools, matchingTools); return ( - !open && onClose()}> + !open && handleClose()}> {initialToolset ? "Edit Toolset" : "New Toolset"} @@ -463,7 +469,7 @@ function CreateToolsetModal({ open, onClose, onSave, initialToolset }: CreateToo
-