@squonk/data-manager-client 5.4.0 → 6.2.0

package/src/api/workflow/workflow.fetch.ts

@@ -1,26 +1,23 @@
 /**
- * Generated by orval v7.21.0 🍺
+ * Generated by orval v8.16.0 🍺
  * Do not edit manually.
  * Dataset Manager API
  * The Dataset Manager API service.
-
-A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
-
- * OpenAPI spec version: 5.4
+ *
+ * A service that allows *registered* users to make **Datasets** and associated **Metadata** available to **Applications**, **Jobs**, and **Workflows** using **Projects** and **Files**.
+ *
+ * OpenAPI spec version: 6.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,18 +41,13 @@ import type {
   WorkflowRunPostResponse,
   WorkflowVersionPutBodyBody,
   WorkflowVersionPutResponse,
-} from ".././api-schemas";
+} from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * 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 type getWorkflowsResponse200 = { data: WorkflowGetAllResponse; status: 200 };
 
 export type getWorkflowsResponse401 = { data: void; status: 401 };
@@ -69,6 +61,10 @@ export const getGetWorkflowsUrl = () => {
   return `/workflow`;
 };
 
+/**
+ * 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 = async (options?: RequestInit): Promise<getWorkflowsResponse> => {
   return customFetch<getWorkflowsResponse>(getGetWorkflowsUrl(), { ...options, method: "GET" });
 };
@@ -95,7 +91,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>>>;
@@ -118,7 +114,7 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -136,7 +132,7 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -146,7 +142,7 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Workflows available to you
  */
@@ -160,16 +156,14 @@ export function useGetWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }
 
 /**
@@ -202,7 +196,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>>>;
@@ -219,7 +213,7 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -231,7 +225,7 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -243,7 +237,7 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all Workflows available to you
  */
@@ -259,24 +253,17 @@ export function useGetWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return { ...query, queryKey: queryOptions.queryKey };
 }
 
-/**
- * Creates a new workflow record.
-
- * @summary Create a new Workflow
- */
 export type createWorkflowResponse201 = { data: WorkflowPostResponse; status: 201 };
 
 export type createWorkflowResponse401 = { data: void; status: 401 };
@@ -290,6 +277,10 @@ export const getCreateWorkflowUrl = () => {
   return `/workflow`;
 };
 
+/**
+ * Creates a new workflow record.
+ * @summary Create a new Workflow
+ */
 export const createWorkflow = async (
   workflowPostBodyBody: WorkflowPostBodyBody,
   options?: RequestInit,
@@ -314,75 +305,126 @@ export const createWorkflow = async (
   });
 };
 
-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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  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, { signal, ...requestOptions });
 
-  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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);
-};
-/**
- * Get details of a specific Workflow available to you.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
- * @summary Get details of a specific Workflow
+  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;
+};
+
 export type getWorkflowResponse200 = { data: WorkflowGetResponse; status: 200 };
 
 export type getWorkflowResponse401 = { data: void; status: 401 };
@@ -400,6 +442,10 @@ export const getGetWorkflowUrl = (workflowId: string) => {
   return `/workflow/${workflowId}`;
 };
 
+/**
+ * Get details of a specific Workflow available to you.
+ * @summary Get details of a specific Workflow
+ */
 export const getWorkflow = async (
   workflowId: string,
   options?: RequestInit,
@@ -410,7 +456,7 @@ export const getWorkflow = async (
   });
 };
 
-export const getGetWorkflowQueryKey = (workflowId?: string) => {
+export const getGetWorkflowQueryKey = (workflowId: string) => {
   return ["data-manager", "workflow", workflowId] as const;
 };
 
@@ -431,11 +477,14 @@ export const getGetWorkflowQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getWorkflow>>> = ({ signal }) =>
     getWorkflow(workflowId, { signal, ...requestOptions });
 
-  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>>>;
@@ -459,7 +508,7 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -478,7 +527,7 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -489,7 +538,7 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get details of a specific Workflow
  */
@@ -504,16 +553,14 @@ export function useGetWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }
 
 /**
@@ -552,7 +599,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>>>;
@@ -568,7 +615,7 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -581,7 +628,7 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -594,7 +641,7 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get details of a specific Workflow
  */
@@ -611,26 +658,17 @@ export function useGetWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  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.
-
- * @summary Delete a Workflow
- */
 export type deleteWorkflowResponse204 = { data: void; status: 204 };
 
 export type deleteWorkflowResponse401 = { data: void; status: 401 };
@@ -649,6 +687,12 @@ export const getDeleteWorkflowUrl = (workflowId: string) => {
   return `/workflow/${workflowId}`;
 };
 
