From 64bacb665ae3b358b7fb6fcc73383c05714b45e2 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Mon, 15 Feb 2021 00:27:46 +0100
Subject: [PATCH] Show queue counts in side menu
---
.../webapp/src/main/elm/Page/Queue/View2.elm | 41 ++++++++++++++++---
1 file changed, 35 insertions(+), 6 deletions(-)
diff --git a/modules/webapp/src/main/elm/Page/Queue/View2.elm b/modules/webapp/src/main/elm/Page/Queue/View2.elm
index 28f4f6f8..a59534b4 100644
--- a/modules/webapp/src/main/elm/Page/Queue/View2.elm
+++ b/modules/webapp/src/main/elm/Page/Queue/View2.elm
@@ -18,6 +18,26 @@ import Util.Time exposing (formatDateTime, formatIsoDateTime)
viewSidebar : Bool -> Flags -> UiSettings -> Model -> Html Msg
viewSidebar visible _ _ model =
let
+ count v =
+ case v of
+ CurrentJobs ->
+ List.length model.state.progress
+
+ QueueAll ->
+ List.length model.state.queued
+ + List.length model.state.completed
+
+ QueueWaiting ->
+ List.length model.state.queued
+
+ QueueSuccess ->
+ filterJobDetails model.state.completed "success"
+ |> List.length
+
+ QueueError ->
+ filterJobDetails model.state.completed "failed"
+ |> List.length
+
tabLink cls v icon label =
a
[ href "#"
@@ -28,9 +48,12 @@ viewSidebar visible _ _ model =
]
[ i [ class icon ]
[]
- , span
+ , div
[ class "ml-3" ]
[ text label ]
+ , div [ class "ml-auto bg-gray-200 border rounded-full h-6 w-6 flex items-center justify-center text-xs dark:bg-bluegray-800 dark:text-bluegray-200 dark:border-bluegray-800 dark:bg-opacity-50" ]
+ [ count v |> String.fromInt |> text
+ ]
]
in
div
@@ -60,9 +83,6 @@ viewContent _ _ model =
gridStyle =
"grid gap-4 grid-cols-1 md:grid-cols-2"
- isState state job =
- state == job.state
-
message str =
div [ class "h-28 flex flex-col items-center justify-center w-full" ]
[ div [ class S.header2 ]
@@ -110,7 +130,7 @@ viewContent _ _ model =
QueueError ->
let
items =
- List.filter (isState "failed") model.state.completed
+ filterJobDetails model.state.completed "failed"
in
if List.isEmpty items then
message "No failed jobs to display."
@@ -122,7 +142,7 @@ viewContent _ _ model =
QueueSuccess ->
let
items =
- List.filter (isState "success") model.state.completed
+ filterJobDetails model.state.completed "success"
in
if List.isEmpty items then
message "No succesfull jobs to display."
@@ -133,6 +153,15 @@ viewContent _ _ model =
]
+filterJobDetails : List JobDetail -> String -> List JobDetail
+filterJobDetails list state =
+ let
+ isState job =
+ state == job.state
+ in
+ List.filter isState list
+
+
renderJobLog : JobDetail -> Html Msg
renderJobLog job =
div