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

[RFR] Convert GET_MANY accumulate saga to hooks #3550

Merged
merged 15 commits into from
Aug 22, 2019
Merged

[RFR] Convert GET_MANY accumulate saga to hooks #3550

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f78b895
add useGetMany Hook
fzaninotto Aug 20, 2019
7d71acd
Fix ReferenceFieldController tests
fzaninotto Aug 20, 2019
3d0f561
Fix ReferenceField tests
fzaninotto Aug 20, 2019
bfdc444
fix useReference tests
fzaninotto Aug 20, 2019
d00f967
Fix remaining unit test
fzaninotto Aug 20, 2019
68901b0
Always write unit tests
fzaninotto Aug 20, 2019
dc2208a
Add comments to make the code more readable
fzaninotto Aug 20, 2019
8c738db
Remove allowEmpty prop from ReferenceField
fzaninotto Aug 20, 2019
7b9b51c
Add handling for Error case
fzaninotto Aug 20, 2019
ea24d62
Add test to prove that ReferenceField works with missing reference
fzaninotto Aug 20, 2019
b8d499c
Memoize ReferenceFieldView
fzaninotto Aug 21, 2019
abe5473
Fix wrong memoization in useListController
fzaninotto Aug 21, 2019
d05db6a
use useGetMany in useReferencearrayfieldcontroller instead of crudGet…
fzaninotto Aug 21, 2019
d38f2cc
Fix unit tests
fzaninotto Aug 21, 2019
748ce32
Use error message in aria attribute
fzaninotto Aug 21, 2019
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
6 changes: 5 additions & 1 deletion packages/ra-ui-materialui/src/field/ReferenceField.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,11 @@ export const ReferenceFieldView = ({
}
if (error) {
return (
<Error aria-errormessage="Error" color="error" fontSize="small" />
<Error
aria-errormessage={error.message ? error.message : error}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we translate this error ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally, yes. In a future PR? I'd like to have this pr merged quickly to release a new alpha soon.

color="error"
fontSize="small"
/>
);
}
if (!referenceRecord) {
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/src/field/ReferenceField.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ describe('<ReferenceField />', () => {

it('should display an error icon if the dataProvider call fails', async () => {
const dataProvider = jest.fn();
dataProvider.mockImplementationOnce(() => Promise.reject());
dataProvider.mockImplementationOnce(() => Promise.reject('boo'));
const { getByRole } = renderWithRedux(
<DataProviderContext.Provider value={dataProvider}>
<ReferenceField
Expand All @@ -210,7 +210,7 @@ describe('<ReferenceField />', () => {
await new Promise(resolve => setTimeout(resolve, 10));
const ErrorIcon = getByRole('presentation');
expect(ErrorIcon).toBeDefined();
expect(ErrorIcon.getAttribute('aria-errormessage')).toBe('Error');
expect(ErrorIcon.getAttribute('aria-errormessage')).toBe('boo');
});

describe('ReferenceFieldView', () => {
Expand Down