From cbdd3d2d86fb2ef0276c2772673fa7f7f5ec065a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Fri, 20 Nov 2026 10:55:28 +0100 Subject: [PATCH] desktop: Refresh CI status on job updates Every status chip of a repository shares one list of its jobs, which refreshes when a job changes, at most every few seconds, since listing them scans every job of the repository. --- .../radicle-tauri/src/commands/cob/job.rs | 4 +- .../crates/radicle-types/src/traits/job.rs | 90 ++++++++++++++++- desktop/crates/test-http-api/src/api.rs | 8 +- desktop/src/components/JobCob.svelte | 29 ++++-- desktop/src/lib/invoke.ts | 16 +--- desktop/src/lib/startup.svelte.ts | 37 +++++-- desktop/tests/unit/eventBatch.test.ts | 96 +++++++++++++++++++ shared/core/src/keys.ts | 1 + shared/core/src/refUpdates.ts | 5 + shared/core/tests/refUpdates.test.ts | 9 ++ shared/ui/lib/query.svelte.ts | 1 + 11 files changed, 258 insertions(+), 38 deletions(-) create mode 100644 desktop/tests/unit/eventBatch.test.ts diff --git a/desktop/crates/radicle-tauri/src/commands/cob/job.rs b/desktop/crates/radicle-tauri/src/commands/cob/job.rs index 07099d165..9c6826857 100644 --- a/desktop/crates/radicle-tauri/src/commands/cob/job.rs +++ b/desktop/crates/radicle-tauri/src/commands/cob/job.rs @@ -1,4 +1,3 @@ -use radicle::git; use radicle::identity::RepoId; use radicle_types::cobs::job; use radicle_types::error::Error; @@ -11,7 +10,6 @@ use crate::commands::blocking; pub async fn list_jobs( ctx: tauri::State<'_, AppState>, rid: RepoId, - sha: git::Oid, ) -> Result, Error> { - blocking(ctx, move |ctx| ctx.list_jobs(rid, sha)).await + blocking(ctx, move |ctx| ctx.list_jobs(rid)).await } diff --git a/desktop/crates/radicle-types/src/traits/job.rs b/desktop/crates/radicle-types/src/traits/job.rs index 7318fb6e4..cb8939a9a 100644 --- a/desktop/crates/radicle-types/src/traits/job.rs +++ b/desktop/crates/radicle-types/src/traits/job.rs @@ -1,6 +1,6 @@ use radicle::cob::store::access::ReadOnly; +use radicle::identity; use radicle::storage::ReadStorage; -use radicle::{git, identity}; use radicle_job::{Job, JobId, Jobs as JobsStore}; use crate::cobs::job; @@ -8,13 +8,18 @@ use crate::error::Error; use crate::traits::Profile; pub trait Jobs: Profile { - fn list_jobs(&self, rid: identity::RepoId, sha: git::Oid) -> Result, Error> { + /// Every job of the repository that has runs. Finding one commit's jobs + /// scans them all anyway, so views share one scan and pick their commits. + fn list_jobs(&self, rid: identity::RepoId) -> Result, Error> { let profile = self.profile(); let repo = profile.storage.repository(rid)?; let aliases = &profile.aliases(); let jobs = JobsStore::open(&repo, ReadOnly)?; - let found_jobs: Result, _> = jobs.find_by_commit(sha)?.collect(); + let found_jobs: Result, _> = jobs + .all()? + .map(|job| job.map(|(id, job)| (JobId::from(id), job))) + .collect(); Ok(found_jobs? .into_iter() @@ -23,3 +28,82 @@ pub trait Jobs: Profile { .collect()) } } + +#[cfg(test)] +#[allow(clippy::unwrap_used)] +mod test { + use std::convert::Infallible; + + use radicle::cob::store::access::WriteAs; + use radicle::cob::{self, Contents, Create, Entry, Evaluate, Version}; + use radicle::crypto::{Seed, SigningKey}; + use radicle::git::Oid; + use radicle::storage::ReadStorage; + use radicle::test::fixtures; + use radicle_job::{Jobs as JobsStore, TYPENAME}; + + use crate::traits::job::Jobs; + use crate::{AppState, test}; + + /// Accepts any contents, to write a job that the job store can't load. + struct Raw; + + impl Evaluate for Raw { + type Error = Infallible; + + fn init(_: &Entry, _: &R) -> Result { + Ok(Raw) + } + + fn apply<'a, I: Iterator>( + &mut self, + _: &Entry, + _: I, + _: &R, + ) -> Result<(), Self::Error> { + Ok(()) + } + } + + #[test] + fn list_jobs_skips_jobs_that_cannot_be_loaded() { + let tmp = tempfile::tempdir().unwrap(); + let profile = test::profile(&tmp.path().join("home"), [0xff; 32]); + let signer = SigningKey::from_seed(Seed::new([0xff; 32])); + let (rid, _, _, head) = + fixtures::project(tmp.path().join("working"), &profile.storage, &signer).unwrap(); + let repo = profile.storage.repository(rid).unwrap(); + + let mut jobs = JobsStore::open(&repo, WriteAs::new(&signer)).unwrap(); + let mut job = jobs.create(head.into()).unwrap(); + job.run( + serde_json::from_str("\"67e55044-10b1-426f-9247-bb680e5fe0c8\"").unwrap(), + "https://ci.example/1".parse().unwrap(), + ) + .unwrap(); + let id = job.id; + + cob::create::( + &repo, + &signer, + None, + vec![], + &profile.public_key, + Create { + contents: Contents::new(b"not a job action".to_vec()), + type_name: TYPENAME.clone(), + message: "Broken job".to_string(), + embeds: vec![], + version: Version::default(), + }, + ) + .unwrap(); + + let state = AppState { profile }; + let listed = state.list_jobs(rid).unwrap(); + assert_eq!( + listed.iter().map(|job| job.job_id).collect::>(), + vec![id] + ); + } +} diff --git a/desktop/crates/test-http-api/src/api.rs b/desktop/crates/test-http-api/src/api.rs index c1cba86a8..7c085cd9f 100644 --- a/desktop/crates/test-http-api/src/api.rs +++ b/desktop/crates/test-http-api/src/api.rs @@ -1745,14 +1745,10 @@ async fn delete_patch_handler( #[derive(Serialize, Deserialize)] struct JobsBody { pub rid: identity::RepoId, - pub sha: git::Oid, } -async fn jobs_handler( - Ctx(ctx): Ctx, - Json(JobsBody { rid, sha }): Json, -) -> impl IntoResponse { - let jobs = ctx.list_jobs(rid, sha)?; +async fn jobs_handler(Ctx(ctx): Ctx, Json(JobsBody { rid }): Json) -> impl IntoResponse { + let jobs = ctx.list_jobs(rid)?; Ok::<_, Error>(Json(jobs)) } diff --git a/desktop/src/components/JobCob.svelte b/desktop/src/components/JobCob.svelte index c77efd370..4da9d60b9 100644 --- a/desktop/src/components/JobCob.svelte +++ b/desktop/src/components/JobCob.svelte @@ -1,4 +1,8 @@