From 26cc467858f931ae9cecbad07a3edaedb2674b4b Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 10 Jun 2024 23:17:12 -0700
Subject: [PATCH] Fix delete request in sidebar

---
 src-web/components/Sidebar.tsx     |  2 +-
 src-web/hooks/useDeleteRequest.tsx | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index 91399260..3a52b863 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -603,7 +603,7 @@ const SidebarItem = forwardRef(function SidebarItem(
 ) {
   const activeRequest = useActiveRequest();
   const deleteFolder = useDeleteFolder(itemId);
-  const deleteRequest = useDeleteRequest(activeRequest ?? null);
+  const deleteRequest = useDeleteRequest(itemId);
   const duplicateHttpRequest = useDuplicateHttpRequest({ id: itemId, navigateAfter: true });
   const duplicateGrpcRequest = useDuplicateGrpcRequest({ id: itemId, navigateAfter: true });
   const copyAsCurl = useCopyAsCurl(itemId);
diff --git a/src-web/hooks/useDeleteRequest.tsx b/src-web/hooks/useDeleteRequest.tsx
index 963951bb..2be14c85 100644
--- a/src-web/hooks/useDeleteRequest.tsx
+++ b/src-web/hooks/useDeleteRequest.tsx
@@ -1,21 +1,17 @@
 import { useMutation } from '@tanstack/react-query';
-import type { GrpcRequest, HttpRequest } from '../lib/models';
 import { useDeleteAnyGrpcRequest } from './useDeleteAnyGrpcRequest';
 import { useDeleteAnyHttpRequest } from './useDeleteAnyHttpRequest';
 
-export function useDeleteRequest(request: HttpRequest | GrpcRequest | null) {
+export function useDeleteRequest(id: string | null) {
   const deleteAnyHttpRequest = useDeleteAnyHttpRequest();
   const deleteAnyGrpcRequest = useDeleteAnyGrpcRequest();
 
   return useMutation<void, string>({
     mutationFn: async () => {
-      if (request?.model === 'http_request') {
-        await deleteAnyHttpRequest.mutateAsync(request.id);
-      } else if (request?.model === 'grpc_request') {
-        await deleteAnyGrpcRequest.mutateAsync(request.id);
-      } else {
-        // Request is null
-      }
+      if (id == null) return;
+      // We don't know what type it is based on the ID, so just try deleting both
+      deleteAnyHttpRequest.mutate(id);
+      deleteAnyGrpcRequest.mutate(id);
     },
   });
 }