Include active jobs in history, and sort by start time

Author: plotnick

common/src/jobs.rs

@@ -258,6 +258,12 @@ impl JobStatus {
         }
     }
 
+    pub fn time_started(&self) -> DateTime<Utc> {
+        match self {
+            Self::Started { time_started, .. } | Self::Ended { time_started, .. } => *time_started,
+        }
+    }
+
     pub fn time_elapsed(&self) -> TimeDelta {
         match self {
             Self::Started { time_started, .. } => Utc::now() - time_started,

server/src/manager.rs

@@ -428,13 +428,19 @@ impl JobManager {
         &self,
         _authn: &Identity, // anyone may retrieve job history
     ) -> Result<Vec<JobStatus>, JobError> {
-        Ok(self
-            .job_history
-            .lock()
-            .await
-            .iter()
-            .map(|(_id, status)| status.to_owned())
-            .collect())
+        let mut jobs = Vec::new();
+        self.with_jobs(
+            &mut self.session.lock().await,
+            |active_jobs, job_history| {
+                for (_id, status) in active_jobs.iter().chain(job_history.iter()) {
+                    jobs.push(status.clone());
+                }
+                Ok(())
+            },
+        )
+        .await?;
+        jobs.sort_by_key(JobStatus::time_started);
+        Ok(jobs)
     }
 
     pub async fn job_start(