@squonk/data-manager-client 4.2.0 → 4.3.0

package/src/admin/admin.ts

@@ -1,6 +1,5 @@
-// @ts-nocheck
 /**
- * Generated by orval v7.4.1 🍺
+ * Generated by orval v7.10.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
@@ -9,16 +8,13 @@ A service that allows *registered* users to make **Datasets** and associated **M
 
  * OpenAPI spec version: 4.1
  */
-import {
-  useMutation,
-  useQuery,
-  useSuspenseQuery
-} from '@tanstack/react-query'
+import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   MutationFunction,
+  QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
@@ -27,8 +23,9 @@ import type {
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
-  UseSuspenseQueryResult
-} from '@tanstack/react-query'
+  UseSuspenseQueryResult,
+} from "@tanstack/react-query";
+
 import type {
   AdminDeleteJobManifestParams,
   AdminGetServiceErrorsParams,
@@ -40,14 +37,15 @@ import type {
   JobManifestPutBodyBody,
   ServiceErrorsGetResponse,
   UserAccountDetail,
-  UserPatchBodyBody
-} from '../data-manager-api.schemas'
-import { customInstance } from '.././custom-instance';
-import type { ErrorType } from '.././custom-instance';
-
+  UserPatchBodyBody,
+} from "../data-manager-api.schemas";
 
-type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1];
+import { customInstance } from ".././custom-instance";
+import type { ErrorType } from ".././custom-instance";
+import { queryMutator } from ".././options-mutator";
+import { mutationMutator } from ".././options-mutator";
 
