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

fix(n8n Form Trigger Node): Remove relience on getWorkflowStaticData for passing query parameters (#14728)

Browse Source
This commit is contained in:
Michael Kret
2025-04-18 10:37:46 +03:00
committed by GitHub
parent b615e51f13
commit 3feab31792
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/nodes-base/nodes/Form/test/utils.test.ts
View File

@@ -1,3 +1,4 @@
import type { Request } from 'express';
import { mock } from 'jest-mock-extended';
import { DateTime } from 'luxon';
import type {
@@ -603,6 +604,7 @@ jest.mock('luxon', () => ({
describe('prepareFormReturnItem', () => {
const mockContext = mock<IWebhookFunctions>({
getRequestObject: jest.fn().mockReturnValue({ method: 'GET', query: {} }),
nodeHelpers: mock({
copyBinaryFile: jest.fn().mockResolvedValue({}),
}),
@@ -735,13 +737,35 @@ describe('prepareFormReturnItem', () => {
expect(DateTime.now().setZone).toHaveBeenCalledWith('America/New_York');
});
it('should include workflow static data for form trigger node', async () => {
it('should not include workflow static data for form trigger node', async () => {
const staticData = { queryParam: 'value' };
mockContext.getWorkflowStaticData.mockReturnValue(staticData);
const result = await prepareFormReturnItem(mockContext, [], 'test');
expect(result.json.formQueryParameters).toEqual(staticData);
expect(result.json.formQueryParameters).toBeUndefined();
});
it('should include query parameters if present and is trigger node', async () => {
mockContext.getRequestObject.mockReturnValue({
method: 'POST',
query: { param: 'value' },
} as unknown as Request);
const result = await prepareFormReturnItem(mockContext, [], 'test');
expect(result.json.formQueryParameters).toEqual({ param: 'value' });
});
it('should not include query parameters if empty', async () => {
mockContext.getRequestObject.mockReturnValue({
method: 'POST',
query: {},
} as unknown as Request);
const result = await prepareFormReturnItem(mockContext, [], 'test');
expect(result.json.formQueryParameters).toBeUndefined();
});
it('should return html if field name is set', async () => {

11
packages/nodes-base/nodes/Form/utils.ts
View File

@@ -369,12 +369,11 @@ export async function prepareFormReturnItem(
returnItem.json.formMode = mode;
const workflowStaticData = context.getWorkflowStaticData('node');
if (
Object.keys(workflowStaticData || {}).length &&
context.getNode().type === FORM_TRIGGER_NODE_TYPE
context.getNode().type === FORM_TRIGGER_NODE_TYPE &&
Object.keys(context.getRequestObject().query || {}).length
) {
returnItem.json.formQueryParameters = workflowStaticData;
returnItem.json.formQueryParameters = context.getRequestObject().query;
}
return returnItem;
@@ -416,10 +415,6 @@ export function renderForm({
if (context.getNode().type === FORM_TRIGGER_NODE_TYPE) {
query = context.getRequestObject().query as IDataObject;
const workflowStaticData = context.getWorkflowStaticData('node');
for (const key of Object.keys(query)) {
workflowStaticData[key] = query[key];
}
} else if (context.getNode().type === FORM_NODE_TYPE) {
const parentNodes = context.getParentNodes(context.getNode().name);
const trigger = parentNodes.find(