CSM modal shows stream
This commit is contained in:
parent
79e8230ac5
commit
3631f76b23
3 changed files with 18 additions and 0 deletions
|
|
@ -21,6 +21,7 @@
|
||||||
:task-running="taskRunning"
|
:task-running="taskRunning"
|
||||||
:task-started="taskStarted"
|
:task-started="taskStarted"
|
||||||
:task-status="taskStatus"
|
:task-status="taskStatus"
|
||||||
|
:display-stream="modalProgress && streamWithModal"
|
||||||
@terminate-task="terminateTask"
|
@terminate-task="terminateTask"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -99,6 +100,11 @@ export default {
|
||||||
required: false,
|
required: false,
|
||||||
default: false,
|
default: false,
|
||||||
},
|
},
|
||||||
|
streamWithModal: {
|
||||||
|
type: Boolean,
|
||||||
|
required: false,
|
||||||
|
default: false,
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
emits: [
|
emits: [
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,10 @@
|
||||||
<div ref="modal" class="" uk-modal="bg-close: false; esc-close: false; stack: true;">
|
<div ref="modal" class="" uk-modal="bg-close: false; esc-close: false; stack: true;">
|
||||||
<div id="status-modal" class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical">
|
<div id="status-modal" class="uk-modal-dialog uk-modal-body uk-margin-auto-vertical">
|
||||||
<h2>{{ title }}</h2>
|
<h2>{{ title }}</h2>
|
||||||
|
<mini-stream-display
|
||||||
|
v-if="displayStream"
|
||||||
|
class="uk-margin-small-bottom"
|
||||||
|
/>
|
||||||
<action-log-display :log="log" :task-status="taskStatus" />
|
<action-log-display :log="log" :task-status="taskStatus" />
|
||||||
<div id="progress-and-cancel-row">
|
<div id="progress-and-cancel-row">
|
||||||
<div class="stretchy">
|
<div class="stretchy">
|
||||||
|
|
@ -29,12 +33,14 @@ import UIkit from "uikit";
|
||||||
import ActionProgressBar from "./actionProgressBar.vue";
|
import ActionProgressBar from "./actionProgressBar.vue";
|
||||||
import ActionLogDisplay from "./actionLogDisplay.vue";
|
import ActionLogDisplay from "./actionLogDisplay.vue";
|
||||||
import { eventBus } from "../../eventBus.js";
|
import { eventBus } from "../../eventBus.js";
|
||||||
|
import miniStreamDisplay from "../genericComponents/miniStreamDisplay.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "ActionStatusModal",
|
name: "ActionStatusModal",
|
||||||
components: {
|
components: {
|
||||||
ActionProgressBar,
|
ActionProgressBar,
|
||||||
ActionLogDisplay,
|
ActionLogDisplay,
|
||||||
|
miniStreamDisplay,
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
@ -67,6 +73,11 @@ export default {
|
||||||
type: String,
|
type: String,
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
|
displayStream: {
|
||||||
|
type: Boolean,
|
||||||
|
required: false,
|
||||||
|
default: false,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
emits: ["terminateTask"],
|
emits: ["terminateTask"],
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
:modal-progress="true"
|
:modal-progress="true"
|
||||||
@response="onRecalibrateResponse"
|
@response="onRecalibrateResponse"
|
||||||
@error="modalError"
|
@error="modalError"
|
||||||
|
:streamWithModal="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue