Skip to content

πŸ› fix(dashboard): stalled merge-queue chevrons read their words (ochre on amber was invisible) - #15547

Merged
clubanderson merged 2 commits into
v5from
fix/empty-merge-queue-chevron
Oct 29, 2026
Merged

clubanderson merged 2 commits into
v5from
fix/empty-merge-queue-chevron

Conversation

@clubanderson

Copy link
Copy Markdown
Member

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.active fill.

  • 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_WORD words every head_state; an unmapped merge_train.state falls back to its humanised name + place, never ''.
  • tracker-queue.js: popover uses the shared stalled lead.
  • Tests: node ratchet over every train state Γ— stalled Γ— head_state Γ— place (non-empty, slug-free); Go TestStageTrackerMergeTrainPayloadStates asserts every emitted merge_train carries a documented state/head_state.
  • Docs: dashboard-copy-inventory, dashboard-sections, operator-reference; changelog fragment.

Train admission for the untrusted-author head is handled in a sibling PR; this is contrast + wording only.

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>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 29, 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 nicholasjackson 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 29, 2026
@github-actions

github-actions Bot commented Oct 29, 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
#15529 πŸ› fix(dashboard): omit empty lineage separator same files src/pkg/dashboard/static/index.html
#15530 πŸ› fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static/index.html
#15553 πŸ› tracker: merge-train header counts its rows; human-merge PRs ride no train same files src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker_merge_train_test.go
src/pkg/dashboard/static-src/js/tracker-words.js
src/pkg/dashboard/static/index.html
#15550 πŸ› Activity monitor: an adoption pair never asks a human to pick a PR same files src/docs/dashboard-copy-inventory.md
src/pkg/dashboard/static/index.html
#15516 πŸ“– docs: split the operator reference CONFLICT src/docs/operator-reference.md
#15554 ✨ tracker: PR in progress names who is working it, like Claimed same files src/docs/dashboard-copy-inventory.md
src/docs/dashboard-sections.md
src/pkg/dashboard/stage_tracker_merge_gate_test.go
src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static/index.html
#15405 πŸ› fix: require verified signature for email-only hive commit identity match same files src/docs/operator-reference.md
#15556 ✨ dashboard: toast countdown progress bar same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#15526 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md

@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 tree at fa84263, not just the diff. This looks correct to me.

  • Contrast fix mechanism holds. The stalled word is only ever emitted as gateWord when the segment is active (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-0 on amber. The popover header (tracker-queue.js:45) and chip (:76) are not inside .ham-seg.active, so they keep the ochre.
  • head_state table matches the server. STAGE_TRACKER_TRAIN_HEAD_STALL_WORD keys needs-human / ci / soaking / ready / merging / fixing / unknown are exactly the mergeTrainHead* constants at stage_tracker_merge_train.go:89-103, and HeadState/HeadReason are set at :283.
  • Fallback is well-formed. stageTrackerOrdinal exists (tracker-words.js:188) and p is computed in stageTrackerTrainWord before the new word + ' Β· ' + ordinal line, so an unmapped merge_train.state can 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

@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.

Reviewed β€” no findings from this perspective.

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 060-reviewed: check-pending

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 060-reviewed β†’ 050-review-pending: required-check-pending:build-and-test

@clubanderson
clubanderson merged commit 964f67f into v5 Oct 29, 2026
77 of 78 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/empty-merge-queue-chevron branch October 29, 2026 23:16
@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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts-with-open-pr Open PR has a merge conflict with another open PR 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: stalled merge-queue chevrons render with no words (#15529, #15530 behind #15425)

1 participant