@squonk/account-server-client 4.2.1 → 4.3.1

package/src/organisation/organisation.ts

@@ -1,24 +1,20 @@
-// @ts-nocheck
 /**
- * Generated by orval v7.4.1 🍺
+ * Generated by orval v7.10.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
 
 A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
 
- * OpenAPI spec version: 4.2
+ * OpenAPI spec version: 4.3
  */
-import {
-  useMutation,
-  useQuery,
-  useSuspenseQuery
-} from '@tanstack/react-query'
+import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import type {
   DataTag,
   DefinedInitialDataOptions,
   DefinedUseQueryResult,
   MutationFunction,
+  QueryClient,
   QueryFunction,
   QueryKey,
   UndefinedInitialDataOptions,
@@ -27,8 +23,9 @@ import type {
   UseQueryOptions,
   UseQueryResult,
   UseSuspenseQueryOptions,
-  UseSuspenseQueryResult
-} from '@tanstack/react-query'
+  UseSuspenseQueryResult,
+} from "@tanstack/react-query";
+
 import type {
   AsError,
   GetOrganisationsParams,
@@ -37,14 +34,15 @@ import type {
   OrganisationPatchBodyBody,
   OrganisationPostBodyBody,
   OrganisationPostResponse,
-  OrganisationsGetResponse
-} from '../account-server-api.schemas'
-import { customInstance } from '.././custom-instance';
-import type { ErrorType } from '.././custom-instance';
-
+  OrganisationsGetResponse,
+} from "../account-server-api.schemas";
 
-type SecondParameter<T extends (...args: any) => any> = Parameters<T>[1];
+import { customInstance } from ".././custom-instance";
+import type { ErrorType } from ".././custom-instance";
+import { queryMutator } from ".././options-mutator";
+import { mutationMutator } from ".././options-mutator";
 
+type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
 /**
  * Gets all the Organisations that you are a member of, or a specific Organisation by name.
@@ -54,144 +52,225 @@ You can see an Organisation if you are a member of it, the owner (creator) of it
  * @summary Gets Organisations
  */
 export const getOrganisations = (
-    params?: GetOrganisationsParams,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  params?: GetOrganisationsParams,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<OrganisationsGetResponse>(
-      {url: `/organisation`, method: 'GET',
-        params, signal
-    },
-      options);
-    }
-  
-
-export const getGetOrganisationsQueryKey = (params?: GetOrganisationsParams,) => {
-    return ["account-server-api", `/organisation`, ...(params ? [params]: [])] as const;
-    }
-
-    
-export const getGetOrganisationsQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(params?: GetOrganisationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<OrganisationsGetResponse>(
+    { url: `/organisation`, method: "GET", params, signal },
+    options,
+  );
+};
+
+export const getGetOrganisationsQueryKey = (params?: GetOrganisationsParams) => {
+  return [`/organisation`, ...(params ? [params] : [])] as const;
+};
+
+export const useGetOrganisationsQueryOptions = <
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationsQueryKey(params);
+  const queryKey = queryOptions?.queryKey ?? getGetOrganisationsQueryKey(params);
 
-  
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisations>>> = ({ signal }) =>
+    getOrganisations(params, requestOptions, signal);
 
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisations>>> = ({ signal }) => getOrganisations(params, requestOptions, signal);
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-      
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getOrganisations>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-      
+export type GetOrganisationsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>;
+export type GetOrganisationsQueryError = ErrorType<void | AsError>;
 
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetOrganisationsQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>
-export type GetOrganisationsQueryError = ErrorType<void | AsError>
-
-
-export function useGetOrganisations<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params: undefined |  GetOrganisationsParams, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>> & Pick<
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params: undefined | GetOrganisationsParams,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getOrganisations>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisations<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params?: GetOrganisationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getOrganisations>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getOrganisations>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisations<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params?: GetOrganisationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getOrganisations>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisations
  */
 
