Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions site/frontend/src/pages/status_new/collector.vue
Original file line number Diff line number Diff line change
@@ -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<{
Expand All @@ -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>
Expand Down Expand Up @@ -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>

Expand All @@ -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"
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 2 additions & 3 deletions site/frontend/src/pages/status_new/page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)">
Expand Down Expand Up @@ -210,7 +210,6 @@ loadStatusData(loading);
.collector-wrapper {
width: 100%;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
padding-left: 8px;
Expand Down
10 changes: 10 additions & 0 deletions site/frontend/src/utils/formatting.ts
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 "";
}
4 changes: 2 additions & 2 deletions site/src/job_queue/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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;
}
}

Expand Down
Loading