From b5f7fac0155a13122fe85e6ee46f6204d087cb27 Mon Sep 17 00:00:00 2001 From: mskitroot <153523628+mskitroot@users.noreply.github.com> Date: Sat, 22 Nov 2025 14:55:16 +0200 Subject: [PATCH] Add workspaceId in options if not already there. (#5503) * Add workspaceId in options if not already there. * Update packages/components/nodes/tools/MCP/CustomMCP/CustomMCP.ts Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../components/nodes/tools/MCP/CustomMCP/CustomMCP.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/components/nodes/tools/MCP/CustomMCP/CustomMCP.ts b/packages/components/nodes/tools/MCP/CustomMCP/CustomMCP.ts index 09015a710..eb65ecbdf 100644 --- a/packages/components/nodes/tools/MCP/CustomMCP/CustomMCP.ts +++ b/packages/components/nodes/tools/MCP/CustomMCP/CustomMCP.ts @@ -136,17 +136,17 @@ class Custom_MCP implements INode { } let sandbox: ICommonObject = {} + const workspaceId = options?.searchOptions?.workspaceId?._value || options?.workspaceId if (mcpServerConfig.includes('$vars')) { const appDataSource = options.appDataSource as DataSource const databaseEntities = options.databaseEntities as IDatabaseEntity - - const variables = await getVars(appDataSource, databaseEntities, nodeData, options) + // If options.workspaceId is not set, create a new options object with the workspaceId for getVars. + const optionsWithWorkspaceId = options.workspaceId ? options : { ...options, workspaceId } + const variables = await getVars(appDataSource, databaseEntities, nodeData, optionsWithWorkspaceId) sandbox['$vars'] = prepareSandboxVars(variables) } - const workspaceId = options?.searchOptions?.workspaceId?._value || options?.workspaceId - let canonicalConfig try { canonicalConfig = JSON.parse(mcpServerConfig)