From 450a9aafea0e44c5d6e6541a9e0872a9d3ac7dee Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 2 Jun 2022 16:13:07 +0200
Subject: [PATCH] fix(editor): Fix stuck loading states (#3428)

---
 packages/editor-ui/src/components/InputPanel.vue        | 6 ++++++
 packages/editor-ui/src/components/NodeExecuteButton.vue | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 362970bc41..cd630970e0 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -92,6 +92,9 @@ export default mixins(
 	},
 	computed: {
 		isExecutingPrevious(): boolean {
+			if (!this.workflowRunning) {
+				return false;
+			}
 			const triggeredNode = this.$store.getters.executedNode;
 			const executingNode = this.$store.getters.executingNode;
 			if (this.activeNode && triggeredNode === this.activeNode.name && this.activeNode.name !== executingNode) {
@@ -103,6 +106,9 @@ export default mixins(
 			}
 			return false;
 		},
+		workflowRunning (): boolean {
+			return this.$store.getters.isActionActive('workflowRunning');
+		},
 		currentWorkflow(): Workflow {
 			return this.workflow as Workflow;
 		},
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index 6c7c53f461..1fde9d150f 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -50,7 +50,7 @@ export default mixins(
 		nodeRunning (): boolean {
 			const triggeredNode = this.$store.getters.executedNode;
 			const executingNode = this.$store.getters.executingNode;
-			return executingNode === this.node.name || triggeredNode === this.node.name;
+			return this.workflowRunning && (executingNode === this.node.name || triggeredNode === this.node.name);
 		},
 		workflowRunning (): boolean {
 			return this.$store.getters.isActionActive('workflowRunning');