@refinedev/core 4.48.0 → 4.49.1

package/src/hooks/data/useDeleteMany.ts

@@ -1,12 +1,11 @@
 import { getXRay } from "@refinedev/devtools-internal";
 import {
-  useMutation,
   UseMutationOptions,
   UseMutationResult,
+  useMutation,
   useQueryClient,
 } from "@tanstack/react-query";
 
-import { ActionTypes } from "@contexts/undoableQueue";
 import {
   handleMultiple,
   pickDataProvider,
@@ -19,6 +18,7 @@ import {
   useDataProvider,
   useHandleNotification,
   useInvalidate,
+  useKeys,
   useLog,
   useMeta,
   useMutationMode,
@@ -28,7 +28,7 @@ import {
   useResource,
   useTranslate,
 } from "@hooks";
-import { useKeys } from "@hooks/useKeys";
+
 import {
   BaseKey,
   BaseRecord,
@@ -40,12 +40,13 @@ import {
   MutationMode,
   PrevContext as DeleteContext,
   PreviousQuery,
-  SuccessErrorNotification,
-} from "../../interfaces";
+} from "../../contexts/data/types";
+import { SuccessErrorNotification } from "../../contexts/notification/types";
+import { ActionTypes } from "../../contexts/undoableQueue/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
 export type DeleteManyParams<TData, TError, TVariables> = {

package/src/hooks/data/useInfiniteList.ts

@@ -2,8 +2,8 @@ import { getXRay } from "@refinedev/devtools-internal";
 import {
   InfiniteData,
   InfiniteQueryObserverResult,
-  useInfiniteQuery,
   UseInfiniteQueryOptions,
+  useInfiniteQuery,
 } from "@tanstack/react-query";
 
 import {
@@ -12,42 +12,43 @@ import {
   handlePaginationParams,
   pickDataProvider,
   pickNotDeprecated,
+  prepareQueryContext,
   useActiveAuthProvider,
 } from "@definitions/helpers";
 import {
   useDataProvider,
   useHandleNotification,
+  useKeys,
   useMeta,
   useOnError,
   useResource,
   useResourceSubscription,
   useTranslate,
 } from "@hooks";
+
 import {
   BaseRecord,
-  CrudFilters,
-  CrudSorting,
+  CrudFilter,
+  CrudSort,
   GetListResponse,
   HttpError,
-  LiveModeProps,
   MetaQuery,
   Pagination,
   Prettify,
-  SuccessErrorNotification,
-} from "../../interfaces";
-
-import { useKeys } from "@hooks/useKeys";
+} from "../../contexts/data/types";
+import { LiveModeProps } from "../../contexts/live/types";
+import { SuccessErrorNotification } from "../../contexts/notification/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
 export interface UseInfiniteListConfig {
   pagination?: Pagination;
   hasPagination?: boolean;
-  sort?: CrudSorting;
-  filters?: CrudFilters;
+  sort?: CrudSort[];
+  filters?: CrudFilter[];
 }
 
 type BaseInfiniteListProps = {
@@ -78,11 +79,11 @@ type BaseInfiniteListProps = {
   /**
    * Sorter parameters
    */
-  sorters?: CrudSorting;
+  sorters?: CrudSort[];
   /**
    * Filter parameters
    */
-  filters?: CrudFilters;
+  filters?: CrudFilter[];
   /**
    * If there is more than one `dataProvider`, you should use the `dataProviderName` that you will use
    */
@@ -250,10 +251,15 @@ export const useInfiniteList = <
         }),
       })
       .get(preferLegacyKeys),
-    queryFn: ({ queryKey, pageParam, signal }) => {
+    queryFn: (context) => {
       const paginationProperties = {
         ...prefferedPagination,
-        current: pageParam,
+        current: context.pageParam,
+      };
+
+      const meta = {
+        ...combinedMeta,
+        queryContext: prepareQueryContext(context),
       };
 
       return getList<TQueryFnData>({
@@ -263,22 +269,8 @@ export const useInfiniteList = <
         filters: prefferedFilters,
         sort: prefferedSorters,
         sorters: prefferedSorters,
-        meta: {
-          ...combinedMeta,
-          queryContext: {
-            queryKey,
-            pageParam,
-            signal,
-          },
-        },
-        metaData: {
-          ...combinedMeta,
-          queryContext: {
-            queryKey,
-            pageParam,
-            signal,
-          },
-        },
+        meta,
+        metaData: meta,
       }).then(({ data, total, ...rest }) => {
         return {
           data,
@@ -323,7 +315,7 @@ export const useInfiniteList = <
     },
     meta: {
       ...queryOptions?.meta,
-      ...getXRay("useInfiniteList", preferLegacyKeys),
+      ...getXRay("useInfiniteList", preferLegacyKeys, resource?.name),
     },
   });
 

package/src/hooks/data/useList.ts

@@ -1,49 +1,51 @@
 import { getXRay } from "@refinedev/devtools-internal";
 import {
   QueryObserverResult,
-  useQuery,
   UseQueryOptions,
+  useQuery,
 } from "@tanstack/react-query";
 
 import {
   handlePaginationParams,
   pickDataProvider,
   pickNotDeprecated,
+  prepareQueryContext,
   useActiveAuthProvider,
 } from "@definitions/helpers";
 import {
   useDataProvider,
   useHandleNotification,
+  useKeys,
   useMeta,
   useOnError,
   useResource,
   useResourceSubscription,
   useTranslate,
 } from "@hooks";
-import { useKeys } from "@hooks/useKeys";
+
 import {
   BaseRecord,
-  CrudFilters,
-  CrudSorting,
+  CrudFilter,
+  CrudSort,
   GetListResponse,
   HttpError,
-  LiveModeProps,
   MetaQuery,
   Pagination,
   Prettify,
-  SuccessErrorNotification,
-} from "../../interfaces";
+} from "../../contexts/data/types";
+import { LiveModeProps } from "../../contexts/live/types";
+import { SuccessErrorNotification } from "../../contexts/notification/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
 export interface UseListConfig {
   pagination?: Pagination;
   hasPagination?: boolean;
-  sort?: CrudSorting;
-  filters?: CrudFilters;
+  sort?: CrudSort[];
+  filters?: CrudFilter[];
 }
 
 export type BaseListProps = {
@@ -65,11 +67,11 @@ export type BaseListProps = {
   /**
    * Sorter parameters
    */
-  sorters?: CrudSorting;
+  sorters?: CrudSort[];
   /**
    * Filter parameters
    */
-  filters?: CrudFilters;
+  filters?: CrudFilter[];
   /**
    * Meta data query for `dataProvider`
    */
@@ -247,7 +249,11 @@ export const useList = <
         }),
       })
       .get(preferLegacyKeys),
