Skip to content

πŸ› Activity Monitor: merge celebration flies from the issue row an inline PR is drawn on; add Test celebration - #15060

Merged
hivecommons-hive[bot] merged 1 commit into
v5from
fix/celebrate-nested-pr-row
Oct 28, 2026
Merged

hivecommons-hive[bot] merged 1 commit into
v5from
fix/celebrate-nested-pr-row

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15059. Reported by @clubanderson.

Root cause

The merge detector fired all afternoon (the open tab's _stageTrackerZapped held every merge), but stageTrackerCelebrateRowKey only knew two ways to find a row β€” the PR's own data-ham-key row, or a data-ham-sub-key sub-row (drawn only when an issue has β‰₯2 covering PRs). On hive's hive 19 of 22 open PRs are nested under their issue and drawn inline on the issue row, so the lookup returned '' and stageTrackerCelebrateMerges took the "not on the board" branch: counter pops, no glow, no flight. Verified live in the operator's Chrome tab via CDP: celebrateRow() on a real row flies fine (Safari-relevant pieces all OK); only the row resolution was missing.

Fix

  • stageTrackerRowHtml stamps data-ham-prs="<prKey> …" β€” the PR keys the row draws (own key on a PR row; covering PRs on an issue row).
  • stageTrackerCelebrateRowKey falls through data-ham-key β†’ data-ham-sub-key β†’ [data-ham-prs~=key] β†’ the PR's host row remembered from the last payload (stageTrackerPRHosts: nested_under / linked_prs), so a merge that also closes its issue still starts its flight from the pinned issue row.
  • βš™ β†’ Merges β†’ Test celebration: one flight from the first row to the counter (pop + zap; count unchanged; no event line; glow clears after the pin window). Warns plainly when there is no row, or explains the no-fly path under reduced motion / over the flight cap.

Tests

TestStageTrackerCelebrateNestedPRRow replays the captured before/after payload shape (issue + inline PR dropped, PR in recently_merged) through the lifted merge detector + celebration module over stdin: issue row is the celebrating row, pinned, glows, event line names the PR, token flies, count ticks on landing; host-memory path; Test button flies/pops/does not count/clears, and its no-row warning. Fails on v5 without the fix. Celebration fixture refactored into stageTrackerCelebrateJS + stageTrackerCelebrateFixture for reuse. Style ratchet and the full StageTracker/Ham/Native suites pass.

Docs: Merged today paragraph in dashboard-sections.md; changelog fragment.

…wn on; add Test celebration

A PR nested under its issue is drawn inline on the issue row with no
sub-row, so stageTrackerCelebrateRowKey found no row and the merge
only ticked the counter (hive's hive: 19 of 22 open PRs). Rows now stamp
the PR keys they draw (data-ham-prs) and the SPA remembers each PR's host
row from the last payload; βš™ β†’ Merges gains a Test celebration button.

Fixes #15059. Reported by @clubanderson.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 28, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign hanthor for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 28, 2026
@github-actions

github-actions Bot commented Oct 28, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#15063 πŸ› Let hive decide: say when a decision never took effect, in plain words, and never block the PR with hive's own decision same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#15057 πŸ› fix: recover orphaned supersede adoptions same files src/pkg/dashboard/static/index.html
#15054 ✨ feature: show clanker presence on waiting-on pills same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#14807 ✨ dashboard: stream Job pod logs in the terminal pane for sandbox.runtime: job agents same files src/pkg/dashboard/static/index.html

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this hive's repositories have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply.

@hivecommons-hive hivecommons-hive Bot added author/human A person pushed this PR themselves dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 28, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Read the resolver chain in the tree at 64b00ba β€” looks correct to me.

  • Host lookup is sound. stageTrackerRowNode (index.html:15558) stamps data-ham-key on the same .ham-row element the template now stamps data-ham-prs on (:15083), so the new [data-ham-prs~=…][data-ham-key] selector in stageTrackerCelebrateRowKey (:17792) matches one node, and ~= is the right operator for the space-separated multi-PR case.
  • Ordering holds when the merge also closes the issue. stageTrackerNoteMerges (:17641-17657) runs stageTrackerCelebrateMerges against the previous render's DOM, so the issue row is still present when stageTrackerCelebrateRowKey resolves it, and _stageTrackerCelebrating[rowKey] then pins it through stageTrackerPinnedRows (:17817-17833). The _stageTrackerPRHost map is assigned from the new payload before the lookup (:17646), and a merged PR is absent from that payload, so its old host entry survives β€” the fallback at :17795 is reachable exactly when intended.
  • Test button dispatch. data-action resolves through window[action] (:37920), the same path stageTrackerCelebrateChange already takes, so the new global is reachable; STAGE_TRACKER_CELEBRATE_TEST_KEY is a script-level const declared after the function but initialised long before any click. preview correctly skips the _stageTrackerMergedToday write (:17754) and the event-line/owner-event side effects (:17851-17857), so the counter and the row's event history are untouched by a test flight.
  • TestStageTrackerCelebrateNestedPRRow executes the extracted JS against a fixture with an inline PR, a two-sub-row issue and a standalone PR, and asserts the pin, glow, event line, flight and tick; the test (dashboard …) shards are green on this head.

β€” hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot added stage/095-pre-merge-soak Lane admitted; the pre-merge soak window is running before the merge is attempted stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) and removed stage/050-review-pending Review swarm requested; awaiting a verdict for the current head stage/095-pre-merge-soak Lane admitted; the pre-merge soak window is running before the merge is attempted labels Oct 28, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 095-pre-merge-soak β†’ 060-reviewed: required-check-pending:Sign-off survives the squash

@hivecommons-hive
hivecommons-hive Bot merged commit fc10aff into v5 Oct 28, 2026
92 of 98 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/celebrate-nested-pr-row branch October 28, 2026 19:24
@hivecommons-hive

Copy link
Copy Markdown
Contributor
Evidence bundle `#1506064b00ba` sha256:ad680e1eaf736eeb3558de4d9a005a24846f32fb1126135e08988069ad266528 β€” download from the dashboard or `hivectl review evidence #15060`.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

merged by Hive trusted-author auto-merge: author @clubanderson holds role owner and GitHub permission admin on repo; CI green at 64b00ba.

@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot removed role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/060-reviewed Review swarm verdict approve; a gate is still pending (CI running, soak not started) labels Oct 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/human A person pushed this PR themselves dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Activity Monitor: merge celebration never flies for a PR drawn inline on its issue row (only the counter ticks)

1 participant