Skip to content

Commit 3a0971d

Browse files
committed
refactor(pr): move maintainer edits to menus
1 parent c4aaf3c commit 3a0971d

9 files changed

Lines changed: 207 additions & 155 deletions

‎apps/mobile/src/components/ui/AndroidScreenHeader.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export interface AndroidHeaderAction {
2020
readonly disabled?: boolean;
2121
readonly loading?: boolean;
2222
readonly selected?: boolean;
23+
readonly subtitle?: string;
2324
readonly destructive?: boolean;
2425
readonly overflowOnly?: boolean;
2526
}
@@ -170,10 +171,11 @@ export function AndroidScreenHeader(props: {
170171
actions={overflowActions.map((action, index) => ({
171172
id: String(index),
172173
title: action.accessibilityLabel,
174+
subtitle: action.subtitle,
175+
state: action.selected ? "on" : undefined,
173176
attributes: {
174177
disabled: Boolean(action.disabled),
175178
destructive: action.destructive,
176-
state: action.selected ? "on" : undefined,
177179
},
178180
}))}
179181
onPressAction={({ nativeEvent }) =>

‎apps/mobile/src/features/pull-requests/PullRequestMaintainerEdits.tsx‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ import {
110110
PullRequestReadStatus,
111111
} from "./PullRequestPresentation";
112112
import { usePullRequestFilesSection } from "./PullRequestFiles";
113-
import { PullRequestMaintainerEdits } from "./PullRequestMaintainerEdits";
113+
import { usePullRequestMaintainerEdits } from "./usePullRequestMaintainerEdits";
114114
import { PullRequestDescription } from "./PullRequestDescription";
115115
import { PullRequestMediaVisibleContext } from "./PullRequestMedia";
116116
import { PullRequestMarkdownRepository } from "./PullRequestMarkdown";
@@ -325,15 +325,6 @@ function PullRequestOverview(props: {
325325
footer={<PullRequestReactions params={props.params} />}
326326
/>
327327
</Animated.View>
328-
{pr.capabilities.edit?.maintainerEdits === true &&
329-
pr.viewerPermissions.maintainerEdits === true &&
330-
pr.maintainerCanModify !== undefined ? (
331-
<PullRequestMaintainerEdits
332-
key={`${pr.url}:${pr.maintainerCanModify}`}
333-
params={props.params}
334-
pr={pr}
335-
/>
336-
) : null}
337328
</View>
338329
);
339330
}
@@ -418,6 +409,7 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
418409
const terminology = sourceControlClients.get(identity?.provider).changeRequest;
419410
const permissions = usePullRequestPermissions(params, pr);
420411
const action = usePullRequestAction(params, pr);
412+
const maintainerEdits = usePullRequestMaintainerEdits(params, pr);
421413
const showsDeleteBranch = pr !== null && canPerformPullRequestAction(pr, "delete-branch");
422414
const confirmDeleteBranch = () =>
423415
pr &&
@@ -519,6 +511,19 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
519511
},
520512
]
521513
: []),
514+
...(maintainerEdits.visible
515+
? [
516+
{
517+
accessibilityLabel: "Allow edits from maintainers",
518+
icon: "pencil" as const,
519+
selected: maintainerEdits.value,
520+
disabled: maintainerEdits.disabled,
521+
subtitle: maintainerEdits.subtitle,
522+
overflowOnly: true,
523+
onPress: maintainerEdits.toggle,
524+
},
525+
]
526+
: []),
522527
...(identity
523528
? [
524529
{
@@ -599,6 +604,17 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
599604
<Toolbar.Label>Edit description</Toolbar.Label>
600605
</Toolbar.MenuAction>
601606
) : null}
607+
{maintainerEdits.visible ? (
608+
<Toolbar.MenuAction
609+
icon="pencil"
610+
isOn={maintainerEdits.value}
611+
disabled={maintainerEdits.disabled}
612+
subtitle={maintainerEdits.subtitle}
613+
onPress={maintainerEdits.toggle}
614+
>
615+
<Toolbar.Label>Allow edits from maintainers</Toolbar.Label>
616+
</Toolbar.MenuAction>
617+
) : null}
602618
{identity ? (
603619
<Toolbar.MenuAction
604620
icon="arrow.up.right"
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import { useAtomRefresh } from "@effect/atom-react";
2+
import type { PullRequestDetail } from "@t3tools/contracts";
3+
import { AsyncResult } from "effect/reactivity";
4+
import { useRef, useState } from "react";
5+
import * as Dialog from "../../components/ui/Dialog";
6+
import { composerPullRequests } from "../../state/pull-requests";
7+
import { useAtomCommand } from "../../state/use-atom-command";
8+
import { pullRequestTarget, type PullRequestParams } from "./usePullRequestDiff";
9+
import { usePullRequestPermissions } from "./usePullRequestPermissions";
10+
11+
export function usePullRequestMaintainerEdits(
12+
params: PullRequestParams,
13+
pr: PullRequestDetail | null,
14+
) {
15+
const target = pullRequestTarget(params);
16+
const permissions = usePullRequestPermissions(params, pr);
17+
const update = useAtomCommand(composerPullRequests.update, { reportFailure: false });
18+
const refresh = useAtomRefresh(composerPullRequests.detail(target));
19+
const key = `${pr?.url}:${pr?.maintainerCanModify}`;
20+
const [selection, setSelection] = useState({ key, value: pr?.maintainerCanModify ?? false });
21+
if (selection.key !== key) {
22+
setSelection({ key, value: pr?.maintainerCanModify ?? false });
23+
}
24+
const value = selection.key === key ? selection.value : (pr?.maintainerCanModify ?? false);
25+
const [saving, setSaving] = useState(false);
26+
const inFlight = useRef(false);
27+
const visible =
28+
pr?.capabilities.edit?.maintainerEdits === true &&
29+
pr.viewerPermissions.maintainerEdits === true &&
30+
pr.maintainerCanModify !== undefined;
31+
const save = async (next: boolean) => {
32+
if (!visible || !permissions.canEditChangeRequest || inFlight.current) return;
33+
const previous = value;
34+
inFlight.current = true;
35+
setSaving(true);
36+
setSelection({ key, value: next });
37+
const result = await update({
38+
...target,
39+
input: { ...target.input, maintainerCanModify: next },
40+
});
41+
inFlight.current = false;
42+
setSaving(false);
43+
if (AsyncResult.isFailure(result)) {
44+
setSelection({ key, value: previous });
45+
Dialog.alert("Could not save maintainer access", "Try again.");
46+
return;
47+
}
48+
refresh();
49+
};
50+
51+
return {
52+
visible,
53+
value,
54+
disabled: !permissions.canEditChangeRequest || saving,
55+
subtitle: saving
56+
? "Saving…"
57+
: "Maintainers can push to this branch and access fork workflow secrets.",
58+
toggle: () => void save(!value),
59+
};
60+
}

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

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import {
4444
} from "./pullRequestDetail.logic";
4545
import { PullRequestGlyph } from "./pullRequestIcons";
4646
import type { PickableEnvironment } from "./pullRequestProjectAssignment.logic";
47+
import { PullRequestMaintainerEdits } from "./PullRequestMaintainerEdits";
4748
import { PullRequestThreadLinks } from "./PullRequestThreadLinks";
4849
import { useInlineActionConfirm } from "./useInlineActionConfirm";
4950

@@ -83,6 +84,8 @@ export function PullRequestActionsMenu({
8384
onSelectMergeMethod,
8485
showsDeleteBranch,
8586
environmentConnected,
87+
canWriteSourceControl,
88+
onMaintainerEditsSaved,
8689
confirmDeleteBranch,
8790
pendingAction,
8891
perform,
@@ -92,7 +95,16 @@ export function PullRequestActionsMenu({
9295
environmentId: EnvironmentId;
9396
reference: PullRequestRef;
9497
pullRequestKey: string;
95-
detail: Pick<PullRequestDetail, "url" | "state" | "isDraft" | "headBranch">;
98+
detail: Pick<
99+
PullRequestDetail,
100+
| "url"
101+
| "state"
102+
| "isDraft"
103+
| "headBranch"
104+
| "capabilities"
105+
| "viewerPermissions"
106+
| "maintainerCanModify"
107+
>;
96108
terminology: ChangeRequestTerminology;
97109
linkThreadRef: ScopedThreadRef | null;
98110
onThreadPickerOpenChange: (open: boolean) => void;
@@ -123,6 +135,8 @@ export function PullRequestActionsMenu({
123135
onSelectMergeMethod: (method: PullRequestMergeMethod) => void;
124136
showsDeleteBranch: boolean;
125137
environmentConnected: boolean;
138+
canWriteSourceControl: boolean;
139+
onMaintainerEditsSaved: () => void;
126140
confirmDeleteBranch: () => Promise<void>;
127141
pendingAction: PullRequestAction | null;
128142
perform: PerformPullRequestAction;
@@ -132,6 +146,10 @@ export function PullRequestActionsMenu({
132146
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
133147
const inlineConfirm = useInlineActionConfirm(pullRequestKey);
134148
const actionPending = pendingAction !== null;
149+
const showsMaintainerEdits =
150+
detail.capabilities.edit?.maintainerEdits === true &&
151+
detail.viewerPermissions.maintainerEdits === true &&
152+
detail.maintainerCanModify !== undefined;
135153
return (
136154
<Menu>
137155
<Tooltip>
@@ -164,7 +182,7 @@ export function PullRequestActionsMenu({
164182
: `More ${terminology.singular} actions`}
165183
</TooltipPopup>
166184
</Tooltip>
167-
<MenuPopup align="end" side="bottom">
185+
<MenuPopup align="end" side="bottom" keepMounted={showsMaintainerEdits}>
168186
<PullRequestThreadLinks
169187
display="menu-item"
170188
environmentId={environmentId}
@@ -218,6 +236,19 @@ export function PullRequestActionsMenu({
218236
/>
219237
) : null}
220238
<MenuSeparator />
239+
{showsMaintainerEdits && detail.maintainerCanModify !== undefined ? (
240+
<>
241+
<PullRequestMaintainerEdits
242+
key={`${detail.url}:${detail.maintainerCanModify}`}
243+
environmentId={environmentId}
244+
reference={reference}
245+
enabled={detail.maintainerCanModify}
246+
allowed={canWriteSourceControl && environmentConnected}
247+
onSaved={onMaintainerEditsSaved}
248+
/>
249+
<MenuSeparator />
250+
</>
251+
) : null}
221252
{detail.state === "open" ? (
222253
<>
223254
{showsDraftToggle ? (

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1379,6 +1379,8 @@ export function PullRequestDetailPanel({
13791379
onSelectMergeMethod={selectMergeMethod}
13801380
showsDeleteBranch={showsDeleteBranch}
13811381
environmentConnected={environmentConnected}
1382+
canWriteSourceControl={canWriteSourceControl}
1383+
onMaintainerEditsSaved={refreshDetail}
13821384
confirmDeleteBranch={confirmDeleteBranch}
13831385
pendingAction={pendingAction}
13841386
perform={perform}
@@ -1732,7 +1734,6 @@ export function PullRequestDetailPanel({
17321734
detail={detail}
17331735
activityPending={activityPending}
17341736
checksStale={checksStale}
1735-
canWriteSourceControl={canWriteSourceControl && environmentConnected}
17361737
activityError={activityError}
17371738
pendingFinding={handoff}
17381739
fixFindingLabel={handoffLabels.fixFinding}

0 commit comments

Comments
 (0)