diff --git a/oxa/oxa-cli/src/lead_page.rs b/oxa/oxa-cli/src/lead_page.rs index e9ca9b24..c8234a79 100644 --- a/oxa/oxa-cli/src/lead_page.rs +++ b/oxa/oxa-cli/src/lead_page.rs @@ -1,6 +1,6 @@ //! Read-only web projection. Never serialize runner records or arbitrary GitHub payloads. use oxa_proto::work::{IncidentKind, PullRequest, Snapshot, Subject}; -use oxa_work::board::{Action, Board}; +use oxa_work::board::{Action, Board, Entry}; use std::fmt::Write; mod chat; @@ -82,7 +82,11 @@ pub fn content(view: &View<'_>, now: u64) -> String { } pub fn content_for(page: Page, view: &View<'_>, now: u64) -> String { - let mut html = format!("

{}

", page.title()); + let title = match page { + Page::Item(number) => format!("Item #{number}"), + _ => page.title().into(), + }; + let mut html = format!("

{title}

"); if page == Page::Home { attention(&mut html, view); } @@ -106,6 +110,7 @@ pub fn content_for(page: Page, view: &View<'_>, now: u64) -> String { } Page::Workers => workers(&mut html, view), Page::Asks => asks(&mut html, view), + Page::Item(number) => item(&mut html, view, number, now), Page::Chat(prompt) => chat::render(&mut html, view, prompt), Page::Usage => html .push_str("

Plans and quotas

Usage observations unavailable.

"), @@ -186,17 +191,10 @@ fn board(html: &mut String, view: &View<'_>, now: u64, query: Query) { html.push_str("
"); let offset = query.page.saturating_mul(pages::BOARD_ROWS); for row in rows.iter().skip(offset).take(pages::BOARD_ROWS) { - let lease = row.lease.as_ref().map_or("Unleased".into(), |l| { - format!( - "{} · expires {}{}", - escape(&l.holder), - l.expires_at, - if l.expires_at <= now { " (expired)" } else { "" } - ) - }); + let lease = lease(row, now); let _ = write!( html, - "", + "", row.number, action(row.action), if row.release_pinned { "Release" } else { "Normal" }, @@ -232,6 +230,34 @@ fn board(html: &mut String, view: &View<'_>, now: u64, query: Query) { html.push_str(""); } +fn lease(row: &Entry, now: u64) -> String { + row.lease.as_ref().map_or("Unleased".into(), |l| { + format!( + "{} · expires {}{}", + escape(&l.holder), + l.expires_at, + if l.expires_at <= now { " (expired)" } else { "" } + ) + }) +} + +fn item(html: &mut String, view: &View<'_>, number: u64, now: u64) { + html.push_str("

Back to Board

"); + let Some(board) = view.board else { + html.push_str("

Board unavailable.

"); + return; + }; + let Some(row) = board.entries.iter().find(|row| row.number == number) else { + html.push_str("

Item unavailable in this snapshot.

"); + return; + }; + let _ = write!(html, + "

Next action

{}

State

{}

{}

Attempts today: {}

Observed at {} (Unix seconds)

", + action(row.action), if row.release_pinned { "Release" } else { "Normal priority" }, + lease(row, now), row.attempts_today, board.observed_at); + html.push_str("

Details and changes

Title, checks, findings and diff observations unavailable.

"); +} + fn workers(html: &mut String, view: &View<'_>) { html.push_str("

Workers

"); if let Some(s) = view.situation { diff --git a/oxa/oxa-cli/src/lead_page/pages.rs b/oxa/oxa-cli/src/lead_page/pages.rs index 2568e378..93e06193 100644 --- a/oxa/oxa-cli/src/lead_page/pages.rs +++ b/oxa/oxa-cli/src/lead_page/pages.rs @@ -18,6 +18,7 @@ pub enum Page { BoardQuery(Query), Workers, Usage, + Item(u64), Chat(Prompt), } @@ -31,6 +32,7 @@ impl Page { Self::Board | Self::BoardQuery(_) => "Board", Self::Workers => "Workers", Self::Usage => "Usage", + Self::Item(_) => "Item", Self::Chat(_) => "Chat with lead", } } @@ -39,7 +41,7 @@ impl Page { match self { Self::Home => "/", Self::Asks => "/asks", - Self::Board | Self::BoardQuery(_) => "/board", + Self::Board | Self::BoardQuery(_) | Self::Item(_) => "/board", Self::Workers => "/workers", Self::Usage => "/usage", Self::Chat(_) => "/chat", @@ -51,6 +53,10 @@ impl Page { .strip_suffix("?fragment=1") .or_else(|| path.strip_suffix("&fragment=1")) .map_or((path, false), |path| (path, true)); + if let Some(number) = path.strip_prefix("/items/") { + let parsed: u64 = number.parse().ok()?; + return (parsed > 0 && parsed.to_string() == number).then_some((Self::Item(parsed), fragment)); + } if let Some(query) = path.strip_prefix("/board?") { return Some((Self::BoardQuery(Query::parse(query)?), fragment)); } @@ -71,7 +77,7 @@ impl Page { pub(super) fn navigation(self) -> String { let mut html = String::from("
PRNext actionPriorityLeaseAttempts today
#{}{}{}{lease}{}
#{0}{1}{2}{lease}{3}