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

fix(n8n Form Node): Support expressions in completion page (#11781)

Browse Source 
Co-authored-by: Shireen Missi <shireen@n8n.io>
This commit is contained in:
Michael Kret
2024-11-20 10:52:11 +02:00
committed by GitHub
parent 43aa389ea7
commit 10991675fe
3 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ import {
import { formDescription, formFields, formTitle } from '../Form/common.descriptions';
import { prepareFormReturnItem, renderForm, resolveRawData } from '../Form/utils';
import { type CompletionPageConfig } from './interfaces';
const pageProperties = updateDisplayOptions(
{
@@ -267,22 +268,17 @@ export class Form extends Node {
const method = context.getRequestObject().method;
if (operation === 'completion') {
const respondWith = context.getNodeParameter('respondWith', '') as string;
const staticData = context.getWorkflowStaticData('node');
const id = `${context.getExecutionId()}-${context.getNode().name}`;
const config = staticData?.[id] as CompletionPageConfig;
delete staticData[id];
if (respondWith === 'redirect') {
const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
res.redirect(redirectUrl);
return {
noWebhookResponse: true,
};
if (config.redirectUrl) {
res.redirect(config.redirectUrl);
return { noWebhookResponse: true };
}
const completionTitle = context.getNodeParameter('completionTitle', '') as string;
const completionMessage = context.getNodeParameter('completionMessage', '') as string;
const options = context.getNodeParameter('options', {}) as {
formTitle: string;
};
let title = options.formTitle;
let title = config.pageTitle;
if (!title) {
title = context.evaluateExpression(
`{{ $('${trigger?.name}').params.formTitle }}`,
@@ -293,15 +289,13 @@ export class Form extends Node {
) as boolean;
res.render('form-trigger-completion', {
title: completionTitle,
message: completionMessage,
title: config.completionTitle,
message: config.completionMessage,
formTitle: title,
appendAttribution,
});
return {
noWebhookResponse: true,
};
return { noWebhookResponse: true };
}
if (method === 'GET') {
@@ -415,6 +409,22 @@ export class Form extends Node {
if (operation !== 'completion') {
const waitTill = new Date(WAIT_TIME_UNLIMITED);
await context.putExecutionToWait(waitTill);
} 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;
}
return [context.getInputData()];