Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions apps/web/src/components/ChatView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1580,6 +1580,36 @@ export default function ChatView({ threadId }: ChatViewProps) {
},
[activeProject, persistProjectScripts],
);
const deleteProjectScript = useCallback(
async (scriptId: string) => {
if (!activeProject) return;
const nextScripts = activeProject.scripts.filter((script) => script.id !== scriptId);

const deletedName = activeProject.scripts.find((s) => s.id === scriptId)?.name;

try {
await persistProjectScripts({
projectId: activeProject.id,
projectCwd: activeProject.cwd,
previousScripts: activeProject.scripts,
nextScripts,
keybinding: null,
keybindingCommand: commandForProjectScript(scriptId),
});
toastManager.add({
type: "success",
title: `Deleted action "${deletedName ?? "Unknown"}"`,
});
} catch (error) {
toastManager.add({
type: "error",
title: "Could not delete action",
description: error instanceof Error ? error.message : "An unexpected error occurred.",
});
}
},
[activeProject, persistProjectScripts],
);

const handleRuntimeModeChange = useCallback(
(mode: RuntimeMode) => {
Expand Down Expand Up @@ -3338,6 +3368,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
}}
onAddProjectScript={saveProjectScript}
onUpdateProjectScript={updateProjectScript}
onDeleteProjectScript={deleteProjectScript}
onToggleDiff={onToggleDiff}
/>
</header>
Expand Down Expand Up @@ -3914,6 +3945,7 @@ interface ChatHeaderProps {
onRunProjectScript: (script: ProjectScript) => void;
onAddProjectScript: (input: NewProjectScriptInput) => Promise<void>;
onUpdateProjectScript: (scriptId: string, input: NewProjectScriptInput) => Promise<void>;
onDeleteProjectScript: (scriptId: string) => Promise<void>;
onToggleDiff: () => void;
}

Expand All @@ -3932,6 +3964,7 @@ const ChatHeader = memo(function ChatHeader({
onRunProjectScript,
onAddProjectScript,
onUpdateProjectScript,
onDeleteProjectScript,
onToggleDiff,
}: ChatHeaderProps) {
return (
Expand Down Expand Up @@ -3959,6 +3992,7 @@ const ChatHeader = memo(function ChatHeader({
onRunScript={onRunProjectScript}
onAddScript={onAddProjectScript}
onUpdateScript={onUpdateProjectScript}
onDeleteScript={onDeleteProjectScript}
/>
)}
{activeProjectName && (
Expand Down
46 changes: 45 additions & 1 deletion apps/web/src/components/ProjectScriptsControl.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
SettingsIcon,
WrenchIcon,
} from "lucide-react";
import React, { type FormEvent, type KeyboardEvent, useMemo, useState } from "react";
import React, { type FormEvent, type KeyboardEvent, useCallback, useMemo, useState } from "react";

import {
keybindingValueForCommand,
Expand All @@ -27,6 +27,15 @@ import {
} from "~/projectScripts";
import { shortcutLabelForCommand } from "~/keybindings";
import { isMacPlatform } from "~/lib/utils";
import {
AlertDialog,
AlertDialogClose,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogPopup,
AlertDialogTitle,
} from "./ui/alert-dialog";
import { Button } from "./ui/button";
import {
Dialog,
Expand Down Expand Up @@ -84,6 +93,7 @@ interface ProjectScriptsControlProps {
onRunScript: (script: ProjectScript) => void;
onAddScript: (input: NewProjectScriptInput) => Promise<void> | void;
onUpdateScript: (scriptId: string, input: NewProjectScriptInput) => Promise<void> | void;
onDeleteScript: (scriptId: string) => Promise<void> | void;
}

function normalizeShortcutKeyToken(key: string): string | null {
Expand Down Expand Up @@ -144,6 +154,7 @@ export default function ProjectScriptsControl({
onRunScript,
onAddScript,
onUpdateScript,
onDeleteScript,
}: ProjectScriptsControlProps) {
const addScriptFormId = React.useId();
const [editingScriptId, setEditingScriptId] = useState<string | null>(null);
Expand All @@ -155,6 +166,7 @@ export default function ProjectScriptsControl({
const [runOnWorktreeCreate, setRunOnWorktreeCreate] = useState(false);
const [keybinding, setKeybinding] = useState("");
const [validationError, setValidationError] = useState<string | null>(null);
const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false);

const primaryScript = useMemo(() => {
if (preferredScriptId) {
Expand Down Expand Up @@ -247,6 +259,13 @@ export default function ProjectScriptsControl({
setDialogOpen(true);
};

const confirmDeleteScript = useCallback(() => {
if (!editingScriptId) return;
setDeleteConfirmOpen(false);
setDialogOpen(false);
void onDeleteScript(editingScriptId);
}, [editingScriptId, onDeleteScript]);

return (
<>
{primaryScript ? (
Expand Down Expand Up @@ -440,6 +459,16 @@ export default function ProjectScriptsControl({
</form>
</DialogPanel>
<DialogFooter>
{isEditing && (
<Button
type="button"
variant="destructive-outline"
className="mr-auto"
onClick={() => setDeleteConfirmOpen(true)}
>
Delete
</Button>
)}
<Button
type="button"
variant="outline"
Expand All @@ -455,6 +484,21 @@ export default function ProjectScriptsControl({
</DialogFooter>
</DialogPopup>
</Dialog>

<AlertDialog open={deleteConfirmOpen} onOpenChange={setDeleteConfirmOpen}>
<AlertDialogPopup>
<AlertDialogHeader>
<AlertDialogTitle>Delete action "{name}"?</AlertDialogTitle>
<AlertDialogDescription>This action cannot be undone.</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
<Button variant="destructive" onClick={confirmDeleteScript}>
Delete action
</Button>
</AlertDialogFooter>
</AlertDialogPopup>
</AlertDialog>
</>
);
}