Skip to content

Commit 973e0f9

Browse files
committed
fix(pr): preserve pending maintainer edits on refresh
1 parent 53acfb9 commit 973e0f9

5 files changed

Lines changed: 148 additions & 22 deletions

File tree

‎apps/mobile/src/features/pull-requests/usePullRequestMaintainerEdits.test.tsx‎

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ function setup() {
5353
mocks.permission = Atom.make(true);
5454
mocks.detail = Atom.make(null);
5555
const registry = AtomRegistry.make();
56-
const detail: PullRequestDetail = {
56+
let detail: PullRequestDetail = {
5757
provider: SourceControlProviderKind.make("github"),
5858
projectId: ProjectId.make("project"),
5959
projectTitle: "Project",
@@ -127,7 +127,13 @@ function setup() {
127127
);
128128
render();
129129
return {
130-
detail,
130+
get detail() {
131+
return detail;
132+
},
133+
refresh(enabled: boolean) {
134+
detail = { ...detail, maintainerCanModify: enabled };
135+
render();
136+
},
131137
render,
132138
registry,
133139
get current() {
@@ -166,3 +172,26 @@ it("saves an explicit maintainer grant without a viewer login, while honoring lo
166172
await act(async () => screen.current.toggle());
167173
expect(mocks.update).toHaveBeenCalledTimes(1);
168174
});
175+
176+
it("keeps a newer selection when an earlier save's refresh arrives", async () => {
177+
using screen = setup();
178+
await act(async () => screen.current.toggle());
179+
expect(screen.current.value).toBe(true);
180+
let settle!: (value: { _tag: "Success" }) => void;
181+
mocks.update.mockReturnValueOnce(
182+
new Promise<{ _tag: "Success" }>((resolve) => {
183+
settle = resolve;
184+
}),
185+
);
186+
await act(async () => screen.current.toggle());
187+
expect(screen.current.value).toBe(false);
188+
screen.refresh(true);
189+
expect(screen.current.disabled).toBe(true);
190+
expect(screen.current.value).toBe(false);
191+
await act(async () => screen.current.toggle());
192+
expect(mocks.update).toHaveBeenCalledTimes(2);
193+
await act(async () => settle({ _tag: "Success" }));
194+
expect(screen.current.value).toBe(false);
195+
screen.refresh(false);
196+
expect(screen.current.value).toBe(false);
197+
});

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ export function usePullRequestMaintainerEdits(
2020
const update = useAtomCommand(composerPullRequests.update, { reportFailure: false });
2121
const refresh = useAtomRefresh(composerPullRequests.detail(target));
2222
const key = `${pr?.url}:${pr?.maintainerCanModify}`;
23+
const [saving, setSaving] = useState(false);
2324
const [selection, setSelection] = useState({ key, value: pr?.maintainerCanModify ?? false });
25+
const value =
26+
selection.key === key || saving ? selection.value : (pr?.maintainerCanModify ?? false);
2427
if (selection.key !== key) {
25-
setSelection({ key, value: pr?.maintainerCanModify ?? false });
28+
setSelection({ key, value });
2629
}
27-
const value = selection.key === key ? selection.value : (pr?.maintainerCanModify ?? false);
28-
const [saving, setSaving] = useState(false);
2930
const inFlight = useRef(false);
3031
const visible = pr !== null && canEditPullRequestMaintainerEdits(pr);
3132
const save = async (next: boolean) => {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export function PullRequestActionsMenu({
237237
{showsMaintainerEdits && detail.maintainerCanModify !== undefined ? (
238238
<>
239239
<PullRequestMaintainerEdits
240-
key={`${detail.url}:${detail.maintainerCanModify}`}
240+
key={`${environmentId}:${detail.url}`}
241241
environmentId={environmentId}
242242
reference={reference}
243243
enabled={detail.maintainerCanModify}

‎apps/web/src/components/pullRequest/PullRequestMaintainerEdits.browser.test.tsx‎

Lines changed: 107 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import "~/index.css";
22
import { EnvironmentId, ProjectId } from "@t3tools/contracts";
3+
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
34
import { expect, it, vi } from "vite-plus/test";
45
import { page, userEvent } from "vite-plus/test/browser";
56

@@ -17,11 +18,18 @@ vi.mock(
1718
);
1819

1920
vi.mock(import("../ui/toast"), () => ({ toastManager: { add: mocks.notify } }) as never);
21+
vi.mock(import("~/state/server"), async () => {
22+
const { Atom } = await import("effect/reactivity");
23+
return { primaryServerKeybindingsAtom: Atom.make([]) } as never;
24+
});
25+
vi.mock(import("./PullRequestThreadLinks"), () => ({ PullRequestThreadLinks: () => null }));
26+
vi.mock(
27+
import("./PullRequestDetailActions"),
28+
() => ({ ActOnEnvironmentPicker: () => null }) as never,
29+
);
2030

2131
import { render } from "../../../test/render";
22-
import { Menu, MenuPopup, MenuTrigger } from "../ui/menu";
23-
24-
import { PullRequestMaintainerEdits } from "./PullRequestMaintainerEdits";
32+
import { PullRequestActionsMenu } from "./PullRequestActionsMenu";
2533

2634
const reference = { projectId: ProjectId.make("project"), repository: "owner/repo", number: 7 };
2735
const environmentId = EnvironmentId.make("environment");
@@ -30,19 +38,74 @@ function setup() {
3038
mocks.update.mockReset().mockResolvedValue({ _tag: "Success" });
3139
mocks.notify.mockReset();
3240
const onSaved = vi.fn();
33-
const control = (allowed = true) => (
34-
<Menu>
35-
<MenuTrigger>More pull request actions</MenuTrigger>
36-
<MenuPopup keepMounted>
37-
<PullRequestMaintainerEdits
38-
environmentId={environmentId}
39-
reference={reference}
40-
enabled={true}
41-
allowed={allowed}
42-
onSaved={onSaved}
43-
/>
44-
</MenuPopup>
45-
</Menu>
41+
const control = (allowed = true, enabled = true) => (
42+
<PullRequestActionsMenu
43+
environmentId={environmentId}
44+
reference={reference}
45+
pullRequestKey="owner/repo/7"
46+
detail={{
47+
url: "https://github.com/owner/repo/pull/7",
48+
state: "open",
49+
isDraft: false,
50+
headBranch: "feature",
51+
maintainerCanModify: enabled,
52+
capabilities: {
53+
diff: true,
54+
comment: true,
55+
actions: [],
56+
mergeMethods: [],
57+
search: true,
58+
review: { inlineComment: true, reply: true, resolve: true, verdicts: [] },
59+
reviewers: { request: true, listCandidates: true },
60+
edit: { changeRequest: true, comment: true, maintainerEdits: true },
61+
},
62+
viewerPermissions: {
63+
actions: [],
64+
comment: true,
65+
resolve: true,
66+
verdicts: [],
67+
requestReviewers: true,
68+
maintainerEdits: true,
69+
},
70+
}}
71+
terminology={sourceControlClients.get("github").changeRequest}
72+
linkThreadRef={null}
73+
onThreadPickerOpenChange={() => {}}
74+
refreshing={false}
75+
refreshFromHost={async () => {}}
76+
handoff={null}
77+
attachesToComposer={false}
78+
askAboutPullRequest={() => {}}
79+
explainPullRequest={() => {}}
80+
canFixFindings={false}
81+
startFixFindings={() => {}}
82+
handoffLabels={{ fixFindings: "Fix review findings" }}
83+
canWriteGuide={false}
84+
guideRunning={false}
85+
guideWritten={false}
86+
writeGuide={() => {}}
87+
pickableEnvironments={[]}
88+
actingEnvironmentId={environmentId}
89+
onActingEnvironmentChange={() => {}}
90+
can={() => false}
91+
autoMergeArmed={false}
92+
showsDraftToggle={false}
93+
showsMergeNow={false}
94+
showsAutoMerge={false}
95+
showsMergeMethods={false}
96+
allowedMergeMethods={[]}
97+
selectedMergeMethod="squash"
98+
onSelectMergeMethod={() => {}}
99+
showsDeleteBranch={false}
100+
environmentConnected={true}
101+
canWriteSourceControl={allowed}
102+
onMaintainerEditsSaved={onSaved}
103+
confirmDeleteBranch={async () => {}}
104+
pendingAction={null}
105+
perform={async () => true}
106+
openOnHostText="Open on GitHub"
107+
copyReference={() => {}}
108+
/>
46109
);
47110
return { control, onSaved };
48111
}
@@ -128,3 +191,31 @@ it("blocks a session without source control write access", async () => {
128191
await expect.element(page.getByRole("menuitemcheckbox")).toHaveAttribute("aria-disabled", "true");
129192
expect(mocks.update).not.toHaveBeenCalled();
130193
});
194+
195+
it("keeps a second save locked when the first save's refresh arrives", async () => {
196+
const { control, onSaved } = setup();
197+
await using screen = await render(control());
198+
await screen.getByRole("button", { name: "More pull request actions" }).click();
199+
const checkbox = page.getByRole("menuitemcheckbox");
200+
await checkbox.click();
201+
await vi.waitFor(() => expect(onSaved).toHaveBeenCalledTimes(1));
202+
let settle!: (value: { _tag: "Success" }) => void;
203+
mocks.update.mockReturnValueOnce(
204+
new Promise<{ _tag: "Success" }>((resolve) => {
205+
settle = resolve;
206+
}),
207+
);
208+
await checkbox.click();
209+
await expect.element(checkbox).toHaveAttribute("aria-disabled", "true");
210+
await screen.rerender(control(true, false));
211+
await expect.element(checkbox).toHaveAttribute("aria-disabled", "true");
212+
await expect.element(checkbox).toBeChecked();
213+
await userEvent.keyboard("{Enter}");
214+
expect(mocks.update).toHaveBeenCalledTimes(2);
215+
settle({ _tag: "Success" });
216+
await expect.element(checkbox).not.toHaveAttribute("aria-disabled", "true");
217+
await expect.element(checkbox).toBeChecked();
218+
await screen.rerender(control(true, true));
219+
await screen.rerender(control(true, false));
220+
await expect.element(checkbox).not.toBeChecked();
221+
});

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ export function PullRequestMaintainerEdits({
2323
const update = useAtomCommand(pullRequestEnvironment.update, { reportFailure: false });
2424
const [value, setValue] = useState(enabled);
2525
const [saving, setSaving] = useState(false);
26+
const [observedValue, setObservedValue] = useState(enabled);
27+
if (observedValue !== enabled) {
28+
setObservedValue(enabled);
29+
if (!saving) setValue(enabled);
30+
}
2631
const inFlight = useRef(false);
2732
const save = async (next: boolean) => {
2833
if (!allowed || inFlight.current) return;

0 commit comments

Comments
 (0)