dashboard: queue log link opens BUILD L0GS tab instead of downloading
Fixes hyperhive#2895. The rebuild-queue tree's per-node log icon (the printer-glyph "open" affordance next to each node in the R3BU1LD QU3U3 tab) linked directly to the raw-text download endpoint (/api/build-log/<node_id>/raw, which sets Content-Disposition: attachment server-side) -- surprising, since nothing about that icon signals "this leaves the app", unlike the other two explicit "download raw"/"raw" links elsewhere on the page. Point it at the existing ?id=N#buildlogs deep-link into the BUILD L0GS tab instead (builds.js's fetchBuild already auto-expands + scrolls to the matching row there). That deep-link's id is the build-log history row id -- a different id space than the queue tree's NodeId, and wasn't exposed to the frontend before (only a derived has_log bool was). Added NodeView.build_log_id: Option<i64> to the wire type alongside the existing has_log (kept, since findLiveBuild's separate live-log-panel gate still needs a plain bool), threaded through job_queue::mod.rs, updated hivectl's NodeView test-helper literal. The raw download is still one click away once on that row's BUILD L0GS detail (the two already-explicit raw-download links are untouched). cargo build/clippy/test clean across the three touched crates (hive-c0re, hive-host-sock, hivectl); nix fmt clean; frontend build verified (grep for build_log_id in the built builds.js bundle).
This commit is contained in:
parent
a962fae348
commit
662e303e72
4 changed files with 19 additions and 5 deletions
|
|
@ -376,12 +376,17 @@ function renderQueueEntry(entry) {
|
|||
chip.append(el('span', { class: 'rqe-node-agent' }, ' · ' + n.agent));
|
||||
}
|
||||
row.append(chip);
|
||||
if (n.has_log) {
|
||||
if (n.build_log_id != null) {
|
||||
// Deep-links into the BUILD L0GS tab's rich view (auto-expands +
|
||||
// scrolls to this row there, see fetchBuild's `?id=N` handling)
|
||||
// rather than the raw-text download endpoint — a plain download
|
||||
// is surprising here since nothing about a printer-glyph icon
|
||||
// says "this leaves the app". The raw download is still one
|
||||
// click away once on that row.
|
||||
row.append(el('a', {
|
||||
class: 'rqe-log-link rqe-node-log',
|
||||
href: '/api/build-log/' + n.id + '/raw',
|
||||
target: '_blank',
|
||||
title: 'download build log for ' + n.kind + ' node',
|
||||
href: '/builds.html?id=' + n.build_log_id + '#buildlogs',
|
||||
title: 'view build log for ' + n.kind + ' node',
|
||||
}, '⎙'));
|
||||
}
|
||||
treeRoot.append(row);
|
||||
|
|
|
|||
|
|
@ -559,7 +559,8 @@ impl QueueInner {
|
|||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
let has_log = self.node_rt.get(&id).and_then(|r| r.build_log_id).is_some();
|
||||
let build_log_id = self.node_rt.get(&id).and_then(|r| r.build_log_id);
|
||||
let has_log = build_log_id.is_some();
|
||||
// `node.parent` is the structural jobq parent. Top-level nodes
|
||||
// have `parent == Some(container)` (direct children of the Dag
|
||||
// container); those become `parent: None` on the wire since the
|
||||
|
|
@ -581,6 +582,7 @@ impl QueueInner {
|
|||
approval_id,
|
||||
inputs,
|
||||
has_log,
|
||||
build_log_id,
|
||||
parent,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,6 +111,12 @@ pub struct NodeView {
|
|||
/// store-only nodes don't render a link that 404s.
|
||||
#[serde(default)]
|
||||
pub has_log: bool,
|
||||
/// The underlying build-log history row id, when this node has a
|
||||
/// captured log (`Some` iff `has_log`). Lets the client deep-link to the
|
||||
/// rich BUILD L0GS tab view (`/builds.html?id=<id>#buildlogs`) instead of
|
||||
/// only the raw-text download endpoint.
|
||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||
pub build_log_id: Option<i64>,
|
||||
/// Structural parent in the jobq tree — `None` for top-level nodes
|
||||
/// (direct children of the DAG container). Sub-nodes carry the id of
|
||||
/// their containing parent node. The client uses this to render the
|
||||
|
|
|
|||
|
|
@ -343,6 +343,7 @@ mod tests {
|
|||
approval_id: None,
|
||||
inputs: vec![],
|
||||
has_log: false,
|
||||
build_log_id: None,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue