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-selection-parent-delegation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Activity Monitor bulk “Let hive decide” now works when a multi-PR parent issue is selected, confirming and deciding each open PR once even when its sub-rows are also selected ([#15061](https://github.com/hivecommons/hive/issues/15061)).
64 changes: 64 additions & 0 deletions src/pkg/dashboard/stage_tracker_row_actions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ func stageTrackerRowActionsPreamble(t *testing.T, html string) string {
jsFunc(t, html, "stageTrackerPRParked"),
jsFunc(t, html, "stageTrackerParkedNestedPRs"),
jsFunc(t, html, "stageTrackerDecisionTarget"),
jsFunc(t, html, "stageTrackerDelegateTargets"),
jsFunc(t, html, "stageTrackerDecideOptions"),
jsFunc(t, html, "stageTrackerSupersederOptions"),
jsFunc(t, html, "stageTrackerSupersederValid"),
Expand Down Expand Up @@ -633,6 +634,37 @@ assert.ok(stageTrackerSelBarHtml([a, b], bulk).includes('data-arg0="decide:deleg
const plain = { repo: 'o/r', kind: 'issue', number: 2, url: 'u', stage: 20, modifiers: [] };
assert.strictEqual(stageTrackerSelectionActions([a, plain], () => ctx)[1].enabled, false, 'an item with nothing to decide disables the chip');

// A parent selected alone or with its PR sub-rows offers bulk delegation.
for (const selected of [[issue], [issue, a], [issue, a, b], [b, issue, a]]) {
const actions = stageTrackerSelectionActions(selected, () => ctx);
assert.strictEqual(actions[1].enabled, true, 'multi-PR parent must not grey out delegation');
assert.strictEqual(actions[0].submenu.find(x => x.id === 'decide:delegate').enabled, true);
assert.strictEqual(actions[0].submenu.find(x => x.id === 'decide:approve').enabled, false, 'no ambiguous bulk approval');
}
for (const denied of [{ ...ctx, user: false }, { ...ctx, canHold: false }]) {
const action = stageTrackerSelectionActions([issue, a, b], () => denied)[1];
assert.strictEqual(action.enabled, false, 'parent delegation retains write gates');
assert.ok(action.why.includes(STAGE_TRACKER_WHY_WRITE));
}
assert.strictEqual(stageTrackerSelectionActions([issue, plain], () => ctx)[1].enabled, false);
// Bulk delegation on a parent expands to its open PRs only when no single
// PR is its decision target; with one parked PR the row keeps that PR.
assert.deepStrictEqual(stageTrackerDelegateTargets(issue).map(p => p.number), [15017, 15020]);
const oneParked = { ...issue, linked_prs: [{ ...issue.linked_prs[0], stage: 60, manual_merge: false, human_merge_reason: '' }, issue.linked_prs[1], issue.linked_prs[2]] };
assert.strictEqual(stageTrackerDecisionTarget(oneParked).number, 15020);
assert.deepStrictEqual(stageTrackerNestedOpenPRs(oneParked).map(p => p.number), [15017, 15020], 'still a two-PR parent for delegate-all');
assert.deepStrictEqual(stageTrackerDelegateTargets(oneParked).map(p => p.number), [15020], 'single parked PR: only that PR');
assert.deepStrictEqual(stageTrackerDelegateTargets(a).map(p => p.number), [15017], 'a parked PR row is its own target');
assert.deepStrictEqual(stageTrackerDelegateTargets(plain), []);
// A parent's open PRs count as PR targets in the issue/PR mix check: a
// multi-PR parent plus a 045 issue stays refused, as before.
const parked045 = { repo: 'o/r', kind: 'issue', number: 1, url: 'u', stage: 45, modifiers: ['needs-decision'] };
const mixed = stageTrackerSelectionActions([issue, parked045], () => ctx);
assert.strictEqual(mixed[1].enabled, false, 'parent + parked issue mixes kinds');
assert.ok(mixed[1].why.includes('mixes'), mixed[1].why);
assert.strictEqual(stageTrackerSelectionActions([issue, a, parked045], () => ctx)[1].enabled, false);
assert.strictEqual(stageTrackerSelectionActions([parked045, { ...parked045, number: 2 }], () => ctx)[1].enabled, true, 'two parked issues still delegate');

// The tally: "3 sent · 2 decided · 1 no-op", counting each PR of a per-PR job.
assert.strictEqual(stageTrackerDelegateTally([{ ok: true, result: { action: 'approved' } }, { ok: true, result: { action: 'approved' } }, { ok: true, result: { action: STAGE_TRACKER_ACTION_NOOP } }]), '3 sent · 2 decided · 1 no-op');
assert.strictEqual(stageTrackerDelegateTally([{ ok: false }, { ok: true, result: { action: 'recommended' } }]), '2 sent · 1 decided · 0 no-op · 1 failed');
Expand Down Expand Up @@ -665,6 +697,38 @@ function stageTrackerAfterActions() {}
// A PR row never runs the all-PRs action.
const none = await runRowAction('decide:delegate-all', a);
assert.strictEqual(none.toasts.length, 0); assert.strictEqual(calls.length, 1);

// Selection delegation expands parents like delegate-all, but dedupes
// selected sub-rows before confirmation and before sending any requests.
global.fetch = async (url, init) => {
calls.push({ url, body: JSON.parse(init.body) });
const number = Number(url.split('/').slice(-2)[0]);
return { ok: true, status: 200, json: async () => ({ status: 'done', result: { action: STAGE_TRACKER_ACTION_NOOP, target: { repo: issue.repo, kind: 'pr', number }, outcome: 'No change' } }) };
};
for (const selected of [[issue], [issue, a, b], [b, issue, a]]) {
calls.length = 0; dialogs.length = 0;
await runRowAction('decide:delegate', selected);
assert.deepStrictEqual(calls.map(c => c.url).sort(), [
'/api/repos/hivecommons/hive/items/15017/decide-delegated',
'/api/repos/hivecommons/hive/items/15020/decide-delegated',
]);
assert.ok(calls.every(c => c.body.type === 'pr'), 'never delegate the ambiguous issue itself');
assert.strictEqual(dialogs.length, 1);
for (const number of [15017, 15020]) {
assert.strictEqual(dialogs[0].cfg.message.split('hivecommons/hive#' + number).length - 1, 1, 'confirm each PR exactly once');
}
assert.ok(!dialogs[0].cfg.message.includes('hivecommons/hive#15009'));
}
// The row menu's "Decide PR #15020 › Let hive decide" on a parent with
// one parked PR (of two open) delegates that PR alone — never the other
// in-flight PR, which only the explicit delegate-all touches.
for (const selected of [oneParked, [oneParked], [oneParked, b]]) {
calls.length = 0; dialogs.length = 0;
await runRowAction('decide:delegate', selected);
assert.deepStrictEqual(calls.map(c => c.url), ['/api/repos/hivecommons/hive/items/15020/decide-delegated']);
assert.strictEqual(dialogs.length, 1);
assert.ok(!dialogs[0].cfg.message.includes('hivecommons/hive#15017'), dialogs[0].cfg.message);
}
})().catch(e => { console.error(e); process.exit(1); });
`)
}
Expand Down
29 changes: 24 additions & 5 deletions src/pkg/dashboard/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -16549,6 +16549,16 @@ <h2 class="config-title" id="activity-monitor-labels-title">All labels</h2>
if (item.mirrored) return null;
return (mods.indexOf('needs-decision') >= 0 || (Number(item.stage) || 0) === 45) ? item : null;
}
// Pure: what bulk "Let hive decide" acts on for one row — its decision
// target when it has one (so "Decide PR #N" on an issue row stays on
// that PR), else every open PR of a multi-PR parent (the delegate-all
// fan-out); [] when there is nothing to decide.
function stageTrackerDelegateTargets(item) {
const target = stageTrackerDecisionTarget(item);
if (target) return [target];
const nested = stageTrackerNestedOpenPRs(item);
return nested.length >= STAGE_TRACKER_DELEGATE_ALL_MIN ? nested : [];
}
// Pure: the decision choices for one decision target. On an issue
// parked at 045 the verbs are /hive approve and /hive decision. On a PR
// parked at 085, Approve posts the /lgtm + /approve commands as the
Expand Down Expand Up @@ -16648,18 +16658,21 @@ <h2 class="config-title" id="activity-monitor-labels-title">All labels</h2>
const per = items.map(it => ({ it, flat: stageTrackerFlatActions(stageTrackerRowActions(it, typeof ctxOf === 'function' ? ctxOf(it.repo) : ctxOf)) }));
const judge = id => {
for (const p of per) {
const a = p.flat[id];
// A multi-PR parent delegates all its PRs, not one ambiguous target.
const a = p.flat[id] || (id === 'decide:delegate' ? p.flat['decide:delegate-all'] : null);
if (!a) return { enabled: false, why: 'Not applicable to ' + stageTrackerRefOf(p.it) };
if (!a.enabled) return { enabled: false, why: a.why + ' (' + stageTrackerRefOf(p.it) + ')' };
}
return { enabled: items.length > 0, why: items.length ? '' : 'Nothing selected' };
};
const decideIds = ['decide:delegate', 'decide:approve', 'decide:direction', 'decide:close-superseded', 'decide:close-wontfix'];
const submenu = decideIds.map(id => Object.assign({ id, label: STAGE_TRACKER_ACTION_LABELS[id] + (id === 'decide:approve' || id === 'decide:delegate' ? '' : '…'), danger: id.indexOf('close') > 0 }, judge(id)));
const targets = items.map(stageTrackerDecisionTarget).filter(Boolean);
if (targets.length === items.length && items.length) {
// The kind mix counts a multi-PR parent's open PRs (what bulk
// delegation acts on), so a parent plus a parked issue is refused.
const targets = items.map(stageTrackerDelegateTargets);
if (items.length && targets.every(ts => ts.length)) {
const kinds = {};
for (const t of targets) kinds[t.kind] = true;
for (const t of [].concat(...targets)) kinds[t.kind] = true;
if (kinds.pr && kinds.issue) {
for (const sm of submenu) if (sm.enabled) Object.assign(sm, { enabled: false, why: 'Selection mixes issues and pull requests waiting on a decision' });
}
Expand Down Expand Up @@ -17591,7 +17604,13 @@ <h2 class="config-title" id="activity-monitor-labels-title">All labels</h2>
// A row decides its parked PR when it has one (the issue's stage is
// only mirrored from it); dedupe when the PR row is selected too.
const seen = {};
items = items.map(stageTrackerDecisionTarget).filter(t => t && !seen[stageTrackerItemKey(t)] && (seen[stageTrackerItemKey(t)] = true));
// Bulk delegation expands a parent with no single target into the
// same open PRs as delegate-all — before deduping, so a selected
// parent and its sub-rows run each PR once, with every PR named in
// the shared confirmation. A parent with one parked PR keeps
// deciding just that PR ("Decide PR #N › Let hive decide").
items = [].concat(...items.map(it => id === 'decide:delegate' ? stageTrackerDelegateTargets(it) : [stageTrackerDecisionTarget(it)]))
.filter(t => t && !seen[stageTrackerItemKey(t)] && (seen[stageTrackerItemKey(t)] = true));
if (!items.length) return { toasts: [], pending: [] };
}
const payload = await stageTrackerActionPayload(items, id);
Expand Down
Loading