diff --git a/webapp/src/components/labThingsComponents/actionButton.vue b/webapp/src/components/labThingsComponents/actionButton.vue index aa4d2265..ede5af16 100644 --- a/webapp/src/components/labThingsComponents/actionButton.vue +++ b/webapp/src/components/labThingsComponents/actionButton.vue @@ -11,7 +11,7 @@ v-if="canTerminate && taskRunning" type="button" class="uk-button uk-button-danger uk-margin-remove uk-float-right uk-width-1-1" - @click="terminateTask()" + @click="terminateTask" > Cancel @@ -27,57 +27,34 @@ isDisabled ? 'uk-button-disabled' : '', buttonPrimary ? 'uk-button-primary' : 'uk-button-default', ]" - @click="bootstrapTask()" + @click="bootstrapTask" > {{ submitLabel }} - - + :title="submitLabel" + :log="log" + :progress="progress" + :can-terminate="canTerminate" + :task-running="taskRunning" + :task-started="taskStarted" + :task-status="taskStatus" + @terminateTask="terminateTask" + /> - - diff --git a/webapp/src/components/labThingsComponents/actionStatusModal.vue b/webapp/src/components/labThingsComponents/actionStatusModal.vue new file mode 100644 index 00000000..e605305e --- /dev/null +++ b/webapp/src/components/labThingsComponents/actionStatusModal.vue @@ -0,0 +1,105 @@ + + + +