-    queryFn: ({ queryKey, pageParam, signal }) => {
+    queryFn: (context) => {
+      const meta = {
+        ...combinedMeta,
+        queryContext: prepareQueryContext(context),
+      };
       return getList<TQueryFnData>({
         resource: resource?.name ?? "",
         pagination: prefferedPagination,
@@ -255,22 +261,8 @@ export const useList = <
         filters: prefferedFilters,
         sort: prefferedSorters,
         sorters: prefferedSorters,
-        meta: {
-          ...combinedMeta,
-          queryContext: {
-            queryKey,
-            pageParam,
-            signal,
-          },
-        },
-        metaData: {
-          ...combinedMeta,
-          queryContext: {
-            queryKey,
-            pageParam,
-            signal,
-          },
-        },
+        meta,
+        metaData: meta,
       });
     },
     ...queryOptions,
@@ -329,7 +321,7 @@ export const useList = <
     },
     meta: {
       ...queryOptions?.meta,
-      ...getXRay("useList", preferLegacyKeys),
+      ...getXRay("useList", preferLegacyKeys, resource?.name),
     },
   });
 

package/src/hooks/data/useMany.ts

@@ -1,39 +1,41 @@
 import { getXRay } from "@refinedev/devtools-internal";
 import {
   QueryObserverResult,
-  useQuery,
   UseQueryOptions,
+  useQuery,
 } from "@tanstack/react-query";
 
 import {
   handleMultiple,
   pickDataProvider,
   pickNotDeprecated,
+  prepareQueryContext,
   useActiveAuthProvider,
 } from "@definitions/helpers";
 import {
   useDataProvider,
   useHandleNotification,
+  useKeys,
   useMeta,
   useOnError,
   useResource,
   useResourceSubscription,
   useTranslate,
 } from "@hooks";
