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

Fix create and edit controller's save callback should use calltime meta param #8933

Merged
merged 1 commit into from
May 22, 2023
Merged

Fix create and edit controller's save callback should use calltime meta param #8933

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
31 changes: 31 additions & 0 deletions packages/ra-core/src/controller/create/useCreateController.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,37 @@ describe('useCreateController', () => {
});
});

it('should accept meta as a save option', async () => {
let saveCallback;
const create = jest
.fn()
.mockImplementationOnce((_, { data }) =>
Promise.resolve({ data: { id: 123, ...data } })
);
const dataProvider = testDataProvider({
getOne: () => Promise.resolve({ data: { id: 12 } } as any),
create,
});

render(
<CoreAdminContext dataProvider={dataProvider}>
<CreateController {...defaultProps}>
{({ save }) => {
saveCallback = save;
return null;
}}
</CreateController>
</CoreAdminContext>
);
await act(async () =>
saveCallback({ foo: 'bar' }, { meta: { lorem: 'ipsum' } })
);
expect(create).toHaveBeenCalledWith('posts', {
data: { foo: 'bar' },
meta: { lorem: 'ipsum' },
});
});

it('should allow the save onError option to override the failure side effects override', async () => {
jest.spyOn(console, 'error').mockImplementation(() => {});
let saveCallback;
Expand Down
3 changes: 2 additions & 1 deletion packages/ra-core/src/controller/create/useCreateController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export const useCreateController = <
onSuccess: onSuccessFromSave,
onError: onErrorFromSave,
transform: transformFromSave,
meta: metaFromSave,
} = {}
) =>
Promise.resolve(
Expand All @@ -100,7 +101,7 @@ export const useCreateController = <
try {
await mutate(
resource,
{ data, meta },
{ data, meta: metaFromSave ?? meta },
{
onSuccess: async (data, variables, context) => {
if (onSuccessFromSave) {
Expand Down
35 changes: 35 additions & 0 deletions packages/ra-core/src/controller/edit/useEditController.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,41 @@ describe('useEditController', () => {
});
});

it('should accept meta as a save option', async () => {
let saveCallback;
const update = jest
.fn()
.mockImplementationOnce((_, { id, data, previousData }) =>
Promise.resolve({ data: { id, ...previousData, ...data } })
);
const dataProvider = ({
getOne: () => Promise.resolve({ data: { id: 12 } }),
update,
} as unknown) as DataProvider;

render(
<CoreAdminContext dataProvider={dataProvider}>
<EditController {...defaultProps} mutationMode="pessimistic">
{({ save }) => {
saveCallback = save;
return <div />;
}}
</EditController>
</CoreAdminContext>
);
await act(async () =>
saveCallback({ foo: 'bar' }, { meta: { lorem: 'ipsum' } })
);
await waitFor(() => {
expect(update).toHaveBeenCalledWith('posts', {
id: 12,
data: { foo: 'bar' },
previousData: undefined,
meta: { lorem: 'ipsum' },
});
});
});

it('should allow the save onSuccess option to override the success side effects override', async () => {
let saveCallback;
const dataProvider = ({
Expand Down
3 changes: 2 additions & 1 deletion packages/ra-core/src/controller/edit/useEditController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export const useEditController = <
onSuccess: onSuccessFromSave,
onError: onErrorFromSave,
transform: transformFromSave,
meta: metaFromSave,
} = {}
) =>
Promise.resolve(
Expand All @@ -155,7 +156,7 @@ export const useEditController = <
try {
await mutate(
resource,
{ id, data, meta: mutationMeta },
{ id, data, meta: metaFromSave ?? mutationMeta },
{
onSuccess: async (data, variables, context) => {
if (onSuccessFromSave) {
Expand Down