fix(n8n Form Node): Remove field requirement and do not inherit description (#14254)

This commit is contained in:
Dana
2025-04-01 12:21:39 +02:00
committed by GitHub
parent 87bc38d409
commit 4bc1c1a547
11 changed files with 122 additions and 162 deletions

View File

@@ -46,7 +46,7 @@ export const formFields: INodeProperties = {
name: 'formFields',
placeholder: 'Add Form Element',
type: 'fixedCollection',
default: { values: [{ label: '', fieldType: 'text' }] },
default: {},
typeOptions: {
multipleValues: true,
sortable: true,

View File

@@ -27,13 +27,6 @@ export const renderFormNode = async (
title = context.evaluateExpression(`{{ $('${trigger?.name}').params.formTitle }}`) as string;
}
let description = options.formDescription;
if (!description) {
description = context.evaluateExpression(
`{{ $('${trigger?.name}').params.formDescription }}`,
) as string;
}
let buttonLabel = options.buttonLabel;
if (!buttonLabel) {
buttonLabel =
@@ -50,7 +43,7 @@ export const renderFormNode = async (
context,
res,
formTitle: title,
formDescription: description,
formDescription: options.formDescription,
formFields: fields,
responseMode: 'responseNode',
mode,

View File

@@ -19,7 +19,6 @@ export type FormTriggerInput = {
export type FormTriggerData = {
testRun: boolean;
validForm: boolean;
formTitle: string;
formDescription?: string;
formDescriptionMetadata?: string;

View File

@@ -167,7 +167,6 @@ describe('Form Node', () => {
n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
testRun: true,
useResponseData: true,
validForm: true,
formSubmittedHeader: undefined,
});
});

View File

@@ -109,7 +109,6 @@ describe('FormTrigger', () => {
'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=instanceId',
testRun: true,
useResponseData: false,
validForm: true,
});
expect(responseData).toEqual({ noWebhookResponse: true });

View File

@@ -117,7 +117,6 @@ describe('formNodeUtils', () => {
n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
testRun: true,
useResponseData: true,
validForm: true,
});
});
});

View File

@@ -203,7 +203,6 @@ describe('FormTrigger, formWebhook', () => {
'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=instanceId',
testRun: true,
useResponseData: false,
validForm: true,
});
});
@@ -250,7 +249,6 @@ describe('FormTrigger, formWebhook', () => {
'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=instanceId',
testRun: true,
useResponseData: false,
validForm: true,
});
}
});
@@ -353,7 +351,6 @@ describe('FormTrigger, prepareFormData', () => {
expect(result).toEqual({
testRun: false,
validForm: true,
formTitle: 'Test Form',
formDescription: 'This is a test form',
formDescriptionMetadata: 'This is a test form',
@@ -455,7 +452,6 @@ describe('FormTrigger, prepareFormData', () => {
expect(result).toEqual({
testRun: true,
validForm: true,
formTitle: 'Test Form',
formDescription: 'This is a test form',
formDescriptionMetadata: 'This is a test form',
@@ -515,7 +511,6 @@ describe('FormTrigger, prepareFormData', () => {
query: {},
});
expect(result.validForm).toBe(false);
expect(result.formFields).toEqual([]);
});

View File

@@ -141,7 +141,6 @@ export function prepareFormData({
formSubmittedHeader?: string;
customCss?: string;
}) {
const validForm = formFields.length > 0;
const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
const n8nWebsiteLink = `https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger${utm_campaign}`;
@@ -151,7 +150,6 @@ export function prepareFormData({
const formData: FormTriggerData = {
testRun,
validForm,
formTitle,
formDescription,
formDescriptionMetadata: createDescriptionMetadata(formDescription),
@@ -172,10 +170,6 @@ export function prepareFormData({
formData.redirectUrl = redirectUrl;
}
if (!validForm) {
return formData;
}
for (const [index, field] of formFields.entries()) {
const { fieldType, requiredField, multiselect, placeholder } = field;

View File

@@ -238,7 +238,6 @@ describe('Send and Wait utils tests', () => {
expect(mockRender).toHaveBeenCalledWith('form-trigger', {
testRun: false,
validForm: true,
formTitle: '',
formDescription: 'Test message',
formDescriptionMetadata: 'Test message',
@@ -317,7 +316,6 @@ describe('Send and Wait utils tests', () => {
expect(mockRender).toHaveBeenCalledWith('form-trigger', {
testRun: false,
validForm: true,
formTitle: 'Test title',
formDescription: 'Test description',
formDescriptionMetadata: 'Test description',