From 219861cbac346cfffe7ebdd70a7315b7cf97ea4f Mon Sep 17 00:00:00 2001 From: Joe Knapper Date: Wed, 18 Feb 2026 14:08:18 +0000 Subject: [PATCH] Stream progress in UI.py, resize modal --- src/openflexure_microscope_server/ui.py | 7 +++++++ .../components/labThingsComponents/actionStatusModal.vue | 6 +++++- .../labThingsComponents/serverSpecifiedActionButton.vue | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) 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/actionStatusModal.vue b/webapp/src/components/labThingsComponents/actionStatusModal.vue index 1d2e5c57..b298cc85 100644 --- a/webapp/src/components/labThingsComponents/actionStatusModal.vue +++ b/webapp/src/components/labThingsComponents/actionStatusModal.vue @@ -115,7 +115,11 @@ export default { margin-left: 5px; margin-right: 5px; } - +#status-modal { + max-height: 90vh; // never exceed 90% of viewport height + display: flex; + flex-direction: column; +} #status-modal .log-container { height: 10em; } diff --git a/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue b/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue index b98023da..78f81dd0 100644 --- a/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue +++ b/webapp/src/components/labThingsComponents/serverSpecifiedActionButton.vue @@ -9,6 +9,7 @@ :confirmation-message="actionData.confirmation_message" :button-primary="actionData.button_primary" :modal-progress="actionData.modal_progress" + :stream-with-modal="actionData.stream_with_modal" @response="actionResponse" @error="modalError" @finished="actionFinished"