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>
This commit is contained in:
parent
ca22160361
commit
b5f7fac015
|
|
@ -136,17 +136,17 @@ class Custom_MCP implements INode {
|
||||||
}
|
}
|
||||||
|
|
||||||
let sandbox: ICommonObject = {}
|
let sandbox: ICommonObject = {}
|
||||||
|
const workspaceId = options?.searchOptions?.workspaceId?._value || options?.workspaceId
|
||||||
|
|
||||||
if (mcpServerConfig.includes('$vars')) {
|
if (mcpServerConfig.includes('$vars')) {
|
||||||
const appDataSource = options.appDataSource as DataSource
|
const appDataSource = options.appDataSource as DataSource
|
||||||
const databaseEntities = options.databaseEntities as IDatabaseEntity
|
const databaseEntities = options.databaseEntities as IDatabaseEntity
|
||||||
|
// If options.workspaceId is not set, create a new options object with the workspaceId for getVars.
|
||||||
const variables = await getVars(appDataSource, databaseEntities, nodeData, options)
|
const optionsWithWorkspaceId = options.workspaceId ? options : { ...options, workspaceId }
|
||||||
|
const variables = await getVars(appDataSource, databaseEntities, nodeData, optionsWithWorkspaceId)
|
||||||
sandbox['$vars'] = prepareSandboxVars(variables)
|
sandbox['$vars'] = prepareSandboxVars(variables)
|
||||||
}
|
}
|
||||||
|
|
||||||
const workspaceId = options?.searchOptions?.workspaceId?._value || options?.workspaceId
|
|
||||||
|
|
||||||
let canonicalConfig
|
let canonicalConfig
|
||||||
try {
|
try {
|
||||||
canonicalConfig = JSON.parse(mcpServerConfig)
|
canonicalConfig = JSON.parse(mcpServerConfig)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue