Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/integration-governance.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const MAX_COMMITS = 1000;
const MAX_AUTHOR_BATCH = 50;
// This literal is inside the enrolled .github closure. A caller-supplied
// preparedBy.sourceSHA must never choose a new executable verifier tree.
const TRUSTED_SCRIPTS_TREE = 'aa20dad41934337be58b07e3812d78e9c41310e2';
const TRUSTED_SCRIPTS_TREE = '68aa6a3ea98f2ab257c8d492b39b8a661092786d';
const SOURCE = 'https://github.com/kubernetes-sigs/kubebuilder-release-tools/tree/012269a88fa4c034a0acf1ba84c26b195c0dbab4';
const sha = value => crypto.createHash('sha256').update(value).digest('hex');
const git = (args, cwd = process.cwd()) =>
Expand Down
1 change: 1 addition & 0 deletions changelog.d/fixed-activity-chevron-height.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Activity monitor: stage chevrons are again only as tall as their caption (one line of text β†’ a one-line chevron, two lines β†’ two, never more) with the caption centred instead of flush-left in a fixed two-line box, and the CI / Review lanes are notched chevrons like the other stages (state shown by fill and text colour) rather than bordered boxes.
22 changes: 17 additions & 5 deletions src/docs/dashboard-source-layout.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,16 +120,28 @@ inputs, not a claimed live backend snapshot. Use these structures plus long
unbroken-handle stress data for preview coverage; a fixture passing is not proof
that the published application renders correctly.

