Merge pull request marmelab#4829 from marmelab/fix-refresh-cache

Fix refresh button breaks useGetList result with application cache

Author: djhi

packages/ra-core/src/controller/useEditController.ts

@@ -73,7 +73,6 @@ const useEditController = (props: EditProps): EditControllerProps => {
     const refresh = useRefresh();
     const version = useVersion();
     const { data: record, loading, loaded } = useGetOne(resource, id, {
-        version, // used to force reload
         action: CRUD_GET_ONE,
         onFailure: () => {
             notify('ra.notification.item_doesnt_exist', 'warning');

packages/ra-core/src/controller/useListController.ts

@@ -142,7 +142,6 @@ const useListController = <RecordType = Record>(
         { ...query.filter, ...filter },
         {
             action: CRUD_GET_LIST,
-            version,
             onFailure: error =>
                 notify(
                     typeof error === 'string'

packages/ra-core/src/controller/useShowController.ts

@@ -55,7 +55,6 @@ const useShowController = (props: ShowProps): ShowControllerProps => {
     const refresh = useRefresh();
     const version = useVersion();
     const { data: record, loading, loaded } = useGetOne(resource, id, {
-        version, // used to force reload
         action: CRUD_GET_ONE,
         onFailure: () => {
             notify('ra.notification.item_doesnt_exist', 'warning');

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

@@ -69,7 +69,7 @@ import useDataProviderWithDeclarativeSideEffects from './useDataProviderWithDecl
 const useQuery = (query: Query, options: QueryOptions = {}): UseQueryValue => {
     const { type, resource, payload } = query;
     const { withDeclarativeSideEffectsSupport, ...rest } = options;
-    const [state, setState] = useSafeSetState({
+    const [state, setState] = useSafeSetState<UseQueryValue>({
         data: undefined,
         error: null,
         total: null,

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

@@ -3,6 +3,7 @@ import { useSelector } from 'react-redux';
 import isEqual from 'lodash/isEqual';
 
 import useDataProvider from './useDataProvider';
+import useVersion from '../controller/useVersion';
 import getFetchType from './getFetchType';
 import { useSafeSetState } from '../util/hooks';
 import { ReduxState } from '../types';
@@ -120,7 +121,8 @@ const useQueryWithStore = (
     loaded: boolean;
 } => {
     const { type, resource, payload } = query;
-    const requestSignature = JSON.stringify({ query, options });
+    const version = useVersion(); // used to allow force reload
+    const requestSignature = JSON.stringify({ query, options, version });
     const requestSignatureRef = useRef(requestSignature);
     const data = useSelector(dataSelector);
     const total = useSelector(totalSelector);