mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-12 13:27:31 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(core): Node version available in expression (#9350)

Browse source
This commit is contained in:
Michael Kret 2024-05-10 09:51:26 +03:00 committed by GitHub
parent dc5994b185
commit a00467c9fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/editor-ui/src/components/CodeNodeEditor/completions/base.completions.ts
View file

@ -92,6 +92,10 @@ export const baseCompletions = defineComponent({
label: `${prefix}runIndex`, label: `${prefix}runIndex`,
info: this.$locale.baseText('codeNodeEditor.completer.$runIndex'), info: this.$locale.baseText('codeNodeEditor.completer.$runIndex'),
}, },
{
label: `${prefix}nodeVersion`,
info: this.$locale.baseText('codeNodeEditor.completer.$nodeVersion'),
},
]; ];
const options: Completion[] = TOP_LEVEL_COMPLETIONS_IN_BOTH_MODES.map(addVarType); const options: Completion[] = TOP_LEVEL_COMPLETIONS_IN_BOTH_MODES.map(addVarType);

1
packages/editor-ui/src/constants.ts
View file

@ -518,6 +518,7 @@ export const MAPPING_PARAMS = [
'$today', '$today',
'$vars', '$vars',
'$workflow', '$workflow',
'$nodeVersion',
]; ];
export const DEFAULT_STICKY_HEIGHT = 160; export const DEFAULT_STICKY_HEIGHT = 160;

5
packages/editor-ui/src/plugins/codemirror/completions/constants.ts
View file

@ -133,6 +133,11 @@ export const ROOT_DOLLAR_COMPLETIONS: Completion[] = [
section: METHODS_SECTION, section: METHODS_SECTION,
info: i18n.rootVars.$min, info: i18n.rootVars.$min,
}, },
{
label: '$nodeVersion',
section: METADATA_SECTION,
info: i18n.rootVars.$nodeVersion,
},
]; ];
export const STRING_RECOMMENDED_OPTIONS = [ export const STRING_RECOMMENDED_OPTIONS = [

1
packages/editor-ui/src/plugins/i18n/index.ts
View file

@ -379,6 +379,7 @@ export class I18nClass {
$request: this.baseText('codeNodeEditor.completer.$request'), $request: this.baseText('codeNodeEditor.completer.$request'),
$response: this.baseText('codeNodeEditor.completer.$response'), $response: this.baseText('codeNodeEditor.completer.$response'),
$pageCount: this.baseText('codeNodeEditor.completer.$pageCount'), $pageCount: this.baseText('codeNodeEditor.completer.$pageCount'),
$nodeVersion: this.baseText('codeNodeEditor.completer.$nodeVersion'),
} as const satisfies Record<string, string | undefined>; } as const satisfies Record<string, string | undefined>;
proxyVars: Record<string, string | undefined> = { proxyVars: Record<string, string | undefined> = {

1
packages/editor-ui/src/plugins/i18n/locales/en.json
View file

@ -217,6 +217,7 @@
"codeNodeEditor.completer.$prevNode.runIndex": "The run of the node providing input data to the current one", "codeNodeEditor.completer.$prevNode.runIndex": "The run of the node providing input data to the current one",
"codeNodeEditor.completer.$runIndex": "The index of the current run of this node", "codeNodeEditor.completer.$runIndex": "The index of the current run of this node",
"codeNodeEditor.completer.$today": "A timestamp representing the current day (at midnight, as a Luxon object)", "codeNodeEditor.completer.$today": "A timestamp representing the current day (at midnight, as a Luxon object)",
"codeNodeEditor.completer.$nodeVersion": "The type version of the current node",
"codeNodeEditor.completer.$vars": "The variables defined in your instance", "codeNodeEditor.completer.$vars": "The variables defined in your instance",
"codeNodeEditor.completer.$vars.varName": "Variable set on this n8n instance. All variables evaluate to strings.", "codeNodeEditor.completer.$vars.varName": "Variable set on this n8n instance. All variables evaluate to strings.",
"codeNodeEditor.completer.$secrets": "The external secrets connected to your instance", "codeNodeEditor.completer.$secrets": "The external secrets connected to your instance",

2
packages/workflow/src/WorkflowDataProxy.ts
View file

@ -995,6 +995,7 @@ export class WorkflowDataProxy {
// Before resolving the pairedItem make sure that the requested node comes in the // Before resolving the pairedItem make sure that the requested node comes in the
// graph before the current one // graph before the current one
const activeNode = that.workflow.getNode(that.activeNodeName); const activeNode = that.workflow.getNode(that.activeNodeName);
let contextNode = that.contextNodeName; let contextNode = that.contextNodeName;
if (activeNode) { if (activeNode) {
const parentMainInputNode = that.workflow.getParentMainInputNode(activeNode); const parentMainInputNode = that.workflow.getParentMainInputNode(activeNode);
@ -1281,6 +1282,7 @@ export class WorkflowDataProxy {
$thisItem: that.connectionInputData[that.itemIndex], $thisItem: that.connectionInputData[that.itemIndex],
$thisItemIndex: this.itemIndex, $thisItemIndex: this.itemIndex,
$thisRunIndex: this.runIndex, $thisRunIndex: this.runIndex,
$nodeVersion: that.workflow.getNode(that.activeNodeName)?.typeVersion,
}; };
return new Proxy(base, { return new Proxy(base, {