Refactor remaining queries/mutations for new controller

src/renderer/features/shared/mutations/create-favorite-mutation.ts

@@ -1,4 +1,4 @@
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
@@ -9,11 +9,12 @@ import {
   FavoriteResponse,
   LibraryItem,
 } from '/@/renderer/api/types';
-import { MutationHookArgs, queryClient } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
 
-export const useCreateFavorite = (args?: MutationHookArgs) => {
+export const useCreateFavorite = (args: MutationHookArgs) => {
   const { options } = args || {};
+  const queryClient = useQueryClient();
   const setAlbumListData = useSetAlbumListItemDataById();
   const setQueueFavorite = useSetQueueFavorite();
 
@@ -30,6 +31,9 @@ export const useCreateFavorite = (args?: MutationHookArgs) => {
     },
     onSuccess: (_data, variables) => {
       const { serverId } = variables;
+
+      if (!serverId) return;
+
       for (const id of variables.query.id) {
         // Set the userFavorite property to true for the album in the album list data store
         if (variables.query.type === LibraryItem.ALBUM) {

src/renderer/features/shared/mutations/delete-favorite-mutation.ts

@@ -1,4 +1,4 @@
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
@@ -9,12 +9,12 @@ import {
   FavoriteResponse,
   LibraryItem,
 } from '/@/renderer/api/types';
-import { MutationHookArgs, queryClient } from '/@/renderer/lib/react-query';
+import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
 
 export const useDeleteFavorite = (args: MutationHookArgs) => {
   const { options } = args || {};
-  // const queryClient = useQueryClient();
+  const queryClient = useQueryClient();
   const setAlbumListData = useSetAlbumListItemDataById();
   const setQueueFavorite = useSetQueueFavorite();
 
@@ -31,6 +31,9 @@ export const useDeleteFavorite = (args: MutationHookArgs) => {
     },
     onSuccess: (_data, variables) => {
       const { serverId } = variables;
+
+      if (!serverId) return;
+
       for (const id of variables.query.id) {
         // Set the userFavorite property to false for the album in the album list data store
         if (variables.query.type === LibraryItem.ALBUM) {

src/renderer/features/shared/mutations/set-rating-mutation.ts

@@ -1,9 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { HTTPError } from 'ky';
 import { api } from '/@/renderer/api';
-import { NDAlbumArtistDetail, NDAlbumDetail } from '/@/renderer/api/navidrome.types';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { SSAlbumArtistDetail, SSAlbumDetail } from '/@/renderer/api/subsonic.types';
 import {
   Album,
   AlbumArtist,
@@ -11,7 +9,8 @@ import {
   LibraryItem,
   SetRatingArgs,
   RatingResponse,
-  ServerType,
+  AlbumDetailResponse,
+  AlbumArtistDetailResponse,
 } from '/@/renderer/api/types';
 import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useSetAlbumListItemDataById, useSetQueueRating } from '/@/renderer/store';
@@ -65,61 +64,35 @@ export const useSetRating = (args: MutationHookArgs) => {
         variables.query.item.length === 1 && variables.query.item[0].itemType === LibraryItem.ALBUM;
 
       if (isAlbumDetailPage) {
-        const { serverType, id: albumId, serverId } = variables.query.item[0] as Album;
+        const { id: albumId, serverId } = variables.query.item[0] as Album;
 
         const queryKey = queryKeys.albums.detail(serverId || '', { id: albumId });
-        const previous = queryClient.getQueryData<any>(queryKey);
+        const previous = queryClient.getQueryData<AlbumDetailResponse>(queryKey);
         if (previous) {
-          switch (serverType) {
-            case ServerType.NAVIDROME:
-              queryClient.setQueryData<NDAlbumDetail>(queryKey, {
-                ...previous,
-                rating: variables.query.rating,
-              });
-              break;
-            case ServerType.SUBSONIC:
-              queryClient.setQueryData<SSAlbumDetail>(queryKey, {
-                ...previous,
-                userRating: variables.query.rating,
-              });
-              break;
-            case ServerType.JELLYFIN:
-              // Jellyfin does not support ratings
-              break;
-          }
+          queryClient.setQueryData<AlbumDetailResponse>(queryKey, {
+            ...previous,
+            userRating: variables.query.rating,
+          });
         }
       }
 
-      // We only need to set if we're already on the album detail page
+      // We only need to set if we're already on the album artist detail page
       const isAlbumArtistDetailPage =
         variables.query.item.length === 1 &&
         variables.query.item[0].itemType === LibraryItem.ALBUM_ARTIST;
 
       if (isAlbumArtistDetailPage) {
-        const { serverType, id: albumArtistId, serverId } = variables.query.item[0] as AlbumArtist;
+        const { id: albumArtistId, serverId } = variables.query.item[0] as AlbumArtist;
 
         const queryKey = queryKeys.albumArtists.detail(serverId || '', {
           id: albumArtistId,
         });
-        const previous = queryClient.getQueryData<any>(queryKey);
+        const previous = queryClient.getQueryData<AlbumArtistDetailResponse>(queryKey);
         if (previous) {
-          switch (serverType) {
-            case ServerType.NAVIDROME:
-              queryClient.setQueryData<NDAlbumArtistDetail>(queryKey, {
-                ...previous,
-                rating: variables.query.rating,
-              });
-              break;
-            case ServerType.SUBSONIC:
-              queryClient.setQueryData<SSAlbumArtistDetail>(queryKey, {
-                ...previous,
-                userRating: variables.query.rating,
-              });
-              break;
-            case ServerType.JELLYFIN:
-              // Jellyfin does not support ratings
-              break;
-          }
+          queryClient.setQueryData<AlbumArtistDetailResponse>(queryKey, {
+            ...previous,
+            userRating: variables.query.rating,
+          });
         }
       }
     },

src/renderer/features/shared/queries/music-folders-query.ts

@@ -1,23 +1,22 @@
-import { useCallback } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import { useCurrentServer } from '/@/renderer/store';
-import { RawMusicFolderListResponse } from '/@/renderer/api/types';
+import { getServerById } from '/@/renderer/store';
+import { MusicFolderListQuery } from '../../../api/types';
+import { QueryHookArgs } from '../../../lib/react-query';
 
-export const useMusicFolders = () => {
-  const server = useCurrentServer();
+export const useMusicFolders = (args: QueryHookArgs<MusicFolderListQuery>) => {
+  const { options, serverId } = args || {};
+  const server = getServerById(serverId);
 
   const query = useQuery({
-    enabled: !!server?.id,
-    queryFn: ({ signal }) => api.controller.getMusicFolderList({ server, signal }),
+    enabled: !!server,
+    queryFn: ({ signal }) => {
+      if (!server) throw new Error('Server not found');
+      return api.controller.getMusicFolderList({ apiClientProps: { server, signal } });
+    },
     queryKey: queryKeys.musicFolders.list(server?.id || ''),
-    select: useCallback(
-      (data: RawMusicFolderListResponse | undefined) => {
-        return api.normalize.musicFolderList(data, server);
-      },
-      [server],
-    ),
+    ...options,
   });
 
   return query;