-import { useKeys } from "@hooks/useKeys";
+
 import {
   BaseKey,
   BaseRecord,
   GetManyResponse,
   HttpError,
-  LiveModeProps,
   MetaQuery,
-  SuccessErrorNotification,
-} from "../../interfaces";
+} from "../../contexts/data/types";
+import { LiveModeProps } from "../../contexts/live/types";
+import { SuccessErrorNotification } from "../../contexts/notification/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
 export type UseManyProps<TQueryFnData, TError, TData> = {
@@ -166,27 +168,18 @@ export const useMany = <
         ...(preferredMeta || {}),
       })
       .get(preferLegacyKeys),
-    queryFn: ({ queryKey, pageParam, signal }) => {
+    queryFn: (context) => {
+      const meta = {
+        ...combinedMeta,
+        queryContext: prepareQueryContext(context),
+      };
+
       if (getMany) {
         return getMany({
           resource: resource?.name,
           ids,
-          meta: {
-            ...combinedMeta,
-            queryContext: {
-              queryKey,
-              pageParam,
-              signal,
-            },
-          },
-          metaData: {
-            ...combinedMeta,
-            queryContext: {
-              queryKey,
-              pageParam,
-              signal,
-            },
-          },
+          meta,
+          metaData: meta,
         });
       }
       return handleMultiple(
@@ -194,22 +187,8 @@ export const useMany = <
           getOne<TQueryFnData>({
             resource: resource?.name,
             id,
-            meta: {
-              ...combinedMeta,
-              queryContext: {
-                queryKey,
-                pageParam,
-                signal,
-              },
-            },
-            metaData: {
-              ...combinedMeta,
-              queryContext: {
-                queryKey,
-                pageParam,
-                signal,
-              },
-            },
+            meta,
+            metaData: meta,
           }),
         ),
       );
@@ -247,7 +226,7 @@ export const useMany = <
     },
     meta: {
       ...queryOptions?.meta,
-      ...getXRay("useMany", preferLegacyKeys),
+      ...getXRay("useMany", preferLegacyKeys, resource?.name),
     },
   });
 

package/src/hooks/data/useOne.ts

@@ -1,39 +1,41 @@
 import { getXRay } from "@refinedev/devtools-internal";
 import {
   QueryObserverResult,
-  useQuery,
   UseQueryOptions,
+  useQuery,
 } from "@tanstack/react-query";
 
 import {
   pickDataProvider,
   pickNotDeprecated,
+  prepareQueryContext,
   useActiveAuthProvider,
 } from "@definitions";
 import {
   useDataProvider,
   useHandleNotification,
+  useKeys,
   useMeta,
   useOnError,
   useResource,
   useResourceSubscription,
   useTranslate,
 } from "@hooks";
-import { useKeys } from "@hooks/useKeys";
+
 import {
   BaseKey,
   BaseRecord,
   GetOneResponse,
   HttpError,
-  LiveModeProps,
   MetaQuery,
   Prettify,
-  SuccessErrorNotification,
-} from "../../interfaces";
+} from "../../contexts/data/types";
+import { LiveModeProps } from "../../contexts/live/types";
+import { SuccessErrorNotification } from "../../contexts/notification/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
 export type UseOneProps<TQueryFnData, TError, TData> = {
@@ -173,25 +175,17 @@ export const useOne = <
         ...(preferredMeta || {}),
       })
       .get(preferLegacyKeys),
-    queryFn: ({ queryKey, pageParam, signal }) =>
+    queryFn: (context) =>
       getOne<TQueryFnData>({
         resource: resource?.name ?? "",
         id: id!,
         meta: {
           ...combinedMeta,
-          queryContext: {
-            queryKey,
-            pageParam,
-            signal,
-          },
+          queryContext: prepareQueryContext(context),
         },
         metaData: {
           ...combinedMeta,
-          queryContext: {
-            queryKey,
-            pageParam,
-            signal,
-          },
+          queryContext: prepareQueryContext(context),
         },
       }),
     ...queryOptions,
@@ -245,7 +239,7 @@ export const useOne = <
     },
     meta: {
       ...queryOptions?.meta,
-      ...getXRay("useOne", preferLegacyKeys),
+      ...getXRay("useOne", preferLegacyKeys, resource?.name),
     },
   });
 

package/src/hooks/data/useUpdate.ts

@@ -1,12 +1,11 @@
 import { getXRay } from "@refinedev/devtools-internal";
 import {
-  useMutation,
   UseMutationOptions,
   UseMutationResult,
+  useMutation,
   useQueryClient,
 } from "@tanstack/react-query";
 
