+ Are you sure you want to permanently delete this workspace? +
++ You will lose all configuration and data associated with this + workspace, like prompt history or alerts. +
+ , + { + buttons: { + yes: "Delete", + no: "Cancel", + }, + title: "Permanently delete workspace", + isDestructive: true, + }, + ); + if (answer) { + return hardDeleteWorkspace(...params); + } + }, + [confirm, hardDeleteWorkspace], + ); +} diff --git a/src/features/workspace/hooks/use-invalidate-workspace-queries.ts b/src/features/workspace/hooks/use-invalidate-workspace-queries.ts index 1985e28f..3bb23afa 100644 --- a/src/features/workspace/hooks/use-invalidate-workspace-queries.ts +++ b/src/features/workspace/hooks/use-invalidate-workspace-queries.ts @@ -8,12 +8,12 @@ import { useCallback } from "react"; export function useInvalidateWorkspaceQueries() { const queryClient = useQueryClient(); - const invalidate = useCallback(() => { - queryClient.invalidateQueries({ + const invalidate = useCallback(async () => { + await queryClient.invalidateQueries({ queryKey: v1ListWorkspacesOptions(), refetchType: "all", }); - queryClient.invalidateQueries({ + await queryClient.invalidateQueries({ queryKey: v1ListArchivedWorkspacesQueryKey(), refetchType: "all", }); diff --git a/src/features/workspace/hooks/use-mutation-activate-workspace.ts b/src/features/workspace/hooks/use-mutation-activate-workspace.ts index 3979d188..0e7ac68a 100644 --- a/src/features/workspace/hooks/use-mutation-activate-workspace.ts +++ b/src/features/workspace/hooks/use-mutation-activate-workspace.ts @@ -1,13 +1,13 @@ import { v1ActivateWorkspaceMutation } from "@/api/generated/@tanstack/react-query.gen"; import { useToastMutation as useToastMutation } from "@/hooks/use-toast-mutation"; -import { useInvalidateWorkspaceQueries } from "./use-invalidate-workspace-queries"; +import { useQueryClient } from "@tanstack/react-query"; export function useMutationActivateWorkspace() { - const invalidate = useInvalidateWorkspaceQueries(); + const queryClient = useQueryClient(); return useToastMutation({ ...v1ActivateWorkspaceMutation(), - onSuccess: () => invalidate(), + onSuccess: () => queryClient.invalidateQueries({ refetchType: "all" }), // Global setting, refetch **everything** successMsg: (variables) => `Activated "${variables.body.name}" workspace`, }); } diff --git a/src/features/workspace/hooks/use-mutation-archive-workspace.ts b/src/features/workspace/hooks/use-mutation-archive-workspace.ts index cd12a702..7dc0267e 100644 --- a/src/features/workspace/hooks/use-mutation-archive-workspace.ts +++ b/src/features/workspace/hooks/use-mutation-archive-workspace.ts @@ -1,13 +1,87 @@ -import { v1DeleteWorkspaceMutation } from "@/api/generated/@tanstack/react-query.gen"; +import { + v1DeleteWorkspaceMutation, + v1ListArchivedWorkspacesQueryKey, + v1ListWorkspacesQueryKey, +} from "@/api/generated/@tanstack/react-query.gen"; import { useToastMutation } from "@/hooks/use-toast-mutation"; import { useInvalidateWorkspaceQueries } from "./use-invalidate-workspace-queries"; +import { useQueryClient } from "@tanstack/react-query"; +import { + V1ListArchivedWorkspacesResponse, + V1ListWorkspacesResponse, +} from "@/api/generated"; +import { useActiveWorkspaceName } from "./use-active-workspace-name"; export function useMutationArchiveWorkspace() { + const queryClient = useQueryClient(); const invalidate = useInvalidateWorkspaceQueries(); + const { data: activeWorkspaceName } = useActiveWorkspaceName(); return useToastMutation({ ...v1DeleteWorkspaceMutation(), - onSuccess: () => invalidate(), + onMutate: async (variables) => { + // These conditions would cause the archive operation to error + if (variables.path.workspace_name === "default") return; + if (variables.path.workspace_name === activeWorkspaceName) return; + + // Cancel any outgoing refetches + // Prevents the refetch from overwriting the optimistic update + await queryClient.cancelQueries({ + queryKey: v1ListWorkspacesQueryKey(), + }); + await queryClient.cancelQueries({ + queryKey: v1ListArchivedWorkspacesQueryKey(), + }); + + // Snapshot the previous data + const prevWorkspaces = queryClient.getQueryData( + v1ListWorkspacesQueryKey(), + ); + const prevArchivedWorkspaces = queryClient.getQueryData( + v1ListArchivedWorkspacesQueryKey(), + ); + + if (!prevWorkspaces || !prevArchivedWorkspaces) return; + + // Optimistically update values in cache + await queryClient.setQueryData( + v1ListWorkspacesQueryKey(), + (old: V1ListWorkspacesResponse | null) => ({ + workspaces: old + ? [...old.workspaces].filter( + (o) => o.name !== variables.path.workspace_name, + ) + : [], + }), + ); + await queryClient.setQueryData( + v1ListArchivedWorkspacesQueryKey(), + (old: V1ListArchivedWorkspacesResponse | null) => ({ + workspaces: old + ? [...old.workspaces, { name: variables.path.workspace_name }] + : [], + }), + ); + + return { + prevWorkspaces, + prevArchivedWorkspaces, + }; + }, + onSettled: async () => { + await invalidate(); + }, + // Rollback cache updates on error + onError: async (_a, _b, context) => { + queryClient.setQueryData( + v1ListWorkspacesQueryKey(), + context?.prevWorkspaces, + ); + queryClient.setQueryData( + v1ListArchivedWorkspacesQueryKey(), + context?.prevArchivedWorkspaces, + ); + }, successMsg: (variables) => `Archived "${variables.path.workspace_name}" workspace`, }); diff --git a/src/features/workspace/hooks/use-mutation-create-workspace.ts b/src/features/workspace/hooks/use-mutation-create-workspace.ts index 955e2f71..92e35c43 100644 --- a/src/features/workspace/hooks/use-mutation-create-workspace.ts +++ b/src/features/workspace/hooks/use-mutation-create-workspace.ts @@ -7,7 +7,12 @@ export function useMutationCreateWorkspace() { return useToastMutation({ ...v1CreateWorkspaceMutation(), - onSuccess: () => invalidate(), - successMsg: (variables) => `Created "${variables.body.name}" workspace`, + onSuccess: async () => { + await invalidate(); + }, + successMsg: (variables) => + variables.body.rename_to + ? `Renamed workspace to "${variables.body.rename_to}"` + : `Created "${variables.body.name}" workspace`, }); } diff --git a/src/features/workspace/hooks/use-mutation-hard-delete-workspace.ts b/src/features/workspace/hooks/use-mutation-hard-delete-workspace.ts index 9456788b..7ec91fea 100644 --- a/src/features/workspace/hooks/use-mutation-hard-delete-workspace.ts +++ b/src/features/workspace/hooks/use-mutation-hard-delete-workspace.ts @@ -9,6 +9,6 @@ export function useMutationHardDeleteWorkspace() { ...v1HardDeleteWorkspaceMutation(), onSuccess: () => invalidate(), successMsg: (variables) => - `Permanently deleted "${variables.path.name}" workspace`, + `Permanently deleted "${variables.path.workspace_name}" workspace`, }); } diff --git a/src/features/workspace/hooks/use-mutation-restore-workspace.ts b/src/features/workspace/hooks/use-mutation-restore-workspace.ts index 913b7c01..f984a238 100644 --- a/src/features/workspace/hooks/use-mutation-restore-workspace.ts +++ b/src/features/workspace/hooks/use-mutation-restore-workspace.ts @@ -1,13 +1,81 @@ -import { v1RecoverWorkspaceMutation } from "@/api/generated/@tanstack/react-query.gen"; +import { + v1ListArchivedWorkspacesQueryKey, + v1ListWorkspacesQueryKey, + v1RecoverWorkspaceMutation, +} from "@/api/generated/@tanstack/react-query.gen"; import { useToastMutation } from "@/hooks/use-toast-mutation"; import { useInvalidateWorkspaceQueries } from "./use-invalidate-workspace-queries"; +import { + V1ListWorkspacesResponse, + V1ListArchivedWorkspacesResponse, +} from "@/api/generated"; +import { useQueryClient } from "@tanstack/react-query"; export function useMutationRestoreWorkspace() { const invalidate = useInvalidateWorkspaceQueries(); + const queryClient = useQueryClient(); return useToastMutation({ ...v1RecoverWorkspaceMutation(), - onSuccess: () => invalidate(), + onMutate: async (variables) => { + // Cancel any outgoing refetches + // Prevents the refetch from overwriting the optimistic update + await queryClient.cancelQueries({ + queryKey: v1ListWorkspacesQueryKey(), + }); + await queryClient.cancelQueries({ + queryKey: v1ListArchivedWorkspacesQueryKey(), + }); + + // Snapshot the previous data + const prevWorkspaces = queryClient.getQueryData( + v1ListWorkspacesQueryKey(), + ); + const prevArchivedWorkspaces = queryClient.getQueryData( + v1ListArchivedWorkspacesQueryKey(), + ); + + if (!prevWorkspaces || !prevArchivedWorkspaces) return; + + // Optimistically update values in cache + queryClient.setQueryData( + v1ListArchivedWorkspacesQueryKey(), + (old: V1ListWorkspacesResponse) => ({ + workspaces: [...old.workspaces].filter( + (o) => o.name !== variables.path.workspace_name, + ), + }), + ); + // Optimistically add the workspace to the non-archived list + queryClient.setQueryData( + v1ListWorkspacesQueryKey(), + (old: V1ListArchivedWorkspacesResponse) => ({ + workspaces: [ + ...old.workspaces, + { name: variables.path.workspace_name }, + ], + }), + ); + + return { + prevWorkspaces, + prevArchivedWorkspaces, + }; + }, + onSettled: async () => { + await invalidate(); + }, + // Rollback cache updates on error + onError: async (_a, _b, context) => { + queryClient.setQueryData( + v1ListWorkspacesQueryKey(), + context?.prevWorkspaces, + ); + queryClient.setQueryData( + v1ListArchivedWorkspacesQueryKey(), + context?.prevArchivedWorkspaces, + ); + }, successMsg: (variables) => `Restored "${variables.path.workspace_name}" workspace`, }); diff --git a/src/features/workspace/hooks/use-mutation-set-workspace-custom-instructions.tsx b/src/features/workspace/hooks/use-mutation-set-workspace-custom-instructions.tsx new file mode 100644 index 00000000..e1531c12 --- /dev/null +++ b/src/features/workspace/hooks/use-mutation-set-workspace-custom-instructions.tsx @@ -0,0 +1,23 @@ +import { + v1GetWorkspaceCustomInstructionsQueryKey, + v1SetWorkspaceCustomInstructionsMutation, +} from "@/api/generated/@tanstack/react-query.gen"; +import { V1GetWorkspaceCustomInstructionsData } from "@/api/generated"; +import { useToastMutation } from "@/hooks/use-toast-mutation"; +import { useQueryClient } from "@tanstack/react-query"; + +export function useMutationSetWorkspaceCustomInstructions( + options: V1GetWorkspaceCustomInstructionsData, +) { + const queryClient = useQueryClient(); + + return useToastMutation({ + ...v1SetWorkspaceCustomInstructionsMutation(options), + onSuccess: () => + queryClient.invalidateQueries({ + queryKey: v1GetWorkspaceCustomInstructionsQueryKey(options), + refetchType: "all", + }), + successMsg: "Successfully updated custom instructions", + }); +} diff --git a/src/features/workspace-system-prompt/hooks/use-get-system-prompt.ts b/src/features/workspace/hooks/use-query-get-workspace-custom-instructions.ts similarity index 81% rename from src/features/workspace-system-prompt/hooks/use-get-system-prompt.ts rename to src/features/workspace/hooks/use-query-get-workspace-custom-instructions.ts index ec85e20a..a39f01b2 100644 --- a/src/features/workspace-system-prompt/hooks/use-get-system-prompt.ts +++ b/src/features/workspace/hooks/use-query-get-workspace-custom-instructions.ts @@ -1,7 +1,7 @@ import { v1GetWorkspaceCustomInstructionsOptions } from "@/api/generated/@tanstack/react-query.gen"; import { useQuery } from "@tanstack/react-query"; -export function useGetSystemPrompt(options: { +export function useQueryGetWorkspaceCustomInstructions(options: { path: { workspace_name: string; }; diff --git a/src/features/workspace/hooks/use-query-list-all-workspaces.ts b/src/features/workspace/hooks/use-query-list-all-workspaces.ts new file mode 100644 index 00000000..37a50551 --- /dev/null +++ b/src/features/workspace/hooks/use-query-list-all-workspaces.ts @@ -0,0 +1,67 @@ +import { + DefinedUseQueryResult, + QueryObserverLoadingErrorResult, + QueryObserverLoadingResult, + QueryObserverPendingResult, + QueryObserverRefetchErrorResult, + useQueries, +} from "@tanstack/react-query"; +import { + v1ListArchivedWorkspacesOptions, + v1ListWorkspacesOptions, +} from "@/api/generated/@tanstack/react-query.gen"; +import { + V1ListArchivedWorkspacesResponse, + V1ListWorkspacesResponse, +} from "@/api/generated"; + +type QueryResult