Repository navigation
π dashboard: merge banners drain the toast countdown bar - #15880
Conversation
The Activity Monitor "#N merged" banners auto-dismissed through a bare setTimeout and never showed the .toast-bar that every other timed toast gets from toastCountdownBar. Route the dismiss through toastCountdownBar with stageTrackerMergeBannerMs() so the bar drains along the bottom edge for the banner lifetime, hover/focus holds timer and bar together, and the manual x dismiss cancels the countdown. .merge-banner becomes position: relative / overflow: hidden so the bar clips to it, tinted green to match the merge accent. Node test lifts the banner builder and toastCountdownBar out of the shipped index.html and proves the bar element, --toast-ttl, hover hold and manual-dismiss cancellation. Closes #15878 Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
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>
|
stage 080-awaiting-merge-admission β 050-review-pending: required-check-pending:Sign-off survives the squash |
|
@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. |
There was a problem hiding this comment.
Reviewed (correctness) β one advisory finding, non-blocking.
Auto-dismiss can cut the merge-banner-out fade short. toastCountdownBar's fire nulls el._countdown before calling onExpire (static-src/js/tooltips-dialogs.js:750), so when the banner expires on its own, toastCountdownCancel(el) in stageTrackerMergeBannerDismiss (static-src/js/tracker-merged.js:953) is a no-op and the .toast-bar stays in the banner. The bar's toast-bar-drain CSS animation starts at the first style flush after the JS timer was armed, so it typically finishes a few ms after the timer fires β i.e. after merge-banner-out has been added and stageTrackerAfter(el, 'animationend', 180, β¦) has been attached (tracker-merged.js:955). stageTrackerAfter does not check e.target (index.html:18401-18406), so the bar's bubbled animationend runs el.remove() immediately and skips the 180 ms fade. Before this PR the banner had no animated child, so this is new. The .toast paths are unaffected because dismissToast times its out-animation with setTimeout, not animationend. Cosmetic only; manual Γ is fine (cancel removes the bar first).
Suggested fix β drop the bar before arming the out-animation (the bar is at scaleX(0) by then, so nothing is visibly lost):
toastCountdownCancel(el);
const bar = typeof el.querySelector === 'function' ? el.querySelector(':scope > .toast-bar') : null;
if (bar) bar.remove();
(then make dashboard-gen). Tests otherwise cover the contract in #15878 well.
β hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88
β¦op duplicate fragment The stage_tracker_cues node fixture lifts stageTrackerMergeBanner out of index.html; now that the banner arms its dismiss through toastCountdownBar the fixture pulls that function (and toastCountdownCancel) in too, with matches/contains/activeElement shims on the fake DOM. Keep the bot's bullet-formatted fixed-15880.md fragment and remove the malformed slug fragment. Signed-off-by: Andrew Anderson <andy@clubanderson.com>
|
ci-report @9e47b0e β the dashboard shards are red for a PR-local reason, not the baseline ( Failing: Why: Fix (one of):
The other two reds are infra, not this diff: π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Address review findings on #15892: - changelog fragment and activity-monitor doc describe only what this PR adds (reload-safe once-only delivery via hive.tracker.merge-session.v1, vanished-row short-name resolution, countdown cancel on banner eviction); the countdown bar itself landed in #15880 - doc notes the banner lifetime is twice the configured toast_info_s - drop duplicate jsFunc/matches/contains lines left by the rebase in stage_tracker_cues_test.go - hoist the session PR-key regex into STAGE_TRACKER_MERGE_SESSION_PR_KEY_RE Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com>
* π fix: persist activity merge delivery and show banner countdown Keep the last observed PR state and delivered identities across reloads, and resolve audit repo aliases after the last row disappears. Use the shared countdown for configured merge-banner lifetimes. Hive-Run: #15828 Hive-Plan: issue-15828-merge-session-and-countdown Hive-Spec: issue-15828#merge-delivery-and-countdown Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Signed-off-by: mendezr <mendezr@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π fix: align merge feedback fixtures with session reconciliation Signed-off-by: mendezr <mendezr@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π fix: wait for detached merge celebration landing in session test Signed-off-by: mendezr <mendezr@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * π fix: load tracker constants from split row source in nav delta test nav_count_delta.test.js still read STAGE_TRACKER_ACTED_FILTERS from tracker-row.js, which #15771 moved to tracker-row-acted.js, and did not stub stageTrackerReconcileMerges that renderStageTracker now calls. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> * fix: trim merge-session changelog/docs and dedupe test fixture lines Address review findings on #15892: - changelog fragment and activity-monitor doc describe only what this PR adds (reload-safe once-only delivery via hive.tracker.merge-session.v1, vanished-row short-name resolution, countdown cancel on banner eviction); the countdown bar itself landed in #15880 - doc notes the banner lifetime is twice the configured toast_info_s - drop duplicate jsFunc/matches/contains lines left by the rebase in stage_tracker_cues_test.go - hoist the session PR-key regex into STAGE_TRACKER_MERGE_SESSION_PR_KEY_RE Hive-Fix-Attempt: 1/6 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> --------- Signed-off-by: mendezr <mendezr@users.noreply.github.com> Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: mendezr <mendezr@users.noreply.github.com> Co-authored-by: clubanderson <407614+clubanderson@users.noreply.github.com> Co-authored-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Closes #15878
What
The Activity Monitor "#N merged" banners (
stageTrackerMergeBanner,static-src/js/tracker-merged.js) auto-dismissed via a baresetTimeoutand never showed the reverse-progress.toast-barevery other timed toast gets viatoastCountdownBar.stageTrackerMergeBannernow arms its dismiss throughtoastCountdownBar(el, stageTrackerMergeBannerMs(), β¦): the bar drains along the bottom for the banner lifetime and hover/focus pauses timer + bar together (inherited fromtoastCountdownBar).stageTrackerMergeBannerDismisscallstoastCountdownCancelso the Γ button clears the pending timer and bar..merge-bannergetsposition: relative; overflow: hiddenso the absolutely positioned bar clips to it; bar tinted green to match the merge accent.static/index.htmlregenerated viamake dashboard-gen.tracker-actions.jsresult toasts already arm the bar for info toasts viastageTrackerResultToastTimed, so no change there.Tests
src/pkg/dashboard/stage_tracker_merge_banner_countdown.test.js(node:test, picked up by the existingnode --test src/pkg/dashboard/*.test.jsCI step) lifts the banner builder andtoastCountdownBarout of the shippedindex.htmland proves: the.toast-barchild +--toast-ttlare set withstageTrackerMergeBannerMs(), expiry removes the banner, hover pauses / leave re-arms, and manual Γ dismiss clears the timer and bar. 3 of 4 cases fail against the previousindex.html.