Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .changeset/popular-falcons-suffer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@refinedev/core": patch
---

- Preserve row id in meta for data hooks.

[Resolves #6906](https://github.com/refinedev/refine/issues/6906)
39 changes: 39 additions & 0 deletions packages/core/src/hooks/data/useCreate.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1889,4 +1889,43 @@ describe("useCreate Hook should work with params and props", () => {
expect(onErrorFn).toHaveBeenCalledWith("onErrorProp");
});
});

it("should not override audit meta.id with route params", async () => {
const auditCreateMock = jest.fn();
const createMock = jest.fn().mockResolvedValue({ data: { id: "123" } });

const { result } = renderHook(() => useCreate(), {
wrapper: TestWrapper({
dataProvider: {
default: { ...MockJSONServer.default, create: createMock },
},
resources: [{ name: "posts" }],
auditLogProvider: {
create: auditCreateMock,
get: jest.fn(),
update: jest.fn(),
},
routerProvider: mockRouterProvider({
params: { id: "6" },
}),
}),
});

act(() => {
result.current.mutate({
resource: "posts",
values: { title: "new post" },
});
});

await waitFor(() => expect(result.current.isSuccess).toBeTruthy());

expect(auditCreateMock).toHaveBeenCalledWith(
expect.objectContaining({
action: "create",
resource: "posts",
meta: expect.objectContaining({ id: "123" }),
}),
);
});
});
2 changes: 1 addition & 1 deletion packages/core/src/hooks/data/useCreate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ export const useCreate = <
resource: resource.name,
data: values,
meta: {
...rest,
dataProviderName,
id: data?.data?.id ?? undefined,
...rest,
},
});

Expand Down
36 changes: 36 additions & 0 deletions packages/core/src/hooks/data/useDelete.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -864,4 +864,40 @@ describe("useDelete Hook", () => {
}),
).toHaveLength(1);
});

it("should not override audit meta.id with route params", async () => {
const auditCreateMock = jest.fn();

const { result } = renderHook(() => useDelete(), {
wrapper: TestWrapper({
dataProvider: MockJSONServer,
resources: [{ name: "posts" }],
auditLogProvider: {
create: auditCreateMock,
get: jest.fn(),
update: jest.fn(),
},
routerProvider: mockRouterProvider({
params: { id: "6" },
}),
}),
});

act(() => {
result.current.mutate({
resource: "posts",
id: "1",
});
});

await waitFor(() => expect(result.current.isSuccess).toBeTruthy());

expect(auditCreateMock).toHaveBeenCalledWith(
expect.objectContaining({
action: "delete",
resource: "posts",
meta: expect.objectContaining({ id: "1" }),
}),
);
});
});
4 changes: 2 additions & 2 deletions packages/core/src/hooks/data/useDelete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -436,9 +436,9 @@ export const useDelete = <
action: "delete",
resource: resource.name,
meta: {
id,
dataProviderName,
...rest,
dataProviderName,
id,
},
});

Expand Down
37 changes: 37 additions & 0 deletions packages/core/src/hooks/data/useUpdate.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2621,4 +2621,41 @@ describe("useUpdate Hook should work with params and props", () => {
expect(onErrorFn).toHaveBeenCalledWith("onErrorProp");
});
});

it("should not override audit meta.id with route params", async () => {
const auditCreateMock = jest.fn();

const { result } = renderHook(() => useUpdate(), {
wrapper: TestWrapper({
dataProvider: MockJSONServer,
resources: [{ name: "posts" }],
auditLogProvider: {
create: auditCreateMock,
get: jest.fn(),
update: jest.fn(),
},
routerProvider: mockRouterProvider({
params: { id: "6" },
}),
}),
});

act(() => {
result.current.mutate({
resource: "posts",
id: "1",
values: { title: "updated" },
});
});

await waitFor(() => expect(result.current.isSuccess).toBeTruthy());

expect(auditCreateMock).toHaveBeenCalledWith(
expect.objectContaining({
action: "update",
resource: "posts",
meta: expect.objectContaining({ id: "1" }),
}),
);
});
});
4 changes: 2 additions & 2 deletions packages/core/src/hooks/data/useUpdate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -571,9 +571,9 @@ export const useUpdate = <
data: values,
previousData,
meta: {
id,
dataProviderName,
...rest,
dataProviderName,
id,
},
});

Expand Down
37 changes: 37 additions & 0 deletions packages/core/src/hooks/data/useUpdateMany.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2822,4 +2822,41 @@ describe("useUpdateMany Hook should work with params and props", () => {
expect(onErrorFn).toHaveBeenCalledWith("onErrorProp");
});
});

it("should not override audit meta.ids with route params", async () => {
const auditCreateMock = jest.fn();

const { result } = renderHook(() => useUpdateMany(), {
wrapper: TestWrapper({
dataProvider: MockJSONServer,
resources: [{ name: "posts" }],
auditLogProvider: {
create: auditCreateMock,
get: jest.fn(),
update: jest.fn(),
},
routerProvider: mockRouterProvider({
params: { id: "6" },
}),
}),
});

act(() => {
result.current.mutate({
resource: "posts",
ids: ["1", "2"],
values: { title: "bulk" },
});
});

await waitFor(() => expect(result.current.isSuccess).toBeTruthy());

expect(auditCreateMock).toHaveBeenCalledWith(
expect.objectContaining({
action: "updateMany",
resource: "posts",
meta: expect.objectContaining({ ids: ["1", "2"] }),
}),
);
});
});
4 changes: 2 additions & 2 deletions packages/core/src/hooks/data/useUpdateMany.ts
Original file line number Diff line number Diff line change
Expand Up @@ -611,9 +611,9 @@ export const useUpdateMany = <
data: values,
previousData,
meta: {
ids,
dataProviderName,
...rest,
dataProviderName,
ids,
},
});

Expand Down
Loading