rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'action-status-message' into 'v3'

Browse source 
Style action status message and don't show with last log.

Closes #802

See merge request openflexure/openflexure-microscope-server!620
This commit is contained in:
Julian Stirling 2026-06-25 09:46:09 +00:00
commit 407824f4cb
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
webapp/src/components/labThingsComponents/actionLogDisplay.vue
View file

@ -15,29 +15,22 @@
<!-- Header always shows latest message -->
<div class="log-summary">
<div class="log-summary-text">
<template v-if="taskStatus === 'error'">
<div v-if="taskStatus === 'error'" class="status-error">
<p>The task failed due to an error:</p>
<p>{{ errorMessage }}</p>
</template>
</div>
<template v-else-if="taskStatus == 'cancelled'"> The task was cancelled. </template>
<div v-else-if="taskStatus == 'cancelled'" class="status-cancelled">
The task was cancelled.
</div>
<template v-else-if="taskStatus == 'completed'">
<div v-else-if="taskStatus == 'completed'" class="status-completed">
The task completed successfully.
</template>
</div>
<template
v-if="
latestMessage &&
(taskStatus === 'error' || taskStatus === 'cancelled' || taskStatus === 'completed')
"
>
<br />
</template>
<template v-if="latestMessage">
<div v-else-if="latestMessage">
{{ latestMessage }}
</template>
</div>
</div>
</div>
@ -215,6 +208,21 @@ export default {
line-clamp: 2; /* Future version of webkit-line-clamp, not fully supported yet */
}
.status-error {
color: #f0506e;
font-weight: 600;
}
.status-cancelled {
color: #faa05a;
font-weight: 600;
}
.status-completed {
color: green;
font-weight: 600;
}
.log-container {
flex: 1 1 auto;
min-height: 0;