@squonk/data-manager-client 3.3.0 → 3.3.1

package/src/admin/admin.ts

@@ -1,6 +1,6 @@
 // @ts-nocheck
 /**
- * Generated by orval v7.2.0 🍺
+ * Generated by orval v7.4.1 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
@@ -15,6 +15,7 @@ import {
   useSuspenseQuery
 } from '@tanstack/react-query'
 import type {
+  DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   MutationFunction,
@@ -89,7 +90,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -105,7 +106,7 @@ export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof admin
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -115,11 +116,11 @@ export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof admin
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets Service Errors
  */
@@ -127,11 +128,11 @@ export function useAdminGetServiceErrors<TData = Awaited<ReturnType<typeof admin
 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: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getAdminGetServiceErrorsQueryOptions(params,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -155,7 +156,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetServiceErrors>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -165,15 +166,15 @@ 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: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Gets Service Errors
  */
@@ -181,11 +182,11 @@ export function useAdminGetServiceErrorsSuspense<TData = Awaited<ReturnType<type
 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: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getAdminGetServiceErrorsSuspenseQueryOptions(params,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -214,10 +215,15 @@ export const adminPatchServiceError = (
   
 
 
-export const getAdminPatchServiceErrorMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -231,7 +237,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{errorId: number}, TContext>}
 
     export type AdminPatchServiceErrorMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchServiceError>>>
     
@@ -240,10 +246,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Patches a Service Error
  */
-export const useAdminPatchServiceError = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError,{errorId: number}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminPatchServiceError>>,
+        TData,
         TError,
         {errorId: number},
         TContext
@@ -273,10 +279,15 @@ export const adminDeleteServiceError = (
   
 
 
-export const getAdminDeleteServiceErrorMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -290,7 +301,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{errorId: number}, TContext>}
 
     export type AdminDeleteServiceErrorMutationResult = NonNullable<Awaited<ReturnType<typeof adminDeleteServiceError>>>
     
@@ -299,10 +310,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Deletes a Service Error
  */
-export const useAdminDeleteServiceError = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError,{errorId: number}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminDeleteServiceError>>,
+        TData,
         TError,
         {errorId: number},
         TContext
@@ -351,7 +362,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -367,7 +378,7 @@ export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -377,11 +388,11 @@ export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get detailed information about all known Users
  */
@@ -389,11 +400,11 @@ export function useAdminGetUsers<TData = Awaited<ReturnType<typeof adminGetUsers
 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: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getAdminGetUsersQueryOptions(params,options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -417,7 +428,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetUsers>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -427,15 +438,15 @@ 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: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get detailed information about all known Users
  */
@@ -443,11 +454,11 @@ export function useAdminGetUsersSuspense<TData = Awaited<ReturnType<typeof admin
 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: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getAdminGetUsersSuspenseQueryOptions(params,options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -476,10 +487,15 @@ export const adminPutUser = (
   
 
 
-export const getAdminPutUserMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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};
 
       
 
@@ -493,7 +509,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{userId: string}, TContext>}
 
     export type AdminPutUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPutUser>>>
     
@@ -502,10 +518,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Prepares a user account in the Data Manager service
  */
-export const useAdminPutUser = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof adminPutUser>>, TError,{userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminPutUser>>,
+        TData,
         TError,
         {userId: string},
         TContext
@@ -535,10 +551,15 @@ export const adminDeleteUser = (
   
 
 
-export const getAdminDeleteUserMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -552,7 +573,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{userId: string}, TContext>}
 
     export type AdminDeleteUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminDeleteUser>>>
     
@@ -561,10 +582,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Deletes a user account
  */
-export const useAdminDeleteUser = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError,{userId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminDeleteUser>>,
+        TData,
         TError,
         {userId: string},
         TContext
@@ -601,10 +622,15 @@ if(userPatchBodyBody.suspend_message !== undefined) {
   
 
 
-export const getAdminPatchUserMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -618,7 +644,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{userId: string;data: UserPatchBodyBody}, TContext>}
 
     export type AdminPatchUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>
     export type AdminPatchUserMutationBody = UserPatchBodyBody
@@ -627,10 +653,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Patch a given user
  */
-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>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminPatchUser>>,
+        TData,
         TError,
         {userId: string;data: UserPatchBodyBody},
         TContext
@@ -680,7 +706,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -696,7 +722,7 @@ export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminG
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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<
@@ -706,11 +732,11 @@ export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminG
         > , 'initialData'
       >, request?: SecondParameter<typeof customInstance>}
 
-  ):  UseQueryResult<TData, TError> & { queryKey: QueryKey }
+  ):  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: QueryKey }
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get Job Manifests
  */
@@ -718,11 +744,11 @@ export function useAdminGetJobManifests<TData = Awaited<ReturnType<typeof adminG
 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: QueryKey } {
+  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getAdminGetJobManifestsQueryOptions(options)
 
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -746,7 +772,7 @@ const {query: queryOptions, request: requestOptions} = options ?? {};
 
       
 
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof adminGetJobManifests>>, TError, TData> & { queryKey: QueryKey }
+   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>>>
@@ -756,15 +782,15 @@ 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: QueryKey }
+  ):  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: QueryKey }
+  ):  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: QueryKey }
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
 /**
  * @summary Get Job Manifests
  */
