fix(editor): fix workflow not stopping on clicking stop button (#4382)

* fix(editor): fix workflow not stopping * address comment, fix for unsaved workflows
n8n-io · Oct 19, 2022 · 50c18a7 · 50c18a7
1 parent 263794c
commit 50c18a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
@@ -180,7 +180,7 @@ export interface IRestApi {
 	getWorkflow(id: string): Promise<IWorkflowDb>;
 	getWorkflows(filter?: object): Promise<IWorkflowShortResponse[]>;
 	getWorkflowFromUrl(url: string): Promise<IWorkflowDb>;
-	getExecution(id: string): Promise<IExecutionResponse>;
+	getExecution(id: string): Promise<IExecutionResponse | undefined>;
 	deleteExecutions(sendData: IExecutionDeleteFilter): Promise<void>;
 	retryExecution(id: string, loadWorkflow?: boolean): Promise<boolean>;
 	getTimezones(): Promise<IDataObject>;

diff --git a/packages/editor-ui/src/components/mixins/pushConnection.ts b/packages/editor-ui/src/components/mixins/pushConnection.ts
@@ -260,7 +260,7 @@ export const pushConnection = mixins(
 						this.$titleSet(workflow.name as string, 'ERROR');
 
 						if (
-							runDataExecuted.data.resultData.error!.name === 'ExpressionError' &&
+							runDataExecuted.data.resultData.error?.name === 'ExpressionError' &&
 							(runDataExecuted.data.resultData.error as ExpressionError).context.functionality === 'pairedItem'
 						) {
 							const error = runDataExecuted.data.resultData.error as ExpressionError;

diff --git a/packages/editor-ui/src/components/mixins/restApi.ts b/packages/editor-ui/src/components/mixins/restApi.ts
@@ -129,9 +129,9 @@ export const restApi = Vue.extend({
 				},
 
 				// Returns the execution with the given name
-				getExecution: async (id: string): Promise<IExecutionResponse> => {
+				getExecution: async (id: string): Promise<IExecutionResponse | undefined> => {
 					const response = await self.restApi().makeRestApiRequest('GET', `/executions/${id}`);
-					return unflattenExecutionData(response);
+					return response && unflattenExecutionData(response);
 				},
 
 				// Deletes executions

diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
@@ -1231,7 +1231,7 @@ export default mixins(
 				} catch (error) {
 					// Execution stop might fail when the execution has already finished. Let's treat this here.
 					const execution = await this.restApi().getExecution(executionId);
-					if (execution.finished) {
+					if (execution?.finished) {
 						const executedData = {
 							data: execution.data,
 							finished: execution.finished,