From 215bfb51213dc6e839d77b972a6febd15fb0be27 Mon Sep 17 00:00:00 2001
From: Richard Bowman <richard.bowman@cantab.net>
Date: Wed, 10 Jan 2024 20:33:49 +0000
Subject: [PATCH] Leave scan log open until closed

The log/progress view is now closed explicitly, rather than disappearing as soon as the scan is over.
---
 .../tabContentComponents/slideScanContent.vue    | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/webapp/src/components/tabContentComponents/slideScanContent.vue b/webapp/src/components/tabContentComponents/slideScanContent.vue
index d4a62866..de827dbd 100644
--- a/webapp/src/components/tabContentComponents/slideScanContent.vue
+++ b/webapp/src/components/tabContentComponents/slideScanContent.vue
@@ -41,7 +41,7 @@
             submit-label="Start smart scan"
             :can-terminate="true"
             :submit-data="{ sample_check: true }"
-            @update:taskRunning="scanning = $event"
+            @taskStarted="scanning = true"
             @update:taskStatus="taskStatus = $event"
             @update:progress="progress = $event"
             @update:log="log = $event"
@@ -53,7 +53,6 @@
             submit-label="Start manual scan"
             :can-terminate="true"
             :submit-data="{ sample_check: false }"
-            @update:taskRunning="scanning = $event"
             @update:taskStatus="taskStatus = $event"
             @update:progress="progress = $event"
             @update:log="log = $event"
@@ -68,13 +67,21 @@
         />
         <action-progress-bar :progress="progress" :task-status="taskStatus" />
         <button
-          v-if="scanning"
+          v-if="cancellable"
           type="button"
           class="uk-button uk-button-danger uk-margin-remove uk-float-right uk-width-1-1"
           @click="$refs.smartScanTaskSubmitter.terminateTask()"
         >
           Cancel
         </button>
+        <button
+          v-if="!cancellable"
+          type="button"
+          class="uk-button uk-button-danger uk-margin-remove uk-float-right uk-width-1-1"
+          @click="scanning = false"
+        >
+          Close
+        </button>
       </div>
     </div>
     <div class="view-component uk-width-expand">
@@ -117,6 +124,9 @@ export default {
     },
     smartScanUri() {
       return this.thingActionUrl("smart_scan", "sample_scan");
+    },
+    cancellable() {
+      return (this.taskStatus == "running") | (this.taskStatus == "pending");
     }
   },