mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-01 20:23:36 +00:00
Security fixes:
- Enhanced branch name sanitization for cross-platform filesystem safety
(handles Windows-invalid chars, reserved names, path length limits)
- Added branch name validation in pr-info.ts to prevent command injection
- Sanitized prUrl in kanban-card to only allow http/https URLs
Code quality improvements:
- Fixed placeholder issue where {owner}/{repo} was passed literally to gh api
- Replaced async forEach with Promise.all for proper async handling
- Display PR number extracted from URL in kanban cards
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
406 lines
15 KiB
TypeScript
406 lines
15 KiB
TypeScript
|
|
import { useState, useEffect, useRef } from "react";
|
|
import {
|
|
Dialog,
|
|
DialogContent,
|
|
DialogDescription,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogTitle,
|
|
} from "@/components/ui/dialog";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Input } from "@/components/ui/input";
|
|
import { Textarea } from "@/components/ui/textarea";
|
|
import { Label } from "@/components/ui/label";
|
|
import { Checkbox } from "@/components/ui/checkbox";
|
|
import { GitPullRequest, Loader2, ExternalLink } from "lucide-react";
|
|
import { getElectronAPI } from "@/lib/electron";
|
|
import { toast } from "sonner";
|
|
|
|
interface WorktreeInfo {
|
|
path: string;
|
|
branch: string;
|
|
isMain: boolean;
|
|
hasChanges?: boolean;
|
|
changedFilesCount?: number;
|
|
}
|
|
|
|
interface CreatePRDialogProps {
|
|
open: boolean;
|
|
onOpenChange: (open: boolean) => void;
|
|
worktree: WorktreeInfo | null;
|
|
projectPath: string | null;
|
|
onCreated: (prUrl?: string) => void;
|
|
}
|
|
|
|
export function CreatePRDialog({
|
|
open,
|
|
onOpenChange,
|
|
worktree,
|
|
projectPath,
|
|
onCreated,
|
|
}: CreatePRDialogProps) {
|
|
const [title, setTitle] = useState("");
|
|
const [body, setBody] = useState("");
|
|
const [baseBranch, setBaseBranch] = useState("main");
|
|
const [commitMessage, setCommitMessage] = useState("");
|
|
const [isDraft, setIsDraft] = useState(false);
|
|
const [isLoading, setIsLoading] = useState(false);
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [prUrl, setPrUrl] = useState<string | null>(null);
|
|
const [browserUrl, setBrowserUrl] = useState<string | null>(null);
|
|
const [showBrowserFallback, setShowBrowserFallback] = useState(false);
|
|
// Track whether an operation completed that warrants a refresh
|
|
const operationCompletedRef = useRef(false);
|
|
|
|
// Reset state when dialog opens or worktree changes
|
|
useEffect(() => {
|
|
if (open) {
|
|
// Reset form fields
|
|
setTitle("");
|
|
setBody("");
|
|
setCommitMessage("");
|
|
setBaseBranch("main");
|
|
setIsDraft(false);
|
|
setError(null);
|
|
// Also reset result states when opening for a new worktree
|
|
// This prevents showing stale PR URLs from previous worktrees
|
|
setPrUrl(null);
|
|
setBrowserUrl(null);
|
|
setShowBrowserFallback(false);
|
|
// Reset operation tracking
|
|
operationCompletedRef.current = false;
|
|
} else {
|
|
// Reset everything when dialog closes
|
|
setTitle("");
|
|
setBody("");
|
|
setCommitMessage("");
|
|
setBaseBranch("main");
|
|
setIsDraft(false);
|
|
setError(null);
|
|
setPrUrl(null);
|
|
setBrowserUrl(null);
|
|
setShowBrowserFallback(false);
|
|
operationCompletedRef.current = false;
|
|
}
|
|
}, [open, worktree?.path]);
|
|
|
|
const handleCreate = async () => {
|
|
if (!worktree) return;
|
|
|
|
setIsLoading(true);
|
|
setError(null);
|
|
|
|
try {
|
|
const api = getElectronAPI();
|
|
if (!api?.worktree?.createPR) {
|
|
setError("Worktree API not available");
|
|
return;
|
|
}
|
|
const result = await api.worktree.createPR(worktree.path, {
|
|
projectPath: projectPath || undefined,
|
|
commitMessage: commitMessage || undefined,
|
|
prTitle: title || worktree.branch,
|
|
prBody: body || `Changes from branch ${worktree.branch}`,
|
|
baseBranch,
|
|
draft: isDraft,
|
|
});
|
|
|
|
if (result.success && result.result) {
|
|
if (result.result.prCreated && result.result.prUrl) {
|
|
setPrUrl(result.result.prUrl);
|
|
// Mark operation as completed for refresh on close
|
|
operationCompletedRef.current = true;
|
|
|
|
// Show different message based on whether PR already existed
|
|
if (result.result.prAlreadyExisted) {
|
|
toast.success("Pull request found!", {
|
|
description: `PR already exists for ${result.result.branch}`,
|
|
action: {
|
|
label: "View PR",
|
|
onClick: () => window.open(result.result!.prUrl!, "_blank"),
|
|
},
|
|
});
|
|
} else {
|
|
toast.success("Pull request created!", {
|
|
description: `PR created from ${result.result.branch}`,
|
|
action: {
|
|
label: "View PR",
|
|
onClick: () => window.open(result.result!.prUrl!, "_blank"),
|
|
},
|
|
});
|
|
}
|
|
// Don't call onCreated() here - keep dialog open to show success message
|
|
// onCreated() will be called when user closes the dialog
|
|
} else {
|
|
// Branch was pushed successfully
|
|
const prError = result.result.prError;
|
|
const hasBrowserUrl = !!result.result.browserUrl;
|
|
|
|
// Check if we should show browser fallback
|
|
if (!result.result.prCreated && hasBrowserUrl) {
|
|
// If gh CLI is not available, show browser fallback UI
|
|
if (prError === "gh_cli_not_available" || !result.result.ghCliAvailable) {
|
|
setBrowserUrl(result.result.browserUrl ?? null);
|
|
setShowBrowserFallback(true);
|
|
// Mark operation as completed - branch was pushed successfully
|
|
operationCompletedRef.current = true;
|
|
toast.success("Branch pushed", {
|
|
description: result.result.committed
|
|
? `Commit ${result.result.commitHash} pushed to ${result.result.branch}`
|
|
: `Branch ${result.result.branch} pushed`,
|
|
});
|
|
// Don't call onCreated() here - we want to keep the dialog open to show the browser URL
|
|
setIsLoading(false);
|
|
return; // Don't close dialog, show browser fallback UI
|
|
}
|
|
|
|
// gh CLI is available but failed - show error with browser option
|
|
if (prError) {
|
|
// Parse common gh CLI errors for better messages
|
|
let errorMessage = prError;
|
|
if (prError.includes("No commits between")) {
|
|
errorMessage = "No new commits to create PR. Make sure your branch has changes compared to the base branch.";
|
|
} else if (prError.includes("already exists")) {
|
|
errorMessage = "A pull request already exists for this branch.";
|
|
} else if (prError.includes("not logged in") || prError.includes("auth")) {
|
|
errorMessage = "GitHub CLI not authenticated. Run 'gh auth login' in terminal.";
|
|
}
|
|
|
|
// Show error but also provide browser option
|
|
setBrowserUrl(result.result.browserUrl ?? null);
|
|
setShowBrowserFallback(true);
|
|
// Mark operation as completed - branch was pushed even though PR creation failed
|
|
operationCompletedRef.current = true;
|
|
toast.error("PR creation failed", {
|
|
description: errorMessage,
|
|
duration: 8000,
|
|
});
|
|
// Don't call onCreated() here - we want to keep the dialog open to show the browser URL
|
|
setIsLoading(false);
|
|
return;
|
|
}
|
|
}
|
|
|
|
// Show success toast for push
|
|
toast.success("Branch pushed", {
|
|
description: result.result.committed
|
|
? `Commit ${result.result.commitHash} pushed to ${result.result.branch}`
|
|
: `Branch ${result.result.branch} pushed`,
|
|
});
|
|
|
|
// No browser URL available, just close
|
|
if (!result.result.prCreated) {
|
|
if (!hasBrowserUrl) {
|
|
toast.info("PR not created", {
|
|
description: "Could not determine repository URL. GitHub CLI (gh) may not be installed or authenticated.",
|
|
duration: 8000,
|
|
});
|
|
}
|
|
}
|
|
onCreated();
|
|
onOpenChange(false);
|
|
}
|
|
} else {
|
|
setError(result.error || "Failed to create pull request");
|
|
}
|
|
} catch (err) {
|
|
setError(err instanceof Error ? err.message : "Failed to create PR");
|
|
} finally {
|
|
setIsLoading(false);
|
|
}
|
|
};
|
|
|
|
const handleClose = () => {
|
|
// Only call onCreated() if an actual operation completed
|
|
// This prevents unnecessary refreshes when user cancels
|
|
if (operationCompletedRef.current) {
|
|
// Pass the PR URL if one was created
|
|
onCreated(prUrl || undefined);
|
|
}
|
|
onOpenChange(false);
|
|
// State reset is handled by useEffect when open becomes false
|
|
};
|
|
|
|
if (!worktree) return null;
|
|
|
|
const shouldShowBrowserFallback = showBrowserFallback && browserUrl;
|
|
|
|
return (
|
|
<Dialog open={open} onOpenChange={handleClose}>
|
|
<DialogContent className="sm:max-w-[550px]">
|
|
<DialogHeader>
|
|
<DialogTitle className="flex items-center gap-2">
|
|
<GitPullRequest className="w-5 h-5" />
|
|
Create Pull Request
|
|
</DialogTitle>
|
|
<DialogDescription>
|
|
Push changes and create a pull request from{" "}
|
|
<code className="font-mono bg-muted px-1 rounded">
|
|
{worktree.branch}
|
|
</code>
|
|
</DialogDescription>
|
|
</DialogHeader>
|
|
|
|
{prUrl ? (
|
|
<div className="py-6 text-center space-y-4">
|
|
<div className="inline-flex items-center justify-center w-16 h-16 rounded-full bg-green-500/10">
|
|
<GitPullRequest className="w-8 h-8 text-green-500" />
|
|
</div>
|
|
<div>
|
|
<h3 className="text-lg font-semibold">Pull Request Created!</h3>
|
|
<p className="text-sm text-muted-foreground mt-1">
|
|
Your PR is ready for review
|
|
</p>
|
|
</div>
|
|
<div className="flex gap-2 justify-center">
|
|
<Button
|
|
onClick={() => window.open(prUrl, "_blank")}
|
|
className="gap-2"
|
|
>
|
|
<ExternalLink className="w-4 h-4" />
|
|
View Pull Request
|
|
</Button>
|
|
<Button variant="outline" onClick={handleClose}>
|
|
Close
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
) : shouldShowBrowserFallback ? (
|
|
<div className="py-6 text-center space-y-4">
|
|
<div className="inline-flex items-center justify-center w-16 h-16 rounded-full bg-blue-500/10">
|
|
<GitPullRequest className="w-8 h-8 text-blue-500" />
|
|
</div>
|
|
<div>
|
|
<h3 className="text-lg font-semibold">Branch Pushed!</h3>
|
|
<p className="text-sm text-muted-foreground mt-1">
|
|
Your changes have been pushed to GitHub.
|
|
<br />
|
|
Click below to create a pull request in your browser.
|
|
</p>
|
|
</div>
|
|
<div className="space-y-3">
|
|
<Button
|
|
onClick={() => {
|
|
if (browserUrl) {
|
|
window.open(browserUrl, "_blank");
|
|
}
|
|
}}
|
|
className="gap-2 w-full"
|
|
size="lg"
|
|
>
|
|
<ExternalLink className="w-4 h-4" />
|
|
Create PR in Browser
|
|
</Button>
|
|
<div className="p-2 bg-muted rounded text-xs break-all font-mono">
|
|
{browserUrl}
|
|
</div>
|
|
<p className="text-xs text-muted-foreground">
|
|
Tip: Install the GitHub CLI (<code className="bg-muted px-1 rounded">gh</code>) to create PRs directly from the app
|
|
</p>
|
|
<DialogFooter className="mt-4">
|
|
<Button variant="outline" onClick={handleClose}>
|
|
Close
|
|
</Button>
|
|
</DialogFooter>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<>
|
|
<div className="grid gap-4 py-4">
|
|
{worktree.hasChanges && (
|
|
<div className="grid gap-2">
|
|
<Label htmlFor="commit-message">
|
|
Commit Message{" "}
|
|
<span className="text-muted-foreground">(optional)</span>
|
|
</Label>
|
|
<Input
|
|
id="commit-message"
|
|
placeholder="Leave empty to auto-generate"
|
|
value={commitMessage}
|
|
onChange={(e) => setCommitMessage(e.target.value)}
|
|
className="font-mono text-sm"
|
|
/>
|
|
<p className="text-xs text-muted-foreground">
|
|
{worktree.changedFilesCount} uncommitted file(s) will be
|
|
committed
|
|
</p>
|
|
</div>
|
|
)}
|
|
|
|
<div className="grid gap-2">
|
|
<Label htmlFor="pr-title">PR Title</Label>
|
|
<Input
|
|
id="pr-title"
|
|
placeholder={worktree.branch}
|
|
value={title}
|
|
onChange={(e) => setTitle(e.target.value)}
|
|
/>
|
|
</div>
|
|
|
|
<div className="grid gap-2">
|
|
<Label htmlFor="pr-body">Description</Label>
|
|
<Textarea
|
|
id="pr-body"
|
|
placeholder="Describe the changes in this PR..."
|
|
value={body}
|
|
onChange={(e) => setBody(e.target.value)}
|
|
className="min-h-[80px]"
|
|
/>
|
|
</div>
|
|
|
|
<div className="grid grid-cols-2 gap-4">
|
|
<div className="grid gap-2">
|
|
<Label htmlFor="base-branch">Base Branch</Label>
|
|
<Input
|
|
id="base-branch"
|
|
placeholder="main"
|
|
value={baseBranch}
|
|
onChange={(e) => setBaseBranch(e.target.value)}
|
|
className="font-mono text-sm"
|
|
/>
|
|
</div>
|
|
<div className="flex items-end">
|
|
<div className="flex items-center space-x-2">
|
|
<Checkbox
|
|
id="draft"
|
|
checked={isDraft}
|
|
onCheckedChange={(checked) => setIsDraft(checked === true)}
|
|
/>
|
|
<Label htmlFor="draft" className="cursor-pointer">
|
|
Create as draft
|
|
</Label>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
{error && (
|
|
<p className="text-sm text-destructive">{error}</p>
|
|
)}
|
|
</div>
|
|
|
|
<DialogFooter>
|
|
<Button variant="ghost" onClick={handleClose} disabled={isLoading}>
|
|
Cancel
|
|
</Button>
|
|
<Button onClick={handleCreate} disabled={isLoading}>
|
|
{isLoading ? (
|
|
<>
|
|
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
|
|
Creating...
|
|
</>
|
|
) : (
|
|
<>
|
|
<GitPullRequest className="w-4 h-4 mr-2" />
|
|
Create PR
|
|
</>
|
|
)}
|
|
</Button>
|
|
</DialogFooter>
|
|
</>
|
|
)}
|
|
</DialogContent>
|
|
</Dialog>
|
|
);
|
|
}
|