+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.
@@ -57,144 +55,237 @@ You will need `admin` rights to use this endpoint
  * @summary Gets Service Errors
  */
 export const adminGetServiceErrors = (
-    params?: AdminGetServiceErrorsParams,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  params?: AdminGetServiceErrorsParams,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<ServiceErrorsGetResponse>(
-      {url: `/admin/service-error`, method: 'GET',
-        params, signal
-    },
-      options);
-    }
-  
-
-export const getAdminGetServiceErrorsQueryKey = (params?: AdminGetServiceErrorsParams,) => {
-    return ["data-manager-api", `/admin/service-error`, ...(params ? [params]: [])] as const;
-    }
-
-    
-export const getAdminGetServiceErrorsQueryOptions = <TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<ServiceErrorsGetResponse>(
+    { url: `/admin/service-error`, method: "GET", params, signal },
+    options,
+  );
+};
+
+export const getAdminGetServiceErrorsQueryKey = (params?: AdminGetServiceErrorsParams) => {
+  return [`/admin/service-error`, ...(params ? [params] : [])] as const;
+};
+
+export const useAdminGetServiceErrorsQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getAdminGetServiceErrorsQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetServiceErrors>>> = ({ signal }) => adminGetServiceErrors(params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type AdminGetServiceErrorsQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetServiceErrors>>>
-export type AdminGetServiceErrorsQueryError = ErrorType<void | DmError>
-
-
-export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params: undefined |  AdminGetServiceErrorsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>> & Pick<
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminGetServiceErrorsQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetServiceErrors>>> = ({ signal }) =>
+    adminGetServiceErrors(params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof adminGetServiceErrors>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type AdminGetServiceErrorsQueryResult = NonNullable<
+  Awaited<ReturnType<typeof adminGetServiceErrors>>
+>;
+export type AdminGetServiceErrorsQueryError = ErrorType<void | DmError>;
+
+export function useAdminGetServiceErrors<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | AdminGetServiceErrorsParams,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    > &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof adminGetServiceErrors>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof adminGetServiceErrors>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetServiceErrors<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    > &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof adminGetServiceErrors>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof adminGetServiceErrors>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetServiceErrors<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Service Errors
  */
 
-export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getAdminGetServiceErrorsQueryOptions(params,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useAdminGetServiceErrors<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useAdminGetServiceErrorsQueryOptions(params, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getAdminGetServiceErrorsSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useAdminGetServiceErrorsSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getAdminGetServiceErrorsQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetServiceErrors>>> = ({ signal }) => adminGetServiceErrors(params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type AdminGetServiceErrorsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetServiceErrors>>>
-export type AdminGetServiceErrorsSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useAdminGetServiceErrorsSuspense<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params: undefined |  AdminGetServiceErrorsParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetServiceErrorsSuspense<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetServiceErrorsSuspense<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminGetServiceErrorsQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetServiceErrors>>> = ({ signal }) =>
+    adminGetServiceErrors(params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof adminGetServiceErrors>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type AdminGetServiceErrorsSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof adminGetServiceErrors>>
+>;
+export type AdminGetServiceErrorsSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useAdminGetServiceErrorsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | AdminGetServiceErrorsParams,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetServiceErrorsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetServiceErrorsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Service Errors
  */
 
-export function useAdminGetServiceErrorsSuspense<TData = Awaited<ReturnType<typeof adminGetServiceErrors>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetServiceErrorsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getAdminGetServiceErrorsSuspenseQueryOptions(params,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useAdminGetServiceErrorsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetServiceErrors>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetServiceErrorsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useAdminGetServiceErrorsSuspenseQueryOptions(params, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * Used primarily to 'Acknowledge' but not delete a Service Error.
 
@@ -203,63 +294,81 @@ You will need `admin` rights to use this endpoint
  * @summary Patches a Service Error
  */
 export const adminPatchServiceError = (
-    errorId: number,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/admin/service-error/${errorId}`, method: 'PATCH'
-    },
-      options);
-    }
-  
-
-
-export const getAdminPatchServiceErrorMutationOptions = <TData = Awaited<ReturnType<typeof adminPatchServiceError>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{errorId: number}, TContext>, request?: SecondParameter<typeof customInstance>}
+  errorId: number,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-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};
+  return customInstance<void>({ url: `/admin/service-error/${errorId}`, method: "PATCH" }, options);
+};
+
+export const useAdminPatchServiceErrorMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminPatchServiceError>>,
+    TError,
+    { errorId: number },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminPatchServiceErrorMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminPatchServiceError>>
+>;
+
+export type AdminPatchServiceErrorMutationError = ErrorType<void | DmError>;
 
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof adminPatchServiceError>>, {errorId: number}> = (props) => {
-          const {errorId} = props ?? {};
-
-          return  adminPatchServiceError(errorId,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{errorId: number}, TContext>}
-
-    export type AdminPatchServiceErrorMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchServiceError>>>
-    
-    export type AdminPatchServiceErrorMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Patches a Service Error
  */
-export const useAdminPatchServiceError = <TData = Awaited<ReturnType<typeof adminPatchServiceError>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{errorId: number}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminPatchServiceError = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminPatchServiceError>>,
+      TError,
+      { errorId: number },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {errorId: number},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminPatchServiceErrorMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminPatchServiceError>>,
+  TError,
+  { errorId: number },
+  TContext
+> => {
+  const mutationOptions = useAdminPatchServiceErrorMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Deletes an existing Service Error.
 
 You will need `admin` rights to use this endpoint
@@ -267,206 +376,308 @@ You will need `admin` rights to use this endpoint
  * @summary Deletes a Service Error
  */
 export const adminDeleteServiceError = (
-    errorId: number,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/admin/service-error/${errorId}`, method: 'DELETE'
-    },
-      options);
-    }
-  
-
-
-export const getAdminDeleteServiceErrorMutationOptions = <TData = Awaited<ReturnType<typeof adminDeleteServiceError>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{errorId: number}, TContext>, request?: SecondParameter<typeof customInstance>}
+  errorId: number,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-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};
+  return customInstance<void>(
+    { url: `/admin/service-error/${errorId}`, method: "DELETE" },
+    options,
+  );
+};
+
+export const useAdminDeleteServiceErrorMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminDeleteServiceError>>,
+    TError,
+    { errorId: number },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminDeleteServiceErrorMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminDeleteServiceError>>
+>;
+
+export type AdminDeleteServiceErrorMutationError = ErrorType<void | DmError>;
 
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof adminDeleteServiceError>>, {errorId: number}> = (props) => {
-          const {errorId} = props ?? {};
-
-          return  adminDeleteServiceError(errorId,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{errorId: number}, TContext>}
-
-    export type AdminDeleteServiceErrorMutationResult = NonNullable<Awaited<ReturnType<typeof adminDeleteServiceError>>>
-    
-    export type AdminDeleteServiceErrorMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Deletes a Service Error
  */
-export const useAdminDeleteServiceError = <TData = Awaited<ReturnType<typeof adminDeleteServiceError>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{errorId: number}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminDeleteServiceError = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminDeleteServiceError>>,
+      TError,
+      { errorId: number },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {errorId: number},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminDeleteServiceErrorMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminDeleteServiceError>>,
+  TError,
+  { errorId: number },
+  TContext
+> => {
+  const mutationOptions = useAdminDeleteServiceErrorMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * 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 = (
-    params?: AdminGetUsersParams,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  params?: AdminGetUsersParams,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<AdminUsersGetResponse>(
-      {url: `/admin/user`, method: 'GET',
-        params, signal
-    },
-      options);
-    }
-  
-
-export const getAdminGetUsersQueryKey = (params?: AdminGetUsersParams,) => {
-    return ["data-manager-api", `/admin/user`, ...(params ? [params]: [])] as const;
-    }
-
-    
-export const getAdminGetUsersQueryOptions = <TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(params?: AdminGetUsersParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<AdminUsersGetResponse>(
+    { url: `/admin/user`, method: "GET", params, signal },
+    options,
+  );
+};
+
+export const getAdminGetUsersQueryKey = (params?: AdminGetUsersParams) => {
+  return [`/admin/user`, ...(params ? [params] : [])] as const;
+};
+
+export const useAdminGetUsersQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getAdminGetUsersQueryKey(params);
+  const queryKey = queryOptions?.queryKey ?? getAdminGetUsersQueryKey(params);
 
-  
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetUsers>>> = ({ signal }) =>
+    adminGetUsers(params, requestOptions, signal);
 
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetUsers>>> = ({ signal }) => adminGetUsers(params, requestOptions, signal);
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-      
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof adminGetUsers>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-      
+export type AdminGetUsersQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetUsers>>>;
+export type AdminGetUsersQueryError = ErrorType<void | DmError>;
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type AdminGetUsersQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetUsers>>>
-export type AdminGetUsersQueryError = ErrorType<void | DmError>
-
-
-export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params: undefined |  AdminGetUsersParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>> & Pick<
+export function useAdminGetUsers<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | AdminGetUsersParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof adminGetUsers>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetUsersParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof adminGetUsers>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetUsers<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof adminGetUsers>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetUsersParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof adminGetUsers>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetUsers<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about all known Users
  */
 
-export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetUsersParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getAdminGetUsersQueryOptions(params,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useAdminGetUsers<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useAdminGetUsersQueryOptions(params, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getAdminGetUsersSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(params?: AdminGetUsersParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useAdminGetUsersSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getAdminGetUsersQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetUsers>>> = ({ signal }) => adminGetUsers(params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type AdminGetUsersSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetUsers>>>
-export type AdminGetUsersSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useAdminGetUsersSuspense<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params: undefined |  AdminGetUsersParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetUsersSuspense<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetUsersParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetUsersSuspense<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetUsersParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminGetUsersQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetUsers>>> = ({ signal }) =>
+    adminGetUsers(params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof adminGetUsers>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type AdminGetUsersSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof adminGetUsers>>
+>;
+export type AdminGetUsersSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useAdminGetUsersSuspense<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params: undefined | AdminGetUsersParams,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetUsersSuspense<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetUsersSuspense<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get detailed information about all known Users
  */
 
-export function useAdminGetUsersSuspense<TData = Awaited<ReturnType<typeof adminGetUsers>>, TError = ErrorType<void | DmError>>(
- params?: AdminGetUsersParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getAdminGetUsersSuspenseQueryOptions(params,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useAdminGetUsersSuspense<
+  TData = Awaited<ReturnType<typeof adminGetUsers>>,
+  TError = ErrorType<void | DmError>,
+>(
+  params?: AdminGetUsersParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useAdminGetUsersSuspenseQueryOptions(params, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * 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.
 
@@ -474,64 +685,80 @@ You will need `admin` rights to use this endpoint
 
  * @summary Prepares a user account in the Data Manager service
  */
-export const adminPutUser = (
-    userId: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<UserAccountDetail>(
-      {url: `/admin/user/${userId}`, method: 'PUT'
-    },
-      options);
-    }
-  
-
-
-export const getAdminPutUserMutationOptions = <TData = Awaited<ReturnType<typeof adminPutUser>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
-) => {
-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};
-
-      
-
+export const adminPutUser = (userId: string, options?: SecondParameter<typeof customInstance>) => {
+  return customInstance<UserAccountDetail>(
+    { url: `/admin/user/${userId}`, method: "PUT" },
+    options,
+  );
+};
+
+export const useAdminPutUserMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminPutUser>>,
+    TError,
+    { userId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminPutUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPutUser>>>;
+
+export type AdminPutUserMutationError = ErrorType<void | DmError>;
 
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof adminPutUser>>, {userId: string}> = (props) => {
-          const {userId} = props ?? {};
-
-          return  adminPutUser(userId,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{userId: string}, TContext>}
-
-    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 = <TData = Awaited<ReturnType<typeof adminPutUser>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminPutUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminPutUser>>,
+      TError,
+      { userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {userId: string},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminPutUserMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminPutUser>>,
+  TError,
+  { userId: string },
+  TContext
+> => {
+  const mutationOptions = useAdminPutUserMutationOptions(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
@@ -539,63 +766,81 @@ You will need `admin` rights to use this endpoint
  * @summary Deletes a user account
  */
 export const adminDeleteUser = (
-    userId: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/admin/user/${userId}`, method: 'DELETE'
-    },
-      options);
-    }
-  
-
-
-export const getAdminDeleteUserMutationOptions = <TData = Awaited<ReturnType<typeof adminDeleteUser>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+  userId: string,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-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};
-
-      
-
+  return customInstance<void>({ url: `/admin/user/${userId}`, method: "DELETE" }, options);
+};
+
+export const useAdminDeleteUserMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminDeleteUser>>,
+    TError,
+    { userId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminDeleteUserMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminDeleteUser>>
+>;
+
+export type AdminDeleteUserMutationError = ErrorType<void | DmError>;
 
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof adminDeleteUser>>, {userId: string}> = (props) => {
-          const {userId} = props ?? {};
-
-          return  adminDeleteUser(userId,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{userId: string}, TContext>}
-
-    export type AdminDeleteUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminDeleteUser>>>
-    
-    export type AdminDeleteUserMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Deletes a user account
  */
-export const useAdminDeleteUser = <TData = Awaited<ReturnType<typeof adminDeleteUser>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminDeleteUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminDeleteUser>>,
+      TError,
+      { userId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {userId: string},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminDeleteUserMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminDeleteUser>>,
+  TError,
+  { userId: string },
+  TContext
+> => {
+  const mutationOptions = useAdminDeleteUserMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Patches a user record, typically to suspend or re-enable a user account
 
 You will need `admin` rights to use this endpoint
@@ -603,70 +848,93 @@ You will need `admin` rights to use this endpoint
  * @summary Patch a given user
  */
 export const adminPatchUser = (
-    userId: string,
-    userPatchBodyBody: UserPatchBodyBody,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      const formUrlEncoded = new URLSearchParams();
-if(userPatchBodyBody.suspend_message !== undefined) {
- formUrlEncoded.append('suspend_message', userPatchBodyBody.suspend_message)
- }
-
-      return customInstance<void>(
-      {url: `/admin/user/${userId}`, method: 'PATCH',
-      headers: {'Content-Type': 'application/x-www-form-urlencoded', },
-       data: formUrlEncoded
-    },
-      options);
-    }
-  
-
-
-export const getAdminPatchUserMutationOptions = <TData = Awaited<ReturnType<typeof adminPatchUser>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{userId: string;data: UserPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+  userId: string,
+  userPatchBodyBody: UserPatchBodyBody,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-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)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{userId: string;data: UserPatchBodyBody}, TContext>}
-
-    export type AdminPatchUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>
-    export type AdminPatchUserMutationBody = UserPatchBodyBody
-    export type AdminPatchUserMutationError = ErrorType<void | DmError>
+  const formUrlEncoded = new URLSearchParams();
+  if (userPatchBodyBody.suspend_message !== undefined) {
+    formUrlEncoded.append(`suspend_message`, userPatchBodyBody.suspend_message);
+  }
+
+  return customInstance<void>(
+    {
+      url: `/admin/user/${userId}`,
+      method: "PATCH",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      data: formUrlEncoded,
+    },
+    options,
+  );
+};
+
+export const useAdminPatchUserMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminPatchUser>>,
+    TError,
+    { userId: string; data: UserPatchBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminPatchUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>;
+export type AdminPatchUserMutationBody = UserPatchBodyBody;
+export type AdminPatchUserMutationError = ErrorType<void | DmError>;
 
-    /**
+/**
  * @summary Patch a given user
  */
-export const useAdminPatchUser = <TData = Awaited<ReturnType<typeof adminPatchUser>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{userId: string;data: UserPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminPatchUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminPatchUser>>,
+      TError,
+      { userId: string; data: UserPatchBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {userId: string;data: UserPatchBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminPatchUserMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminPatchUser>>,
+  TError,
+  { userId: string; data: UserPatchBodyBody },
+  TContext
+> => {
+  const mutationOptions = useAdminPatchUserMutationOptions(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.
 
 You will need `admin` rights to use this endpoint
@@ -674,143 +942,220 @@ You will need `admin` rights to use this endpoint
  * @summary Get Job Manifests
  */
 export const adminGetJobManifests = (
-    
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<AdminJobManifestGetResponse>(
-      {url: `/admin/job-manifest`, method: 'GET', signal
-    },
-      options);
-    }
-  
+  return customInstance<AdminJobManifestGetResponse>(
+    { url: `/admin/job-manifest`, method: "GET", signal },
+    options,
+  );
+};
 
 export const getAdminGetJobManifestsQueryKey = () => {
-    return ["data-manager-api", `/admin/job-manifest`] as const;
-    }
-
-    
-export const getAdminGetJobManifestsQueryOptions = <TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>( options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getAdminGetJobManifestsQueryKey();
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetJobManifests>>> = ({ signal }) => adminGetJobManifests(requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type AdminGetJobManifestsQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetJobManifests>>>
-export type AdminGetJobManifestsQueryError = ErrorType<void | DmError>
-
-
-export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>> & Pick<
+  return [`/admin/job-manifest`] as const;
+};
+
+export const useAdminGetJobManifestsQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(options?: {
+  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminGetJobManifestsQueryKey();
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetJobManifests>>> = ({ signal }) =>
+    adminGetJobManifests(requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof adminGetJobManifests>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type AdminGetJobManifestsQueryResult = NonNullable<
+  Awaited<ReturnType<typeof adminGetJobManifests>>
+>;
+export type AdminGetJobManifestsQueryError = ErrorType<void | DmError>;
+
+export function useAdminGetJobManifests<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    > &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof adminGetJobManifests>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof adminGetJobManifests>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetJobManifests<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    > &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof adminGetJobManifests>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof adminGetJobManifests>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetJobManifests<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Job Manifests
  */
 
-export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getAdminGetJobManifestsQueryOptions(options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useAdminGetJobManifests<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useAdminGetJobManifestsQueryOptions(options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getAdminGetJobManifestsSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>( options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getAdminGetJobManifestsQueryKey();
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetJobManifests>>> = ({ signal }) => adminGetJobManifests(requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type AdminGetJobManifestsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof adminGetJobManifests>>>
-export type AdminGetJobManifestsSuspenseQueryError = ErrorType<void | DmError>
-
-
-export function useAdminGetJobManifestsSuspense<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetJobManifestsSuspense<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useAdminGetJobManifestsSuspense<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export const useAdminGetJobManifestsSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(options?: {
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getAdminGetJobManifestsQueryKey();
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminGetJobManifests>>> = ({ signal }) =>
+    adminGetJobManifests(requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof adminGetJobManifests>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type AdminGetJobManifestsSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof adminGetJobManifests>>
+>;
+export type AdminGetJobManifestsSuspenseQueryError = ErrorType<void | DmError>;
+
+export function useAdminGetJobManifestsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetJobManifestsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useAdminGetJobManifestsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get Job Manifests
  */
 
-export function useAdminGetJobManifestsSuspense<TData = Awaited<ReturnType<typeof adminGetJobManifests>>, TError = ErrorType<void | DmError>>(
-  options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getAdminGetJobManifestsSuspenseQueryOptions(options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useAdminGetJobManifestsSuspense<
+  TData = Awaited<ReturnType<typeof adminGetJobManifests>>,
+  TError = ErrorType<void | DmError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useAdminGetJobManifestsSuspenseQueryOptions(options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * 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.
 
@@ -821,73 +1166,98 @@ 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 = (
-    jobManifestPutBodyBody: JobManifestPutBodyBody,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      const formUrlEncoded = new URLSearchParams();
-formUrlEncoded.append('url', jobManifestPutBodyBody.url)
-if(jobManifestPutBodyBody.header !== undefined) {
- formUrlEncoded.append('header', jobManifestPutBodyBody.header)
- }
-if(jobManifestPutBodyBody.params !== undefined) {
- formUrlEncoded.append('params', jobManifestPutBodyBody.params)
- }
-
-      return customInstance<AdminJobManifestLoadPutResponse>(
-      {url: `/admin/job-manifest`, method: 'PUT',
-      headers: {'Content-Type': 'application/x-www-form-urlencoded', },
-       data: formUrlEncoded
-    },
-      options);
-    }
-  
-
-
-export const getAdminJobManifestPutMutationOptions = <TData = Awaited<ReturnType<typeof adminJobManifestPut>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: JobManifestPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+  jobManifestPutBodyBody: JobManifestPutBodyBody,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-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 ?? {};
-
-          return  adminJobManifestPut(data,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: JobManifestPutBodyBody}, TContext>}
-
-    export type AdminJobManifestPutMutationResult = NonNullable<Awaited<ReturnType<typeof adminJobManifestPut>>>
-    export type AdminJobManifestPutMutationBody = JobManifestPutBodyBody
-    export type AdminJobManifestPutMutationError = ErrorType<void | DmError>
+  const formUrlEncoded = new URLSearchParams();
+  formUrlEncoded.append(`url`, jobManifestPutBodyBody.url);
+  if (jobManifestPutBodyBody.header !== undefined) {
+    formUrlEncoded.append(`header`, jobManifestPutBodyBody.header);
+  }
+  if (jobManifestPutBodyBody.params !== undefined) {
+    formUrlEncoded.append(`params`, jobManifestPutBodyBody.params);
+  }
+
+  return customInstance<AdminJobManifestLoadPutResponse>(
+    {
+      url: `/admin/job-manifest`,
+      method: "PUT",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      data: formUrlEncoded,
+    },
+    options,
+  );
+};
+
+export const useAdminJobManifestPutMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminJobManifestPut>>,
+    TError,
+    { data: JobManifestPutBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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 ?? {};
+
+    return adminJobManifestPut(data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminJobManifestPutMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminJobManifestPut>>
+>;
+export type AdminJobManifestPutMutationBody = JobManifestPutBodyBody;
+export type AdminJobManifestPutMutationError = ErrorType<void | DmError>;
 
-    /**
+/**
  * @summary Adds a Job Manifest and triggers the download of its Job Definitions
  */
-export const useAdminJobManifestPut = <TData = Awaited<ReturnType<typeof adminJobManifestPut>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: JobManifestPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminJobManifestPut = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminJobManifestPut>>,
+      TError,
+      { data: JobManifestPutBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {data: JobManifestPutBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminJobManifestPutMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminJobManifestPut>>,
+  TError,
+  { data: JobManifestPutBodyBody },
+  TContext
+> => {
+  const mutationOptions = useAdminJobManifestPutMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * 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.
@@ -897,65 +1267,85 @@ You will need `admin` rights to use this endpoint and the Data Manager needs to
  * @summary Deletes a Job Manifest
  */
 export const adminDeleteJobManifest = (
-    jobManifestId: number,
-    params?: AdminDeleteJobManifestParams,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/admin/job-manifest/${jobManifestId}`, method: 'DELETE',
-        params
-    },
-      options);
-    }
-  
-
-
-export const getAdminDeleteJobManifestMutationOptions = <TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{jobManifestId: number;params?: AdminDeleteJobManifestParams}, TContext>, request?: SecondParameter<typeof customInstance>}
+  jobManifestId: number,
+  params?: AdminDeleteJobManifestParams,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-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)
-        }
-
-        
+  return customInstance<void>(
+    { url: `/admin/job-manifest/${jobManifestId}`, method: "DELETE", params },
+    options,
+  );
+};
+
+export const useAdminDeleteJobManifestMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+    TError,
+    { jobManifestId: number; params?: AdminDeleteJobManifestParams },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminDeleteJobManifestMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminDeleteJobManifest>>
+>;
+
+export type AdminDeleteJobManifestMutationError = ErrorType<void | DmError>;
 
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{jobManifestId: number;params?: AdminDeleteJobManifestParams}, TContext>}
-
-    export type AdminDeleteJobManifestMutationResult = NonNullable<Awaited<ReturnType<typeof adminDeleteJobManifest>>>
-    
-    export type AdminDeleteJobManifestMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Deletes a Job Manifest
  */
-export const useAdminDeleteJobManifest = <TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{jobManifestId: number;params?: AdminDeleteJobManifestParams}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useAdminDeleteJobManifest = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+      TError,
+      { jobManifestId: number; params?: AdminDeleteJobManifestParams },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {jobManifestId: number;params?: AdminDeleteJobManifestParams},
-        TContext
-      > => {
-
-      const mutationOptions = getAdminDeleteJobManifestMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+  TError,
+  { jobManifestId: number; params?: AdminDeleteJobManifestParams },
+  TContext
+> => {
+  const mutationOptions = useAdminDeleteJobManifestMutationOptions(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.
@@ -964,61 +1354,71 @@ You will need `admin` rights to use this endpoint and the Data Manager needs to
 
  * @summary Trigger a download of Job Definitions using existing Job Manifests
  */
-export const adminJobManifestLoad = (
-    
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<AdminJobManifestLoadPutResponse>(
-      {url: `/admin/job-manifest/load`, method: 'PUT'
-    },
-      options);
-    }
-  
+export const adminJobManifestLoad = (options?: SecondParameter<typeof customInstance>) => {
+  return customInstance<AdminJobManifestLoadPutResponse>(
+    { url: `/admin/job-manifest/load`, method: "PUT" },
+    options,
+  );
+};
+
+export const useAdminJobManifestLoadMutationOptions = <
+  TError = ErrorType<void | DmError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof adminJobManifestLoad>>,
+    TError,
+    void,
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): 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 customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type AdminJobManifestLoadMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminJobManifestLoad>>
+>;
+
+export type AdminJobManifestLoadMutationError = ErrorType<void | DmError>;
 
-
-export const getAdminJobManifestLoadMutationOptions = <TData = Awaited<ReturnType<typeof adminJobManifestLoad>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
-) => {
-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)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,void, TContext>}
-
-    export type AdminJobManifestLoadMutationResult = NonNullable<Awaited<ReturnType<typeof adminJobManifestLoad>>>
-    
-    export type AdminJobManifestLoadMutationError = ErrorType<void | DmError>
-
-    /**
+/**
  * @summary Trigger a download of Job Definitions using existing Job Manifests
  */
-export const useAdminJobManifestLoad = <TData = Awaited<ReturnType<typeof adminJobManifestLoad>>, TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
-): UseMutationResult<
-        TData,
-        TError,
-        void,
-        TContext
-      > => {
-
-      const mutationOptions = getAdminJobManifestLoadMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    
+export const useAdminJobManifestLoad = <TError = ErrorType<void | DmError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminJobManifestLoad>>,
+      TError,
+      void,
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseMutationResult<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, void, TContext> => {
+  const mutationOptions = useAdminJobManifestLoadMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};