Repository navigation
🐛 Activity Monitor: base-branch pill sits beside the repo chip - #16621
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Generated by changelog-fragment-guard from the PR title (#5675). Edit the wording freely, or replace this file with the no-changelog label if the change is not user-visible. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: clubanderson <407614+clubanderson@users.noreply.github.com>
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. clubanderson this PR is held at Failing checks:
Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path. Review findings from Read against v5 at merge-base Why CI is red:
|
There was a problem hiding this comment.
The code change looks correct to me; the only thing holding this back is the changelog fragment, which is why changelog-fragment-guard (and, downstream of it, native-queue-policy) are red.
src/scripts/check-changelog-fragment.sh output at f001b9a:
a fragment must start with a '- ' entry bullet (or a '' marker) — it IS the entry; the compiler owns the ### headings
changelog.d/changed-activity-monitor-base-pill-by-repo-chip.md:1 starts with Activity Monitor rows now draw… with no leading - . The second fragment, changelog.d/fixed-16621.md, is bulleted but is just the PR title — two fragments for one change will produce two entries. Suggest: prefix the changed-… fragment with - and drop fixed-16621.md (the descriptive one is the entry a reader wants). native-queue-policy fails only because it reads the guard's conclusion (.github/scripts/native-queue-policy.cjs:97), so it will clear on the same push.
What I checked on the code, at this head:
stageTrackerPRPillsHtmllost its third parameter (tracker-row-layout.js:224). Every caller instatic-src/jsand every test stub/jsFuncloader (tracker-row-render.js:108,tracker-row-layout.js:247, the five*_test.goand three*.test.jsfiles) was updated — nothing still passesbaseRef.item.base_ref/lp.base_refare real fields on both the PR item (stage_tracker.go:298) and the linked-PR record (stage_tracker.go:703), sostageTrackerBasePillHtml(item.base_ref, item.number)attracker-row-render.js:136and the sub-row call attracker-row-layout.js:245read populated data;tracker-integration-execution.js:13already relies on the same field.stageTrackerBasePillHtmlescapes both the tooltip and the label (tracker-row-layout.js:232-233).node --test src/pkg/dashboard/*.test.js→ 302/302 pass;go run ./pkg/dashboard/webstatic/gen … -check→ clean, so the committedstatic/index.htmlmatchesstatic-src.
— hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Scanner triage at f001b9a (comment-only; the hive does not push to this branch): the red Failing test (3/3 reruns, deterministic): This PR branched at Verdict: MERGE_BASE — merge/rebase onto current 🐝 Hive Agent: — hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
f001b9a to
97751fa
Compare
There was a problem hiding this comment.
Looks correct to me.
Verified against the v5 tree at 0f56a75:
stageTrackerPRPillsHtmlhas exactly two callers instatic-src/js(tracker-row-layout.js:238,tracker-row-render.js:106on v5) and both are updated to the two-argument form, so no caller still passeslp.base_refinto the right-hand cluster and the pill cannot render twice.- The new PR-row pill reads
item.base_ref, which the Go side populates for PR items (stage_tracker.go:298,json:"base_ref,omitempty"), andstageTrackerBasePillHtmlreturns''on an empty base — so the three${chip}sites intracker-row-render.js:141/152/158degrade to the bare repo chip, as before, when a base is unknown. - Sub-rows use
lp.base_ref+pr.number(tracker-row-layout.js:245), matching the per-PR tooltip the body describes.
One coordination note, not a defect: #16628 also edits tracker-row-layout.js, tracker-row-render.js and the generated static/index.html. Whichever lands second will need a rebase and make dashboard-gen rerun before dashboard-gen-check passes.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Quality triage at Failing: Cause: Fix (one line, line 56): - for (const name of ['stageTrackerLinkedPRItem', 'stageTrackerLinkedPROpen', 'stageTrackerLinkedDrawnHere', 'stageTrackerLinkedSorted', 'stageTrackerHeadColsHtml', 'stageTrackerSubRowHtml']) vm.runInContext(fn('tracker-row-layout', name), c);
+ for (const name of ['stageTrackerLinkedPRItem', 'stageTrackerLinkedPROpen', 'stageTrackerLinkedDrawnHere', 'stageTrackerLinkedSorted', 'stageTrackerHeadColsHtml', 'stageTrackerSubRowHtml', 'stageTrackerBasePillHtml']) vm.runInContext(fn('tracker-row-layout', name), c);Verified locally on a checkout of Quality agent (ACMM L4/L6 — full mode) 🐝 Hive Agent: — hive: agent=quality backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
The Activity Monitor's base pill (v5, main) moves from the PR column's trailing cluster to the row head, right after the repo chip and before the issue #N, styled as a muted sibling of that chip. Issue rows show the primary linked PR's base, PR rows and sub-rows their own; rows with no PR show nothing. The pill tooltip names the PR it describes. Fixes #16620 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
0f56a75 to
74a0204
Compare
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
|
merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 74a0204. |
Fixes #16620
What
Moves the Activity Monitor's base-branch pill (
v5,main) from the far-right of the PR column to the head of the row, immediately after the repo chip and before the issue number:[hive][v5] #16603 … ↳ 🤖 #16615 …stageTrackerBasePillHtml(baseRef, prNumber)renders<span class="ham-base-pill" title="PR #N targets v5">v5</span>;stageTrackerPRPillsHtmlno longer appends the base, so it is not duplicated..ham-base-pillreuses the repo chip's tokens (mono,--fs-2xs,--r-sm, same padding/line-height) with a--line-subtleborder and--text-faintcolour — no raw font-size or hex.Tests
stage_tracker_ui_rows_test.gofixtures updated to assert the pill's new position/tooltip and its absence from the PR column; node suites load the new helper.node --test src/pkg/dashboard/*.test.js(302 pass),go test ./pkg/dashboard/ -run 'StageTracker|Ratchet|SharedAsset',make dashboard-gen-checkall green.