Minor tweaks

src-web/hooks/useDeleteRequest.tsx

@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
+import { InlineCode } from '../components/core/InlineCode';
 import type { HttpRequest } from '../lib/models';
 import { getRequest } from '../lib/store';
 import { useActiveRequestId } from './useActiveRequestId';
@@ -13,13 +14,18 @@ export function useDeleteRequest(id: string | null) {
   const activeRequestId = useActiveRequestId();
   const routes = useRoutes();
   const confirm = useConfirm();
+
   return useMutation<HttpRequest | null, string>({
     mutationFn: async () => {
       const request = await getRequest(id);
       const confirmed = await confirm({
         title: 'Delete Request',
         variant: 'delete',
-        description: `Are you sure you want to delete ${request?.name}?`,
+        description: (
+          <>
+            Are you sure you want to delete <InlineCode>{request?.name}</InlineCode>?
+          </>
+        ),
       });
       if (!confirmed) return null;
       return invoke('delete_request', { requestId: id });

src-web/hooks/useDeleteWorkspace.tsx

@@ -1,20 +1,37 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
+import { InlineCode } from '../components/core/InlineCode';
 import type { Workspace } from '../lib/models';
 import { useActiveWorkspaceId } from './useActiveWorkspaceId';
+import { useConfirm } from './useConfirm';
 import { requestsQueryKey } from './useRequests';
 import { useRoutes } from './useRoutes';
 import { workspacesQueryKey } from './useWorkspaces';
 
-export function useDeleteWorkspace(id: string | null) {
+export function useDeleteWorkspace(workspace: Workspace | null) {
   const queryClient = useQueryClient();
   const activeWorkspaceId = useActiveWorkspaceId();
   const routes = useRoutes();
-  return useMutation<Workspace, string>({
-    mutationFn: () => {
-      return invoke('delete_workspace', { id });
+  const confirm = useConfirm();
+
+  return useMutation<Workspace | null, string>({
+    mutationFn: async () => {
+      const confirmed = await confirm({
+        title: 'Delete Workspace',
+        variant: 'delete',
+        description: (
+          <>
+            Are you sure you want to delete <InlineCode>{workspace?.name}</InlineCode>?
+          </>
+        ),
+      });
+      if (!confirmed) return null;
+      return invoke('delete_workspace', { id: workspace?.id });
     },
-    onSuccess: async ({ id: workspaceId }) => {
+    onSuccess: async (workspace) => {
+      if (workspace === null) return;
+
+      const { id: workspaceId } = workspace;
       queryClient.setQueryData<Workspace[]>(workspacesQueryKey({}), (workspaces) =>
         workspaces?.filter((workspace) => workspace.id !== workspaceId),
       );