The split CI/Review cards also distinguish position from activity: a steady
outline and accessible current-phase label identify the occupied phase, even when
evidence is unknown, work is queued or a PR is held. The running-work class and
The split CI/Review lanes are chevrons like every other stage β€” the same notch
polygon, padding and content-driven height as their neighbours, never a bordered
card (the boxed opt-out of #16384 is gone). They express lane state the way the
other chevrons do, through fill, tint and text colour: `done` (passed/approved),
dimmed `todo`, the lit `active` fill for fresh observed work, a muted amber tint
for `ham-current` occupancy, and an amber-on-tint treatment for failing CI or
changes requested. They also distinguish position from activity: a steady
current-phase tint and accessible current-phase label identify the occupied
phase, even when evidence is unknown, work is queued or a PR is held. The running-work class and
motion still require fresh current-head activity evidence; completion remains
evidence-based. Both parallel tracks can occupy the current phase without
claiming either is running. Native stages, holds and merge authority do not
change.

All progress chevrons share a fixed two-line text budget, wrapping even unbroken
handles. Icons have reserved space clear of the chevron points. Full details
All progress chevrons share a two-line text budget, wrapping even unbroken
handles, but a row is only as tall as its longest caption: one line of text gives
a one-line-tall chevron, two lines a two-line-tall one, never more (the grid row
sizes to content above a one-line floor; sibling cells stretch to the row's
tallest chevron, not to a fixed box). The caption, with its reserved icons, is
centred in the chevron both horizontally and vertically, as before the two-line
budget; a wrapped second line is centred under the first. Icons have reserved
space clear of the chevron points. Full details
remain in the native title and/or shared hover/focus tooltip portal; links and
decision controls remain interactive. Decision chevrons, including native
merge-gate claim conflicts, instead use their existing decision dialog as the
Expand Down
9 changes: 8 additions & 1 deletion src/pkg/dashboard/stage_tracker_activity.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,15 @@ test('genuine current-head source work still lights PR in progress; fix assignme

test('current-phase styling is steady and undimmed, including compact/reduced-motion layouts', () => {
const css = fs.readFileSync(path.join(__dirname, 'static-src/css/tracker.css'), 'utf8');
assert.match(css, /\.ham-activity-track\.ham-current \{[^}]*opacity: 1;[^}]*box-shadow:/);
assert.match(css, /\.ham-activity-track\.ham-current \{[^}]*opacity: 1;[^}]*box-shadow: none/);
assert.match(css, /\.ham-activity-track\.ham-current:not\(\.active\) \{ background: color-mix/);
// Lanes are chevrons like every other stage (#16384's boxed card is
// gone): no clip-path opt-out, no border/ring; state is fill and colour.
assert.doesNotMatch(css, /\.ham-activity-track \{/, 'no activity-track rule overrides the .ham-seg chevron shape');
for (const block of css.match(/\.ham-(?:seg\.)?ham-activity-track[^{]*\{[^}]*\}/g)) {
assert.doesNotMatch(block, /clip-path|border(?!-radius)|box-shadow: inset/, block);
}
assert.match(css, /\.ham-seg\.ham-activity-track\[data-activity-state="failing"\], \.ham-seg\.ham-activity-track\[data-activity-state="changes_requested"\] \{ background: color-mix\(in srgb, var\(--amber\) \d+%, var\(--panel\)\); color: var\(--amber\);/);
const current = css.match(/\.ham-activity-track\.ham-current \{([^}]*)\}/)[1];
assert.doesNotMatch(current, /animation|data-motion/);
assert.ok(css.indexOf('.ham-activity-track.ham-current {') > css.indexOf('.ham-seg.todo {'), 'current occupancy overrides generic upcoming-track dimming');
Expand Down
15 changes: 15 additions & 0 deletions src/pkg/dashboard/stage_tracker_header_spans.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,21 @@ test('spans share the physical lane grid, including independent concurrent CI/Re
assert.match(ctx.stageTrackerHeadColsHtml(['PR']), /data-ham-pr-start="5"/, 'boundary derives from canonical stages, not a second hard-coded span');
});

test('chevron height is content-driven (one-line floor, two-line clamp) and the caption stays centred', () => {
const strip = rule('.ham-strip[aria-label="Pipeline progress"]');
const seg = rule('.ham-strip[aria-label="Pipeline progress"] > .ham-seg');
const copy = rule('.ham-chevron-copy');
assert.match(strip, /grid-auto-rows: minmax\(calc\(var\(--ham-chevron-line-height\) \* 1em \+ 2 \* var\(--sp-2\) \+ 2 \* var\(--line-width\)\), auto\)/,
'rows size to their tallest caption above a one-line floor');
assert.doesNotMatch(strip, /grid-auto-rows: calc\(var\(--ham-chevron-text-lines\)/, 'no fixed two-line row height around one line of text');
assert.match(seg, /align-self: stretch/);
assert.doesNotMatch(seg, /height: 100%/, 'siblings follow the row, the row follows its content');
assert.match(copy, /max-height: calc\(var\(--ham-chevron-text-lines\) \* var\(--ham-chevron-line-height\) \* 1em\)/, 'the two-line clamp stays');
assert.match(copy, /flex: 0 1 auto/, 'the copy shrink-wraps its text so justify-content: center centres it');
assert.match(copy, /text-align: center/, 'a wrapped second line is centred under the first');
assert.match(rule('.ham-chevron-info.config-info, .ham-chevron-info.ham-chevron-decision'), /align-items: center; justify-content: center/);
});

test('long metadata wraps in bounded slots and the narrow layout resets both grid axes', () => {
assert.match(rule('.ham-head-cols .ham-seg.ham-head-pr'), /flex-wrap: wrap/);
assert.match(rule('.ham-head-cols .ham-seg.cap .ham-badges'), /flex-wrap: wrap/);
Expand Down
37 changes: 27 additions & 10 deletions src/pkg/dashboard/static-src/css/tracker.css
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,12 @@
.ham-badge-reroute.ham-reroute-online .ham-presence-dot { background: var(--status-ok); }
.ham-strip { list-style: none; margin: 0; padding: 0; display: grid; grid-template-columns: repeat(var(--ham-visible-columns), minmax(0, 1fr)) 4em; gap: var(--sp-1); min-height: 18px; flex: 1 1 auto; min-width: 0; font-size: var(--fs-xs); --ham-notch: 8px; --ham-visible-columns: 7; --ham-chevron-text-lines: 2; --ham-chevron-line-height: 1.3; }
.ham-seg { position: relative; flex: 1 1 0; min-width: 0; display: flex; align-items: center; justify-content: center; padding: 0 var(--sp-4) 0 var(--sp-5); font-size: var(--fs-xs); font-weight: var(--fw-medium); white-space: nowrap; overflow: hidden; clip-path: polygon(0 0, calc(100% - var(--ham-notch)) 0, 100% 50%, calc(100% - var(--ham-notch)) 100%, 0 100%, var(--ham-notch) 50%); }
.ham-activity-track { clip-path: none; border: var(--line-width) solid var(--line-subtle); border-radius: var(--r-sm); white-space: normal; }
/* The concurrent CI / Review lanes are chevrons like every other stage
(same clip-path, padding and height β€” the boxed card opt-out of
#16384 is gone); their lane state reads through fill, tint and text
colour exactly as done / todo / active do, never a border or ring,
which the notched polygon would clip anyway. */
.ham-track-state a { color: inherit; }
.ham-activity-track[data-activity-state="failing"], .ham-activity-track[data-activity-state="changes_requested"] { border-color: var(--amber); color: var(--amber); }
.ham-seg:first-child { clip-path: polygon(0 0, calc(100% - var(--ham-notch)) 0, 100% 50%, calc(100% - var(--ham-notch)) 100%, 0 100%); }
.ham-seg.cap { flex: 0 0 4em; }
.ham-seg.active.merged { background: var(--green); color: var(--surface-0); animation: none; }
Expand All @@ -346,9 +349,15 @@
movement effects' (flash / ripple / wash). */
.ham-seg.active { background: var(--amber); color: var(--surface-0); }
/* Position is independent of observed work: queued, held and unknown
tracks retain a steady current-phase outline, never a work pulse. */
.ham-activity-track.ham-current { border-color: var(--amber); opacity: 1; box-shadow: inset 0 0 0 var(--line-width) var(--amber); }
.ham-activity-track.ham-current:not(.active) { background: color-mix(in srgb, var(--amber) 12%, var(--panel)); }
tracks keep a steady current-phase tint (a muted amber fill, full
opacity, no dimming ring), never a work pulse; only fresh observed
work earns the lit .active fill. */
.ham-activity-track.ham-current { opacity: 1; box-shadow: none; }
.ham-activity-track.ham-current:not(.active) { background: color-mix(in srgb, var(--amber) 28%, var(--panel)); color: var(--text); }
/* Findings (red CI, changes requested) are an amber-tinted chevron with
amber words β€” full opacity, still not the hive's own work; the finding
outranks the current-phase tint when both apply. */
.ham-seg.ham-activity-track[data-activity-state="failing"], .ham-seg.ham-activity-track[data-activity-state="changes_requested"] { background: color-mix(in srgb, var(--amber) 18%, var(--panel)); color: var(--amber); box-shadow: none; opacity: 1; }
.ham-seg.active[data-motion]::before { content: ''; position: absolute; inset: 0; opacity: 0; pointer-events: none; }
.ham-seg.active[data-motion="active"]::before { background: white; animation: ham-pulse 1.6s ease-in-out infinite; }
.ham-seg.active[data-motion="needs-human"]::before { background: var(--red); animation: ham-breathe-human 2.8s ease-in-out infinite; }
Expand Down Expand Up @@ -379,14 +388,22 @@
.ham-gate-ico { display: inline-flex; align-items: center; margin-right: var(--sp-1); cursor: help; }
.ham-gate-ico .ham-ico { width: 12px; height: 12px; }
.ham-gate-detail { font-weight: normal; opacity: 0.85; font-variant-numeric: tabular-nums; }
/* All physical chevrons share a two-line budget. The portal tooltip is
outside the clipped polygon; keyboard focus exposes the same full text. */
.ham-strip[aria-label="Pipeline progress"] { grid-auto-rows: calc(var(--ham-chevron-text-lines) * var(--ham-chevron-line-height) * 1em + 2 * var(--sp-2) + 2 * var(--line-width)); }
.ham-strip[aria-label="Pipeline progress"] > .ham-seg { box-sizing: border-box; height: 100%; line-height: var(--ham-chevron-line-height); padding: var(--sp-2) calc(var(--ham-notch) + var(--sp-2)); }
/* All physical chevrons share a two-line text budget, but a row is only
as tall as its longest caption: one line of text β†’ a one-line chevron,
two lines β†’ two (the clamp below caps it there). The grid row sizes
to content with a one-line floor so icon-only cells and siblings
stretch to the row's tallest chevron, never to a fixed box. The
portal tooltip is outside the clipped polygon; keyboard focus
exposes the same full text. */
.ham-strip[aria-label="Pipeline progress"] { grid-auto-rows: minmax(calc(var(--ham-chevron-line-height) * 1em + 2 * var(--sp-2) + 2 * var(--line-width)), auto); }
.ham-strip[aria-label="Pipeline progress"] > .ham-seg { box-sizing: border-box; align-self: stretch; line-height: var(--ham-chevron-line-height); padding: var(--sp-2) calc(var(--ham-notch) + var(--sp-2)); }
.ham-chevron-info.config-info, .ham-chevron-info.ham-chevron-decision { display: flex; align-items: center; justify-content: center; gap: var(--sp-1); width: 100%; height: 100%; min-width: 0; flex-shrink: 1; margin: 0; padding: 0; border: 0; background: transparent; color: inherit; font: inherit; line-height: inherit; position: static; }
.ham-chevron-info.config-info:hover { background: transparent; border: 0; color: inherit; }
.ham-chevron-info:focus-visible, .ham-chevron-decision:focus-within { outline: var(--line-width) solid currentColor; outline-offset: var(--sp-1); }
.ham-chevron-copy { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: var(--ham-chevron-text-lines); line-clamp: var(--ham-chevron-text-lines); max-height: calc(var(--ham-chevron-text-lines) * var(--ham-chevron-line-height) * 1em); flex: 1 1 auto; min-width: 0; overflow: hidden; white-space: normal; overflow-wrap: anywhere; }
/* The copy shrink-wraps its text (flex 0 1 auto) so the words, with
their icons, sit centred in the chevron as before; a wrapped second
line is centred under the first rather than ragged-left. */
.ham-chevron-copy { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: var(--ham-chevron-text-lines); line-clamp: var(--ham-chevron-text-lines); max-height: calc(var(--ham-chevron-text-lines) * var(--ham-chevron-line-height) * 1em); flex: 0 1 auto; min-width: 0; overflow: hidden; white-space: normal; overflow-wrap: anywhere; text-align: center; }
.ham-chevron-copy :is(.ham-seg-t, .ham-detour, .ham-holder, .ham-gate-detail) { display: inline; white-space: normal; overflow-wrap: anywhere; }
.ham-chevron-copy > .ham-decision-trigger { display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: var(--ham-chevron-text-lines); line-clamp: var(--ham-chevron-text-lines); max-width: 100%; overflow: hidden; white-space: normal; overflow-wrap: anywhere; }
.config-tooltip.ham-chevron-tip { overflow-wrap: anywhere; max-width: calc(100vw - var(--sp-8)); max-height: calc(100vh - var(--sp-8)); overflow-y: auto; pointer-events: auto; }
Expand Down
Loading
Loading