From 14f1d7a246746bb96406de3afa0125d2728df259 Mon Sep 17 00:00:00 2001
From: tdurieux <durieuxthomas@hotmail.com>
Date: Sun, 26 Sep 2021 07:52:00 +0200
Subject: [PATCH] chore: improve queue admin

---
 public/partials/admin/queues.htm | 56 ++++++++++++++++++++++++++++++--
 public/script/app.js             |  2 +-
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/public/partials/admin/queues.htm b/public/partials/admin/queues.htm
index 08f1c04..808fbaf 100644
--- a/public/partials/admin/queues.htm
+++ b/public/partials/admin/queues.htm
@@ -6,7 +6,33 @@
         class="col-12 d-flex px-0 py-3 border-bottom color-border-secondary"
         ng-repeat="job in downloadJobs as filteredDownloadJobs"
       >
-        <div class="w-100">{{job}}</div>
+        <div class="w-100">
+          <div class="">
+            <h3>
+              <a target="__blank" ng-href="/r/{{job.id}}" ng-bind="job.id"></a>
+              <span class="badge" ng-bind="repo.progress | title"></span>
+            </h3>
+          </div>
+          <div class="color-text-secondary mb-1">
+            <span ng-if="job.timestamp">
+              Created on:
+              <span ng-bind="job.timestamp | humanTime"></span>
+            </span>
+            <span ng-if="job.finishedOn">
+              Finished on:
+              <span ng-bind="job.finishedOn | humanTime"></span>
+            </span>
+            <span ng-if="job.processedOn">
+              Processed on:
+              <span ng-bind="job.processedOn | humanTime"></span>
+            </span>
+          </div>
+          <div>
+            <pre
+              ng-repeat="stack in job.stacktrace"
+            ><code ng-bind="stack"></code></pre>
+          </div>
+        </div>
         <div class="d-flex">
           <div class="dropdown">
             <button
@@ -51,7 +77,33 @@
         class="col-12 d-flex px-0 py-3 border-bottom color-border-secondary"
         ng-repeat="job in removeJobs as filteredRemoveJobs"
       >
-        <div class="w-100">{{job}}</div>
+        <div class="w-100">
+          <div class="">
+            <h3>
+              <a target="__blank" ng-href="/r/{{job.id}}" ng-bind="job.id"></a>
+              <span class="badge" ng-bind="repo.progress | title"></span>
+            </h3>
+          </div>
+          <div class="color-text-secondary mb-1">
+            <span ng-if="job.timestamp">
+              Created on:
+              <span ng-bind="job.timestamp | humanTime"></span>
+            </span>
+            <span ng-if="job.finishedOn">
+              Finished on:
+              <span ng-bind="job.finishedOn | humanTime"></span>
+            </span>
+            <span ng-if="job.processedOn">
+              Processed on:
+              <span ng-bind="job.processedOn | humanTime"></span>
+            </span>
+          </div>
+          <div>
+            <pre
+              ng-repeat="stack in job.stacktrace"
+            ><code ng-bind="stack"></code></pre>
+          </div>
+        </div>
         <div class="d-flex">
           <div class="dropdown">
             <button
diff --git a/public/script/app.js b/public/script/app.js
index a7f6a41..d407b5a 100644
--- a/public/script/app.js
+++ b/public/script/app.js
@@ -153,7 +153,7 @@ angular
       }
       if (seconds instanceof Date)
         seconds = Math.round((Date.now() - seconds) / 1000);
-      if (typeof seconds == "string")
+      if (typeof seconds == "string" || typeof seconds == "number")
         seconds = Math.round((Date.now() - new Date(seconds)) / 1000);
       var suffix = seconds < 0 ? "from now" : "ago";