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/albums/api/album-api.ts

@@ -1,7 +1,9 @@
 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 { AlbumDetailQuery, AlbumListQuery, ListCountQuery } from '/@/shared/types/domain-types';
 
@@ -36,8 +38,25 @@ export const albumQueries = {
     },
     listCount: (args: QueryHookArgs<ListCountQuery<AlbumListQuery>>) => {
         return queryOptions({
-            gcTime: 1000 * 60 * 60 * 12,
-            queryFn: ({ signal }) => {
+            gcTime: 1000 * 60 * 60,
+            queryFn: async ({ client, signal }) => {
+                const optimizedCount = await getOptimizedListCount<
+                    ListCountQuery<AlbumListQuery>,
+                    AlbumListQuery,
+                    { totalRecordCount: null | number }
+                >({
+                    client,
+                    listQueryFn: controller.getAlbumList,
+                    listQueryKeyFn: (serverId, query) => queryKeys.albums.list(serverId, query),
+                    query: args.query,
+                    serverId: args.serverId,
+                    signal,
+                });
+
+                if (optimizedCount !== null) {
+                    return optimizedCount;
+                }
+
                 return api.controller.getAlbumListCount({
                     apiClientProps: { serverId: args.serverId, signal },
                     query: args.query,
@@ -48,7 +67,7 @@ export const albumQueries = {
                 args.query,
                 args.query?.artistIds?.length === 1 ? args.query?.artistIds[0] : undefined,
             ),
-            staleTime: 1000 * 60 * 60 * 12,
+            staleTime: 1000 * 60 * 60,
             ...args.options,
         });
     },

src/renderer/features/albums/components/album-list-infinite-grid.tsx

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

src/renderer/features/albums/components/album-list-infinite-table.tsx

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

src/renderer/features/albums/components/album-list-paginated-grid.tsx

@@ -31,15 +31,15 @@ export const AlbumListPaginatedGrid = ({
     serverId,
     size,
 }: AlbumListPaginatedGridProps) => {
+    const { currentPage, onChange } = useItemListPagination();
+
     const listCountQuery = albumQueries.listCount({
-        query: { ...query },
+        query: { ...query, limit: itemsPerPage },
         serverId: serverId,
     }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
 
     const listQueryFn = api.controller.getAlbumList;
 
-    const { currentPage, onChange } = useItemListPagination();
-
     const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
         currentPage,
         eventKey: ItemListKey.ALBUM,

src/renderer/features/albums/components/album-list-paginated-table.tsx

@@ -38,15 +38,15 @@ export const AlbumListPaginatedTable = ({
     serverId,
     size = 'default',
 }: AlbumListPaginatedTableProps) => {
+    const { currentPage, onChange } = useItemListPagination();
+
     const listCountQuery = albumQueries.listCount({
-        query: { ...query },
+        query: { ...query, limit: itemsPerPage },
         serverId: serverId,
     }) as UseSuspenseQueryOptions<number, Error, number, readonly unknown[]>;
 
     const listQueryFn = api.controller.getAlbumList;
 
-    const { currentPage, onChange } = useItemListPagination();
-
     const { data, pageCount, totalItemCount } = useItemListPaginatedLoader({
         currentPage,
         eventKey: ItemListKey.ALBUM,