optimize ND/JF list fetch

- no longer requires 2 separate fetches for count and data
- the list count includes the first page so we set the query data directly

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

@@ -3,6 +3,7 @@ import { queryOptions } from '@tanstack/react-query';
 import { api } from '/@/renderer/api';
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
+import { getOptimizedListCount } from '/@/renderer/api/utils-list-count';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
 import {
     ArtistRadioQuery,
@@ -53,8 +54,25 @@ export const songsQueries = {
     },
     listCount: (args: QueryHookArgs<ListCountQuery<SongListQuery>>) => {
         return queryOptions({
-            gcTime: 1000 * 60 * 60 * 12,
-            queryFn: ({ signal }) => {
+            gcTime: 1000 * 60 * 60,
+            queryFn: async ({ client, signal }) => {
+                const optimizedCount = await getOptimizedListCount<
+                    ListCountQuery<SongListQuery>,
+                    SongListQuery,
+                    { totalRecordCount: null | number }
+                >({
+                    client,
+                    listQueryFn: controller.getSongList,
+                    listQueryKeyFn: queryKeys.songs.list,
+                    query: args.query,
+                    serverId: args.serverId,
+                    signal,
+                });
+
+                if (optimizedCount !== null) {
+                    return optimizedCount;
+                }
+
                 return api.controller.getSongListCount({
                     apiClientProps: { serverId: args.serverId, signal },
                     query: args.query,
@@ -64,7 +82,7 @@ export const songsQueries = {
                 args.serverId,
                 Object.keys(args.query).length === 0 ? undefined : args.query,
             ),
-            staleTime: 1000 * 60 * 60 * 12,
+            staleTime: 1000 * 60 * 60,
             ...args.options,
         });
     },

src/renderer/features/songs/components/song-list-infinite-grid.tsx

@@ -25,7 +25,7 @@ export const SongListInfiniteGrid = ({
     size,
 }: SongListInfiniteGridProps) => {
     const listCountQuery = songsQueries.listCount({
-        query: { ...query },
+        query: { ...query, limit: itemsPerPage },
         serverId: serverId,
     }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
 

src/renderer/features/songs/components/song-list-infinite-table.tsx

@@ -33,7 +33,7 @@ export const SongListInfiniteTable = ({
     size = 'default',
 }: SongListInfiniteTableProps) => {
     const listCountQuery = songsQueries.listCount({
-        query: { ...query },
+        query: { ...query, limit: itemsPerPage },
         serverId: serverId,
     }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
 

src/renderer/features/songs/components/song-list-paginated-grid.tsx

@@ -24,15 +24,15 @@ export const SongListPaginatedGrid = ({
     serverId,
     size,
 }: SongListPaginatedGridProps) => {
+    const { currentPage, onChange } = useItemListPagination();
+
     const listCountQuery = songsQueries.listCount({
-        query: { ...query },
+        query: { ...query, limit: itemsPerPage },
         serverId: serverId,
     }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
 
     const listQueryFn = api.controller.getSongList;
 
-    const { currentPage, onChange } = useItemListPagination();
-
     const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
         currentPage,
         eventKey: ItemListKey.SONG,

src/renderer/features/songs/components/song-list-paginated-table.tsx

@@ -34,15 +34,15 @@ export const SongListPaginatedTable = ({
     serverId,
     size = 'default',
 }: SongListPaginatedTableProps) => {
+    const { currentPage, onChange } = useItemListPagination();
+
     const listCountQuery = songsQueries.listCount({
-        query: { ...query },
+        query: { ...query, limit: itemsPerPage },
         serverId: serverId,
     }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
 
     const listQueryFn = api.controller.getSongList;
 
-    const { currentPage, onChange } = useItemListPagination();
-
     const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
         currentPage,
         eventKey: ItemListKey.SONG,