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

package/src/api/admin/admin.fetch.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,
@@ -39,20 +36,13 @@ import type {
   ServiceErrorsGetResponse,
   UserAccountDetail,
   UserPatchBodyBody,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Displays the existing Service Errors, which can also include acknowledged errors, normally excluded from the list.
-
-You will need `admin` rights to use this endpoint
-
- * @summary Gets Service Errors
- */
 export type adminGetServiceErrorsResponse200 = { data: ServiceErrorsGetResponse; status: 200 };
 
 export type adminGetServiceErrorsResponse401 = { data: void; status: 401 };
@@ -76,7 +66,7 @@ export const getAdminGetServiceErrorsUrl = (params?: AdminGetServiceErrorsParams
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -87,6 +77,12 @@ export const getAdminGetServiceErrorsUrl = (params?: AdminGetServiceErrorsParams
     : `/admin/service-error`;
 };
 
+/**
+ * Displays the existing Service Errors, which can also include acknowledged errors, normally excluded from the list.
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Gets Service Errors
+ */
 export const adminGetServiceErrors = async (
   params?: AdminGetServiceErrorsParams,
   options?: RequestInit,
@@ -124,7 +120,7 @@ export const getAdminGetServiceErrorsQueryOptions = <
     Awaited<ReturnType<typeof adminGetServiceErrors>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type AdminGetServiceErrorsQueryResult = NonNullable<
@@ -152,7 +148,7 @@ export function useAdminGetServiceErrors<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetServiceErrors<
   TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
   TError = ErrorType<void | DmError>,
@@ -173,7 +169,7 @@ export function useAdminGetServiceErrors<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetServiceErrors<
   TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
   TError = ErrorType<void | DmError>,
@@ -186,7 +182,7 @@ export function useAdminGetServiceErrors<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Service Errors
  */
@@ -203,16 +199,14 @@ export function useAdminGetServiceErrors<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getAdminGetServiceErrorsQueryOptions(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 };
 }
 
 /**
@@ -254,7 +248,7 @@ export const getAdminGetServiceErrorsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof adminGetServiceErrors>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type AdminGetServiceErrorsSuspenseQueryResult = NonNullable<
@@ -274,7 +268,7 @@ export function useAdminGetServiceErrorsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetServiceErrorsSuspense<
   TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
   TError = ErrorType<void | DmError>,
@@ -287,7 +281,7 @@ export function useAdminGetServiceErrorsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetServiceErrorsSuspense<
   TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
   TError = ErrorType<void | DmError>,
@@ -300,7 +294,7 @@ export function useAdminGetServiceErrorsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Service Errors
  */
@@ -317,26 +311,17 @@ export function useAdminGetServiceErrorsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getAdminGetServiceErrorsSuspenseQueryOptions(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 };
 }
 
-/**
- * Used primarily to 'Acknowledge' but not delete a Service Error.
-
-You will need `admin` rights to use this endpoint
-
- * @summary Patches a Service Error
- */
 export type adminPatchServiceErrorResponse204 = { data: void; status: 204 };
 
 export type adminPatchServiceErrorResponse401 = { data: void; status: 401 };
@@ -362,6 +347,12 @@ export const getAdminPatchServiceErrorUrl = (errorId: number) => {
   return `/admin/service-error/${errorId}`;
 };
 
+/**
+ * Used primarily to 'Acknowledge' but not delete a Service Error.
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Patches a Service Error
+ */
 export const adminPatchServiceError = async (
   errorId: number,
   options?: RequestInit,
@@ -372,79 +363,141 @@ export const adminPatchServiceError = async (
   });
 };
 
