From 20625891a0f7b0e43827020cab2f422e5934a235 Mon Sep 17 00:00:00 2001 From: Andy Anderson Date: Sat, 31 Oct 2026 06:52:14 -0400 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=90=9B=20fix:=20let=20tracker=20opera?= =?UTF-8?q?tors=20close=20any=20open=20issue=20explicitly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andy Anderson --- changelog.d/fixed-tracker-close-issue.md | 1 + .../api_repo_item_close_issue_test.go | 87 ++++++++++++++ src/pkg/dashboard/api_repo_item_decision.go | 29 ++++- .../dashboard/api_repo_item_decision_test.go | 23 +++- src/pkg/dashboard/operator_actions.go | 2 + .../stage_tracker_accept_triage_test.go | 2 +- .../dashboard/stage_tracker_advisory_test.go | 2 +- .../stage_tracker_close_issue_test.go | 113 ++++++++++++++++++ .../stage_tracker_row_actions_test.go | 7 +- .../static-src/js/tracker-actions.js | 45 ++++++- .../static-src/js/tracker-row-layout.js | 1 + src/pkg/dashboard/static/index.html | 46 ++++++- 12 files changed, 344 insertions(+), 14 deletions(-) create mode 100644 changelog.d/fixed-tracker-close-issue.md create mode 100644 src/pkg/dashboard/api_repo_item_close_issue_test.go create mode 100644 src/pkg/dashboard/stage_tracker_close_issue_test.go diff --git a/changelog.d/fixed-tracker-close-issue.md b/changelog.d/fixed-tracker-close-issue.md new file mode 100644 index 0000000000..4033ea1d8c --- /dev/null +++ b/changelog.d/fixed-tracker-close-issue.md @@ -0,0 +1 @@ +- Every open issue in the Activity Monitor now offers a permission-checked Close issue action with an in-app confirmation; only the selected issue closes, leaving linked pull requests and other issues unchanged. diff --git a/src/pkg/dashboard/api_repo_item_close_issue_test.go b/src/pkg/dashboard/api_repo_item_close_issue_test.go new file mode 100644 index 0000000000..6507181aee --- /dev/null +++ b/src/pkg/dashboard/api_repo_item_close_issue_test.go @@ -0,0 +1,87 @@ +package dashboard + +import ( + "encoding/json" + "net/http" + "strings" + "testing" + + "github.com/hivecommons/hive/pkg/config" +) + +func TestCloseIssueDecisionTargetsOnlySelectedIssue(t *testing.T) { + for _, labels := range [][]string{ + nil, {"stage/045-needs-decision"}, {"stage/085-needs-decision", "needs-human"}, + {"hive/hold", "agent/scanner", "claimed"}, {"tracking", "triage/advisory"}, + } { + t.Run(strings.Join(labels, ","), func(t *testing.T) { + m := &repoItemDecisionMock{issueLabels: labels} + s := newRepoItemDecisionServer(t, m) + w := postRepoItemDecision(t, s, 7, "writer", `{"decision":"close-issue","type":"issue","comment":"Finished independently"}`) + if w.Code != http.StatusOK { + t.Fatalf("close: %d %s", w.Code, w.Body.String()) + } + if len(m.edits) != 1 || m.editPaths[0] != "/repos/testorg/testrepo/issues/7" || + m.edits[0]["state"] != "closed" || m.edits[0]["state_reason"] != issueStateReasonCompleted { + t.Fatalf("must close only selected issue: paths=%v edits=%v", m.editPaths, m.edits) + } + if len(m.comments) != 1 || !strings.Contains(m.comments[0], "completed by @writer") || !strings.Contains(m.comments[0], "Finished independently") { + t.Fatalf("closing attribution: %v", m.comments) + } + var resp repoItemDecisionResponse + _ = json.Unmarshal(w.Body.Bytes(), &resp) + if resp.Status != "closed" || resp.Result == nil || resp.Result.Action != rowActionClosed || resp.Result.Target.Kind != "issue" || resp.Result.Target.Number != 7 { + t.Fatalf("result: %+v", resp) + } + if len(m.added) != 0 || len(m.merges) != 0 || len(m.reviews) != 0 { + t.Fatal("issue close must not resolve a PR or move other items") + } + }) + } +} + +func TestCloseIssueDecisionGuardsAndFailures(t *testing.T) { + for _, tc := range []struct { + name, user, body, state string + + number, commentError, editError, want int + + paused bool + }{ + {name: "anonymous", number: 7, want: http.StatusUnauthorized}, + {name: "read-only", user: "reader", number: 7, want: http.StatusForbidden}, + {name: "PR type", user: "writer", number: 8, body: `{"decision":"close-issue","type":"pr"}`, want: http.StatusBadRequest}, + {name: "PR disguised as issue", user: "writer", number: 8, want: http.StatusBadRequest}, + {name: "already closed", user: "writer", number: 7, state: "closed", want: http.StatusConflict}, + {name: "missing issue", user: "writer", number: 404, want: http.StatusBadGateway}, + {name: "required attribution refused", user: "writer", number: 7, commentError: http.StatusForbidden, want: http.StatusBadGateway}, + {name: "remote close refused", user: "writer", number: 7, editError: http.StatusForbidden, want: http.StatusBadGateway}, + {name: "remote close unavailable", user: "writer", number: 7, editError: http.StatusServiceUnavailable, want: http.StatusBadGateway}, + {name: "repo paused", user: "writer", number: 7, paused: true, want: http.StatusOK}, + } { + t.Run(tc.name, func(t *testing.T) { + m := &repoItemDecisionMock{issueState: tc.state, commentError: tc.commentError, editError: tc.editError} + s := newRepoItemDecisionServer(t, m) + if tc.paused { + s.deps.Config.Project.PausedRepos = []config.RepoPause{{Repo: "testrepo", Reason: "read only"}} + } + body := tc.body + if body == "" { + body = `{"decision":"close-issue","type":"issue"}` + } + w := postRepoItemDecision(t, s, tc.number, tc.user, body) + if w.Code != tc.want { + t.Fatalf("got %d want %d: %s", w.Code, tc.want, w.Body.String()) + } + if len(m.edits) != 0 || strings.Contains(w.Body.String(), `"status":"closed"`) { + t.Fatalf("failure must not close or report closed: %v %s", m.edits, w.Body.String()) + } + if tc.editError == 0 && len(m.comments) != 0 { + t.Fatalf("guard failure posted a comment: %v", m.comments) + } + if tc.paused && !strings.Contains(w.Body.String(), `"action":"refused"`) { + t.Fatalf("pause must explain refusal: %s", w.Body.String()) + } + }) + } +} diff --git a/src/pkg/dashboard/api_repo_item_decision.go b/src/pkg/dashboard/api_repo_item_decision.go index be749629da..0f542130e5 100644 --- a/src/pkg/dashboard/api_repo_item_decision.go +++ b/src/pkg/dashboard/api_repo_item_decision.go @@ -66,6 +66,7 @@ const ( repoItemDecisionDirection = "direction" repoItemDecisionCloseSuperseded = "close-superseded" repoItemDecisionCloseWontFix = "close-wontfix" + repoItemDecisionCloseIssue = "close-issue" // close-read closes an advisory issue (triage/advisory, a dedupe // checklist) as completed once a maintainer has read it // (hivecommons/hive#15381): the row's "Close (read)" action. @@ -284,6 +285,10 @@ func repoItemDecisionResultWith(repoFull string, number int, itemType, decision, out.Action = rowActionClosed out.Outcome = "Closed as read (advisory acknowledged)." out.Next = "Nothing further to do; the row leaves the tracker on its next refresh." + case repoItemDecisionCloseIssue: + out.Action = rowActionClosed + out.Outcome = "Issue closed as completed." + out.Next = "Only this issue was closed; linked pull requests and other issues are unchanged." case repoItemDecisionAdopt: out.Action = rowActionAdopted out.Outcome = "Adoption queued: `" + label + "` applied." @@ -422,10 +427,30 @@ func (s *Server) handleRepoItemDecision(w http.ResponseWriter, r *http.Request) s.audit.LogRecord(user, action, auditDetail("repo", repoFull, "number", numStr, "decision", event.Decision), "", repoFull, number) jsonResponse(w, repoItemDecisionResponse{OK: true, Repo: repoFull, Number: number, Decision: decision, Status: "unparked", Label: ghpkg.HumanAckLabel, Result: repoItemDecisionResult(repoFull, number, itemType, decision, comment, "", ghpkg.HumanAckLabel, nil)}) - case repoItemDecisionCloseSuperseded, repoItemDecisionCloseWontFix, repoItemDecisionCloseRead: + case repoItemDecisionCloseSuperseded, repoItemDecisionCloseWontFix, repoItemDecisionCloseRead, repoItemDecisionCloseIssue: verb := "won't fix" stateReason := issueStateReasonNotPlanned supersededBy := "" + if decision == repoItemDecisionCloseIssue { + if itemType != "issue" { + jsonError(w, "close-issue applies to issues only", http.StatusBadRequest) + return + } + issue, _, err := gh.GoGitHub().Issues.Get(ctx, owner, repoName, number) + if err != nil { + jsonError(w, err.Error(), http.StatusBadGateway) + return + } + if issue.IsPullRequest() { + jsonError(w, "close-issue applies to issues only", http.StatusBadRequest) + return + } + if issue.GetState() != "open" { + jsonError(w, "issue is already closed", http.StatusConflict) + return + } + verb, stateReason = "completed", issueStateReasonCompleted + } if decision == repoItemDecisionCloseRead { if itemType != "issue" { jsonError(w, "close-read applies to issues", http.StatusBadRequest) @@ -531,7 +556,7 @@ func (s *Server) handleRepoItemDecision(w http.ResponseWriter, r *http.Request) } s.handlePullRequestMergeDecision(ctx, w, repoFull, number, user, decision, comment) default: - jsonError(w, "unknown decision; want approve, direction, close-superseded, close-wontfix, close-read, adopt, reroute, re-author, merge-now or queue-merge", http.StatusBadRequest) + jsonError(w, "unknown decision; want approve, direction, close-superseded, close-wontfix, close-read, close-issue, adopt, reroute, re-author, merge-now or queue-merge", http.StatusBadRequest) } } diff --git a/src/pkg/dashboard/api_repo_item_decision_test.go b/src/pkg/dashboard/api_repo_item_decision_test.go index ee4c6c26a8..b10d7b33c8 100644 --- a/src/pkg/dashboard/api_repo_item_decision_test.go +++ b/src/pkg/dashboard/api_repo_item_decision_test.go @@ -70,6 +70,14 @@ type repoItemDecisionMock struct { fixedIssueClosedBy int // issueTitle / issueBody shape issue #7 (empty = untitled, no body). issueTitle, issueBody string + + issueState string + + commentError int + + editError int + + editPaths []string } func newRepoItemDecisionServer(t *testing.T, m *repoItemDecisionMock) *Server { @@ -91,7 +99,11 @@ func newRepoItemDecisionServer(t *testing.T, m *repoItemDecisionMock) *Server { for _, label := range m.issueLabels { labels = append(labels, map[string]string{"name": label}) } - _ = json.NewEncoder(w).Encode(map[string]any{"number": 7, "state": "open", "title": m.issueTitle, "body": m.issueBody, "labels": labels, "user": map[string]any{"login": "hive[bot]", "type": "Bot"}}) + state := m.issueState + if state == "" { + state = "open" + } + _ = json.NewEncoder(w).Encode(map[string]any{"number": 7, "state": state, "title": m.issueTitle, "body": m.issueBody, "labels": labels, "user": map[string]any{"login": "hive[bot]", "type": "Bot"}}) case r.Method == http.MethodGet && (strings.HasSuffix(path, "/issues/8") || strings.HasSuffix(path, "/issues/9")): n := 8 if strings.HasSuffix(path, "/issues/9") { @@ -206,6 +218,10 @@ func newRepoItemDecisionServer(t *testing.T, m *repoItemDecisionMock) *Server { } _ = json.NewEncoder(w).Encode(prior) case r.Method == http.MethodPost && strings.HasSuffix(path, "/comments"): + if m.commentError != 0 { + http.Error(w, `{"message":"comment denied"}`, m.commentError) + return + } var c map[string]string _ = json.NewDecoder(r.Body).Decode(&c) m.comments = append(m.comments, c["body"]) @@ -223,9 +239,14 @@ func newRepoItemDecisionServer(t *testing.T, m *repoItemDecisionMock) *Server { m.removed = append(m.removed, path[strings.LastIndex(path, "/")+1:]) _, _ = io.WriteString(w, `{}`) case r.Method == http.MethodPatch && strings.Contains(path, "/issues/"): + if m.editError != 0 { + http.Error(w, `{"message":"close denied"}`, m.editError) + return + } var body map[string]any _ = json.NewDecoder(r.Body).Decode(&body) m.edits = append(m.edits, body) + m.editPaths = append(m.editPaths, path) _, _ = io.WriteString(w, `{}`) default: t.Logf("unexpected GitHub API request: %s %s", r.Method, path) diff --git a/src/pkg/dashboard/operator_actions.go b/src/pkg/dashboard/operator_actions.go index 63211b0d64..6d558b67ac 100644 --- a/src/pkg/dashboard/operator_actions.go +++ b/src/pkg/dashboard/operator_actions.go @@ -338,6 +338,8 @@ func operatorActionFromBody(endpoint string, body []byte) (operatorActionRequest out.Action = operatorActionWontFix case repoItemDecisionCloseRead: out.Action = operatorActionCloseRead + case repoItemDecisionCloseIssue: + out.Action = repoItemDecisionCloseIssue case repoItemDecisionMergeNow: out.Action = operatorActionMergeNow case repoItemDecisionQueueMerge: diff --git a/src/pkg/dashboard/stage_tracker_accept_triage_test.go b/src/pkg/dashboard/stage_tracker_accept_triage_test.go index 1b3a2b90c4..d4c6fa48d6 100644 --- a/src/pkg/dashboard/stage_tracker_accept_triage_test.go +++ b/src/pkg/dashboard/stage_tracker_accept_triage_test.go @@ -35,7 +35,7 @@ const ctx = { user: true, canHold: true, canHuman: true, login: 'octo', nowMs: N // The primary case: an issue at 015 "Triage needed". const triage = { repo: 'o/r', kind: 'issue', number: 1, title: 'From an untrusted reporter', url: 'https://github.com/o/r/issues/1', stage: 15, modifiers: [] }; let as = stageTrackerRowActions(triage, ctx); -assert.deepStrictEqual(ids(as), ['accept-triage', 'hold', 'retry', 'needs-human', 'open', 'copy'], 'Accept triage heads the menu'); +assert.deepStrictEqual(ids(as), ['accept-triage', 'hold', 'retry', 'needs-human', 'decide:close-issue', 'open', 'copy'], 'Accept triage heads the menu'); const accept = as.find(a => a.id === 'accept-triage'); assert.strictEqual(accept.label, 'Accept triage'); assert.strictEqual(accept.enabled, true); diff --git a/src/pkg/dashboard/stage_tracker_advisory_test.go b/src/pkg/dashboard/stage_tracker_advisory_test.go index b535dbf0c9..9829d7cc12 100644 --- a/src/pkg/dashboard/stage_tracker_advisory_test.go +++ b/src/pkg/dashboard/stage_tracker_advisory_test.go @@ -293,7 +293,7 @@ const ordinary = { repo: 'o/r', number: 2, kind: 'issue', stage: 0, caption: 'No const ids = as => as.map(a => a.id); const ctx = { user: true, canHold: true, canHuman: true }; const as = stageTrackerRowActions(empty, ctx); -assert.deepStrictEqual(ids(as), ['decide:close-read', 'hold', 'retry', 'needs-human', 'open', 'copy'], ids(as).join(',')); +assert.deepStrictEqual(ids(as), ['decide:close-read', 'hold', 'retry', 'needs-human', 'decide:close-issue', 'open', 'copy'], ids(as).join(',')); assert.strictEqual(as[0].label, 'Close now'); assert.ok(as[0].lead && as[0].enabled, JSON.stringify(as[0])); assert.ok(as[0].hint.startsWith('nothing found'), as[0].hint); diff --git a/src/pkg/dashboard/stage_tracker_close_issue_test.go b/src/pkg/dashboard/stage_tracker_close_issue_test.go new file mode 100644 index 0000000000..8806efe5f5 --- /dev/null +++ b/src/pkg/dashboard/stage_tracker_close_issue_test.go @@ -0,0 +1,113 @@ +package dashboard + +import "testing" + +func TestStageTrackerCloseIssueEveryStageAndExactTarget(t *testing.T) { + html := indexHTML(t) + runStageTrackerRowActionsScript(t, stageTrackerRowActionsPreamble(t, html)+"\n"+jsFunc(t, html, "stageTrackerLinkedIssueToolsHtml")+` +const ctx = { user: true, canHold: true }; +const issue = { repo: 'hivecommons/dibs', kind: 'issue', number: 527, title: 'Selected issue', url: 'u527' }; +for (let stage = 0; stage <= 100; stage++) { + for (const author_kind of ['human', 'hive', 'clanker']) { + const it = { ...issue, stage, author_kind, mirrored: true, claimant: { login: 'agent' }, modifiers: ['hold', 'needs-human'], + linked_prs: [{ number: 528, stage: 85, modifiers: ['needs-decision'] }, { number: 529, stage: 60 }] }; + const close = stageTrackerRowActions(it, ctx).find(a => a.id === 'decide:close-issue'); + assert.ok(close && close.enabled, 'every open issue stage/author/hold has Close: ' + stage); + assert.deepStrictEqual(stageTrackerActionRequest(it, close.id, { comment: 'done' }), { + url: '/api/repos/hivecommons/dibs/items/527/decision', + body: { decision: 'close-issue', type: 'issue', comment: 'done' }, + }, 'never chooses covering PR or another issue'); + for (const ro of [{ user: false, canHold: false }, { user: true, canHold: false }]) { + const denied = stageTrackerRowActions(it, ro).find(a => a.id === close.id); + assert.ok(denied && !denied.enabled && denied.why, 'permission denial stays visible'); + } + } +} +for (const it of [{ ...issue, state: 'closed' }, { ...issue, kind: 'pr' }]) { + assert.ok(!stageTrackerRowActions(it, ctx).some(a => a.id === 'decide:close-issue')); + assert.strictEqual(stageTrackerActionRequest(it, 'decide:close-issue'), null); +} +const pr = { repo: 'other/repository', kind: 'pr', number: 900, linked_issues: [ + { number: 901, title: 'First issue', state: 'open', url: 'u901' }, + { number: 902, title: 'Selected nested issue', state: 'open', url: 'u902' }, + { number: 903, title: 'Closed issue', state: 'closed', url: 'u903' }, +] }; +const tools = stageTrackerLinkedIssueToolsHtml(pr); +assert.ok(tools.includes('other/repository/issue#901') && tools.includes('other/repository/issue#902')); +assert.ok(!tools.includes('issue#903'), 'no close menu for a closed linked issue'); +const nested = stageTrackerItemByKey({ items: [pr] }, 'other/repository/issue#902'); +assert.strictEqual(nested.title, 'Selected nested issue'); +assert.strictEqual(stageTrackerActionRequest(nested, 'decide:close-issue').url, '/api/repos/other/repository/items/902/decision'); +assert.strictEqual(stageTrackerItemByKey({ items: [issue, pr] }, 'hivecommons/dibs/issue#527'), issue, 'canonical root DTO wins'); +`) +} + +func TestStageTrackerCloseIssueConfirmationPendingAndFailures(t *testing.T) { + html := indexHTML(t) + runStageTrackerRowActionsScript(t, stageTrackerRowActionsPreamble(t, html)+stageTrackerConfirmOptOutJS(t, html)+` +const issue = { repo: 'hivecommons/dibs', kind: 'issue', number: 527, title: 'Selected issue', url: 'u527', stage: 85, mirrored: true, + linked_prs: [{ number: 528, stage: 85, modifiers: ['needs-decision'] }] }; +_stageTracker = { items: [issue] }; +const messages = [], results = [], calls = []; +global.showToast = (msg, type) => { messages.push({ msg, type }); return null; }; +global.dismissToast = () => {}; +function stageTrackerProgressToast() { return { update() {}, done() {} }; } +let refreshes = 0; +function stageTrackerAfterActions() { refreshes++; } +function stageTrackerResultToast(result) { results.push(result); return { result }; } +function stageTrackerDecidePending(pend) { pend.decided = true; } +let releasePrompt, releaseFetch; +global.hivePrompt = cfg => { dialogs.push({ cfg }); return new Promise(resolve => { releasePrompt = resolve; }); }; +global.fetch = (url, init) => { calls.push({ url, body: JSON.parse(init.body) }); return new Promise(resolve => { releaseFetch = resolve; }); }; +const tick = async () => { for (let i = 0; i < 10; i++) await Promise.resolve(); }; +(async () => { + const first = runRowAction('decide:close-issue', issue); + assert.strictEqual(dialogs.length, 1); + assert.ok(dialogs[0].cfg.label.includes('hivecommons/dibs#527') && dialogs[0].cfg.label.includes('Selected issue')); + assert.ok(dialogs[0].cfg.label.includes('linked pull requests and other issues stay unchanged')); + assert.strictEqual(dialogs[0].cfg.danger, true); + assert.strictEqual(calls.length, 0, 'confirmation before any mutation'); + await runRowAction('decide:close-issue', issue); + assert.strictEqual(dialogs.length, 1, 'double click cannot open another confirmation'); + releasePrompt('Finished separately'); + await tick(); + assert.strictEqual(calls.length, 1); + assert.strictEqual(calls[0].url, '/api/repos/hivecommons/dibs/items/527/decision'); + assert.strictEqual(calls[0].body.comment, 'Finished separately'); + assert.strictEqual(_stageTrackerPending[0].caption, 'Closing…'); + assert.strictEqual(issue.state, undefined, 'no optimistic false close'); + assert.strictEqual(results.length, 0, 'no success before remote response'); + await runRowAction('decide:close-issue', issue); + assert.strictEqual(calls.length, 1, 'pending prevents double submit'); + releaseFetch({ ok: true, json: async () => ({ status: 'closed', result: { action: 'closed', target: { repo: issue.repo, number: 527, kind: 'issue' }, outcome: 'Issue closed as completed.' } }) }); + const done = await first; + assert.strictEqual(done.results[0].ok, true); + assert.strictEqual(results[0].target.number, 527); + assert.strictEqual(_stageTrackerPending[0].caption, 'Closed · leaving list'); + assert.strictEqual(refreshes, 1, 'canonical tracker refresh requested'); + assert.strictEqual(_stageTracker.items[0], issue, 'existing closed-row policy owns removal; no local hide'); + await runRowAction('decide:close-issue', issue); + assert.strictEqual(dialogs.length, 1, 'waiting for canonical DTO still prevents duplicate close'); + _stageTrackerPending = []; + for (const error of ['write permission required', 'read-only', 'CSRF validation failed', 'forge service unavailable', 'API write denied']) { + const attempt = runRowAction('decide:close-issue', issue); + releasePrompt(''); + await tick(); + releaseFetch({ ok: false, status: 403, json: async () => ({ error }) }); + const failed = await attempt; + assert.strictEqual(failed.results[0].ok, false); + assert.strictEqual(_stageTrackerPending.length, 0, 'error clears pending'); + assert.ok(results.at(-1).outcome.includes(error), 'standard error notification includes server reason'); + assert.strictEqual(_stageTracker.items[0], issue, 'failed close does not hide issue'); + } + const cancelled = runRowAction('decide:close-issue', issue); + const before = calls.length; + releasePrompt(null); + assert.strictEqual((await cancelled).cancelled, true); + assert.strictEqual(calls.length, before, 'cancel writes nothing'); + const n = dialogs.length; + await runRowAction('decide:close-issue', [issue, { ...issue, number: 999 }]); + assert.strictEqual(dialogs.length, n, 'single exact selected issue only; no bulk fan-out'); +})().catch(e => { console.error(e); process.exit(1); }); +`) +} diff --git a/src/pkg/dashboard/stage_tracker_row_actions_test.go b/src/pkg/dashboard/stage_tracker_row_actions_test.go index 7f74fb0c52..f10730cf9a 100644 --- a/src/pkg/dashboard/stage_tracker_row_actions_test.go +++ b/src/pkg/dashboard/stage_tracker_row_actions_test.go @@ -38,6 +38,7 @@ func stageTrackerRowActionsPreamble(t *testing.T, html string) string { jsConstLine(t, html, "STAGE_TRACKER_DELEGATE_ALL_MIN"), jsConstLine(t, html, "STAGE_TRACKER_MERGE_ACTIONS"), jsConstLine(t, html, "STAGE_TRACKER_GENERIC_ACTIONS"), + jsConstLine(t, html, "_stageTrackerCloseIssueBusy"), jsConstLine(t, html, "STAGE_TRACKER_TERMINAL"), "var _stageTrackerSel = new Set(); var _stageTrackerSelAnchor = ''; var _stageTrackerMenu = null; var _stageTracker = null; var _statusSeqFloor = 0; var _stageTrackerEtag = 'e'; var _stageTrackerSig = 's';", jsFunc(t, html, "esc"), @@ -288,12 +289,12 @@ const ids = as => as.map(a => a.id); const ctx = { user: true, canHold: true, canHuman: true }; const parked = { repo: 'o/r', kind: 'issue', number: 1, title: 'Parked', url: 'https://github.com/o/r/issues/1', stage: 45, modifiers: ['needs-decision'] }; let as = stageTrackerRowActions(parked, ctx); -assert.deepStrictEqual(ids(as), ['decide', 'hold', 'retry', 'needs-human', 'open', 'copy']); +assert.deepStrictEqual(ids(as), ['decide', 'hold', 'retry', 'needs-human', 'decide:close-issue', 'open', 'copy']); assert.deepStrictEqual(ids(as[0].submenu), ['decide:delegate', 'decide:approve', 'decide:direction', 'decide:close-superseded', 'decide:close-wontfix'], 'an issue gets let-hive-decide first, then approve / direction / close'); assert.ok(as.every(a => a.enabled), 'everything is enabled for a writer'); const plain = { repo: 'o/r', kind: 'issue', number: 2, url: 'u', stage: 20, modifiers: [] }; -assert.deepStrictEqual(ids(stageTrackerRowActions(plain, ctx)), ['hold', 'retry', 'needs-human', 'open', 'copy'], 'no Decide off 045/085'); +assert.deepStrictEqual(ids(stageTrackerRowActions(plain, ctx)), ['hold', 'retry', 'needs-human', 'decide:close-issue', 'open', 'copy'], 'no Decide off 045/085'); const held = { repo: 'o/r', kind: 'pr', number: 3, url: 'u', stage: 60, modifiers: ['hold', 'needs-human'] }; as = stageTrackerRowActions(held, ctx); @@ -693,7 +694,7 @@ assert.strictEqual(stageTrackerActionRequest(a, 'decide:approve', {}).url, '/api // The issue row no longer picks one: no single Decide, an explicit all-PRs item. assert.strictEqual(stageTrackerDecisionTarget(issue), null, 'two parked PRs is ambiguous'); as = stageTrackerRowActions(issue, ctx); -assert.deepStrictEqual(ids(as), ['decide:delegate-all', 'hold', 'retry', 'needs-human', 'open', 'copy']); +assert.deepStrictEqual(ids(as), ['decide:delegate-all', 'hold', 'retry', 'needs-human', 'decide:close-issue', 'open', 'copy']); assert.strictEqual(as[0].label, 'Let hive decide — all 2 PRs'); assert.strictEqual(as[0].hint, 'per PR'); assert.deepStrictEqual(as[0].prs, [15017, 15020]); assert.strictEqual(stageTrackerRowActions(issue, { user: false, canHold: false })[0].enabled, false); const req = stageTrackerActionRequest(issue, 'decide:delegate-all'); diff --git a/src/pkg/dashboard/static-src/js/tracker-actions.js b/src/pkg/dashboard/static-src/js/tracker-actions.js index 7360d32761..5914cbafe6 100644 --- a/src/pkg/dashboard/static-src/js/tracker-actions.js +++ b/src/pkg/dashboard/static-src/js/tracker-actions.js @@ -35,6 +35,7 @@ 'decide:delegate': 'Let hive decide', 'decide:delegate-all': 'Let hive decide — all PRs', 'decide:delegate:rerun': 'Re-run decision', 'decide:approve': 'Approve', 'decide:direction': 'Give direction', 'decide:close-superseded': 'Close as superseded by', 'decide:close-wontfix': "Close as won't-fix", 'decide:close-read': 'Close now', + 'decide:close-issue': 'Close issue', 'decide:adopt': 'Adopt (hive takes over)', 'decide:queue-merge': 'Approve and let hive merge', 'decide:merge-now': 'Merge now as maintainer', 'decide:re-author': 'Re-author as hive PR', @@ -51,7 +52,8 @@ const STAGE_TRACKER_MERGE_ACTIONS = ['decide:queue-merge', 'decide:merge-now']; // Generic items every row has; a server-named decision option with one // of these ids is not repeated at the top of the menu. - const STAGE_TRACKER_GENERIC_ACTIONS = ['hold', 'release', 'retry', 'needs-human', 'accept-triage', 'open', 'copy', 'decide:delegate', 'decide:delegate-all', 'decide:adopt']; + const STAGE_TRACKER_GENERIC_ACTIONS = ['hold', 'release', 'retry', 'needs-human', 'accept-triage', 'open', 'copy', 'decide:delegate', 'decide:delegate-all', 'decide:adopt', 'decide:close-issue']; + const _stageTrackerCloseIssueBusy = new Set(); // Accept triage shows on an issue the chevron calls "Triage needed": // stage 015, or the needs-triage pill on a pre-claim stage (010 / 017 / // 045). A needs-triage left on a claimed or covered issue is reported @@ -160,6 +162,10 @@ if (!d || !Array.isArray(d.items)) return null; for (const it of d.items) if (stageTrackerItemKey(it) === key) return it; for (const it of d.items) { + for (const li of (Array.isArray(it.linked_issues) ? it.linked_issues : [])) { + const issue = { repo: it.repo, number: li.number, kind: 'issue', title: li.title || '', url: li.url || '', state: li.state || '' }; + if (stageTrackerItemKey(issue) === key) return issue; + } for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) { const pr = stageTrackerLinkedPRItem(it, lp); if (stageTrackerItemKey(pr) === key) return pr; @@ -167,6 +173,14 @@ } return null; } + // Linked issues in a PR-only view still have their own exact target. + function stageTrackerLinkedIssueToolsHtml(item) { + return (Array.isArray(item.linked_issues) ? item.linked_issues : []).filter(li => li && Number(li.number) > 0 && li.state === 'open').map(li => { + const issue = { repo: item.repo, number: li.number, kind: 'issue' }; + const ref = stageTrackerRefOf(issue); + return `Issue #${Number(li.number)} `; + }).join(''); + } function stageTrackerItemsForKeys(keys) { return keys.map(k => stageTrackerItemByKey(_stageTracker, k)).filter(Boolean); } @@ -443,6 +457,7 @@ : { id: 'hold', label: 'Hold', enabled: write, why: write ? '' : STAGE_TRACKER_WHY_WRITE, sep: triage && !target }); out.push({ id: 'retry', label: 'Re-evaluate now', hint: 'rescan', enabled: true, why: '' }); if (!has('needs-human')) out.push({ id: 'needs-human', label: 'Mark needs-human…', enabled: !!ctx.canHuman, why: ctx.canHuman ? '' : STAGE_TRACKER_WHY_ROLE }); + if (item.kind === 'issue' && String(item.state || '').toLowerCase() !== 'closed') out.push(Object.assign({ id: 'decide:close-issue', label: 'Close issue…', danger: true, hint: 'only this issue · completed' }, stageTrackerActionAllowed('decide:close-issue', ctx))); out.push({ id: 'open', label: 'Open on GitHub', enabled: !!item.url, why: item.url ? '' : 'No GitHub link', sep: true }); out.push({ id: 'copy', label: 'Copy link', enabled: !!item.url, why: item.url ? '' : 'No GitHub link' }); return out; @@ -1177,6 +1192,7 @@ case 'accept-triage': return item.kind === 'pr' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/accept-triage', body: {} }; case 'blocker:recheck': return item.kind === 'pr' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/blocker/recheck', body: {} }; case 'blocker:close-partial': return item.kind === 'pr' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/blocker/close-partial', body: { comment: payload.comment || '' } }; + case 'decide:close-issue': return item.kind !== 'issue' || String(item.state || '').toLowerCase() === 'closed' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/decision', body: { decision: 'close-issue', comment: payload.comment || '', type: 'issue' } }; } if (id === 'decide:delegate' || id === 'decide:delegate:rerun') { const body = { type, reason: item.reason || '', caption: item.caption || '', sentinel_reason: item.sentinel_reason || '' }; @@ -1333,6 +1349,7 @@ const r = await fetch(req.url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(req.body) }); let data = await r.json().catch(() => ({})); if (!r.ok) throw new Error(data.error || ('HTTP ' + r.status)); + if (id === 'decide:close-issue' && data.status !== 'closed' && data.status !== 'refused') throw new Error(data.error || 'The server did not confirm that the issue closed'); if (data.minStatusSeq != null) _statusSeqFloor = Math.max(_statusSeqFloor || 0, Number(data.minStatusSeq) || 0); if (req.poll && !stageTrackerDelegatedDone(data)) { showToast('Hive is deciding ' + stageTrackerRefOf(it) + '…', 'info'); @@ -1878,6 +1895,11 @@ } case 'decide:close-read': return (await stageTrackerAsk(id, 'confirm', { title: 'Close advisory', message: stageTrackerAdvisoryCloseMessage(items, refs, who), confirmLabel: 'Close' })) ? {} : null; + case 'decide:close-issue': { + const item = items[0]; + const v = await hivePrompt({ title: 'Close issue', label: 'Close ' + refs + ' — ' + (item.title || 'Untitled issue') + ' as completed, as ' + who + '? Only this issue closes; linked pull requests and other issues stay unchanged. An attributed closing note is posted. Additional comment (optional):', placeholder: 'Optional closing comment', confirmLabel: 'Close issue', danger: true }); + return v == null ? null : { comment: v }; + } case 'decide:merge-now': { const base = items.map(it => it.base_ref || '').filter(Boolean)[0] || 'its base branch'; if (items.some(stageTrackerNeedsRebase)) { @@ -1997,7 +2019,7 @@ const STAGE_TRACKER_ACTING_CAPTIONS = { 'hold': 'Holding…', 'release': 'Releasing hold…', 'retry': 'Re-evaluating…', 'needs-human': 'Marking needs-human…', 'accept-triage': 'Accepting triage…', 'blocker:recheck': 'Checking App permissions…', 'blocker:close-partial': 'Closing as partial…', - 'decide:delegate': 'Hive deciding…', 'decide:delegate:preview': 'Asking the hive…', 'decide:delegate-all': 'Hive deciding each PR…', 'decide:delegate:rerun': 'Hive deciding again…', 'decide:approve': 'Approving…', 'decide:direction': 'Recording direction…', 'decide:close-superseded': 'Closing…', 'decide:close-wontfix': 'Closing…', 'decide:close-read': 'Closing…', + 'decide:delegate': 'Hive deciding…', 'decide:delegate:preview': 'Asking the hive…', 'decide:delegate-all': 'Hive deciding each PR…', 'decide:delegate:rerun': 'Hive deciding again…', 'decide:approve': 'Approving…', 'decide:direction': 'Recording direction…', 'decide:close-superseded': 'Closing…', 'decide:close-wontfix': 'Closing…', 'decide:close-read': 'Closing…', 'decide:close-issue': 'Closing…', 'decide:merge-now': 'Merging…', 'decide:queue-merge': 'Recording approval…', 'decide:re-author': 'Queuing re-authoring…', 'decide:adopt': 'Adopting…', 'decide:adopt-now': 'Adopting now…', 'decide:reroute': 'Rerouting…', }; @@ -2312,6 +2334,24 @@ const id = action; const rows = items.slice(); if (!items.length) return { toasts: [], pending: [] }; + if (id === 'decide:close-issue') { + // Never remap an issue close through its covering PR or fan it out. + if (items.length !== 1 || !stageTrackerActionRequest(items[0], id)) { + stageTrackerNothingToActOn(id, rows); + return { toasts: [], pending: [] }; + } + const key = stageTrackerItemKey(items[0]); + if (_stageTrackerCloseIssueBusy.has(key) || _stageTrackerPending.some(p => p.keys.indexOf(key) >= 0)) return { toasts: [], pending: [] }; + _stageTrackerCloseIssueBusy.add(key); + try { + const payload = await stageTrackerActionPayload(items, id, rows); + if (payload == null) return { toasts: [], pending: [], cancelled: true }; + const results = await stageTrackerRunActions(items, id, payload, rows); + return { toast: results.toasts[0] || null, toasts: results.toasts, pending: results.pending, results }; + } finally { + _stageTrackerCloseIssueBusy.delete(key); + } + } if (id === 'open') { for (const it of items) if (it.url) window.open(it.url, '_blank', 'noopener'); return { toasts: [], pending: [] }; @@ -2513,4 +2553,3 @@ // kind → { name, bytes (ArrayBuffer), buffer (AudioBuffer|null), failed } var _stageTrackerClips = { open: null, merge: null }; var _stageTrackerSettingsReturnFocus = null; - diff --git a/src/pkg/dashboard/static-src/js/tracker-row-layout.js b/src/pkg/dashboard/static-src/js/tracker-row-layout.js index 3d5eec71ed..8a8f59d563 100644 --- a/src/pkg/dashboard/static-src/js/tracker-row-layout.js +++ b/src/pkg/dashboard/static-src/js/tracker-row-layout.js @@ -532,6 +532,7 @@ ${stageTrackerIcon('issue', 'ham-kind-ico')}${chip} ${esc(li.text)} `; + if (typeof stageTrackerLinkedIssueToolsHtml === 'function') leadHtml += stageTrackerLinkedIssueToolsHtml(item); } const prs = typeof stageTrackerRowPRKeys === 'function' ? stageTrackerRowPRKeys(item) : ''; const trainKey = typeof stageTrackerTrainKey === 'function' ? stageTrackerTrainKey(item) : ''; diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index 51a950591b..ca1d6aa020 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -18142,6 +18142,7 @@

Where to get help

${stageTrackerIcon('issue', 'ham-kind-ico')}${chip} ${esc(li.text)} `; + if (typeof stageTrackerLinkedIssueToolsHtml === 'function') leadHtml += stageTrackerLinkedIssueToolsHtml(item); } const prs = typeof stageTrackerRowPRKeys === 'function' ? stageTrackerRowPRKeys(item) : ''; const trainKey = typeof stageTrackerTrainKey === 'function' ? stageTrackerTrainKey(item) : ''; @@ -20478,6 +20479,7 @@

All labels

'decide:delegate': 'Let hive decide', 'decide:delegate-all': 'Let hive decide — all PRs', 'decide:delegate:rerun': 'Re-run decision', 'decide:approve': 'Approve', 'decide:direction': 'Give direction', 'decide:close-superseded': 'Close as superseded by', 'decide:close-wontfix': "Close as won't-fix", 'decide:close-read': 'Close now', + 'decide:close-issue': 'Close issue', 'decide:adopt': 'Adopt (hive takes over)', 'decide:queue-merge': 'Approve and let hive merge', 'decide:merge-now': 'Merge now as maintainer', 'decide:re-author': 'Re-author as hive PR', @@ -20494,7 +20496,8 @@

All labels

const STAGE_TRACKER_MERGE_ACTIONS = ['decide:queue-merge', 'decide:merge-now']; // Generic items every row has; a server-named decision option with one // of these ids is not repeated at the top of the menu. - const STAGE_TRACKER_GENERIC_ACTIONS = ['hold', 'release', 'retry', 'needs-human', 'accept-triage', 'open', 'copy', 'decide:delegate', 'decide:delegate-all', 'decide:adopt']; + const STAGE_TRACKER_GENERIC_ACTIONS = ['hold', 'release', 'retry', 'needs-human', 'accept-triage', 'open', 'copy', 'decide:delegate', 'decide:delegate-all', 'decide:adopt', 'decide:close-issue']; + const _stageTrackerCloseIssueBusy = new Set(); // Accept triage shows on an issue the chevron calls "Triage needed": // stage 015, or the needs-triage pill on a pre-claim stage (010 / 017 / // 045). A needs-triage left on a claimed or covered issue is reported @@ -20603,6 +20606,10 @@

All labels

if (!d || !Array.isArray(d.items)) return null; for (const it of d.items) if (stageTrackerItemKey(it) === key) return it; for (const it of d.items) { + for (const li of (Array.isArray(it.linked_issues) ? it.linked_issues : [])) { + const issue = { repo: it.repo, number: li.number, kind: 'issue', title: li.title || '', url: li.url || '', state: li.state || '' }; + if (stageTrackerItemKey(issue) === key) return issue; + } for (const lp of (Array.isArray(it.linked_prs) ? it.linked_prs : [])) { const pr = stageTrackerLinkedPRItem(it, lp); if (stageTrackerItemKey(pr) === key) return pr; @@ -20610,6 +20617,14 @@

All labels

} return null; } + // Linked issues in a PR-only view still have their own exact target. + function stageTrackerLinkedIssueToolsHtml(item) { + return (Array.isArray(item.linked_issues) ? item.linked_issues : []).filter(li => li && Number(li.number) > 0 && li.state === 'open').map(li => { + const issue = { repo: item.repo, number: li.number, kind: 'issue' }; + const ref = stageTrackerRefOf(issue); + return `Issue #${Number(li.number)} `; + }).join(''); + } function stageTrackerItemsForKeys(keys) { return keys.map(k => stageTrackerItemByKey(_stageTracker, k)).filter(Boolean); } @@ -20886,6 +20901,7 @@

All labels

: { id: 'hold', label: 'Hold', enabled: write, why: write ? '' : STAGE_TRACKER_WHY_WRITE, sep: triage && !target }); out.push({ id: 'retry', label: 'Re-evaluate now', hint: 'rescan', enabled: true, why: '' }); if (!has('needs-human')) out.push({ id: 'needs-human', label: 'Mark needs-human…', enabled: !!ctx.canHuman, why: ctx.canHuman ? '' : STAGE_TRACKER_WHY_ROLE }); + if (item.kind === 'issue' && String(item.state || '').toLowerCase() !== 'closed') out.push(Object.assign({ id: 'decide:close-issue', label: 'Close issue…', danger: true, hint: 'only this issue · completed' }, stageTrackerActionAllowed('decide:close-issue', ctx))); out.push({ id: 'open', label: 'Open on GitHub', enabled: !!item.url, why: item.url ? '' : 'No GitHub link', sep: true }); out.push({ id: 'copy', label: 'Copy link', enabled: !!item.url, why: item.url ? '' : 'No GitHub link' }); return out; @@ -21620,6 +21636,7 @@

