Skip to content

πŸ› fix(dashboard): issue-row linked PR passes null when the lineage chip is empty - #15530

Closed
odttlnt wants to merge 1 commit into
hivecommons:v5from
odttlnt:fix/lineage-chip-null-15523
Closed

odttlnt wants to merge 1 commit into
hivecommons:v5from
odttlnt:fix/lineage-chip-null-15523

Conversation

@odttlnt

@odttlnt odttlnt commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

Summary

stageTrackerLineageChipHtml returns '' (not null) when there is no lineage text, and stageTrackerPRPillsHtml only omits its separator for null, so the issue row's linked-PR pill emitted a stray trailing space. The issue-row caller in tracker-row.js now coalesces the empty chip to null ((… ? chip : '') || null), matching the sub-row caller. static/index.html is updated to the same line; it is the generated output of static-src.

#15478 (which the finding was filed against) is merged, and the pattern was still present on v5.

Validation

Per AGENTS.md I did not run the test suite locally; CI is the verdict. The new line still contains the substring stageTrackerLineageChipHtml(lp, nowMs) asserted by stage_tracker_lineage_test.go.

Fixes #15523

β€” hive: backend=bob model=premium

…ip is empty

stageTrackerLineageChipHtml returns '' when the lineage has no text, and
stageTrackerPRPillsHtml only skips the separator for null, so the issue
row emitted a trailing space. Coalesce the empty chip to null, as the
sub-row caller already does.

Fixes hivecommons#15523

Hive-Run: hivecommons#15523
Hive-Plan: issue-15523 lineage chip null coalesce
Hive-Spec: issue-15523#lineage-chip-null
Signed-off-by: SACHIN NAIK <sachin.naik@ibm.com>
@kubestellar-prow kubestellar-prow Bot added dco-signoff: yes Indicates the PR's author has signed the DCO. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 29, 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.

Decision needed: @clubanderson should decide whether to close #15530 in favour of #15529, which makes the same one-line fix and adds the regression test (and whether #15529's body should also Closes #15523, which is the same finding as #15493 filed twice).

This appears to duplicate #15529, which makes the same change to src/pkg/dashboard/static-src/js/tracker-row.js:1246 (and the generated static/index.html:16814).

What I verified, reading both diffs in full against v5@ce13a25:

  • Both PRs change exactly that one line in exactly the same way semantically: coalesce the issue-row lineage chip to null when it is empty. #15529 writes (stageTrackerLineageChipHtml(lp, nowMs) || null) inside the ternary; this PR writes (… ? chip : '') || null around it. Both yield null for every input where the old code yielded '', and are otherwise identical.
  • The mechanism is real: stageTrackerLineageChipHtml returns '' when stageTrackerLineageText is empty (tracker-row.js:967), and stageTrackerPRPillsHtml only suppresses the separator for lineage == null (tracker-row.js:1010), so a lineage object with no from_number produced </a> <span class="ham-badge"> with a double space. The fix is correct in both PRs.
  • The two linked issues are the same finding filed twice from the review of #15478: #15493 (correctness) and #15523 (security), both citing this line.

Why #15529 is preferable: it is the earlier PR, and it adds a regression case in stage_tracker_ui_test.go (lineage: { kind: 'adopted' } with no from_number, asserting </a> <span class="ham-badge">v5</span>) that fails on v5 and passes with the fix β€” this PR ships the fix without a test. The two cannot both merge cleanly; whichever lands second conflicts on the same line.

Flagging for a maintainer: if you agree, this one could be closed in favour of #15529, and #15529 should pick up Closes #15523 so the second issue does not stay open after merge. I have not closed anything.

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

@github-actions

github-actions Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

This PR conflicts with v5 itself. Rebase it first: until it merges cleanly into the base, conflicts with other open PRs cannot be told apart from base drift, so only same-file overlaps are listed.

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
#15521 🌱 refactor: split tracker row source same files src/pkg/dashboard/static-src/js/tracker-row.js

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission: no activity for 30m0s: merge-train:queued-behind#15425:3/3:0/0:tracker-row.js,index.html

