Merge pull request #5481 from marmelab/fix-withDataProvider-without-options

Fix error when using withDataProvider without options argument

Author: djhi

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

@@ -35,6 +35,7 @@ const useDataProviderWithDeclarativeSideEffects = (): DataProviderProxy => {
                     let finalAllArguments = allArguments;
 
                     if (
+                        options &&
                         Object.keys(options).some(key =>
                             ['onSuccess', 'onFailure'].includes(key)
                         )

packages/ra-core/src/dataProvider/withDataProvider.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { DataProvider } from '../types';
 
-import useDataProvider from './useDataProviderWithDeclarativeSideEffects';
+import useDataProviderWithDeclarativeSideEffects from './useDataProviderWithDeclarativeSideEffects';
 
 export interface DataProviderProps {
     dataProvider: DataProvider;
@@ -58,7 +58,10 @@ export interface DataProviderProps {
 const withDataProvider = <P extends object>(
     Component: React.ComponentType<P>
 ): React.FunctionComponent<P & DataProviderProps> => (props: P) => (
-    <Component {...props} dataProvider={useDataProvider()} />
+    <Component
+        {...props}
+        dataProvider={useDataProviderWithDeclarativeSideEffects()}
+    />
 );
 
 export default withDataProvider;