Merge pull request #2243 from Jamesbarford/fix/small-snags-1

Fix; date formatting and job status

Author: Kobzol

site/frontend/src/pages/status_new/collector.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import {ref, Ref} from "vue";
+import {formatISODate} from "../../utils/formatting";
 import {CollectorConfig, BenchmarkJobStatus} from "./data";
 
 const props = defineProps<{
@@ -26,6 +27,19 @@ const ACTIVE_FILTERS: Ref<Record<BenchmarkJobStatus, boolean>> = ref({
 function filterJobByStatus(status: string) {
   ACTIVE_FILTERS.value[status] = !ACTIVE_FILTERS.value[status];
 }
+
+function formatJobStatus(status: BenchmarkJobStatus): string {
+  switch (status) {
+    case "InProgress":
+      return "In progress";
+    case "Success":
+    case "Failed":
+    case "Queued":
+      return status;
+    default:
+      return "Unknown";
+  }
+}
 </script>
 
 <template>
@@ -62,14 +76,14 @@ function filterJobByStatus(status: string) {
         <span class="collector-meta-name">
           <strong>Last Heartbeat:</strong>
         </span>
-        <span>{{ collector.lastHeartbeatAt }}</span>
+        <span>{{ formatISODate(collector.lastHeartbeatAt) }}</span>
       </div>
 
       <div class="collector-meta">
         <span class="collector-meta-name">
           <strong>Date Added:</strong>
         </span>
-        <span>{{ collector.dateAdded }}</span>
+        <span>{{ formatISODate(collector.dateAdded) }}</span>
       </div>
     </div>
 
@@ -83,7 +97,7 @@ function filterJobByStatus(status: string) {
                 class="table-collector-status-filter-btn"
                 @click="filterJobByStatus(filter)"
               >
-                {{ filter }}
+                {{ formatJobStatus(filter) }}
                 <input
                   type="checkbox"
                   value="filter"
@@ -115,10 +129,10 @@ function filterJobByStatus(status: string) {
                 {{ job.requestTag }}
               </td>
               <td class="table-cell-padding">
-                {{ job.status }}
+                {{ formatJobStatus(job.status) }}
               </td>
               <td class="table-cell-padding">
-                {{ job.startedAt }}
+                {{ formatISODate(job.startedAt) }}
               </td>
               <td class="table-cell-padding">{{ job.backend }}</td>
               <td class="table-cell-padding">{{ job.profile }}</td>

site/frontend/src/pages/status_new/page.vue

@@ -4,7 +4,7 @@ import {h, ref, Ref} from "vue";
 import {getJson} from "../../utils/requests";
 import {STATUS_DATA_NEW_URL} from "../../urls";
 import {withLoading} from "../../utils/loading";
-import {formatSecondsAsDuration} from "../../utils/formatting";
+import {formatSecondsAsDuration, formatISODate} from "../../utils/formatting";
 import {useExpandedStore} from "../../utils/expansion";
 import {
   BenchmarkRequest,
@@ -158,7 +158,7 @@ loadStatusData(loading);
                     req.status === "Completed" && req.hasPendingJobs ? "*" : ""
                   }}
                 </td>
-                <td v-html="req.completedAt"></td>
+                <td v-html="formatISODate(req.completedAt)"></td>
                 <td v-html="getDuration(req)"></td>
 
                 <td v-if="hasErrors(req.errors)">
@@ -210,7 +210,6 @@ loadStatusData(loading);
 .collector-wrapper {
   width: 100%;
   display: flex;
-  justify-content: center;
   align-items: center;
   flex-direction: column;
   padding-left: 8px;

site/frontend/src/utils/formatting.ts

@@ -1,3 +1,5 @@
+import {parseISO, format} from "date-fns";
+
 // `time` has to be in seconds
 export function formatSecondsAsDuration(time: number): string {
   let seconds = time % 60;
@@ -17,3 +19,11 @@ export function formatSecondsAsDuration(time: number): string {
   }
   return s;
 }
+
+// Takes a date like `2025-09-10T08:22:47.161348Z` -> `"2025-09-10 08:22:47"`
+export function formatISODate(dateString?: string): string {
+  if (dateString) {
+    return format(parseISO(dateString), "yyyy-MM-dd HH:mm:ss");
+  }
+  return "";
+}

site/src/job_queue/mod.rs

@@ -289,8 +289,6 @@ pub async fn cron_main(site_ctxt: Arc<RwLock<Option<Arc<SiteCtxt>>>>, seconds: u
     let ctxt = site_ctxt.clone();
 
     loop {
-        interval.tick().await;
-
         if let Some(ctxt_clone) = {
             let guard = ctxt.read();
             guard.as_ref().cloned()
@@ -300,6 +298,8 @@ pub async fn cron_main(site_ctxt: Arc<RwLock<Option<Arc<SiteCtxt>>>>, seconds: u
                 Err(e) => log::error!("Cron job failed to execute: {e:?}"),
             }
         }
+
+        interval.tick().await;
     }
 }