mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Streamline multiple pinned triggers behavior (#4569)

Browse source 
🐛 Fix multiple pinned triggers behavior
This commit is contained in:
Iván Ovejero 2022-11-10 14:03:14 +01:00 committed by GitHub
parent d06197d879
commit 953457ad86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/cli/src/workflows/workflows.controller.ts
View file

@ -1,7 +1,7 @@
/* eslint-disable no-param-reassign */ /* eslint-disable no-param-reassign */
import express from 'express'; import express from 'express';
import { INode, IPinData, LoggerProxy, Workflow } from 'n8n-workflow'; import { INode, LoggerProxy, Workflow } from 'n8n-workflow';
import axios from 'axios'; import axios from 'axios';
import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner'; import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
@ -18,7 +18,6 @@ import {
IWorkflowResponse, IWorkflowResponse,
IExecutionPushResponse, IExecutionPushResponse,
IWorkflowExecutionDataProcess, IWorkflowExecutionDataProcess,
IWorkflowDb,
} from '@/Interfaces'; } from '@/Interfaces';
import config from '@/config'; import config from '@/config';
import * as TagHelpers from '@/TagHelpers'; import * as TagHelpers from '@/TagHelpers';
@ -49,18 +48,6 @@ workflowsController.use((req, res, next) => {
workflowsController.use('/', EEWorkflowController); workflowsController.use('/', EEWorkflowController);
const isTrigger = (nodeType: string) =>
['trigger', 'webhook'].some((suffix) => nodeType.toLowerCase().includes(suffix));
function findFirstPinnedTrigger(workflow: IWorkflowDb, pinData?: IPinData) {
if (!pinData) return;
// eslint-disable-next-line consistent-return
return workflow.nodes.find(
(node) => !node.disabled && isTrigger(node.type) && pinData[node.name],
);
}
/** /**
* POST /workflows * POST /workflows
*/ */
@ -351,11 +338,11 @@ workflowsController.post(
const sessionId = GenericHelpers.getSessionId(req); const sessionId = GenericHelpers.getSessionId(req);
const pinnedTrigger = findFirstPinnedTrigger(workflowData, pinData); const pinnedTrigger = WorkflowsService.findPinnedTrigger(workflowData, startNodes, pinData);
// If webhooks nodes exist and are active we have to wait for till we receive a call // If webhooks nodes exist and are active we have to wait for till we receive a call
if ( if (
pinnedTrigger === undefined && pinnedTrigger === null &&
(runData === undefined || (runData === undefined ||
startNodes === undefined || startNodes === undefined ||
startNodes.length === 0 || startNodes.length === 0 ||

25
packages/cli/src/workflows/workflows.services.ts
View file

@ -1,4 +1,4 @@
import { JsonObject, jsonParse, LoggerProxy } from 'n8n-workflow'; import { IPinData, JsonObject, jsonParse, LoggerProxy } from 'n8n-workflow';
import { FindManyOptions, FindOneOptions, In, ObjectLiteral } from 'typeorm'; import { FindManyOptions, FindOneOptions, In, ObjectLiteral } from 'typeorm';
import { validate as jsonSchemaValidate } from 'jsonschema'; import { validate as jsonSchemaValidate } from 'jsonschema';
import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner'; import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
@ -15,6 +15,7 @@ import { validateEntity } from '@/GenericHelpers';
import { externalHooks } from '@/Server'; import { externalHooks } from '@/Server';
import * as TagHelpers from '@/TagHelpers'; import * as TagHelpers from '@/TagHelpers';
import { getSharedWorkflowIds } from '@/WorkflowHelpers'; import { getSharedWorkflowIds } from '@/WorkflowHelpers';
import { IWorkflowDb } from '..';
export interface IGetWorkflowsQueryFilter { export interface IGetWorkflowsQueryFilter {
id?: number | string; id?: number | string;
@ -61,6 +62,28 @@ export class WorkflowsService {
return Db.collections.SharedWorkflow.findOne(options); return Db.collections.SharedWorkflow.findOne(options);
} }
/**
* Find the pinned trigger to execute the workflow from, if any.
*/
static findPinnedTrigger(workflow: IWorkflowDb, startNodes?: string[], pinData?: IPinData) {
if (!pinData || !startNodes) return null;
const isTrigger = (nodeTypeName: string) =>
['trigger', 'webhook'].some((suffix) => nodeTypeName.toLowerCase().includes(suffix));
const pinnedTriggers = workflow.nodes.filter(
(node) => !node.disabled && pinData[node.name] && isTrigger(node.type),
);
if (pinnedTriggers.length === 0) return null;
if (startNodes?.length === 0) return pinnedTriggers[0]; // full execution
const [startNodeName] = startNodes;
return pinnedTriggers.find((pt) => pt.name === startNodeName) ?? null; // partial execution
}
static async get(workflow: Partial<WorkflowEntity>, options?: { relations: string[] }) { static async get(workflow: Partial<WorkflowEntity>, options?: { relations: string[] }) {
return Db.collections.Workflow.findOne(workflow, options); return Db.collections.Workflow.findOne(workflow, options);
} }