upgrade and refactor for react-query v5

src/renderer/features/albums/routes/album-detail-route.tsx

@@ -1,12 +1,13 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 
+import { useQuery } from '@tanstack/react-query';
 import { useRef } from 'react';
 import { useParams } from 'react-router';
 
 import { NativeScrollArea } from '/@/renderer/components/native-scroll-area/native-scroll-area';
+import { albumQueries } from '/@/renderer/features/albums/api/album-api';
 import { AlbumDetailContent } from '/@/renderer/features/albums/components/album-detail-content';
 import { AlbumDetailHeader } from '/@/renderer/features/albums/components/album-detail-header';
-import { useAlbumDetail } from '/@/renderer/features/albums/queries/album-detail-query';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useFastAverageColor } from '/@/renderer/hooks';
@@ -22,7 +23,9 @@ const AlbumDetailRoute = () => {
 
     const { albumId } = useParams() as { albumId: string };
     const server = useCurrentServer();
-    const detailQuery = useAlbumDetail({ query: { id: albumId }, serverId: server?.id });
+    const detailQuery = useQuery(
+        albumQueries.detail({ query: { id: albumId }, serverId: server?.id }),
+    );
     const { background: backgroundColor, colorId } = useFastAverageColor({
         id: albumId,
         src: detailQuery.data?.imageUrl,

src/renderer/features/albums/routes/album-list-route.tsx

@@ -1,5 +1,6 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 
+import { useQuery } from '@tanstack/react-query';
 import isEmpty from 'lodash/isEmpty';
 import { useCallback, useMemo, useRef } from 'react';
 import { useParams, useSearchParams } from 'react-router-dom';
@@ -8,10 +9,10 @@ import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
+import { albumQueries } from '/@/renderer/features/albums/api/album-api';
 import { AlbumListContent } from '/@/renderer/features/albums/components/album-list-content';
 import { AlbumListHeader } from '/@/renderer/features/albums/components/album-list-header';
-import { useAlbumListCount } from '/@/renderer/features/albums/queries/album-list-count-query';
-import { useGenreList } from '/@/renderer/features/genres';
+import { genresQueries } from '/@/renderer/features/genres/api/genres-api';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { queryClient } from '/@/renderer/lib/react-query';
@@ -53,18 +54,20 @@ const AlbumListRoute = () => {
         key: pageKey,
     });
 
-    const genreList = useGenreList({
-        options: {
-            cacheTime: 1000 * 60 * 60,
-            enabled: !!genreId,
-        },
-        query: {
-            sortBy: GenreListSort.NAME,
-            sortOrder: SortOrder.ASC,
-            startIndex: 0,
-        },
-        serverId: server?.id,
-    });
+    const genreList = useQuery(
+        genresQueries.list({
+            options: {
+                enabled: !!genreId,
+                gcTime: 1000 * 60 * 60,
+            },
+            query: {
+                sortBy: GenreListSort.NAME,
+                sortOrder: SortOrder.ASC,
+                startIndex: 0,
+            },
+            serverId: server?.id,
+        }),
+    );
 
     const genreTitle = useMemo(() => {
         if (!genreList.data) return '';
@@ -75,16 +78,18 @@ const AlbumListRoute = () => {
         return genre?.name;
     }, [genreId, genreList.data]);
 
-    const itemCountCheck = useAlbumListCount({
-        options: {
-            cacheTime: 1000 * 60,
-            staleTime: 1000 * 60,
-        },
-        query: {
-            ...albumListFilter,
-        },
-        serverId: server?.id,
-    });
+    const itemCountCheck = useQuery(
+        albumQueries.listCount({
+            options: {
+                gcTime: 1000 * 60,
+                staleTime: 1000 * 60,
+            },
+            query: {
+                ...albumListFilter,
+            },
+            serverId: server?.id,
+        }),
+    );
 
     const itemCount = itemCountCheck.data === null ? undefined : itemCountCheck.data;
 

src/renderer/features/albums/routes/dummy-album-detail-route.tsx

@@ -183,8 +183,8 @@ const DummyAlbumDetailRoute = () => {
                                     fill: detailQuery?.data?.userFavorite ? 'primary' : undefined,
                                 }}
                                 loading={
-                                    createFavoriteMutation.isLoading ||
-                                    deleteFavoriteMutation.isLoading
+                                    createFavoriteMutation.isPending ||
+                                    deleteFavoriteMutation.isPending
                                 }
                                 onClick={handleFavorite}
                                 variant="subtle"