upgrade and refactor for react-query v5

src/renderer/features/genres/api/genres-api.ts

@@ -0,0 +1,25 @@
+import { queryOptions } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { QueryHookArgs } from '/@/renderer/lib/react-query';
+import { getServerById } from '/@/renderer/store';
+import { GenreListQuery } from '/@/shared/types/domain-types';
+
+export const genresQueries = {
+    list: (args: QueryHookArgs<GenreListQuery>) => {
+        return queryOptions({
+            gcTime: 1000 * 5,
+            queryFn: ({ signal }) => {
+                const server = getServerById(args.serverId);
+                if (!server) throw new Error('Server not found');
+                return api.controller.getGenreList({
+                    apiClientProps: { server, signal },
+                    query: args.query,
+                });
+            },
+            queryKey: queryKeys.genres.list(args.serverId || '', args.query),
+            ...args.options,
+        });
+    },
+};

src/renderer/features/genres/components/genre-list-header-filters.tsx

@@ -1,6 +1,6 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 
-import { useQueryClient } from '@tanstack/react-query';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
 import debounce from 'lodash/debounce';
 import { MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -10,7 +10,8 @@ import { queryKeys } from '/@/renderer/api/query-keys';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { GENRE_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
 import { useListContext } from '/@/renderer/context/list-context';
-import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
+import { OrderToggleButton } from '/@/renderer/features/shared';
+import { sharedQueries } from '/@/renderer/features/shared/api/shared-api';
 import { FolderButton } from '/@/renderer/features/shared/components/folder-button';
 import { ListConfigMenu } from '/@/renderer/features/shared/components/list-config-menu';
 import { MoreButton } from '/@/renderer/features/shared/components/more-button';
@@ -93,7 +94,9 @@ export const GenreListHeaderFilters = ({
         server,
     });
 
-    const musicFoldersQuery = useMusicFolders({ query: null, serverId: server?.id });
+    const musicFoldersQuery = useQuery(
+        sharedQueries.musicFolders({ query: null, serverId: server?.id }),
+    );
 
     const sortByLabel =
         (server?.type &&
@@ -121,7 +124,7 @@ export const GenreListHeaderFilters = ({
     );
 
     const handleRefresh = useCallback(() => {
-        queryClient.invalidateQueries(queryKeys.genres.list(server?.id || ''));
+        queryClient.invalidateQueries({ queryKey: queryKeys.genres.list(server?.id || '') });
         onFilterChange(filter);
     }, [filter, onFilterChange, queryClient, server?.id]);
 

src/renderer/features/genres/queries/genre-list-query.ts

@@ -1,24 +0,0 @@
-import type { QueryHookArgs } from '/@/renderer/lib/react-query';
-import type { GenreListQuery } from '/@/shared/types/domain-types';
-
-import { useQuery } from '@tanstack/react-query';
-
-import { api } from '/@/renderer/api';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { getServerById } from '/@/renderer/store';
-
-export const useGenreList = (args: QueryHookArgs<GenreListQuery>) => {
-    const { options, query, serverId } = args || {};
-    const server = getServerById(serverId);
-
-    return useQuery({
-        enabled: !!server,
-        queryFn: ({ signal }) => {
-            if (!server) throw new Error('Server not found');
-            return api.controller.getGenreList({ apiClientProps: { server, signal }, query });
-        },
-        queryKey: queryKeys.genres.list(server?.id || '', query),
-        staleTime: 1000 * 5,
-        ...options,
-    });
-};

src/renderer/features/genres/routes/genre-list-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 { useMemo, useRef } from 'react';
 
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
+import { genresQueries } from '/@/renderer/features/genres/api/genres-api';
 import { GenreListContent } from '/@/renderer/features/genres/components/genre-list-content';
 import { GenreListHeader } from '/@/renderer/features/genres/components/genre-list-header';
-import { useGenreList } from '/@/renderer/features/genres/queries/genre-list-query';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { useCurrentServer } from '/@/renderer/store';
 import { useListStoreByKey } from '/@/renderer/store/list.store';
@@ -19,14 +20,16 @@ const GenreListRoute = () => {
     const pageKey = 'genre';
     const { filter } = useListStoreByKey<GenreListQuery>({ key: pageKey });
 
-    const itemCountCheck = useGenreList({
-        query: {
-            ...filter,
-            limit: 1,
-            startIndex: 0,
-        },
-        serverId: server?.id,
-    });
+    const itemCountCheck = useQuery(
+        genresQueries.list({
+            query: {
+                ...filter,
+                limit: 1,
+                startIndex: 0,
+            },
+            serverId: server?.id,
+        }),
+    );
 
     const itemCount =
         itemCountCheck.data?.totalRecordCount === null