@squonk/data-manager-client 6.7.1 → 6.7.2

package/src/api/admin/admin.ts

@@ -1,5 +1,5 @@
 /**
- * Generated by orval v8.16.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
@@ -8,16 +8,19 @@
  *
  * OpenAPI spec version: 6.7
  */
-import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
+  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
+  UseMutationOptions,
+  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -43,6 +46,21 @@ import type { ErrorType } from "../../custom-axios";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
+
 /**
  * Displays the existing Service Errors, which can also include acknowledged errors, normally excluded from the list.
  *
@@ -173,7 +191,7 @@ export function useAdminGetServiceErrors<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -286,7 +304,7 @@ export function useAdminGetServiceErrorsSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -306,141 +324,70 @@ export const adminPatchServiceError = (
   );
 };
 
-export const getAdminPatchServiceErrorQueryKey = (errorId: number) => {
-  return ["data-manager", "PATCH", "admin", "service-error", errorId] as const;
-};
-
-export const getAdminPatchServiceErrorQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
+export const getAdminPatchServiceErrorMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminPatchServiceErrorQueryKey(errorId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminPatchServiceError>>> = ({ signal }) =>
-    adminPatchServiceError(errorId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: errorId !== null && errorId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminPatchServiceErrorQueryResult = NonNullable<
+export type AdminPatchServiceErrorMutationResult = NonNullable<
   Awaited<ReturnType<typeof adminPatchServiceError>>
 >;
-export type AdminPatchServiceErrorQueryError = ErrorType<void | DmError>;
 
-export function useAdminPatchServiceError<
-  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminPatchServiceError>>,
-          TError,
-          Awaited<ReturnType<typeof adminPatchServiceError>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminPatchServiceError<
-  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminPatchServiceError>>,
-          TError,
-          Awaited<ReturnType<typeof adminPatchServiceError>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminPatchServiceError<
-  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type AdminPatchServiceErrorMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Patches a Service Error
  */
-
-export function useAdminPatchServiceError<
-  TData = Awaited<ReturnType<typeof adminPatchServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
+export const useAdminPatchServiceError = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminPatchServiceError>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminPatchServiceError>>,
+      TError,
+      { errorId: number },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminPatchServiceErrorQueryOptions(errorId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Patches a Service Error
- */
-export const invalidateAdminPatchServiceError = async (
-  queryClient: QueryClient,
-  errorId: number,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAdminPatchServiceErrorQueryKey(errorId) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminPatchServiceError>>,
+  TError,
+  { errorId: number },
+  TContext
+> => {
+  return useMutation(getAdminPatchServiceErrorMutationOptions(options), queryClient);
 };
-
 /**
  * Deletes an existing Service Error.
  *
@@ -458,142 +405,70 @@ export const adminDeleteServiceError = (
   );
 };
 
-export const getAdminDeleteServiceErrorQueryKey = (errorId: number) => {
-  return ["data-manager", "DELETE", "admin", "service-error", errorId] as const;
-};
-
-export const getAdminDeleteServiceErrorQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
+export const getAdminDeleteServiceErrorMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminDeleteServiceErrorQueryKey(errorId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminDeleteServiceError>>> = ({
-    signal,
-  }) => adminDeleteServiceError(errorId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: errorId !== null && errorId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminDeleteServiceErrorQueryResult = NonNullable<
+export type AdminDeleteServiceErrorMutationResult = NonNullable<
   Awaited<ReturnType<typeof adminDeleteServiceError>>
 >;
-export type AdminDeleteServiceErrorQueryError = ErrorType<void | DmError>;
 
-export function useAdminDeleteServiceError<
-  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminDeleteServiceError>>,
-          TError,
-          Awaited<ReturnType<typeof adminDeleteServiceError>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminDeleteServiceError<
-  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminDeleteServiceError>>,
-          TError,
-          Awaited<ReturnType<typeof adminDeleteServiceError>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminDeleteServiceError<
-  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type AdminDeleteServiceErrorMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Deletes a Service Error
  */
-
-export function useAdminDeleteServiceError<
-  TData = Awaited<ReturnType<typeof adminDeleteServiceError>>,
-  TError = ErrorType<void | DmError>,
->(
-  errorId: number,
+export const useAdminDeleteServiceError = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteServiceError>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminDeleteServiceError>>,
+      TError,
+      { errorId: number },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminDeleteServiceErrorQueryOptions(errorId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Deletes a Service Error
- */
-export const invalidateAdminDeleteServiceError = async (
-  queryClient: QueryClient,
-  errorId: number,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAdminDeleteServiceErrorQueryKey(errorId) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminDeleteServiceError>>,
+  TError,
+  { errorId: number },
+  TContext
+> => {
+  return useMutation(getAdminDeleteServiceErrorMutationOptions(options), 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
@@ -710,7 +585,7 @@ export function useAdminGetUsers<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -820,7 +695,7 @@ export function useAdminGetUsersSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -840,260 +715,146 @@ export const adminPutUser = (
   );
 };
 
-export const getAdminPutUserQueryKey = (userId: string) => {
-  return ["data-manager", "PUT", "admin", "user", userId] as const;
+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 mutationKey = ["adminPutUser"];
+  const { mutation: mutationOptions, request: requestOptions } = options
+    ? options.mutation && "mutationKey" in options.mutation && options.mutation.mutationKey
+      ? options
+      : { ...options, mutation: { ...options.mutation, mutationKey } }
+    : { mutation: { mutationKey }, request: undefined };
+
+  const mutationFn: MutationFunction<
+    Awaited<ReturnType<typeof adminPutUser>>,
+    { userId: string }
+  > = (props) => {
+    const { userId } = props ?? {};
+
+    return adminPutUser(userId, requestOptions);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export const getAdminPutUserQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminPutUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
+export type AdminPutUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPutUser>>>;
+
+export type AdminPutUserMutationError = ErrorType<void | DmError>;
+
+/**
+ * @summary Prepares a user account in the Data Manager service
+ */
+export const useAdminPutUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminPutUser>>,
+      TError,
+      { userId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
+  queryClient?: QueryClient,
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminPutUser>>,
+  TError,
+  { userId: string },
+  TContext
+> => {
+  return useMutation(getAdminPutUserMutationOptions(options), queryClient);
+};
+/**
+ * Deletes a user account, along with all the user's Datasets
+ *
+ * You will need `admin` rights to use this endpoint
+ * @summary Deletes a user account
+ */
+export const adminDeleteUser = (
+  userId: string,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminPutUserQueryKey(userId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminPutUser>>> = ({ signal }) =>
-    adminPutUser(userId, requestOptions, signal);
+  return customInstance<void>({ url: `/admin/user/${userId}`, method: "DELETE", signal }, options);
+};
 
-  return {
-    queryKey,
-    queryFn,
-    enabled: userId !== null && userId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+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 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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminPutUserQueryResult = NonNullable<Awaited<ReturnType<typeof adminPutUser>>>;
-export type AdminPutUserQueryError = ErrorType<void | DmError>;
+export type AdminDeleteUserMutationResult = NonNullable<
+  Awaited<ReturnType<typeof adminDeleteUser>>
+>;
 
-export function useAdminPutUser<
-  TData = Awaited<ReturnType<typeof adminPutUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminPutUser>>,
-          TError,
-          Awaited<ReturnType<typeof adminPutUser>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminPutUser<
-  TData = Awaited<ReturnType<typeof adminPutUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
+export type AdminDeleteUserMutationError = ErrorType<void | DmError>;
+
+/**
+ * @summary Deletes a user account
+ */
+export const useAdminDeleteUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminPutUser>>,
-          TError,
-          Awaited<ReturnType<typeof adminPutUser>>
-        >,
-        "initialData"
-      >;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminDeleteUser>>,
+      TError,
+      { userId: string },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminPutUser<
-  TData = Awaited<ReturnType<typeof adminPutUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-/**
- * @summary Prepares a user account in the Data Manager service
- */
-
-export function useAdminPutUser<
-  TData = Awaited<ReturnType<typeof adminPutUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPutUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminPutUserQueryOptions(userId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Prepares a user account in the Data Manager service
- */
-export const invalidateAdminPutUser = async (
-  queryClient: QueryClient,
-  userId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getAdminPutUserQueryKey(userId) }, options);
-
-  return queryClient;
-};
-
-/**
- * Deletes a user account, along with all the user's Datasets
- *
- * You will need `admin` rights to use this endpoint
- * @summary Deletes a user account
- */
-export const adminDeleteUser = (
-  userId: string,
-  options?: SecondParameter<typeof customInstance>,
-  signal?: AbortSignal,
-) => {
-  return customInstance<void>({ url: `/admin/user/${userId}`, method: "DELETE", signal }, options);
-};
-
-export const getAdminDeleteUserQueryKey = (userId: string) => {
-  return ["data-manager", "DELETE", "admin", "user", userId] as const;
-};
-
-export const getAdminDeleteUserQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminDeleteUserQueryKey(userId);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminDeleteUser>>> = ({ signal }) =>
-    adminDeleteUser(userId, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: userId !== null && userId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-};
-
-export type AdminDeleteUserQueryResult = NonNullable<Awaited<ReturnType<typeof adminDeleteUser>>>;
-export type AdminDeleteUserQueryError = ErrorType<void | DmError>;
-
-export function useAdminDeleteUser<
-  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminDeleteUser>>,
-          TError,
-          Awaited<ReturnType<typeof adminDeleteUser>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminDeleteUser<
-  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminDeleteUser>>,
-          TError,
-          Awaited<ReturnType<typeof adminDeleteUser>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminDeleteUser<
-  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-/**
- * @summary Deletes a user account
- */
-
-export function useAdminDeleteUser<
-  TData = Awaited<ReturnType<typeof adminDeleteUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminDeleteUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminDeleteUserQueryOptions(userId, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Deletes a user account
- */
-export const invalidateAdminDeleteUser = async (
-  queryClient: QueryClient,
-  userId: string,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getAdminDeleteUserQueryKey(userId) }, options);
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminDeleteUser>>,
+  TError,
+  { userId: string },
+  TContext
+> => {
+  return useMutation(getAdminDeleteUserMutationOptions(options), queryClient);
 };
-
 /**
  * Patches a user record, typically to suspend or re-enable a user account
  *
@@ -1123,138 +884,68 @@ export const adminPatchUser = (
   );
 };
 
-export const getAdminPatchUserQueryKey = (
-  userId: string,
-  userPatchBodyBody?: UserPatchBodyBody,
-) => {
-  return ["data-manager", "PATCH", "admin", "user", userId, userPatchBodyBody] as const;
-};
-
-export const getAdminPatchUserQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminPatchUser>>,
+export const getAdminPatchUserMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  userPatchBodyBody: UserPatchBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminPatchUserQueryKey(userId, userPatchBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminPatchUser>>> = ({ signal }) =>
-    adminPatchUser(userId, userPatchBodyBody, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: userId !== null && userId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminPatchUserQueryResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>;
-export type AdminPatchUserQueryError = ErrorType<void | DmError>;
+export type AdminPatchUserMutationResult = NonNullable<Awaited<ReturnType<typeof adminPatchUser>>>;
+export type AdminPatchUserMutationBody = UserPatchBodyBody;
+export type AdminPatchUserMutationError = ErrorType<void | DmError>;
 
-export function useAdminPatchUser<
-  TData = Awaited<ReturnType<typeof adminPatchUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  userPatchBodyBody: UserPatchBodyBody,
-  options: {
-    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>> &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminPatchUser>>,
-          TError,
-          Awaited<ReturnType<typeof adminPatchUser>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminPatchUser<
-  TData = Awaited<ReturnType<typeof adminPatchUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  userPatchBodyBody: UserPatchBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>> &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminPatchUser>>,
-          TError,
-          Awaited<ReturnType<typeof adminPatchUser>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminPatchUser<
-  TData = Awaited<ReturnType<typeof adminPatchUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  userPatchBodyBody: UserPatchBodyBody,
-  options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>>;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Patch a given user
  */
-
-export function useAdminPatchUser<
-  TData = Awaited<ReturnType<typeof adminPatchUser>>,
-  TError = ErrorType<void | DmError>,
->(
-  userId: string,
-  userPatchBodyBody: UserPatchBodyBody,
+export const useAdminPatchUser = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminPatchUser>>, TError, TData>>;
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminPatchUser>>,
+      TError,
+      { userId: string; data: UserPatchBodyBody },
+      TContext
+    >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminPatchUserQueryOptions(userId, userPatchBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Patch a given user
- */
-export const invalidateAdminPatchUser = async (
-  queryClient: QueryClient,
-  userId: string,
-  userPatchBodyBody: UserPatchBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAdminPatchUserQueryKey(userId, userPatchBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminPatchUser>>,
+  TError,
+  { userId: string; data: UserPatchBodyBody },
+  TContext
+> => {
+  return useMutation(getAdminPatchUserMutationOptions(options), 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.
  *
@@ -1375,7 +1066,7 @@ export function useAdminGetJobManifests<
     queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1477,7 +1168,7 @@ export function useAdminGetJobManifestsSuspense<
     TError
   > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return { ...query, queryKey: queryOptions.queryKey };
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -1516,138 +1207,70 @@ export const adminJobManifestPut = (
   );
 };
 
-export const getAdminJobManifestPutQueryKey = (jobManifestPutBodyBody?: JobManifestPutBodyBody) => {
-  return ["data-manager", "PUT", "admin", "job-manifest", jobManifestPutBodyBody] as const;
-};
-
-export const getAdminJobManifestPutQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
+export const getAdminJobManifestPutMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  jobManifestPutBodyBody: JobManifestPutBodyBody,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminJobManifestPutQueryKey(jobManifestPutBodyBody);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminJobManifestPut>>> = ({ signal }) =>
-    adminJobManifestPut(jobManifestPutBodyBody, requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof adminJobManifestPut>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, 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);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminJobManifestPutQueryResult = NonNullable<
+export type AdminJobManifestPutMutationResult = NonNullable<
   Awaited<ReturnType<typeof adminJobManifestPut>>
 >;
-export type AdminJobManifestPutQueryError = ErrorType<void | DmError>;
+export type AdminJobManifestPutMutationBody = JobManifestPutBodyBody;
+export type AdminJobManifestPutMutationError = ErrorType<void | DmError>;
 
-export function useAdminJobManifestPut<
-  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestPutBodyBody: JobManifestPutBodyBody,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminJobManifestPut>>,
-          TError,
-          Awaited<ReturnType<typeof adminJobManifestPut>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminJobManifestPut<
-  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestPutBodyBody: JobManifestPutBodyBody,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminJobManifestPut>>,
-          TError,
-          Awaited<ReturnType<typeof adminJobManifestPut>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminJobManifestPut<
-  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestPutBodyBody: JobManifestPutBodyBody,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Adds a Job Manifest and triggers the download of its Job Definitions
  */
-
-export function useAdminJobManifestPut<
-  TData = Awaited<ReturnType<typeof adminJobManifestPut>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestPutBodyBody: JobManifestPutBodyBody,
+export const useAdminJobManifestPut = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestPut>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminJobManifestPut>>,
+      TError,
+      { data: JobManifestPutBodyBody },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminJobManifestPutQueryOptions(jobManifestPutBodyBody, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Adds a Job Manifest and triggers the download of its Job Definitions
- */
-export const invalidateAdminJobManifestPut = async (
-  queryClient: QueryClient,
-  jobManifestPutBodyBody: JobManifestPutBodyBody,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAdminJobManifestPutQueryKey(jobManifestPutBodyBody) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminJobManifestPut>>,
+  TError,
+  { data: JobManifestPutBodyBody },
+  TContext
+> => {
+  return useMutation(getAdminJobManifestPutMutationOptions(options), queryClient);
 };
-
 /**
  * Deletes a Job Manifest record
  *
@@ -1668,158 +1291,70 @@ export const adminDeleteJobManifest = (
   );
 };
 
-export const getAdminDeleteJobManifestQueryKey = (
-  jobManifestId: number,
-  params?: AdminDeleteJobManifestParams,
-) => {
-  return [
-    "data-manager",
-    "DELETE",
-    "admin",
-    "job-manifest",
-    jobManifestId,
-    ...(params ? [params] : []),
-  ] as const;
-};
-
-export const getAdminDeleteJobManifestQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+export const getAdminDeleteJobManifestMutationOptions = <
   TError = ErrorType<void | DmError>,
->(
-  jobManifestId: number,
-  params?: AdminDeleteJobManifestParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ?? getAdminDeleteJobManifestQueryKey(jobManifestId, params);
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminDeleteJobManifest>>> = ({ signal }) =>
-    adminDeleteJobManifest(jobManifestId, params, requestOptions, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: jobManifestId !== null && jobManifestId !== undefined,
-    ...queryOptions,
-  } as UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
+  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);
   };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminDeleteJobManifestQueryResult = NonNullable<
+export type AdminDeleteJobManifestMutationResult = NonNullable<
   Awaited<ReturnType<typeof adminDeleteJobManifest>>
 >;
-export type AdminDeleteJobManifestQueryError = ErrorType<void | DmError>;
 
-export function useAdminDeleteJobManifest<
-  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestId: number,
-  params: undefined | AdminDeleteJobManifestParams,
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-          TError,
-          Awaited<ReturnType<typeof adminDeleteJobManifest>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminDeleteJobManifest<
-  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestId: number,
-  params?: AdminDeleteJobManifestParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-          TError,
-          Awaited<ReturnType<typeof adminDeleteJobManifest>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminDeleteJobManifest<
-  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestId: number,
-  params?: AdminDeleteJobManifestParams,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type AdminDeleteJobManifestMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Deletes a Job Manifest
  */
-
-export function useAdminDeleteJobManifest<
-  TData = Awaited<ReturnType<typeof adminDeleteJobManifest>>,
-  TError = ErrorType<void | DmError>,
->(
-  jobManifestId: number,
-  params?: AdminDeleteJobManifestParams,
+export const useAdminDeleteJobManifest = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminDeleteJobManifest>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+      TError,
+      { jobManifestId: number; params?: AdminDeleteJobManifestParams },
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminDeleteJobManifestQueryOptions(jobManifestId, params, options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Deletes a Job Manifest
- */
-export const invalidateAdminDeleteJobManifest = async (
-  queryClient: QueryClient,
-  jobManifestId: number,
-  params?: AdminDeleteJobManifestParams,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries(
-    { queryKey: getAdminDeleteJobManifestQueryKey(jobManifestId, params) },
-    options,
-  );
-
-  return queryClient;
+): UseMutationResult<
+  Awaited<ReturnType<typeof adminDeleteJobManifest>>,
+  TError,
+  { jobManifestId: number; params?: AdminDeleteJobManifestParams },
+  TContext
+> => {
+  return useMutation(getAdminDeleteJobManifestMutationOptions(options), 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.
  *
@@ -1838,121 +1373,60 @@ export const adminJobManifestLoad = (
   );
 };
 
-export const getAdminJobManifestLoadQueryKey = () => {
-  return ["data-manager", "PUT", "admin", "job-manifest", "load"] as const;
-};
-
-export const getAdminJobManifestLoadQueryOptions = <
-  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
+export const getAdminJobManifestLoadMutationOptions = <
   TError = ErrorType<void | DmError>,
+  TContext = unknown,
 >(options?: {
-  query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>>;
-  request?: SecondParameter<typeof customInstance>;
-}) => {
-  const { query: queryOptions, request: requestOptions } = options ?? {};
-
-  const queryKey = queryOptions?.queryKey ?? getAdminJobManifestLoadQueryKey();
-
-  const queryFn: QueryFunction<Awaited<ReturnType<typeof adminJobManifestLoad>>> = ({ signal }) =>
-    adminJobManifestLoad(requestOptions, signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+  mutation?: UseMutationOptions<
     Awaited<ReturnType<typeof adminJobManifestLoad>>,
     TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData, 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);
+  };
+
+  return { mutationFn, ...mutationOptions };
 };
 
-export type AdminJobManifestLoadQueryResult = NonNullable<
+export type AdminJobManifestLoadMutationResult = NonNullable<
   Awaited<ReturnType<typeof adminJobManifestLoad>>
 >;
-export type AdminJobManifestLoadQueryError = ErrorType<void | DmError>;
 
-export function useAdminJobManifestLoad<
-  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
-  TError = ErrorType<void | DmError>,
->(
-  options: {
-    query: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
-    > &
-      Pick<
-        DefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminJobManifestLoad>>,
-          TError,
-          Awaited<ReturnType<typeof adminJobManifestLoad>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminJobManifestLoad<
-  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
-  TError = ErrorType<void | DmError>,
->(
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
-    > &
-      Pick<
-        UndefinedInitialDataOptions<
-          Awaited<ReturnType<typeof adminJobManifestLoad>>,
-          TError,
-          Awaited<ReturnType<typeof adminJobManifestLoad>>
-        >,
-        "initialData"
-      >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-export function useAdminJobManifestLoad<
-  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
-  TError = ErrorType<void | DmError>,
->(
-  options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
-    >;
-    request?: SecondParameter<typeof customInstance>;
-  },
-  queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export type AdminJobManifestLoadMutationError = ErrorType<void | DmError>;
+
 /**
  * @summary Trigger a download of Job Definitions using existing Job Manifests
  */
-
-export function useAdminJobManifestLoad<
-  TData = Awaited<ReturnType<typeof adminJobManifestLoad>>,
-  TError = ErrorType<void | DmError>,
->(
+export const useAdminJobManifestLoad = <TError = ErrorType<void | DmError>, TContext = unknown>(
   options?: {
-    query?: Partial<
-      UseQueryOptions<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, TData>
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof adminJobManifestLoad>>,
+      TError,
+      void,
+      TContext
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-  const queryOptions = getAdminJobManifestLoadQueryOptions(options);
-
-  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData, TError>;
-  };
-
-  return { ...query, queryKey: queryOptions.queryKey };
-}
-
-/**
- * @summary Trigger a download of Job Definitions using existing Job Manifests
- */
-export const invalidateAdminJobManifestLoad = async (
-  queryClient: QueryClient,
-  options?: InvalidateOptions,
-): Promise<QueryClient> => {
-  await queryClient.invalidateQueries({ queryKey: getAdminJobManifestLoadQueryKey() }, options);
-
-  return queryClient;
+): UseMutationResult<Awaited<ReturnType<typeof adminJobManifestLoad>>, TError, void, TContext> => {
+  return useMutation(getAdminJobManifestLoadMutationOptions(options), queryClient);
 };