From d6b7ba53241e12aa318c3dcf690666d8eb266ca6 Mon Sep 17 00:00:00 2001
From: fzaninotto <fzaninotto@gmail.com>
Date: Tue, 3 Nov 2020 15:55:13 +0100
Subject: [PATCH] Fix error when using withDataProvider without options
 argument

Closes #5477
---
 .../useDataProviderWithDeclarativeSideEffects.ts           | 1 +
 packages/ra-core/src/dataProvider/withDataProvider.tsx     | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/ra-core/src/dataProvider/useDataProviderWithDeclarativeSideEffects.ts b/packages/ra-core/src/dataProvider/useDataProviderWithDeclarativeSideEffects.ts
index 2b70f1c89eb..0918c44f3ed 100644
--- a/packages/ra-core/src/dataProvider/useDataProviderWithDeclarativeSideEffects.ts
+++ b/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)
                         )
diff --git a/packages/ra-core/src/dataProvider/withDataProvider.tsx b/packages/ra-core/src/dataProvider/withDataProvider.tsx
index 1588aa255c2..581e59a3b31 100644
--- a/packages/ra-core/src/dataProvider/withDataProvider.tsx
+++ b/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;