clubanderson added a commit that referenced this pull request Oct 29, 2026
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>
Co-authored-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
clubanderson added a commit that referenced this pull request Oct 29, 2026
…o train (#15553)

The Activity Monitor's train header read 'merge train Β· 3 PRs Β· 1st: #15425'
over one row: #15529 and #15530 were drawn as sub-rows of their linked
issues (nested_under), which the header grouping did not see. An issue row
now rides its open PR's train (key, contiguity, rail, merge order), the
header counts the rows drawn under it and names members the view hides,
and the payload carries merge_train.members.

#15425 fronted that train although it waits for a maintainer (untrusted
author): the lane's admission verdicts were not blocking for the planner.
A head whose last lane verdict maps to a human_merge_reason other than the
catch-all policy is now no train member at all; verdicts are keyed per lane
so another lane's opinion never evicts a member.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>
@github-actions github-actions Bot removed the conflicts-with-open-pr Open PR has a merge conflict with another open PR label Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

@odttlnt this PR is back in your court (stage/072-returned-to-contributor). The hive will not merge it until the head changes.

Review asks:

  • the branch conflicts with the base and needs a rebase

Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path.

Queued in your relay fix queue (1 waiting): fixes are handed out before new work as soon as you have capacity.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 072-returned-to-contributor: conflicting

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Needs a decision, not a merge:

Head: verdict requires_human @c49dc25, 60/60 checks green, DCO yes, soak 0s of 30m0s.

How to release it:

  • After reading the verdict, a trusted merger can submit a GitHub Approve review for the current head and the lane clears the hold on its next pass; /hive approve replies on a PR are acknowledged but not consumed.

Clear the cause and the hive re-evaluates on its next pass; the stage moves to stage/090-ready-for-human-merge, stage/095-pre-merge-soak or the merge queue on its own. Approval does not bypass CI, hold labels or other merge gates.

@kubestellar-prow

Copy link
Copy Markdown
Contributor

PR needs rebase.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

/lgtm

Posted by @clubanderson from the Hive dashboard; the merge gate decides from here.

@kubestellar-prow

Copy link
Copy Markdown
Contributor

@hivecommons-hive[bot]: changing LGTM is restricted to collaborators

Details

In response to this:

/lgtm

Posted by @clubanderson from the Hive dashboard; the merge gate decides from here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

/approve

Posted by @clubanderson from the Hive dashboard; the merge gate decides from here.

@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hivecommons-hive[bot]
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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

FYI: the same change landed on v5 via #15591 (22cf3b8) and #15523 is closed, so a rebase onto v5 would leave this PR with an empty diff. Its adopted copy #15643 was closed for that reason; this one can be closed too.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: ed091b4d8

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

The hive's copies of this PR were closed without merging twice within an hour (#15636, then #15643). Something keeps closing them, so the hive is not opening a third. This PR needs a person (stage/085-needs-decision): reopen one of the copies, close this PR, or say what should happen.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Rebase check on this PR: after merging v5 the only surviving change is the changelog fragment β€” the code fix is already on v5.

Not pushing an empty-code rebase onto the fork. This PR is superseded by #15591 and can be closed as such.


🐝 Hive Agent: scanner | Instance: hosted-available-oke-11-placeholder-r05x | SHA: aa1b5af84

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

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Closed as superseded by #15529 by @clubanderson from the Hive dashboard.

Already fixed on v5 by #15529 (see #15523). Closing as superseded β€” thanks @odttlnt.

@hivecommons-hive hivecommons-hive Bot added the hive/superseded Closed by Hive: a different merged PR already landed this change label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot closed this Oct 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

dco-signoff: yes Indicates the PR's author has signed the DCO. hive/superseded Closed by Hive: a different merged PR already landed this change needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Review backlog (security): Issue-row caller still passes '' instead of null when lineage chip is empty (carried over)

1 participant