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
1 change: 1 addition & 0 deletions changelog.d/changed-16668-shared-age-word.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- The stage tracker's row tooltip and current-stage line now share one relative-age formatter (#16668)
4 changes: 2 additions & 2 deletions src/pkg/dashboard/stage_tracker_activity.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function constLine(source, name) {
return match[0];
}
const trackConsts = ['STAGE_TRACKER_WORKFLOW_APPROVAL_BLOCKER', 'STAGE_TRACKER_WORKFLOW_APPROVAL_TIP', 'STAGE_TRACKER_RING_SEGMENT_GAP_MAX', 'STAGE_TRACKER_RING_RADIUS', 'STAGE_TRACKER_RING_GAP_DEG'].map(name => constLine(strip, name)).join('\n');
const trackFns = ['stageTrackerHiveOwesReReview', 'stageTrackerTrackLead', 'stageTrackerWaitingOnPerson', 'stageTrackerTrackRunning', 'stageTrackerWorkflowApprovalPending', 'stageTrackerRingSvg', 'stageTrackerStalledTrack', 'stageTrackerQueueAheadWord', 'stageTrackerStageTrack', 'stageTrackerHiveOwnsRepair', 'stageTrackerTrackWord', 'stageTrackerActivityTrackHtml'].map(name => fn(strip, name)).join('\n');
const trackFns = ['stageTrackerHiveOwesReReview', 'stageTrackerTrackLead', 'stageTrackerWaitingOnPerson', 'stageTrackerTrackRunning', 'stageTrackerWorkflowApprovalPending', 'stageTrackerRingSvg', 'stageTrackerStalledTrack', 'stageTrackerQueueAheadWord', 'stageTrackerStageTrack', 'stageTrackerHiveOwnsRepair', 'stageTrackerTrackWord', 'stageTrackerAgoWord', 'stageTrackerActivityTrackHtml'].map(name => fn(strip, name)).join('\n');
const track = new Function('esc', 'stageTrackerIcon', trackConsts + '\n' + trackFns + ';return stageTrackerActivityTrackHtml;')(esc, (n, cls) => `<svg class="${cls}" data-icon="${n}"></svg>`);
const getAnchor = new Function(globals + anchor + ';return stageTrackerAnchor;')();
const header = new Function('esc', 'stageTrackerIcon', globals + fn(strip, 'stageTrackerHeaderHtml') + ';return stageTrackerHeaderHtml;')(esc, () => '');
Expand Down Expand Up @@ -677,7 +677,7 @@ function stageTrackerActorTip() { return ''; }
` + trackConsts + '\n' + fn(strip, 'stageTrackerWaitingOnPerson') + fn(strip, 'stageTrackerTrackRunning') + fn(strip, 'stageTrackerWorkflowApprovalPending') + fn(strip, 'stageTrackerRingSvg') + fn(strip, 'stageTrackerStageTrack') + fn(strip, 'stageTrackerStalledTrack') + fn(strip, 'stageTrackerQueueAheadWord') + `
function stageTrackerMotion() { return 'active'; }
function stageTrackerIcon(n, cls) { return '<svg class="' + cls + '"></svg>'; }
` + anchor + fn(row, 'stageTrackerSegments') + fn(strip, 'stageTrackerActivityTrackHtml') + fn(strip, 'stageTrackerStripItems');
` + anchor + fn(row, 'stageTrackerSegments') + fn(strip, 'stageTrackerAgoWord') + fn(strip, 'stageTrackerActivityTrackHtml') + fn(strip, 'stageTrackerStripItems');
const render = new Function('esc', definitions + ';return stageTrackerStripItems;')(esc);
const item = { kind: 'pr', stage: 70, head: 'head', display_column: 30,
ci_activity: activity('running', 'CI running · 1/2 checks done', true),
Expand Down
1 change: 1 addition & 0 deletions src/pkg/dashboard/stage_tracker_advisory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ func TestStageTrackerAdvisoryChipAndAction(t *testing.T) {
jsFunc(t, html, "stageTrackerSegments"),
jsFunc(t, html, "stageTrackerWaitingOnPerson"),
jsFunc(t, html, "stageTrackerTrackRunning"),
jsFunc(t, html, "stageTrackerAgoWord"),
jsFunc(t, html, "stageTrackerActivityTrackHtml"),
jsFunc(t, html, "stageTrackerStripItems"),
jsFunc(t, html, "stageTrackerItemOnHold"),
Expand Down
2 changes: 2 additions & 0 deletions src/pkg/dashboard/stage_tracker_motion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ func TestStageTrackerMotionRowStamp(t *testing.T) {
jsFunc(t, html, "stageTrackerShortAgo"),
jsFunc(t, html, "stageTrackerWaitingOnPerson"),
jsFunc(t, html, "stageTrackerTrackRunning"),
jsFunc(t, html, "stageTrackerAgoWord"),
jsFunc(t, html, "stageTrackerActivityTrackHtml"),
jsFunc(t, html, "stageTrackerStripItems"),
jsFunc(t, html, "stageTrackerCurrentStageHtml"),
Expand Down Expand Up @@ -572,6 +573,7 @@ func TestStageTrackerMotionPreviewSample(t *testing.T) {
jsFunc(t, html, "stageTrackerSoakLeft"),
jsFunc(t, html, "stageTrackerWaitingOnPerson"),
jsFunc(t, html, "stageTrackerTrackRunning"),
jsFunc(t, html, "stageTrackerAgoWord"),
jsFunc(t, html, "stageTrackerActivityTrackHtml"),
jsFunc(t, html, "stageTrackerStripItems"),
jsFunc(t, html, "stageTrackerCurrentStageHtml"),
Expand Down
1 change: 1 addition & 0 deletions src/pkg/dashboard/stage_tracker_new_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,7 @@ func TestStageTrackerNewRowRendering(t *testing.T) {
jsFunc(t, html, "stageTrackerSegments"),
jsFunc(t, html, "stageTrackerWaitingOnPerson"),
jsFunc(t, html, "stageTrackerTrackRunning"),
jsFunc(t, html, "stageTrackerAgoWord"),
jsFunc(t, html, "stageTrackerActivityTrackHtml"),
jsFunc(t, html, "stageTrackerStripItems"),
jsFunc(t, html, "stageTrackerTooltip"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function constLine(source, name) {
return match[0];
}
const trackConsts = ['STAGE_TRACKER_WORKFLOW_APPROVAL_BLOCKER', 'STAGE_TRACKER_WORKFLOW_APPROVAL_TIP', 'STAGE_TRACKER_RING_SEGMENT_GAP_MAX', 'STAGE_TRACKER_RING_RADIUS', 'STAGE_TRACKER_RING_GAP_DEG'].map(name => constLine(strip, name)).join('\n');
const trackFns = ['stageTrackerTrackLead', 'stageTrackerWaitingOnPerson', 'stageTrackerTrackRunning', 'stageTrackerWorkflowApprovalPending', 'stageTrackerRingSvg', 'stageTrackerStalledTrack', 'stageTrackerQueueAheadWord', 'stageTrackerStageTrack', 'stageTrackerHiveOwnsRepair', 'stageTrackerTrackWord', 'stageTrackerActivityTrackHtml'].map(name => fn(strip, name)).join('\n');
const trackFns = ['stageTrackerTrackLead', 'stageTrackerWaitingOnPerson', 'stageTrackerTrackRunning', 'stageTrackerWorkflowApprovalPending', 'stageTrackerRingSvg', 'stageTrackerStalledTrack', 'stageTrackerQueueAheadWord', 'stageTrackerStageTrack', 'stageTrackerHiveOwnsRepair', 'stageTrackerTrackWord', 'stageTrackerAgoWord', 'stageTrackerActivityTrackHtml'].map(name => fn(strip, name)).join('\n');
const track = new Function('esc', 'stageTrackerIcon', trackConsts + '\n' + trackFns + ';return stageTrackerActivityTrackHtml;')(esc, (n, cls) => `<svg class="${cls}" data-icon="${n}"></svg>`);
const getAnchor = new Function(globals + anchor + ';return stageTrackerAnchor;')();
const segments = new Function('stageTrackerAnchor', globals + `
Expand Down
1 change: 1 addition & 0 deletions src/pkg/dashboard/stage_tracker_repo_grouping_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ func stageTrackerRepoGroupingHarness(t *testing.T, html string) string {
jsFunc(t, html, "stageTrackerSoakLeft"),
jsFunc(t, html, "stageTrackerWaitingOnPerson"),
jsFunc(t, html, "stageTrackerTrackRunning"),
jsFunc(t, html, "stageTrackerAgoWord"),
jsFunc(t, html, "stageTrackerActivityTrackHtml"),
jsFunc(t, html, "stageTrackerStripItems"),
jsFunc(t, html, "stageTrackerCurrentStageHtml"),
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/dashboard/stage_tracker_supersession_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func TestClosedSnapshotIsNeverActionable(t *testing.T) {

func TestSupersededRepairRowHasDecisionActionAndHeadline(t *testing.T) {
html := indexHTML(t)
script := stageTrackerRowActionsPreamble(t, html) + "\n" + jsFunc(t, html, "stageTrackerHeadline") + "\n" + jsFunc(t, html, "stageTrackerCurrentStageHtml") + `
script := stageTrackerRowActionsPreamble(t, html) + "\n" + jsFunc(t, html, "stageTrackerHeadline") + "\n" + jsFunc(t, html, "stageTrackerAgoWord") + "\n" + jsFunc(t, html, "stageTrackerCurrentStageHtml") + `
const item = {kind:'pr',repo:'o/r',number:12,stage:72,superseded:{closer_pr:22}};
assert.strictEqual(stageTrackerHeadline(item), 'Superseded by #22 — decide');
assert.ok(stageTrackerCurrentStageHtml(item, [], null, 0).includes('Superseded by #22'));
Expand Down
1 change: 1 addition & 0 deletions src/pkg/dashboard/stage_tracker_ui_prelude_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ func stageTrackerRowsPreludeJS(t *testing.T, html string) string {
jsFunc(t, html, "stageTrackerQueueAheadWord"),
jsFunc(t, html, "stageTrackerStageTrack"),
jsFunc(t, html, "stageTrackerTrackWord"),
jsFunc(t, html, "stageTrackerAgoWord"),
jsFunc(t, html, "stageTrackerActivityTrackHtml"),
jsFunc(t, html, "stageTrackerStripItems"),
jsFunc(t, html, "stageTrackerCurrentStageHtml"),
Expand Down
11 changes: 5 additions & 6 deletions src/pkg/dashboard/static-src/js/tracker-row-strip.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@
return total > 0 && done < total && !settledWords.includes(a.state);
}

// Pure: "12m ago" beside a timestamp; "just now" under a minute.
function stageTrackerAgoWord(atMs, nowMs) { const mins = Math.floor((nowMs - atMs) / 60000); return !Number.isFinite(mins) || mins < 1 ? 'just now' : mins < 60 ? mins + 'm ago' : mins < 1440 ? Math.floor(mins / 60) + 'h ago' : Math.floor(mins / 1440) + 'd ago'; }
// Evidence is supplied independently by the backend. A native 050 label
// cannot say who reviews, whether checks run, or whether an author codes.
// The chevron wears its glyph plus the count words from
Expand All @@ -279,8 +281,6 @@
const observed = matches && a.observed_at ? Date.parse(a.observed_at) : NaN;
const activityFreshMS = 2 * 60 * 1000;
const clock = Number(nowMs) || Date.now();
// "12m ago" beside a timestamp (kept local: harnesses lift this function alone).
const agoWord = (atMs, nowMs) => { const mins = Math.floor((nowMs - atMs) / 60000); return !Number.isFinite(mins) || mins < 1 ? 'just now' : mins < 60 ? mins + 'm ago' : mins < 1440 ? Math.floor(mins / 60) + 'h ago' : Math.floor(mins / 1440) + 'd ago'; };
const stale = Number.isFinite(observed) && (clock - observed > activityFreshMS || observed > clock);
const current = sg.state === 'active';
const state = matches ? a.state || 'unknown' : 'unknown';
Expand Down Expand Up @@ -315,7 +315,7 @@
const humanAction = approvalPending > 0 ? STAGE_TRACKER_WORKFLOW_APPROVAL_TIP : kind === 'review' && state === 'human_decision' ? 'Needs a person\'s decision' : '';
const personIco = stalled && humanAction ? stageTrackerIcon('human', 'ham-ico ham-actor-ico', humanAction) : '';
const source = matches ? a.source || 'unavailable' : 'unavailable';
const freshness = !Number.isFinite(observed) ? 'observation time unknown' : (stale ? 'stale · ' : 'observed · ') + new Date(observed).toISOString() + ' (' + agoWord(observed, clock) + ')';
const freshness = !Number.isFinite(observed) ? 'observation time unknown' : (stale ? 'stale · ' : 'observed · ') + new Date(observed).toISOString() + ' (' + stageTrackerAgoWord(observed, clock) + ')';
const since = matches && a.since && Number.isFinite(Date.parse(a.since)) ? ' · since ' + new Date(a.since).toISOString() : '';
let blocker = matches && a.blocker ? ' · ' + a.blocker : '';
// A sign-off ask: the tooltip carries the question itself (who should
Expand All @@ -326,7 +326,7 @@
// The backend's plain-language sentence behind the caption rides in
// the tooltip only; the chevron clamps the caption.
const detail = matches && a.detail ? ' · ' + a.detail : '';
const sinceAgo = matches && a.since && Number.isFinite(Date.parse(a.since)) && settledState ? ' · ' + agoWord(Date.parse(a.since), clock) : '';
const sinceAgo = matches && a.since && Number.isFinite(Date.parse(a.since)) && settledState ? ' · ' + stageTrackerAgoWord(Date.parse(a.since), clock) : '';
let tip = caption + blocker + detail + sinceAgo + (perspectives.length ? ' · ' + perspectives.map(perspectiveLine).join(' · ') : '') + ' · head ' + (item.head || 'unknown') + ' · ' + source + ' · ' + freshness + since;
const code = item.code_activity;
const codeNote = code && code.head === item.head && Number(item.display_column) === 50 &&
Expand Down Expand Up @@ -578,9 +578,8 @@
const activityFreshMS = 2 * 60 * 1000;
const clock = Number(nowMs) || Date.now();
const fresh = Number.isFinite(observed) && observed <= clock && clock - observed <= activityFreshMS;
const agoWord = (atMs, nowMs) => { const mins = Math.floor((nowMs - atMs) / 60000); return !Number.isFinite(mins) || mins < 1 ? 'just now' : mins < 60 ? mins + 'm ago' : mins < 1440 ? Math.floor(mins / 60) + 'h ago' : Math.floor(mins / 1440) + 'd ago'; };
const moving = a.active || ['running', 'reviewing', 'adjudicating'].includes(a.state);
return (a.caption || noData).replace(/^(CI|Review) unknown(?= ·|$)/, noData) + (!Number.isFinite(observed) ? ' · observation time unknown' : !fresh ? ' · last observed ' + agoWord(observed, clock) + (moving ? ' · refreshing' : '') : '');
return (a.caption || noData).replace(/^(CI|Review) unknown(?= ·|$)/, noData) + (!Number.isFinite(observed) ? ' · observation time unknown' : !fresh ? ' · last observed ' + stageTrackerAgoWord(observed, clock) + (moving ? ' · refreshing' : '') : '');
}).join(' · ') : '';
return `<p class="ham-current-stage">${esc(text + (tracks ? ' · ' + tracks : ''))}</p>`;
}
Expand Down
11 changes: 5 additions & 6 deletions src/pkg/dashboard/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18190,6 +18190,8 @@ <h3 class="faq-group-title">Where to get help</h3>
return total > 0 && done < total && !settledWords.includes(a.state);
}

// Pure: "12m ago" beside a timestamp; "just now" under a minute.
function stageTrackerAgoWord(atMs, nowMs) { const mins = Math.floor((nowMs - atMs) / 60000); return !Number.isFinite(mins) || mins < 1 ? 'just now' : mins < 60 ? mins + 'm ago' : mins < 1440 ? Math.floor(mins / 60) + 'h ago' : Math.floor(mins / 1440) + 'd ago'; }
// Evidence is supplied independently by the backend. A native 050 label
// cannot say who reviews, whether checks run, or whether an author codes.
// The chevron wears its glyph plus the count words from
Expand All @@ -18214,8 +18216,6 @@ <h3 class="faq-group-title">Where to get help</h3>
const observed = matches && a.observed_at ? Date.parse(a.observed_at) : NaN;
const activityFreshMS = 2 * 60 * 1000;
const clock = Number(nowMs) || Date.now();
// "12m ago" beside a timestamp (kept local: harnesses lift this function alone).
const agoWord = (atMs, nowMs) => { const mins = Math.floor((nowMs - atMs) / 60000); return !Number.isFinite(mins) || mins < 1 ? 'just now' : mins < 60 ? mins + 'm ago' : mins < 1440 ? Math.floor(mins / 60) + 'h ago' : Math.floor(mins / 1440) + 'd ago'; };
const stale = Number.isFinite(observed) && (clock - observed > activityFreshMS || observed > clock);
const current = sg.state === 'active';
const state = matches ? a.state || 'unknown' : 'unknown';
Expand Down Expand Up @@ -18250,7 +18250,7 @@ <h3 class="faq-group-title">Where to get help</h3>
const humanAction = approvalPending > 0 ? STAGE_TRACKER_WORKFLOW_APPROVAL_TIP : kind === 'review' && state === 'human_decision' ? 'Needs a person\'s decision' : '';
const personIco = stalled && humanAction ? stageTrackerIcon('human', 'ham-ico ham-actor-ico', humanAction) : '';
const source = matches ? a.source || 'unavailable' : 'unavailable';
const freshness = !Number.isFinite(observed) ? 'observation time unknown' : (stale ? 'stale · ' : 'observed · ') + new Date(observed).toISOString() + ' (' + agoWord(observed, clock) + ')';
const freshness = !Number.isFinite(observed) ? 'observation time unknown' : (stale ? 'stale · ' : 'observed · ') + new Date(observed).toISOString() + ' (' + stageTrackerAgoWord(observed, clock) + ')';
const since = matches && a.since && Number.isFinite(Date.parse(a.since)) ? ' · since ' + new Date(a.since).toISOString() : '';
let blocker = matches && a.blocker ? ' · ' + a.blocker : '';
// A sign-off ask: the tooltip carries the question itself (who should
Expand All @@ -18261,7 +18261,7 @@ <h3 class="faq-group-title">Where to get help</h3>
// The backend's plain-language sentence behind the caption rides in
// the tooltip only; the chevron clamps the caption.
const detail = matches && a.detail ? ' · ' + a.detail : '';
const sinceAgo = matches && a.since && Number.isFinite(Date.parse(a.since)) && settledState ? ' · ' + agoWord(Date.parse(a.since), clock) : '';
const sinceAgo = matches && a.since && Number.isFinite(Date.parse(a.since)) && settledState ? ' · ' + stageTrackerAgoWord(Date.parse(a.since), clock) : '';
let tip = caption + blocker + detail + sinceAgo + (perspectives.length ? ' · ' + perspectives.map(perspectiveLine).join(' · ') : '') + ' · head ' + (item.head || 'unknown') + ' · ' + source + ' · ' + freshness + since;
const code = item.code_activity;
const codeNote = code && code.head === item.head && Number(item.display_column) === 50 &&
Expand Down Expand Up @@ -18513,9 +18513,8 @@ <h3 class="faq-group-title">Where to get help</h3>
const activityFreshMS = 2 * 60 * 1000;
const clock = Number(nowMs) || Date.now();
const fresh = Number.isFinite(observed) && observed <= clock && clock - observed <= activityFreshMS;
const agoWord = (atMs, nowMs) => { const mins = Math.floor((nowMs - atMs) / 60000); return !Number.isFinite(mins) || mins < 1 ? 'just now' : mins < 60 ? mins + 'm ago' : mins < 1440 ? Math.floor(mins / 60) + 'h ago' : Math.floor(mins / 1440) + 'd ago'; };
const moving = a.active || ['running', 'reviewing', 'adjudicating'].includes(a.state);
return (a.caption || noData).replace(/^(CI|Review) unknown(?= ·|$)/, noData) + (!Number.isFinite(observed) ? ' · observation time unknown' : !fresh ? ' · last observed ' + agoWord(observed, clock) + (moving ? ' · refreshing' : '') : '');
return (a.caption || noData).replace(/^(CI|Review) unknown(?= ·|$)/, noData) + (!Number.isFinite(observed) ? ' · observation time unknown' : !fresh ? ' · last observed ' + stageTrackerAgoWord(observed, clock) + (moving ? ' · refreshing' : '') : '');
}).join(' · ') : '';
return `<p class="ham-current-stage">${esc(text + (tracks ? ' · ' + tracks : ''))}</p>`;
}
Expand Down
Loading