Skip to content

fix(core): prevent React Query double fetching by lazy signal access #7439

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

Closed
SpencerJung wants to merge 1 commit into from
Closed

fix(core): prevent React Query double fetching by lazy signal access #7439

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
24 changes: 16 additions & 8 deletions packages/core/src/hooks/data/useCustom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
useQuery,
} from "@tanstack/react-query";

import { prepareQueryContext } from "@definitions/helpers";

import {
useDataProvider,
useHandleNotification,
Expand Down Expand Up @@ -168,16 +168,24 @@ export const useCustom = <
...(preferredMeta || {}),
})
.get(),
queryFn: (context) =>
custom<TQueryFnData>({
queryFn: (context) => {
const meta = {
...combinedMeta,
queryKey: context.queryKey,
};
Object.defineProperty(meta, "signal", {
enumerable: true,
get() {
return context.signal;
},
});
return custom<TQueryFnData>({
url,
method,
...config,
meta: {
...combinedMeta,
...prepareQueryContext(context as any),
},
}),
meta,
});
},
...queryOptions,
meta: {
...queryOptions?.meta,
Expand Down
9 changes: 7 additions & 2 deletions packages/core/src/hooks/data/useInfiniteList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
getPreviousPageParam,
handlePaginationParams,
pickDataProvider,
prepareQueryContext,
} from "@definitions/helpers";
import {
useDataProvider,
Expand Down Expand Up @@ -256,8 +255,14 @@ export const useInfiniteList = <

const meta = {
...combinedMeta,
...prepareQueryContext(context),
queryKey: context.queryKey,
};
Object.defineProperty(meta, "signal", {
enumerable: true,
get() {
return context.signal;
},
});

return getList<TQueryFnData>({
resource: resource?.name || "",
Expand Down
9 changes: 7 additions & 2 deletions packages/core/src/hooks/data/useList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
import {
handlePaginationParams,
pickDataProvider,
prepareQueryContext,
} from "@definitions/helpers";
import {
useDataProvider,
Expand Down Expand Up @@ -257,8 +256,14 @@ export const useList = <
queryFn: (context) => {
const meta = {
...combinedMeta,
...prepareQueryContext(context),
queryKey: context.queryKey,
};
Object.defineProperty(meta, "signal", {
enumerable: true,
get() {
return context.signal;
},
});
return getList<TQueryFnData>({
resource: resource?.name ?? "",
pagination: prefferedPagination,
Expand Down
9 changes: 7 additions & 2 deletions packages/core/src/hooks/data/useMany.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
import {
handleMultiple,
pickDataProvider,
prepareQueryContext,
} from "@definitions/helpers";
import {
useDataProvider,
Expand Down Expand Up @@ -190,8 +189,14 @@ export const useMany = <
queryFn: (context) => {
const meta = {
...combinedMeta,
...prepareQueryContext(context as any),
queryKey: context.queryKey,
};
Object.defineProperty(meta, "signal", {
enumerable: true,
get() {
return context.signal;
},
});

if (getMany) {
return getMany({
Expand Down
24 changes: 16 additions & 8 deletions packages/core/src/hooks/data/useOne.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
useQuery,
} from "@tanstack/react-query";

import { pickDataProvider, prepareQueryContext } from "@definitions";
import { pickDataProvider } from "@definitions";
import {
useDataProvider,
useHandleNotification,
Expand Down Expand Up @@ -181,15 +181,23 @@ export const useOne = <
...(preferredMeta || {}),
})
.get(),
queryFn: (context) =>
getOne<TQueryFnData>({
queryFn: (context) => {
const meta = {
...combinedMeta,
queryKey: context.queryKey,
};
Object.defineProperty(meta, "signal", {
enumerable: true,
get() {
return context.signal;
},
});
return getOne<TQueryFnData>({
resource: resource?.name ?? "",
id: id!,
meta: {
...combinedMeta,
...prepareQueryContext(context as any),
},
}),
meta,
});
},
...queryOptions,
enabled: isEnabled,
meta: {
Expand Down
Loading