Add ability to refetch a query in useQuery and useQueryWithStore

docs/Actions.md

@@ -133,6 +133,7 @@ The return value of `useQuery` is an object representing the query state, using
 - `error`: `null` unless the `dataProvider` threw an error, in which case it contains that error.
 - `loading`: A boolean updating according to the request state
 - `loaded`: A boolean updating according to the request state
+- `refetch`: A function you can call to trigger a refetch. It's different than the `refresh` function returned by `useRefresh` as it won't trigger a refresh of the view, only this specific query.
 
 This object updates according to the request state:
 
@@ -175,6 +176,8 @@ const UserProfile = ({ record }) => {
 
 In practice, react-admin uses `useQueryWithStore` instead of `useQuery` everywhere, and you should probably do the same in your components. It really improves the User Experience, with only one little drawback: if the data changed on the backend side between two calls for the same query, the user may briefly see outdated data before the screen updates with the up-to-date data. 
 
+Just like `useQuery`, `useQueryWithStore` also returns a `¶efetch` function you can call to trigger a refetch. It's different than the `refresh` function returned by `useRefresh` as it won't trigger a refresh of the view, only this specific query.
+
 ## `useMutation` Hook
 
 `useQuery` emits the request to the `dataProvider` as soon as the component mounts. To emit the request based on a user action, use the `useMutation` hook instead. This hook takes the same arguments as `useQuery`, but returns a callback that emits the request when executed.

packages/ra-core/src/dataProvider/useQuery.ts

@@ -123,21 +123,21 @@ const useQuery = (
                     : [payload, otherOptions]
             )
             .then(({ data, total }) => {
-                setState(prev => ({
-                    ...prev,
+                setState({
                     data,
                     total,
                     loading: false,
                     loaded: true,
-                }));
+                    refetch,
+                });
             })
             .catch(error => {
-                setState(prev => ({
-                    ...prev,
+                setState({
                     error,
                     loading: false,
                     loaded: false,
-                }));
+                    refetch,
+                });
             });
     }, [
         requestSignature,

packages/ra-core/src/dataProvider/useQueryWithStore.ts

@@ -151,14 +151,14 @@ const useQueryWithStore = <State extends ReduxState = ReduxState>(
         if (requestSignatureRef.current !== requestSignature) {
             // request has changed, reset the loading state
             requestSignatureRef.current = requestSignature;
-            setState(prev => ({
-                ...prev,
+            setState({
                 data,
                 total,
                 error: null,
                 loading: true,
                 loaded: isDataLoaded(data),
-            }));
+                refetch,
+            });
         } else if (!isEqual(state.data, data) || state.total !== total) {
             // the dataProvider response arrived in the Redux store
             if (typeof total !== 'undefined' && isNaN(total)) {
@@ -183,6 +183,7 @@ const useQueryWithStore = <State extends ReduxState = ReduxState>(
         state.total,
         total,
         isDataLoaded,
+        refetch,
     ]);
 
     const dataProvider = useDataProvider();