// no count โ instead of letting the row vanish in silence.
const closed = stageTrackerNewlyClosed(d, _stageTrackerMergeState, next, _stageTrackerPRItems, _stageTrackerClosedNoted);
const closedItems = closed.map(k => prevItems[k] || _stageTrackerPRLast[k]);
- closed.forEach(k => { _stageTrackerClosedNoted[k] = true; delete next[k]; delete _stageTrackerPRLast[k]; });
+ // The closed key stays comparable (false), not deleted: a close the
+ // server later corrects to a merge โ a bot's comment on a just-merged
+ // PR read as "closed" before the merge fact landed โ still flips
+ // false โ true and celebrates (hivecommons/hive#16658).
+ closed.forEach(k => { _stageTrackerClosedNoted[k] = true; delete _stageTrackerPRLast[k]; });
_stageTrackerMergeState = next;
// A merged PR is no longer in this payload, so its last host survives.
if (typeof stageTrackerPRHosts === 'function') Object.assign(_stageTrackerPRHost, stageTrackerPRHosts(d));
@@ -25411,6 +25416,30 @@
All labels
if (!by) return '';
return by === 'hive' ? 'by hive' : 'by @' + by;
}
+ // Pure: the merger as the merge toast's head names them โ "๐ hive"
+ // for the hive's own merge, "@login" for anyone else, '' unknown.
+ function stageTrackerMergerText(by) {
+ by = String(by || '').trim();
+ if (!by) return '';
+ return by === 'hive' ? '๐ hive' : '@' + by;
+ }
+ // Pure: who merged the PR at key, from the payload's terminal facts โ
+ // recently_merged (audit + ledger, any merger) and the ledger's recent
+ // list โ then the terminal fact this tab already holds. '' unknown.
+ function stageTrackerMergedByOf(key, d) {
+ const n = Number(String(key || '').slice(String(key || '').lastIndexOf('/pr#') + 4)) || 0;
+ const repo = String(key || '').slice(0, String(key || '').lastIndexOf('/pr#')).toLowerCase();
+ if (!n || !repo) return '';
+ const short = repo.slice(repo.lastIndexOf('/') + 1);
+ const ledger = d && d.merged && Array.isArray(d.merged.recent) ? d.merged.recent : [];
+ for (const m of (d && Array.isArray(d.recently_merged) ? d.recently_merged : []).concat(ledger)) {
+ if (!m || Number(m.number) !== n || !m.merged_by) continue;
+ const r = String(m.repo || '').toLowerCase();
+ if (r === repo || (r.indexOf('/') < 0 && r === short)) return String(m.merged_by).trim();
+ }
+ const fact = typeof _stageTrackerTerminalFacts !== 'undefined' && _stageTrackerTerminalFacts ? _stageTrackerTerminalFacts[key] : null;
+ return fact && fact.merged_by ? String(fact.merged_by).trim() : '';
+ }
// Pure: the popover's inner HTML.
function stageTrackerMergedPopHtml(txt, nowMs) {
const fmtAt = at => { if (!at) return ''; const d = new Date(at); const sameDay = stageTrackerLocalMidnight(at) === stageTrackerLocalMidnight(nowMs); const hm = `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`; return sameDay ? hm : `${typeof formatDashboardDate === 'function' ? formatDashboardDate(d, { month: 'short', day: 'numeric' }) : d.toISOString().slice(5, 10)} ${hm}`; };
@@ -25923,7 +25952,7 @@