@squonk/data-manager-client 5.4.0-alpha.3 → 6.1.0

package/src/api/project/project.ts

@@ -1,26 +1,23 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.1
  */
-import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
-  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
-  UseMutationOptions,
-  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -36,7 +33,7 @@ import type {
   ProjectPostResponse,
   ProjectsGetResponse,
   TaskIdentity,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
@@ -82,7 +79,7 @@ export const getGetProjectsQueryOptions = <
     Awaited<ReturnType<typeof getProjects>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProjectsQueryResult = NonNullable<Awaited<ReturnType<typeof getProjects>>>;
@@ -106,7 +103,7 @@ export function useGetProjects<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjects<
   TData = Awaited<ReturnType<typeof getProjects>>,
   TError = ErrorType<void | DmError>,
@@ -125,7 +122,7 @@ export function useGetProjects<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjects<
   TData = Awaited<ReturnType<typeof getProjects>>,
   TError = ErrorType<void | DmError>,
@@ -136,7 +133,7 @@ export function useGetProjects<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Projects available to you
  */
@@ -151,16 +148,14 @@ export function useGetProjects<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectsQueryOptions(params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -199,7 +194,7 @@ export const getGetProjectsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProjects>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProjectsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProjects>>>;
@@ -215,7 +210,7 @@ export function useGetProjectsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectsSuspense<
   TData = Awaited<ReturnType<typeof getProjects>>,
   TError = ErrorType<void | DmError>,
@@ -228,7 +223,7 @@ export function useGetProjectsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectsSuspense<
   TData = Awaited<ReturnType<typeof getProjects>>,
   TError = ErrorType<void | DmError>,
@@ -241,7 +236,7 @@ export function useGetProjectsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Projects available to you
  */
@@ -258,41 +253,42 @@ export function useGetProjectsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectsSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Creates a new Project, assigning and returning a unique **ID**. A persistent volume is created in the cluster and assigned to your Project. It's here you can add **Datasets** as **Files** and run **Applications** and **Jobs**.
-
-To create a Project when an **Account Server** is configured you will need a **Product**.
-
-As the Project creator you are also automatically an `administrator` of the Project and can add other users so that they can also see or manipulate data in the Project.
-
-The name you give the Project is free-form text (can contain spaces etc.) but the name you use must be unique amongst all the Projects within the same Organisational Unit.
-
+ *
+ * To create a Project when an **Account Server** is configured you will need a **Product**.
+ *
+ * As the Project creator you are also automatically an `administrator` of the Project and can add other users so that they can also see or manipulate data in the Project.
+ *
+ * The name you give the Project is free-form text (can contain spaces etc.) but the name you use must be unique amongst all the Projects within the same Organisational Unit.
  * @summary Create a new Project
  */
 export const createProject = (
-  projectPostBodyBody: ProjectPostBodyBody,
+  projectPostBodyBody?: ProjectPostBodyBody,
   options?: SecondParameter<typeof customInstance>,
   signal?: AbortSignal,
 ) => {
   const formUrlEncoded = new URLSearchParams();
-  formUrlEncoded.append(`name`, projectPostBodyBody.name);
-  if (projectPostBodyBody.private !== undefined) {
+  if (projectPostBodyBody?.name !== undefined) {
+    formUrlEncoded.append(`name`, projectPostBodyBody.name);
+  }
+  if (projectPostBodyBody?.private !== undefined) {
     formUrlEncoded.append(`private`, projectPostBodyBody.private.toString());
   }
-  formUrlEncoded.append(`tier_product_id`, projectPostBodyBody.tier_product_id);
+  if (projectPostBodyBody?.tier_product_id !== undefined) {
+    formUrlEncoded.append(`tier_product_id`, projectPostBodyBody.tier_product_id);
+  }
 
   return customInstance<ProjectPostResponse>(
     {
@@ -306,73 +302,128 @@ export const createProject = (
   );
 };
 
-export const getCreateProjectMutationOptions = <
+export const getCreateProjectQueryKey = (projectPostBodyBody?: ProjectPostBodyBody) => {
+  return ["data-manager", "POST", "project", projectPostBodyBody] as const;
+};
+
+export const getCreateProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof createProject>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createProject>>,
-    TError,
-    { data: ProjectPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createProject>>,
-  TError,
-  { data: ProjectPostBodyBody },
-  TContext
-> => {
-  const mutationKey = ["createProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createProject>>,
-    { data: ProjectPostBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
+>(
+  projectPostBodyBody?: ProjectPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return createProject(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getCreateProjectQueryKey(projectPostBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof createProject>>> = ({ signal }) =>
+    createProject(projectPostBodyBody, requestOptions, signal);
+
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof createProject>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type CreateProjectMutationResult = NonNullable<Awaited<ReturnType<typeof createProject>>>;
-export type CreateProjectMutationBody = ProjectPostBodyBody;
-export type CreateProjectMutationError = ErrorType<DmError | void>;
+export type CreateProjectQueryResult = NonNullable<Awaited<ReturnType<typeof createProject>>>;
+export type CreateProjectQueryError = ErrorType<DmError | void>;
 
+export function useCreateProject<
+  TData = Awaited<ReturnType<typeof createProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectPostBodyBody: undefined | ProjectPostBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof createProject>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof createProject>>,
+          TError,
+          Awaited<ReturnType<typeof createProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useCreateProject<
+  TData = Awaited<ReturnType<typeof createProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectPostBodyBody?: ProjectPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createProject>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof createProject>>,
+          TError,
+          Awaited<ReturnType<typeof createProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useCreateProject<
+  TData = Awaited<ReturnType<typeof createProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectPostBodyBody?: ProjectPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Create a new Project
  */
-export const useCreateProject = <TError = ErrorType<DmError | void>, TContext = unknown>(
+
+export function useCreateProject<
+  TData = Awaited<ReturnType<typeof createProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectPostBodyBody?: ProjectPostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createProject>>,
-      TError,
-      { data: ProjectPostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createProject>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createProject>>,
-  TError,
-  { data: ProjectPostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getCreateProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getCreateProjectQueryOptions(projectPostBodyBody, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Create a new Project
+ */
+export const invalidateCreateProject = async (
+  queryClient: QueryClient,
+  projectPostBodyBody?: ProjectPostBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getCreateProjectQueryKey(projectPostBodyBody) },
+    options,
+  );
+
+  return queryClient;
 };
+
 /**
  * Gets the details of a Project that is available to you.
-
  * @summary Get a Project by UUID
  */
 export const getProject = (
@@ -386,7 +437,7 @@ export const getProject = (
   );
 };
 
-export const getGetProjectQueryKey = (projectId?: string) => {
+export const getGetProjectQueryKey = (projectId: string) => {
   return ["data-manager", "project", projectId] as const;
 };
 
@@ -407,11 +458,14 @@ export const getGetProjectQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getProject>>> = ({ signal }) =>
     getProject(projectId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!projectId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getProject>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: projectId !== null && projectId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetProjectQueryResult = NonNullable<Awaited<ReturnType<typeof getProject>>>;
@@ -435,7 +489,7 @@ export function useGetProject<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProject<
   TData = Awaited<ReturnType<typeof getProject>>,
   TError = ErrorType<void | DmError>,
@@ -454,7 +508,7 @@ export function useGetProject<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProject<
   TData = Awaited<ReturnType<typeof getProject>>,
   TError = ErrorType<void | DmError>,
@@ -465,7 +519,7 @@ export function useGetProject<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get a Project by UUID
  */
@@ -480,16 +534,14 @@ export function useGetProject<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectQueryOptions(projectId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -526,7 +578,7 @@ export const getGetProjectSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getProject>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetProjectSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getProject>>>;
@@ -542,7 +594,7 @@ export function useGetProjectSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectSuspense<
   TData = Awaited<ReturnType<typeof getProject>>,
   TError = ErrorType<void | DmError>,
@@ -553,7 +605,7 @@ export function useGetProjectSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetProjectSuspense<
   TData = Awaited<ReturnType<typeof getProject>>,
   TError = ErrorType<void | DmError>,
@@ -564,7 +616,7 @@ export function useGetProjectSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get a Project by UUID
  */
@@ -579,708 +631,1282 @@ export function useGetProjectSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetProjectSuspenseQueryOptions(projectId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Used to update some adjustable parameters of a Project, i.e. to make it `private` or make it `public``. What can be adjusted will depend on the purchased **Product**
-
  * @summary Adjust an existing Project
  */
 export const patchProject = (
   projectId: string,
-  projectPatchBodyBody: ProjectPatchBodyBody,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   const formUrlEncoded = new URLSearchParams();
-  if (projectPatchBodyBody.private !== undefined) {
+  if (projectPatchBodyBody?.private !== undefined) {
     formUrlEncoded.append(`private`, projectPatchBodyBody.private.toString());
   }
-  if (projectPatchBodyBody.name !== undefined) {
+  if (projectPatchBodyBody?.name !== undefined) {
     formUrlEncoded.append(`name`, projectPatchBodyBody.name);
   }
 
-  return customInstance<void | void>(
+  return customInstance<void>(
     {
       url: `/project/${projectId}`,
       method: "PATCH",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       data: formUrlEncoded,
+      signal,
     },
     options,
   );
 };
 
-export const getPatchProjectMutationOptions = <
+export const getPatchProjectQueryKey = (
+  projectId: string,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
+) => {
+  return ["data-manager", "PATCH", "project", projectId, projectPatchBodyBody] as const;
+};
+
+export const getPatchProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof patchProject>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof patchProject>>,
-    TError,
-    { projectId: string; data: ProjectPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof patchProject>>,
-  TError,
-  { projectId: string; data: ProjectPatchBodyBody },
-  TContext
-> => {
-  const mutationKey = ["patchProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof patchProject>>,
-    { projectId: string; data: ProjectPatchBodyBody }
-  > = (props) => {
-    const { projectId, data } = props ?? {};
-
-    return patchProject(projectId, data, requestOptions);
-  };
+>(
+  projectId: string,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey =
+    queryOptions?.queryKey ?? getPatchProjectQueryKey(projectId, projectPatchBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof patchProject>>> = ({ signal }) =>
+    patchProject(projectId, projectPatchBodyBody, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return {
+    queryKey,
+    queryFn,
+    enabled: projectId !== null && projectId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof patchProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type PatchProjectMutationResult = NonNullable<Awaited<ReturnType<typeof patchProject>>>;
-export type PatchProjectMutationBody = ProjectPatchBodyBody;
-export type PatchProjectMutationError = ErrorType<void | DmError>;
+export type PatchProjectQueryResult = NonNullable<Awaited<ReturnType<typeof patchProject>>>;
+export type PatchProjectQueryError = ErrorType<void | DmError>;
 
+export function usePatchProject<
+  TData = Awaited<ReturnType<typeof patchProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  projectPatchBodyBody: undefined | ProjectPatchBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchProject>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof patchProject>>,
+          TError,
+          Awaited<ReturnType<typeof patchProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function usePatchProject<
+  TData = Awaited<ReturnType<typeof patchProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchProject>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof patchProject>>,
+          TError,
+          Awaited<ReturnType<typeof patchProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function usePatchProject<
+  TData = Awaited<ReturnType<typeof patchProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Adjust an existing Project
  */
-export const usePatchProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function usePatchProject<
+  TData = Awaited<ReturnType<typeof patchProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof patchProject>>,
-      TError,
-      { projectId: string; data: ProjectPatchBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof patchProject>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof patchProject>>,
-  TError,
-  { projectId: string; data: ProjectPatchBodyBody },
-  TContext
-> => {
-  const mutationOptions = getPatchProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Deletes an existing Project.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getPatchProjectQueryOptions(projectId, projectPatchBodyBody, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-You must be an `administrator` of the project.
+/**
+ * @summary Adjust an existing Project
+ */
+export const invalidatePatchProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  projectPatchBodyBody?: ProjectPatchBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getPatchProjectQueryKey(projectId, projectPatchBodyBody) },
+    options,
+  );
 
-Once deleted all **Files**, working directories and material in the Project will also be removed
+  return queryClient;
+};
 
+/**
+ * Deletes an existing Project.
+ *
+ * You must be an `administrator` of the project.
+ *
+ * Once deleted all **Files**, working directories and material in the Project will also be removed
  * @summary Delete a Project
  */
 export const deleteProject = (
   projectId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<TaskIdentity>({ url: `/project/${projectId}`, method: "DELETE" }, options);
+  return customInstance<TaskIdentity>(
+    { url: `/project/${projectId}`, method: "DELETE", signal },
+    options,
+  );
+};
+
+export const getDeleteProjectQueryKey = (projectId: string) => {
+  return ["data-manager", "DELETE", "project", projectId] as const;
 };
 
-export const getDeleteProjectMutationOptions = <
+export const getDeleteProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof deleteProject>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteProject>>,
-    TError,
-    { projectId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteProject>>,
-  TError,
-  { projectId: string },
-  TContext
-> => {
-  const mutationKey = ["deleteProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof deleteProject>>,
-    { projectId: string }
-  > = (props) => {
-    const { projectId } = props ?? {};
-
-    return deleteProject(projectId, requestOptions);
-  };
+>(
+  projectId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryKey = queryOptions?.queryKey ?? getDeleteProjectQueryKey(projectId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteProject>>> = ({ signal }) =>
+    deleteProject(projectId, requestOptions, signal);
 
-export type DeleteProjectMutationResult = NonNullable<Awaited<ReturnType<typeof deleteProject>>>;
+  return {
+    queryKey,
+    queryFn,
+    enabled: projectId !== null && projectId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof deleteProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
 
-export type DeleteProjectMutationError = ErrorType<void | DmError>;
+export type DeleteProjectQueryResult = NonNullable<Awaited<ReturnType<typeof deleteProject>>>;
+export type DeleteProjectQueryError = ErrorType<void | DmError>;
 
+export function useDeleteProject<
+  TData = Awaited<ReturnType<typeof deleteProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteProject>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteProject>>,
+          TError,
+          Awaited<ReturnType<typeof deleteProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteProject<
+  TData = Awaited<ReturnType<typeof deleteProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteProject>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteProject>>,
+          TError,
+          Awaited<ReturnType<typeof deleteProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteProject<
+  TData = Awaited<ReturnType<typeof deleteProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Project
  */
-export const useDeleteProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeleteProject<
+  TData = Awaited<ReturnType<typeof deleteProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteProject>>,
-      TError,
-      { projectId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteProject>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteProject>>,
-  TError,
-  { projectId: string },
-  TContext
-> => {
-  const mutationOptions = getDeleteProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getDeleteProjectQueryOptions(projectId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
 /**
- * Adds a user to a Project as an `administrator`. As well as the ability to edit the project administrators can add and remove other users.
+ * @summary Delete a Project
+ */
+export const invalidateDeleteProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getDeleteProjectQueryKey(projectId) }, options);
 
-You must be an `administrator` of the project
+  return queryClient;
+};
 
+/**
+ * Adds a user to a Project as an `administrator`. As well as the ability to edit the project administrators can add and remove other users.
+ *
+ * You must be an `administrator` of the project
  * @summary Add a Project Administrator
  */
 export const addAdministratorToProject = (
   projectId: string,
   userId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/project/${projectId}/administrator/${userId}`, method: "PUT" },
+    { url: `/project/${projectId}/administrator/${userId}`, method: "PUT", signal },
     options,
   );
 };
 
-export const getAddAdministratorToProjectMutationOptions = <
-  TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof addAdministratorToProject>>,
-    TError,
-    { projectId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof addAdministratorToProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationKey = ["addAdministratorToProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof addAdministratorToProject>>,
-    { projectId: string; userId: string }
-  > = (props) => {
-    const { projectId, userId } = props ?? {};
-
-    return addAdministratorToProject(projectId, userId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
+export const getAddAdministratorToProjectQueryKey = (projectId: string, userId: string) => {
+  return ["data-manager", "PUT", "project", projectId, "administrator", userId] as const;
 };
 
-export type AddAdministratorToProjectMutationResult = NonNullable<
-  Awaited<ReturnType<typeof addAdministratorToProject>>
->;
-
-export type AddAdministratorToProjectMutationError = ErrorType<void | DmError>;
-
-/**
- * @summary Add a Project Administrator
- */
-export const useAddAdministratorToProject = <
+export const getAddAdministratorToProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof addAdministratorToProject>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
 >(
+  projectId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof addAdministratorToProject>>,
-      TError,
-      { projectId: string; userId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addAdministratorToProject>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof addAdministratorToProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getAddAdministratorToProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Deletes a project `administrator`. The administrator can be you.
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-A project must always have one `administrator` so you will not be able to delete the last administrator of a project.
+  const queryKey =
+    queryOptions?.queryKey ?? getAddAdministratorToProjectQueryKey(projectId, userId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof addAdministratorToProject>>> = ({
+    signal,
+  }) => addAdministratorToProject(projectId, userId, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      projectId !== null && projectId !== undefined && userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof addAdministratorToProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
 
-You must be an `administrator` of the project
+export type AddAdministratorToProjectQueryResult = NonNullable<
+  Awaited<ReturnType<typeof addAdministratorToProject>>
+>;
+export type AddAdministratorToProjectQueryError = ErrorType<void | DmError>;
 
+export function useAddAdministratorToProject<
+  TData = Awaited<ReturnType<typeof addAdministratorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addAdministratorToProject>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof addAdministratorToProject>>,
+          TError,
+          Awaited<ReturnType<typeof addAdministratorToProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAddAdministratorToProject<
+  TData = Awaited<ReturnType<typeof addAdministratorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addAdministratorToProject>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof addAdministratorToProject>>,
+          TError,
+          Awaited<ReturnType<typeof addAdministratorToProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAddAdministratorToProject<
+  TData = Awaited<ReturnType<typeof addAdministratorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addAdministratorToProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+/**
+ * @summary Add a Project Administrator
+ */
+
+export function useAddAdministratorToProject<
+  TData = Awaited<ReturnType<typeof addAdministratorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addAdministratorToProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAddAdministratorToProjectQueryOptions(projectId, userId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Add a Project Administrator
+ */
+export const invalidateAddAdministratorToProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAddAdministratorToProjectQueryKey(projectId, userId) },
+    options,
+  );
+
+  return queryClient;
+};
+
+/**
+ * Deletes a project `administrator`. The administrator can be you.
+ *
+ * A project must always have one `administrator` so you will not be able to delete the last administrator of a project.
+ *
+ * You must be an `administrator` of the project
  * @summary Delete a Project Administrator
  */
 export const removeAdministratorFromProject = (
   projectId: string,
   userId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/project/${projectId}/administrator/${userId}`, method: "DELETE" },
+    { url: `/project/${projectId}/administrator/${userId}`, method: "DELETE", signal },
     options,
   );
 };
 
-export const getRemoveAdministratorFromProjectMutationOptions = <
+export const getRemoveAdministratorFromProjectQueryKey = (projectId: string, userId: string) => {
+  return ["data-manager", "DELETE", "project", projectId, "administrator", userId] as const;
+};
+
+export const getRemoveAdministratorFromProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof removeAdministratorFromProject>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof removeAdministratorFromProject>>,
-    TError,
-    { projectId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof removeAdministratorFromProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationKey = ["removeAdministratorFromProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof removeAdministratorFromProject>>,
-    { projectId: string; userId: string }
-  > = (props) => {
-    const { projectId, userId } = props ?? {};
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeAdministratorFromProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return removeAdministratorFromProject(projectId, userId, requestOptions);
-  };
+  const queryKey =
+    queryOptions?.queryKey ?? getRemoveAdministratorFromProjectQueryKey(projectId, userId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof removeAdministratorFromProject>>> = ({
+    signal,
+  }) => removeAdministratorFromProject(projectId, userId, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      projectId !== null && projectId !== undefined && userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<
+    Awaited<ReturnType<typeof removeAdministratorFromProject>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type RemoveAdministratorFromProjectMutationResult = NonNullable<
+export type RemoveAdministratorFromProjectQueryResult = NonNullable<
   Awaited<ReturnType<typeof removeAdministratorFromProject>>
 >;
+export type RemoveAdministratorFromProjectQueryError = ErrorType<DmError | void>;
 
-export type RemoveAdministratorFromProjectMutationError = ErrorType<DmError | void>;
-
+export function useRemoveAdministratorFromProject<
+  TData = Awaited<ReturnType<typeof removeAdministratorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeAdministratorFromProject>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof removeAdministratorFromProject>>,
+          TError,
+          Awaited<ReturnType<typeof removeAdministratorFromProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRemoveAdministratorFromProject<
+  TData = Awaited<ReturnType<typeof removeAdministratorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeAdministratorFromProject>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof removeAdministratorFromProject>>,
+          TError,
+          Awaited<ReturnType<typeof removeAdministratorFromProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRemoveAdministratorFromProject<
+  TData = Awaited<ReturnType<typeof removeAdministratorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeAdministratorFromProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Project Administrator
  */
-export const useRemoveAdministratorFromProject = <
+
+export function useRemoveAdministratorFromProject<
+  TData = Awaited<ReturnType<typeof removeAdministratorFromProject>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
 >(
+  projectId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof removeAdministratorFromProject>>,
-      TError,
-      { projectId: string; userId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeAdministratorFromProject>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof removeAdministratorFromProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getRemoveAdministratorFromProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Adds a user to a Project as an `editor`. Editors can add and remove datasets in a project and delete the project.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getRemoveAdministratorFromProjectQueryOptions(projectId, userId, options);
 
-An `editor` of a project is not automatically an `editor` of any datasets the project contains.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You must be an `administrator` of the project
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
+/**
+ * @summary Delete a Project Administrator
+ */
+export const invalidateRemoveAdministratorFromProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getRemoveAdministratorFromProjectQueryKey(projectId, userId) },
+    options,
+  );
+
+  return queryClient;
+};
+
+/**
+ * Adds a user to a Project as an `editor`. Editors can add and remove datasets in a project and delete the project.
+ *
+ * An `editor` of a project is not automatically an `editor` of any datasets the project contains.
+ *
+ * You must be an `administrator` of the project
  * @summary Add a Project Editor
  */
 export const addEditorToProject = (
   projectId: string,
   userId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/project/${projectId}/editor/${userId}`, method: "PUT" },
+    { url: `/project/${projectId}/editor/${userId}`, method: "PUT", signal },
     options,
   );
 };
 
-export const getAddEditorToProjectMutationOptions = <
+export const getAddEditorToProjectQueryKey = (projectId: string, userId: string) => {
+  return ["data-manager", "PUT", "project", projectId, "editor", userId] as const;
+};
+
+export const getAddEditorToProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof addEditorToProject>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof addEditorToProject>>,
-    TError,
-    { projectId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof addEditorToProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationKey = ["addEditorToProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof addEditorToProject>>,
-    { projectId: string; userId: string }
-  > = (props) => {
-    const { projectId, userId } = props ?? {};
-
-    return addEditorToProject(projectId, userId, requestOptions);
-  };
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAddEditorToProjectQueryKey(projectId, userId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof addEditorToProject>>> = ({ signal }) =>
+    addEditorToProject(projectId, userId, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      projectId !== null && projectId !== undefined && userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof addEditorToProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type AddEditorToProjectMutationResult = NonNullable<
+export type AddEditorToProjectQueryResult = NonNullable<
   Awaited<ReturnType<typeof addEditorToProject>>
 >;
+export type AddEditorToProjectQueryError = ErrorType<void | DmError>;
 
-export type AddEditorToProjectMutationError = ErrorType<void | DmError>;
-
+export function useAddEditorToProject<
+  TData = Awaited<ReturnType<typeof addEditorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToProject>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof addEditorToProject>>,
+          TError,
+          Awaited<ReturnType<typeof addEditorToProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAddEditorToProject<
+  TData = Awaited<ReturnType<typeof addEditorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addEditorToProject>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof addEditorToProject>>,
+          TError,
+          Awaited<ReturnType<typeof addEditorToProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAddEditorToProject<
+  TData = Awaited<ReturnType<typeof addEditorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToProject>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Add a Project Editor
  */
-export const useAddEditorToProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAddEditorToProject<
+  TData = Awaited<ReturnType<typeof addEditorToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof addEditorToProject>>,
-      TError,
-      { projectId: string; userId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof addEditorToProject>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof addEditorToProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getAddEditorToProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Deletes a project `editor`. The editor can be you.
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAddEditorToProjectQueryOptions(projectId, userId, options);
 
-A project must always have one `editor` so you will not be able to delete the last editor of a project.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You must be an `administrator` of the project
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
+/**
+ * @summary Add a Project Editor
+ */
+export const invalidateAddEditorToProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAddEditorToProjectQueryKey(projectId, userId) },
+    options,
+  );
+
+  return queryClient;
+};
+
+/**
+ * Deletes a project `editor`. The editor can be you.
+ *
+ * A project must always have one `editor` so you will not be able to delete the last editor of a project.
+ *
+ * You must be an `administrator` of the project
  * @summary Delete a Project Editor
  */
 export const removeEditorFromProject = (
   projectId: string,
   userId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/project/${projectId}/editor/${userId}`, method: "DELETE" },
+    { url: `/project/${projectId}/editor/${userId}`, method: "DELETE", signal },
     options,
   );
 };
 
-export const getRemoveEditorFromProjectMutationOptions = <
+export const getRemoveEditorFromProjectQueryKey = (projectId: string, userId: string) => {
+  return ["data-manager", "DELETE", "project", projectId, "editor", userId] as const;
+};
+
+export const getRemoveEditorFromProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof removeEditorFromProject>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof removeEditorFromProject>>,
-    TError,
-    { projectId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof removeEditorFromProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationKey = ["removeEditorFromProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof removeEditorFromProject>>,
-    { projectId: string; userId: string }
-  > = (props) => {
-    const { projectId, userId } = props ?? {};
-
-    return removeEditorFromProject(projectId, userId, requestOptions);
-  };
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
+  const queryKey = queryOptions?.queryKey ?? getRemoveEditorFromProjectQueryKey(projectId, userId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof removeEditorFromProject>>> = ({
+    signal,
+  }) => removeEditorFromProject(projectId, userId, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      projectId !== null && projectId !== undefined && userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type RemoveEditorFromProjectMutationResult = NonNullable<
+export type RemoveEditorFromProjectQueryResult = NonNullable<
   Awaited<ReturnType<typeof removeEditorFromProject>>
 >;
+export type RemoveEditorFromProjectQueryError = ErrorType<DmError | void>;
 
-export type RemoveEditorFromProjectMutationError = ErrorType<DmError | void>;
-
+export function useRemoveEditorFromProject<
+  TData = Awaited<ReturnType<typeof removeEditorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromProject>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof removeEditorFromProject>>,
+          TError,
+          Awaited<ReturnType<typeof removeEditorFromProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRemoveEditorFromProject<
+  TData = Awaited<ReturnType<typeof removeEditorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromProject>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof removeEditorFromProject>>,
+          TError,
+          Awaited<ReturnType<typeof removeEditorFromProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRemoveEditorFromProject<
+  TData = Awaited<ReturnType<typeof removeEditorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Project Editor
  */
-export const useRemoveEditorFromProject = <TError = ErrorType<DmError | void>, TContext = unknown>(
+
+export function useRemoveEditorFromProject<
+  TData = Awaited<ReturnType<typeof removeEditorFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof removeEditorFromProject>>,
-      TError,
-      { projectId: string; userId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeEditorFromProject>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof removeEditorFromProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getRemoveEditorFromProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getRemoveEditorFromProjectQueryOptions(projectId, userId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
 /**
- * Adds a user to a project as an `observer`. Observers can view Projects and download files but they cannot modify Project data or run **Applications** or **Jobs**.
+ * @summary Delete a Project Editor
+ */
+export const invalidateRemoveEditorFromProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getRemoveEditorFromProjectQueryKey(projectId, userId) },
+    options,
+  );
 
-You must be an `administrator` of the Project to add Observers
+  return queryClient;
+};
 
+/**
+ * Adds a user to a project as an `observer`. Observers can view Projects and download files but they cannot modify Project data or run **Applications** or **Jobs**.
+ *
+ * You must be an `administrator` of the Project to add Observers
  * @summary Add a Project Observer
  */
 export const addObserverToProject = (
   projectId: string,
   userId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/project/${projectId}/observer/${userId}`, method: "PUT" },
+    { url: `/project/${projectId}/observer/${userId}`, method: "PUT", signal },
     options,
   );
 };
 
-export const getAddObserverToProjectMutationOptions = <
+export const getAddObserverToProjectQueryKey = (projectId: string, userId: string) => {
+  return ["data-manager", "PUT", "project", projectId, "observer", userId] as const;
+};
+
+export const getAddObserverToProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof addObserverToProject>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof addObserverToProject>>,
-    TError,
-    { projectId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof addObserverToProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationKey = ["addObserverToProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof addObserverToProject>>,
-    { projectId: string; userId: string }
-  > = (props) => {
-    const { projectId, userId } = props ?? {};
-
-    return addObserverToProject(projectId, userId, requestOptions);
-  };
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addObserverToProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAddObserverToProjectQueryKey(projectId, userId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof addObserverToProject>>> = ({ signal }) =>
+    addObserverToProject(projectId, userId, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      projectId !== null && projectId !== undefined && userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof addObserverToProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type AddObserverToProjectMutationResult = NonNullable<
+export type AddObserverToProjectQueryResult = NonNullable<
   Awaited<ReturnType<typeof addObserverToProject>>
 >;
+export type AddObserverToProjectQueryError = ErrorType<void | DmError>;
 
-export type AddObserverToProjectMutationError = ErrorType<void | DmError>;
-
+export function useAddObserverToProject<
+  TData = Awaited<ReturnType<typeof addObserverToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addObserverToProject>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof addObserverToProject>>,
+          TError,
+          Awaited<ReturnType<typeof addObserverToProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAddObserverToProject<
+  TData = Awaited<ReturnType<typeof addObserverToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addObserverToProject>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof addObserverToProject>>,
+          TError,
+          Awaited<ReturnType<typeof addObserverToProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAddObserverToProject<
+  TData = Awaited<ReturnType<typeof addObserverToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addObserverToProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Add a Project Observer
  */
-export const useAddObserverToProject = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAddObserverToProject<
+  TData = Awaited<ReturnType<typeof addObserverToProject>>,
+  TError = ErrorType<void | DmError>,
+>(
+  projectId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof addObserverToProject>>,
-      TError,
-      { projectId: string; userId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof addObserverToProject>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof addObserverToProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getAddObserverToProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAddObserverToProjectQueryOptions(projectId, userId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
 /**
- * Deletes a project `observer`.
+ * @summary Add a Project Observer
+ */
+export const invalidateAddObserverToProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAddObserverToProjectQueryKey(projectId, userId) },
+    options,
+  );
 
-You must be an `administrator` of the Project to remove Observers
+  return queryClient;
+};
 
+/**
+ * Deletes a project `observer`.
+ *
+ * You must be an `administrator` of the Project to remove Observers
  * @summary Delete a Project Observer
  */
 export const removeObserverFromProject = (
   projectId: string,
   userId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/project/${projectId}/observer/${userId}`, method: "DELETE" },
+    { url: `/project/${projectId}/observer/${userId}`, method: "DELETE", signal },
     options,
   );
 };
 
-export const getRemoveObserverFromProjectMutationOptions = <
+export const getRemoveObserverFromProjectQueryKey = (projectId: string, userId: string) => {
+  return ["data-manager", "DELETE", "project", projectId, "observer", userId] as const;
+};
+
+export const getRemoveObserverFromProjectQueryOptions = <
+  TData = Awaited<ReturnType<typeof removeObserverFromProject>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof removeObserverFromProject>>,
-    TError,
-    { projectId: string; userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof removeObserverFromProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationKey = ["removeObserverFromProject"];
-  const { mutation: mutationOptions, request: requestOptions } = options
-    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
-      ? options
-      : { ...options, mutation: { ...options.mutation, mutationKey } }
-    : { mutation: { mutationKey }, request: undefined };
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof removeObserverFromProject>>,
-    { projectId: string; userId: string }
-  > = (props) => {
-    const { projectId, userId } = props ?? {};
-
-    return removeObserverFromProject(projectId, userId, requestOptions);
-  };
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeObserverFromProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
+  const queryKey =
+    queryOptions?.queryKey ?? getRemoveObserverFromProjectQueryKey(projectId, userId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof removeObserverFromProject>>> = ({
+    signal,
+  }) => removeObserverFromProject(projectId, userId, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled:
+      projectId !== null && projectId !== undefined && userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof removeObserverFromProject>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type RemoveObserverFromProjectMutationResult = NonNullable<
+export type RemoveObserverFromProjectQueryResult = NonNullable<
   Awaited<ReturnType<typeof removeObserverFromProject>>
 >;
+export type RemoveObserverFromProjectQueryError = ErrorType<DmError | void>;
 
-export type RemoveObserverFromProjectMutationError = ErrorType<DmError | void>;
-
+export function useRemoveObserverFromProject<
+  TData = Awaited<ReturnType<typeof removeObserverFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeObserverFromProject>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof removeObserverFromProject>>,
+          TError,
+          Awaited<ReturnType<typeof removeObserverFromProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRemoveObserverFromProject<
+  TData = Awaited<ReturnType<typeof removeObserverFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeObserverFromProject>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof removeObserverFromProject>>,
+          TError,
+          Awaited<ReturnType<typeof removeObserverFromProject>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRemoveObserverFromProject<
+  TData = Awaited<ReturnType<typeof removeObserverFromProject>>,
+  TError = ErrorType<DmError | void>,
+>(
+  projectId: string,
+  userId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeObserverFromProject>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Project Observer
  */
-export const useRemoveObserverFromProject = <
+
+export function useRemoveObserverFromProject<
+  TData = Awaited<ReturnType<typeof removeObserverFromProject>>,
   TError = ErrorType<DmError | void>,
-  TContext = unknown,
 >(
+  projectId: string,
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof removeObserverFromProject>>,
-      TError,
-      { projectId: string; userId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof removeObserverFromProject>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof removeObserverFromProject>>,
-  TError,
-  { projectId: string; userId: string },
-  TContext
-> => {
-  const mutationOptions = getRemoveObserverFromProjectMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getRemoveObserverFromProjectQueryOptions(projectId, userId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Delete a Project Observer
+ */
+export const invalidateRemoveObserverFromProject = async (
+  queryClient: QueryClient,
+  projectId: string,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getRemoveObserverFromProjectQueryKey(projectId, userId) },
+    options,
+  );
+
+  return queryClient;
 };