-import { ActionTypes } from "@contexts/undoableQueue";
 import {
   pickDataProvider,
   pickNotDeprecated,
@@ -18,6 +17,7 @@ import {
   useDataProvider,
   useHandleNotification,
   useInvalidate,
+  useKeys,
   useLog,
   useMeta,
   useMutationMode,
@@ -27,7 +27,7 @@ import {
   useResource,
   useTranslate,
 } from "@hooks";
-import { useKeys } from "@hooks/useKeys";
+
 import {
   BaseKey,
   BaseRecord,
@@ -38,18 +38,42 @@ import {
   IQueryKeys,
   MetaQuery,
   MutationMode,
-  OptimisticUpdateMapType,
   PrevContext as UpdateContext,
   PreviousQuery,
-  SuccessErrorNotification,
   UpdateResponse,
-} from "../../interfaces";
+} from "../../contexts/data/types";
+import { SuccessErrorNotification } from "../../contexts/notification/types";
+import { ActionTypes } from "../../contexts/undoableQueue/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
+export type OptimisticUpdateMapType<TData, TVariables> = {
+  list?:
+    | ((
+        previous: GetListResponse<TData> | null | undefined,
+        values: TVariables,
+        id: BaseKey,
+      ) => GetListResponse<TData> | null)
+    | boolean;
+  many?:
+    | ((
+        previous: GetManyResponse<TData> | null | undefined,
+        values: TVariables,
+        id: BaseKey,
+      ) => GetManyResponse<TData> | null)
+    | boolean;
+  detail?:
+    | ((
+        previous: GetOneResponse<TData> | null | undefined,
+        values: TVariables,
+        id: BaseKey,
+      ) => GetOneResponse<TData> | null)
+    | boolean;
+};
+
 export type UpdateParams<TData, TError, TVariables> = {
   /**
    * Resource name for API data interactions

package/src/hooks/data/useUpdateMany.ts

@@ -1,12 +1,11 @@
 import { getXRay } from "@refinedev/devtools-internal";
 import {
-  useMutation,
   UseMutationOptions,
   UseMutationResult,
+  useMutation,
   useQueryClient,
 } from "@tanstack/react-query";
 
-import { ActionTypes } from "@contexts/undoableQueue";
 import {
   handleMultiple,
   pickDataProvider,
@@ -19,6 +18,7 @@ import {
   useDataProvider,
   useHandleNotification,
   useInvalidate,
+  useKeys,
   useLog,
   useMeta,
   useMutationMode,
@@ -28,7 +28,7 @@ import {
   useResource,
   useTranslate,
 } from "@hooks";
-import { useKeys } from "@hooks/useKeys";
+
 import {
   BaseKey,
   BaseRecord,
@@ -39,18 +39,43 @@ import {
   IQueryKeys,
   MetaQuery,
   MutationMode,
-  OptimisticUpdateManyMapType,
   PrevContext as UpdateContext,
   QueryResponse,
-  SuccessErrorNotification,
   UpdateManyResponse,
-} from "../../interfaces";
+} from "../../contexts/data/types";
 import {
-  useLoadingOvertime,
   UseLoadingOvertimeOptionsProps,
   UseLoadingOvertimeReturnType,
+  useLoadingOvertime,
 } from "../useLoadingOvertime";
 
+import { SuccessErrorNotification } from "../../contexts/notification/types";
+import { ActionTypes } from "../../contexts/undoableQueue/types";
+
+export type OptimisticUpdateManyMapType<TData, TVariables> = {
+  list?:
+    | ((
+        previous: GetListResponse<TData> | null | undefined,
+        values: TVariables,
+        ids: BaseKey[],
+      ) => GetListResponse<TData> | null)
+    | boolean;
+  many?:
+    | ((
+        previous: GetManyResponse<TData> | null | undefined,
+        values: TVariables,
+        ids: BaseKey[],
+      ) => GetManyResponse<TData> | null)
+    | boolean;
+  detail?:
+    | ((
+        previous: GetOneResponse<TData> | null | undefined,
+        values: TVariables,
+        id: BaseKey,
+      ) => GetOneResponse<TData> | null)
+    | boolean;
+};
+
 type UpdateManyParams<TData, TError, TVariables> = {
   /**
    * ids for mutation function