Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ const SidebarItemsList = ({
})
.map((SBItemName) => {
const currentItem = dataFilter[item.name][SBItemName];
if (SBItemName === "MCPTools") {
return null;
}

if (SBItemName === "ChatInput" || SBItemName === "Webhook") {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export type SearchContextType = {
// Additional properties for the sidebar to use
search?: string;
setSearch?: (value: string) => void;
searchInputRef?: React.RefObject<HTMLInputElement>;
searchInputRef?: React.RefObject<HTMLInputElement | null>;
handleInputFocus?: () => void;
handleInputBlur?: () => void;
handleInputChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
Expand Down Expand Up @@ -668,7 +668,7 @@ export function FlowSidebarComponent({ isLoading }: FlowSidebarComponentProps) {
<>
{hasResults ? (
<>
{showComponents && (
{showComponents && !showMcp && (
<CategoryGroup
dataFilter={dataFilter}
sortedCategories={sortedCategories}
Expand Down
16 changes: 2 additions & 14 deletions src/frontend/tests/extended/features/mcp-server-tab.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -234,23 +234,11 @@ test(

// Create a new flow with MCP component
await page.getByTestId("blank-flow").click();
await page.getByTestId("sidebar-search-input").click();
await page.getByTestId("sidebar-search-input").fill("mcp");

await page.waitForSelector('[data-testid="models_and_agentsMCP Tools"]', {
timeout: 30000,
});

await page
.getByTestId("models_and_agentsMCP Tools")
.dragTo(page.locator('//*[@id="react-flow-id"]'), {
targetPosition: { x: 50, y: 50 },
});
await page.getByTestId("sidebar-nav-mcp").click();
await page.getByTestId("add-component-button-lf-starter_project").click();

await adjustScreenView(page, { numberOfZoomOut: 3 });

await expect(page.getByTestId("dropdown_str_tool")).toBeHidden();

await openAddMcpServerModal(page);

await page.waitForSelector('[data-testid="json-input"]', {
Expand Down
72 changes: 10 additions & 62 deletions src/frontend/tests/extended/features/mcp-server.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,8 @@ test(
timeout: 30000,
});
await page.getByTestId("blank-flow").click();
await page.getByTestId("sidebar-search-input").click();
await page.getByTestId("sidebar-search-input").fill("mcp tools");

await page.waitForSelector('[data-testid="models_and_agentsMCP Tools"]', {
timeout: 30000,
});

await page
.getByTestId("models_and_agentsMCP Tools")
.dragTo(page.locator('//*[@id="react-flow-id"]'), {
targetPosition: { x: 100, y: 100 },
});
await page.getByTestId("sidebar-nav-mcp").click();
await page.getByTestId("add-component-button-lf-starter_project").click();

// See if the color matches

Expand All @@ -48,8 +38,6 @@ test(

await adjustScreenView(page, { numberOfZoomOut: 3 });

await expect(page.getByTestId("dropdown_str_tool")).toBeHidden();

await openAddMcpServerModal(page);

await page.getByTestId("stdio-tab").click();
Expand Down Expand Up @@ -337,18 +325,9 @@ test(
timeout: 30000,
});
await page.getByTestId("blank-flow").click();
await page.getByTestId("sidebar-search-input").click();
await page.getByTestId("sidebar-search-input").fill("mcp tools");

await page.waitForSelector('[data-testid="models_and_agentsMCP Tools"]', {
timeout: 30000,
});
await page.getByTestId("sidebar-nav-mcp").click();
await page.getByTestId("add-component-button-lf-starter_project").click();

await page
.getByTestId("models_and_agentsMCP Tools")
.dragTo(page.locator('//*[@id="react-flow-id"]'), {
targetPosition: { x: 100, y: 100 },
});
await adjustScreenView(page, { numberOfZoomOut: 3 });

await openAddMcpServerModal(page);
Expand Down Expand Up @@ -490,18 +469,9 @@ test(
timeout: 30000,
});
await page.getByTestId("blank-flow").click();
await page.getByTestId("sidebar-search-input").click();
await page.getByTestId("sidebar-search-input").fill("mcp tools");

await page.waitForSelector('[data-testid="models_and_agentsMCP Tools"]', {
timeout: 30000,
});
await page.getByTestId("sidebar-nav-mcp").click();
await page.getByTestId("add-component-button-lf-starter_project").click();

await page
.getByTestId("models_and_agentsMCP Tools")
.dragTo(page.locator('//*[@id="react-flow-id"]'), {
targetPosition: { x: 100, y: 100 },
});
await adjustScreenView(page, { numberOfZoomOut: 3 });

await openAddMcpServerModal(page);
Expand Down Expand Up @@ -663,18 +633,8 @@ test(
timeout: 30000,
});
await page.getByTestId("blank-flow").click();
await page.getByTestId("sidebar-search-input").click();
await page.getByTestId("sidebar-search-input").fill("mcp tools");

await page.waitForSelector('[data-testid="models_and_agentsMCP Tools"]', {
timeout: 30000,
});

await page
.getByTestId("models_and_agentsMCP Tools")
.dragTo(page.locator('//*[@id="react-flow-id"]'), {
targetPosition: { x: 100, y: 100 },
});
await page.getByTestId("sidebar-nav-mcp").click();
await page.getByTestId("add-component-button-lf-starter_project").click();

await page.getByTestId("canvas_controls_dropdown").click();

Expand All @@ -683,8 +643,6 @@ test(
await zoomOut(page, 3);
await page.getByTestId("canvas_controls_dropdown").click({ force: true });

await expect(page.getByTestId("dropdown_str_tool")).toBeHidden();

await openAddMcpServerModal(page);

await page.getByTestId("stdio-tab").click();
Expand Down Expand Up @@ -948,18 +906,8 @@ test(
timeout: 30000,
});
await page.getByTestId("blank-flow").click();
await page.getByTestId("sidebar-search-input").click();
await page.getByTestId("sidebar-search-input").fill("mcp tools");

await page.waitForSelector('[data-testid="models_and_agentsMCP Tools"]', {
timeout: 30000,
});

await page
.getByTestId("models_and_agentsMCP Tools")
.dragTo(page.locator('//*[@id="react-flow-id"]'), {
targetPosition: { x: 100, y: 100 },
});
await page.getByTestId("sidebar-nav-mcp").click();
await page.getByTestId("add-component-button-lf-starter_project").click();

await adjustScreenView(page, { numberOfZoomOut: 3 });

Expand Down
2 changes: 1 addition & 1 deletion src/frontend/tests/utils/open-add-mcp-server-modal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export async function openAddMcpServerModal(page: Page) {
} else {
// Otherwise use the dropdown
await page.getByTestId("mcp-server-dropdown").click({ timeout: 3000 });
await page.getByText("Add MCP Server", { exact: true }).click({
await page.getByText("Add MCP Server", { exact: true }).last().click({
timeout: 5000,
});
}
Expand Down
Loading