From a366ba9decb1f2f08fa1fd5e52b6d9315cbe5998 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 12 Nov 2020 21:49:10 +0100
Subject: [PATCH] Rework pollUntil* to avoid building up queries

It won't fire off a new query before the previous hasn't been answered.
---
 .../WorkflowInvocationState.vue               | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
index 75289ed061e..15199914c43 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue
@@ -161,18 +161,18 @@ export default {
     methods: {
         ...mapActions(["fetchInvocationForId", "fetchInvocationJobsSummaryForId"]),
         pollStepStatesUntilTerminal: function () {
-            clearInterval(this.stepStatesInterval);
-            if (!this.invocationSchedulingTerminal) {
-                this.fetchInvocationForId(this.invocationId);
-                this.stepStatesInterval = setInterval(this.pollStepStatesUntilTerminal, 3000);
-            }
+            this.fetchInvocationForId(this.invocationId).then((response) => {
+                if (!this.invocationSchedulingTerminal) {
+                    this.stepStatesInterval = setTimeout(this.pollStepStatesUntilTerminal, 3000);
+                }
+            });
         },
         pollJobStatesUntilTerminal: function () {
-            clearInterval(this.jobStatesInterval);
-            if (!this.jobStatesTerminal) {
-                this.fetchInvocationJobsSummaryForId(this.invocationId);
-                this.jobStatesInterval = setInterval(this.pollJobStatesUntilTerminal, 3000);
-            }
+            this.fetchInvocationJobsSummaryForId(this.invocationId).then((response) => {
+                if (!this.jobStatesTerminal) {
+                    this.jobStatesInterval = setTimeout(this.pollJobStatesUntilTerminal, 3000);
+                }
+            });
         },
         onError: function (e) {
             console.error(e);
@@ -182,8 +182,8 @@ export default {
         },
     },
     beforeDestroy: function () {
-        clearInterval(this.jobStatesInterval);
-        clearInterval(this.stepStatesInterval);
+        clearTimeout(this.jobStatesInterval);
+        clearTimeout(this.stepStatesInterval);
     },
 };
 </script>