From eb519dffce5f91900dfe783d2ed7646828fbb8ad Mon Sep 17 00:00:00 2001
From: Buster Neece <buster@busterneece.com>
Date: Sat, 21 Jan 2023 18:14:42 -0600
Subject: [PATCH] Fix how the streaming log view works.

---
 .../components/Common/StreamingLogView.vue    | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/frontend/vue/components/Common/StreamingLogView.vue b/frontend/vue/components/Common/StreamingLogView.vue
index ea7560aaf..80163e915 100644
--- a/frontend/vue/components/Common/StreamingLogView.vue
+++ b/frontend/vue/components/Common/StreamingLogView.vue
@@ -24,9 +24,9 @@
 </template>
 
 <script setup>
-import {nextTick, onMounted, ref} from "vue";
+import {nextTick, ref, toRef, watch} from "vue";
 import {useAxios} from "~/vendor/axios";
-import {useTimeoutFn} from "@vueuse/core";
+import {tryOnScopeDispose} from "@vueuse/core";
 
 const props = defineProps({
     logUrl: {
@@ -44,14 +44,16 @@ const {axios} = useAxios();
 
 const $textarea = ref(); // Template Ref
 
-const scrollTextarea = () => {
-    if (scrollToBottom.value) {
-        nextTick(() => {
-            $textarea.value.scrollTop = $textarea.value.scrollHeight;
-        });
+let updateInterval = null;
+
+const stop = () => {
+    if (updateInterval) {
+        clearInterval(updateInterval);
     }
 };
 
+tryOnScopeDispose(stop);
+
 const updateLogs = () => {
     axios({
         method: 'GET',
@@ -62,40 +64,36 @@ const updateLogs = () => {
     }).then((resp) => {
         if (resp.data.contents !== '') {
             logs.value = logs.value + resp.data.contents + "\n";
-            scrollTextarea();
+            if (scrollToBottom.value) {
+                nextTick(() => {
+                    $textarea.value.scrollTop = $textarea.value.scrollHeight;
+                });
+            }
         }
 
         currentLogPosition.value = resp.data.position;
 
-        if (!resp.data.eof) {
-            useTimeoutFn(updateLogs, 2500);
-        }
-    });
-};
-
-onMounted(() => {
-    loading.value = true;
-
-    axios({
-        method: 'GET',
-        url: props.logUrl
-    }).then((resp) => {
-        if (resp.data.contents !== '') {
-            logs.value = resp.data.contents + "\n";
-            scrollTextarea();
-        } else {
-            logs.value = '';
-        }
-
-        currentLogPosition.value = resp.data.position;
-
-        if (!resp.data.eof) {
-            useTimeoutFn(updateLogs, 2500);
+        if (resp.data.eof) {
+            stop();
         }
     }).finally(() => {
         loading.value = false;
     });
-});
+};
+
+watch(toRef(props, 'logUrl'), (newLogUrl) => {
+    loading.value = true;
+    logs.value = '';
+    currentLogPosition.value = 0;
+
+    if (null === newLogUrl) {
+        stop();
+    } else {
+        updateInterval = setInterval(updateLogs, 2500);
+        updateLogs();
+    }
+
+}, {immediate: true});
 
 const getContents = () => {
     return logs.value;