Repository navigation
π fix(dashboard): issue-row linked PR passes null when the lineage chip is empty - #15636
hivecommons-hive[bot] wants to merge 1 commit into
Conversation
β¦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 #15523 Hive-Run: #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>
|
[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 |
|
PR needs rebase. DetailsInstructions 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. |
Open PR overlap checkBase branch:
Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Correctness review (read head c49dc25f; merge-base 11ec2585)
Already fixed on v5 β rebasing this line as-is would regress it. The one-line change in src/pkg/dashboard/static-src/js/tracker-row.js:1246 ((β¦ ? stageTrackerLineageChipHtml(lp, nowMs) : '') || null) is mechanically correct, but #15529 (merged, 0d67c0eb8a, "omit empty lineage separator", with a regression case) landed the same null-normalisation on v5, and v5 has since extended that exact line to also fall back to stageTrackerAdoptedFromChipHtml(lp, nowMs) (tracker-row.js:1293 on v5). The PR is CONFLICTING on precisely this hunk; a rebase that takes this branch's side drops the adopted-from chip on single-covering-PR issue rows.
Requested: resolve the conflict by taking v5's line in both static-src/js/tracker-row.js and static/index.html (leaving an empty code diff), drop changelog.d/fixed-15523-lineage-chip-empty.md (the fix is already in #15529's fragment), and close this PR / #15523 as superseded by #15529. #15523 itself says to "close this item without a PR" if already fixed on the base.
β hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Intent alignment β the fix this PR carries is already on v5; the PR is redundant and its conflict resolution is the only remaining risk.
- The one code change (
src/pkg/dashboard/static-src/js/tracker-row.js:1246and the mirroredstatic/index.html:16814at c49dc25) coerces the empty lineage chip with(β¦ : '') || null. Basev5already has exactly that coercion on the same line βtracker-row.js:1293onv5reads(lp.lineage && β¦ ? stageTrackerLineageChipHtml(lp, nowMs) : '') || (typeof stageTrackerAdoptedFromChipHtml === 'function' ? stageTrackerAdoptedFromChipHtml(lp, nowMs) : '') || null(landed by #15529 "omit empty lineage separator", merged 2026-10-29, with a regression case; the adopted-from arm came with #15591). The generatedstatic/index.htmlonv5(line 17347) matches. - So #15523's finding no longer applies on the base, and #15523 itself says: "check the finding still applies on the base branch; if it is already fixed, close this item without a PR."
- The PR is
CONFLICTINGon that exact line. If the rebase-resolve fixer takes this branch's side, it would drop the|| stageTrackerAdoptedFromChipHtml(lp, nowMs)fallback thatv5now has β a regression of #15591, not a fix.
Requested change: close this PR as superseded by #15529 (already merged) and close #15523 as fixed-on-base; do not rebase it. If it is rebased anyway, the conflict must resolve to v5's line verbatim, which leaves only changelog.d/fixed-15523-lineage-chip-empty.md β a fragment for a change this PR would no longer contain, so drop it too.
β hive: agent=adjudicator-4 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Closing as superseded: base |
There was a problem hiding this comment.
Decision needed: @clubanderson should decide whether #15636 (adoption of #15530) is closed as superseded by merged #15529, which already coalesces the empty lineage chip to null.
No-op against v5: merged #15529 already carries this change. Recommend closing this adoption (and its origin #15530) as superseded by #15529 β I have not closed anything.
Evidence (read both diffs and current v5):
- This PR changes the single-covering-PR issue-row call in
src/pkg/dashboard/static-src/js/tracker-row.js:1246from⦠? stageTrackerLineageChipHtml(lp, nowMs) : ''to(⦠? stageTrackerLineageChipHtml(lp, nowMs) : '') || null. - #15529 (merged 2026-10-29T23:22Z, "omit empty lineage separator") changed the same expression to
β¦ ? (stageTrackerLineageChipHtml(lp, nowMs) || null) : nullβ the same semantic result: an empty chip reachesstageTrackerPRPillsHtmlasnull, so the separator is omitted. v5today (tracker-row.js:1293) readsβ¦ : '') || (β¦ stageTrackerAdoptedFromChipHtml β¦) || null, lp.base_ref, so the coalesce is already in place; that is also why this branch isDIRTY.
The #15530 body says the pattern "was still present on v5" β that was true when it was written (before #15529 merged), so the fix here is correct, just already landed. Issue #15523 is still open and can be closed by referencing #15529.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
Supersedes #15530 (adopted after CI went red and the contributor was unavailable; original commits by @odttlnt preserved).
Fixes #15523
This branch is #15530's head
c49dc25f6aaeas pushed by @odttlnt (forkodttlnt/hive), unchanged. Last lane reason on the original:adoption-stalled:supersede-failed:conflicting.Hive fix agent: rebase this branch on
v5, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and theirSigned-off-by; add your own sign-off on your commits. Do not open another PR.Conflicts with
v5: the contributor head could not be replayed onto the base, so this copy opened as it is and the hive's fixer is resolving the conflicts on this branch (rebase-resolve episode, two attempts). If both fail the PR parks for a person: adopt the commits into a fresh branch, or close it as superseded.