-export function useGetOrganisations<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params?: GetOrganisationsParams, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetOrganisationsQueryOptions(params,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetOrganisations<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetOrganisationsQueryOptions(params, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetOrganisationsSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(params?: GetOrganisationsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetOrganisationsSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationsQueryKey(params);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisations>>> = ({ signal }) => getOrganisations(params, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetOrganisationsSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisations>>>
-export type GetOrganisationsSuspenseQueryError = ErrorType<void | AsError>
-
-
-export function useGetOrganisationsSuspense<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params: undefined |  GetOrganisationsParams, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisationsSuspense<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params?: GetOrganisationsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisationsSuspense<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params?: GetOrganisationsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetOrganisationsQueryKey(params);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisations>>> = ({ signal }) =>
+    getOrganisations(params, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getOrganisations>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetOrganisationsSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getOrganisations>>
+>;
+export type GetOrganisationsSuspenseQueryError = ErrorType<void | AsError>;
+
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params: undefined | GetOrganisationsParams,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets Organisations
  */
 
-export function useGetOrganisationsSuspense<TData = Awaited<ReturnType<typeof getOrganisations>>, TError = ErrorType<void | AsError>>(
- params?: GetOrganisationsParams, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetOrganisationsSuspenseQueryOptions(params,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetOrganisationsSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisations>>,
+  TError = ErrorType<void | AsError>,
+>(
+  params?: GetOrganisationsParams,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisations>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetOrganisationsSuspenseQueryOptions(params, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
  * Creates a new Organisation.
 
@@ -202,66 +281,91 @@ You need admin rights to use this method
  * @summary Create a new organisation
  */
 export const createOrganisation = (
-    organisationPostBodyBody: OrganisationPostBodyBody,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  organisationPostBodyBody: OrganisationPostBodyBody,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<OrganisationPostResponse>(
-      {url: `/organisation`, method: 'POST',
-      headers: {'Content-Type': 'application/json', },
-      data: organisationPostBodyBody, signal
+  return customInstance<OrganisationPostResponse>(
+    {
+      url: `/organisation`,
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      data: organisationPostBodyBody,
+      signal,
     },
-      options);
-    }
-  
-
-
-export const getCreateOrganisationMutationOptions = <TData = Awaited<ReturnType<typeof createOrganisation>>, TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: OrganisationPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
-) => {
-const mutationKey = ['createOrganisation'];
-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};
+    options,
+  );
+};
+
+export const useCreateOrganisationMutationOptions = <
+  TError = ErrorType<AsError | void>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof createOrganisation>>,
+    TError,
+    { data: OrganisationPostBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof createOrganisation>>,
+  TError,
+  { data: OrganisationPostBodyBody },
+  TContext
+> => {
+  const mutationKey = ["createOrganisation"];
+  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 createOrganisation>>,
+    { data: OrganisationPostBodyBody }
+  > = (props) => {
+    const { data } = props ?? {};
+
+    return createOrganisation(data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type CreateOrganisationMutationResult = NonNullable<
+  Awaited<ReturnType<typeof createOrganisation>>
+>;
+export type CreateOrganisationMutationBody = OrganisationPostBodyBody;
+export type CreateOrganisationMutationError = ErrorType<AsError | void>;
 
-      
-
-
-      const mutationFn: MutationFunction<Awaited<ReturnType<typeof createOrganisation>>, {data: OrganisationPostBodyBody}> = (props) => {
-          const {data} = props ?? {};
-
-          return  createOrganisation(data,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{data: OrganisationPostBodyBody}, TContext>}
-
-    export type CreateOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof createOrganisation>>>
-    export type CreateOrganisationMutationBody = OrganisationPostBodyBody
-    export type CreateOrganisationMutationError = ErrorType<AsError | void>
-
-    /**
+/**
  * @summary Create a new organisation
  */
-export const useCreateOrganisation = <TData = Awaited<ReturnType<typeof createOrganisation>>, TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{data: OrganisationPostBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useCreateOrganisation = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof createOrganisation>>,
+      TError,
+      { data: OrganisationPostBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {data: OrganisationPostBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getCreateOrganisationMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof createOrganisation>>,
+  TError,
+  { data: OrganisationPostBodyBody },
+  TContext
+> => {
+  const mutationOptions = useCreateOrganisationMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Gets an Organisation. To see the Organisation you need admin rights or need to be a member of the Organisation or are its *creator*.
 
 Members of an Organisation's **Unit** do not have access to the Organisation.
@@ -269,211 +373,319 @@ Members of an Organisation's **Unit** do not have access to the Organisation.
  * @summary Gets an Organisation
  */
 export const getOrganisation = (
-    orgId: string,
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  orgId: string,
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<OrganisationAllDetail>(
-      {url: `/organisation/${orgId}`, method: 'GET', signal
-    },
-      options);
-    }
-  
-
-export const getGetOrganisationQueryKey = (orgId: string,) => {
-    return ["account-server-api", `/organisation/${orgId}`] as const;
-    }
-
-    
-export const getGetOrganisationQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+  return customInstance<OrganisationAllDetail>(
+    { url: `/organisation/${orgId}`, method: "GET", signal },
+    options,
+  );
+};
+
+export const getGetOrganisationQueryKey = (orgId: string) => {
+  return [`/organisation/${orgId}`] as const;
+};
+
+export const useGetOrganisationQueryOptions = <
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
 
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationQueryKey(orgId);
+  const queryKey = queryOptions?.queryKey ?? getGetOrganisationQueryKey(orgId);
 
-  
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({ signal }) =>
+    getOrganisation(orgId, requestOptions, signal);
 
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({ signal }) => getOrganisation(orgId, requestOptions, signal);
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
 
-      
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getOrganisation>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
 
-      
+export type GetOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisation>>>;
+export type GetOrganisationQueryError = ErrorType<void | AsError>;
 
-   return  { queryKey, queryFn, enabled: !!(orgId), ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisation>>>
-export type GetOrganisationQueryError = ErrorType<void | AsError>
-
-
-export function useGetOrganisation<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>> & Pick<
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>> &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getOrganisation>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisation<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>> &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getOrganisation>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisation<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisation
  */
 
-export function useGetOrganisation<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetOrganisationQueryOptions(orgId,options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetOrganisation<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<UseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetOrganisationQueryOptions(orgId, options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetOrganisationSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
+export const useGetOrganisationSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
 ) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetOrganisationQueryKey(orgId);
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({ signal }) => getOrganisation(orgId, requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetOrganisationSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getOrganisation>>>
-export type GetOrganisationSuspenseQueryError = ErrorType<void | AsError>
-
-
-export function useGetOrganisationSuspense<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisationSuspense<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetOrganisationSuspense<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetOrganisationQueryKey(orgId);
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisation>>> = ({ signal }) =>
+    getOrganisation(orgId, requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getOrganisation>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetOrganisationSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getOrganisation>>
+>;
+export type GetOrganisationSuspenseQueryError = ErrorType<void | AsError>;
+
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets an Organisation
  */
 
-export function useGetOrganisationSuspense<TData = Awaited<ReturnType<typeof getOrganisation>>, TError = ErrorType<void | AsError>>(
- orgId: string, options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetOrganisationSuspenseQueryOptions(orgId,options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  orgId: string,
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetOrganisationSuspenseQueryOptions(orgId, options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
 /**
- * Used to update existing Organisation.
+ * Used to update existing Organisation. You can change an Organisation's **name** or its **default_product_privacy**.
+
+Changes to the default product privacy may conflict with those settings in any existing Units where the default product privacy of those existing units will be honoured. Any new Organisation value will only apply to new Units.
 
 You have to be a member of the **Organisation**, its creator, or an administrator to patch an Organisation.
 
  * @summary Adjust an existing Organisation
  */
 export const patchOrganisation = (
-    orgId: string,
-    organisationPatchBodyBody: OrganisationPatchBodyBody,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/organisation/${orgId}`, method: 'PATCH',
-      headers: {'Content-Type': 'application/json', },
-      data: organisationPatchBodyBody
-    },
-      options);
-    }
-  
-
-
-export const getPatchOrganisationMutationOptions = <TData = Awaited<ReturnType<typeof patchOrganisation>>, TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{orgId: string;data: OrganisationPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+  orgId: string,
+  organisationPatchBodyBody: OrganisationPatchBodyBody,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['patchOrganisation'];
-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 patchOrganisation>>, {orgId: string;data: OrganisationPatchBodyBody}> = (props) => {
-          const {orgId,data} = props ?? {};
-
-          return  patchOrganisation(orgId,data,requestOptions)
-        }
-
-        
-
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{orgId: string;data: OrganisationPatchBodyBody}, TContext>}
-
-    export type PatchOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof patchOrganisation>>>
-    export type PatchOrganisationMutationBody = OrganisationPatchBodyBody
-    export type PatchOrganisationMutationError = ErrorType<void | AsError>
+  return customInstance<void>(
+    {
+      url: `/organisation/${orgId}`,
+      method: "PATCH",
+      headers: { "Content-Type": "application/json" },
+      data: organisationPatchBodyBody,
+    },
+    options,
+  );
+};
+
+export const usePatchOrganisationMutationOptions = <
+  TError = ErrorType<void | AsError>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof patchOrganisation>>,
+    TError,
+    { orgId: string; data: OrganisationPatchBodyBody },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof patchOrganisation>>,
+  TError,
+  { orgId: string; data: OrganisationPatchBodyBody },
+  TContext
+> => {
+  const mutationKey = ["patchOrganisation"];
+  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 patchOrganisation>>,
+    { orgId: string; data: OrganisationPatchBodyBody }
+  > = (props) => {
+    const { orgId, data } = props ?? {};
+
+    return patchOrganisation(orgId, data, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type PatchOrganisationMutationResult = NonNullable<
+  Awaited<ReturnType<typeof patchOrganisation>>
+>;
+export type PatchOrganisationMutationBody = OrganisationPatchBodyBody;
+export type PatchOrganisationMutationError = ErrorType<void | AsError>;
 
-    /**
+/**
  * @summary Adjust an existing Organisation
  */
-export const usePatchOrganisation = <TData = Awaited<ReturnType<typeof patchOrganisation>>, TError = ErrorType<void | AsError>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{orgId: string;data: OrganisationPatchBodyBody}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const usePatchOrganisation = <TError = ErrorType<void | AsError>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof patchOrganisation>>,
+      TError,
+      { orgId: string; data: OrganisationPatchBodyBody },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {orgId: string;data: OrganisationPatchBodyBody},
-        TContext
-      > => {
-
-      const mutationOptions = getPatchOrganisationMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof patchOrganisation>>,
+  TError,
+  { orgId: string; data: OrganisationPatchBodyBody },
+  TContext
+> => {
+  const mutationOptions = usePatchOrganisationMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Before an Organisation can be deleted all its underlying **Units** must also be deleted, remembering that **Units** that have undeleted **Products** cannot be deleted.
 
 You need admin rights to use this method
@@ -481,63 +693,81 @@ You need admin rights to use this method
  * @summary Deletes an Organisation
  */
 export const deleteOrganisation = (
-    orgId: string,
- options?: SecondParameter<typeof customInstance>,) => {
-      
-      
-      return customInstance<void>(
-      {url: `/organisation/${orgId}`, method: 'DELETE'
-    },
-      options);
-    }
-  
-
-
-export const getDeleteOrganisationMutationOptions = <TData = Awaited<ReturnType<typeof deleteOrganisation>>, TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{orgId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+  orgId: string,
+  options?: SecondParameter<typeof customInstance>,
 ) => {
-const mutationKey = ['deleteOrganisation'];
-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 deleteOrganisation>>, {orgId: string}> = (props) => {
-          const {orgId} = props ?? {};
-
-          return  deleteOrganisation(orgId,requestOptions)
-        }
-
-        
+  return customInstance<void>({ url: `/organisation/${orgId}`, method: "DELETE" }, options);
+};
+
+export const useDeleteOrganisationMutationOptions = <
+  TError = ErrorType<AsError | void>,
+  TContext = unknown,
+>(options?: {
+  mutation?: UseMutationOptions<
+    Awaited<ReturnType<typeof deleteOrganisation>>,
+    TError,
+    { orgId: string },
+    TContext
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}): UseMutationOptions<
+  Awaited<ReturnType<typeof deleteOrganisation>>,
+  TError,
+  { orgId: string },
+  TContext
+> => {
+  const mutationKey = ["deleteOrganisation"];
+  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 deleteOrganisation>>,
+    { orgId: string }
+  > = (props) => {
+    const { orgId } = props ?? {};
+
+    return deleteOrganisation(orgId, requestOptions);
+  };
+
+  const customOptions = mutationMutator({ ...mutationOptions, mutationFn });
+
+  return customOptions;
+};
+
+export type DeleteOrganisationMutationResult = NonNullable<
+  Awaited<ReturnType<typeof deleteOrganisation>>
+>;
+
+export type DeleteOrganisationMutationError = ErrorType<AsError | void>;
 
-
-  return  { mutationFn, ...mutationOptions } as UseMutationOptions<TData, TError,{orgId: string}, TContext>}
-
-    export type DeleteOrganisationMutationResult = NonNullable<Awaited<ReturnType<typeof deleteOrganisation>>>
-    
-    export type DeleteOrganisationMutationError = ErrorType<AsError | void>
-
-    /**
+/**
  * @summary Deletes an Organisation
  */
-export const useDeleteOrganisation = <TData = Awaited<ReturnType<typeof deleteOrganisation>>, TError = ErrorType<AsError | void>,
-    TContext = unknown>(options?: { mutation?:UseMutationOptions<TData, TError,{orgId: string}, TContext>, request?: SecondParameter<typeof customInstance>}
+export const useDeleteOrganisation = <TError = ErrorType<AsError | void>, TContext = unknown>(
+  options?: {
+    mutation?: UseMutationOptions<
+      Awaited<ReturnType<typeof deleteOrganisation>>,
+      TError,
+      { orgId: string },
+      TContext
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
 ): UseMutationResult<
-        TData,
-        TError,
-        {orgId: string},
-        TContext
-      > => {
-
-      const mutationOptions = getDeleteOrganisationMutationOptions(options);
-
-      return useMutation(mutationOptions);
-    }
-    /**
+  Awaited<ReturnType<typeof deleteOrganisation>>,
+  TError,
+  { orgId: string },
+  TContext
+> => {
+  const mutationOptions = useDeleteOrganisationMutationOptions(options);
+
+  return useMutation(mutationOptions, queryClient);
+};
+/**
  * Gets the Default Organisation, a built-in Organisation used exclusively for **Personal Units**.
 
 Any authorised user can see the Default Organisation.
@@ -545,140 +775,218 @@ Any authorised user can see the Default Organisation.
  * @summary Gets the Default Organisation
  */
 export const getDefaultOrganisation = (
-    
- options?: SecondParameter<typeof customInstance>,signal?: AbortSignal
+  options?: SecondParameter<typeof customInstance>,
+  signal?: AbortSignal,
 ) => {
-      
-      
-      return customInstance<OrganisationGetDefaultResponse>(
-      {url: `/default/organisation`, method: 'GET', signal
-    },
-      options);
-    }
-  
+  return customInstance<OrganisationGetDefaultResponse>(
+    { url: `/default/organisation`, method: "GET", signal },
+    options,
+  );
+};
 
 export const getGetDefaultOrganisationQueryKey = () => {
-    return ["account-server-api", `/default/organisation`] as const;
-    }
-
-    
-export const getGetDefaultOrganisationQueryOptions = <TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>( options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getDefaultOrganisation>>> = ({ signal }) => getDefaultOrganisation(requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetDefaultOrganisationQueryResult = NonNullable<Awaited<ReturnType<typeof getDefaultOrganisation>>>
-export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>
-
-
-export function useGetDefaultOrganisation<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options: { query:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>> & Pick<
+  return [`/default/organisation`] as const;
+};
+
+export const useGetDefaultOrganisationQueryOptions = <
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(options?: {
+  query?: Partial<
+    UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getDefaultOrganisation>>> = ({ signal }) =>
+    getDefaultOrganisation(requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseQueryOptions<
+    Awaited<ReturnType<typeof getDefaultOrganisation>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetDefaultOrganisationQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getDefaultOrganisation>>
+>;
+export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>;
+
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    > &
+      Pick<
         DefinedInitialDataOptions<
           Awaited<ReturnType<typeof getDefaultOrganisation>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDefaultOrganisation<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>> & Pick<
+          Awaited<ReturnType<typeof getDefaultOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    > &
+      Pick<
         UndefinedInitialDataOptions<
           Awaited<ReturnType<typeof getDefaultOrganisation>>,
           TError,
-          TData
-        > , 'initialData'
-      >, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDefaultOrganisation<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+          Awaited<ReturnType<typeof getDefaultOrganisation>>
+        >,
+        "initialData"
+      >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Default Organisation
  */
 
-export function useGetDefaultOrganisation<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options?: { query?:Partial<UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetDefaultOrganisationQueryOptions(options)
-
-  const query = useQuery(queryOptions) as  UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetDefaultOrganisation<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetDefaultOrganisationQueryOptions(options);
+
+  const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
 
-
-
-export const getGetDefaultOrganisationSuspenseQueryOptions = <TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>( options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-) => {
-
-const {query: queryOptions, request: requestOptions} = options ?? {};
-
-  const queryKey =  queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
-
-  
-
-    const queryFn: QueryFunction<Awaited<ReturnType<typeof getDefaultOrganisation>>> = ({ signal }) => getDefaultOrganisation(requestOptions, signal);
-
-      
-
-      
-
-   return  { queryKey, queryFn, ...queryOptions} as UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData> & { queryKey: DataTag<QueryKey, TData, TError> }
-}
-
-export type GetDefaultOrganisationSuspenseQueryResult = NonNullable<Awaited<ReturnType<typeof getDefaultOrganisation>>>
-export type GetDefaultOrganisationSuspenseQueryError = ErrorType<void | AsError>
-
-
-export function useGetDefaultOrganisationSuspense<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options: { query:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDefaultOrganisationSuspense<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
-export function useGetDefaultOrganisationSuspense<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> }
+export const useGetDefaultOrganisationSuspenseQueryOptions = <
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(options?: {
+  query?: Partial<
+    UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+  >;
+  request?: SecondParameter<typeof customInstance>;
+}) => {
+  const { query: queryOptions, request: requestOptions } = options ?? {};
+
+  const queryKey = queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
+
+  const queryFn: QueryFunction<Awaited<ReturnType<typeof getDefaultOrganisation>>> = ({ signal }) =>
+    getDefaultOrganisation(requestOptions, signal);
+
+  const customOptions = queryMutator({ ...queryOptions, queryKey, queryFn });
+
+  return customOptions as UseSuspenseQueryOptions<
+    Awaited<ReturnType<typeof getDefaultOrganisation>>,
+    TError,
+    TData
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+};
+
+export type GetDefaultOrganisationSuspenseQueryResult = NonNullable<
+  Awaited<ReturnType<typeof getDefaultOrganisation>>
+>;
+export type GetDefaultOrganisationSuspenseQueryError = ErrorType<void | AsError>;
+
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options: {
+    query: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets the Default Organisation
  */
 
-export function useGetDefaultOrganisationSuspense<TData = Awaited<ReturnType<typeof getDefaultOrganisation>>, TError = ErrorType<void | AsError>>(
-  options?: { query?:Partial<UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>>, request?: SecondParameter<typeof customInstance>}
-
-  ):  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
-
-  const queryOptions = getGetDefaultOrganisationSuspenseQueryOptions(options)
-
-  const query = useSuspenseQuery(queryOptions) as  UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
-
-  query.queryKey = queryOptions.queryKey ;
+export function useGetDefaultOrganisationSuspense<
+  TData = Awaited<ReturnType<typeof getDefaultOrganisation>>,
+  TError = ErrorType<void | AsError>,
+>(
+  options?: {
+    query?: Partial<
+      UseSuspenseQueryOptions<Awaited<ReturnType<typeof getDefaultOrganisation>>, TError, TData>
+    >;
+    request?: SecondParameter<typeof customInstance>;
+  },
+  queryClient?: QueryClient,
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
+  const queryOptions = useGetDefaultOrganisationSuspenseQueryOptions(options);
+
+  const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
+    TData,
+    TError
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
+
+  query.queryKey = queryOptions.queryKey;
 
   return query;
 }
-
-
-