From 49dd674f7269682154d25725f3c6a348f2b905f1 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Wed, 8 Mar 2023 14:03:46 +0100
Subject: [PATCH] User trace report can contains messages

---
 ui/src/routes/works/[wid]/+page.svelte | 11 ++++++++---
 works.go                               | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ui/src/routes/works/[wid]/+page.svelte b/ui/src/routes/works/[wid]/+page.svelte
index 11f167c..4705f95 100644
--- a/ui/src/routes/works/[wid]/+page.svelte
+++ b/ui/src/routes/works/[wid]/+page.svelte
@@ -154,16 +154,21 @@
                         <TraceStatus status={trace.status} />
                     </div>
                     {#if trace.items}
-                        <ul class="list-group">
+                        <ul class="list-group mb-3">
                             {#each trace.items as item}
-                                <li class="list-group-item fw-bold">
+                                <li class="list-group-item">
                                     <i
                                         class="me-1 bi"
                                         class:bi-check-lg={item.status == "success"}
                                         class:bi-x-lg={item.status == "failure"}
                                         class:bi-question-lg={item.status != "success" && item.status != "failure"}
                                     ></i>
-                                    {item.title}
+                                    <strong>
+                                        {item.title}
+                                    </strong>
+                                    {#if item.msg}
+                                        {item.msg}
+                                    {/if}
                                 </li>
                             {/each}
                         </ul>
diff --git a/works.go b/works.go
index 30aed6d..215ba46 100644
--- a/works.go
+++ b/works.go
@@ -375,8 +375,9 @@ func declareAPIAdminWorksRoutes(router *gin.RouterGroup) {
 }
 
 type UserTraceItem struct {
-	Title  string `json:"title"`
-	Status string `json:"status"`
+	Title   string `json:"title"`
+	Status  string `json:"status"`
+	Message string `json:"msg,omitempty"`
 }
 
 type UserTrace struct {
@@ -516,14 +517,19 @@ func declareAPIAuthWorksRoutes(router *gin.RouterGroup) {
 						items := []UserTraceItem{}
 						for _, line := range result {
 							if strings.HasPrefix(line.Message, "report:") {
-								tmp := strings.Split(strings.TrimSpace(line.Message), ":")
-								if len(tmp) != 3 {
+								tmp := strings.SplitN(strings.TrimSpace(line.Message), ":", 4)
+								if len(tmp) < 3 {
 									continue
 								}
-								items = append(items, UserTraceItem{
+
+								uti := UserTraceItem{
 									Title:  tmp[1],
 									Status: tmp[2],
-								})
+								}
+								if len(tmp) >= 4 {
+									uti.Message = tmp[3]
+								}
+								items = append(items, uti)
 							}
 						}