Skip to content

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

Closed
hivecommons-hive[bot] wants to merge 1 commit into
v5from
hive/adopt-15530
Closed

hivecommons-hive[bot] wants to merge 1 commit into
v5from
hive/adopt-15530

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

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 c49dc25f6aae as pushed by @odttlnt (fork odttlnt/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 their Signed-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.

…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>
@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 the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2026
@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.

@kubestellar-prow kubestellar-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 30, 2026
@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) labels Oct 30, 2026
@github-actions

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
#15637 πŸ“– community: list the Twitch live stream everywhere community links live 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 changelog.d/fixed-15523-lineage-chip-empty.md
src/pkg/dashboard/static-src/js/tracker-row.js
src/pkg/dashboard/static/index.html
#15633 🌱 refactor: split stage tracker UI tests same files src/pkg/dashboard/static/index.html
#15566 🌱 refactor: split stage tracker UI tests same files src/pkg/dashboard/static/index.html
#15521 🌱 refactor: split tracker row source same files src/pkg/dashboard/static-src/js/tracker-row.js

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

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-3 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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:1246 and the mirrored static/index.html:16814 at c49dc25) coerces the empty lineage chip with (… : '') || null. Base v5 already has exactly that coercion on the same line β€” tracker-row.js:1293 on v5 reads (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 generated static/index.html on v5 (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 CONFLICTING on that exact line. If the rebase-resolve fixer takes this branch's side, it would drop the || stageTrackerAdoptedFromChipHtml(lp, nowMs) fallback that v5 now 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

@hivecommons-hive

Copy link
Copy Markdown
Contributor Author

Closing as superseded: base v5 already carries this normalisation via #15529 (merged 2026-10-29T23:22Z, with a regression test), and #15591 has since extended the same line with the stageTrackerAdoptedFromChipHtml fallback (static-src/js/tracker-row.js:1293, static/index.html:17347 on v5). This PR is CONFLICTING on exactly that hunk, and resolving it in favour of this branch would drop the adopted-from chip for single-covering-PR issue rows. No code change remains to land, so no fix commit was pushed.

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

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 #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:1246 from … ? 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 reaches stageTrackerPRPillsHtml as null, so the separator is omitted.
  • v5 today (tracker-row.js:1293) reads … : '') || (… stageTrackerAdoptedFromChipHtml …) || null, lp.base_ref, so the coalesce is already in place; that is also why this branch is DIRTY.

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

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

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. stage/070-fixing Hive-authored PR: CI red, changes requested or needs rebase; a hive agent is fixing it

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