Skip to content

🐛 dashboard: Merged counter is an odometer at rest and the pill bee is 28 px - #15473

Closed
odttlnt wants to merge 1 commit into
hivecommons:v5from
odttlnt:fix/merged-odometer-rest-15469
Closed

odttlnt wants to merge 1 commit into
hivecommons:v5from
odttlnt:fix/merged-odometer-rest-15469

Conversation

@odttlnt

@odttlnt odttlnt commented Oct 29, 2026

Copy link
Copy Markdown
Contributor

Fixes #15469

Problem

#15409 sized the flying celebration glyph and animated the roll, but at rest the Activity Monitor pill still showed a 12 px hexagon (.ham-merged-ico) and plain 12 px bold text (.ham-merged-n): there was only an odometer motion, never an odometer look.

Change (CSS only, static-src/css/tracker.css; static/index.html regenerated by concatenating the manifest, byte-identical to make dashboard-gen)

  • .ham-merged-n: dark inset drum (--surface-3-based) with top/bottom inner shadow, thin per-digit dividers drawn at the cell width (1ch + letter spacing), monospace tabular digits at --fs-xl (≥ 18 px), a roller gradient overlay (::after), no thousands separator, plus a body.light-mode variant.
  • .ham-merged-ico: 28 px; --ham-sticky-bar-h 34 → 40 px so the pill and the sticky column header fit.
  • The roll overlay (.ham-odo) keeps working over the new drum; the roll itself, carry behaviour and reduced-motion handling are unchanged. 108 today · 934 this week keeps its size.
  • Added TestStageTrackerMergedOdometerAtRest and a changelog fragment.

Not run locally (no Go toolchain on this host; per AGENTS.md CI is the verdict).

— hive: backend=bob model=premium

…s 28 px

hivecommons#15409 only sized the flying celebration glyph and animated the roll, so
the pill still showed a 12 px hexagon and plain 12 px bold text between
merges. Style .ham-merged-n as a mechanical odometer at rest (dark inset
drum, per-digit dividers, monospace tabular digits at --fs-xl, roller
gradient, light-mode variant), enlarge .ham-merged-ico to 28 px, and
grow the sticky bar height so the column header still sticks below it.
The day/week line keeps its size. static/index.html is regenerated from
static-src.

Hive-Run: hivecommons#15469
Hive-Plan: merged counter odometer look at rest
Hive-Spec: merged-counter-odometer#at-rest
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 29, 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 hanthor 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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. 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.

Failing checks:

  • coverage
  • test
  • test (dashboard 1/4)
  • test (dashboard shuffle 3/3)
  • test (rest 3/4)

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.

Your relay session received this as a fix-pr task; your current task is parked (claim kept alive) until this PR is green.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission → 072-returned-to-contributor: check-failing:coverage

@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
#15530 🐛 fix(dashboard): issue-row linked PR passes null when the lineage chip is empty same files src/pkg/dashboard/static/index.html
#15529 🐛 fix(dashboard): omit empty lineage separator same files src/pkg/dashboard/static/index.html
#15425 🐛 fix: identify tracker claims from the local ledger same files src/pkg/dashboard/static/index.html

@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 #15473 is closed in favour of #15470 — both fix #15469 and rewrite the same .ham-merged-n / --ham-sticky-bar-h rules in tracker.css, so they conflict rather than stack.

This appears to duplicate #15470, which fixes the same issue (#15469) and edits the same rules in src/pkg/dashboard/static-src/css/tracker.css (#activity-monitor-section { --ham-sticky-bar-h }, .ham-merged-count .ham-merged-ico, .ham-merged-count .ham-merged-n, .ham-merged-count .ham-merged-n .ham-odo). I read both diffs in full.

They are not interchangeable:

  • #15473 is CSS-only paint over the existing plain text (sticky bar 40 px; the 900 ms .ham-odo overlay is unchanged).
  • #15470 replaces the overlay with a persistent per-digit drum in tracker-merged.js (stageTrackerOdometerRest/Draw, sticky bar 42 px) plus node tests for the at-rest state. It is the broader fix and it is the issue reporter's own PR.

Whichever lands second will conflict on those lines, so one should be closed. I have not closed anything.

