Skip to content

Commit b148cac

Browse files
committed
fix(review): preserve upstream review behavior after rebase
1 parent b69bd8e commit b148cac

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import {
4545
PanelRightIcon,
4646
PlayIcon,
4747
RotateCcwIcon,
48+
Trash2Icon,
4849
TriangleAlertIcon,
4950
} from "lucide-react";
5051
import {

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,10 @@ export function PullRequestReviewForm({
136136
const canSubmit = (verdict: PullRequestReviewVerdict, summary: string) =>
137137
verdict === "request-changes" && requestChangesSummaryRequired
138138
? summary.trim().length > 0
139-
: verdict === "approve" || summary.trim().length > 0 || comments.length > 0 || pendingReviewId !== undefined;
139+
: verdict === "approve" ||
140+
summary.trim().length > 0 ||
141+
comments.length > 0 ||
142+
pendingReviewId !== undefined;
140143
// The placeholder asks for exactly what the submit button is waiting on.
141144
const placeholder =
142145
selectedVerdict === undefined || canSubmit(selectedVerdict.value, "")
@@ -159,7 +162,7 @@ export function PullRequestReviewForm({
159162
<PullRequestAttachments
160163
environmentId={environmentId}
161164
reference={reference}
162-
disabled={pending || uploading || draftBusy}
165+
disabled={pending}
163166
onBusyChange={setUploading}
164167
textareaRef={textareaRef}
165168
onTextChange={(text) => setSummary(reviewKey, text)}
@@ -194,7 +197,11 @@ export function PullRequestReviewForm({
194197
<Button
195198
size="xs"
196199
disabled={
197-
pending || uploading || draftBusy || selectedVerdict === undefined || !canSubmit(selectedVerdict.value, body)
200+
pending ||
201+
uploading ||
202+
draftBusy ||
203+
selectedVerdict === undefined ||
204+
!canSubmit(selectedVerdict.value, body)
198205
}
199206
onClick={() => {
200207
if (selectedVerdict !== undefined) void submit(selectedVerdict);

0 commit comments

Comments
 (0)