fix: unable to delete MCP server from permission settings #16124 (#16407)

This commit is contained in:
YutaSaito 2025-11-11 12:50:13 +09:00 committed by GitHub
parent 0ecc38519e
commit aff1060512
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -357,23 +357,22 @@ const TeamInfoView: React.FC<TeamInfoProps> = ({
servers: [],
accessGroups: [],
};
const mcpToolPermissions = values.mcp_tool_permissions || {};
const serverIds = new Set(servers || []);
const mcpToolPermissions = Object.fromEntries(
Object.entries(values.mcp_tool_permissions || {}).filter(([serverId]) =>
serverIds.has(serverId)
)
);
if (
(servers && servers.length > 0) ||
(accessGroups && accessGroups.length > 0) ||
Object.keys(mcpToolPermissions).length > 0
) {
updateData.object_permission = {};
if (servers && servers.length > 0) {
updateData.object_permission.mcp_servers = servers;
}
if (accessGroups && accessGroups.length > 0) {
updateData.object_permission.mcp_access_groups = accessGroups;
}
if (Object.keys(mcpToolPermissions).length > 0) {
updateData.object_permission.mcp_tool_permissions = mcpToolPermissions;
}
updateData.object_permission = {};
if (servers) {
updateData.object_permission.mcp_servers = servers;
}
if (accessGroups) {
updateData.object_permission.mcp_access_groups = accessGroups;
}
if (mcpToolPermissions) {
updateData.object_permission.mcp_tool_permissions = mcpToolPermissions;
}
delete values.mcp_servers_and_groups;
delete values.mcp_tool_permissions;