+/**
+ * The Workflow is deleted.
+ *
+ * You cannot delete a Workflow if it is the _source_ of a versioned workflow.
+ * @summary Delete a Workflow
+ */
 export const deleteWorkflow = async (
   workflowId: string,
   options?: RequestInit,
@@ -659,77 +703,126 @@ export const deleteWorkflow = async (
   });
 };
 
-export const getDeleteWorkflowMutationOptions = <
+export const getDeleteWorkflowQueryKey = (workflowId: string) => {
+  return ["data-manager", "DELETE", "workflow", workflowId] as const;
+};
+
+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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  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, { signal, ...requestOptions });
 
-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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * The Workflow is updated according to the patch parameters.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-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 { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Update a Workflow
+/**
+ * @summary Delete a Workflow
  */
+export const invalidateDeleteWorkflow = async (
+  queryClient: QueryClient,
+  workflowId: string,
+  options?: InvalidateOptions,
+): Promise<QueryClient> => {
+  await queryClient.invalidateQueries({ queryKey: getDeleteWorkflowQueryKey(workflowId) }, options);
+
+  return queryClient;
+};
+
 export type updateWorkflowResponse200 = { data: WorkflowPatchResponse; status: 200 };
 
 export type updateWorkflowResponse401 = { data: void; status: 401 };
@@ -748,6 +841,12 @@ export const getUpdateWorkflowUrl = (workflowId: string) => {
   return `/workflow/${workflowId}`;
 };
 
+/**
+ * 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 = async (
   workflowId: string,
   workflowPatchBodyBody: WorkflowPatchBodyBody,
@@ -771,75 +870,139 @@ export const updateWorkflow = async (
   });
 };
 
-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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
+  const queryKey =
+    queryOptions?.queryKey ?? getUpdateWorkflowQueryKey(workflowId, workflowPatchBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof updateWorkflow>>> = ({ signal }) =>
+    updateWorkflow(workflowId, workflowPatchBodyBody, { signal, ...requestOptions });
+
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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);
 
-  return useMutation(mutationOptions, 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.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
- * @summary Gets the full definition of a Workflow
+  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 queryClient;
+};
+
 export type getWorkflowDefinitionResponse200 = { data: WorkflowDefinitionGetResponse; status: 200 };
 
 export type getWorkflowDefinitionResponse401 = { data: void; status: 401 };
@@ -862,6 +1025,10 @@ export const getGetWorkflowDefinitionUrl = (workflowId: string) => {
   return `/workflow/${workflowId}/definition`;
 };
 
+/**
+ * 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 = async (
   workflowId: string,
   options?: RequestInit,
@@ -872,7 +1039,7 @@ export const getWorkflowDefinition = async (
   });
 };
 
-export const getGetWorkflowDefinitionQueryKey = (workflowId?: string) => {
+export const getGetWorkflowDefinitionQueryKey = (workflowId: string) => {
   return ["data-manager", "workflow", workflowId, "definition"] as const;
 };
 
@@ -895,11 +1062,14 @@ export const getGetWorkflowDefinitionQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getWorkflowDefinition>>> = ({ signal }) =>
     getWorkflowDefinition(workflowId, { signal, ...requestOptions });
 
-  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<
@@ -927,7 +1097,7 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -948,7 +1118,7 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -961,7 +1131,7 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customFetch>;
   },
   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
  */
@@ -978,16 +1148,14 @@ export function useGetWorkflowDefinition<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }
 
 /**
@@ -1029,7 +1197,7 @@ export const getGetWorkflowDefinitionSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getWorkflowDefinition>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetWorkflowDefinitionSuspenseQueryResult = NonNullable<
@@ -1049,7 +1217,7 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1062,7 +1230,7 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1075,7 +1243,7 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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
  */
@@ -1092,24 +1260,17 @@ export function useGetWorkflowDefinitionSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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 type runWorkflowResponse201 = { data: WorkflowRunPostResponse; status: 201 };
 
 export type runWorkflowResponse401 = { data: void; status: 401 };
@@ -1127,6 +1288,10 @@ export const getRunWorkflowUrl = (workflowId: string) => {
   return `/workflow/${workflowId}/run`;
 };
 
+/**
+ * Runs a Workflow.
+ * @summary Run a Workflow
+ */
 export const runWorkflow = async (
   workflowId: string,
   workflowRunPostBodyBody: WorkflowRunPostBodyBody,
@@ -1150,77 +1315,139 @@ export const runWorkflow = async (
   });
 };
 
