User trace report can contains messages

This commit is contained in:
nemunaire 2023-03-08 14:03:46 +01:00
parent 1348678be1
commit 49dd674f72
2 changed files with 20 additions and 9 deletions

View File

@ -154,16 +154,21 @@
<TraceStatus status={trace.status} /> <TraceStatus status={trace.status} />
</div> </div>
{#if trace.items} {#if trace.items}
<ul class="list-group"> <ul class="list-group mb-3">
{#each trace.items as item} {#each trace.items as item}
<li class="list-group-item fw-bold"> <li class="list-group-item">
<i <i
class="me-1 bi" class="me-1 bi"
class:bi-check-lg={item.status == "success"} class:bi-check-lg={item.status == "success"}
class:bi-x-lg={item.status == "failure"} class:bi-x-lg={item.status == "failure"}
class:bi-question-lg={item.status != "success" && item.status != "failure"} class:bi-question-lg={item.status != "success" && item.status != "failure"}
></i> ></i>
{item.title} <strong>
{item.title}
</strong>
{#if item.msg}
{item.msg}
{/if}
</li> </li>
{/each} {/each}
</ul> </ul>

View File

@ -375,8 +375,9 @@ func declareAPIAdminWorksRoutes(router *gin.RouterGroup) {
} }
type UserTraceItem struct { type UserTraceItem struct {
Title string `json:"title"` Title string `json:"title"`
Status string `json:"status"` Status string `json:"status"`
Message string `json:"msg,omitempty"`
} }
type UserTrace struct { type UserTrace struct {
@ -516,14 +517,19 @@ func declareAPIAuthWorksRoutes(router *gin.RouterGroup) {
items := []UserTraceItem{} items := []UserTraceItem{}
for _, line := range result { for _, line := range result {
if strings.HasPrefix(line.Message, "report:") { if strings.HasPrefix(line.Message, "report:") {
tmp := strings.Split(strings.TrimSpace(line.Message), ":") tmp := strings.SplitN(strings.TrimSpace(line.Message), ":", 4)
if len(tmp) != 3 { if len(tmp) < 3 {
continue continue
} }
items = append(items, UserTraceItem{
uti := UserTraceItem{
Title: tmp[1], Title: tmp[1],
Status: tmp[2], Status: tmp[2],
}) }
if len(tmp) >= 4 {
uti.Message = tmp[3]
}
items = append(items, uti)
} }
} }