Repository navigation
π fix(dashboard): stalled merge-queue chevrons read their words (ochre on amber was invisible) - #15547
Conversation
Riders behind a stalled train head (#15529, #15530 behind untrusted-author #15425) drew an active amber chevron with no visible words: the stalled label was in the DOM but painted --yellow (.ham-queue-stalled) on the amber .ham-seg.active fill. The text now inherits the chevron colour and reads "Merge queue Β· stalled β waiting on #15425 (needs maintainer merge) Β· 1h21m" (head row: "Merge queue Β· stalled β needs maintainer merge Β· 1h21m"), every head_state has words, and an unmapped merge_train.state falls back to its humanised name plus place instead of an empty string. Ratchets: node test over every train state x stalled x head_state x place asserts non-empty, slug-free chevron words; Go test asserts every emitted merge_train carries a documented state/head_state. 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
|
There was a problem hiding this comment.
Read the tree at fa84263, not just the diff. This looks correct to me.
- Contrast fix mechanism holds. The stalled word is only ever emitted as
gateWordwhen the segment isactive(tracker-row.js:386), as<span class="ham-seg-t ham-queue-stalled">(tracker-words.js:879), and.ham-seg.active { background: var(--amber); color: var(--surface-0) }(tracker.css:308). So the new.ham-seg.active .ham-seg-t.ham-queue-stalled { color: inherit }(4 classes) outranks.ham-queue-stalled { color: var(--yellow) }(1 class) and resolves to--surface-0on amber. The popover header (tracker-queue.js:45) and chip (:76) are not inside.ham-seg.active, so they keep the ochre. head_statetable matches the server.STAGE_TRACKER_TRAIN_HEAD_STALL_WORDkeysneeds-human / ci / soaking / ready / merging / fixing / unknownare exactly themergeTrainHead*constants atstage_tracker_merge_train.go:89-103, andHeadState/HeadReasonare set at:283.- Fallback is well-formed.
stageTrackerOrdinalexists (tracker-words.js:188) andpis computed instageTrackerTrainWordbefore the newword + ' Β· ' + ordinalline, so an unmappedmerge_train.statecan no longer render''.
Body and diff agree: contrast + wording only; no train-admission change.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
stage 080-awaiting-merge-admission β 060-reviewed: check-pending |
|
stage 060-reviewed β 050-review-pending: required-check-pending:build-and-test |
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Fixes #15546
Riders behind a stalled train head (#15529, #15530 behind untrusted-author #15425) drew an active amber Merge queue chevron with no visible words. The stalled label was in the DOM but
.ham-queue-stalled { color: var(--yellow) }painted it ochre on the amber.ham-seg.activefill.tracker.css: stalled text inherits the chevron colour on an active segment.tracker-words.js:Merge queue Β· stalled β waiting on #15425 (needs maintainer merge) Β· 1h21m(head row:Merge queue Β· stalled β needs maintainer merge Β· 1h21m);STAGE_TRACKER_TRAIN_HEAD_STALL_WORDwords everyhead_state; an unmappedmerge_train.statefalls back to its humanised name + place, never''.tracker-queue.js: popover uses the shared stalled lead.TestStageTrackerMergeTrainPayloadStatesasserts every emittedmerge_traincarries a documentedstate/head_state.Train admission for the untrusted-author head is handled in a sibling PR; this is contrast + wording only.