-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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  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, { signal, ...requestOptions });
+
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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);
 
-  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.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-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 { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Applied a version to the Workflow
+/**
+ * @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,
+  );
+
+  return queryClient;
+};
+
 export type versionWorkflowResponse201 = { data: WorkflowVersionPutResponse; status: 201 };
 
 export type versionWorkflowResponse401 = { data: void; status: 401 };
@@ -1239,6 +1466,12 @@ export const getVersionWorkflowUrl = (workflowId: string) => {
   return `/workflow/${workflowId}/version`;
 };
 
+/**
+ * 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 = async (
   workflowId: string,
   workflowVersionPutBodyBody: WorkflowVersionPutBodyBody,
@@ -1255,79 +1488,150 @@ export const versionWorkflow = async (
   });
 };
 
-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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-  return { mutationFn, ...mutationOptions };
+  const queryKey =
+    queryOptions?.queryKey ?? getVersionWorkflowQueryKey(workflowId, workflowVersionPutBodyBody);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof versionWorkflow>>> = ({ signal }) =>
+    versionWorkflow(workflowId, workflowVersionPutBodyBody, { signal, ...requestOptions });
+
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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,
+  );
 
-  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.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
-By providing a workflow ID you will only see Running Workflows for that Workflow.
+  return { ...query, queryKey: queryOptions.queryKey };
+}
 
- * @summary Get all Running Workflows available to you
+/**
+ * @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,
+  );
+
+  return queryClient;
+};
+
 export type getRunningWorkflowsResponse200 = { data: RunningWorkflowGetAllResponse; status: 200 };
 
 export type getRunningWorkflowsResponse401 = { data: void; status: 401 };
@@ -1348,7 +1652,7 @@ export const getGetRunningWorkflowsUrl = (params?: GetRunningWorkflowsParams) =>
 
   Object.entries(params || {}).forEach(([key, value]) => {
     if (value !== undefined) {
-      normalizedParams.append(key, value === null ? "null" : value.toString());
+      normalizedParams.append(key, value === null ? "null" : String(value));
     }
   });
 
@@ -1359,6 +1663,12 @@ export const getGetRunningWorkflowsUrl = (params?: GetRunningWorkflowsParams) =>
     : `/running-workflow`;
 };
 
+/**
+ * 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 = async (
   params?: GetRunningWorkflowsParams,
   options?: RequestInit,
@@ -1396,7 +1706,7 @@ export const getGetRunningWorkflowsQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflows>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowsQueryResult = NonNullable<
@@ -1424,7 +1734,7 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1445,7 +1755,7 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1458,7 +1768,7 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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
  */
@@ -1475,16 +1785,14 @@ export function useGetRunningWorkflows<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }
 
 /**
@@ -1526,7 +1834,7 @@ export const getGetRunningWorkflowsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflows>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowsSuspenseQueryResult = NonNullable<
@@ -1546,7 +1854,7 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1559,7 +1867,7 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1572,7 +1880,7 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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
  */
@@ -1589,24 +1897,17 @@ export function useGetRunningWorkflowsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  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 type getRunningWorkflowResponse200 = { data: RunningWorkflowGetResponse; status: 200 };
 
 export type getRunningWorkflowResponse401 = { data: void; status: 401 };
@@ -1629,6 +1930,10 @@ export const getGetRunningWorkflowUrl = (runningWorkflowId: string) => {
   return `/running-workflow/${runningWorkflowId}`;
 };
 
+/**
+ * Get details of a specific Running Workflow available to you.
+ * @summary Get details of a specific Running Workflow
+ */
 export const getRunningWorkflow = async (
   runningWorkflowId: string,
   options?: RequestInit,
@@ -1639,7 +1944,7 @@ export const getRunningWorkflow = async (
   });
 };
 
-export const getGetRunningWorkflowQueryKey = (runningWorkflowId?: string) => {
+export const getGetRunningWorkflowQueryKey = (runningWorkflowId: string) => {
   return ["data-manager", "running-workflow", runningWorkflowId] as const;
 };
 
@@ -1660,11 +1965,14 @@ export const getGetRunningWorkflowQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getRunningWorkflow>>> = ({ signal }) =>
     getRunningWorkflow(runningWorkflowId, { signal, ...requestOptions });
 
-  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<
@@ -1690,7 +1998,7 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1711,7 +2019,7 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1722,7 +2030,7 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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
  */
@@ -1737,16 +2045,14 @@ export function useGetRunningWorkflow<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }
 
 /**
@@ -1788,7 +2094,7 @@ export const getGetRunningWorkflowSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflow>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowSuspenseQueryResult = NonNullable<
@@ -1808,7 +2114,7 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1821,7 +2127,7 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -1834,7 +2140,7 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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
  */
