mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-10 06:34:05 -08:00
fix(editor): Fix stuck loading states (#3428)
This commit is contained in:
parent
15a20d257d
commit
450a9aafea
|
@ -92,6 +92,9 @@ export default mixins(
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
isExecutingPrevious(): boolean {
|
isExecutingPrevious(): boolean {
|
||||||
|
if (!this.workflowRunning) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const triggeredNode = this.$store.getters.executedNode;
|
const triggeredNode = this.$store.getters.executedNode;
|
||||||
const executingNode = this.$store.getters.executingNode;
|
const executingNode = this.$store.getters.executingNode;
|
||||||
if (this.activeNode && triggeredNode === this.activeNode.name && this.activeNode.name !== executingNode) {
|
if (this.activeNode && triggeredNode === this.activeNode.name && this.activeNode.name !== executingNode) {
|
||||||
|
@ -103,6 +106,9 @@ export default mixins(
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
|
workflowRunning (): boolean {
|
||||||
|
return this.$store.getters.isActionActive('workflowRunning');
|
||||||
|
},
|
||||||
currentWorkflow(): Workflow {
|
currentWorkflow(): Workflow {
|
||||||
return this.workflow as Workflow;
|
return this.workflow as Workflow;
|
||||||
},
|
},
|
||||||
|
|
|
@ -50,7 +50,7 @@ export default mixins(
|
||||||
nodeRunning (): boolean {
|
nodeRunning (): boolean {
|
||||||
const triggeredNode = this.$store.getters.executedNode;
|
const triggeredNode = this.$store.getters.executedNode;
|
||||||
const executingNode = this.$store.getters.executingNode;
|
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 {
|
workflowRunning (): boolean {
|
||||||
return this.$store.getters.isActionActive('workflowRunning');
|
return this.$store.getters.isActionActive('workflowRunning');
|
||||||
|
|
Loading…
Reference in a new issue