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 dataProvider fails silently when response has wrong type #5373

Merged
merged 4 commits into from
Oct 12, 2020
Merged

Fix dataProvider fails silently when response has wrong type #5373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2482ff9
Fix dataProvider fails silently when response has wrong type
fzaninotto Oct 8, 2020
7c26f9c
fix useEditController tests
fzaninotto Oct 11, 2020
ac427a7
fix useCreateController unit tests
fzaninotto Oct 11, 2020
cd2f610
fix useDataProvider unit tests
fzaninotto Oct 11, 2020
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
21 changes: 15 additions & 6 deletions packages/ra-core/src/controller/useCreateController.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ describe('useCreateController', () => {
it('should call the dataProvider.create() function on save', async () => {
const create = jest
.fn()
.mockImplementationOnce((_, { data }) => Promise.resolve({ data }));
.mockImplementationOnce((_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
create,
Expand All @@ -101,7 +103,8 @@ describe('useCreateController', () => {
let saveCallback;
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
create: (_, { data }) => Promise.resolve({ data }),
create: (_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } }),
} as unknown) as DataProvider;
const { dispatch } = renderWithRedux(
<DataProviderContext.Provider value={dataProvider}>
Expand Down Expand Up @@ -168,7 +171,8 @@ describe('useCreateController', () => {
let saveCallback;
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
create: (_, { data }) => Promise.resolve({ data }),
create: (_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } }),
} as unknown) as DataProvider;
const onSuccess = jest.fn();
const { dispatch } = renderWithRedux(
Expand All @@ -194,7 +198,8 @@ describe('useCreateController', () => {
let saveCallback;
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
create: (_, { data }) => Promise.resolve({ data }),
create: (_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } }),
} as unknown) as DataProvider;
const onSuccess = jest.fn();
const onSuccessSave = jest.fn();
Expand Down Expand Up @@ -286,7 +291,9 @@ describe('useCreateController', () => {
let saveCallback;
const create = jest
.fn()
.mockImplementationOnce((_, { data }) => Promise.resolve({ data }));
.mockImplementationOnce((_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
create,
Expand Down Expand Up @@ -317,7 +324,9 @@ describe('useCreateController', () => {
let saveCallback;
const create = jest
.fn()
.mockImplementationOnce((_, { data }) => Promise.resolve({ data }));
.mockImplementationOnce((_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
create,
Expand Down
18 changes: 11 additions & 7 deletions packages/ra-core/src/controller/useEditController.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ describe('useEditController', () => {
const update = jest
.fn()
.mockImplementationOnce((_, { id, data, previousData }) =>
Promise.resolve({ data: { ...previousData, ...data } })
Promise.resolve({ data: { id, ...previousData, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
Expand Down Expand Up @@ -115,7 +115,7 @@ describe('useEditController', () => {
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update: (_, { id, data, previousData }) =>
Promise.resolve({ data: { ...previousData, ...data } }),
Promise.resolve({ data: { id, ...previousData, ...data } }),
} as unknown) as DataProvider;
let saveCallback;
const { dispatch } = renderWithRedux(
Expand Down Expand Up @@ -148,7 +148,7 @@ describe('useEditController', () => {
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update: (_, { id, data, previousData }) =>
Promise.resolve({ data: { ...previousData, ...data } }),
Promise.resolve({ data: { id, ...previousData, ...data } }),
} as unknown) as DataProvider;
const { dispatch } = renderWithRedux(
<DataProviderContext.Provider value={dataProvider}>
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('useEditController', () => {
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update: (_, { id, data, previousData }) =>
Promise.resolve({ data: { ...previousData, ...data } }),
Promise.resolve({ data: { id, ...previousData, ...data } }),
} as unknown) as DataProvider;
const onSuccess = jest.fn();
const { dispatch } = renderWithRedux(
Expand Down Expand Up @@ -219,7 +219,7 @@ describe('useEditController', () => {
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update: (_, { id, data, previousData }) =>
Promise.resolve({ data: { ...previousData, ...data } }),
Promise.resolve({ data: { id, ...previousData, ...data } }),
} as unknown) as DataProvider;
const onSuccess = jest.fn();
const onSuccessSave = jest.fn();
Expand Down Expand Up @@ -323,7 +323,9 @@ describe('useEditController', () => {
let saveCallback;
const update = jest
.fn()
.mockImplementationOnce((_, { data }) => Promise.resolve({ data }));
.mockImplementationOnce((_, { id, data }) =>
Promise.resolve({ data: { id, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update,
Expand Down Expand Up @@ -362,7 +364,9 @@ describe('useEditController', () => {
let saveCallback;
const update = jest
.fn()
.mockImplementationOnce((_, { data }) => Promise.resolve({ data }));
.mockImplementationOnce((_, { id, data }) =>
Promise.resolve({ data: { id, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update,
Expand Down
14 changes: 7 additions & 7 deletions packages/ra-core/src/core/dataFetchActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ export const UPDATE_MANY = 'UPDATE_MANY';
export const DELETE = 'DELETE';
export const DELETE_MANY = 'DELETE_MANY';

export const fetchActionsWithRecordResponse = [GET_ONE, CREATE, UPDATE];
export const fetchActionsWithRecordResponse = ['getOne', 'create', 'update'];
export const fetchActionsWithArrayOfIdentifiedRecordsResponse = [
GET_LIST,
GET_MANY,
GET_MANY_REFERENCE,
'getList',
'getMany',
'getManyReference',
];
export const fetchActionsWithArrayOfRecordsResponse = [
...fetchActionsWithArrayOfIdentifiedRecordsResponse,
UPDATE_MANY,
DELETE_MANY,
'updateMany',
'deleteMany',
];
export const fetchActionsWithTotalResponse = [GET_LIST, GET_MANY_REFERENCE];
export const fetchActionsWithTotalResponse = ['getList', 'getManyReference'];

export const sanitizeFetchType = (fetchType: string) => {
switch (fetchType) {
Expand Down
6 changes: 4 additions & 2 deletions packages/ra-core/src/dataProvider/useDataProvider.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ describe('useDataProvider', () => {
});

it('should dispatch CUSTOM_FETCH actions by default', async () => {
const getOne = jest.fn(() => Promise.resolve({ data: null }));
const getOne = jest.fn(() => Promise.resolve({ data: { id: 123 } }));
const dataProvider = { getOne };
const { dispatch } = renderWithRedux(
<DataProviderContext.Provider value={dataProvider}>
Expand Down Expand Up @@ -121,7 +121,9 @@ describe('useDataProvider', () => {
return <div data-testid="data">{JSON.stringify(data)}</div>;
return <div data-testid="loading">loading</div>;
};
const getOne = jest.fn(() => Promise.resolve({ data: null }));
const getOne = jest.fn(() =>
Promise.resolve({ data: { id: 123 } })
);
const dataProvider = { getOne };
const { dispatch } = renderWithRedux(
<DataProviderContext.Provider value={dataProvider}>
Expand Down