@refinedev/core 4.1.2 → 4.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@refinedev/core",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "refine is a React-based framework for building internal tools, rapidly. It ships with Ant Design System, an enterprise-level UI toolkit.",
   "private": false,
   "main": "dist/index.js",

package/src/hooks/accessControl/useCan/index.ts

@@ -1,13 +1,13 @@
-import { useContext } from "react";
 import {
     useQuery,
-    UseQueryResult,
     UseQueryOptions,
+    UseQueryResult,
 } from "@tanstack/react-query";
+import { useContext } from "react";
 
 import { AccessControlContext } from "@contexts/accessControl";
-import { CanParams, CanReturnType } from "../../../interfaces";
 import { sanitizeResource } from "@definitions/helpers/sanitize-resource";
+import { CanParams, CanReturnType } from "../../../interfaces";
 
 export type UseCanProps = CanParams & {
     /**
@@ -40,8 +40,8 @@ export const useCan = ({
 
     /* eslint-disable @typescript-eslint/no-unused-vars */
     const sanitizedResource = sanitizeResource(_resource ?? {});
-    /* eslint-enable @typescript-eslint/no-unused-vars */
 
+    /* eslint-enable @typescript-eslint/no-unused-vars */
     const queryResponse = useQuery<CanReturnType>(
         [
             "useCan",
@@ -54,7 +54,7 @@ export const useCan = ({
         ],
         // Enabled check for `can` is enough to be sure that it's defined in the query function but TS is not smart enough to know that.
         () =>
-            can?.({ action, resource, params }) ??
+            can?.({ action, resource, params: paramsRest }) ??
             Promise.resolve({ can: true }),
         {
             enabled: typeof can !== "undefined",

package/src/hooks/data/useCustom.ts

@@ -4,22 +4,22 @@ import {
     UseQueryOptions,
 } from "@tanstack/react-query";
 
+import { pickNotDeprecated, useActiveAuthProvider } from "@definitions/helpers";
+import {
+    useDataProvider,
+    useHandleNotification,
+    useOnError,
+    useTranslate,
+} from "@hooks";
 import {
-    CustomResponse,
-    CrudSorting,
-    CrudFilters,
     BaseRecord,
+    CrudFilters,
+    CrudSorting,
+    CustomResponse,
     HttpError,
     MetaQuery,
     SuccessErrorNotification,
 } from "../../interfaces";
-import {
-    useTranslate,
-    useHandleNotification,
-    useDataProvider,
-    useOnError,
-} from "@hooks";
-import { pickNotDeprecated, useActiveAuthProvider } from "@definitions/helpers";
 
 interface UseCustomConfig<TQuery, TPayload> {
     /**
@@ -108,15 +108,15 @@ export const useCustom = <
     const handleNotification = useHandleNotification();
 
     if (custom) {
-        const queryResponse = useQuery<CustomResponse<TData>, TError>(
-            [
+        const queryResponse = useQuery<CustomResponse<TData>, TError>({
+            queryKey: [
                 dataProviderName,
                 "custom",
                 method,
                 url,
                 { ...config, ...(pickNotDeprecated(meta, metaData) || {}) },
             ],
-            ({ queryKey, pageParam, signal }) =>
+            queryFn: ({ queryKey, pageParam, signal }) =>
                 custom<TData>({
                     url,
                     method,
@@ -130,46 +130,44 @@ export const useCustom = <
                         },
                     },
                 }),
-            {
-                ...queryOptions,
-                onSuccess: (data) => {
-                    queryOptions?.onSuccess?.(data);
+            ...queryOptions,
+            onSuccess: (data) => {
+                queryOptions?.onSuccess?.(data);
 
-                    const notificationConfig =
-                        typeof successNotification === "function"
-                            ? successNotification(data, {
-                                  ...config,
-                                  ...(pickNotDeprecated(meta, metaData) || {}),
-                              })
-                            : successNotification;
+                const notificationConfig =
+                    typeof successNotification === "function"
+                        ? successNotification(data, {
+                              ...config,
+                              ...(pickNotDeprecated(meta, metaData) || {}),
+                          })
+                        : successNotification;
 
-                    handleNotification(notificationConfig);
-                },
-                onError: (err: TError) => {
-                    checkError(err);
-                    queryOptions?.onError?.(err);
+                handleNotification(notificationConfig);
+            },
+            onError: (err: TError) => {
+                checkError(err);
+                queryOptions?.onError?.(err);
 
-                    const notificationConfig =
-                        typeof errorNotification === "function"
-                            ? errorNotification(err, {
-                                  ...config,
-                                  ...(pickNotDeprecated(meta, metaData) || {}),
-                              })
-                            : errorNotification;
+                const notificationConfig =
+                    typeof errorNotification === "function"
+                        ? errorNotification(err, {
+                              ...config,
+                              ...(pickNotDeprecated(meta, metaData) || {}),
+                          })
+                        : errorNotification;
 
-                    handleNotification(notificationConfig, {
-                        key: `${method}-notification`,
-                        message: translate(
-                            "notifications.error",
-                            { statusCode: err.statusCode },
-                            `Error (status code: ${err.statusCode})`,
-                        ),
-                        description: err.message,
-                        type: "error",
-                    });
-                },
+                handleNotification(notificationConfig, {
+                    key: `${method}-notification`,
+                    message: translate(
+                        "notifications.error",
+                        { statusCode: err.statusCode },
+                        `Error (status code: ${err.statusCode})`,
+                    ),
+                    description: err.message,
+                    type: "error",
+                });
             },
-        );
+        });
         return queryResponse;
     } else {
         throw Error("Not implemented custom on data provider.");