From 3c64c00b749a7edc909361a008dca8d2c35c9d5a Mon Sep 17 00:00:00 2001 From: Joe Knapper Date: Thu, 18 Jun 2026 12:59:05 +0100 Subject: [PATCH 1/7] Help message appears if no logs at current level, conditional pagination --- .../tabContentComponents/loggingContent.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue index 56cb3ee3..91d85132 100644 --- a/webapp/src/components/tabContentComponents/loggingContent.vue +++ b/webapp/src/components/tabContentComponents/loggingContent.vue @@ -35,6 +35,16 @@ +
+
+

+ No log entries found at the current filter level ({{ filterLevel }} or + higher). +

+

You can include lower levels using the dropdown in the top left.

+
+
+
Date: Thu, 18 Jun 2026 12:59:41 +0100 Subject: [PATCH 2/7] Add task status messages to collapsed log, give summary more space --- .../labThingsComponents/actionLogDisplay.vue | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/webapp/src/components/labThingsComponents/actionLogDisplay.vue b/webapp/src/components/labThingsComponents/actionLogDisplay.vue index 364a8bfb..1cd0ebd2 100644 --- a/webapp/src/components/labThingsComponents/actionLogDisplay.vue +++ b/webapp/src/components/labThingsComponents/actionLogDisplay.vue @@ -2,7 +2,6 @@
- +
-
- {{ latestMessage }} -
-
-

The task failed due to an error:

-

{{ errorMessage }}

-

{{ errorMessage }}

-
-
- The task was cancelled. -
-
- The task completed successfully. +
+ + + + + + + + +
@@ -194,9 +205,9 @@ export default { .log-summary-text { text-align: center; font-size: large; - min-height: calc(2 * 1.4em); /* ALWAYS reserve 2 lines */ + height: calc(2 * 1.4em); /* height of element is 2 lines */ line-height: 1.4em; - padding: 0px 5px; /* Give some padding so there's room for ... to not expand too far */ + padding: 0 5px; /* Give some padding so there's room for ... to not expand too far */ overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; From 559d211df8c839adf02d37f032ba7cec23de243b Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Sun, 21 Jun 2026 15:04:40 +0000 Subject: [PATCH 7/7] Use same colours for empty log message as for info logs --- .../tabContentComponents/loggingContent.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue index 91d85132..deaffe4d 100644 --- a/webapp/src/components/tabContentComponents/loggingContent.vue +++ b/webapp/src/components/tabContentComponents/loggingContent.vue @@ -35,18 +35,18 @@
-
-
-

- No log entries found at the current filter level ({{ filterLevel }} or - higher). -

-

You can include lower levels using the dropdown in the top left.

-
-
-
+
+
+

+ No log entries found at the current filter level ({{ filterLevel }} or + higher). +

+

You can include lower levels using the dropdown in the top left.

+
+
+