@ventlio/tanstack-query 0.3.8 → 0.4.0

package/src/queries/useGetRequest.ts

@@ -78,15 +78,13 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     }
   };
 
-  const query = useQuery<any, any, IRequestSuccess<TResponse>>(
-    [requestPath, {}],
-    ({ queryKey }) =>
+  const query = useQuery<any, any, IRequestSuccess<TResponse>>({
+    queryKey: [requestPath, {}],
+    queryFn: ({ queryKey }) =>
       new Promise<IRequestSuccess<TResponse> | IRequestError>((res, rej) => sendRequest(res, rej, queryKey)),
-    {
-      enabled: load && !isFutureQueriesPaused,
-      ...options,
-    }
-  );
+    enabled: load && !isFutureQueriesPaused,
+    ...options,
+  });
 
   useEffect(() => {
     if (path) {
@@ -98,7 +96,6 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     if (keyTracker) {
       // set expiration time for the tracker
       queryClient.setQueryDefaults([keyTracker], {
-        cacheTime: Infinity,
         staleTime: Infinity,
       });
 
@@ -106,23 +103,18 @@ export const useGetRequest = <TResponse extends Record<string, any>>({
     }
   }, [keyTracker, requestPath, queryClient, queryOptions?.staleTime]);
 
-  const nextPage = (data?: IRequestSuccess<TResponse>) => {
-    const queryData = data ?? query.data;
-    data = queryData ?? queryClient.getQueryData([requestPath, {}]);
-
-    if (data?.data.pagination) {
-      const pagination: IPagination = data.data.pagination;
+  const nextPage = () => {
+    if (query.data?.data.pagination) {
+      const pagination: IPagination = query.data.data.pagination;
       if (pagination.next_page !== pagination.current_page && pagination.next_page > pagination.current_page) {
         setRequestPath(constructPaginationLink(requestPath, pagination.next_page));
       }
     }
   };
 
-  const prevPage = (data?: IRequestSuccess<TResponse>) => {
-    const queryData = data ?? query.data;
-    data = queryData ?? queryClient.getQueryData([requestPath, {}]);
-    if (data?.data.pagination) {
-      const pagination: IPagination = data.data.pagination;
+  const prevPage = () => {
+    if (query.data?.data.pagination) {
+      const pagination: IPagination = query.data.data.pagination;
       if (pagination.previous_page !== pagination.current_page && pagination.previous_page < pagination.current_page) {
         setRequestPath(constructPaginationLink(requestPath, pagination.previous_page));
       }

package/src/queries/usePatchRequest.ts

@@ -63,13 +63,13 @@ export const usePatchRequest = <TResponse>({ path, baseUrl, headers }: { path: s
   };
 
   // register post mutation
-  const mutation = useMutation<IRequestSuccess<TResponse>, IRequestError>(
-    (dataData: any) =>
+  const mutation = useMutation<IRequestSuccess<TResponse>, IRequestError>({
+    mutationFn: (dataData: any) =>
       new Promise<IRequestSuccess<TResponse>>((res, rej) => {
         return sendRequest(res, rej, dataData);
       }),
-    { mutationKey: [path, { type: 'mutation' }] }
-  );
+    mutationKey: [path, { type: 'mutation' }],
+  });
 
   const patch = async (
     data: any,
@@ -91,5 +91,5 @@ export const usePatchRequest = <TResponse>({ path, baseUrl, headers }: { path: s
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFutureMutationsPaused]);
 
-  return { patch, uploadProgressPercent, ...mutation, isLoading: mutation.isLoading || isFutureMutationsPaused };
+  return { patch, uploadProgressPercent, ...mutation, isLoading: mutation.isPending || isFutureMutationsPaused };
 };

package/src/queries/usePostRequest.ts

@@ -95,7 +95,9 @@ export const usePostRequest = <TResponse>({
     IRequestSuccess<TResponse>,
     IRequestError,
     { data: any; requestConfig?: Partial<Omit<IMakeRequest, 'body'>> }
-  >(async (postData) => new Promise<IRequestSuccess<TResponse>>((res, rej) => sendRequest(res, rej, postData)), {
+  >({
+    mutationFn: async (postData) =>
+      new Promise<IRequestSuccess<TResponse>>((res, rej) => sendRequest(res, rej, postData)),
     mutationKey: [path, { type: 'mutation' }],
   });
 
@@ -129,5 +131,5 @@ export const usePostRequest = <TResponse>({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFutureMutationsPaused]);
 
-  return { post, uploadProgressPercent, ...mutation, isLoading: mutation.isLoading || isFutureMutationsPaused };
+  return { post, uploadProgressPercent, ...mutation, isLoading: mutation.isPending || isFutureMutationsPaused };
 };