@@ -772,11 +798,11 @@ export function useAdminGetJobManifestsSuspense<TData = Awaited<ReturnType<typeo
 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: QueryKey } {
+  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
 
   const queryOptions = getAdminGetJobManifestsSuspenseQueryOptions(options)
 
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: QueryKey };
+  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 
   query.queryKey = queryOptions.queryKey ;
 
@@ -817,10 +843,15 @@ if(jobManifestPutBodyBody.params !== undefined) {
   
 
 
-export const getAdminJobManifestPutMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -834,7 +865,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: JobManifestPutBodyBody}, TContext>}
 
     export type AdminJobManifestPutMutationResult = NonNullable<Awaited<ReturnType<typeof adminJobManifestPut>>>
     export type AdminJobManifestPutMutationBody = JobManifestPutBodyBody
@@ -843,10 +874,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Adds a Job Manifest and triggers the download of its Job Definitions
  */
-export const useAdminJobManifestPut = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError,{data: JobManifestPutBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminJobManifestPut>>,
+        TData,
         TError,
         {data: JobManifestPutBodyBody},
         TContext
@@ -880,10 +911,15 @@ export const adminDeleteJobManifest = (
   
 
 
-export const getAdminDeleteJobManifestMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = 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>}
+) => {
+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};
 
       
 
@@ -897,7 +933,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{jobManifestId: number;params?: AdminDeleteJobManifestParams}, TContext>}
 
     export type AdminDeleteJobManifestMutationResult = NonNullable<Awaited<ReturnType<typeof adminDeleteJobManifest>>>
     
@@ -906,10 +942,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Deletes a Job Manifest
  */
-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>}
+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>}
 ): UseMutationResult<
-        Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+        TData,
         TError,
         {jobManifestId: number;params?: AdminDeleteJobManifestParams},
         TContext
@@ -941,10 +977,15 @@ export const adminJobManifestLoad = (
   
 
 
-export const getAdminJobManifestLoadMutationOptions = <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 {mutation: mutationOptions, request: requestOptions} = options ?? {};
+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};
 
       
 
@@ -958,7 +999,7 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
         
 
 
-  return  { mutationFn, ...mutationOptions }}
+  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,void, TContext>}
 
     export type AdminJobManifestLoadMutationResult = NonNullable<Awaited<ReturnType<typeof adminJobManifestLoad>>>
     
@@ -967,10 +1008,10 @@ const {mutation: mutationOptions, request: requestOptions} = options ?? {};
     /**
  * @summary Trigger a download of Job Definitions using existing Job Manifests
  */
-export const useAdminJobManifestLoad = <TError = ErrorType<void | DmError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError,void, TContext>, request?: SecondParameter<typeof customInstance>}
+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<
-        Awaited<ReturnType<typeof adminJobManifestLoad>>,
+        TData,
         TError,
         void,
         TContext