Skip to content

Commit 729ef41

Browse files
fix: add enabled flag and remove select function for disabled queries
Co-Authored-By: [email protected] <[email protected]>
1 parent f170264 commit 729ef41

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ export const useApiDataQuery = <TResultData>(
1919
.then(response => response.theQuerykey as TResultData);
2020
};
2121

22+
const modifiedQueryOptions = queryObject ? queryOptions : {
23+
...queryOptions,
24+
select: undefined,
25+
};
26+
2227
return useQuery<TResultData>(
2328
[ReactQueryAppNamespace, ...queryKey],
2429
queryFn,
@@ -28,6 +33,7 @@ export const useApiDataQuery = <TResultData>(
2833
refetchOnReconnect: false,
2934
staleTime: 2 * 60 * 1000,
3035
cacheTime: 5 * 60 * 1000,
31-
...queryOptions,
36+
enabled: !!queryObject,
37+
...modifiedQueryOptions,
3238
});
3339
};

src/core_modules/capture-core/utils/reactQueryHelpers/query/useMetadataQuery.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export const useApiMetadataQuery = <TResultData>(
7474
return useAsyncMetadata(queryKey, queryFn, {
7575
cacheTime: Infinity,
7676
staleTime: Infinity,
77-
...queryOptions,
77+
enabled: !!queryObject,
78+
...modifiedQueryOptions,
7879
});
7980
};

0 commit comments

Comments
 (0)