From d8b1cadae620bae3f30563e538be3adbc71d71d7 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 21 May 2025 08:25:12 -0700
Subject: [PATCH] Fix model deletion

---
 src-web/components/core/Input.tsx                     |  3 ---
 src-web/components/sidebar/SidebarItemContextMenu.tsx | 11 ++++-------
 src-web/lib/deleteModelWithConfirm.tsx                |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src-web/components/core/Input.tsx b/src-web/components/core/Input.tsx
index a9cbaedf..65f1e744 100644
--- a/src-web/components/core/Input.tsx
+++ b/src-web/components/core/Input.tsx
@@ -174,15 +174,12 @@ const BaseInput = forwardRef<EditorView, InputProps>(function InputBase(
   );
 
   const isValid = useMemo(() => {
-    console.log('CHECKING VALIDITY', validate);
     if (required && !validateRequire(defaultValue ?? '')) return false;
     if (typeof validate === 'boolean') return validate;
     if (typeof validate === 'function' && !validate(defaultValue ?? '')) return false;
     return true;
   }, [required, defaultValue, validate]);
 
-  console.log('IS VALID', isValid, defaultValue);
-
   const handleChange = useCallback(
     (value: string) => {
       onChange?.(value);
diff --git a/src-web/components/sidebar/SidebarItemContextMenu.tsx b/src-web/components/sidebar/SidebarItemContextMenu.tsx
index 0b3fd5f5..6a79a22a 100644
--- a/src-web/components/sidebar/SidebarItemContextMenu.tsx
+++ b/src-web/components/sidebar/SidebarItemContextMenu.tsx
@@ -1,9 +1,4 @@
-import {
-  deleteModelById,
-  duplicateModelById,
-  getModel,
-  workspacesAtom,
-} from '@yaakapp-internal/models';
+import { duplicateModelById, getModel, workspacesAtom } from '@yaakapp-internal/models';
 import { useAtomValue } from 'jotai';
 import React, { useMemo } from 'react';
 import { useCreateDropdownItems } from '../../hooks/useCreateDropdownItems';
@@ -134,7 +129,9 @@ export function SidebarItemContextMenu({ child, show, close }: Props) {
           hotKeyAction: 'sidebar.delete_selected_item',
           hotKeyLabelOnly: true,
           leftSlot: <Icon icon="trash" />,
-          onSelect: async () => deleteModelById(child.model, child.id),
+          onSelect: async () => {
+            await deleteModelWithConfirm(getModel(child.model, child.id));
+          },
         },
       ];
     }
diff --git a/src-web/lib/deleteModelWithConfirm.tsx b/src-web/lib/deleteModelWithConfirm.tsx
index f92bdac4..ff42409c 100644
--- a/src-web/lib/deleteModelWithConfirm.tsx
+++ b/src-web/lib/deleteModelWithConfirm.tsx
@@ -11,7 +11,7 @@ export async function deleteModelWithConfirm(model: AnyModel | null): Promise<bo
   }
 
   const confirmed = await showConfirmDelete({
-    id: 'delete-model-' + model.model,
+    id: 'delete-model-' + model.id,
     title: 'Delete ' + modelTypeLabel(model),
     description: (
       <>