@refinedev/core 4.44.3 → 4.44.5

package/src/hooks/data/useInfiniteList.ts

@@ -1,48 +1,47 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
+    InfiniteData,
+    InfiniteQueryObserverResult,
     useInfiniteQuery,
     UseInfiniteQueryOptions,
-    InfiniteQueryObserverResult,
-    InfiniteData,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
 import {
-    CrudFilters,
-    Pagination,
-    BaseRecord,
-    HttpError,
-    CrudSorting,
-    MetaQuery,
-    SuccessErrorNotification,
-    LiveModeProps,
-    GetListResponse,
-    Prettify,
-} from "../../interfaces";
+    getNextPageParam,
+    getPreviousPageParam,
+    handlePaginationParams,
+    pickDataProvider,
+    pickNotDeprecated,
+    useActiveAuthProvider,
+} from "@definitions/helpers";
 import {
-    useResource,
+    useDataProvider,
     useHandleNotification,
+    useMeta,
+    useOnError,
+    useResource,
     useResourceSubscription,
     useTranslate,
-    useDataProvider,
-    useOnError,
-    useMeta,
 } from "@hooks";
 import {
-    queryKeys,
-    pickDataProvider,
-    getNextPageParam,
-    getPreviousPageParam,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-    handlePaginationParams,
-} from "@definitions/helpers";
+    BaseRecord,
+    CrudFilters,
+    CrudSorting,
+    GetListResponse,
+    HttpError,
+    LiveModeProps,
+    MetaQuery,
+    Pagination,
+    Prettify,
+    SuccessErrorNotification,
+} from "../../interfaces";
 
+import { useKeys } from "@hooks/useKeys";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export interface UseInfiniteListConfig {
     pagination?: Pagination;
@@ -221,6 +220,10 @@ export const useInfiniteList = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...combinedMeta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useInfiniteQuery<

package/src/hooks/data/useList.ts

@@ -1,44 +1,43 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
     QueryObserverResult,
     useQuery,
     UseQueryOptions,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
 import {
-    GetListResponse,
-    CrudFilters,
-    Pagination,
-    BaseRecord,
-    HttpError,
-    CrudSorting,
-    MetaQuery,
-    SuccessErrorNotification,
-    LiveModeProps,
-    Prettify,
-} from "../../interfaces";
+    handlePaginationParams,
+    pickDataProvider,
+    pickNotDeprecated,
+    useActiveAuthProvider,
+} from "@definitions/helpers";
 import {
-    useResource,
+    useDataProvider,
     useHandleNotification,
+    useMeta,
+    useOnError,
+    useResource,
     useResourceSubscription,
     useTranslate,
-    useDataProvider,
-    useOnError,
-    useMeta,
 } from "@hooks";
