PR Feedback; change check for job progress & small refactor for job completion

Author: Jamesbarford

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

@@ -2,7 +2,7 @@
 import {h, ref, Ref} from "vue";
 import {parseISO, differenceInHours} from "date-fns";
 import {formatISODate, shortenTag} from "../../utils/formatting";
-import {CollectorConfig, BenchmarkJobStatus} from "./data";
+import {CollectorConfig, BenchmarkJobStatus, isJobComplete} from "./data";
 
 const props = defineProps<{
   collector: CollectorConfig;
@@ -56,9 +56,7 @@ function ActiveStatus({collector}: {collector: CollectorConfig}) {
         statusText = "Offline";
         statusClass = "offline";
       } else {
-        const allJobsComplete = collector.jobs.every(
-          (job) => job.status === "Failed" || job.status === "Success"
-        );
+        const allJobsComplete = collector.jobs.every(isJobComplete);
         if (allJobsComplete) {
           statusText = "Waiting";
           statusClass = "waiting";

site/frontend/src/pages/status_new/data.ts

@@ -42,3 +42,7 @@ export type StatusResponse = {
   requests: BenchmarkRequest[];
   collectors: CollectorConfig[];
 };
+
+export function isJobComplete(job: BenchmarkJob): boolean {
+  return job.status === "Failed" || job.status === "Success";
+}

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

@@ -13,9 +13,9 @@ import {useExpandedStore} from "../../utils/expansion";
 import {
   BenchmarkRequest,
   BenchmarkRequestStatus,
-  BenchmarkJob,
   CollectorConfig,
   StatusResponse,
+  isJobComplete,
 } from "./data";
 import Collector from "./collector.vue";
 
@@ -123,30 +123,23 @@ function PullRequestLink({request}: {request: BenchmarkRequest}) {
   );
 }
 
-// This works off the assumption that all of the collectors are working on the
-// same request.
 function getJobCompletion(
   req: BenchmarkRequest,
   collectors: CollectorConfig[]
 ) {
-  const sampleJob = collectors?.[0]?.jobs?.[0];
-  if (!sampleJob) return "";
-  if (sampleJob.requestTag !== req.tag) return "";
-
-  const allJobs: BenchmarkJob[] = [];
-  for (const collector of collectors) {
-    allJobs.push(...collector.jobs);
+  const jobs = collectors
+    .flatMap((c) => c.jobs)
+    .filter((j) => j.requestTag === req.tag);
+  if (jobs.length === 0) {
+    return "";
   }
-  const completed = allJobs.reduce((acc, job) => {
-    if (job.status === "Failed" || job.status === "Success") {
+  const completed = jobs.reduce((acc, job) => {
+    if (isJobComplete(job)) {
       acc += 1;
     }
     return acc;
   }, 0);
-  if (allJobs.length) {
-    return `${completed} / ${allJobs.length}`;
-  }
-  return "";
+  return `${completed} / ${jobs.length}`;
 }
 
 const {toggleExpanded: toggleExpandedErrors, isExpanded: hasExpandedErrors} =