diff --git a/src/openflexure_microscope_server/ui.py b/src/openflexure_microscope_server/ui.py index d6c68290..0f3720dd 100644 --- a/src/openflexure_microscope_server/ui.py +++ b/src/openflexure_microscope_server/ui.py @@ -40,6 +40,13 @@ class ActionButton(BaseModel): modal_progress: bool = False """Specify whether to show a progress modal.""" + stream_with_modal: bool = False + """Specify whether to show a mini stream preview in the progress modal. + + This option only has an effect if `modal_progress` is True. + If `modal_progress` is False, no modal (and therefore no stream preview) is shown. + """ + notify_on_success: bool = False """Specify whether to a notification on successful completion.""" diff --git a/webapp/src/components/labThingsComponents/actionButton.vue b/webapp/src/components/labThingsComponents/actionButton.vue index 1f2e0efe..8256d47a 100644 --- a/webapp/src/components/labThingsComponents/actionButton.vue +++ b/webapp/src/components/labThingsComponents/actionButton.vue @@ -21,6 +21,7 @@ :task-running="taskRunning" :task-started="taskStarted" :task-status="taskStatus" + :display-stream="modalProgress && streamWithModal" @terminate-task="terminateTask" /> @@ -99,6 +100,11 @@ export default { required: false, default: false, }, + streamWithModal: { + type: Boolean, + required: false, + default: false, + } }, emits: [ diff --git a/webapp/src/components/labThingsComponents/actionStatusModal.vue b/webapp/src/components/labThingsComponents/actionStatusModal.vue index 2131ad9d..b298cc85 100644 --- a/webapp/src/components/labThingsComponents/actionStatusModal.vue +++ b/webapp/src/components/labThingsComponents/actionStatusModal.vue @@ -2,6 +2,10 @@