From 0286e043e6c9f0831ddbb5dc47e8709c065d1607 Mon Sep 17 00:00:00 2001 From: Charlie Kolb Date: Wed, 18 Dec 2024 08:50:02 +0100 Subject: [PATCH 1/4] Copy --- .../nodes/tools/ToolWorkflow/ToolWorkflow.node.ts | 4 ++-- .../components/ResourceMapper/MappingFields.vue | 4 ++-- .../editor-ui/src/plugins/i18n/locales/en.json | 4 ++-- .../ExecuteWorkflow/ExecuteWorkflow.node.ts | 4 ++-- .../ExecuteWorkflowTrigger.node.ts | 14 +++++++++----- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts index d85ff722712b2..c19f987a2d178 100644 --- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts +++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts @@ -32,14 +32,14 @@ import { getConnectionHintNoticeField } from '../../../utils/sharedFields'; export class ToolWorkflow implements INodeType { description: INodeTypeDescription = { - displayName: 'Call n8n Workflow Tool', + displayName: 'Call n8n Sub-Workflow Tool', name: 'toolWorkflow', icon: 'fa:network-wired', group: ['transform'], version: [1, 1.1, 1.2, 1.3], description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.', defaults: { - name: 'Call n8n Workflow Tool', + name: 'Call n8n Sub-Workflow Tool', }, codex: { categories: ['AI'], diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue index 0b444dd13f6e7..8e805157c408a 100644 --- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue +++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue @@ -360,7 +360,7 @@ defineExpose({ :title=" locale.baseText('resourceMapper.removeField', { interpolate: { - fieldWord: singularFieldWordCapitalized, + fieldWord: singularFieldWord, }, }) " @@ -391,7 +391,7 @@ defineExpose({ Date: Thu, 19 Dec 2024 12:43:56 +0100 Subject: [PATCH 2/4] lockfile --- pnpm-lock.yaml | 104 +++++++------------------------------------------ 1 file changed, 13 insertions(+), 91 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ba2200020b469..3307206c48ae5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -283,7 +283,7 @@ importers: version: 4.0.7 axios: specifier: 'catalog:' - version: 1.7.4(debug@4.3.7) + version: 1.7.4 dotenv: specifier: 8.6.0 version: 8.6.0 @@ -354,7 +354,7 @@ importers: dependencies: axios: specifier: 'catalog:' - version: 1.7.4(debug@4.3.7) + version: 1.7.4 packages/@n8n/codemirror-lang: dependencies: @@ -801,7 +801,7 @@ importers: version: 1.11.0 axios: specifier: 'catalog:' - version: 1.7.4(debug@4.3.7) + version: 1.7.4 bcryptjs: specifier: 2.4.3 version: 2.4.3 @@ -1120,7 +1120,7 @@ importers: dependencies: '@langchain/core': specifier: 'catalog:' - version: 0.3.19(openai@4.73.1(zod@3.23.8)) + version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)) '@n8n/client-oauth2': specifier: workspace:* version: link:../@n8n/client-oauth2 @@ -1135,7 +1135,7 @@ importers: version: 1.11.0 axios: specifier: 'catalog:' - version: 1.7.4(debug@4.3.7) + version: 1.7.4 chardet: specifier: 2.0.0 version: 2.0.0 @@ -1431,7 +1431,7 @@ importers: version: 10.11.0(vue@3.5.13(typescript@5.7.2)) axios: specifier: 'catalog:' - version: 1.7.4(debug@4.3.7) + version: 1.7.4 bowser: specifier: 2.11.0 version: 2.11.0 @@ -1932,7 +1932,7 @@ importers: version: 0.15.2 axios: specifier: 'catalog:' - version: 1.7.4(debug@4.3.7) + version: 1.7.4 callsites: specifier: 3.1.0 version: 3.1.0 @@ -1978,7 +1978,7 @@ importers: devDependencies: '@langchain/core': specifier: 'catalog:' - version: 0.3.19(openai@4.73.1) + version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)) '@types/deep-equal': specifier: ^1.0.1 version: 1.0.1 @@ -16226,38 +16226,6 @@ snapshots: transitivePeerDependencies: - openai - '@langchain/core@0.3.19(openai@4.73.1(zod@3.23.8))': - dependencies: - ansi-styles: 5.2.0 - camelcase: 6.3.0 - decamelize: 1.2.0 - js-tiktoken: 1.0.12 - langsmith: 0.2.3(openai@4.73.1(zod@3.23.8)) - mustache: 4.2.0 - p-queue: 6.6.2 - p-retry: 4.6.2 - uuid: 10.0.0 - zod: 3.23.8 - zod-to-json-schema: 3.23.3(zod@3.23.8) - transitivePeerDependencies: - - openai - - '@langchain/core@0.3.19(openai@4.73.1)': - dependencies: - ansi-styles: 5.2.0 - camelcase: 6.3.0 - decamelize: 1.2.0 - js-tiktoken: 1.0.12 - langsmith: 0.2.3(openai@4.73.1) - mustache: 4.2.0 - p-queue: 6.6.2 - p-retry: 4.6.2 - uuid: 10.0.0 - zod: 3.23.8 - zod-to-json-schema: 3.23.3(zod@3.23.8) - transitivePeerDependencies: - - openai - '@langchain/google-common@0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)': dependencies: '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)) @@ -17173,7 +17141,7 @@ snapshots: '@rudderstack/rudder-sdk-node@2.0.9(tslib@2.6.2)': dependencies: - axios: 1.7.4(debug@4.3.7) + axios: 1.7.4 axios-retry: 3.7.0 component-type: 1.2.1 join-component: 1.1.0 @@ -19470,15 +19438,7 @@ snapshots: '@babel/runtime': 7.24.7 is-retry-allowed: 2.2.0 - axios@1.7.4(debug@4.3.7): - dependencies: - follow-redirects: 1.15.6(debug@4.3.6) - form-data: 4.0.0 - proxy-from-env: 1.1.0 - transitivePeerDependencies: - - debug - - axios@1.7.7: + axios@1.7.4: dependencies: follow-redirects: 1.15.6(debug@4.3.6) form-data: 4.0.0 @@ -22337,7 +22297,7 @@ snapshots: '@types/debug': 4.1.12 '@types/node': 18.16.16 '@types/tough-cookie': 4.0.2 - axios: 1.7.4(debug@4.3.7) + axios: 1.7.4 camelcase: 6.3.0 debug: 4.3.7 dotenv: 16.4.5 @@ -23370,7 +23330,7 @@ snapshots: '@langchain/groq': 0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13) '@langchain/mistralai': 0.2.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))) '@langchain/ollama': 0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))) - axios: 1.7.4(debug@4.3.7) + axios: 1.7.4 cheerio: 1.0.0 handlebars: 4.7.8 transitivePeerDependencies: @@ -23389,28 +23349,6 @@ snapshots: optionalDependencies: openai: 4.73.1(encoding@0.1.13)(zod@3.23.8) - langsmith@0.2.3(openai@4.73.1(zod@3.23.8)): - dependencies: - '@types/uuid': 10.0.0 - commander: 10.0.1 - p-queue: 6.6.2 - p-retry: 4.6.2 - semver: 7.6.0 - uuid: 10.0.0 - optionalDependencies: - openai: 4.73.1(zod@3.23.8) - - langsmith@0.2.3(openai@4.73.1): - dependencies: - '@types/uuid': 10.0.0 - commander: 10.0.1 - p-queue: 6.6.2 - p-retry: 4.6.2 - semver: 7.6.0 - uuid: 10.0.0 - optionalDependencies: - openai: 4.73.1(zod@3.23.8) - lazy-ass@1.6.0: {} ldapts@4.2.6: @@ -24743,22 +24681,6 @@ snapshots: - encoding - supports-color - openai@4.73.1(zod@3.23.8): - dependencies: - '@types/node': 18.16.16 - '@types/node-fetch': 2.6.4 - abort-controller: 3.0.0 - agentkeepalive: 4.2.1 - form-data-encoder: 1.7.2 - formdata-node: 4.4.1 - node-fetch: 2.7.0(encoding@0.1.13) - optionalDependencies: - zod: 3.23.8 - transitivePeerDependencies: - - encoding - - supports-color - optional: true - openapi-sampler@1.5.1: dependencies: '@types/json-schema': 7.0.15 @@ -25756,7 +25678,7 @@ snapshots: retry-axios@2.6.0(axios@1.7.4(debug@4.3.7)): dependencies: - axios: 1.7.4(debug@4.3.7) + axios: 1.7.4 retry-request@7.0.2(encoding@0.1.13): dependencies: From 3841e7f19264c51d8e6fa00f8e5d800d28b73140 Mon Sep 17 00:00:00 2001 From: Charlie Kolb Date: Thu, 19 Dec 2024 13:28:14 +0100 Subject: [PATCH 3/4] lint --- .../ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts index 52f3210e43528..ce8ca4be3de7a 100644 --- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts +++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts @@ -83,7 +83,7 @@ export class ExecuteWorkflowTrigger implements INodeType { default: '', }, { - // eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased + // eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased displayName: 'Input data mode', name: INPUT_SOURCE, type: 'options', From 51535e7e96c187ef4a8db1411860e4336e0c4682 Mon Sep 17 00:00:00 2001 From: Charlie Kolb Date: Thu, 19 Dec 2024 14:45:58 +0100 Subject: [PATCH 4/4] fix test --- .../core/src/node-execution-context/workflow-node-context.ts | 3 +-- packages/editor-ui/src/components/ResourceMapper.test.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/core/src/node-execution-context/workflow-node-context.ts b/packages/core/src/node-execution-context/workflow-node-context.ts index 7a8c730ae61f2..962f20eec0f8c 100644 --- a/packages/core/src/node-execution-context/workflow-node-context.ts +++ b/packages/core/src/node-execution-context/workflow-node-context.ts @@ -17,8 +17,7 @@ export class LoadWorkflowNodeContext extends NodeExecutionContext implements IWo this.getNodeParameter = (( parameterName: string, itemIndex: number, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - fallbackValue?: any, + fallbackValue?: unknown, options?: IGetNodeParameterOptions, ) => this._getNodeParameter( diff --git a/packages/editor-ui/src/components/ResourceMapper.test.ts b/packages/editor-ui/src/components/ResourceMapper.test.ts index 253c7dfdc7941..fdc06099cf845 100644 --- a/packages/editor-ui/src/components/ResourceMapper.test.ts +++ b/packages/editor-ui/src/components/ResourceMapper.test.ts @@ -222,7 +222,7 @@ describe('ResourceMapper.vue', () => { expect( getByText('Look for incoming data that matches the foos in the service'), ).toBeInTheDocument(); - expect(getByText('Foos to Match On')).toBeInTheDocument(); + expect(getByText('Foos to match on')).toBeInTheDocument(); expect( getByText( 'The foos to use when matching rows in the service to the input items of this node. Usually an ID.',