diff --git a/apps/dashboard/src/components/details/detail-activity.tsx b/apps/dashboard/src/components/details/detail-activity.tsx index 8b1547c..3162a08 100644 --- a/apps/dashboard/src/components/details/detail-activity.tsx +++ b/apps/dashboard/src/components/details/detail-activity.tsx @@ -1,4 +1,8 @@ -import { CommentIcon } from "@diffkit/icons"; +import { + CommentIcon, + GitPullRequestClosedIcon, + GitPullRequestIcon, +} from "@diffkit/icons"; import { MarkdownEditor, type MentionCandidate, @@ -7,7 +11,7 @@ import { toast } from "@diffkit/ui/components/sonner"; import { Spinner } from "@diffkit/ui/components/spinner"; import { useQuery, useQueryClient } from "@tanstack/react-query"; import { useMemo, useState } from "react"; -import { createComment } from "#/lib/github.functions"; +import { createComment, updatePullState } from "#/lib/github.functions"; import { type GitHubQueryScope, githubQueryKeys, @@ -42,15 +46,18 @@ export function DetailCommentBox({ issueNumber, scope, involvedUsers, + pullState, }: { owner: string; repo: string; issueNumber: number; scope: GitHubQueryScope; involvedUsers?: GitHubActor[]; + pullState?: "open" | "closed"; }) { const [value, setValue] = useState(""); const [isSending, setIsSending] = useState(false); + const [isTogglingState, setIsTogglingState] = useState(false); const [mentionActivated, setMentionActivated] = useState(false); const queryClient = useQueryClient(); @@ -121,6 +128,42 @@ export function DetailCommentBox({ } }; + const handleTogglePullState = async () => { + if (!pullState) return; + const newState = pullState === "open" ? "closed" : "open"; + setIsTogglingState(true); + try { + if (value.trim()) { + await createComment({ + data: { owner, repo, issueNumber, body: value.trim() }, + }); + setValue(""); + } + const result = await updatePullState({ + data: { + owner, + repo, + pullNumber: issueNumber, + state: newState, + }, + }); + if (result.ok) { + void queryClient.invalidateQueries({ + queryKey: githubQueryKeys.all, + }); + } else { + toast.error(result.error); + checkPermissionWarning(result, `${owner}/${repo}`); + } + } catch { + toast.error( + `Failed to ${pullState === "open" ? "close" : "reopen"} pull request`, + ); + } finally { + setIsTogglingState(false); + } + }; + return (
-
+
+ {pullState && ( + + )}
)} @@ -250,6 +252,11 @@ export function PullDetailActivitySection({ issueNumber={pullNumber} scope={scope} involvedUsers={getInvolvedUsers(pr, comments)} + pullState={ + !pr.isMerged && (pr.state === "open" || pr.state === "closed") + ? pr.state + : undefined + } />
@@ -294,11 +301,15 @@ function MergeStatusSection({ owner, repo, pullNumber, + prTitle, + firstCommitMessage, }: { scope: GitHubQueryScope; owner: string; repo: string; pullNumber: number; + prTitle: string; + firstCommitMessage?: string; }) { const statusQuery = useQuery({ ...githubPullStatusQueryOptions(scope, { owner, repo, pullNumber }), @@ -314,6 +325,8 @@ function MergeStatusSection({ owner={owner} repo={repo} pullNumber={pullNumber} + prTitle={prTitle} + firstCommitMessage={firstCommitMessage} /> ); } @@ -408,11 +421,15 @@ function MergeStatusCard({ owner, repo, pullNumber, + prTitle, + firstCommitMessage, }: { status: PullStatus; owner: string; repo: string; pullNumber: number; + prTitle: string; + firstCommitMessage?: string; }) { const { checks, @@ -444,12 +461,7 @@ function MergeStatusCard({ const bypass = useMergeBypass({ isMergeBlocked, canBypassProtections, - hasCheckFailures, - hasReviewIssue, hasConflicts, - isBehind, - allChecksPassed, - totalChecks: checks.total, }); return ( @@ -508,6 +520,8 @@ function MergeStatusCard({ owner={owner} repo={repo} pullNumber={pullNumber} + prTitle={prTitle} + firstCommitMessage={firstCommitMessage} /> ); @@ -585,6 +599,11 @@ function ReviewsSection({ + {allReviews.length === 0 && ( +
+

No reviewers added

+
+ )} {allReviews.length > 0 && (
{allReviews.map((review) => ( @@ -1009,6 +1028,8 @@ function MergeFooter({ owner, repo, pullNumber, + prTitle, + firstCommitMessage, }: { isMergeBlocked: boolean; canMerge: boolean; @@ -1016,17 +1037,37 @@ function MergeFooter({ owner: string; repo: string; pullNumber: number; + prTitle: string; + firstCommitMessage?: string; }) { const [mergeMethod, setMergeMethod] = useState<"merge" | "squash" | "rebase">( "squash", ); const [isMerging, setIsMerging] = useState(false); + const [showCommitForm, setShowCommitForm] = useState(false); + const [commitTitle, setCommitTitle] = useState(""); + const [commitDescription, setCommitDescription] = useState(""); const queryClient = useQueryClient(); const currentStrategy = MERGE_STRATEGIES.find((s) => s.value === mergeMethod) ?? MERGE_STRATEGIES[0]; + const getDefaultCommitTitle = useCallback(() => { + if (mergeMethod === "squash") { + return ( + firstCommitMessage?.split("\n")[0] ?? `${prTitle} (#${pullNumber})` + ); + } + return `Merge pull request #${pullNumber}`; + }, [mergeMethod, firstCommitMessage, prTitle, pullNumber]); + + const openCommitForm = () => { + setCommitTitle(getDefaultCommitTitle()); + setCommitDescription(""); + setShowCommitForm(true); + }; + const handleMerge = async () => { setIsMerging(true); try { @@ -1037,6 +1078,8 @@ function MergeFooter({ pullNumber, mergeMethod, bypassProtections: bypass.shouldBypass, + commitTitle: commitTitle || undefined, + commitMessage: commitDescription || undefined, }, }); if (result.ok) { @@ -1055,6 +1098,65 @@ function MergeFooter({ const isDisabled = !canMerge || (isMergeBlocked && !bypass.shouldBypass) || isMerging; + if (!canMerge) return null; + + if (showCommitForm) { + return ( +
+
+ + setCommitTitle(e.target.value)} + className="flex h-9 w-full rounded-md border bg-transparent px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring" + /> +
+
+ +