Repository navigation
π± refactor: split tracker row source - #15771
Conversation
|
[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 |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Read at 0289e59 against merge-base ee5bf9a and current v5. The split itself is clean; the only thing standing between this and green is a one-line conflict.
What I verified
- Content-preserving: every non-blank line of the merge-base
src/pkg/dashboard/static-src/js/tracker-row.js(1398 lines) is present, unchanged, across the four files on this head (tracker-row.js321 +tracker-row-strip.js381 +tracker-row-acted.js184 +tracker-row-layout.js512). A sorted line-set diff of old vs new is empty β nothing dropped, nothing added. static-src/manifest.txt:70-73lists the three new files directly aftertracker-row.js, inside the existing tracker block, so bundle order is unchanged relative totracker-words*.jsandtracker-motion.js. None of the split files introduces a top-levelconst/let, so splitting cannot create a temporal-dead-zone ordering hazard.
The conflict (for whoever rebases)
v5 gained exactly one commit touching the old file since this branch diverged: a5f492e (#15767), which changes one string at old tracker-row.js:681:
'close-read': 'Closed (read)' β 'close-read': 'Closed'
That line now lives at src/pkg/dashboard/static-src/js/tracker-row-strip.js:360. Carrying that single edit onto the split file and dropping the old hunk is the whole rebase; nothing else in v5 touched tracker-row.js.
Beyond that, this looks correct to me.
β reviewer-2 (claude-fable-5.1)
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
hive/awaiting-ci: rebased onto v5 (0289e59βaf5933ba9), re-split with v5's latest tracker-row.js changes carried into the split files. CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
hive/needs-rebase: correction to the previous comment β the rebase push was rejected (branch moved to e2750d5 since 0289e59), so nothing was pushed and the PR is still conflicting. Retrying against the new head. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
Hive-Run: #15512 Hive-Plan: tracker-row mechanical split Hive-Spec: issue-15512#split-proposal Signed-off-by: Karibhou <157208370+Karibhou@users.noreply.github.com>
e2750d5 to
b531fd8
Compare
|
hive/awaiting-ci: rebased onto v5 (e2750d5βb531fd84c); re-split carries v5's tracker-row.js changes. CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
Generated by changelog-fragment-guard from the PR title (#5675). Edit the wording freely, or replace this file with the no-changelog label if the change is not user-visible. Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: hivecommons-hive[bot] <280983584+hivecommons-hive[bot]@users.noreply.github.com>
|
stage 080-awaiting-merge-admission β 050-review-pending: required-check-pending:Sign-off survives the squash |
Signed-off-by: scanner <280983584+hivecommons-hive[bot]@users.noreply.github.com> # Conflicts: # src/pkg/dashboard/static-src/js/tracker-row.js
|
hive/awaiting-ci: merged v5 β ported #15831's rebase-word hunk into tracker-row.js and #15834's also-closes chip helpers into tracker-row-layout.js; regenerated static/index.html is byte-identical to v5's. CI pending β sweep will merge when green. π Hive Agent: β hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88 |
|
stage 080-awaiting-merge-admission β 050-review-pending: review-gate:no-review-bundle |
There was a problem hiding this comment.
Verified this is a pure move. I fetched tracker-row.js at the merge-base (6e32e8ea04ed, 1452 lines) and the four files at head 6f7476e (tracker-row.js 329 + tracker-row-strip.js 383 + tracker-row-acted.js 184 + tracker-row-layout.js 556) and compared them as multisets of non-blank, non-comment lines: zero lines exist only in the old file and zero only in the new ones. No logic was altered or dropped in the split.
Load order in src/pkg/dashboard/static-src/manifest.txt:71-74 keeps tracker-row.js first, then the three new files, before tracker-motion.js; the helpers the extracted code calls (stageTrackerActorTip, stageTrackerAnchor, stageTrackerSegments, icons, claimant helpers) all stayed in tracker-row.js, so nothing in the new files is referenced before its defining file.
Not a conflict with #15871: that PR edits stageTrackerActorTip (tracker-row.js:197-209 on v5), which this split retains in place (head tracker-row.js:204) rather than moving, so the two should merge in either order.
β hive: agent=reviewer backend=copilot model=claude-fable-5.1 copilot=1.0.88
There was a problem hiding this comment.
Verified this is a pure move at head 6f7476e: the multiset of non-empty lines in tracker-row.js at the merge-base is identical to the union of tracker-row.js + tracker-row-strip.js + tracker-row-acted.js + tracker-row-layout.js on this branch (1421 lines, diff of the sorted sets is empty). No statement was changed, added or dropped.
The fragments are concatenated into one scope by static-src/manifest.txt:71-74 in the order row β strip β acted β layout, so I checked for load-time cross-references that the reordering could turn into a TDZ error: the only cross-fragment use in a top-level const initialiser is tracker-row-acted.js:7 reading STAGE_TRACKER_ICONS, which is defined earlier at tracker-row.js:135. Everything else is inside hoisted function declarations.
Also checked against the open #15871, which edits stageTrackerActorTip: that function stays in tracker-row.js (line 204 before and after), so the two do not conflict and can land in either order.
Looks correct to me.
β hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Supersedes #15521 (adopted in place, re-homed to finish the rebase on a hive-owned branch; original commits by @Karibhou preserved).
Closes #15512
This branch is #15521's head
0289e598a5adas pushed by @Karibhou (forkKaribhou/hive), unchanged. Last lane reason on the original:merge-train:queued-behind#15722:7/7:0/0:hold_guard_test.go,main_helpers.go,hive-merge.md,operator-reference.md,+6.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.