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

feat(n8n Form Page Node): New node (#10390)

Browse Source 
Co-authored-by: Giulio Andreini <g.andreini@gmail.com>
Co-authored-by: Shireen Missi <94372015+ShireenMissi@users.noreply.github.com>
This commit is contained in:
Michael Kret
2024-10-17 16:59:53 +03:00
committed by GitHub
parent 86a94b5523
commit 643d66c0ae
39 changed files with 2101 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
packages/cli/src/webhooks/waiting-webhooks.ts
View File

@@ -1,9 +1,11 @@
import type express from 'express';
import {
FORM_NODE_TYPE,
type INodes,
type IWorkflowBase,
NodeHelpers,
SEND_AND_WAIT_OPERATION,
WAIT_NODE_TYPE,
Workflow,
} from 'n8n-workflow';
import { Service } from 'typedi';
@@ -34,7 +36,7 @@ export class WaitingWebhooks implements IWebhookManager {
constructor(
protected readonly logger: Logger,
private readonly nodeTypes: NodeTypes,
protected readonly nodeTypes: NodeTypes,
private readonly executionRepository: ExecutionRepository,
) {}
@@ -58,7 +60,7 @@ export class WaitingWebhooks implements IWebhookManager {
);
}
private getWorkflow(workflowData: IWorkflowBase) {
private createWorkflow(workflowData: IWorkflowBase) {
return new Workflow({
id: workflowData.id,
name: workflowData.name,
@@ -71,6 +73,13 @@ export class WaitingWebhooks implements IWebhookManager {
});
}
protected async getExecution(executionId: string) {
return await this.executionRepository.findSingleExecution(executionId, {
includeData: true,
unflattenData: true,
});
}
async executeWebhook(
req: WaitingWebhookRequest,
res: express.Response,
@@ -82,17 +91,14 @@ export class WaitingWebhooks implements IWebhookManager {
// Reset request parameters
req.params = {} as WaitingWebhookRequest['params'];
const execution = await this.executionRepository.findSingleExecution(executionId, {
includeData: true,
unflattenData: true,
});
const execution = await this.getExecution(executionId);
if (!execution) {
throw new NotFoundError(`The execution "${executionId} does not exist.`);
throw new NotFoundError(`The execution "${executionId}" does not exist.`);
}
if (execution.status === 'running') {
throw new ConflictError(`The execution "${executionId} is running already.`);
throw new ConflictError(`The execution "${executionId}" is running already.`);
}
if (execution.data?.resultData?.error) {
@@ -101,7 +107,7 @@ export class WaitingWebhooks implements IWebhookManager {
if (execution.finished) {
const { workflowData } = execution;
const { nodes } = this.getWorkflow(workflowData);
const { nodes } = this.createWorkflow(workflowData);
if (this.isSendAndWaitRequest(nodes, suffix)) {
res.render('send-and-wait-no-action-required', { isTestWebhook: false });
return { noWebhookResponse: true };
@@ -112,6 +118,31 @@ export class WaitingWebhooks implements IWebhookManager {
const lastNodeExecuted = execution.data.resultData.lastNodeExecuted as string;
return await this.getWebhookExecutionData({
execution,
req,
res,
lastNodeExecuted,
executionId,
suffix,
});
}
protected async getWebhookExecutionData({
execution,
req,
res,
lastNodeExecuted,
executionId,
suffix,
}: {
execution: IExecutionResponse;
req: WaitingWebhookRequest;
res: express.Response;
lastNodeExecuted: string;
executionId: string;
suffix?: string;
}): Promise<IWebhookResponseCallbackData> {
// Set the node as disabled so that the data does not get executed again as it would result
// in starting the wait all over again
this.disableNode(execution, req.method);
@@ -123,7 +154,7 @@ export class WaitingWebhooks implements IWebhookManager {
execution.data.resultData.runData[lastNodeExecuted].pop();
const { workflowData } = execution;
const workflow = this.getWorkflow(workflowData);
const workflow = this.createWorkflow(workflowData);
const workflowStartNode = workflow.getNode(lastNodeExecuted);
if (workflowStartNode === null) {
@@ -146,11 +177,26 @@ export class WaitingWebhooks implements IWebhookManager {
if (webhookData === undefined) {
// If no data got found it means that the execution can not be started via a webhook.
// Return 404 because we do not want to give any data if the execution exists or not.
const errorMessage = `The workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`;
if (this.isSendAndWaitRequest(workflow.nodes, suffix)) {
res.render('send-and-wait-no-action-required', { isTestWebhook: false });
return { noWebhookResponse: true };
} else if (!execution.data.resultData.error && execution.status === 'waiting') {
const childNodes = workflow.getChildNodes(
execution.data.resultData.lastNodeExecuted as string,
);
const hasChildForms = childNodes.some(
(node) =>
workflow.nodes[node].type === FORM_NODE_TYPE ||
workflow.nodes[node].type === WAIT_NODE_TYPE,
);
if (hasChildForms) {
return { noWebhookResponse: true };
} else {
throw new NotFoundError(errorMessage);
}
} else {
const errorMessage = `The workflow for execution "${executionId}" does not contain a waiting webhook with a matching path/method.`;
throw new NotFoundError(errorMessage);
}
}