Skip to content

Commit 560960b

Browse files
committed
fix(pr): hide maintainer edits on closed requests
1 parent 3a0971d commit 560960b

4 files changed

Lines changed: 34 additions & 8 deletions

File tree

‎apps/mobile/src/features/pull-requests/usePullRequestMaintainerEdits.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useAtomRefresh } from "@effect/atom-react";
2+
import { canEditPullRequestMaintainerEdits } from "@t3tools/client-runtime/pull-request-editing";
23
import type { PullRequestDetail } from "@t3tools/contracts";
34
import { AsyncResult } from "effect/reactivity";
45
import { useRef, useState } from "react";
@@ -24,10 +25,7 @@ export function usePullRequestMaintainerEdits(
2425
const value = selection.key === key ? selection.value : (pr?.maintainerCanModify ?? false);
2526
const [saving, setSaving] = useState(false);
2627
const inFlight = useRef(false);
27-
const visible =
28-
pr?.capabilities.edit?.maintainerEdits === true &&
29-
pr.viewerPermissions.maintainerEdits === true &&
30-
pr.maintainerCanModify !== undefined;
28+
const visible = pr !== null && canEditPullRequestMaintainerEdits(pr);
3129
const save = async (next: boolean) => {
3230
if (!visible || !permissions.canEditChangeRequest || inFlight.current) return;
3331
const previous = value;

‎apps/web/src/components/pullRequest/PullRequestActionsMenu.tsx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useAtomValue } from "@effect/atom-react";
2+
import { canEditPullRequestMaintainerEdits } from "@t3tools/client-runtime/pull-request-editing";
23
import type { ChangeRequestTerminology } from "@t3tools/client-runtime/source-control-clients";
34
import type {
45
EnvironmentId,
@@ -146,10 +147,7 @@ export function PullRequestActionsMenu({
146147
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
147148
const inlineConfirm = useInlineActionConfirm(pullRequestKey);
148149
const actionPending = pendingAction !== null;
149-
const showsMaintainerEdits =
150-
detail.capabilities.edit?.maintainerEdits === true &&
151-
detail.viewerPermissions.maintainerEdits === true &&
152-
detail.maintainerCanModify !== undefined;
150+
const showsMaintainerEdits = canEditPullRequestMaintainerEdits(detail);
153151
return (
154152
<Menu>
155153
<Tooltip>

‎packages/client-runtime/src/pullRequestEditing.test.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { describe, expect, it } from "vite-plus/test";
1010
import {
1111
canEditPullRequestChangeRequest,
1212
canEditPullRequestComment,
13+
canEditPullRequestMaintainerEdits,
1314
canResolvePullRequestThread,
1415
} from "./pullRequestEditing.ts";
1516

@@ -141,6 +142,21 @@ describe("canEditPullRequestChangeRequest", () => {
141142
});
142143
});
143144

145+
describe("canEditPullRequestMaintainerEdits", () => {
146+
it.each(["open", "closed", "merged"] as const)(
147+
"only allows an open pull request when cached permissions allow edits: %s",
148+
(state) => {
149+
const detail = {
150+
state,
151+
capabilities: capabilities({ changeRequest: true, comment: true, maintainerEdits: true }),
152+
viewerPermissions: permissions({ maintainerEdits: true }),
153+
maintainerCanModify: false,
154+
};
155+
expect(canEditPullRequestMaintainerEdits(detail)).toBe(state === "open");
156+
},
157+
);
158+
});
159+
144160
describe("canEditPullRequestComment", () => {
145161
it("lets the reader rewrite their own remark on a line", () => {
146162
expect(canEditPullRequestComment(subject(), comment({ kind: "review-comment" }))).toBe(true);

‎packages/client-runtime/src/pullRequestEditing.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,20 @@ export function canEditPullRequestChangeRequest(detail: EditingSubject): boolean
2525
);
2626
}
2727

28+
export function canEditPullRequestMaintainerEdits(
29+
detail: Pick<
30+
PullRequestDetail,
31+
"state" | "capabilities" | "viewerPermissions" | "maintainerCanModify"
32+
>,
33+
): boolean {
34+
return (
35+
detail.state === "open" &&
36+
detail.capabilities.edit?.maintainerEdits === true &&
37+
detail.viewerPermissions.maintainerEdits === true &&
38+
detail.maintainerCanModify !== undefined
39+
);
40+
}
41+
2842
/** Hosts do not support rewriting review summaries through comment mutations. */
2943
export function canEditPullRequestComment(
3044
detail: EditingSubject,

0 commit comments

Comments
 (0)