admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(n8n Form Node): Remove dependence on static data from the form completion page (no-changelog) (#12445)

Browse Source
This commit is contained in:
Michael Kret
2025-01-07 11:39:59 +02:00
committed by GitHub
parent e234756457
commit 7df5eb1e4d
3 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
packages/nodes-base/nodes/Form/Form.node.ts
View File

@@ -19,7 +19,6 @@ import {
WAIT_INDEFINITELY,
} from 'n8n-workflow';
import { type CompletionPageConfig } from './interfaces';
import { formDescription, formFields, formTitle } from '../Form/common.descriptions';
import { prepareFormReturnItem, renderForm, resolveRawData } from '../Form/utils';
@@ -273,19 +272,19 @@ export class Form extends Node {
const method = context.getRequestObject().method;
if (operation === 'completion' && method === 'GET') {
const staticData = context.getWorkflowStaticData('node');
const id = `${context.getExecutionId()}-${context.getNode().name}`;
const config = staticData?.[id] as CompletionPageConfig;
delete staticData[id];
const completionTitle = context.getNodeParameter('completionTitle', '') as string;
const completionMessage = context.getNodeParameter('completionMessage', '') as string;
const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
const options = context.getNodeParameter('options', {}) as { formTitle: string };
if (config.redirectUrl) {
if (redirectUrl) {
res.send(
`<html><head><meta http-equiv="refresh" content="0; url=${config.redirectUrl}"></head></html>`,
`<html><head><meta http-equiv="refresh" content="0; url=${redirectUrl}"></head></html>`,
);
return { noWebhookResponse: true };
}
let title = config.pageTitle;
let title = options.formTitle;
if (!title) {
title = context.evaluateExpression(
`{{ $('${trigger?.name}').params.formTitle }}`,
@@ -296,8 +295,8 @@ export class Form extends Node {
) as boolean;
res.render('form-trigger-completion', {
title: config.completionTitle,
message: config.completionMessage,
title: completionTitle,
message: completionMessage,
formTitle: title,
appendAttribution,
});
@@ -419,28 +418,7 @@ export class Form extends Node {
);
}
if (operation !== 'completion') {
await context.putExecutionToWait(WAIT_INDEFINITELY);
} else {
const staticData = context.getWorkflowStaticData('node');
const completionTitle = context.getNodeParameter('completionTitle', 0, '') as string;
const completionMessage = context.getNodeParameter('completionMessage', 0, '') as string;
const redirectUrl = context.getNodeParameter('redirectUrl', 0, '') as string;
const options = context.getNodeParameter('options', 0, {}) as { formTitle: string };
const id = `${context.getExecutionId()}-${context.getNode().name}`;
const config: CompletionPageConfig = {
completionTitle,
completionMessage,
redirectUrl,
pageTitle: options.formTitle,
};
staticData[id] = config;
const waitTill = new Date(WAIT_INDEFINITELY);
await context.putExecutionToWait(waitTill);
}
await context.putExecutionToWait(WAIT_INDEFINITELY);
return [context.getInputData()];
}