Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix combineDataProvider throws a runtime error #9910

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Fix combineDataProvider throws a runtime error #9910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/ra-core/src/dataProvider/combineDataProviders.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import expect from 'expect';
import { testDataProvider } from './testDataProvider';
import { combineDataProviders } from './combineDataProviders';

Expand Down Expand Up @@ -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({
Expand All @@ -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,
});
});
});
2 changes: 1 addition & 1 deletion packages/ra-core/src/dataProvider/combineDataProviders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const combineDataProviders = (
if (name === 'then') {
return null;
}
return (resource, params) => {
return (resource, ...params) => {
if (typeof name === 'symbol') {
return;
}
Expand Down
Loading