Skip to content

πŸ› tracker: queue ordinals say 'of N' and name their train - #15590

Merged
clubanderson merged 1 commit into
v5from
fix/train-ordinal-of-n
Oct 30, 2026
Merged

clubanderson merged 1 commit into
v5from
fix/train-ordinal-of-n

Conversation

@clubanderson

@clubanderson clubanderson commented Oct 30, 2026 •

Copy link
Copy Markdown
Member

Fixes #15589

Problem

Two trains on one page: "2 PRs Β· 1st: #15567 Β· overlapping: main.go" and "2 PRs Β· 1st: #15537 Β· overlapping: stage_tracker.go" β€” four chevrons reading Merge queued Β· 1st / 2nd / 1st / 2nd. The ordinal is per train, but nothing on the chevron says so, and every train's rail wears the same colour.

Change

Where Before After
Queue word (stageTrackerTrainWord, gate chip) Merge queued Β· 1st Merge queued Β· 1st of 2
Provisional suffix (#15581) queued 1st once ready queued 1st of 2 once ready
> 1 train on the page β€” word ends Β· train main.go (overlap basename, else head #N); hover leads Train of 2 PRs overlapping main.go; merges after #15567.
1 train β€” no tag (unchanged apart from "of N")
Rail one colour for every train header + member rows share .ham-train-k0…k3 accent (blue / purple / cyan / amber, cycling in page order)

Plumbing: stageTrackerTrainIndex(items) β†’ {count, index} computed once per render in tracker-filter.js, passed as ctx.trains / ctx.trainIndex through stageTrackerSegments β†’ stageTrackerTrainWord and stageTrackerMergeGateInfo(For) / WordHtml / CueHtml; stageTrackerTrainRows / RowClass / HeaderHtml take the accent slot.

Tests

  • New TestStageTrackerTrainTagOnTwoTrains: index count for 0/1/2 trains (wrappers read through), "of N" always, tag only past one train, two trains never share a word for the same place, head fallback tag, chip/hover/cue carry the train sentence, provisional + tag, accent classes on header and rows.
  • Existing ordinal assertions updated to "of N"; copy inventory + dashboard-sections.md + API reference wording; changelog fragment.

Screenshots

Before:

four chevrons read Merge queued 1st / 2nd twice with one rail colour

After:

chevrons read 1st of 2 Β· train main.go and 1st of 2 Β· train stage_tracker.go with blue and purple rails

@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 30, 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 clubanderson 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 needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 30, 2026
Two trains on one page read as two unexplained "Merge queued Β· 1st" /
"Β· 2nd" pairs: the ordinal is per train, but the chevron never said so
and every train's rail wore the same colour.

- Queue words carry the length: "Merge queued Β· 1st of 2"; the
  provisional suffix reads "queued 1st of 2 once ready".
- Past one train on the page the word ends with the train's tag
  ("Β· train main.go": overlap basename, else the head #N) and the
  hover leads "Train of 2 PRs overlapping main.go; merges after
  #15567."; one train β†’ no tag. stageTrackerTrainIndex counts the
  page's trains once per render (ctx.trains / ctx.trainIndex).
- Each train's header and member rows share a rail accent
  (.ham-train-k0..k3, cycling in page order).
- Node test for 1 vs 2 trains; copy inventory + docs; changelog.

Fixes #15589

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@clubanderson
clubanderson force-pushed the fix/train-ordinal-of-n branch from 80d1e9c to 49991e6 Compare October 30, 2026 00:43
@kubestellar-prow kubestellar-prow Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
@github-actions

github-actions Bot commented Oct 30, 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
#15591 πŸ› adoption: superseded PRs close promptly and read as one muted tracker line same files src/docs/dashboard-sections.md
src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static-src/js/tracker-words.js
src/pkg/dashboard/static/index.html
#15521 🌱 refactor: split tracker row source CONFLICT src/pkg/dashboard/static-src/js/tracker-row.js
#15565 🌱 refactor: split tracker words source CONFLICT src/pkg/dashboard/static-src/js/tracker-words.js
#15593 πŸ› adoption: offline clanker PRs don't stall at 'PR in progress' same files src/docs/dashboard-copy-inventory.md
src/docs/dashboard-sections.md
src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static-src/js/tracker-words.js
src/pkg/dashboard/static/index.html
#15584 πŸ› Close the hive's own empty-diff PRs as superseded instead of asking a person same files src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static/index.html
#15574 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md
#15526 🌱 dashboard: split stage_tracker.go into 4 files same files src/docs/dashboard-sections.md
#15530 πŸ› fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html

@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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

tracker: two merge trains on one page show two unexplained "Merge queued Β· 1st" / "Β· 2nd"

1 participant