Leave scan log open until closed
The log/progress view is now closed explicitly, rather than disappearing as soon as the scan is over.
This commit is contained in:
parent
f03e0188e4
commit
215bfb5121
1 changed files with 13 additions and 3 deletions
|
|
@ -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");
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue