@squonk/data-manager-client 5.4.0 → 6.2.0

package/src/api/workflow/workflow.ts

@@ -1,26 +1,23 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.2
  */
-import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
+import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   InvalidateOptions,
-  MutationFunction,
   QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
-  UseMutationOptions,
-  UseMutationResult,
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
@@ -44,7 +41,7 @@ import type {
   WorkflowRunPostResponse,
   WorkflowVersionPutBodyBody,
   WorkflowVersionPutResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customInstance } from "../../custom-axios";
 import type { ErrorType } from "../../custom-axios";
@@ -53,7 +50,6 @@ type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
 /**
  * Get a list of all Workflows available to you. The Workflows are listed in reverse chronological order of creation, where the most recent that was created is first in the list.
-
  * @summary Get all Workflows available to you
  */
 export const getWorkflows = (
@@ -88,7 +84,7 @@ export const getGetWorkflowsQueryOptions = <
     Awaited<ReturnType<typeof getWorkflows>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetWorkflowsQueryResult = NonNullable<Awaited<ReturnType<typeof getWorkflows>>>;
@@ -111,7 +107,7 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflows<
   TData = Awaited<ReturnType<typeof getWorkflows>>,
   TError = ErrorType<void>,
@@ -129,7 +125,7 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflows<
   TData = Awaited<ReturnType<typeof getWorkflows>>,
   TError = ErrorType<void>,
@@ -139,7 +135,7 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Workflows available to you
  */
@@ -153,16 +149,14 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetWorkflowsQueryOptions(options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -195,7 +189,7 @@ export const getGetWorkflowsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getWorkflows>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetWorkflowsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getWorkflows>>>;
@@ -212,7 +206,7 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowsSuspense<
   TData = Awaited<ReturnType<typeof getWorkflows>>,
   TError = ErrorType<void>,
@@ -224,7 +218,7 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowsSuspense<
   TData = Awaited<ReturnType<typeof getWorkflows>>,
   TError = ErrorType<void>,
@@ -236,7 +230,7 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Workflows available to you
  */
@@ -252,22 +246,19 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetWorkflowsSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Creates a new workflow record.
-
  * @summary Create a new Workflow
  */
 export const createWorkflow = (
@@ -300,73 +291,128 @@ export const createWorkflow = (
   );
 };
 
-export const getCreateWorkflowMutationOptions = <
+export const getCreateWorkflowQueryKey = (workflowPostBodyBody?: WorkflowPostBodyBody) => {
+  return ["data-manager", "POST", "workflow", workflowPostBodyBody] as const;
+};
+
+export const getCreateWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof createWorkflow>>,
   TError = ErrorType<void>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createWorkflow>>,
-    TError,
-    { data: WorkflowPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createWorkflow>>,
-  TError,
-  { data: WorkflowPostBodyBody },
-  TContext
-> => {
-  const mutationKey = ["createWorkflow"];
-  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 createWorkflow>>,
-    { data: WorkflowPostBodyBody }
-  > = (props) => {
-    const { data } = props ?? {};
+>(
+  workflowPostBodyBody: WorkflowPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-    return createWorkflow(data, requestOptions);
-  };
+  const queryKey = queryOptions?.queryKey ?? getCreateWorkflowQueryKey(workflowPostBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof createWorkflow>>> = ({ signal }) =>
+    createWorkflow(workflowPostBodyBody, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
+    Awaited<ReturnType<typeof createWorkflow>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
-export type CreateWorkflowMutationResult = NonNullable<Awaited<ReturnType<typeof createWorkflow>>>;
-export type CreateWorkflowMutationBody = WorkflowPostBodyBody;
-export type CreateWorkflowMutationError = ErrorType<void>;
+export type CreateWorkflowQueryResult = NonNullable<Awaited<ReturnType<typeof createWorkflow>>>;
+export type CreateWorkflowQueryError = ErrorType<void>;
 
+export function useCreateWorkflow<
+  TData = Awaited<ReturnType<typeof createWorkflow>>,
+  TError = ErrorType<void>,
+>(
+  workflowPostBodyBody: WorkflowPostBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof createWorkflow>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof createWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof createWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useCreateWorkflow<
+  TData = Awaited<ReturnType<typeof createWorkflow>>,
+  TError = ErrorType<void>,
+>(
+  workflowPostBodyBody: WorkflowPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createWorkflow>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof createWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof createWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useCreateWorkflow<
+  TData = Awaited<ReturnType<typeof createWorkflow>>,
+  TError = ErrorType<void>,
+>(
+  workflowPostBodyBody: WorkflowPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Create a new Workflow
  */
-export const useCreateWorkflow = <TError = ErrorType<void>, TContext = unknown>(
+
+export function useCreateWorkflow<
+  TData = Awaited<ReturnType<typeof createWorkflow>>,
+  TError = ErrorType<void>,
+>(
+  workflowPostBodyBody: WorkflowPostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof createWorkflow>>,
-      TError,
-      { data: WorkflowPostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof createWorkflow>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof createWorkflow>>,
-  TError,
-  { data: WorkflowPostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getCreateWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getCreateWorkflowQueryOptions(workflowPostBodyBody, options);
 
-  return useMutation(mutationOptions, queryClient);
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Create a new Workflow
+ */
+export const invalidateCreateWorkflow = async (
+  queryClient: QueryClient,
+  workflowPostBodyBody: WorkflowPostBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getCreateWorkflowQueryKey(workflowPostBodyBody) },
+    options,
+  );
+
+  return queryClient;
 };
+
 /**
  * Get details of a specific Workflow available to you.
-
  * @summary Get details of a specific Workflow
  */
 export const getWorkflow = (
@@ -380,7 +426,7 @@ export const getWorkflow = (
   );
 };
 
-export const getGetWorkflowQueryKey = (workflowId?: string) => {
+export const getGetWorkflowQueryKey = (workflowId: string) => {
   return ["data-manager", "workflow", workflowId] as const;
 };
 
@@ -401,11 +447,14 @@ export const getGetWorkflowQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getWorkflow>>> = ({ signal }) =>
     getWorkflow(workflowId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!workflowId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getWorkflow>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: workflowId !== null && workflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetWorkflowQueryResult = NonNullable<Awaited<ReturnType<typeof getWorkflow>>>;
@@ -429,7 +478,7 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflow<
   TData = Awaited<ReturnType<typeof getWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -448,7 +497,7 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflow<
   TData = Awaited<ReturnType<typeof getWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -459,7 +508,7 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get details of a specific Workflow
  */
@@ -474,16 +523,14 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetWorkflowQueryOptions(workflowId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -522,7 +569,7 @@ export const getGetWorkflowSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getWorkflow>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetWorkflowSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getWorkflow>>>;
@@ -538,7 +585,7 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowSuspense<
   TData = Awaited<ReturnType<typeof getWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -551,7 +598,7 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowSuspense<
   TData = Awaited<ReturnType<typeof getWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -564,7 +611,7 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get details of a specific Workflow
  */
@@ -581,108 +628,165 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetWorkflowSuspenseQueryOptions(workflowId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * The Workflow is deleted.
-
-You cannot delete a Workflow if it is the _source_ of a versioned workflow.
-
+ *
+ * You cannot delete a Workflow if it is the _source_ of a versioned workflow.
  * @summary Delete a Workflow
  */
 export const deleteWorkflow = (
   workflowId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-  return customInstance<void>({ url: `/workflow/${workflowId}`, method: "DELETE" }, options);
+  return customInstance<void>(
+    { url: `/workflow/${workflowId}`, method: "DELETE", signal },
+    options,
+  );
+};
+
+export const getDeleteWorkflowQueryKey = (workflowId: string) => {
+  return ["data-manager", "DELETE", "workflow", workflowId] as const;
 };
 
-export const getDeleteWorkflowMutationOptions = <
+export const getDeleteWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof deleteWorkflow>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteWorkflow>>,
-    TError,
-    { workflowId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteWorkflow>>,
-  TError,
-  { workflowId: string },
-  TContext
-> => {
-  const mutationKey = ["deleteWorkflow"];
-  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 deleteWorkflow>>,
-    { workflowId: string }
-  > = (props) => {
-    const { workflowId } = props ?? {};
-
-    return deleteWorkflow(workflowId, requestOptions);
-  };
+>(
+  workflowId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
-};
+  const queryKey = queryOptions?.queryKey ?? getDeleteWorkflowQueryKey(workflowId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteWorkflow>>> = ({ signal }) =>
+    deleteWorkflow(workflowId, requestOptions, signal);
 
-export type DeleteWorkflowMutationResult = NonNullable<Awaited<ReturnType<typeof deleteWorkflow>>>;
+  return {
+    queryKey,
+    queryFn,
+    enabled: workflowId !== null && workflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof deleteWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+};
 
-export type DeleteWorkflowMutationError = ErrorType<void | DmError>;
+export type DeleteWorkflowQueryResult = NonNullable<Awaited<ReturnType<typeof deleteWorkflow>>>;
+export type DeleteWorkflowQueryError = ErrorType<void | DmError>;
 
+export function useDeleteWorkflow<
+  TData = Awaited<ReturnType<typeof deleteWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteWorkflow>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof deleteWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteWorkflow<
+  TData = Awaited<ReturnType<typeof deleteWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteWorkflow>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof deleteWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteWorkflow<
+  TData = Awaited<ReturnType<typeof deleteWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Workflow
  */
-export const useDeleteWorkflow = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeleteWorkflow<
+  TData = Awaited<ReturnType<typeof deleteWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteWorkflow>>,
-      TError,
-      { workflowId: string },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof deleteWorkflow>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteWorkflow>>,
-  TError,
-  { workflowId: string },
-  TContext
-> => {
-  const mutationOptions = getDeleteWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getDeleteWorkflowQueryOptions(workflowId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * The Workflow is updated according to the patch parameters.
+ * @summary Delete a Workflow
+ */
+export const invalidateDeleteWorkflow = async (
+  queryClient: QueryClient,
+  workflowId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getDeleteWorkflowQueryKey(workflowId) }, options);
 
-In **PRODUCTION** mode you cannot alter a Workflow that has been versioned. In **DEVELOPMENT** mode you cannot alter a Workflow that is the source of Running Workflow that is running.
+  return queryClient;
+};
 
+/**
+ * The Workflow is updated according to the patch parameters.
+ *
+ * In **PRODUCTION** mode you cannot alter a Workflow that has been versioned. In **DEVELOPMENT** mode you cannot alter a Workflow that is the source of Running Workflow that is running.
  * @summary Update a Workflow
  */
 export const updateWorkflow = (
   workflowId: string,
   workflowPatchBodyBody: WorkflowPatchBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   const formData = new FormData();
   if (workflowPatchBodyBody.name !== undefined) {
@@ -701,78 +805,147 @@ export const updateWorkflow = (
       method: "PATCH",
       headers: { "Content-Type": "multipart/form-data" },
       data: formData,
+      signal,
     },
     options,
   );
 };
 
-export const getUpdateWorkflowMutationOptions = <
+export const getUpdateWorkflowQueryKey = (
+  workflowId: string,
+  workflowPatchBodyBody?: WorkflowPatchBodyBody,
+) => {
+  return ["data-manager", "PATCH", "workflow", workflowId, workflowPatchBodyBody] as const;
+};
+
+export const getUpdateWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof updateWorkflow>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof updateWorkflow>>,
-    TError,
-    { workflowId: string; data: WorkflowPatchBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof updateWorkflow>>,
-  TError,
-  { workflowId: string; data: WorkflowPatchBodyBody },
-  TContext
-> => {
-  const mutationKey = ["updateWorkflow"];
-  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 updateWorkflow>>,
-    { workflowId: string; data: WorkflowPatchBodyBody }
-  > = (props) => {
-    const { workflowId, data } = props ?? {};
-
-    return updateWorkflow(workflowId, data, requestOptions);
-  };
+>(
+  workflowId: string,
+  workflowPatchBodyBody: WorkflowPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof updateWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey =
+    queryOptions?.queryKey ?? getUpdateWorkflowQueryKey(workflowId, workflowPatchBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof updateWorkflow>>> = ({ signal }) =>
+    updateWorkflow(workflowId, workflowPatchBodyBody, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: workflowId !== null && workflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof updateWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type UpdateWorkflowMutationResult = NonNullable<Awaited<ReturnType<typeof updateWorkflow>>>;
-export type UpdateWorkflowMutationBody = WorkflowPatchBodyBody;
-export type UpdateWorkflowMutationError = ErrorType<void | DmError>;
+export type UpdateWorkflowQueryResult = NonNullable<Awaited<ReturnType<typeof updateWorkflow>>>;
+export type UpdateWorkflowQueryError = ErrorType<void | DmError>;
 
+export function useUpdateWorkflow<
+  TData = Awaited<ReturnType<typeof updateWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowPatchBodyBody: WorkflowPatchBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof updateWorkflow>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof updateWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof updateWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useUpdateWorkflow<
+  TData = Awaited<ReturnType<typeof updateWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowPatchBodyBody: WorkflowPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof updateWorkflow>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof updateWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof updateWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useUpdateWorkflow<
+  TData = Awaited<ReturnType<typeof updateWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowPatchBodyBody: WorkflowPatchBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof updateWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Update a Workflow
  */
-export const useUpdateWorkflow = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useUpdateWorkflow<
+  TData = Awaited<ReturnType<typeof updateWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowPatchBodyBody: WorkflowPatchBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof updateWorkflow>>,
-      TError,
-      { workflowId: string; data: WorkflowPatchBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof updateWorkflow>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof updateWorkflow>>,
-  TError,
-  { workflowId: string; data: WorkflowPatchBodyBody },
-  TContext
-> => {
-  const mutationOptions = getUpdateWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getUpdateWorkflowQueryOptions(workflowId, workflowPatchBodyBody, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Update a Workflow
+ */
+export const invalidateUpdateWorkflow = async (
+  queryClient: QueryClient,
+  workflowId: string,
+  workflowPatchBodyBody: WorkflowPatchBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getUpdateWorkflowQueryKey(workflowId, workflowPatchBodyBody) },
+    options,
+  );
 
-  return useMutation(mutationOptions, queryClient);
+  return queryClient;
 };
+
 /**
  * Due to its potential size and complexity the definition is not returned with the Workflow. Instead, to retrieve the definition you need to call this endpoint. A string-encoded YAML document is returned.
-
  * @summary Gets the full definition of a Workflow
  */
 export const getWorkflowDefinition = (
@@ -786,7 +959,7 @@ export const getWorkflowDefinition = (
   );
 };
 
-export const getGetWorkflowDefinitionQueryKey = (workflowId?: string) => {
+export const getGetWorkflowDefinitionQueryKey = (workflowId: string) => {
   return ["data-manager", "workflow", workflowId, "definition"] as const;
 };
 
@@ -809,11 +982,14 @@ export const getGetWorkflowDefinitionQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getWorkflowDefinition>>> = ({ signal }) =>
     getWorkflowDefinition(workflowId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!workflowId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getWorkflowDefinition>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: workflowId !== null && workflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getWorkflowDefinition>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetWorkflowDefinitionQueryResult = NonNullable<
@@ -841,7 +1017,7 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowDefinition<
   TData = Awaited<ReturnType<typeof getWorkflowDefinition>>,
   TError = ErrorType<void | DmError>,
@@ -862,7 +1038,7 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowDefinition<
   TData = Awaited<ReturnType<typeof getWorkflowDefinition>>,
   TError = ErrorType<void | DmError>,
@@ -875,7 +1051,7 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the full definition of a Workflow
  */
@@ -892,16 +1068,14 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetWorkflowDefinitionQueryOptions(workflowId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -943,7 +1117,7 @@ export const getGetWorkflowDefinitionSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getWorkflowDefinition>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetWorkflowDefinitionSuspenseQueryResult = NonNullable<
@@ -963,7 +1137,7 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowDefinitionSuspense<
   TData = Awaited<ReturnType<typeof getWorkflowDefinition>>,
   TError = ErrorType<void | DmError>,
@@ -976,7 +1150,7 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetWorkflowDefinitionSuspense<
   TData = Awaited<ReturnType<typeof getWorkflowDefinition>>,
   TError = ErrorType<void | DmError>,
@@ -989,7 +1163,7 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the full definition of a Workflow
  */
@@ -1006,22 +1180,19 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetWorkflowDefinitionSuspenseQueryOptions(workflowId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Runs a Workflow.
-
  * @summary Run a Workflow
  */
 export const runWorkflow = (
@@ -1052,81 +1223,150 @@ export const runWorkflow = (
   );
 };
 
-export const getRunWorkflowMutationOptions = <
+export const getRunWorkflowQueryKey = (
+  workflowId: string,
+  workflowRunPostBodyBody?: WorkflowRunPostBodyBody,
+) => {
+  return ["data-manager", "POST", "workflow", workflowId, "run", workflowRunPostBodyBody] as const;
+};
+
+export const getRunWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof runWorkflow>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof runWorkflow>>,
-    TError,
-    { workflowId: string; data: WorkflowRunPostBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof runWorkflow>>,
-  TError,
-  { workflowId: string; data: WorkflowRunPostBodyBody },
-  TContext
-> => {
-  const mutationKey = ["runWorkflow"];
-  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 runWorkflow>>,
-    { workflowId: string; data: WorkflowRunPostBodyBody }
-  > = (props) => {
-    const { workflowId, data } = props ?? {};
-
-    return runWorkflow(workflowId, data, requestOptions);
-  };
+>(
+  workflowId: string,
+  workflowRunPostBodyBody: WorkflowRunPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof runWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey =
+    queryOptions?.queryKey ?? getRunWorkflowQueryKey(workflowId, workflowRunPostBodyBody);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof runWorkflow>>> = ({ signal }) =>
+    runWorkflow(workflowId, workflowRunPostBodyBody, requestOptions, signal);
+
+  return {
+    queryKey,
+    queryFn,
+    enabled: workflowId !== null && workflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof runWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type RunWorkflowMutationResult = NonNullable<Awaited<ReturnType<typeof runWorkflow>>>;
-export type RunWorkflowMutationBody = WorkflowRunPostBodyBody;
-export type RunWorkflowMutationError = ErrorType<void | DmError>;
+export type RunWorkflowQueryResult = NonNullable<Awaited<ReturnType<typeof runWorkflow>>>;
+export type RunWorkflowQueryError = ErrorType<void | DmError>;
 
+export function useRunWorkflow<
+  TData = Awaited<ReturnType<typeof runWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowRunPostBodyBody: WorkflowRunPostBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof runWorkflow>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof runWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof runWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRunWorkflow<
+  TData = Awaited<ReturnType<typeof runWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowRunPostBodyBody: WorkflowRunPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof runWorkflow>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof runWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof runWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useRunWorkflow<
+  TData = Awaited<ReturnType<typeof runWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowRunPostBodyBody: WorkflowRunPostBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof runWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Run a Workflow
  */
-export const useRunWorkflow = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useRunWorkflow<
+  TData = Awaited<ReturnType<typeof runWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowRunPostBodyBody: WorkflowRunPostBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof runWorkflow>>,
-      TError,
-      { workflowId: string; data: WorkflowRunPostBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof runWorkflow>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof runWorkflow>>,
-  TError,
-  { workflowId: string; data: WorkflowRunPostBodyBody },
-  TContext
-> => {
-  const mutationOptions = getRunWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getRunWorkflowQueryOptions(workflowId, workflowRunPostBodyBody, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * The Workflow is first copied, leaving the original. The version (a string) is then applied to the copy of the Workflow, the `source_id` of the copy is set to the Workflow being copied, and the new Workflow ID is returned.
+ * @summary Run a Workflow
+ */
+export const invalidateRunWorkflow = async (
+  queryClient: QueryClient,
+  workflowId: string,
+  workflowRunPostBodyBody: WorkflowRunPostBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getRunWorkflowQueryKey(workflowId, workflowRunPostBodyBody) },
+    options,
+  );
 
-When you apply a version to a Workflow you are making a commitment not to alter it. If you want to change the workflow you will need to return to the `source`, Workflow, modify that and then version it again.
+  return queryClient;
+};
 
+/**
+ * The Workflow is first copied, leaving the original. The version (a string) is then applied to the copy of the Workflow, the `source_id` of the copy is set to the Workflow being copied, and the new Workflow ID is returned.
+ *
+ * When you apply a version to a Workflow you are making a commitment not to alter it. If you want to change the workflow you will need to return to the `source`, Workflow, modify that and then version it again.
  * @summary Applied a version to the Workflow
  */
 export const versionWorkflow = (
   workflowId: string,
   workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   const formUrlEncoded = new URLSearchParams();
   formUrlEncoded.append(`version`, workflowVersionPutBodyBody.version);
@@ -1137,82 +1377,160 @@ export const versionWorkflow = (
       method: "PUT",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
       data: formUrlEncoded,
+      signal,
     },
     options,
   );
 };
 
-export const getVersionWorkflowMutationOptions = <
+export const getVersionWorkflowQueryKey = (
+  workflowId: string,
+  workflowVersionPutBodyBody?: WorkflowVersionPutBodyBody,
+) => {
+  return [
+    "data-manager",
+    "PUT",
+    "workflow",
+    workflowId,
+    "version",
+    workflowVersionPutBodyBody,
+  ] as const;
+};
+
+export const getVersionWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof versionWorkflow>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof versionWorkflow>>,
-    TError,
-    { workflowId: string; data: WorkflowVersionPutBodyBody },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof versionWorkflow>>,
-  TError,
-  { workflowId: string; data: WorkflowVersionPutBodyBody },
-  TContext
-> => {
-  const mutationKey = ["versionWorkflow"];
-  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 versionWorkflow>>,
-    { workflowId: string; data: WorkflowVersionPutBodyBody }
-  > = (props) => {
-    const { workflowId, data } = props ?? {};
-
-    return versionWorkflow(workflowId, data, requestOptions);
-  };
+>(
+  workflowId: string,
+  workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof versionWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey =
+    queryOptions?.queryKey ?? getVersionWorkflowQueryKey(workflowId, workflowVersionPutBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof versionWorkflow>>> = ({ signal }) =>
+    versionWorkflow(workflowId, workflowVersionPutBodyBody, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return {
+    queryKey,
+    queryFn,
+    enabled: workflowId !== null && workflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof versionWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type VersionWorkflowMutationResult = NonNullable<
-  Awaited<ReturnType<typeof versionWorkflow>>
->;
-export type VersionWorkflowMutationBody = WorkflowVersionPutBodyBody;
-export type VersionWorkflowMutationError = ErrorType<void | DmError>;
+export type VersionWorkflowQueryResult = NonNullable<Awaited<ReturnType<typeof versionWorkflow>>>;
+export type VersionWorkflowQueryError = ErrorType<void | DmError>;
 
+export function useVersionWorkflow<
+  TData = Awaited<ReturnType<typeof versionWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof versionWorkflow>>, TError, TData>> &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof versionWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof versionWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useVersionWorkflow<
+  TData = Awaited<ReturnType<typeof versionWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof versionWorkflow>>, TError, TData>> &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof versionWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof versionWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useVersionWorkflow<
+  TData = Awaited<ReturnType<typeof versionWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof versionWorkflow>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Applied a version to the Workflow
  */
-export const useVersionWorkflow = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useVersionWorkflow<
+  TData = Awaited<ReturnType<typeof versionWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  workflowId: string,
+  workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof versionWorkflow>>,
-      TError,
-      { workflowId: string; data: WorkflowVersionPutBodyBody },
-      TContext
-    >;
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof versionWorkflow>>, TError, TData>>;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof versionWorkflow>>,
-  TError,
-  { workflowId: string; data: WorkflowVersionPutBodyBody },
-  TContext
-> => {
-  const mutationOptions = getVersionWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getVersionWorkflowQueryOptions(
+    workflowId,
+    workflowVersionPutBodyBody,
+    options,
+  );
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
-  return useMutation(mutationOptions, queryClient);
-};
 /**
- * Get a list of all Running Workflows available to you. The Running Workflows are listed in chronological order of the start time, where the first that was executed is the first in the list.
+ * @summary Applied a version to the Workflow
+ */
+export const invalidateVersionWorkflow = async (
+  queryClient: QueryClient,
+  workflowId: string,
+  workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getVersionWorkflowQueryKey(workflowId, workflowVersionPutBodyBody) },
+    options,
+  );
 
-By providing a workflow ID you will only see Running Workflows for that Workflow.
+  return queryClient;
+};
 
+/**
+ * Get a list of all Running Workflows available to you. The Running Workflows are listed in chronological order of the start time, where the first that was executed is the first in the list.
+ *
+ * By providing a workflow ID you will only see Running Workflows for that Workflow.
  * @summary Get all Running Workflows available to you
  */
 export const getRunningWorkflows = (
@@ -1253,7 +1571,7 @@ export const getGetRunningWorkflowsQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflows>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowsQueryResult = NonNullable<
@@ -1281,7 +1599,7 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflows<
   TData = Awaited<ReturnType<typeof getRunningWorkflows>>,
   TError = ErrorType<void>,
@@ -1302,7 +1620,7 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflows<
   TData = Awaited<ReturnType<typeof getRunningWorkflows>>,
   TError = ErrorType<void>,
@@ -1315,7 +1633,7 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Running Workflows available to you
  */
@@ -1332,16 +1650,14 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetRunningWorkflowsQueryOptions(params, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -1383,7 +1699,7 @@ export const getGetRunningWorkflowsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflows>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowsSuspenseQueryResult = NonNullable<
@@ -1403,7 +1719,7 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowsSuspense<
   TData = Awaited<ReturnType<typeof getRunningWorkflows>>,
   TError = ErrorType<void>,
@@ -1416,7 +1732,7 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowsSuspense<
   TData = Awaited<ReturnType<typeof getRunningWorkflows>>,
   TError = ErrorType<void>,
@@ -1429,7 +1745,7 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Running Workflows available to you
  */
@@ -1446,22 +1762,19 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetRunningWorkflowsSuspenseQueryOptions(params, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Get details of a specific Running Workflow available to you.
-
  * @summary Get details of a specific Running Workflow
  */
 export const getRunningWorkflow = (
@@ -1475,7 +1788,7 @@ export const getRunningWorkflow = (
   );
 };
 
-export const getGetRunningWorkflowQueryKey = (runningWorkflowId?: string) => {
+export const getGetRunningWorkflowQueryKey = (runningWorkflowId: string) => {
   return ["data-manager", "running-workflow", runningWorkflowId] as const;
 };
 
@@ -1496,11 +1809,14 @@ export const getGetRunningWorkflowQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getRunningWorkflow>>> = ({ signal }) =>
     getRunningWorkflow(runningWorkflowId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!runningWorkflowId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getRunningWorkflow>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: runningWorkflowId !== null && runningWorkflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getRunningWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetRunningWorkflowQueryResult = NonNullable<
@@ -1526,7 +1842,7 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflow<
   TData = Awaited<ReturnType<typeof getRunningWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -1547,7 +1863,7 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflow<
   TData = Awaited<ReturnType<typeof getRunningWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -1558,7 +1874,7 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get details of a specific Running Workflow
  */
@@ -1573,16 +1889,14 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetRunningWorkflowQueryOptions(runningWorkflowId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -1624,7 +1938,7 @@ export const getGetRunningWorkflowSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflow>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowSuspenseQueryResult = NonNullable<
@@ -1644,7 +1958,7 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowSuspense<
   TData = Awaited<ReturnType<typeof getRunningWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -1657,7 +1971,7 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowSuspense<
   TData = Awaited<ReturnType<typeof getRunningWorkflow>>,
   TError = ErrorType<void | DmError>,
@@ -1670,7 +1984,7 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get details of a specific Running Workflow
  */
@@ -1687,186 +2001,321 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetRunningWorkflowSuspenseQueryOptions(runningWorkflowId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
  * Deletes a Running Workflow.
-
-It is an error to delete a Running Workflow that is Running.
-
+ *
+ * It is an error to delete a Running Workflow that is Running.
  * @summary Delete a Running Workflow
  */
 export const deleteRunningWorkflow = (
   runningWorkflowId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/running-workflow/${runningWorkflowId}`, method: "DELETE" },
+    { url: `/running-workflow/${runningWorkflowId}`, method: "DELETE", signal },
     options,
   );
 };
 
-export const getDeleteRunningWorkflowMutationOptions = <
+export const getDeleteRunningWorkflowQueryKey = (runningWorkflowId: string) => {
+  return ["data-manager", "DELETE", "running-workflow", runningWorkflowId] as const;
+};
+
+export const getDeleteRunningWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof deleteRunningWorkflow>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof deleteRunningWorkflow>>,
-    TError,
-    { runningWorkflowId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof deleteRunningWorkflow>>,
-  TError,
-  { runningWorkflowId: string },
-  TContext
-> => {
-  const mutationKey = ["deleteRunningWorkflow"];
-  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 deleteRunningWorkflow>>,
-    { runningWorkflowId: string }
-  > = (props) => {
-    const { runningWorkflowId } = props ?? {};
-
-    return deleteRunningWorkflow(runningWorkflowId, requestOptions);
-  };
+>(
+  runningWorkflowId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteRunningWorkflow>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getDeleteRunningWorkflowQueryKey(runningWorkflowId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteRunningWorkflow>>> = ({ signal }) =>
+    deleteRunningWorkflow(runningWorkflowId, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return {
+    queryKey,
+    queryFn,
+    enabled: runningWorkflowId !== null && runningWorkflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof deleteRunningWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type DeleteRunningWorkflowMutationResult = NonNullable<
+export type DeleteRunningWorkflowQueryResult = NonNullable<
   Awaited<ReturnType<typeof deleteRunningWorkflow>>
 >;
+export type DeleteRunningWorkflowQueryError = ErrorType<void | DmError>;
 
-export type DeleteRunningWorkflowMutationError = ErrorType<void | DmError>;
-
+export function useDeleteRunningWorkflow<
+  TData = Awaited<ReturnType<typeof deleteRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteRunningWorkflow>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteRunningWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof deleteRunningWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteRunningWorkflow<
+  TData = Awaited<ReturnType<typeof deleteRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteRunningWorkflow>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof deleteRunningWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof deleteRunningWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useDeleteRunningWorkflow<
+  TData = Awaited<ReturnType<typeof deleteRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteRunningWorkflow>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Delete a Running Workflow
  */
-export const useDeleteRunningWorkflow = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useDeleteRunningWorkflow<
+  TData = Awaited<ReturnType<typeof deleteRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof deleteRunningWorkflow>>,
-      TError,
-      { runningWorkflowId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof deleteRunningWorkflow>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof deleteRunningWorkflow>>,
-  TError,
-  { runningWorkflowId: string },
-  TContext
-> => {
-  const mutationOptions = getDeleteRunningWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getDeleteRunningWorkflowQueryOptions(runningWorkflowId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Delete a Running Workflow
+ */
+export const invalidateDeleteRunningWorkflow = async (
+  queryClient: QueryClient,
+  runningWorkflowId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getDeleteRunningWorkflowQueryKey(runningWorkflowId) },
+    options,
+  );
 
-  return useMutation(mutationOptions, queryClient);
+  return queryClient;
 };
+
 /**
  * Stops a Running Workflow.
-
  * @summary Stop a Running Workflow
  */
 export const stopRunningWorkflow = (
   runningWorkflowId: string,
   options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
   return customInstance<void>(
-    { url: `/running-workflow/${runningWorkflowId}/stop`, method: "PUT" },
+    { url: `/running-workflow/${runningWorkflowId}/stop`, method: "PUT", signal },
     options,
   );
 };
 
-export const getStopRunningWorkflowMutationOptions = <
+export const getStopRunningWorkflowQueryKey = (runningWorkflowId: string) => {
+  return ["data-manager", "PUT", "running-workflow", runningWorkflowId, "stop"] as const;
+};
+
+export const getStopRunningWorkflowQueryOptions = <
+  TData = Awaited<ReturnType<typeof stopRunningWorkflow>>,
   TError = ErrorType<void | DmError>,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof stopRunningWorkflow>>,
-    TError,
-    { runningWorkflowId: string },
-    TContext
-  >;
-  request?: SecondParameter<typeof customInstance>;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof stopRunningWorkflow>>,
-  TError,
-  { runningWorkflowId: string },
-  TContext
-> => {
-  const mutationKey = ["stopRunningWorkflow"];
-  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 stopRunningWorkflow>>,
-    { runningWorkflowId: string }
-  > = (props) => {
-    const { runningWorkflowId } = props ?? {};
-
-    return stopRunningWorkflow(runningWorkflowId, requestOptions);
-  };
+>(
+  runningWorkflowId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof stopRunningWorkflow>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getStopRunningWorkflowQueryKey(runningWorkflowId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof stopRunningWorkflow>>> = ({ signal }) =>
+    stopRunningWorkflow(runningWorkflowId, requestOptions, signal);
 
-  return { mutationFn, ...mutationOptions };
+  return {
+    queryKey,
+    queryFn,
+    enabled: runningWorkflowId !== null && runningWorkflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof stopRunningWorkflow>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
-export type StopRunningWorkflowMutationResult = NonNullable<
+export type StopRunningWorkflowQueryResult = NonNullable<
   Awaited<ReturnType<typeof stopRunningWorkflow>>
 >;
+export type StopRunningWorkflowQueryError = ErrorType<void | DmError>;
 
-export type StopRunningWorkflowMutationError = ErrorType<void | DmError>;
-
+export function useStopRunningWorkflow<
+  TData = Awaited<ReturnType<typeof stopRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof stopRunningWorkflow>>, TError, TData>
+    > &
+      Pick<
+        DefinedInitialDataOptions<
+          Awaited<ReturnType<typeof stopRunningWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof stopRunningWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useStopRunningWorkflow<
+  TData = Awaited<ReturnType<typeof stopRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof stopRunningWorkflow>>, TError, TData>
+    > &
+      Pick<
+        UndefinedInitialDataOptions<
+          Awaited<ReturnType<typeof stopRunningWorkflow>>,
+          TError,
+          Awaited<ReturnType<typeof stopRunningWorkflow>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useStopRunningWorkflow<
+  TData = Awaited<ReturnType<typeof stopRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof stopRunningWorkflow>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Stop a Running Workflow
  */
-export const useStopRunningWorkflow = <TError = ErrorType<void | DmError>, TContext = unknown>(
+
+export function useStopRunningWorkflow<
+  TData = Awaited<ReturnType<typeof stopRunningWorkflow>>,
+  TError = ErrorType<void | DmError>,
+>(
+  runningWorkflowId: string,
   options?: {
-    mutation?: UseMutationOptions<
-      Awaited<ReturnType<typeof stopRunningWorkflow>>,
-      TError,
-      { runningWorkflowId: string },
-      TContext
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof stopRunningWorkflow>>, TError, TData>
     >;
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseMutationResult<
-  Awaited<ReturnType<typeof stopRunningWorkflow>>,
-  TError,
-  { runningWorkflowId: string },
-  TContext
-> => {
-  const mutationOptions = getStopRunningWorkflowMutationOptions(options);
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = getStopRunningWorkflowQueryOptions(runningWorkflowId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-  return useMutation(mutationOptions, queryClient);
+  return { ...query, queryKey: queryOptions.queryKey };
+}
+
+/**
+ * @summary Stop a Running Workflow
+ */
+export const invalidateStopRunningWorkflow = async (
+  queryClient: QueryClient,
+  runningWorkflowId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries(
+    { queryKey: getStopRunningWorkflowQueryKey(runningWorkflowId) },
+    options,
+  );
+
+  return queryClient;
 };
+
 /**
  * Gets the Running Workflow step results for WWorkflow steps that are running (or have run). The steps are listed in chronological order of start time, where the first executed step is the first in the list.
-
  * @summary Get all the Running Workflow Steps
  */
 export const getRunningWorkflowSteps = (
@@ -1880,7 +2329,7 @@ export const getRunningWorkflowSteps = (
   );
 };
 
-export const getGetRunningWorkflowStepsQueryKey = (runningWorkflowId?: string) => {
+export const getGetRunningWorkflowStepsQueryKey = (runningWorkflowId: string) => {
   return ["data-manager", "running-workflow", runningWorkflowId, "steps"] as const;
 };
 
@@ -1904,11 +2353,14 @@ export const getGetRunningWorkflowStepsQueryOptions = <
     signal,
   }) => getRunningWorkflowSteps(runningWorkflowId, requestOptions, signal);
 
-  return { queryKey, queryFn, enabled: !!runningWorkflowId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: runningWorkflowId !== null && runningWorkflowId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getRunningWorkflowSteps>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetRunningWorkflowStepsQueryResult = NonNullable<
@@ -1936,7 +2388,7 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowSteps<
   TData = Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
   TError = ErrorType<void | DmError>,
@@ -1957,7 +2409,7 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowSteps<
   TData = Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
   TError = ErrorType<void | DmError>,
@@ -1970,7 +2422,7 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all the Running Workflow Steps
  */
@@ -1987,16 +2439,14 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetRunningWorkflowStepsQueryOptions(runningWorkflowId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
 /**
@@ -2039,7 +2489,7 @@ export const getGetRunningWorkflowStepsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowStepsSuspenseQueryResult = NonNullable<
@@ -2059,7 +2509,7 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowStepsSuspense<
   TData = Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
   TError = ErrorType<void | DmError>,
@@ -2072,7 +2522,7 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetRunningWorkflowStepsSuspense<
   TData = Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
   TError = ErrorType<void | DmError>,
@@ -2085,7 +2535,7 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all the Running Workflow Steps
  */
@@ -2102,15 +2552,13 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customInstance>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetRunningWorkflowStepsSuspenseQueryOptions(runningWorkflowId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }