Merge pull request #9910 from marmelab/fix-combine-data-providers

Fix combineDataProvider throws a runtime error
marmelab · Jun 10, 2024 · 6e14355 · 6e14355
2 parents bf99c25 + 98fe13b
commit 6e14355
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/ra-core/src/dataProvider/combineDataProviders.spec.ts b/packages/ra-core/src/dataProvider/combineDataProviders.spec.ts
@@ -1,3 +1,4 @@
+import expect from 'expect';
 import { testDataProvider } from './testDataProvider';
 import { combineDataProviders } from './combineDataProviders';
 
@@ -25,7 +26,9 @@ describe('combineDataProviders', () => {
         });
         await dataProvider.getOne('comments', { id: 1 });
         expect(dataProvider1.getOne).not.toHaveBeenCalled();
-        expect(dataProvider2.getOne).toHaveBeenCalled();
+        expect(dataProvider2.getOne).toHaveBeenCalledWith('comments', {
+            id: 1,
+        });
     });
     it('works with a dataProvider that returns a promise', async () => {
         const dataProvider1 = testDataProvider({
@@ -51,6 +54,8 @@ describe('combineDataProviders', () => {
         const dataProvider = await dataProviderValue;
         await dataProvider.getOne('comments', { id: 1 });
         expect(dataProvider1.getOne).not.toHaveBeenCalled();
-        expect(dataProvider2.getOne).toHaveBeenCalled();
+        expect(dataProvider2.getOne).toHaveBeenCalledWith('comments', {
+            id: 1,
+        });
     });
 });
diff --git a/packages/ra-core/src/dataProvider/combineDataProviders.ts b/packages/ra-core/src/dataProvider/combineDataProviders.ts
@@ -29,7 +29,7 @@ export const combineDataProviders = (
             if (name === 'then') {
                 return null;
             }
-            return (resource, params) => {
+            return (resource, ...params) => {
                 if (typeof name === 'symbol') {
                     return;
                 }