Adds a delete button to the action edit dialog with a confirmation alert. Fixes pingdotgg/t3code#208.
Unified · Split
| @@ -1621,6 +1621,36 @@ export default function ChatView({ threadId }: ChatViewProps) { · 1620 unmodified lines | ||
| 1621 | 1621 | }, |
| 1622 | 1622 | [activeProject, persistProjectScripts], |
| 1623 | 1623 | ); |
| 1624 | + const deleteProjectScript = useCallback( | |
| 1625 | + async (scriptId: string) => { | |
| 1626 | + if (!activeProject) return; | |
| 1627 | + const nextScripts = activeProject.scripts.filter((script) => script.id !== scriptId); | |
| 1628 | + | |
| 1629 | + const deletedName = activeProject.scripts.find((s) => s.id === scriptId)?.name; | |
| 1630 | + | |
| 1631 | + try { | |
| 1632 | + await persistProjectScripts({ | |
| 1633 | + projectId: activeProject.id, | |
| 1634 | + projectCwd: activeProject.cwd, | |
| 1635 | + previousScripts: activeProject.scripts, | |
| 1636 | + nextScripts, | |
| 1637 | + keybinding: null, | |
| 1638 | + keybindingCommand: commandForProjectScript(scriptId), | |
| 1639 | + }); | |
| 1640 | + toastManager.add({ | |
| 1641 | + type: "success", | |
| 1642 | + title: `Deleted action "${deletedName ?? "Unknown"}"`, | |
| 1643 | + }); | |
| 1644 | + } catch (error) { | |
| 1645 | + toastManager.add({ | |
| 1646 | + type: "error", | |
| 1647 | + title: "Could not delete action", | |
| 1648 | + description: error instanceof Error ? error.message : "An unexpected error occurred.", | |
| 1649 | + }); | |
| 1650 | + } | |
| 1651 | + }, | |
| 1652 | + [activeProject, persistProjectScripts], | |
| 1653 | + ); | |
| 1624 | 1654 | |
| 1625 | 1655 | const handleRuntimeModeChange = useCallback( |
| 1626 | 1656 | (mode: RuntimeMode) => { |
| @@ -3428,6 +3458,7 @@ export default function ChatView({ threadId }: ChatViewProps) { · 1801 unmodified lines | ||
| 3428 | 3458 | }} |
| 3429 | 3459 | onAddProjectScript={saveProjectScript} |
| 3430 | 3460 | onUpdateProjectScript={updateProjectScript} |
| 3461 | + onDeleteProjectScript={deleteProjectScript} | |
| 3431 | 3462 | onToggleDiff={onToggleDiff} |
| 3432 | 3463 | /> |
| 3433 | 3464 | </header> |
| @@ -4008,6 +4039,7 @@ interface ChatHeaderProps { · 574 unmodified lines | ||
| 4008 | 4039 | onRunProjectScript: (script: ProjectScript) => void; |
| 4009 | 4040 | onAddProjectScript: (input: NewProjectScriptInput) => Promise<void>; |
| 4010 | 4041 | onUpdateProjectScript: (scriptId: string, input: NewProjectScriptInput) => Promise<void>; |
| 4042 | + onDeleteProjectScript: (scriptId: string) => Promise<void>; | |
| 4011 | 4043 | onToggleDiff: () => void; |
| 4012 | 4044 | } |
| 4013 | 4045 | |
| @@ -4027,6 +4059,7 @@ const ChatHeader = memo(function ChatHeader({ · 13 unmodified lines | ||
| 4027 | 4059 | onRunProjectScript, |
| 4028 | 4060 | onAddProjectScript, |
| 4029 | 4061 | onUpdateProjectScript, |
| 4062 | + onDeleteProjectScript, | |
| 4030 | 4063 | onToggleDiff, |
| 4031 | 4064 | }: ChatHeaderProps) { |
| 4032 | 4065 | return ( |
| @@ -4059,6 +4092,7 @@ const ChatHeader = memo(function ChatHeader({ · 26 unmodified lines | ||
| 4059 | 4092 | onRunScript={onRunProjectScript} |
| 4060 | 4093 | onAddScript={onAddProjectScript} |
| 4061 | 4094 | onUpdateScript={onUpdateProjectScript} |
| 4095 | + onDeleteScript={onDeleteProjectScript} | |
| 4062 | 4096 | /> |
| 4063 | 4097 | )} |
| 4064 | 4098 | {activeProjectName && ( |
| @@ -14,7 +14,7 @@ import { · 13 unmodified lines | ||
| 14 | 14 | SettingsIcon, |
| 15 | 15 | WrenchIcon, |
| 16 | 16 | } from "lucide-react"; |
| 17 | −import React, { type FormEvent, type KeyboardEvent, useMemo, useState } from "react"; | |
| 17 | +import React, { type FormEvent, type KeyboardEvent, useCallback, useMemo, useState } from "react"; | |
| 18 | 18 | |
| 19 | 19 | import { |
| 20 | 20 | keybindingValueForCommand, |
| @@ -27,6 +27,15 @@ import { · 6 unmodified lines | ||
| 27 | 27 | } from "~/projectScripts"; |
| 28 | 28 | import { shortcutLabelForCommand } from "~/keybindings"; |
| 29 | 29 | import { isMacPlatform } from "~/lib/utils"; |
| 30 | +import { | |
| 31 | + AlertDialog, | |
| 32 | + AlertDialogClose, | |
| 33 | + AlertDialogDescription, | |
| 34 | + AlertDialogFooter, | |
| 35 | + AlertDialogHeader, | |
| 36 | + AlertDialogPopup, | |
| 37 | + AlertDialogTitle, | |
| 38 | +} from "./ui/alert-dialog"; | |
| 30 | 39 | import { Button } from "./ui/button"; |
| 31 | 40 | import { |
| 32 | 41 | Dialog, |
| @@ -84,6 +93,7 @@ interface ProjectScriptsControlProps { · 51 unmodified lines | ||
| 84 | 93 | onRunScript: (script: ProjectScript) => void; |
| 85 | 94 | onAddScript: (input: NewProjectScriptInput) => Promise<void> | void; |
| 86 | 95 | onUpdateScript: (scriptId: string, input: NewProjectScriptInput) => Promise<void> | void; |
| 96 | + onDeleteScript: (scriptId: string) => Promise<void> | void; | |
| 87 | 97 | } |
| 88 | 98 | |
| 89 | 99 | function normalizeShortcutKeyToken(key: string): string | null { |
| @@ -144,6 +154,7 @@ export default function ProjectScriptsControl({ · 54 unmodified lines | ||
| 144 | 154 | onRunScript, |
| 145 | 155 | onAddScript, |
| 146 | 156 | onUpdateScript, |
| 157 | + onDeleteScript, | |
| 147 | 158 | }: ProjectScriptsControlProps) { |
| 148 | 159 | const addScriptFormId = React.useId(); |
| 149 | 160 | const [editingScriptId, setEditingScriptId] = useState<string | null>(null); |
| @@ -155,6 +166,7 @@ export default function ProjectScriptsControl({ · 5 unmodified lines | ||
| 155 | 166 | const [runOnWorktreeCreate, setRunOnWorktreeCreate] = useState(false); |
| 156 | 167 | const [keybinding, setKeybinding] = useState(""); |
| 157 | 168 | const [validationError, setValidationError] = useState<string | null>(null); |
| 169 | + const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false); | |
| 158 | 170 | |
| 159 | 171 | const primaryScript = useMemo(() => { |
| 160 | 172 | if (preferredScriptId) { |
| @@ -247,6 +259,13 @@ export default function ProjectScriptsControl({ · 86 unmodified lines | ||
| 247 | 259 | setDialogOpen(true); |
| 248 | 260 | }; |
| 249 | 261 | |
| 262 | + const confirmDeleteScript = useCallback(() => { | |
| 263 | + if (!editingScriptId) return; | |
| 264 | + setDeleteConfirmOpen(false); | |
| 265 | + setDialogOpen(false); | |
| 266 | + void onDeleteScript(editingScriptId); | |
| 267 | + }, [editingScriptId, onDeleteScript]); | |
| 268 | + | |
| 250 | 269 | return ( |
| 251 | 270 | <> |
| 252 | 271 | {primaryScript ? ( |
| @@ -440,6 +459,16 @@ export default function ProjectScriptsControl({ · 187 unmodified lines | ||
| 440 | 459 | </form> |
| 441 | 460 | </DialogPanel> |
| 442 | 461 | <DialogFooter> |
| 462 | + {isEditing && ( | |
| 463 | + <Button | |
| 464 | + type="button" | |
| 465 | + variant="destructive-outline" | |
| 466 | + className="mr-auto" | |
| 467 | + onClick={() => setDeleteConfirmOpen(true)} | |
| 468 | + > | |
| 469 | + Delete | |
| 470 | + </Button> | |
| 471 | + )} | |
| 443 | 472 | <Button |
| 444 | 473 | type="button" |
| 445 | 474 | variant="outline" |
| @@ -455,6 +484,21 @@ export default function ProjectScriptsControl({ · 9 unmodified lines | ||
| 455 | 484 | </DialogFooter> |
| 456 | 485 | </DialogPopup> |
| 457 | 486 | </Dialog> |
| 487 | + | |
| 488 | + <AlertDialog open={deleteConfirmOpen} onOpenChange={setDeleteConfirmOpen}> | |
| 489 | + <AlertDialogPopup> | |
| 490 | + <AlertDialogHeader> | |
| 491 | + <AlertDialogTitle>Delete action "{name}"?</AlertDialogTitle> | |
| 492 | + <AlertDialogDescription>This action cannot be undone.</AlertDialogDescription> | |
| 493 | + </AlertDialogHeader> | |
| 494 | + <AlertDialogFooter> | |
| 495 | + <AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose> | |
| 496 | + <Button variant="destructive" onClick={confirmDeleteScript}> | |
| 497 | + Delete action | |
| 498 | + </Button> | |
| 499 | + </AlertDialogFooter> | |
| 500 | + </AlertDialogPopup> | |
| 501 | + </AlertDialog> | |
| 458 | 502 | </> |
| 459 | 503 | ); |
| 460 | 504 | } |