+import { useKeys } from "@hooks/useKeys";
 import {
-    queryKeys,
-    pickDataProvider,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-    handlePaginationParams,
-} from "@definitions/helpers";
+    BaseRecord,
+    CrudFilters,
+    CrudSorting,
+    GetListResponse,
+    HttpError,
+    LiveModeProps,
+    MetaQuery,
+    Pagination,
+    Prettify,
+    SuccessErrorNotification,
+} from "../../interfaces";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export interface UseListConfig {
     pagination?: Pagination;
@@ -218,6 +217,10 @@ export const useList = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...meta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useQuery<

package/src/hooks/data/useMany.ts

@@ -1,41 +1,40 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
     QueryObserverResult,
     useQuery,
     UseQueryOptions,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
 import {
-    BaseRecord,
+    handleMultiple,
+    pickDataProvider,
+    pickNotDeprecated,
+    useActiveAuthProvider,
+} from "@definitions/helpers";
+import {
+    useDataProvider,
+    useHandleNotification,
+    useMeta,
+    useOnError,
+    useResource,
+    useResourceSubscription,
+    useTranslate,
+} from "@hooks";
+import { useKeys } from "@hooks/useKeys";
+import {
     BaseKey,
+    BaseRecord,
     GetManyResponse,
     HttpError,
     LiveModeProps,
-    SuccessErrorNotification,
     MetaQuery,
+    SuccessErrorNotification,
 } from "../../interfaces";
-import {
-    useResource,
-    useTranslate,
-    useResourceSubscription,
-    useHandleNotification,
-    useDataProvider,
-    useOnError,
-    useMeta,
-} from "@hooks";
-import {
-    queryKeys,
-    pickDataProvider,
-    handleMultiple,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-} from "@definitions/helpers";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export type UseManyProps<TQueryFnData, TError, TData> = {
     /**
@@ -146,6 +145,10 @@ export const useMany = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...meta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useQuery<

package/src/hooks/data/useOne.ts

@@ -1,41 +1,40 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
     QueryObserverResult,
     useQuery,
     UseQueryOptions,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
 import {
+    pickDataProvider,
+    pickNotDeprecated,
+    useActiveAuthProvider,
+} from "@definitions";
+import {
+    useDataProvider,
+    useHandleNotification,
+    useMeta,
+    useOnError,
+    useResource,
+    useResourceSubscription,
+    useTranslate,
+} from "@hooks";
+import { useKeys } from "@hooks/useKeys";
+import {
+    BaseKey,
+    BaseRecord,
     GetOneResponse,
     HttpError,
-    BaseRecord,
-    BaseKey,
     LiveModeProps,
-    SuccessErrorNotification,
     MetaQuery,
     Prettify,
+    SuccessErrorNotification,
 } from "../../interfaces";
-import {
-    useResource,
-    useTranslate,
-    useResourceSubscription,
-    useHandleNotification,
-    useDataProvider,
-    useOnError,
-    useMeta,
-} from "@hooks";
-import {
-    queryKeys,
-    pickDataProvider,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-} from "@definitions";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export type UseOneProps<TQueryFnData, TError, TData> = {
     /**
@@ -154,6 +153,10 @@ export const useOne = <
         liveMode,
         onLiveEvent,
         dataProviderName: pickedDataProvider,
+        meta: {
+            ...meta,
+            dataProviderName,
+        },
     });
 
     const queryResponse = useQuery<

package/src/hooks/data/useUpdate.ts

@@ -1,54 +1,54 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
     useMutation,
     UseMutationOptions,
     UseMutationResult,
     useQueryClient,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
 import { ActionTypes } from "@contexts/undoableQueue";
 import {
-    BaseRecord,
-    BaseKey,
-    UpdateResponse,
-    MutationMode,
-    PrevContext as UpdateContext,
-    HttpError,
-    SuccessErrorNotification,
-    MetaQuery,
-    PreviousQuery,
-    GetListResponse,
-    IQueryKeys,
-    OptimisticUpdateMapType,
-    GetManyResponse,
-    GetOneResponse,
-} from "../../interfaces";
+    pickDataProvider,
+    pickNotDeprecated,
+    queryKeysReplacement,
+    useActiveAuthProvider,
+} from "@definitions/helpers";
 import {
-    useResource,
-    useMutationMode,
     useCancelNotification,
-    useTranslate,
-    usePublish,
-    useHandleNotification,
     useDataProvider,
-    useLog,
+    useHandleNotification,
     useInvalidate,
-    useOnError,
+    useLog,
     useMeta,
+    useMutationMode,
+    useOnError,
+    usePublish,
     useRefineContext,
+    useResource,
+    useTranslate,
 } from "@hooks";
+import { useKeys } from "@hooks/useKeys";
 import {
-    queryKeysReplacement,
-    pickDataProvider,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-} from "@definitions/helpers";
+    BaseKey,
+    BaseRecord,
+    GetListResponse,
+    GetManyResponse,
+    GetOneResponse,
+    HttpError,
+    IQueryKeys,
+    MetaQuery,
+    MutationMode,
+    OptimisticUpdateMapType,
+    PrevContext as UpdateContext,
+    PreviousQuery,
+    SuccessErrorNotification,
+    UpdateResponse,
+} from "../../interfaces";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 export type UpdateParams<TData, TError, TVariables> = {
     /**
@@ -480,7 +480,7 @@ export const useUpdate = <
                     id,
                     resource: resourceName,
                     successNotification,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     values,
                     meta,
                     metaData,
@@ -488,9 +488,19 @@ export const useUpdate = <
                 context,
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourceSingular = textTransformers.singular(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 const notificationConfig =
                     typeof successNotification === "function"
                         ? successNotification(data, { id, values }, identifier)
@@ -522,6 +532,10 @@ export const useUpdate = <
                         ids: data.data?.id ? [data.data.id] : undefined,
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
                 let previousData: any;
@@ -539,9 +553,12 @@ export const useUpdate = <
                     );
                 }
 
-                const { fields, operation, variables, ...rest } =
-                    pickNotDeprecated(meta, metaData) || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "update",
                     resource: resource.name,
@@ -549,11 +566,7 @@ export const useUpdate = <
                     previousData,
                     meta: {
                         id,
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ...rest,
                     },
                 });

package/src/hooks/data/useUpdateMany.ts

@@ -1,55 +1,55 @@
+import { getXRay } from "@refinedev/devtools-internal";
 import {
     useMutation,
     UseMutationOptions,
     UseMutationResult,
     useQueryClient,
 } from "@tanstack/react-query";
-import { getXRay } from "@refinedev/devtools-internal";
 
+import { ActionTypes } from "@contexts/undoableQueue";
+import {
+    handleMultiple,
+    pickDataProvider,
+    pickNotDeprecated,
+    queryKeysReplacement,
+    useActiveAuthProvider,
+} from "@definitions/helpers";
 import {
-    useResource,
     useCancelNotification,
-    useMutationMode,
-    useTranslate,
-    usePublish,
-    useHandleNotification,
     useDataProvider,
+    useHandleNotification,
     useInvalidate,
     useLog,
-    useOnError,
     useMeta,
+    useMutationMode,
+    useOnError,
+    usePublish,
     useRefineContext,
+    useResource,
+    useTranslate,
 } from "@hooks";
-import { ActionTypes } from "@contexts/undoableQueue";
+import { useKeys } from "@hooks/useKeys";
 import {
-    BaseRecord,
     BaseKey,
-    UpdateManyResponse,
+    BaseRecord,
+    GetListResponse,
+    GetManyResponse,
+    GetOneResponse,
     HttpError,
+    IQueryKeys,
+    MetaQuery,
     MutationMode,
-    QueryResponse,
+    OptimisticUpdateManyMapType,
     PrevContext as UpdateContext,
+    QueryResponse,
     SuccessErrorNotification,
-    MetaQuery,
-    GetListResponse,
-    IQueryKeys,
-    OptimisticUpdateManyMapType,
-    GetManyResponse,
-    GetOneResponse,
+    UpdateManyResponse,
 } from "../../interfaces";
-import {
-    queryKeysReplacement,
-    pickDataProvider,
-    handleMultiple,
-    pickNotDeprecated,
-    useActiveAuthProvider,
-} from "@definitions/helpers";
 import {
     useLoadingOvertime,
     UseLoadingOvertimeOptionsProps,
     UseLoadingOvertimeReturnType,
 } from "../useLoadingOvertime";
-import { useKeys } from "@hooks/useKeys";
 
 type UpdateManyParams<TData, TError, TVariables> = {
     /**
@@ -508,16 +508,26 @@ export const useUpdateMany = <
                     resource: resourceName,
                     meta,
                     metaData,
-                    dataProviderName,
+                    dataProviderName: dataProviderNameFromProp,
                     successNotification,
                     values,
                 },
                 context,
             ) => {
                 const { resource, identifier } = select(resourceName);
-
                 const resourceSingular = textTransformers.singular(identifier);
 
+                const dataProviderName = pickDataProvider(
+                    identifier,
+                    dataProviderNameFromProp,
+                    resources,
+                );
+
+                const combinedMeta = getMeta({
+                    resource,
+                    meta: pickNotDeprecated(meta, metaData),
+                });
+
                 const notificationConfig =
                     typeof successNotification === "function"
                         ? successNotification(data, { ids, values }, identifier)
@@ -549,6 +559,10 @@ export const useUpdateMany = <
                         ids: ids.map(String),
                     },
                     date: new Date(),
+                    meta: {
+                        ...combinedMeta,
+                        dataProviderName,
+                    },
                 });
 
                 const previousData: any[] = [];
@@ -570,14 +584,12 @@ export const useUpdateMany = <
                     });
                 }
 
-                const combinedMeta = getMeta({
-                    resource,
-                    meta: pickNotDeprecated(meta, metaData),
-                });
-
-                const { fields, operation, variables, ...rest } =
-                    combinedMeta || {};
-
+                const {
+                    fields: _fields,
+                    operation: _operation,
+                    variables: _variables,
+                    ...rest
+                } = combinedMeta || {};
                 log?.mutate({
                     action: "updateMany",
                     resource: resource.name,
@@ -585,11 +597,7 @@ export const useUpdateMany = <
                     previousData,
                     meta: {
                         ids,
-                        dataProviderName: pickDataProvider(
-                            identifier,
-                            dataProviderName,
-                            resources,
-                        ),
+                        dataProviderName,
                         ...rest,
                     },
                 });

package/src/hooks/live/useResourceSubscription/index.ts

@@ -1,3 +1,7 @@
+import { LiveContext } from "@contexts/live";
+import { RefineContext } from "@contexts/refine";
+import { useInvalidate } from "@hooks/invalidate";
+import { useResource } from "@hooks/resource";
 import { useContext, useEffect } from "react";
 import {
     BaseKey,
@@ -10,16 +14,15 @@ import {
     MetaQuery,
     Pagination,
 } from "../../../interfaces";
-import { LiveContext } from "@contexts/live";
-import { RefineContext } from "@contexts/refine";
-import { useResource } from "@hooks/resource";
-import { useInvalidate } from "@hooks/invalidate";
 
 export type UseResourceSubscriptionProps = {
     channel: string;
     params?: {
         ids?: BaseKey[];
         id?: BaseKey;
+        /**
+         * @deprecated `params.meta` is depcerated. Use `meta` directly from the root level instead.
+         */
         meta?: MetaQuery;
         /**
          * @deprecated `metaData` is deprecated with refine@4, refine will pass `meta` instead, however, we still support `metaData` for backward compatibility.
@@ -42,7 +45,11 @@ export type UseResourceSubscriptionProps = {
     types: LiveEvent["type"][];
     resource?: string;
     enabled?: boolean;
+    /**
+     * @deprecated use `meta.dataProviderName` instead.
+     */
     dataProviderName?: string;
+    meta?: MetaQuery & { dataProviderName?: string };
 } & LiveModeProps;
 
 export type PublishType = {
@@ -57,7 +64,8 @@ export const useResourceSubscription = ({
     enabled = true,
     liveMode: liveModeFromProp,
     onLiveEvent,
-    dataProviderName,
+    dataProviderName: dataProviderNameFromProps,
+    meta,
 }: UseResourceSubscriptionProps): void => {
     const { resource, identifier } = useResource(resourceFromProp);
 
@@ -71,6 +79,11 @@ export const useResourceSubscription = ({
 
     const invalidate = useInvalidate();
 
+    const dataProviderName =
+        dataProviderNameFromProps ??
+        meta?.dataProviderName ??
+        resource?.meta?.dataProviderName;
+
     useEffect(() => {
         let subscription: any;
 
@@ -78,7 +91,7 @@ export const useResourceSubscription = ({
             if (liveMode === "auto") {
                 invalidate({
                     resource: identifier,
-                    dataProviderName: resource?.meta?.dataProviderName,
+                    dataProviderName,
                     invalidates: ["resourceAll"],
                     invalidationFilters: {
                         type: "active",
@@ -102,6 +115,10 @@ export const useResourceSubscription = ({
                 types,
                 callback,
                 dataProviderName,
+                meta: {
+                    ...meta,
+                    dataProviderName,
+                },
             });
         }