-export const getAdminPatchServiceErrorMutationOptions = <
+export const getAdminPatchServiceErrorQueryKey = (errorId: number) => {
+  return ["data-manager", "PATCH", "admin", "service-error", errorId] as const;
+};
+
+export const getAdminPatchServiceErrorQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminPatchServiceError>>,
-    TError,
-    { errorId: number },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminPatchServiceError>>,
-  TError,
-  { errorId: number },
-  TContext
-> => {
-  const mutationKey = ["adminPatchServiceError"];
-  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 adminPatchServiceError>>,
-    { errorId: number }
-  > = (props) => {
-    const { errorId } = props ?? {};
-
-    return adminPatchServiceError(errorId, requestOptions);
-  };
+>(
+  errorId: number,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
+  const queryKey = queryOptions?.queryKey ?? getAdminPatchServiceErrorQueryKey(errorId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminPatchServiceError>>> = ({ signal }) =>
+    adminPatchServiceError(errorId, { signal, ...requestOptions });
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: errorId !== null && errorId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type AdminPatchServiceErrorMutationResult = NonNullable<
+export type AdminPatchServiceErrorQueryResult = NonNullable<
   Awaited<ReturnType<typeof adminPatchServiceError>>
 >;
+export type AdminPatchServiceErrorQueryError = ErrorType<void | DmError>;
 
-export type AdminPatchServiceErrorMutationError = ErrorType<void | DmError>;
-
+export function useAdminPatchServiceError<
+  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminPatchServiceError>>,
+          TError,
+          Awaited<ReturnType<typeof adminPatchServiceError>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminPatchServiceError<
+  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminPatchServiceError>>,
+          TError,
+          Awaited<ReturnType<typeof adminPatchServiceError>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminPatchServiceError<
+  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Patches a Service Error
  */
-export const useAdminPatchServiceError = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminPatchServiceError<
+  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminPatchServiceError>>,
-      TError,
-      { errorId: number },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminPatchServiceError>>,
-  TError,
-  { errorId: number },
-  TContext
-> => {
-  const mutationOptions = getAdminPatchServiceErrorMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminPatchServiceErrorQueryOptions(errorId, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Deletes an existing Service Error.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You will need `admin` rights to use this endpoint
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Deletes a Service Error
+/**
+ * @summary Patches a Service Error
  */
+export const invalidateAdminPatchServiceError = async (
+  queryClient: QueryClient,
+  errorId: number,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAdminPatchServiceErrorQueryKey(errorId) },
+    options,
+  );
+
+  return queryClient;
+};
+
 export type adminDeleteServiceErrorResponse204 = { data: void; status: 204 };
 
 export type adminDeleteServiceErrorResponse401 = { data: void; status: 401 };
@@ -470,6 +523,12 @@ export const getAdminDeleteServiceErrorUrl = (errorId: number) => {
   return `/admin/service-error/${errorId}`;
 };
 
+/**
+ * Deletes an existing Service Error.
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Deletes a Service Error
+ */
 export const adminDeleteServiceError = async (
   errorId: number,
   options?: RequestInit,
@@ -480,77 +539,142 @@ export const adminDeleteServiceError = async (
   });
 };
 
-export const getAdminDeleteServiceErrorMutationOptions = <
+export const getAdminDeleteServiceErrorQueryKey = (errorId: number) => {
+  return ["data-manager", "DELETE", "admin", "service-error", errorId] as const;
+};
+
+export const getAdminDeleteServiceErrorQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminDeleteServiceError>>,
-    TError,
-    { errorId: number },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminDeleteServiceError>>,
-  TError,
-  { errorId: number },
-  TContext
-> => {
-  const mutationKey = ["adminDeleteServiceError"];
-  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 adminDeleteServiceError>>,
-    { errorId: number }
-  > = (props) => {
-    const { errorId } = props ?? {};
-
-    return adminDeleteServiceError(errorId, requestOptions);
-  };
+>(
+  errorId: number,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
+  const queryKey = queryOptions?.queryKey ?? getAdminDeleteServiceErrorQueryKey(errorId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminDeleteServiceError>>> = ({
+    signal,
+  }) => adminDeleteServiceError(errorId, { signal, ...requestOptions });
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: errorId !== null && errorId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type AdminDeleteServiceErrorMutationResult = NonNullable<
+export type AdminDeleteServiceErrorQueryResult = NonNullable<
   Awaited<ReturnType<typeof adminDeleteServiceError>>
 >;
+export type AdminDeleteServiceErrorQueryError = ErrorType<void | DmError>;
 
-export type AdminDeleteServiceErrorMutationError = ErrorType<void | DmError>;
-
+export function useAdminDeleteServiceError<
+  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminDeleteServiceError>>,
+          TError,
+          Awaited<ReturnType<typeof adminDeleteServiceError>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminDeleteServiceError<
+  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminDeleteServiceError>>,
+          TError,
+          Awaited<ReturnType<typeof adminDeleteServiceError>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminDeleteServiceError<
+  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Deletes a Service Error
  */
-export const useAdminDeleteServiceError = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminDeleteServiceError<
+  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
+  TError = ErrorType<void | DmError>,
+>(
+  errorId: number,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminDeleteServiceError>>,
-      TError,
-      { errorId: number },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminDeleteServiceError>>,
-  TError,
-  { errorId: number },
-  TContext
-> => {
-  const mutationOptions = getAdminDeleteServiceErrorMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminDeleteServiceErrorQueryOptions(errorId, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * You need admin privileges to use this endpoint and you are excluded from the returned list of users
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
- * @summary Get detailed information about all known Users
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Deletes a Service Error
  */
+export const invalidateAdminDeleteServiceError = async (
+  queryClient: QueryClient,
+  errorId: number,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAdminDeleteServiceErrorQueryKey(errorId) },
+    options,
+  );
+
+  return queryClient;
+};
+
 export type adminGetUsersResponse200 = { data: AdminUsersGetResponse; status: 200 };
 
 export type adminGetUsersResponse401 = { data: void; status: 401 };
@@ -569,7 +693,7 @@ export const getAdminGetUsersUrl = (params?: AdminGetUsersParams) => {
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -578,6 +702,10 @@ export const getAdminGetUsersUrl = (params?: AdminGetUsersParams) => {
   return stringifiedParams.length > 0 ? `/admin/user?${stringifiedParams}` : `/admin/user`;
 };
 
+/**
+ * You need admin privileges to use this endpoint and you are excluded from the returned list of users
+ * @summary Get detailed information about all known Users
+ */
 export const adminGetUsers = async (
   params?: AdminGetUsersParams,
   options?: RequestInit,
@@ -613,7 +741,7 @@ export const getAdminGetUsersQueryOptions = <
     Awaited<ReturnType<typeof adminGetUsers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type AdminGetUsersQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetUsers>>>;
@@ -637,7 +765,7 @@ export function useAdminGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetUsers<
   TData = Awaited<ReturnType<typeof adminGetUsers>>,
   TError = ErrorType<void | DmError>,
@@ -656,7 +784,7 @@ export function useAdminGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetUsers<
   TData = Awaited<ReturnType<typeof adminGetUsers>>,
   TError = ErrorType<void | DmError>,
@@ -667,7 +795,7 @@ export function useAdminGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about all known Users
  */
@@ -682,16 +810,14 @@ export function useAdminGetUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getAdminGetUsersQueryOptions(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 };
 }
 
 /**
@@ -730,7 +856,7 @@ export const getAdminGetUsersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof adminGetUsers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type AdminGetUsersSuspenseQueryResult = NonNullable<
@@ -750,7 +876,7 @@ export function useAdminGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetUsersSuspense<
   TData = Awaited<ReturnType<typeof adminGetUsers>>,
   TError = ErrorType<void | DmError>,
@@ -763,7 +889,7 @@ export function useAdminGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetUsersSuspense<
   TData = Awaited<ReturnType<typeof adminGetUsers>>,
   TError = ErrorType<void | DmError>,
@@ -776,7 +902,7 @@ export function useAdminGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about all known Users
  */
@@ -793,26 +919,17 @@ export function useAdminGetUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getAdminGetUsersSuspenseQueryOptions(params, 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 };
 }
 
-/**
- * This method adds a user to the Data Manager service. The user is authenticated via a keycloak server but will need an initialised account before they can create Datasets or Projects.
-
-You will need `admin` rights to use this endpoint
-
- * @summary Prepares a user account in the Data Manager service
- */
 export type adminPutUserResponse201 = { data: UserAccountDetail; status: 201 };
 
 export type adminPutUserResponse401 = { data: void; status: 401 };
@@ -830,6 +947,12 @@ export const getAdminPutUserUrl = (userId: string) => {
   return `/admin/user/${userId}`;
 };
 
+/**
+ * This method adds a user to the Data Manager service. The user is authenticated via a keycloak server but will need an initialised account before they can create Datasets or Projects.
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Prepares a user account in the Data Manager service
+ */
 export const adminPutUser = async (
   userId: string,
   options?: RequestInit,
@@ -840,98 +963,153 @@ export const adminPutUser = async (
   });
 };
 
-export const getAdminPutUserMutationOptions = <
-  TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminPutUser>>,
-    TError,
-    { userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminPutUser>>,
-  TError,
-  { userId: string },
-  TContext
-> => {
-  const mutationKey = ["adminPutUser"];
-  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 adminPutUser>>,
-    { userId: string }
-  > = (props) => {
-    const { userId } = props ?? {};
-
-    return adminPutUser(userId, requestOptions);
-  };
-
-  return { mutationFn, ...mutationOptions };
+export const getAdminPutUserQueryKey = (userId: string) => {
+  return ["data-manager", "PUT", "admin", "user", userId] as const;
 };
 
-export type AdminPutUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPutUser>>>;
-
-export type AdminPutUserMutationError = ErrorType<void | DmError>;
-
-/**
- * @summary Prepares a user account in the Data Manager service
- */
-export const useAdminPutUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
+export const getAdminPutUserQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminPutUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminPutUser>>,
-      TError,
-      { userId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
-  queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminPutUser>>,
-  TError,
-  { userId: string },
-  TContext
-> => {
-  const mutationOptions = getAdminPutUserMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Deletes a user account, along with all the user's Datasets
-
-You will need `admin` rights to use this endpoint
-
- * @summary Deletes a user account
- */
-export type adminDeleteUserResponse204 = { data: void; status: 204 };
-
-export type adminDeleteUserResponse400 = { data: void; status: 400 };
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-export type adminDeleteUserResponse401 = { data: void; status: 401 };
+  const queryKey = queryOptions?.queryKey ?? getAdminPutUserQueryKey(userId);
 
-export type adminDeleteUserResponse403 = { data: DmError; status: 403 };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminPutUser>>> = ({ signal }) =>
+    adminPutUser(userId, { signal, ...requestOptions });
 
-export type adminDeleteUserResponseSuccess = adminDeleteUserResponse204 & { headers: Headers };
-export type adminDeleteUserResponseError = (
-  | adminDeleteUserResponse400
-  | adminDeleteUserResponse401
-  | adminDeleteUserResponse403
-) & { headers: Headers };
+  return {
+    queryKey,
+    queryFn,
+    enabled: userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
 
-export type adminDeleteUserResponse = adminDeleteUserResponseSuccess | adminDeleteUserResponseError;
+export type AdminPutUserQueryResult = NonNullable<Awaited<ReturnType<typeof adminPutUser>>>;
+export type AdminPutUserQueryError = ErrorType<void | DmError>;
 
-export const getAdminDeleteUserUrl = (userId: string) => {
-  return `/admin/user/${userId}`;
+export function useAdminPutUser<
+  TData = Awaited<ReturnType<typeof adminPutUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminPutUser>>,
+          TError,
+          Awaited<ReturnType<typeof adminPutUser>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminPutUser<
+  TData = Awaited<ReturnType<typeof adminPutUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminPutUser>>,
+          TError,
+          Awaited<ReturnType<typeof adminPutUser>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminPutUser<
+  TData = Awaited<ReturnType<typeof adminPutUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+/**
+ * @summary Prepares a user account in the Data Manager service
+ */
+
+export function useAdminPutUser<
+  TData = Awaited<ReturnType<typeof adminPutUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminPutUserQueryOptions(userId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Prepares a user account in the Data Manager service
+ */
+export const invalidateAdminPutUser = async (
+  queryClient: QueryClient,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getAdminPutUserQueryKey(userId) }, options);
+
+  return queryClient;
+};
+
+export type adminDeleteUserResponse204 = { data: void; status: 204 };
+
+export type adminDeleteUserResponse400 = { data: void; status: 400 };
+
+export type adminDeleteUserResponse401 = { data: void; status: 401 };
+
+export type adminDeleteUserResponse403 = { data: DmError; status: 403 };
+
+export type adminDeleteUserResponseSuccess = adminDeleteUserResponse204 & { headers: Headers };
+export type adminDeleteUserResponseError = (
+  | adminDeleteUserResponse400
+  | adminDeleteUserResponse401
+  | adminDeleteUserResponse403
+) & { headers: Headers };
+
+export type adminDeleteUserResponse = adminDeleteUserResponseSuccess | adminDeleteUserResponseError;
+
+export const getAdminDeleteUserUrl = (userId: string) => {
+  return `/admin/user/${userId}`;
 };
 
+/**
+ * Deletes a user account, along with all the user's Datasets
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Deletes a user account
+ */
 export const adminDeleteUser = async (
   userId: string,
   options?: RequestInit,
@@ -942,79 +1120,126 @@ export const adminDeleteUser = async (
   });
 };
 
-export const getAdminDeleteUserMutationOptions = <
+export const getAdminDeleteUserQueryKey = (userId: string) => {
+  return ["data-manager", "DELETE", "admin", "user", userId] as const;
+};
+
+export const getAdminDeleteUserQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminDeleteUser>>,
-    TError,
-    { userId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError,
-  { userId: string },
-  TContext
-> => {
-  const mutationKey = ["adminDeleteUser"];
-  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 adminDeleteUser>>,
-    { userId: string }
-  > = (props) => {
-    const { userId } = props ?? {};
-
-    return adminDeleteUser(userId, requestOptions);
-  };
+>(
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryKey = queryOptions?.queryKey ?? getAdminDeleteUserQueryKey(userId);
 
-export type AdminDeleteUserMutationResult = NonNullable<
-  Awaited<ReturnType<typeof adminDeleteUser>>
->;
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminDeleteUser>>> = ({ signal }) =>
+    adminDeleteUser(userId, { signal, ...requestOptions });
 
-export type AdminDeleteUserMutationError = ErrorType<void | DmError>;
+  return {
+    queryKey,
+    queryFn,
+    enabled: userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
 
+export type AdminDeleteUserQueryResult = NonNullable<Awaited<ReturnType<typeof adminDeleteUser>>>;
+export type AdminDeleteUserQueryError = ErrorType<void | DmError>;
+
+export function useAdminDeleteUser<
+  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminDeleteUser>>,
+          TError,
+          Awaited<ReturnType<typeof adminDeleteUser>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminDeleteUser<
+  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminDeleteUser>>,
+          TError,
+          Awaited<ReturnType<typeof adminDeleteUser>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminDeleteUser<
+  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Deletes a user account
  */
-export const useAdminDeleteUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminDeleteUser<
+  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminDeleteUser>>,
-      TError,
-      { userId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError,
-  { userId: string },
-  TContext
-> => {
-  const mutationOptions = getAdminDeleteUserMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminDeleteUserQueryOptions(userId, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Patches a user record, typically to suspend or re-enable a user account
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You will need `admin` rights to use this endpoint
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Patch a given user
+/**
+ * @summary Deletes a user account
  */
+export const invalidateAdminDeleteUser = async (
+  queryClient: QueryClient,
+  userId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getAdminDeleteUserQueryKey(userId) }, options);
+
+  return queryClient;
+};
+
 export type adminPatchUserResponse200 = { data: void; status: 200 };
 
 export type adminPatchUserResponse204 = { data: void; status: 204 };
@@ -1041,6 +1266,12 @@ export const getAdminPatchUserUrl = (userId: string) => {
   return `/admin/user/${userId}`;
 };
 
+/**
+ * Patches a user record, typically to suspend or re-enable a user account
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Patch a given user
+ */
 export const adminPatchUser = async (
   userId: string,
   userPatchBodyBody: UserPatchBodyBody,
@@ -1059,77 +1290,138 @@ export const adminPatchUser = async (
   });
 };
 
-export const getAdminPatchUserMutationOptions = <
+export const getAdminPatchUserQueryKey = (
+  userId: string,
+  userPatchBodyBody?: UserPatchBodyBody,
+) => {
+  return ["data-manager", "PATCH", "admin", "user", userId, userPatchBodyBody] as const;
+};
+
+export const getAdminPatchUserQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminPatchUser>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminPatchUser>>,
-    TError,
-    { userId: string; data: UserPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminPatchUser>>,
-  TError,
-  { userId: string; data: UserPatchBodyBody },
-  TContext
-> => {
-  const mutationKey = ["adminPatchUser"];
-  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 adminPatchUser>>,
-    { userId: string; data: UserPatchBodyBody }
-  > = (props) => {
-    const { userId, data } = props ?? {};
-
-    return adminPatchUser(userId, data, requestOptions);
-  };
+>(
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminPatchUserQueryKey(userId, userPatchBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminPatchUser>>> = ({ signal }) =>
+    adminPatchUser(userId, userPatchBodyBody, { signal, ...requestOptions });
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: userId !== null && userId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type AdminPatchUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>;
-export type AdminPatchUserMutationBody = UserPatchBodyBody;
-export type AdminPatchUserMutationError = ErrorType<void | DmError>;
+export type AdminPatchUserQueryResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>;
+export type AdminPatchUserQueryError = ErrorType<void | DmError>;
 
+export function useAdminPatchUser<
+  TData = Awaited<ReturnType<typeof adminPatchUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminPatchUser>>,
+          TError,
+          Awaited<ReturnType<typeof adminPatchUser>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminPatchUser<
+  TData = Awaited<ReturnType<typeof adminPatchUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminPatchUser>>,
+          TError,
+          Awaited<ReturnType<typeof adminPatchUser>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminPatchUser<
+  TData = Awaited<ReturnType<typeof adminPatchUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>>;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Patch a given user
  */
-export const useAdminPatchUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminPatchUser<
+  TData = Awaited<ReturnType<typeof adminPatchUser>>,
+  TError = ErrorType<void | DmError>,
+>(
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminPatchUser>>,
-      TError,
-      { userId: string; data: UserPatchBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>>;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminPatchUser>>,
-  TError,
-  { userId: string; data: UserPatchBodyBody },
-  TContext
-> => {
-  const mutationOptions = getAdminPatchUserMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminPatchUserQueryOptions(userId, userPatchBodyBody, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Returns the list of known **Job Manifests** including the time the manifest was last loaded and its load status, a message indicating success or failure.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You will need `admin` rights to use this endpoint
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Get Job Manifests
+/**
+ * @summary Patch a given user
  */
+export const invalidateAdminPatchUser = async (
+  queryClient: QueryClient,
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAdminPatchUserQueryKey(userId, userPatchBodyBody) },
+    options,
+  );
+
+  return queryClient;
+};
+
 export type adminGetJobManifestsResponse200 = { data: AdminJobManifestGetResponse; status: 200 };
 
 export type adminGetJobManifestsResponse401 = { data: void; status: 401 };
@@ -1152,6 +1444,12 @@ export const getAdminGetJobManifestsUrl = () => {
   return `/admin/job-manifest`;
 };
 
+/**
+ * Returns the list of known **Job Manifests** including the time the manifest was last loaded and its load status, a message indicating success or failure.
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Get Job Manifests
+ */
 export const adminGetJobManifests = async (
   options?: RequestInit,
 ): Promise<adminGetJobManifestsResponse> => {
@@ -1183,7 +1481,7 @@ export const getAdminGetJobManifestsQueryOptions = <
     Awaited<ReturnType<typeof adminGetJobManifests>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type AdminGetJobManifestsQueryResult = NonNullable<
@@ -1210,7 +1508,7 @@ export function useAdminGetJobManifests<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetJobManifests<
   TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
   TError = ErrorType<void | DmError>,
@@ -1230,7 +1528,7 @@ export function useAdminGetJobManifests<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetJobManifests<
   TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
   TError = ErrorType<void | DmError>,
@@ -1242,7 +1540,7 @@ export function useAdminGetJobManifests<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Job Manifests
  */
@@ -1258,16 +1556,14 @@ export function useAdminGetJobManifests<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getAdminGetJobManifestsQueryOptions(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 };
 }
 
 /**
@@ -1302,7 +1598,7 @@ export const getAdminGetJobManifestsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof adminGetJobManifests>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type AdminGetJobManifestsSuspenseQueryResult = NonNullable<
@@ -1321,7 +1617,7 @@ export function useAdminGetJobManifestsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetJobManifestsSuspense<
   TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
   TError = ErrorType<void | DmError>,
@@ -1333,7 +1629,7 @@ export function useAdminGetJobManifestsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useAdminGetJobManifestsSuspense<
   TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
   TError = ErrorType<void | DmError>,
@@ -1345,7 +1641,7 @@ export function useAdminGetJobManifestsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Job Manifests
  */
@@ -1361,35 +1657,22 @@ export function useAdminGetJobManifestsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getAdminGetJobManifestsSuspenseQueryOptions(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 };
 }
 
-/**
- * This endpoint is used to add (or update an existing **Job Manifest**). Manifests are the source of Job definitions. Once added the manifest is inspected and any Jobs it refers to are loaded.
+export type adminJobManifestPutResponse200 = { data: AdminJobManifestLoadPutResponse; status: 200 };
 
-A URL to a manifest is typically its RAW location, something that (for GitHub) begins with `https://raw.githubusercontent.com/` followed by your repository (`InformaticsMatters/virtual-screening`) and then the reference to a **Manifest** file, like `/main/data-manager/manifest-im-virtual-screening.yaml`. For public GitHub repositories you are unlikely to need to provide a `header` or `params`.
+export type adminJobManifestPutResponse401 = { data: void; status: 401 };
 
-A limited number of manifest origins (URLs) are supported. At the moment we support basic GitHib and GitLab URLs, i.e. those that begin `https://raw.githubusercontent.com/` and `https://gitlab.com/api/v4/projects/`.
-
-You will need `admin` rights to use this endpoint
-
- * @summary Adds a Job Manifest and triggers the download of its Job Definitions
- */
-export type adminJobManifestPutResponse200 = { data: AdminJobManifestLoadPutResponse; status: 200 };
-
-export type adminJobManifestPutResponse401 = { data: void; status: 401 };
-
-export type adminJobManifestPutResponse403 = { data: DmError; status: 403 };
+export type adminJobManifestPutResponse403 = { data: DmError; status: 403 };
 
 export type adminJobManifestPutResponseSuccess = adminJobManifestPutResponse200 & {
   headers: Headers;
@@ -1407,6 +1690,16 @@ export const getAdminJobManifestPutUrl = () => {
   return `/admin/job-manifest`;
 };
 
+/**
+ * This endpoint is used to add (or update an existing **Job Manifest**). Manifests are the source of Job definitions. Once added the manifest is inspected and any Jobs it refers to are loaded.
+ *
+ * A URL to a manifest is typically its RAW location, something that (for GitHub) begins with `https://raw.githubusercontent.com/` followed by your repository (`InformaticsMatters/virtual-screening`) and then the reference to a **Manifest** file, like `/main/data-manager/manifest-im-virtual-screening.yaml`. For public GitHub repositories you are unlikely to need to provide a `header` or `params`.
+ *
+ * A limited number of manifest origins (URLs) are supported. At the moment we support basic GitHib and GitLab URLs, i.e. those that begin `https://raw.githubusercontent.com/` and `https://gitlab.com/api/v4/projects/`.
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Adds a Job Manifest and triggers the download of its Job Definitions
+ */
 export const adminJobManifestPut = async (
   jobManifestPutBodyBody: JobManifestPutBodyBody,
   options?: RequestInit,
@@ -1428,81 +1721,138 @@ export const adminJobManifestPut = async (
   });
 };
 
-export const getAdminJobManifestPutMutationOptions = <
+export const getAdminJobManifestPutQueryKey = (jobManifestPutBodyBody?: JobManifestPutBodyBody) => {
+  return ["data-manager", "PUT", "admin", "job-manifest", jobManifestPutBodyBody] as const;
+};
+
+export const getAdminJobManifestPutQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminJobManifestPut>>,
-    TError,
-    { data: JobManifestPutBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminJobManifestPut>>,
-  TError,
-  { data: JobManifestPutBodyBody },
-  TContext
-> => {
-  const mutationKey = ["adminJobManifestPut"];
-  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 adminJobManifestPut>>,
-    { data: JobManifestPutBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
+>(
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return adminJobManifestPut(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getAdminJobManifestPutQueryKey(jobManifestPutBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminJobManifestPut>>> = ({ signal }) =>
+    adminJobManifestPut(jobManifestPutBodyBody, { signal, ...requestOptions });
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof adminJobManifestPut>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type AdminJobManifestPutMutationResult = NonNullable<
+export type AdminJobManifestPutQueryResult = NonNullable<
   Awaited<ReturnType<typeof adminJobManifestPut>>
 >;
-export type AdminJobManifestPutMutationBody = JobManifestPutBodyBody;
-export type AdminJobManifestPutMutationError = ErrorType<void | DmError>;
+export type AdminJobManifestPutQueryError = ErrorType<void | DmError>;
 
+export function useAdminJobManifestPut<
+  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminJobManifestPut>>,
+          TError,
+          Awaited<ReturnType<typeof adminJobManifestPut>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminJobManifestPut<
+  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminJobManifestPut>>,
+          TError,
+          Awaited<ReturnType<typeof adminJobManifestPut>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminJobManifestPut<
+  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Adds a Job Manifest and triggers the download of its Job Definitions
  */
-export const useAdminJobManifestPut = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminJobManifestPut<
+  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminJobManifestPut>>,
-      TError,
-      { data: JobManifestPutBodyBody },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminJobManifestPut>>,
-  TError,
-  { data: JobManifestPutBodyBody },
-  TContext
-> => {
-  const mutationOptions = getAdminJobManifestPutMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Deletes a Job Manifest record
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminJobManifestPutQueryOptions(jobManifestPutBodyBody, options);
 
-You need to exercise caution using this endpoint. You can disrupt the Data Manager **Instance** execution if you delete and purge Jobs while instances of any affected job may be running.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You will need `admin` rights to use this endpoint and the Data Manager needs to be running in `DEVELOPMENT` **Mode**
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Deletes a Job Manifest
+/**
+ * @summary Adds a Job Manifest and triggers the download of its Job Definitions
  */
+export const invalidateAdminJobManifestPut = async (
+  queryClient: QueryClient,
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAdminJobManifestPutQueryKey(jobManifestPutBodyBody) },
+    options,
+  );
+
+  return queryClient;
+};
+
 export type adminDeleteJobManifestResponse204 = { data: void; status: 204 };
 
 export type adminDeleteJobManifestResponse400 = { data: void; status: 400 };
@@ -1532,7 +1882,7 @@ export const getAdminDeleteJobManifestUrl = (
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -1543,6 +1893,14 @@ export const getAdminDeleteJobManifestUrl = (
     : `/admin/job-manifest/${jobManifestId}`;
 };
 
+/**
+ * Deletes a Job Manifest record
+ *
+ * You need to exercise caution using this endpoint. You can disrupt the Data Manager **Instance** execution if you delete and purge Jobs while instances of any affected job may be running.
+ *
+ * You will need `admin` rights to use this endpoint and the Data Manager needs to be running in `DEVELOPMENT` **Mode**
+ * @summary Deletes a Job Manifest
+ */
 export const adminDeleteJobManifest = async (
   jobManifestId: number,
   params?: AdminDeleteJobManifestParams,
@@ -1554,81 +1912,158 @@ export const adminDeleteJobManifest = async (
   );
 };
 
-export const getAdminDeleteJobManifestMutationOptions = <
+export const getAdminDeleteJobManifestQueryKey = (
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
+) => {
+  return [
+    "data-manager",
+    "DELETE",
+    "admin",
+    "job-manifest",
+    jobManifestId,
+    ...(params ? [params] : []),
+  ] as const;
+};
+
+export const getAdminDeleteJobManifestQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-    TError,
-    { jobManifestId: number; params?: AdminDeleteJobManifestParams },
-    TContext
-  >;
-  request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-  TError,
-  { jobManifestId: number; params?: AdminDeleteJobManifestParams },
-  TContext
-> => {
-  const mutationKey = ["adminDeleteJobManifest"];
-  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 adminDeleteJobManifest>>,
-    { jobManifestId: number; params?: AdminDeleteJobManifestParams }
-  > = (props) => {
-    const { jobManifestId, params } = props ?? {};
-
-    return adminDeleteJobManifest(jobManifestId, params, requestOptions);
-  };
+>(
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey =
+    queryOptions?.queryKey ?? getAdminDeleteJobManifestQueryKey(jobManifestId, params);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminDeleteJobManifest>>> = ({ signal }) =>
+    adminDeleteJobManifest(jobManifestId, params, { signal, ...requestOptions });
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: jobManifestId !== null && jobManifestId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type AdminDeleteJobManifestMutationResult = NonNullable<
+export type AdminDeleteJobManifestQueryResult = NonNullable<
   Awaited<ReturnType<typeof adminDeleteJobManifest>>
 >;
+export type AdminDeleteJobManifestQueryError = ErrorType<void | DmError>;
 
-export type AdminDeleteJobManifestMutationError = ErrorType<void | DmError>;
-
+export function useAdminDeleteJobManifest<
+  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestId: number,
+  params: undefined | AdminDeleteJobManifestParams,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+          TError,
+          Awaited<ReturnType<typeof adminDeleteJobManifest>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminDeleteJobManifest<
+  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+          TError,
+          Awaited<ReturnType<typeof adminDeleteJobManifest>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminDeleteJobManifest<
+  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Deletes a Job Manifest
  */
-export const useAdminDeleteJobManifest = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminDeleteJobManifest<
+  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+  TError = ErrorType<void | DmError>,
+>(
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-      TError,
-      { jobManifestId: number; params?: AdminDeleteJobManifestParams },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-  TError,
-  { jobManifestId: number; params?: AdminDeleteJobManifestParams },
-  TContext
-> => {
-  const mutationOptions = getAdminDeleteJobManifestMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminDeleteJobManifestQueryOptions(jobManifestId, params, options);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * This endpoint is used to trigger the Data Manager to re-inspect the internal **Job Manifest** table and download the manifests and reprocess the related job definitions. This is normally done by an administrator when the Manifest table has been modified or if external job definitions are known to have changed in the referenced repositories.
-
-You need to exercise caution using this endpoint. You can disrupt the Data Manager **Instance** execution if you re-load Jobs while instances of any affected job may be running.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-You will need `admin` rights to use this endpoint and the Data Manager needs to be running in `DEVELOPMENT` **Mode**
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Trigger a download of Job Definitions using existing Job Manifests
+/**
+ * @summary Deletes a Job Manifest
  */
+export const invalidateAdminDeleteJobManifest = async (
+  queryClient: QueryClient,
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getAdminDeleteJobManifestQueryKey(jobManifestId, params) },
+    options,
+  );
+
+  return queryClient;
+};
+
 export type adminJobManifestLoadResponse200 = {
   data: AdminJobManifestLoadPutResponse;
   status: 200;
@@ -1657,6 +2092,14 @@ export const getAdminJobManifestLoadUrl = () => {
   return `/admin/job-manifest/load`;
 };
 
+/**
+ * This endpoint is used to trigger the Data Manager to re-inspect the internal **Job Manifest** table and download the manifests and reprocess the related job definitions. This is normally done by an administrator when the Manifest table has been modified or if external job definitions are known to have changed in the referenced repositories.
+ *
+ * You need to exercise caution using this endpoint. You can disrupt the Data Manager **Instance** execution if you re-load Jobs while instances of any affected job may be running.
+ *
+ * You will need `admin` rights to use this endpoint and the Data Manager needs to be running in `DEVELOPMENT` **Mode**
+ * @summary Trigger a download of Job Definitions using existing Job Manifests
+ */
 export const adminJobManifestLoad = async (
   options?: RequestInit,
 ): Promise<adminJobManifestLoadResponse> => {
@@ -1666,62 +2109,121 @@ export const adminJobManifestLoad = async (
   });
 };
 
-export const getAdminJobManifestLoadMutationOptions = <
+export const getAdminJobManifestLoadQueryKey = () => {
+  return ["data-manager", "PUT", "admin", "job-manifest", "load"] as const;
+};
+
+export const getAdminJobManifestLoadQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
 >(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof adminJobManifestLoad>>,
-    TError,
-    void,
-    TContext
-  >;
+  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>>;
   request?: SecondParameter<typeof customFetch>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof adminJobManifestLoad>>,
-  TError,
-  void,
-  TContext
-> => {
-  const mutationKey = ["adminJobManifestLoad"];
-  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 adminJobManifestLoad>>,
-    void
-  > = () => {
-    return adminJobManifestLoad(requestOptions);
-  };
+}) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminJobManifestLoadQueryKey();
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminJobManifestLoad>>> = ({ signal }) =>
+    adminJobManifestLoad({ signal, ...requestOptions });
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof adminJobManifestLoad>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type AdminJobManifestLoadMutationResult = NonNullable<
+export type AdminJobManifestLoadQueryResult = NonNullable<
   Awaited<ReturnType<typeof adminJobManifestLoad>>
 >;
+export type AdminJobManifestLoadQueryError = ErrorType<void | DmError>;
 
-export type AdminJobManifestLoadMutationError = ErrorType<void | DmError>;
-
+export function useAdminJobManifestLoad<
+  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminJobManifestLoad>>,
+          TError,
+          Awaited<ReturnType<typeof adminJobManifestLoad>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminJobManifestLoad<
+  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof adminJobManifestLoad>>,
+          TError,
+          Awaited<ReturnType<typeof adminJobManifestLoad>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminJobManifestLoad<
+  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customFetch>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Trigger a download of Job Definitions using existing Job Manifests
  */
-export const useAdminJobManifestLoad = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useAdminJobManifestLoad<
+  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
+  TError = ErrorType<void | DmError>,
+>(
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof adminJobManifestLoad>>,
-      TError,
-      void,
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
     >;
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, void, TContext> => {
-  const mutationOptions = getAdminJobManifestLoadMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getAdminJobManifestLoadQueryOptions(options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
+/**
+ * @summary Trigger a download of Job Definitions using existing Job Manifests
+ */
+export const invalidateAdminJobManifestLoad = async (
+  queryClient: QueryClient,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getAdminJobManifestLoadQueryKey() }, options);
+
+  return queryClient;
 };