From ceccbf110f5fd48a1b0eb3032b5b703118960a51 Mon Sep 17 00:00:00 2001
From: Ishaan Jaffer <ishaanjaffer0324@gmail.com>
Date: Tue, 10 Mar 2026 13:55:24 -0700
Subject: [PATCH] fix: gate registry fetch on modal visibility, use resetFields
 to clear OAuth fields

---
 .../src/components/mcp_tools/OpenAPIFormSection.tsx    | 10 +++++-----
 .../src/components/mcp_tools/create_mcp_server.tsx     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx b/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx
index 8719bac2441..68412ea21bc 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/OpenAPIFormSection.tsx
@@ -37,13 +37,13 @@ const OpenAPIFormSection: React.FC<OpenAPIFormSectionProps> = ({
       updates.auth_type = AUTH_TYPE.OAUTH2;
       updates.authorization_url = entry.oauth.authorization_url;
       updates.token_url = entry.oauth.token_url;
+      form.setFieldsValue(updates);
     } else {
-      // Clear stale OAuth config from previous preset selection
-      updates.auth_type = undefined;
-      updates.authorization_url = undefined;
-      updates.token_url = undefined;
+      // resetFields is required to visually clear Ant Design form fields —
+      // setFieldsValue with undefined silently skips undefined keys.
+      form.resetFields(["auth_type", "authorization_url", "token_url"]);
+      form.setFieldsValue(updates);
     }
-    form.setFieldsValue(updates);
     onValuesChange(updates);
   };
 
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx
index 737f323da71..41a7db8db36 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/create_mcp_server.tsx
@@ -619,7 +619,7 @@ const CreateMCPServer: React.FC<CreateMCPServerProps> = ({
             {transportType === TRANSPORT.OPENAPI && (
               <OpenAPIFormSection
                 form={form}
-                accessToken={accessToken}
+                accessToken={isModalVisible ? accessToken : null}
                 onValuesChange={(updates) =>
                   setFormValues((prev) => ({ ...prev, ...updates }))
                 }