Better model updates

src-web/hooks/useDeleteWorkspace.ts

@@ -1,6 +1,8 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { invoke } from '@tauri-apps/api';
+import type { Workspace } from '../lib/models';
 import { useActiveWorkspaceId } from './useActiveWorkspaceId';
+import { requestsQueryKey } from './useRequests';
 import { useRoutes } from './useRoutes';
 import { workspacesQueryKey } from './useWorkspaces';
 
@@ -8,17 +10,21 @@ export function useDeleteWorkspace(id: string | null) {
   const queryClient = useQueryClient();
   const activeWorkspaceId = useActiveWorkspaceId();
   const routes = useRoutes();
-  return useMutation<void, string>({
-    mutationFn: async () => {
-      if (id === null) return;
-      await invoke('delete_workspace', { id });
+  return useMutation<Workspace, string>({
+    mutationFn: () => {
+      return invoke('delete_workspace', { id });
     },
-    onSuccess: async () => {
-      if (id === null) return;
-      await queryClient.invalidateQueries(workspacesQueryKey());
-      if (id === activeWorkspaceId) {
+    onSuccess: async ({ id: workspaceId }) => {
+      queryClient.setQueryData<Workspace[]>(workspacesQueryKey({}), (workspaces) =>
+        workspaces?.filter((workspace) => workspace.id !== workspaceId),
+      );
+      if (workspaceId === activeWorkspaceId) {
         routes.navigate('workspaces');
       }
+
+      // Also clean up other things that may have been deleted
+      queryClient.setQueryData(requestsQueryKey({ workspaceId }), []);
+      await queryClient.invalidateQueries(requestsQueryKey({ workspaceId }));
     },
   });
 }