diff --git a/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx b/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx index 235144b553c..3c8089ece22 100644 --- a/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx +++ b/ui/litellm-dashboard/src/components/mcp_server_management/MCPToolPermissions.tsx @@ -72,16 +72,16 @@ const MCPToolPermissions: React.FC = ({ // Every server this permission level reaches, not just the directly selected ones: a server // reached through an access group or a toolset needs its allowlist visible and editable too. + const effectiveMcpInput = { + allServers, + selectedServers, + selectedAccessGroups, + selectedToolsets, + toolsets, + toolPermissions, + }; const servers = useMemo( - () => - resolveEffectiveMcpServers({ - allServers, - selectedServers, - selectedAccessGroups, - selectedToolsets, - toolsets, - toolPermissions, - }), + () => resolveEffectiveMcpServers(effectiveMcpInput), [allServers, selectedServers, selectedAccessGroups, selectedToolsets, toolsets, toolPermissions], ); diff --git a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx index f4e0b4928c0..3ca58b4006b 100644 --- a/ui/litellm-dashboard/src/components/team/TeamInfo.tsx +++ b/ui/litellm-dashboard/src/components/team/TeamInfo.tsx @@ -179,10 +179,7 @@ export const retainedMcpToolPermissions = ( if (granted.length === 0) { return []; } - return granted.map(({ server_id }) => [ - server_id, - [...(toolPermissions[server_id] ?? []), ...tools], - ] as const); + return granted.map(({ server_id }) => [server_id, [...(toolPermissions[server_id] ?? []), ...tools]] as const); }); return entries.reduce>( (retained, [key, tools]) => ({ @@ -937,14 +934,15 @@ const TeamInfoView: React.FC = ({ toolPermissions: submittedToolPermissions, }; const loadedObjectPermission = info.object_permission ?? {}; - const loadedEffectiveMcpServers = resolveEffectiveMcpServers({ + const loadedMcpInput = { allServers: allMcpServers, selectedServers: loadedObjectPermission.mcp_servers ?? [], selectedAccessGroups: loadedObjectPermission.mcp_access_groups ?? [], selectedToolsets: loadedObjectPermission.mcp_toolsets ?? [], toolsets: allMcpToolsets, toolPermissions: loadedObjectPermission.mcp_tool_permissions ?? {}, - }); + }; + const loadedEffectiveMcpServers = resolveEffectiveMcpServers(loadedMcpInput); const standingServerIds = standingToolPermissionServerIds( loadedEffectiveMcpServers, info.access_group_ids ?? [],