From 6fd020c488221b46809ea849053867a427902efd Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Mon, 20 Feb 2023 19:46:20 +0100
Subject: [PATCH 1/9] fix(editor): remove 'crashed' status from filter

---
 packages/editor-ui/src/components/ExecutionsList.vue       | 7 -------
 .../src/components/ExecutionsView/ExecutionsList.vue       | 2 +-
 .../src/components/ExecutionsView/ExecutionsSidebar.vue    | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index ba27506d2e1f5..0dbc0f6257098 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -335,10 +335,6 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 						id: 'error',
 						name: this.$locale.baseText('executionsList.error'),
 					},
-					{
-						id: 'crashed',
-						name: this.$locale.baseText('executionsList.error'),
-					},
 					{
 						id: 'new',
 						name: this.$locale.baseText('executionsList.new'),
@@ -404,9 +400,6 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 					case 'waiting':
 						queryFilter.status = ['waiting'];
 						break;
-					case 'crashed':
-						queryFilter.status = ['crashed'];
-						break;
 					case 'new':
 						queryFilter.status = ['new'];
 						break;
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index c0246589d827e..31be28b40737c 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -71,7 +71,7 @@ export default mixins(
 	debounceHelper,
 	workflowHelpers,
 ).extend({
-	name: 'executions-view',
+	name: 'executions-list',
 	components: {
 		ExecutionsSidebar,
 	},
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index 282800047e3fb..e68503e40de6d 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -115,8 +115,7 @@
 <script lang="ts">
 import ExecutionCard from '@/components/ExecutionsView/ExecutionCard.vue';
 import ExecutionsInfoAccordion from '@/components/ExecutionsView/ExecutionsInfoAccordion.vue';
-import { VIEWS } from '../../constants';
-import { range as _range } from 'lodash';
+import { VIEWS } from '@/constants';
 import { IExecutionsSummary } from '@/Interface';
 import { Route } from 'vue-router';
 import Vue from 'vue';
@@ -162,7 +161,6 @@ export default Vue.extend({
 		},
 		executionStatuses(): Array<{ id: string; name: string }> {
 			return [
-				{ id: 'crashed', name: this.$locale.baseText('executionsList.error') },
 				{ id: 'new', name: this.$locale.baseText('executionsList.new') },
 				{ id: 'error', name: this.$locale.baseText('executionsList.error') },
 				{ id: 'running', name: this.$locale.baseText('executionsList.running') },

From d1643734625d87352da6c942a0db40c460d861f4 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 21 Feb 2023 06:07:08 +0100
Subject: [PATCH 2/9] fix(editor): remove 'crashed' and 'new' status from
 filter

---
 .../src/components/ExecutionsList.vue         | 23 ++++++----------
 .../ExecutionsView/ExecutionCard.vue          |  3 +--
 .../ExecutionsView/ExecutionsSidebar.vue      |  1 -
 .../editor-ui/src/mixins/executionsHelpers.ts | 27 ++++++++-----------
 .../src/plugins/i18n/locales/en.json          |  4 ---
 5 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index 0dbc0f6257098..ab6895550a051 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -335,10 +335,6 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 						id: 'error',
 						name: this.$locale.baseText('executionsList.error'),
 					},
-					{
-						id: 'new',
-						name: this.$locale.baseText('executionsList.new'),
-					},
 					{
 						id: 'running',
 						name: this.$locale.baseText('executionsList.running'),
@@ -400,9 +396,6 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 					case 'waiting':
 						queryFilter.status = ['waiting'];
 						break;
-					case 'new':
-						queryFilter.status = ['new'];
-						break;
 					case 'error':
 						queryFilter.status = ['failed', 'crashed', 'error'];
 						break;
@@ -806,8 +799,9 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				this.isDataLoading = false;
 			},
 			getStatus(execution: IExecutionsSummary): ExecutionStatus {
-				if (execution.status) return execution.status;
-				else {
+				if (execution.status) {
+					return execution.status;
+				} else {
 					// this should not happen but just in case
 					let status: ExecutionStatus = 'unknown';
 					if (execution.waitTill) {
@@ -836,7 +830,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				} else if (status === 'crashed') {
 					text = this.$locale.baseText('executionsList.error');
 				} else if (status === 'new') {
-					text = this.$locale.baseText('executionsList.new');
+					text = this.$locale.baseText('executionsList.running');
 				} else if (status === 'running') {
 					text = this.$locale.baseText('executionsList.running');
 				} else if (status === 'success') {
@@ -858,7 +852,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				} else if (status === 'crashed') {
 					path = 'executionsList.statusText';
 				} else if (status === 'new') {
-					path = 'executionsList.statusNew';
+					path = 'executionsList.statusRunning';
 				} else if (status === 'running') {
 					path = 'executionsList.statusRunning';
 				} else if (status === 'success') {
@@ -1011,14 +1005,12 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 	font-size: var(--font-size-s);
 	font-weight: var(--font-weight-bold);
 
+	.crashed &,
+	.error &,
 	.failed & {
 		color: var(--color-danger);
 	}
 
-	.crashed & {
-		color: var(--color-danger);
-	}
-
 	.waiting & {
 		color: var(--color-secondary);
 	}
@@ -1027,6 +1019,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 		font-weight: var(--font-weight-normal);
 	}
 
+	.new &,
 	.running & {
 		color: var(--color-warning);
 	}
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
index 2e86a0aeb330a..a1e0f41f0cdda 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
@@ -191,8 +191,7 @@ export default mixins(executionHelpers, showMessage, restApi).extend({
 		}
 	}
 
-	&.error,
-	&.crashed {
+	&.error {
 		&,
 		& .executionLink {
 			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-danger-h), 94%, 80%);
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index e68503e40de6d..d2d8e953c7dd0 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -161,7 +161,6 @@ export default Vue.extend({
 		},
 		executionStatuses(): Array<{ id: string; name: string }> {
 			return [
-				{ id: 'new', name: this.$locale.baseText('executionsList.new') },
 				{ id: 'error', name: this.$locale.baseText('executionsList.error') },
 				{ id: 'running', name: this.$locale.baseText('executionsList.running') },
 				{ id: 'success', name: this.$locale.baseText('executionsList.success') },
diff --git a/packages/editor-ui/src/mixins/executionsHelpers.ts b/packages/editor-ui/src/mixins/executionsHelpers.ts
index 36c540f9dee7d..beb2f5811abf5 100644
--- a/packages/editor-ui/src/mixins/executionsHelpers.ts
+++ b/packages/editor-ui/src/mixins/executionsHelpers.ts
@@ -43,37 +43,32 @@ export const executionHelpers = mixins(genericHelpers).extend({
 			if (execution.status === 'waiting' || execution.waitTill) {
 				status.name = 'waiting';
 				status.label = this.$locale.baseText('executionsList.waiting');
-			} else if (execution.status === 'running' || execution.stoppedAt === undefined) {
+			} else if (
+				execution.status === 'running' ||
+				execution.status === 'new' ||
+				execution.stoppedAt === undefined
+			) {
 				status.name = 'running';
 				status.label = this.$locale.baseText('executionsList.running');
-				status.runningTime = this.displayTimer(
-					new Date().getTime() - new Date(execution.startedAt).getTime(),
-					true,
-				);
-			} else if (execution.status === 'success' || execution.finished) {
-				status.name = 'success';
-				status.label = this.$locale.baseText('executionsList.succeeded');
-				if (execution.stoppedAt) {
+				if (execution.startedAt) {
 					status.runningTime = this.displayTimer(
-						new Date(execution.stoppedAt).getTime() - new Date(execution.startedAt).getTime(),
+						new Date().getTime() - new Date(execution.startedAt).getTime(),
 						true,
 					);
 				}
-			} else if (execution.status === 'crashed') {
-				status.name = 'crashed';
-				status.label = this.$locale.baseText('executionsList.error');
+			} else if (execution.status === 'success' || execution.finished) {
+				status.name = 'success';
+				status.label = this.$locale.baseText('executionsList.succeeded');
 				if (execution.stoppedAt) {
 					status.runningTime = this.displayTimer(
 						new Date(execution.stoppedAt).getTime() - new Date(execution.startedAt).getTime(),
 						true,
 					);
 				}
-			} else if (execution.status === 'new') {
-				status.name = 'new';
-				status.label = this.$locale.baseText('executionsList.new');
 			} else if (
 				execution.status === 'error' ||
 				execution.status === 'failed' ||
+				execution.status === 'crashed' ||
 				execution.stoppedAt !== null
 			) {
 				status.name = 'error';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 4b01c2260d145..837dd77dea859 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -442,8 +442,6 @@
 	"executionsList.confirmMessage.headline": "Delete Executions?",
 	"executionsList.confirmMessage.message": "Are you sure that you want to delete the {numSelected} selected execution(s)?",
 	"executionsList.clearSelection": "Clear selection",
-	"executionsList.crashed": "Crashed",
-	"executionsList.new": "New",
 	"executionsList.error": "Failed",
 	"executionsList.filters": "Filters",
 	"executionsList.loadMore": "Load More",
@@ -482,8 +480,6 @@
 	"executionsList.id": "Execution ID",
 	"executionsList.status": "Status",
 	"executionsList.statusText": "{status} in {time}",
-	"executionsList.statusCrashed": "{status}",
-	"executionsList.statusNew": "{status}",
 	"executionsList.statusRunning": "{status} for {time}",
 	"executionsList.statusWaiting": "{status} until {time}",
 	"executionsList.statusUnknown": "Could not complete",

From 085b8916f0613383178d4d852f8e5d6f1264ea76 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 21 Feb 2023 13:04:49 +0100
Subject: [PATCH 3/9] fix(editor): add 'status' to response

---
 packages/cli/src/Server.ts                        | 1 +
 packages/cli/src/executions/executions.service.ts | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 87e9b7463ea06..8c1c7a1de98c2 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1047,6 +1047,7 @@ class Server extends AbstractServer {
 							mode: data.mode,
 							retryOf: data.retryOf,
 							startedAt: new Date(data.startedAt),
+							status: data.status,
 						});
 					}
 
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index 936d34ea7ddc7..e9fc2e3fe1853 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -258,6 +258,7 @@ export class ExecutionsService {
 				'execution.startedAt',
 				'execution.stoppedAt',
 				'execution.workflowData',
+				'execution.status',
 			])
 			.orderBy('id', 'DESC')
 			.take(limit)

From ed671b4011426d568873505029b4a26037a991cf Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 21 Feb 2023 15:36:39 +0100
Subject: [PATCH 4/9] fix(editor): create request filter for workflow level
 execution filtering

---
 packages/editor-ui/src/Interface.ts           |  2 +-
 .../ExecutionsView/ExecutionsList.vue         | 36 ++++++++++++++-----
 packages/editor-ui/src/mixins/restApi.ts      |  6 ++--
 packages/editor-ui/src/stores/workflows.ts    | 21 ++++-------
 4 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 2a972f8ba12fb..a76c70de6147f 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -100,7 +100,7 @@ export interface IExternalHooks {
 export interface IRestApi {
 	getActiveWorkflows(): Promise<string[]>;
 	getActivationError(id: string): Promise<IActivationError | undefined>;
-	getCurrentExecutions(filter: object): Promise<IExecutionsCurrentSummaryExtended[]>;
+	getCurrentExecutions(filter: IDataObject): Promise<IExecutionsCurrentSummaryExtended[]>;
 	getPastExecutions(
 		filter: object,
 		limit: number,
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index 31be28b40737c..a8f358270f702 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -40,6 +40,7 @@ import {
 	IWorkflowDb,
 } from '@/Interface';
 import {
+	ExecutionStatus,
 	IConnection,
 	IConnections,
 	IDataObject,
@@ -107,6 +108,31 @@ export default mixins(
 		totalFinishedExecutionsCount(): number {
 			return this.workflowsStore.getTotalFinishedExecutionsCount;
 		},
+		requestFilter(): IDataObject {
+			const requestFilter: IDataObject = { workflowId: this.currentWorkflow };
+			if (this.filter.status === 'waiting') {
+				requestFilter.waitTill = true;
+			} else if (this.filter.status !== '') {
+				requestFilter.finished = this.filter.status === 'success';
+			}
+
+			switch (this.filter.status as ExecutionStatus) {
+				case 'waiting':
+					requestFilter.status = ['waiting'];
+					break;
+				case 'error':
+					requestFilter.status = ['failed', 'crashed', 'error'];
+					break;
+				case 'success':
+					requestFilter.status = ['success'];
+					break;
+				case 'running':
+					requestFilter.status = ['running'];
+					break;
+			}
+
+			return requestFilter;
+		},
 	},
 	watch: {
 		$route(to: Route, from: Route) {
@@ -211,15 +237,9 @@ export default mixins(
 				lastId = lastItem.id;
 			}
 
-			const requestFilter: IDataObject = { workflowId: this.currentWorkflow };
-			if (this.filter.status === 'waiting') {
-				requestFilter.waitTill = true;
-			} else if (this.filter.status !== '') {
-				requestFilter.finished = this.filter.status === 'success';
-			}
 			let data: IExecutionsListResponse;
 			try {
-				data = await this.restApi().getPastExecutions(requestFilter, limit, lastId);
+				data = await this.restApi().getPastExecutions(this.requestFilter, limit, lastId);
 			} catch (error) {
 				this.loadingMore = false;
 				this.$showError(error, this.$locale.baseText('executionsList.showError.loadMore.title'));
@@ -390,7 +410,7 @@ export default mixins(
 				return [];
 			}
 			try {
-				return await this.workflowsStore.loadCurrentWorkflowExecutions(this.filter);
+				return await this.workflowsStore.loadCurrentWorkflowExecutions(this.requestFilter);
 			} catch (error) {
 				if (error.errorCode === NO_NETWORK_ERROR_CODE) {
 					this.$showMessage(
diff --git a/packages/editor-ui/src/mixins/restApi.ts b/packages/editor-ui/src/mixins/restApi.ts
index d479f38c8bac9..f14d197815cc4 100644
--- a/packages/editor-ui/src/mixins/restApi.ts
+++ b/packages/editor-ui/src/mixins/restApi.ts
@@ -77,7 +77,9 @@ export const restApi = Vue.extend({
 				getActivationError: (id: string): Promise<IActivationError | undefined> => {
 					return self.restApi().makeRestApiRequest('GET', `/active/error/${id}`);
 				},
-				getCurrentExecutions: (filter: object): Promise<IExecutionsCurrentSummaryExtended[]> => {
+				getCurrentExecutions: (
+					filter: IDataObject,
+				): Promise<IExecutionsCurrentSummaryExtended[]> => {
 					let sendData = {};
 					if (filter) {
 						sendData = {
@@ -179,7 +181,7 @@ export const restApi = Vue.extend({
 				// Returns all saved executions
 				// TODO: For sure needs some kind of default filter like last day, with max 10 results, ...
 				getPastExecutions: (
-					filter: object,
+					filter: IDataObject,
 					limit: number,
 					lastId?: string,
 					firstId?: string,
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index e7ab20a50249d..09c6fe8a5c6ae 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -938,28 +938,21 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			Vue.set(this, 'activeExecutions', newActiveExecutions);
 		},
 
-		async loadCurrentWorkflowExecutions(filter: {
-			finished: boolean;
-			status: string;
-		}): Promise<IExecutionsSummary[]> {
+		async loadCurrentWorkflowExecutions(requestFilter: IDataObject): Promise<IExecutionsSummary[]> {
 			let activeExecutions = [];
 			let finishedExecutions = [];
-			const requestFilter: IDataObject = { workflowId: this.workflowId };
 
-			if (!this.workflowId) {
+			if (!requestFilter.workflowId) {
 				return [];
 			}
 			try {
 				const rootStore = useRootStore();
-				if (filter.status === '' || !filter.finished) {
-					activeExecutions = await getCurrentExecutions(rootStore.getRestApiContext, requestFilter);
+				if (!requestFilter.status || !requestFilter.finished) {
+					activeExecutions = await getCurrentExecutions(rootStore.getRestApiContext, {
+						workflowId: requestFilter.workflowId,
+					});
 				}
-				if (filter.status === '' || filter.finished) {
-					if (filter.status === 'waiting') {
-						requestFilter.waitTill = true;
-					} else if (filter.status !== '') {
-						requestFilter.finished = filter.status === 'success';
-					}
+				if (!requestFilter.status || requestFilter.finished) {
 					finishedExecutions = await getFinishedExecutions(
 						rootStore.getRestApiContext,
 						requestFilter,

From 53adc15dec84d05cde72f45ad459b03bc8623be7 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 21 Feb 2023 16:55:44 +0100
Subject: [PATCH 5/9] fix(editor): update filters

---
 packages/editor-ui/src/Interface.ts                  | 2 +-
 packages/editor-ui/src/components/ExecutionsList.vue | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index a76c70de6147f..9679496c6e665 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -102,7 +102,7 @@ export interface IRestApi {
 	getActivationError(id: string): Promise<IActivationError | undefined>;
 	getCurrentExecutions(filter: IDataObject): Promise<IExecutionsCurrentSummaryExtended[]>;
 	getPastExecutions(
-		filter: object,
+		filter: IDataObject,
 		limit: number,
 		lastId?: string,
 		firstId?: string,
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index ab6895550a051..25b5d87c8a023 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -355,10 +355,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 			combinedExecutions(): IExecutionsSummary[] {
 				const returnData: IExecutionsSummary[] = [];
 
-				if (['ALL', 'running', 'new'].includes(this.filter.status)) {
+				if (['ALL', 'running'].includes(this.filter.status)) {
 					returnData.push(...this.activeExecutions);
 				}
-				if (['ALL', 'error', 'crashed', 'success', 'waiting'].includes(this.filter.status)) {
+				if (['ALL', 'error', 'success', 'waiting'].includes(this.filter.status)) {
 					returnData.push(...this.finishedExecutions);
 				}
 				return returnData;
@@ -397,7 +397,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 						queryFilter.status = ['waiting'];
 						break;
 					case 'error':
-						queryFilter.status = ['failed', 'crashed', 'error'];
+						queryFilter.status = ['failed', 'crashed'];
 						break;
 					case 'success':
 						queryFilter.status = ['success'];
@@ -1006,7 +1006,6 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 	font-weight: var(--font-weight-bold);
 
 	.crashed &,
-	.error &,
 	.failed & {
 		color: var(--color-danger);
 	}

From 5ac8db2e9fd51024a3c7c7089563a1e9c49b8ebb Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Tue, 21 Feb 2023 23:16:23 +0100
Subject: [PATCH 6/9] fix(editor): simplify condition

---
 .../src/components/ExecutionsView/ExecutionsList.vue          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index a8f358270f702..d892ed88e6671 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -88,9 +88,7 @@ export default mixins(
 		hidePreview(): boolean {
 			const activeNotPresent =
 				this.filterApplied &&
-				(this.executions as IExecutionsSummary[]).find(
-					(ex) => ex.id === this.activeExecution.id,
-				) === undefined;
+				!(this.executions as IExecutionsSummary[]).find((ex) => ex.id === this.activeExecution?.id);
 			return this.loading || !this.executions.length || activeNotPresent;
 		},
 		filterApplied(): boolean {

From bce59d294eecfa10bc8d3bb8f6300e4ccb9c6248 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 22 Feb 2023 06:55:17 +0100
Subject: [PATCH 7/9] fix(editor): update filters

---
 .../editor-ui/src/components/ExecutionsList.vue  |  6 ++----
 .../components/ExecutionsView/ExecutionsList.vue | 16 ++++++++--------
 .../editor-ui/src/mixins/executionsHelpers.ts    |  1 -
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index 25b5d87c8a023..fcd3f8214c15b 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -1116,18 +1116,16 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 			background: var(--color-primary-tint-3);
 		}
 
+		&.crashed td:first-child::before,
 		&.failed td:first-child::before {
 			background: var(--color-danger);
 		}
 
-		&.crashed td:first-child::before {
-			background: var(--color-danger);
-		}
-
 		&.success td:first-child::before {
 			background: var(--color-success);
 		}
 
+		&.new td:first-child::before,
 		&.running td:first-child::before {
 			background: var(--color-warning);
 		}
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index d892ed88e6671..bc08af5f7c324 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -107,29 +107,29 @@ export default mixins(
 			return this.workflowsStore.getTotalFinishedExecutionsCount;
 		},
 		requestFilter(): IDataObject {
-			const requestFilter: IDataObject = { workflowId: this.currentWorkflow };
+			const rFilter: IDataObject = { workflowId: this.currentWorkflow };
 			if (this.filter.status === 'waiting') {
-				requestFilter.waitTill = true;
+				rFilter.waitTill = true;
 			} else if (this.filter.status !== '') {
-				requestFilter.finished = this.filter.status === 'success';
+				rFilter.finished = this.filter.status === 'success';
 			}
 
 			switch (this.filter.status as ExecutionStatus) {
 				case 'waiting':
-					requestFilter.status = ['waiting'];
+					rFilter.status = ['waiting'];
 					break;
 				case 'error':
-					requestFilter.status = ['failed', 'crashed', 'error'];
+					rFilter.status = ['failed', 'crashed'];
 					break;
 				case 'success':
-					requestFilter.status = ['success'];
+					rFilter.status = ['success'];
 					break;
 				case 'running':
-					requestFilter.status = ['running'];
+					rFilter.status = ['running'];
 					break;
 			}
 
-			return requestFilter;
+			return rFilter;
 		},
 	},
 	watch: {
diff --git a/packages/editor-ui/src/mixins/executionsHelpers.ts b/packages/editor-ui/src/mixins/executionsHelpers.ts
index beb2f5811abf5..2f178330782e6 100644
--- a/packages/editor-ui/src/mixins/executionsHelpers.ts
+++ b/packages/editor-ui/src/mixins/executionsHelpers.ts
@@ -66,7 +66,6 @@ export const executionHelpers = mixins(genericHelpers).extend({
 					);
 				}
 			} else if (
-				execution.status === 'error' ||
 				execution.status === 'failed' ||
 				execution.status === 'crashed' ||
 				execution.stoppedAt !== null

From a3d7ba1d5cd478512a9f17d01fa9e7e38bf7e93b Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 22 Feb 2023 10:35:50 +0100
Subject: [PATCH 8/9] fix(editor): optimizing data loading flow

---
 .../ExecutionsView/ExecutionsList.vue         | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index bc08af5f7c324..b14f102bf0d81 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -26,21 +26,15 @@ import ExecutionsSidebar from '@/components/ExecutionsView/ExecutionsSidebar.vue
 import {
 	MAIN_HEADER_TABS,
 	MODAL_CANCEL,
-	MODAL_CLOSE,
 	MODAL_CONFIRMED,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	VIEWS,
 	WEBHOOK_NODE_TYPE,
 } from '@/constants';
-import {
-	IExecutionsListResponse,
-	IExecutionsSummary,
-	INodeUi,
-	ITag,
-	IWorkflowDb,
-} from '@/Interface';
+import { IExecutionsListResponse, INodeUi, ITag, IWorkflowDb } from '@/Interface';
 import {
 	ExecutionStatus,
+	IExecutionsSummary,
 	IConnection,
 	IConnections,
 	IDataObject,
@@ -203,7 +197,7 @@ export default mixins(
 				await this.openWorkflow(this.$route.params.name);
 				this.uiStore.nodeViewInitialized = false;
 				if (this.workflowsStore.currentWorkflowExecutions.length === 0) {
-					this.setExecutions();
+					await this.setExecutions();
 				}
 				if (this.activeExecution) {
 					this.$router
@@ -217,7 +211,7 @@ export default mixins(
 		},
 		async onLoadMore(): Promise<void> {
 			if (!this.loadingMore) {
-				this.callDebounced('loadMore', { debounceTime: 1000 });
+				await this.callDebounced('loadMore', { debounceTime: 1000 });
 			}
 		},
 		async loadMore(limit = 20): Promise<void> {
@@ -470,7 +464,10 @@ export default mixins(
 			}
 
 			// stop if the execution wasn't found in the first 1000 lookups
-			if (attemptCount >= 10) return;
+			if (attemptCount >= 10) {
+				this.workflowsStore.activeWorkflowExecution = null;
+				return;
+			}
 
 			// Fetch next batch of executions
 			await this.loadMore(100);
@@ -637,8 +634,7 @@ export default mixins(
 			}
 		},
 		async loadActiveWorkflows(): Promise<void> {
-			const activeWorkflows = await this.restApi().getActiveWorkflows();
-			this.workflowsStore.activeWorkflows = activeWorkflows;
+			this.workflowsStore.activeWorkflows = await this.restApi().getActiveWorkflows();
 		},
 		async onRetryExecution(payload: { execution: IExecutionsSummary; command: string }) {
 			const loadWorkflow = payload.command === 'current-workflow';

From dcf6d89f3662fca35c5ce35c843246f04c737aa9 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 22 Feb 2023 11:54:18 +0100
Subject: [PATCH 9/9] fix(editor): always load past executions

---
 .../src/components/ExecutionsView/ExecutionsList.vue   |  4 ++--
 packages/editor-ui/src/stores/workflows.ts             | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index b14f102bf0d81..53b97ca84bcfd 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -356,7 +356,7 @@ export default mixins(
 
 					if (existingStillRunning && currentFinished) {
 						existingExecutions[executionIndex] = currentItem;
-						if (currentItem.id === this.activeExecution.id) {
+						if (currentItem.id === this.activeExecution?.id) {
 							updatedActiveExecution = currentItem;
 						}
 					}
@@ -383,7 +383,7 @@ export default mixins(
 			if (updatedActiveExecution !== null) {
 				this.workflowsStore.activeWorkflowExecution = updatedActiveExecution;
 			} else {
-				const activeInList = existingExecutions.some((ex) => ex.id === this.activeExecution.id);
+				const activeInList = existingExecutions.some((ex) => ex.id === this.activeExecution?.id);
 				if (!activeInList && this.executions.length > 0) {
 					this.$router
 						.push({
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index 09c6fe8a5c6ae..b8af7235af3e8 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -952,12 +952,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 						workflowId: requestFilter.workflowId,
 					});
 				}
-				if (!requestFilter.status || requestFilter.finished) {
-					finishedExecutions = await getFinishedExecutions(
-						rootStore.getRestApiContext,
-						requestFilter,
-					);
-				}
+				finishedExecutions = await getFinishedExecutions(
+					rootStore.getRestApiContext,
+					requestFilter,
+				);
 				this.finishedExecutionsCount = finishedExecutions.count;
 				return [...activeExecutions, ...(finishedExecutions.results || [])];
 			} catch (error) {