All labels

case 'accept-triage': return item.kind === 'pr' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/accept-triage', body: {} }; case 'blocker:recheck': return item.kind === 'pr' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/blocker/recheck', body: {} }; case 'blocker:close-partial': return item.kind === 'pr' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/blocker/close-partial', body: { comment: payload.comment || '' } }; + case 'decide:close-issue': return item.kind !== 'issue' || String(item.state || '').toLowerCase() === 'closed' ? null : { url: '/api/repos/' + seg + '/items/' + n + '/decision', body: { decision: 'close-issue', comment: payload.comment || '', type: 'issue' } }; } if (id === 'decide:delegate' || id === 'decide:delegate:rerun') { const body = { type, reason: item.reason || '', caption: item.caption || '', sentinel_reason: item.sentinel_reason || '' }; @@ -21776,6 +21793,7 @@

All labels

const r = await fetch(req.url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(req.body) }); let data = await r.json().catch(() => ({})); if (!r.ok) throw new Error(data.error || ('HTTP ' + r.status)); + if (id === 'decide:close-issue' && data.status !== 'closed' && data.status !== 'refused') throw new Error(data.error || 'The server did not confirm that the issue closed'); if (data.minStatusSeq != null) _statusSeqFloor = Math.max(_statusSeqFloor || 0, Number(data.minStatusSeq) || 0); if (req.poll && !stageTrackerDelegatedDone(data)) { showToast('Hive is deciding ' + stageTrackerRefOf(it) + '…', 'info'); @@ -22321,6 +22339,11 @@

All labels

} case 'decide:close-read': return (await stageTrackerAsk(id, 'confirm', { title: 'Close advisory', message: stageTrackerAdvisoryCloseMessage(items, refs, who), confirmLabel: 'Close' })) ? {} : null; + case 'decide:close-issue': { + const item = items[0]; + const v = await hivePrompt({ title: 'Close issue', label: 'Close ' + refs + ' — ' + (item.title || 'Untitled issue') + ' as completed, as ' + who + '? Only this issue closes; linked pull requests and other issues stay unchanged. An attributed closing note is posted. Additional comment (optional):', placeholder: 'Optional closing comment', confirmLabel: 'Close issue', danger: true }); + return v == null ? null : { comment: v }; + } case 'decide:merge-now': { const base = items.map(it => it.base_ref || '').filter(Boolean)[0] || 'its base branch'; if (items.some(stageTrackerNeedsRebase)) { @@ -22440,7 +22463,7 @@

All labels

const STAGE_TRACKER_ACTING_CAPTIONS = { 'hold': 'Holding…', 'release': 'Releasing hold…', 'retry': 'Re-evaluating…', 'needs-human': 'Marking needs-human…', 'accept-triage': 'Accepting triage…', 'blocker:recheck': 'Checking App permissions…', 'blocker:close-partial': 'Closing as partial…', - 'decide:delegate': 'Hive deciding…', 'decide:delegate:preview': 'Asking the hive…', 'decide:delegate-all': 'Hive deciding each PR…', 'decide:delegate:rerun': 'Hive deciding again…', 'decide:approve': 'Approving…', 'decide:direction': 'Recording direction…', 'decide:close-superseded': 'Closing…', 'decide:close-wontfix': 'Closing…', 'decide:close-read': 'Closing…', + 'decide:delegate': 'Hive deciding…', 'decide:delegate:preview': 'Asking the hive…', 'decide:delegate-all': 'Hive deciding each PR…', 'decide:delegate:rerun': 'Hive deciding again…', 'decide:approve': 'Approving…', 'decide:direction': 'Recording direction…', 'decide:close-superseded': 'Closing…', 'decide:close-wontfix': 'Closing…', 'decide:close-read': 'Closing…', 'decide:close-issue': 'Closing…', 'decide:merge-now': 'Merging…', 'decide:queue-merge': 'Recording approval…', 'decide:re-author': 'Queuing re-authoring…', 'decide:adopt': 'Adopting…', 'decide:adopt-now': 'Adopting now…', 'decide:reroute': 'Rerouting…', }; @@ -22755,6 +22778,24 @@

All labels

const id = action; const rows = items.slice(); if (!items.length) return { toasts: [], pending: [] }; + if (id === 'decide:close-issue') { + // Never remap an issue close through its covering PR or fan it out. + if (items.length !== 1 || !stageTrackerActionRequest(items[0], id)) { + stageTrackerNothingToActOn(id, rows); + return { toasts: [], pending: [] }; + } + const key = stageTrackerItemKey(items[0]); + if (_stageTrackerCloseIssueBusy.has(key) || _stageTrackerPending.some(p => p.keys.indexOf(key) >= 0)) return { toasts: [], pending: [] }; + _stageTrackerCloseIssueBusy.add(key); + try { + const payload = await stageTrackerActionPayload(items, id, rows); + if (payload == null) return { toasts: [], pending: [], cancelled: true }; + const results = await stageTrackerRunActions(items, id, payload, rows); + return { toast: results.toasts[0] || null, toasts: results.toasts, pending: results.pending, results }; + } finally { + _stageTrackerCloseIssueBusy.delete(key); + } + } if (id === 'open') { for (const it of items) if (it.url) window.open(it.url, '_blank', 'noopener'); return { toasts: [], pending: [] }; @@ -22956,7 +22997,6 @@

All labels

// kind → { name, bytes (ArrayBuffer), buffer (AudioBuffer|null), failed } var _stageTrackerClips = { open: null, merge: null }; var _stageTrackerSettingsReturnFocus = null; - function stageTrackerPRKey(repo, number) { return (repo || '') + '/pr#' + (Number(number) || 0); } function stageTrackerItemKey(it) { return (it.repo || '') + '/' + (it.kind || '') + '#' + (Number(it.number) || 0); } From dfaadfae26fd0fabef7cb704d31feb6975bcfcc5 Mon Sep 17 00:00:00 2001 From: Andy Anderson Date: Sat, 31 Oct 2026 06:55:06 -0400 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20fix:=20settle=20linked=20iss?= =?UTF-8?q?ue=20closure=20through=20canonical=20tracker=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andy Anderson --- src/pkg/dashboard/operator_actions.go | 5 +++-- src/pkg/dashboard/operator_actions_test.go | 5 ++++- .../dashboard/stage_tracker_close_issue_test.go | 14 ++++++++++++++ src/pkg/dashboard/static-src/js/tracker-actions.js | 4 ++-- .../dashboard/static-src/js/tracker-row-acted.js | 2 +- .../dashboard/static-src/js/tracker-row-strip.js | 2 +- src/pkg/dashboard/static/index.html | 8 ++++---- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/pkg/dashboard/operator_actions.go b/src/pkg/dashboard/operator_actions.go index 6d558b67ac..f2760da846 100644 --- a/src/pkg/dashboard/operator_actions.go +++ b/src/pkg/dashboard/operator_actions.go @@ -37,6 +37,7 @@ const ( operatorActionCloseSuperseded = "close-superseded" operatorActionWontFix = "wontfix" operatorActionCloseRead = "close-read" + operatorActionCloseIssue = "close-issue" operatorActionLetHiveDecide = "let-hive-decide" operatorActionHold = "hold" operatorActionRelease = "release" @@ -339,7 +340,7 @@ func operatorActionFromBody(endpoint string, body []byte) (operatorActionRequest case repoItemDecisionCloseRead: out.Action = operatorActionCloseRead case repoItemDecisionCloseIssue: - out.Action = repoItemDecisionCloseIssue + out.Action = operatorActionCloseIssue case repoItemDecisionMergeNow: out.Action = operatorActionMergeNow case repoItemDecisionQueueMerge: @@ -910,7 +911,7 @@ func operatorActionClosedGrace() time.Duration { // operatorClosedActions are the row actions whose applied outcome is a // closed issue or PR. -var operatorClosedActions = []string{operatorActionCloseSuperseded, operatorActionWontFix, operatorActionCloseRead} +var operatorClosedActions = []string{operatorActionCloseSuperseded, operatorActionWontFix, operatorActionCloseRead, operatorActionCloseIssue} // operatorActionClosedItem reports whether the item's newest recorded // action closed it from the dashboard within grace of now: GitHub's list diff --git a/src/pkg/dashboard/operator_actions_test.go b/src/pkg/dashboard/operator_actions_test.go index 486ac3d91b..3dc7c6b5f9 100644 --- a/src/pkg/dashboard/operator_actions_test.go +++ b/src/pkg/dashboard/operator_actions_test.go @@ -480,13 +480,16 @@ func TestStageTrackerDropOperatorClosed(t *testing.T) { {Repo: "o/r", Number: 4, Kind: "issue", LastOperatorAction: act(operatorActionWontFix, operatorActionOutcomeApplied, operatorActionClosedDetail, grace+time.Second)}, {Repo: "o/r", Number: 5, Kind: "issue", LastOperatorAction: act(operatorActionCloseRead, operatorActionOutcomeFailed, "Close refused: repo paused", time.Minute)}, {Repo: "o/r", Number: 6, Kind: "issue", LastOperatorAction: act(operatorActionApprove, operatorActionOutcomeApplied, "unparked", time.Minute)}, + {Repo: "o/r", Number: 7, Kind: "issue", LastOperatorAction: act(operatorActionCloseIssue, operatorActionOutcomeApplied, operatorActionClosedDetail, time.Minute)}, + {Repo: "o/r", Number: 8, Kind: "issue", LastOperatorAction: act(operatorActionCloseIssue, operatorActionOutcomeFailed, "permission denied", time.Minute)}, + {Repo: "o/r", Number: 9, Kind: "pr", LinkedIssues: []StageTrackerLinkedIssue{{Number: 7, State: "open"}}}, } got := stageTrackerDropOperatorClosed(items, now, grace) var nums []int for _, it := range got { nums = append(nums, it.Number) } - want := []int{1, 4, 5, 6} + want := []int{1, 4, 5, 6, 8, 9} if !slices.Equal(nums, want) { t.Fatalf("kept %v, want %v (just-closed rows 2 and 3 must leave; a refused close, an old close and a non-close stay)", nums, want) } diff --git a/src/pkg/dashboard/stage_tracker_close_issue_test.go b/src/pkg/dashboard/stage_tracker_close_issue_test.go index 8806efe5f5..9710ae7242 100644 --- a/src/pkg/dashboard/stage_tracker_close_issue_test.go +++ b/src/pkg/dashboard/stage_tracker_close_issue_test.go @@ -39,6 +39,10 @@ const nested = stageTrackerItemByKey({ items: [pr] }, 'other/repository/issue#90 assert.strictEqual(nested.title, 'Selected nested issue'); assert.strictEqual(stageTrackerActionRequest(nested, 'decide:close-issue').url, '/api/repos/other/repository/items/902/decision'); assert.strictEqual(stageTrackerItemByKey({ items: [issue, pr] }, 'hivecommons/dibs/issue#527'), issue, 'canonical root DTO wins'); +const pend = { keys: ['other/repository/issue#902'], key: 'other/repository/issue#902', state: stageTrackerItemState(nested), at: Date.now() }; +const refreshed = { ...pr, linked_issues: pr.linked_issues.map(li => li.number === 902 ? { ...li, state: 'closed' } : li) }; +assert.strictEqual(stageTrackerPendingLive([pend], { items: [refreshed] }, Date.now()).length, 0, 'canonical closed linked issue settles pending without hiding its PR'); +assert.strictEqual(refreshed.number, 900); `) } @@ -100,6 +104,16 @@ const tick = async () => { for (let i = 0; i < 10; i++) await Promise.resolve(); assert.ok(results.at(-1).outcome.includes(error), 'standard error notification includes server reason'); assert.strictEqual(_stageTracker.items[0], issue, 'failed close does not hide issue'); } + for (const data of [{}, { status: 'refused', result: { action: 'refused', target: { repo: issue.repo, number: 527, kind: 'issue' }, outcome: 'Close refused: repo paused' } }]) { + const attempt = runRowAction('decide:close-issue', issue); + releasePrompt(''); + await tick(); + releaseFetch({ ok: true, json: async () => data }); + await attempt; + assert.ok(results.at(-1).action === 'error' || results.at(-1).action === 'refused', 'no fake success'); + assert.strictEqual(_stageTrackerPending.length, 0); + assert.strictEqual(_stageTracker.items[0], issue); + } const cancelled = runRowAction('decide:close-issue', issue); const before = calls.length; releasePrompt(null); diff --git a/src/pkg/dashboard/static-src/js/tracker-actions.js b/src/pkg/dashboard/static-src/js/tracker-actions.js index 5914cbafe6..36b2908603 100644 --- a/src/pkg/dashboard/static-src/js/tracker-actions.js +++ b/src/pkg/dashboard/static-src/js/tracker-actions.js @@ -2039,7 +2039,7 @@ } // The ledger name of a row action id (the inverse of the badge's // STAGE_TRACKER_ACTED_OPTION_ID), for a failure noted on the client. - const STAGE_TRACKER_ACTION_LEDGER_NAME = { 'decide:delegate': 'let-hive-decide', 'decide:approve': 'approve', 'decide:direction': 'give-direction', 'decide:close-superseded': 'close-superseded', 'decide:close-wontfix': 'wontfix', 'decide:close-read': 'close-read', 'accept-triage': 'accept-triage', hold: 'hold', release: 'release', 'needs-human': 'mark-needs-human', 'decide:merge-now': 'merge-now', 'decide:queue-merge': 'queue-merge', 'decide:re-author': 're-author', 'decide:adopt': 'adopt', 'decide:adopt-now': 'adopt-now', 'decide:reroute': 'reroute' }; + const STAGE_TRACKER_ACTION_LEDGER_NAME = { 'decide:delegate': 'let-hive-decide', 'decide:approve': 'approve', 'decide:direction': 'give-direction', 'decide:close-superseded': 'close-superseded', 'decide:close-wontfix': 'wontfix', 'decide:close-read': 'close-read', 'decide:close-issue': 'close-issue', 'accept-triage': 'accept-triage', hold: 'hold', release: 'release', 'needs-human': 'mark-needs-human', 'decide:merge-now': 'merge-now', 'decide:queue-merge': 'queue-merge', 'decide:re-author': 're-author', 'decide:adopt': 'adopt', 'decide:adopt-now': 'adopt-now', 'decide:reroute': 'reroute' }; // A failed or refused action is noted on the row at once, so the // history badge turns red and its hover's first line names the reason // — the server's ledger only sees 5xx and refused answers, and a @@ -2069,7 +2069,7 @@ // Pure: the state signature a toast / acting row waits to see change. function stageTrackerItemState(it) { if (!it) return ''; - return String(Number(it.stage) || 0) + '|' + (it.stage_slug || '') + '|' + (it.caption || '') + '|' + (Array.isArray(it.modifiers) ? it.modifiers.slice().sort().join(',') : '') + (it.rebase_merge && it.rebase_merge.state ? '|rm:' + it.rebase_merge.state : '') + (it.rebase && it.rebase.text ? '|rb:' + it.rebase.text : ''); + return String(Number(it.stage) || 0) + '|' + (it.stage_slug || '') + '|' + (it.caption || '') + '|' + (Array.isArray(it.modifiers) ? it.modifiers.slice().sort().join(',') : '') + (it.state ? '|state:' + it.state : '') + (it.rebase_merge && it.rebase_merge.state ? '|rm:' + it.rebase_merge.state : '') + (it.rebase && it.rebase.text ? '|rb:' + it.rebase.text : ''); } function stageTrackerTargetKey(target) { return target && target.number ? stageTrackerItemKey({ repo: target.repo, kind: target.kind === 'pr' ? 'pr' : 'issue', number: target.number }) : ''; diff --git a/src/pkg/dashboard/static-src/js/tracker-row-acted.js b/src/pkg/dashboard/static-src/js/tracker-row-acted.js index 8552166546..4e1152e25c 100644 --- a/src/pkg/dashboard/static-src/js/tracker-row-acted.js +++ b/src/pkg/dashboard/static-src/js/tracker-row-acted.js @@ -94,7 +94,7 @@ } // Row-menu action id each ledger action was submitted under, so the // option the owner just took is not offered back to them. - const STAGE_TRACKER_ACTED_OPTION_ID = { 'let-hive-decide': 'decide:delegate', approve: 'decide:approve', 'give-direction': 'decide:direction', 'close-superseded': 'decide:close-superseded', wontfix: 'decide:close-wontfix', 'close-read': 'decide:close-read', 'accept-triage': 'accept-triage', hold: 'hold', 'merge-now': 'decide:merge-now', 'queue-merge': 'decide:queue-merge', 're-author': 'decide:re-author', adopt: 'decide:adopt', 'adopt-now': 'decide:adopt-now', reroute: 'decide:reroute' }; + const STAGE_TRACKER_ACTED_OPTION_ID = { 'let-hive-decide': 'decide:delegate', approve: 'decide:approve', 'give-direction': 'decide:direction', 'close-superseded': 'decide:close-superseded', wontfix: 'decide:close-wontfix', 'close-read': 'decide:close-read', 'close-issue': 'decide:close-issue', 'accept-triage': 'accept-triage', hold: 'hold', 'merge-now': 'decide:merge-now', 'queue-merge': 'decide:queue-merge', 're-author': 'decide:re-author', adopt: 'decide:adopt', 'adopt-now': 'decide:adopt-now', reroute: 'decide:reroute' }; // Pure: what the owner can still do when their action changed nothing // (no-op) or the item has not moved (stuck): the enabled options from // the row's decision_needed payload, minus the one just taken. diff --git a/src/pkg/dashboard/static-src/js/tracker-row-strip.js b/src/pkg/dashboard/static-src/js/tracker-row-strip.js index e9d5400707..93f62b91eb 100644 --- a/src/pkg/dashboard/static-src/js/tracker-row-strip.js +++ b/src/pkg/dashboard/static-src/js/tracker-row-strip.js @@ -370,7 +370,7 @@ request still on the wire) is a different thing drawn on the chevron; this badge appears once the server has recorded the action. */ const STAGE_TRACKER_ACTED_LABELS = { - approve: 'Approve', 'give-direction': 'Give direction', 'close-superseded': 'Close as superseded', wontfix: "Close as won't-fix", 'close-read': 'Closed', + approve: 'Approve', 'give-direction': 'Give direction', 'close-superseded': 'Close as superseded', wontfix: "Close as won't-fix", 'close-read': 'Closed', 'close-issue': 'Close issue', 'let-hive-decide': 'Let hive decide', hold: 'Hold', release: 'Release hold', 'accept-triage': 'Accept triage', 'mark-needs-human': 'Mark needs-human', 'queue-merge': 'Approve and let hive merge', 'merge-now': 'Merge now as maintainer', adopt: 'Adopt', 'adopt-now': 'Adopt now', reroute: 'Reroute to another clanker', diff --git a/src/pkg/dashboard/static/index.html b/src/pkg/dashboard/static/index.html index ca1d6aa020..bcaebc4a68 100644 --- a/src/pkg/dashboard/static/index.html +++ b/src/pkg/dashboard/static/index.html @@ -17402,7 +17402,7 @@

Where to get help

request still on the wire) is a different thing drawn on the chevron; this badge appears once the server has recorded the action. */ const STAGE_TRACKER_ACTED_LABELS = { - approve: 'Approve', 'give-direction': 'Give direction', 'close-superseded': 'Close as superseded', wontfix: "Close as won't-fix", 'close-read': 'Closed', + approve: 'Approve', 'give-direction': 'Give direction', 'close-superseded': 'Close as superseded', wontfix: "Close as won't-fix", 'close-read': 'Closed', 'close-issue': 'Close issue', 'let-hive-decide': 'Let hive decide', hold: 'Hold', release: 'Release hold', 'accept-triage': 'Accept triage', 'mark-needs-human': 'Mark needs-human', 'queue-merge': 'Approve and let hive merge', 'merge-now': 'Merge now as maintainer', adopt: 'Adopt', 'adopt-now': 'Adopt now', reroute: 'Reroute to another clanker', @@ -17520,7 +17520,7 @@

Where to get help

} // Row-menu action id each ledger action was submitted under, so the // option the owner just took is not offered back to them. - const STAGE_TRACKER_ACTED_OPTION_ID = { 'let-hive-decide': 'decide:delegate', approve: 'decide:approve', 'give-direction': 'decide:direction', 'close-superseded': 'decide:close-superseded', wontfix: 'decide:close-wontfix', 'close-read': 'decide:close-read', 'accept-triage': 'accept-triage', hold: 'hold', 'merge-now': 'decide:merge-now', 'queue-merge': 'decide:queue-merge', 're-author': 'decide:re-author', adopt: 'decide:adopt', 'adopt-now': 'decide:adopt-now', reroute: 'decide:reroute' }; + const STAGE_TRACKER_ACTED_OPTION_ID = { 'let-hive-decide': 'decide:delegate', approve: 'decide:approve', 'give-direction': 'decide:direction', 'close-superseded': 'decide:close-superseded', wontfix: 'decide:close-wontfix', 'close-read': 'decide:close-read', 'close-issue': 'decide:close-issue', 'accept-triage': 'accept-triage', hold: 'hold', 'merge-now': 'decide:merge-now', 'queue-merge': 'decide:queue-merge', 're-author': 'decide:re-author', adopt: 'decide:adopt', 'adopt-now': 'decide:adopt-now', reroute: 'decide:reroute' }; // Pure: what the owner can still do when their action changed nothing // (no-op) or the item has not moved (stuck): the enabled options from // the row's decision_needed payload, minus the one just taken. @@ -22483,7 +22483,7 @@

All labels

} // The ledger name of a row action id (the inverse of the badge's // STAGE_TRACKER_ACTED_OPTION_ID), for a failure noted on the client. - const STAGE_TRACKER_ACTION_LEDGER_NAME = { 'decide:delegate': 'let-hive-decide', 'decide:approve': 'approve', 'decide:direction': 'give-direction', 'decide:close-superseded': 'close-superseded', 'decide:close-wontfix': 'wontfix', 'decide:close-read': 'close-read', 'accept-triage': 'accept-triage', hold: 'hold', release: 'release', 'needs-human': 'mark-needs-human', 'decide:merge-now': 'merge-now', 'decide:queue-merge': 'queue-merge', 'decide:re-author': 're-author', 'decide:adopt': 'adopt', 'decide:adopt-now': 'adopt-now', 'decide:reroute': 'reroute' }; + const STAGE_TRACKER_ACTION_LEDGER_NAME = { 'decide:delegate': 'let-hive-decide', 'decide:approve': 'approve', 'decide:direction': 'give-direction', 'decide:close-superseded': 'close-superseded', 'decide:close-wontfix': 'wontfix', 'decide:close-read': 'close-read', 'decide:close-issue': 'close-issue', 'accept-triage': 'accept-triage', hold: 'hold', release: 'release', 'needs-human': 'mark-needs-human', 'decide:merge-now': 'merge-now', 'decide:queue-merge': 'queue-merge', 'decide:re-author': 're-author', 'decide:adopt': 'adopt', 'decide:adopt-now': 'adopt-now', 'decide:reroute': 'reroute' }; // A failed or refused action is noted on the row at once, so the // history badge turns red and its hover's first line names the reason // — the server's ledger only sees 5xx and refused answers, and a @@ -22513,7 +22513,7 @@

All labels

// Pure: the state signature a toast / acting row waits to see change. function stageTrackerItemState(it) { if (!it) return ''; - return String(Number(it.stage) || 0) + '|' + (it.stage_slug || '') + '|' + (it.caption || '') + '|' + (Array.isArray(it.modifiers) ? it.modifiers.slice().sort().join(',') : '') + (it.rebase_merge && it.rebase_merge.state ? '|rm:' + it.rebase_merge.state : '') + (it.rebase && it.rebase.text ? '|rb:' + it.rebase.text : ''); + return String(Number(it.stage) || 0) + '|' + (it.stage_slug || '') + '|' + (it.caption || '') + '|' + (Array.isArray(it.modifiers) ? it.modifiers.slice().sort().join(',') : '') + (it.state ? '|state:' + it.state : '') + (it.rebase_merge && it.rebase_merge.state ? '|rm:' + it.rebase_merge.state : '') + (it.rebase && it.rebase.text ? '|rb:' + it.rebase.text : ''); } function stageTrackerTargetKey(target) { return target && target.number ? stageTrackerItemKey({ repo: target.repo, kind: target.kind === 'pr' ? 'pr' : 'issue', number: target.number }) : ''; From a25079e4148baaa3eb1d0337efbc1b9752c85774 Mon Sep 17 00:00:00 2001 From: Andy Anderson Date: Sat, 31 Oct 2026 07:02:18 -0400 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=90=9B=20test:=20account=20for=20univ?= =?UTF-8?q?ersal=20issue=20close=20in=20tracker=20menus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andy Anderson --- src/pkg/dashboard/stage_tracker_row_actions_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pkg/dashboard/stage_tracker_row_actions_test.go b/src/pkg/dashboard/stage_tracker_row_actions_test.go index f10730cf9a..05f209d4c1 100644 --- a/src/pkg/dashboard/stage_tracker_row_actions_test.go +++ b/src/pkg/dashboard/stage_tracker_row_actions_test.go @@ -372,7 +372,7 @@ assert.strictEqual(by.open.enabled, true); const menu = stageTrackerMenuHtml(as, 'o/r#1 · Parked'); assert.ok(menu.startsWith('')); -assert.strictEqual((menu.match(/role="menuitem"/g) || []).length, 11, 'six top-level items + five decide options'); +assert.strictEqual((menu.match(/role="menuitem"/g) || []).length, 12, 'seven top-level items including Close issue + five decide options'); assert.ok(menu.includes('data-ham-act="hold" tabindex="-1" aria-disabled="true" title="' + STAGE_TRACKER_WHY_WRITE + '"'), 'disabled items carry the reason'); assert.ok(menu.includes('aria-haspopup="menu" aria-expanded="false"'), 'Decide is a collapsed submenu'); assert.ok(menu.includes('