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/fixed-merge-toast-repo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Show the tracker's existing repository chip on merge notifications, keeping same-number PRs in different repositories linked to their own merge and row.
8 changes: 8 additions & 0 deletions src/pkg/dashboard/stage_tracker_cues_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,14 @@ func stageTrackerCelebrateJS(t *testing.T, html string) string {
jsFunc(t, html, "stageTrackerDetachedOrigin"),
jsFunc(t, html, "celebrateDetached"),
jsFunc(t, html, "stageTrackerMergeBannerNumber"),
jsFunc(t, html, "stageTrackerMergeBannerRepo"),
jsConstLine(t, html, "STAGE_TRACKER_REPO_TINTS"),
jsFunc(t, html, "stageTrackerRepoTint"),
jsFunc(t, html, "stageTrackerRepoShort"),
jsFunc(t, html, "stageTrackerIsPrimary"),
jsFunc(t, html, "stageTrackerRepoChipHtml"),
jsFunc(t, html, "stageTrackerPrimaryRepo"),
"var _stageTrackerFilter = { repo: '' };",
jsFunc(t, html, "stageTrackerMergeBannerText"),
jsFunc(t, html, "toastCountdownBar"),
jsFunc(t, html, "toastCountdownCancel"),
Expand Down
77 changes: 74 additions & 3 deletions src/pkg/dashboard/stage_tracker_merge_banner_countdown.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ function makeDom() {

const BANNER_MS = 30000;
const src = [
'const window = {};',
'const window = { _primaryRepo: "hivecommons/hive" };',
'const _stageTrackerFilter = { repo: "" };',
'function esc(s) { return typeof s === "string" ? s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;") : ""; }',
'const _stageTrackerMerged = { server: { recent: [] } };',
'const _stageTrackerPRTitle = {};',
'function stageTrackerMergedIdent(repo, n) { return repo + "#" + n; }',
'function stageTrackerMergedByText() { return ""; }',
'function stageTrackerReducedMotion() { return true; }',
'function stageTrackerAfter(el, ev, ms, fn) { fn(); }',
Expand All @@ -67,6 +67,13 @@ const src = [
pick(/function toastCountdownBar\(el, ms, onExpire\) \{[\s\S]*?\n \}\n/, 'toastCountdownBar'),
pick(/function toastCountdownCancel\(el\) \{[\s\S]*?\n \}\n/, 'toastCountdownCancel'),
pick(/function stageTrackerMergeBannerNumber\(b\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBannerNumber'),
pick(/function stageTrackerMergeBannerRepo\(b\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBannerRepo'),
pick(/const STAGE_TRACKER_REPO_TINTS = [^\n]*\n/, 'STAGE_TRACKER_REPO_TINTS'),
pick(/function stageTrackerRepoTint\(repo\) \{[\s\S]*?\n \}\n/, 'stageTrackerRepoTint'),
pick(/function stageTrackerRepoShort\(repo\) \{[\s\S]*?\n \}\n/, 'stageTrackerRepoShort'),
pick(/function stageTrackerIsPrimary\(repo, primary\) \{[\s\S]*?\n \}\n/, 'stageTrackerIsPrimary'),
pick(/function stageTrackerRepoChipHtml\(repo, ctx\) \{[\s\S]*?\n \}\n/, 'stageTrackerRepoChipHtml'),
pick(/function stageTrackerPrimaryRepo\(\) \{[^\n]*\n/, 'stageTrackerPrimaryRepo'),
pick(/function stageTrackerMergeBannerText\(b, nowMs\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBannerText'),
pick(/function stageTrackerMergeBanner\(b\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBanner'),
pick(/function stageTrackerMergeBannerDismiss\(el\) \{[\s\S]*?\n \}\n/, 'stageTrackerMergeBannerDismiss'),
Expand All @@ -75,7 +82,7 @@ const src = [

function load() {
const dom = makeDom();
const api = new Function('document', 'setTimeout', 'clearTimeout', src + '; return { banner: stageTrackerMergeBanner, dismiss: stageTrackerMergeBannerDismiss, hamBannerDismiss };')(dom.document, dom.setTimeout, dom.clearTimeout);
const api = new Function('document', 'setTimeout', 'clearTimeout', src + '; return { banner: stageTrackerMergeBanner, dismiss: stageTrackerMergeBannerDismiss, hamBannerDismiss, merged: _stageTrackerMerged, filter: _stageTrackerFilter, chip: stageTrackerRepoChipHtml };')(dom.document, dom.setTimeout, dom.clearTimeout);
return Object.assign(dom, api);
}

Expand Down Expand Up @@ -127,3 +134,67 @@ test('manual × dismiss clears the pending timer and the bar', () => {
assert.strictEqual(el._countdown, null);
assert.ok(!el.children.some(c => c.className === 'toast-bar'), 'bar removed with the countdown');
});

test('merge banners reuse tracker chips and preserve repo-scoped actions for colliding PR numbers', () => {
const d = load();
d.merged.server.recent = [
{ repo: 'other/hive', number: 528, title: 'other merge', url: 'https://github.com/other/hive/pull/528', lane: 'other lane' },
{ repo: 'hivecommons/hive', number: 528, title: 'actual merge', url: 'https://github.com/hivecommons/hive/pull/528', lane: 'actual lane' },
{ repo: 'acme/console', number: 528, title: 'console merge', url: 'https://github.com/acme/console/pull/528' },
];
d.filter.repo = 'other/hive';
for (const repo of ['hivecommons/hive', 'other/hive', 'acme/console']) {
const rowKey = repo + '/issue#42';
const el = d.banner({ key: repo + '/pr#528', repo, number: 528, rowKey });
const chip = d.chip(repo, { repoChips: { primary: 'hivecommons/hive', active: d.filter.repo } });
assert.ok(el.innerHTML.includes(chip + ' <span class="merge-banner-num">#528</span> merged'), 'exact existing chip markup');
assert.strictEqual(el.getAttribute('data-ham-row'), rowKey);
assert.ok(el.innerHTML.includes(`data-action="hamBannerShowRow" data-arg0="${rowKey}" data-stop="1">Show row`));
assert.ok(el.innerHTML.includes(`href="https://github.com/${repo}/pull/528" target="_blank" rel="noopener">Open on GitHub`));
assert.ok(el.innerHTML.includes('data-action="hamMergedOpen" data-stop="1">All merges'));
const expected = d.merged.server.recent.find(e => e.repo === repo);
assert.ok(el.innerHTML.includes(expected.title), 'metadata belongs to actual event repo');
for (const other of d.merged.server.recent.filter(e => e.repo !== repo)) {
assert.ok(!el.innerHTML.includes(other.url), 'no other repo URL borrowed');
assert.ok(!el.innerHTML.includes(other.title), 'no other repo title borrowed');
}
}
});

test('banner identity comes from event fields, never the primary repo or current filter', () => {
const d = load();
d.filter.repo = 'unrelated/selected';
const events = [
{ repo: 'acme/console', number: 528 },
{ pr: { repo: 'acme/console', number: 528 } },
{ key: 'acme/console/pr#528' },
{ repo: 'console', key: 'acme/console/pr#528' },
{ url: 'https://github.com/acme/console/pull/528' },
{ pr: { url: 'https://github.com/acme/console/pull/528', number: 528 } },
];
for (const event of events) {
const el = d.banner(event);
assert.ok(el.innerHTML.includes('data-action="hamRepoChip" data-arg0="acme/console"'));
assert.ok(el.innerHTML.includes('href="https://github.com/acme/console/pull/528"'));
assert.ok(!el.innerHTML.includes('hivecommons/hive'));
assert.ok(!el.innerHTML.includes('unrelated/selected'));
}
const unknown = d.banner({ number: 528 });
assert.ok(!unknown.innerHTML.includes('ham-repo-chip'), 'no repository identity means no chip');
assert.ok(!unknown.innerHTML.includes('Open on GitHub'), 'no guessed repository link');
assert.ok(unknown.innerHTML.includes('All merges'), 'merged list remains available');
const short = d.banner({ repo: 'console', number: 528 });
assert.ok(short.innerHTML.includes('data-arg0="console"'), 'explicit short audit identity is retained');
assert.ok(!short.innerHTML.includes('Open on GitHub'), 'short identity does not invent an owner');
});

test('merge repo chips use the existing escaping and preview behavior', () => {
const d = load();
const repo = 'acme/<console"&>';
const el = d.banner({ repo, number: 528, preview: true, rowKey: repo + '/pr#528' });
assert.ok(el.innerHTML.includes(d.chip(repo, { repoChips: { primary: 'hivecommons/hive', active: '' } })));
assert.ok(el.innerHTML.includes('data-arg0="acme/&lt;console&quot;&amp;&gt;"'));
assert.ok(!el.innerHTML.includes('<console'));
assert.ok(!el.innerHTML.includes('Open on GitHub'), 'preview does not invent a GitHub URL');
assert.ok(el.innerHTML.includes('(test)'));
});
19 changes: 16 additions & 3 deletions src/pkg/dashboard/static-src/js/tracker-merged.js
Original file line number Diff line number Diff line change
Expand Up @@ -951,6 +951,17 @@
const k = String(b.key || '').match(/\/pr#(\d+)$/);
return k && Number(k[1]) > 0 ? k[1] : '';
}
// Event identity only: never borrow the currently selected/primary repo.
// Keep an explicit short audit repo when no canonical identity is carried.
function stageTrackerMergeBannerRepo(b) {
if (!b) return '';
const repo = String(b.repo || (b.pr && b.pr.repo) || '');
if (repo.indexOf('/') > 0) return repo;
const key = String(b.key || '').match(/^(.+)\/pr#\d+$/);
if (key) return key[1];
const url = String(b.url || (b.pr && b.pr.url) || '').match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/\d+(?:[?#].*)?$/);
return url ? url[1] : repo;
}
function stageTrackerMergeBannerText(b, nowMs) {
const d = new Date(b.at || nowMs);
const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`;
Expand All @@ -970,17 +981,19 @@
if (!document.body) return null;
let box = document.getElementById('merge-banners');
if (!box) { box = document.createElement('div'); box.id = 'merge-banners'; box.className = 'merge-banners'; box.setAttribute('aria-live', 'polite'); document.body.appendChild(box); }
const recent = ((_stageTrackerMerged.server && _stageTrackerMerged.server.recent) || []).find(e => stageTrackerMergedIdent(e.repo, e.number) === stageTrackerMergedIdent(b.repo, b.number));
const info = Object.assign({ title: _stageTrackerPRTitle[b.key] || '', merged_by: '', lane: '', url: '' }, recent || {}, b);
const repo = stageTrackerMergeBannerRepo(b);
const recent = repo ? ((_stageTrackerMerged.server && _stageTrackerMerged.server.recent) || []).find(e => stageTrackerMergeBannerRepo(e).toLowerCase() === repo.toLowerCase() && stageTrackerMergeBannerNumber(e) === stageTrackerMergeBannerNumber(b)) : null;
const info = Object.assign({ title: _stageTrackerPRTitle[b.key] || '', merged_by: '', lane: '', url: '' }, recent || {}, b, { repo });
const num = stageTrackerMergeBannerNumber(info);
const repoChip = stageTrackerRepoChipHtml(repo, { repoChips: { primary: stageTrackerPrimaryRepo(), active: _stageTrackerFilter.repo } });
// A live merge the ledger has not listed yet still links: the key carries owner/name.
if (!info.url && info.repo && info.repo.indexOf('/') > 0 && num && !info.preview) info.url = `https://github.com/${info.repo}/pull/${num}`;
const t = stageTrackerMergeBannerText(info, Date.now());
const el = document.createElement('div');
el.className = 'merge-banner';
el.setAttribute('role', 'status');
if (b.rowKey) el.setAttribute('data-ham-row', b.rowKey);
el.innerHTML = `<span class="merge-banner-ico" aria-hidden="true">✓</span><div class="merge-banner-body"><div class="merge-banner-head">${num ? `<span class="merge-banner-num">#${esc(num)}</span> ` : ''}merged${info.preview ? ' <span class="text-muted">(test)</span>' : ''}</div><div class="merge-banner-text" title="${esc(t.text)}">${esc(t.text)}</div><div class="merge-banner-links">${b.rowKey ? `<button type="button" data-action="hamBannerShowRow" data-arg0="${esc(b.rowKey)}" data-stop="1">Show row</button>` : ''}${info.url ? `<a href="${esc(info.url)}" target="_blank" rel="noopener">Open on GitHub</a>` : ''}<button type="button" data-action="hamMergedOpen" data-stop="1">All merges</button></div></div><button type="button" class="merge-banner-close" data-action="hamBannerDismiss" data-arg-types="t" data-stop="1" aria-label="Dismiss">×</button>`;
el.innerHTML = `<span class="merge-banner-ico" aria-hidden="true">✓</span><div class="merge-banner-body"><div class="merge-banner-head">${repoChip ? repoChip + ' ' : ''}${num ? `<span class="merge-banner-num">#${esc(num)}</span> ` : ''}merged${info.preview ? ' <span class="text-muted">(test)</span>' : ''}</div><div class="merge-banner-text" title="${esc(t.text)}">${esc(t.text)}</div><div class="merge-banner-links">${b.rowKey ? `<button type="button" data-action="hamBannerShowRow" data-arg0="${esc(b.rowKey)}" data-stop="1">Show row</button>` : ''}${info.url ? `<a href="${esc(info.url)}" target="_blank" rel="noopener">Open on GitHub</a>` : ''}<button type="button" data-action="hamMergedOpen" data-stop="1">All merges</button></div></div><button type="button" class="merge-banner-close" data-action="hamBannerDismiss" data-arg-types="t" data-stop="1" aria-label="Dismiss">×</button>`;
box.appendChild(el);
while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) { toastCountdownCancel(box.children[0]); box.children[0].remove(); }
toastCountdownBar(el, stageTrackerMergeBannerMs(), () => stageTrackerMergeBannerDismiss(el));
Expand Down
19 changes: 16 additions & 3 deletions src/pkg/dashboard/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -24083,6 +24083,17 @@ <h2 class="config-title" id="activity-monitor-labels-title">All labels</h2>
const k = String(b.key || '').match(/\/pr#(\d+)$/);
return k && Number(k[1]) > 0 ? k[1] : '';
}
// Event identity only: never borrow the currently selected/primary repo.
// Keep an explicit short audit repo when no canonical identity is carried.
function stageTrackerMergeBannerRepo(b) {
if (!b) return '';
const repo = String(b.repo || (b.pr && b.pr.repo) || '');
if (repo.indexOf('/') > 0) return repo;
const key = String(b.key || '').match(/^(.+)\/pr#\d+$/);
if (key) return key[1];
const url = String(b.url || (b.pr && b.pr.url) || '').match(/^https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/\d+(?:[?#].*)?$/);
return url ? url[1] : repo;
}
function stageTrackerMergeBannerText(b, nowMs) {
const d = new Date(b.at || nowMs);
const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`;
Expand All @@ -24102,17 +24113,19 @@ <h2 class="config-title" id="activity-monitor-labels-title">All labels</h2>
if (!document.body) return null;
let box = document.getElementById('merge-banners');
if (!box) { box = document.createElement('div'); box.id = 'merge-banners'; box.className = 'merge-banners'; box.setAttribute('aria-live', 'polite'); document.body.appendChild(box); }
const recent = ((_stageTrackerMerged.server && _stageTrackerMerged.server.recent) || []).find(e => stageTrackerMergedIdent(e.repo, e.number) === stageTrackerMergedIdent(b.repo, b.number));
const info = Object.assign({ title: _stageTrackerPRTitle[b.key] || '', merged_by: '', lane: '', url: '' }, recent || {}, b);
const repo = stageTrackerMergeBannerRepo(b);
const recent = repo ? ((_stageTrackerMerged.server && _stageTrackerMerged.server.recent) || []).find(e => stageTrackerMergeBannerRepo(e).toLowerCase() === repo.toLowerCase() && stageTrackerMergeBannerNumber(e) === stageTrackerMergeBannerNumber(b)) : null;
const info = Object.assign({ title: _stageTrackerPRTitle[b.key] || '', merged_by: '', lane: '', url: '' }, recent || {}, b, { repo });
const num = stageTrackerMergeBannerNumber(info);
const repoChip = stageTrackerRepoChipHtml(repo, { repoChips: { primary: stageTrackerPrimaryRepo(), active: _stageTrackerFilter.repo } });
// A live merge the ledger has not listed yet still links: the key carries owner/name.
if (!info.url && info.repo && info.repo.indexOf('/') > 0 && num && !info.preview) info.url = `https://github.com/${info.repo}/pull/${num}`;
const t = stageTrackerMergeBannerText(info, Date.now());
const el = document.createElement('div');
el.className = 'merge-banner';
el.setAttribute('role', 'status');
if (b.rowKey) el.setAttribute('data-ham-row', b.rowKey);
el.innerHTML = `<span class="merge-banner-ico" aria-hidden="true">✓</span><div class="merge-banner-body"><div class="merge-banner-head">${num ? `<span class="merge-banner-num">#${esc(num)}</span> ` : ''}merged${info.preview ? ' <span class="text-muted">(test)</span>' : ''}</div><div class="merge-banner-text" title="${esc(t.text)}">${esc(t.text)}</div><div class="merge-banner-links">${b.rowKey ? `<button type="button" data-action="hamBannerShowRow" data-arg0="${esc(b.rowKey)}" data-stop="1">Show row</button>` : ''}${info.url ? `<a href="${esc(info.url)}" target="_blank" rel="noopener">Open on GitHub</a>` : ''}<button type="button" data-action="hamMergedOpen" data-stop="1">All merges</button></div></div><button type="button" class="merge-banner-close" data-action="hamBannerDismiss" data-arg-types="t" data-stop="1" aria-label="Dismiss">×</button>`;
el.innerHTML = `<span class="merge-banner-ico" aria-hidden="true">✓</span><div class="merge-banner-body"><div class="merge-banner-head">${repoChip ? repoChip + ' ' : ''}${num ? `<span class="merge-banner-num">#${esc(num)}</span> ` : ''}merged${info.preview ? ' <span class="text-muted">(test)</span>' : ''}</div><div class="merge-banner-text" title="${esc(t.text)}">${esc(t.text)}</div><div class="merge-banner-links">${b.rowKey ? `<button type="button" data-action="hamBannerShowRow" data-arg0="${esc(b.rowKey)}" data-stop="1">Show row</button>` : ''}${info.url ? `<a href="${esc(info.url)}" target="_blank" rel="noopener">Open on GitHub</a>` : ''}<button type="button" data-action="hamMergedOpen" data-stop="1">All merges</button></div></div><button type="button" class="merge-banner-close" data-action="hamBannerDismiss" data-arg-types="t" data-stop="1" aria-label="Dismiss">×</button>`;
box.appendChild(el);
while (box.children.length > STAGE_TRACKER_MERGE_BANNER_MAX) { toastCountdownCancel(box.children[0]); box.children[0].remove(); }
toastCountdownBar(el, stageTrackerMergeBannerMs(), () => stageTrackerMergeBannerDismiss(el));
Expand Down
Loading