refactor api controller to internalize server fetch

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

@@ -4,36 +4,31 @@ import { api } from '/@/renderer/api';
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
-import { getServerById } from '/@/renderer/store';
 import { ListCountQuery, SimilarSongsQuery, SongListQuery } from '/@/shared/types/domain-types';
 
 export const songsQueries = {
     list: (args: QueryHookArgs<SongListQuery>, imageSize?: number) => {
         return queryOptions({
             queryFn: ({ signal }) => {
-                const server = getServerById(args.serverId);
-                if (!server) throw new Error('Server not found');
                 return controller.getSongList({
-                    apiClientProps: { server, signal },
+                    apiClientProps: { serverId: args.serverId, signal },
                     query: { ...args.query, imageSize },
                 });
             },
-            queryKey: queryKeys.songs.list(args.serverId || '', { ...args.query, imageSize }),
+            queryKey: queryKeys.songs.list(args.serverId, { ...args.query, imageSize }),
             ...args.options,
         });
     },
     listCount: (args: QueryHookArgs<ListCountQuery<SongListQuery>>) => {
         return queryOptions({
             queryFn: ({ signal }) => {
-                const server = getServerById(args.serverId);
-                if (!server) throw new Error('Server not found');
                 return api.controller.getSongListCount({
-                    apiClientProps: { server, signal },
+                    apiClientProps: { serverId: args.serverId, signal },
                     query: args.query,
                 });
             },
             queryKey: queryKeys.songs.count(
-                args.serverId || '',
+                args.serverId,
                 Object.keys(args.query).length === 0 ? undefined : args.query,
             ),
             ...args.options,
@@ -42,10 +37,8 @@ export const songsQueries = {
     similar: (args: QueryHookArgs<SimilarSongsQuery>) => {
         return queryOptions({
             queryFn: ({ signal }) => {
-                const server = getServerById(args.serverId);
-                if (!server) throw new Error('Server not found');
                 return api.controller.getSimilarSongs({
-                    apiClientProps: { server, signal },
+                    apiClientProps: { serverId: args.serverId, signal },
                     query: {
                         albumArtistIds: args.query.albumArtistIds,
                         count: args.query.count ?? 50,
@@ -53,7 +46,7 @@ export const songsQueries = {
                     },
                 });
             },
-            queryKey: queryKeys.songs.similar(args.serverId || '', args.query),
+            queryKey: queryKeys.songs.similar(args.serverId, args.query),
             ...args.options,
         });
     },

src/renderer/features/songs/components/navidrome-song-filters.tsx

@@ -10,8 +10,8 @@ import {
 import { genresQueries } from '/@/renderer/features/genres/api/genres-api';
 import { sharedQueries } from '/@/renderer/features/shared/api/shared-api';
 import {
-    getServerById,
     SongListFilter,
+    useCurrentServer,
     useListFilterByKey,
     useListStoreActions,
 } from '/@/renderer/store';
@@ -42,7 +42,7 @@ export const NavidromeSongFilters = ({
     const { t } = useTranslation();
     const { setFilter } = useListStoreActions();
     const filter = useListFilterByKey<SongListQuery>({ key: pageKey });
-    const server = getServerById(serverId);
+    const server = useCurrentServer();
 
     const isGenrePage = customFilters?.genreIds !== undefined;
 

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

@@ -43,7 +43,7 @@ export const SongListGridView = ({ gridRef, itemCount }: SongListGridViewProps)
     const scrollOffset = searchParams.get('scrollOffset');
     const initialScrollOffset = Number(id ? scrollOffset : grid?.scrollOffset) || 0;
 
-    const handleFavorite = useHandleFavorite({ gridRef, server });
+    const handleFavorite = useHandleFavorite({ gridRef });
 
     useEffect(() => {
         const unSub = useEventStore.subscribe((state) => {
@@ -189,7 +189,7 @@ export const SongListGridView = ({ gridRef, itemCount }: SongListGridViewProps)
                 queryFn: async ({ signal }) =>
                     controller.getSongList({
                         apiClientProps: {
-                            server,
+                            serverId: server?.id || '',
                             signal,
                         },
                         query,