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: Issue listing executions with Postgres (#4856)

Browse source
This commit is contained in:
Omar Ajoue 2022-12-08 10:49:48 +01:00 committed by GitHub
parent 1c36c37a12
commit 5156328c34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
packages/cli/src/executions/executions.service.ts
View file

@ -110,6 +110,19 @@ export class ExecutionsService {
return { count, estimated: false }; return { count, estimated: false };
} }
static massageFilters(filter: IDataObject): void {
if (filter) {
if (filter.waitTill === true) {
filter.waitTill = Not(IsNull());
// eslint-disable-next-line @typescript-eslint/no-unnecessary-boolean-literal-compare
} else if (filter.finished === false) {
filter.waitTill = IsNull();
} else {
delete filter.waitTill;
}
}
}
static async getExecutionsList(req: ExecutionRequest.GetAll): Promise<IExecutionsListResponse> { static async getExecutionsList(req: ExecutionRequest.GetAll): Promise<IExecutionsListResponse> {
const sharedWorkflowIds = await this.getWorkflowIdsForUser(req.user); const sharedWorkflowIds = await this.getWorkflowIdsForUser(req.user);
if (sharedWorkflowIds.length === 0) { if (sharedWorkflowIds.length === 0) {
@ -215,19 +228,14 @@ export class ExecutionsService {
.take(limit) .take(limit)
.where(findWhere); .where(findWhere);
const countFilter = deepCopy(filter ?? {});
if (filter) { if (filter) {
if (filter.waitTill === true) { this.massageFilters(filter as IDataObject);
filter.waitTill = Not(IsNull());
// eslint-disable-next-line @typescript-eslint/no-unnecessary-boolean-literal-compare
} else if (filter.finished === false) {
filter.waitTill = IsNull();
} else {
delete filter.waitTill;
}
query = query.andWhere(filter); query = query.andWhere(filter);
} }
const countFilter = deepCopy(filter ?? {}); this.massageFilters(countFilter as IDataObject);
countFilter.id = Not(In(executingWorkflowIds)); countFilter.id = Not(In(executingWorkflowIds));
const executions = await query.getMany(); const executions = await query.getMany();