mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

🐛 Fix issue of current execution query with unsaved running workflow

Browse source
This commit is contained in:
Jan Oberhauser 2021-02-11 14:55:59 +01:00
parent e53efdd337
commit 53234770a7
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/cli/src/Server.ts
View file

@ -1472,7 +1472,7 @@ class App {
} }
const resultsPromise = resultsQuery.getMany(); const resultsPromise = resultsQuery.getMany();
const countPromise = Db.collections.Execution!.count(countFilter); const countPromise = Db.collections.Execution!.count(countFilter);
const results: IExecutionFlattedDb[] = await resultsPromise; const results: IExecutionFlattedDb[] = await resultsPromise;
@ -1557,7 +1557,7 @@ class App {
delete data!.executionData!.resultData.error; delete data!.executionData!.resultData.error;
const length = data!.executionData!.resultData.runData[lastNodeExecuted].length; const length = data!.executionData!.resultData.runData[lastNodeExecuted].length;
if (length > 0 && data!.executionData!.resultData.runData[lastNodeExecuted][length - 1].error !== undefined) { if (length > 0 && data!.executionData!.resultData.runData[lastNodeExecuted][length - 1].error !== undefined) {
// Remove results only if it is an error. // Remove results only if it is an error.
// If we are retrying due to a crash, the information is simply success info from last node // If we are retrying due to a crash, the information is simply success info from last node
data!.executionData!.resultData.runData[lastNodeExecuted].pop(); data!.executionData!.resultData.runData[lastNodeExecuted].pop();
// Stack will determine what to run next // Stack will determine what to run next
@ -1651,7 +1651,7 @@ class App {
]) ])
.orderBy('execution.id', 'DESC') .orderBy('execution.id', 'DESC')
.andWhere(`execution.id IN (:...ids)`, {ids: currentlyRunningExecutionIds}); .andWhere(`execution.id IN (:...ids)`, {ids: currentlyRunningExecutionIds});
if (req.query.filter) { if (req.query.filter) {
const filter = JSON.parse(req.query.filter as string); const filter = JSON.parse(req.query.filter as string);
if (filter.workflowId !== undefined) { if (filter.workflowId !== undefined) {
@ -1674,12 +1674,12 @@ class App {
const executingWorkflows = this.activeExecutionsInstance.getActiveExecutions(); const executingWorkflows = this.activeExecutionsInstance.getActiveExecutions();
const returnData: IExecutionsSummary[] = []; const returnData: IExecutionsSummary[] = [];
let filter: any = {}; // tslint:disable-line:no-any let filter: any = {}; // tslint:disable-line:no-any
if (req.query.filter) { if (req.query.filter) {
filter = JSON.parse(req.query.filter as string); filter = JSON.parse(req.query.filter as string);
} }
for (const data of executingWorkflows) { for (const data of executingWorkflows) {
if (filter.workflowId !== undefined && filter.workflowId !== data.workflowId) { if (filter.workflowId !== undefined && filter.workflowId !== data.workflowId) {
continue; continue;
@ -1687,14 +1687,14 @@ class App {
returnData.push( returnData.push(
{ {
idActive: data.id.toString(), idActive: data.id.toString(),
workflowId: data.workflowId.toString(), workflowId: data.workflowId === undefined ? '' : data.workflowId.toString(),
mode: data.mode, mode: data.mode,
retryOf: data.retryOf, retryOf: data.retryOf,
startedAt: new Date(data.startedAt), startedAt: new Date(data.startedAt),
} }
); );
} }
return returnData; return returnData;
} }
})); }));
@ -1721,26 +1721,26 @@ class App {
stoppedAt: fullExecutionData.stoppedAt ? new Date(fullExecutionData.stoppedAt) : undefined, stoppedAt: fullExecutionData.stoppedAt ? new Date(fullExecutionData.stoppedAt) : undefined,
finished: fullExecutionData.finished, finished: fullExecutionData.finished,
}; };
return returnData; return returnData;
} else { } else {
const executionId = req.params.id; const executionId = req.params.id;
// Stopt he execution and wait till it is done and we got the data // Stopt he execution and wait till it is done and we got the data
const result = await this.activeExecutionsInstance.stopExecution(executionId); const result = await this.activeExecutionsInstance.stopExecution(executionId);
if (result === undefined) { if (result === undefined) {
throw new Error(`The execution id "${executionId}" could not be found.`); throw new Error(`The execution id "${executionId}" could not be found.`);
} }
const returnData: IExecutionsStopData = { const returnData: IExecutionsStopData = {
mode: result.mode, mode: result.mode,
startedAt: new Date(result.startedAt), startedAt: new Date(result.startedAt),
stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined, stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined,
finished: result.finished, finished: result.finished,
}; };
return returnData; return returnData;
} }
})); }));