@@ -1851,26 +2157,17 @@ export function useGetRunningWorkflowSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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.
-
- * @summary Delete a Running Workflow
- */
 export type deleteRunningWorkflowResponse204 = { data: void; status: 204 };
 
 export type deleteRunningWorkflowResponse401 = { data: void; status: 401 };
@@ -1893,6 +2190,12 @@ export const getDeleteRunningWorkflowUrl = (runningWorkflowId: string) => {
   return `/running-workflow/${runningWorkflowId}`;
 };
 
+/**
+ * Deletes a Running Workflow.
+ *
+ * It is an error to delete a Running Workflow that is Running.
+ * @summary Delete a Running Workflow
+ */
 export const deleteRunningWorkflow = async (
   runningWorkflowId: string,
   options?: RequestInit,
@@ -1903,77 +2206,141 @@ export const deleteRunningWorkflow = async (
   );
 };
 
-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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getDeleteRunningWorkflowQueryKey(runningWorkflowId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof deleteRunningWorkflow>>> = ({ signal }) =>
+    deleteRunningWorkflow(runningWorkflowId, { signal, ...requestOptions });
+
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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);
 
-  return useMutation(mutationOptions, queryClient);
-};
-/**
- * Stops a Running Workflow.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
- * @summary Stop a Running Workflow
+  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 queryClient;
+};
+
 export type stopRunningWorkflowResponse204 = { data: void; status: 204 };
 
 export type stopRunningWorkflowResponse401 = { data: void; status: 401 };
@@ -1996,6 +2363,10 @@ export const getStopRunningWorkflowUrl = (runningWorkflowId: string) => {
   return `/running-workflow/${runningWorkflowId}/stop`;
 };
 
+/**
+ * Stops a Running Workflow.
+ * @summary Stop a Running Workflow
+ */
 export const stopRunningWorkflow = async (
   runningWorkflowId: string,
   options?: RequestInit,
@@ -2006,77 +2377,141 @@ export const stopRunningWorkflow = async (
   });
 };
 
-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 customFetch>;
-}): 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 customFetch>;
+  },
+) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getStopRunningWorkflowQueryKey(runningWorkflowId);
 
-  return { mutationFn, ...mutationOptions };
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof stopRunningWorkflow>>> = ({ signal }) =>
+    stopRunningWorkflow(runningWorkflowId, { signal, ...requestOptions });
+
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
+  },
+  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 customFetch>;
   },
   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);
 
-  return useMutation(mutationOptions, 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.
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 
- * @summary Get all the Running Workflow Steps
+  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;
+};
+
 export type getRunningWorkflowStepsResponse200 = {
   data: RunningWorkflowStepsGetResponse;
   status: 200;
@@ -2102,6 +2537,10 @@ export const getGetRunningWorkflowStepsUrl = (runningWorkflowId: string) => {
   return `/running-workflow/${runningWorkflowId}/steps`;
 };
 
+/**
+ * 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 = async (
   runningWorkflowId: string,
   options?: RequestInit,
@@ -2112,7 +2551,7 @@ export const getRunningWorkflowSteps = async (
   );
 };
 
-export const getGetRunningWorkflowStepsQueryKey = (runningWorkflowId?: string) => {
+export const getGetRunningWorkflowStepsQueryKey = (runningWorkflowId: string) => {
   return ["data-manager", "running-workflow", runningWorkflowId, "steps"] as const;
 };
 
@@ -2136,11 +2575,14 @@ export const getGetRunningWorkflowStepsQueryOptions = <
     signal,
   }) => getRunningWorkflowSteps(runningWorkflowId, { signal, ...requestOptions });
 
-  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<
@@ -2168,7 +2610,7 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -2189,7 +2631,7 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -2202,7 +2644,7 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all the Running Workflow Steps
  */
@@ -2219,16 +2661,14 @@ export function useGetRunningWorkflowSteps<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }
 
 /**
@@ -2271,7 +2711,7 @@ export const getGetRunningWorkflowStepsSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getRunningWorkflowSteps>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetRunningWorkflowStepsSuspenseQueryResult = NonNullable<
@@ -2291,7 +2731,7 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -2304,7 +2744,7 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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>,
@@ -2317,7 +2757,7 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get all the Running Workflow Steps
  */
@@ -2334,15 +2774,13 @@ export function useGetRunningWorkflowStepsSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   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 };
 }