Skip to content

πŸ› dashboard: Merged counter is an odometer at rest, bee at full size - #15470

Merged
clubanderson merged 1 commit into
v5from
fix/merged-odometer-look
Oct 29, 2026
Merged

clubanderson merged 1 commit into
v5from
fix/merged-odometer-look

Conversation

@clubanderson

Copy link
Copy Markdown
Member

Fixes #15469 (follow-up to #15398 / #15409).

Cause

#15409 is in the build, but it never changed what the Merged pill looks like at rest:

  1. Wrong bee. It sized the flying celebration glyph (.cue-flight via --cue-flight-size), not the pill's own .ham-merged-ico, which stayed 12px Γ— 12px.
  2. Animation-only odometer. stageTrackerOdometerSet appended an absolutely-positioned, aria-hidden .ham-odo overlay for ~900 ms over the plain --fs-sm (12 px) bold text and then removed it. Between merges .ham-merged-n was plain text β€” no cells, dividers or drum. The roll existed; the look never did.
  3. Even mid-roll, unchanged digits were emitted as static {text}, so most of the number was still plain text.

Same element in both cases (#activity-monitor-merged in the sticky header bar); there is no sidebar instance.

Fix

  • .ham-merged-n is now a persistent drum: one .ham-odo-col wheel per digit, dark inset cell (--surface-0β†’--surface-3 roller gradient, top/bottom inner shadows, hairline dividers), monospace tabular digits at --ham-odo-digit: 18px, no thousands separator; light-mode variant under body.light-mode. Value exposed via data-odo-value + aria-label.
  • On change, only the wheels that change get .ham-odo-roll and roll vertically through the intermediate digits (ease-out, 900 ms; carries roll too); the drum is redrawn at rest afterwards. prefers-reduced-motion β†’ instant swap (transition: none).
  • Bee .ham-merged-ico β†’ --ham-merged-bee: 28px, vertically centred; pill grows to 34 px; --ham-sticky-bar-h 34 β†’ 42 px so the column header still sticks beneath the bar. 108 today Β· 934 this week keeps its size (same wheel columns drawn plain).
  • One shared code path (stageTrackerOdometerRest/Draw/Set) for every Merged render; ids/classes asserted by tests unchanged.

Measured in the harness: chip 20 β†’ 34 px, bee 12 β†’ 28 px, digit font 12 β†’ 18 px, drum cells 0 β†’ 4; mid-roll 2 wheels rolling for 9539 β†’ 9541; reduced motion: 0 roll classes, text swapped.

Screenshots

Before, at rest:

before, at rest

After, at rest (dark):

after, at rest, dark

After, mid-roll (dark, 9539 β†’ 9541):

after, mid-roll, dark

After, at rest (light):

after, at rest, light

Tests / docs

  • TestStageTrackerOdometerNode (node harness): N drum cells for N digits at rest; a change puts ham-odo-roll on the changed wheels only; carry roll; reduced-motion/instant swap; data-odo-value.
  • TestStageTrackerCuesWiring: drum CSS tokens/selectors present in the generated page.
  • src/docs/dashboard-sections.md header pill entry; changelog.d/fixed-merged-odometer-at-rest.md.

@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 danathar 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 29, 2026
@github-actions

github-actions Bot commented Oct 29, 2026 •

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

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
#15473 πŸ› dashboard: Merged counter is an odometer at rest and the pill bee is 28 px CONFLICT src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static/index.html
#15468 πŸ› tracker: reporter-trust hold reads 'Triage needed' same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#15477 ✨ tracker: accept triage for every selected issue at once same files src/docs/dashboard-sections.md
src/pkg/dashboard/static/index.html
#15478 πŸ› fix(dashboard): share tracker row pill assembly; fix shrink-priority comment same files src/pkg/dashboard/static-src/css/tracker.css
src/pkg/dashboard/static/index.html
#15400 πŸ› fix: keep merge queue position visible during sweeps 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

Copy link
Copy Markdown
Contributor

@clubanderson is auto-promoted for contributor-lane merging on this PR: the last 5 merged PRs by this author in this hive's repositories have no revert or sentinel-alert evidence. CI, reviewer verdict, diff fences, soak, holds and branch protection still apply.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

@clubanderson this PR is held at stage/071-needs-author and the hive will not merge it yet.

Failing checks:

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

Next: the hive does not push to your branch. Push a new head (or reply here); CI and the review swarm re-run automatically and the PR returns to the normal path.

@hivecommons-hive

Copy link
Copy Markdown
Contributor

stage 080-awaiting-merge-admission β†’ 071-needs-author: optional-check-failing:test (dashboard shuffle 3/3)

@hivecommons-hive

Copy link
Copy Markdown
Contributor

CI triage for head 2bc4408 (PR-local; v5 is green on these checks):

test (dashboard 1/4) / dashboard shuffle 3/3 β€” TestStageTrackerCuesWiring
stage_tracker_cues_test.go:111: tracker-cues CSS must use tokens only, found "rgba(". The new .ham-odo-col rules in static-src/css/tracker.css sit inside the /* ---- tracker-cues … */ block the test scans, and both the dark and body.light-mode variants use box-shadow: inset … rgba(0, 0, 0, 0.75|0.35). Fix: replace the literal with a token β€” e.g. define --odo-inset-shade (dark/light values) alongside --shadow-raised in base.css and use rgba(...)-free color-mix(in srgb, black NN%, transparent), or move the inset shadow onto a new --shadow-odometer token declared in base.css (tokens there are outside the scanned block).

test (rest 3/4) β€” webstatic.TestStyleRatchet
operator static/index.html has 139 raw color literals/functions, above the baseline of 135 and 205 raw padding declarations, above the baseline of 204. The same .ham-odo-col rules add the color-mix(...)/rgba(...)/black literals and one padding: 0 1px. Dropping the rgba( shadows for a token covers most of the colour delta; the gradient's black mixes count too β€” consider var(--surface-0) mixed with an existing dark token. Alternatively pay the debt down elsewhere in the same PR so the counts stay ≀ 135 / ≀ 204 (the test message explains how to lower styleRatchetBaselines).

coverage / test are the aggregates of the above. Regenerate static/index.html after editing static-src/.


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

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

#15409 enlarged the flying .cue-flight glyph, not the pill's
.ham-merged-ico (12px), and drew the roll as a 900ms .ham-odo overlay over
plain --fs-sm text, so at rest the Merged pill was a small hexagon and a
bold number. The counter is now a persistent drum (one .ham-odo-col wheel
per digit in a dark inset cell with a roller gradient, inner shadows and
hairline dividers; monospace tabular 18px digits; no thousands separator)
that only the changed wheels roll through, the pill's bee is 28px with the
pill and sticky bar grown to fit, reduced motion swaps instantly, and the
day/week line rolls through the same columns drawn plain.

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

Fixes #15469

Signed-off-by: Andrew Anderson <andy@clubanderson.com>

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

Read the diff against v5 and the callers of .ham-merged-n. Looks correct to me:

  • The only consumers of the counter's value read data-odo-value (tracker-merged.js:529), the aria-live region is written separately (:541), and the tests build their own nodes β€” so replacing the element's plain text with the persistent .ham-odo drum in stageTrackerOdometerDraw breaks no reader. role="img" + aria-label on the element keeps the screen-reader value intact.
  • The new CSS stays inside the tokens-only rule at stage_tracker_cues_test.go:101 (color-mix(... black ...) keywords, no hex/rgba literals), which is the exact check that fails on the alternative PR.

Heads-up: #15473 fixes the same issue (#15469) by CSS-only paint over the same tracker.css rules (--ham-sticky-bar-h 40 px vs 42 px here, .ham-merged-ico, .ham-merged-n). They conflict rather than stack; I have left a note there recommending it be closed in favour of this one.

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

@clubanderson
clubanderson merged commit 96697e2 into v5 Oct 29, 2026
77 of 78 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the fix/merged-odometer-look branch October 29, 2026 19:42
@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

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

Labels

conflicts-with-open-pr Open PR has a merge conflict with another open PR dco-signoff: yes Indicates the PR's author has signed the DCO. size/XL Denotes a PR that changes 500-999 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