Merge branch 'master' into query-fix

modules/webapp/src/main/elm/Comp/ItemDetail/SingleAttachment.elm

@@ -129,7 +129,7 @@ attachHeader texts settings model _ attach =
     in
     div [ class "flex flex-col sm:flex-row items-center w-full" ]
         [ attachSelectToggle False
-        , div [ class "ml-2 text-base font-bold flex-grow w-full text-center sm:text-left" ]
+        , div [ class "ml-2 text-base font-bold flex-grow w-full text-center sm:text-left break-all" ]
             [ text attachName
             , text " ("
             , text (Util.Size.bytesReadable Util.Size.B (toFloat attach.size))

modules/webapp/src/main/elm/Messages/Page/Queue.elm

@@ -10,11 +10,13 @@ type alias Texts =
     , waiting : String
     , errored : String
     , success : String
+    , cancelled : String
     , noJobsRunning : String
     , noJobsDisplay : String
     , noJobsWaiting : String
     , noJobsFailed : String
     , noJobsSuccess : String
+    , noJobsCancelled : String
     , deleteThisJob : String
     , showLog : String
     , remove : String
@@ -32,11 +34,13 @@ gb =
     , waiting = "Waiting"
     , errored = "Errored"
     , success = "Success"
+    , cancelled = "Cancelled"
     , noJobsRunning = "No jobs currently running."
     , noJobsDisplay = "No jobs to display."
     , noJobsWaiting = "No waiting jobs."
     , noJobsFailed = "No failed jobs to display."
     , noJobsSuccess = "No succesfull jobs to display."
+    , noJobsCancelled = "No cancelled jobs to display."
     , deleteThisJob = "Cancel/Delete this job?"
     , showLog = "Show log"
     , remove = "Remove"

modules/webapp/src/main/elm/Page/Queue/Data.elm

@@ -38,6 +38,7 @@ type QueueView
     | QueueWaiting
     | QueueError
     | QueueSuccess
+    | QueueCancelled
 
 
 emptyModel : Model

modules/webapp/src/main/elm/Page/Queue/View2.elm

@@ -39,6 +39,10 @@ viewSidebar texts visible _ _ model =
                     filterJobDetails model.state.completed "failed"
                         |> List.length
 
+                QueueCancelled ->
+                    filterJobDetails model.state.completed "cancelled"
+                        |> List.length
+
         tabLink cls v icon label =
             a
                 [ href "#"
@@ -74,6 +78,7 @@ viewSidebar texts visible _ _ model =
             , tabLink "ml-8" QueueWaiting "fa fa-clock" texts.waiting
             , tabLink "ml-8" QueueError "fa fa-bolt" texts.errored
             , tabLink "ml-8" QueueSuccess "fa fa-check" texts.success
+            , tabLink "ml-8" QueueCancelled "fa fa-times-circle" texts.cancelled
             ]
         ]
 
@@ -151,6 +156,18 @@ viewContent texts _ _ model =
                 else
                     div [ class gridStyle ]
                         (List.map (renderInfoCard texts model) items)
+
+            QueueCancelled ->
+                let
+                    items =
+                        filterJobDetails model.state.completed "cancelled"
+                in
+                if List.isEmpty items then
+                    message texts.noJobsCancelled
+
+                else
+                    div [ class gridStyle ]
+                        (List.map (renderInfoCard texts model) items)
         ]