Skip to content

Fix(mcp): "set all" button now follows active search #2046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
w3joe wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −13
Open

Fix(mcp): "set all" button now follows active search #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions apps/code/src/renderer/features/mcp-servers/components/parts/ServerDetailView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,35 +252,58 @@ export function ServerDetailView({
<Text color="gray" className="text-[13px]">
Set all:
</Text>
<Tooltip content="Approve all">
<Tooltip
content={toolSearch ? "Approve filtered" : "Approve all"}
>
<IconButton
variant="soft"
color="green"
size="1"
disabled={bulkPending || tools.length === 0}
onClick={() => setBulkApproval("approved")}
disabled={bulkPending || filteredTools.length === 0}
onClick={() =>
setBulkApproval(
"approved",
toolSearch ? filteredTools : undefined,
)
}
>
<Check size={12} weight="bold" />
</IconButton>
</Tooltip>
<Tooltip content="Require approval for all">
<Tooltip
content={
toolSearch
? "Require approval for filtered"
: "Require approval for all"
}
>
<IconButton
variant="soft"
color="amber"
size="1"
disabled={bulkPending || tools.length === 0}
onClick={() => setBulkApproval("needs_approval")}
disabled={bulkPending || filteredTools.length === 0}
onClick={() =>
setBulkApproval(
"needs_approval",
toolSearch ? filteredTools : undefined,
)
}
>
<Shield size={12} weight="bold" />
</IconButton>
</Tooltip>
<Tooltip content="Block all">
<Tooltip content={toolSearch ? "Block filtered" : "Block all"}>
<IconButton
variant="soft"
color="red"
size="1"
disabled={bulkPending || tools.length === 0}
onClick={() => setBulkApproval("do_not_use")}
disabled={bulkPending || filteredTools.length === 0}
onClick={() =>
setBulkApproval(
"do_not_use",
toolSearch ? filteredTools : undefined,
)
}
>
<Prohibit size={12} weight="bold" />
</IconButton>
Expand Down
17 changes: 13 additions & 4 deletions apps/code/src/renderer/features/mcp-servers/hooks/useMcpInstallationTools.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,21 @@ export function useMcpInstallationTools(
);

const setBulkApprovalMutation = useAuthenticatedMutation(
(client, approval_state: McpApprovalState) => {
(
client,
vars: {
approval_state: McpApprovalState;
targetTools?: McpInstallationTool[];
},
) => {
if (!installationId) {
return Promise.reject(new Error("No installation selected"));
}
return dispatchBulkApproval(
client,
installationId,
tools ?? [],
approval_state,
vars.targetTools ?? tools ?? [],
vars.approval_state,
);
},
{
Expand Down Expand Up @@ -174,7 +180,10 @@ export function useMcpInstallationTools(
tools: tools ?? [],
isLoading,
setToolApproval: setToolApprovalMutation.mutate,
setBulkApproval: setBulkApprovalMutation.mutate,
setBulkApproval: (
approval_state: McpApprovalState,
targetTools?: McpInstallationTool[],
) => setBulkApprovalMutation.mutate({ approval_state, targetTools }),
bulkPending: setBulkApprovalMutation.isPending,
refresh: () => refreshMutation.mutate(undefined),
refreshPending: refreshMutation.isPending,
Expand Down