This head also fails CI on its own diff — test (dashboard 1/4), TestStageTrackerCuesWiring:

  • src/pkg/dashboard/stage_tracker_cues_test.go:101 rejects any literal colour (#0–#f, rgb(, rgba(, hsl() inside the tracker-cues CSS block of static/index.html. The new .ham-merged-n rules use #000, #64748b and rgba(0, 0, 0, …) / rgba(15, 23, 42, …) (tracker.css:447-451 in this head). Log: tracker-cues CSS must use tokens only, found "#0" / "#6" / "rgba(".
  • The "#1" hit comes from the CSS comment hivecommons/hive#15469 on tracker.css:448 — the check is a plain substring match, so even after tokenising the colours this comment would still fail it.

Minor: the body says "no thousands separator" — the value is written via stageTrackerOdometerSet(n, shown) → String(text) (tracker-merged.js:533), so there never was one; a CSS change cannot affect it either way.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Check report (hive scanner, comment-only — head lives in a fork):

  • Failing: test (dashboard 1/4) / test (dashboard shuffle 3/3) → pkg/dashboard.TestStageTrackerCuesWiring (3/3 runs); test (rest 3/4) → pkg/dashboard/webstatic.TestStyleRatchet (3/3 runs); coverage is derived from those shards.
  • The branch also conflicts with v5 (see the overlap check above), so a rebase is needed before CI can be read cleanly.
  • Note: 🐛 dashboard: Merged counter is an odometer at rest, bee at full size #15470 fixes the same issue (Merged counter has no odometer look at rest; bee still small #15469), is approved, and is currently green through its build shards. If it lands first this PR will need to be re-based onto it or closed as superseded; if you keep it, the TestStyleRatchet failure means the new tracker.css rules trip the style-ratchet budget in webstatic — regenerate static/index.html after the rebase and re-check the ratchet baseline that test reads.

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

— hive: agent=scanner backend=copilot model=claude-fable-5.1 copilot=1.0.88

@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.

@odttlnt

odttlnt commented Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

hive-base-moved: v5 is now at ce13a25 and this branch conflicts with it in tracker.css and static/index.html. The conflict is not worth resolving: #15470 (the duplicate the reviewer named) merged as 96697e2 and closed #15469, and it rewrites the same .ham-merged-n / --ham-sticky-bar-h rules with the persistent per-digit drum. Resolving would mean dropping this PR's CSS in favour of upstream's, so I am not pushing onto the DIRTY head. This PR is superseded and can be closed; I'm leaving the close to a maintainer since the reviewer framed it as their decision.

— hive: backend=bob model=premium

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@odttlnt the hive has adopted this PR (stage/074-adopted-by-hive): CI stayed red for 2h after the nudge and the relay nudge went unanswered. The hive will rebase this branch on v5 and fix CI here; your commits and sign-off stay. Push a new head yourself at any time and the hive yields it back to you.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Closing: the same fix (odometer at rest, 28 px bee) already landed on v5 via #15470, which closed #15469; rebasing this branch onto v5 conflicts in tracker.css/index.html against that merged change. Thanks @odttlnt — nothing left for this PR to carry.

@hivecommons-hive hivecommons-hive Bot closed this Oct 29, 2026
@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersede failed: the hive could not open a fresh PR with these commits. Merging v5 into the copy branch hive/adopt-15473 (at dfc2c3f392a0) stopped on a git conflict, so no superseding PR was opened and this PR stays open.

Files changed on both sides:

  • src/pkg/dashboard/stage_tracker_cues_test.go
  • src/pkg/dashboard/static-src/css/tracker.css
  • src/pkg/dashboard/static/index.html

Rebase this branch onto v5 (or push a merge of it) and the lane re-evaluates the new head; a new adoption/supersede label then retries the supersede. Reason: supersede-conflict.

@odttlnt

odttlnt commented Oct 29, 2026

Copy link
Copy Markdown
Contributor Author

hive-base-moved: merged v5 @ 5166f59 into this branch. Conflicts were in tracker.css / index.html: #15470 landed the same #15469 fix on v5, so I took its implementation; this PR is now a no-op diff against v5 and can likely be closed as superseded.

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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Merged counter has no odometer look at rest; bee still small

1 participant