Skip to content

Confirm before running git init #1318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adinschmidt wants to merge 1 commit into
base: main
Choose a base branch
from
+44 −8
Open

Confirm before running git init #1318

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 44 additions & 8 deletions apps/web/src/components/GitActionsControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ import {
import { useAppSettings } from "~/appSettings";
import { Button } from "~/components/ui/button";
import { Checkbox } from "~/components/ui/checkbox";
import {
AlertDialog,
AlertDialogClose,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogPopup,
AlertDialogTitle,
} from "~/components/ui/alert-dialog";
import {
Dialog,
DialogDescription,
Expand Down Expand Up @@ -161,6 +170,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
[activeThreadId],
);
const queryClient = useQueryClient();
const [confirmInitOpen, setConfirmInitOpen] = useState(false);
const [isCommitDialogOpen, setIsCommitDialogOpen] = useState(false);
const [dialogCommitMessage, setDialogCommitMessage] = useState("");
const [excludedFiles, setExcludedFiles] = useState<ReadonlySet<string>>(new Set());
Expand Down Expand Up @@ -632,19 +642,45 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
[gitCwd, threadToastData],
);

const confirmGitInit = useCallback(() => {
if (initMutation.isPending) return;
setConfirmInitOpen(false);
initMutation.mutate();
}, [initMutation]);

if (!gitCwd) return null;

return (
<>
{!isRepo ? (
<Button
variant="outline"
size="xs"
disabled={initMutation.isPending}
onClick={() => initMutation.mutate()}
>
{initMutation.isPending ? "Initializing..." : "Initialize Git"}
</Button>
<>
<Button
variant="outline"
size="xs"
disabled={initMutation.isPending}
onClick={() => setConfirmInitOpen(true)}
>
{initMutation.isPending ? "Initializing..." : "Initialize Git"}
</Button>
<AlertDialog open={confirmInitOpen} onOpenChange={setConfirmInitOpen}>
<AlertDialogPopup>
<AlertDialogHeader>
<AlertDialogTitle>Initialize Git repository?</AlertDialogTitle>
<AlertDialogDescription>
This will run{" "}
<code className="rounded bg-muted px-1 py-0.5 text-xs">git init</code> in{" "}
<code className="rounded bg-muted px-1 py-0.5 text-xs break-all">{gitCwd}</code>
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
<Button disabled={initMutation.isPending} onClick={confirmGitInit}>
Initialize
</Button>
</AlertDialogFooter>
</AlertDialogPopup>
</AlertDialog>
</>
) : (
<Group aria-label="Git actions">
{quickActionDisabledReason ? (
Expand Down