Environment deletion and better actions menu

src-web/hooks/useCreateEnvironment.ts

@@ -3,11 +3,9 @@ import { invoke } from '@tauri-apps/api';
 import type { Environment } from '../lib/models';
 import { environmentsQueryKey } from './useEnvironments';
 import { useActiveWorkspaceId } from './useActiveWorkspaceId';
-import { useActiveEnvironmentId } from './useActiveEnvironmentId';
 import { useAppRoutes } from './useAppRoutes';
 
 export function useCreateEnvironment() {
-  const environmentId = useActiveEnvironmentId();
   const workspaceId = useActiveWorkspaceId();
   const queryClient = useQueryClient();
   const routes = useAppRoutes();
@@ -18,7 +16,7 @@ export function useCreateEnvironment() {
     },
     onSuccess: async (environment) => {
       if (workspaceId == null) return;
-      routes.navigate('workspace', { workspaceId, environmentId });
+      routes.setEnvironment(environment);
       queryClient.setQueryData<Environment[]>(
         environmentsQueryKey({ workspaceId }),
         (environments) => [...(environments ?? []), environment],

src-web/hooks/useDeleteEnvironment.tsx

@@ -0,0 +1,36 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { invoke } from '@tauri-apps/api';
+import { InlineCode } from '../components/core/InlineCode';
+import type { Environment, Workspace } from '../lib/models';
+import { useConfirm } from './useConfirm';
+import { environmentsQueryKey } from './useEnvironments';
+
+export function useDeleteEnvironment(environment: Environment | null) {
+  const queryClient = useQueryClient();
+  const confirm = useConfirm();
+
+  return useMutation<Environment | null, string>({
+    mutationFn: async () => {
+      const confirmed = await confirm({
+        title: 'Delete Environment',
+        variant: 'delete',
+        description: (
+          <>
+            Permanently delete <InlineCode>{environment?.name}</InlineCode>?
+          </>
+        ),
+      });
+      if (!confirmed) return null;
+      return invoke('delete_environment', { environmentId: environment?.id });
+    },
+    onSuccess: async (environment) => {
+      if (environment === null) return;
+
+      const { id: environmentId, workspaceId } = environment;
+      queryClient.setQueryData<Workspace[]>(
+        environmentsQueryKey({ workspaceId }),
+        (environments) => environments?.filter((e) => e.id !== environmentId),
+      );
+    },
+  });
+}

src-web/hooks/useDeleteWorkspace.tsx

@@ -26,7 +26,7 @@ export function useDeleteWorkspace(workspace: Workspace | null) {
         ),
       });
       if (!confirmed) return null;
-      return invoke('delete_workspace', { id: workspace?.id });
+      return invoke('delete_workspace', { workspaceId: workspace?.id });
     },
     onSuccess: async (workspace) => {
       if (workspace === null) return;