vanja/feishin
1
0
Fork 0
mirror of https://github.com/jeffvli/feishin.git synced 2026-05-13 20:10:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor api controller to internalize server fetch

Browse Source
This commit is contained in:
jeffvli
2025-11-02 21:56:35 -08:00
parent 8dbaec3943
commit c7a473d864
79 changed files with 904 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/features/shared/api/shared-api.ts
+7 -14
View File
@@ -3,28 +3,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 { MusicFolderListQuery, TagQuery, UserListQuery } from '/@/shared/types/domain-types';
export const sharedQueries = {
musicFolders: (args: QueryHookArgs<MusicFolderListQuery>) => {
return queryOptions({
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.getMusicFolderList({ apiClientProps: { server, signal } });
return api.controller.getMusicFolderList({
apiClientProps: { serverId: args.serverId, signal },
});
},
queryKey: queryKeys.musicFolders.list(args.serverId || ''),
queryKey: queryKeys.musicFolders.list(args.serverId),
...args.options,
});
},
roles: (args: QueryHookArgs<object>) => {
return queryOptions({
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.getRoles({
apiClientProps: { server, signal },
apiClientProps: { serverId: args.serverId, signal },
});
},
queryKey: queryKeys.roles.list(args.serverId || ''),
@@ -35,10 +32,8 @@ export const sharedQueries = {
return queryOptions({
gcTime: 1000 * 60,
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.getTags({
apiClientProps: { server, signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
@@ -49,10 +44,8 @@ export const sharedQueries = {
users: (args: QueryHookArgs<UserListQuery>) => {
return queryOptions({
queryFn: ({ signal }) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.getUserList({
apiClientProps: { server, signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
src/renderer/features/shared/hooks/use-handle-favorite.ts
+6 -6
View File
@@ -3,17 +3,17 @@ import { MutableRefObject, useCallback } from 'react';
import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid';
import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation';
import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-favorite-mutation';
import { useCurrentServerId } from '/@/renderer/store';
import { LibraryItem } from '/@/shared/types/domain-types';
import { ServerListItem } from '/@/shared/types/types';
interface HandleFavoriteProps {
gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
server: null | ServerListItem;
}
export const useHandleFavorite = ({ gridRef, server }: HandleFavoriteProps) => {
export const useHandleFavorite = ({ gridRef }: HandleFavoriteProps) => {
const createFavoriteMutation = useCreateFavorite({});
const deleteFavoriteMutation = useDeleteFavorite({});
const serverId = useCurrentServerId();
const handleFavorite = useCallback(
async (options: { id: string[]; isFavorite: boolean; itemType: LibraryItem }) => {
@@ -21,19 +21,19 @@ export const useHandleFavorite = ({ gridRef, server }: HandleFavoriteProps) => {
try {
if (isFavorite) {
await deleteFavoriteMutation.mutateAsync({
apiClientProps: { serverId },
query: {
id,
type: itemType,
},
serverId: server?.id,
});
} else {
await createFavoriteMutation.mutateAsync({
apiClientProps: { serverId },
query: {
id,
type: itemType,
},
serverId: server?.id,
});
}
@@ -50,7 +50,7 @@ export const useHandleFavorite = ({ gridRef, server }: HandleFavoriteProps) => {
console.error(error);
}
},
[createFavoriteMutation, deleteFavoriteMutation, gridRef, server?.id],
[createFavoriteMutation, deleteFavoriteMutation, gridRef, serverId],
);
return handleFavorite;
src/renderer/features/shared/mutations/create-favorite-mutation.ts
+8 -11
View File
@@ -5,7 +5,7 @@ import isElectron from 'is-electron';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { MutationHookArgs } from '/@/renderer/lib/react-query';
import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
import { useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
import { useFavoriteEvent } from '/@/renderer/store/event.store';
import {
AlbumArtistDetailResponse,
@@ -24,19 +24,16 @@ export const useCreateFavorite = (args: MutationHookArgs) => {
const setQueueFavorite = useSetQueueFavorite();
const setFavoriteEvent = useFavoriteEvent();
return useMutation<
FavoriteResponse,
AxiosError,
Omit<FavoriteArgs, 'apiClientProps' | 'server'>,
null
>({
return useMutation<FavoriteResponse, AxiosError, FavoriteArgs, null>({
mutationFn: (args) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.createFavorite({ ...args, apiClientProps: { server } });
return api.controller.createFavorite({
...args,
apiClientProps: { serverId: args.apiClientProps.serverId },
});
},
onSuccess: (_data, variables) => {
const { serverId } = variables;
const { apiClientProps } = variables;
const serverId = apiClientProps.serverId;
if (!serverId) return;
src/renderer/features/shared/mutations/delete-favorite-mutation.ts
+11 -14
View File
@@ -5,7 +5,7 @@ import isElectron from 'is-electron';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { MutationHookArgs } from '/@/renderer/lib/react-query';
import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
import { useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
import { useFavoriteEvent } from '/@/renderer/store/event.store';
import {
AlbumArtistDetailResponse,
@@ -24,21 +24,16 @@ export const useDeleteFavorite = (args: MutationHookArgs) => {
const setQueueFavorite = useSetQueueFavorite();
const setFavoriteEvent = useFavoriteEvent();
return useMutation<
FavoriteResponse,
AxiosError,
Omit<FavoriteArgs, 'apiClientProps' | 'server'>,
null
>({
return useMutation<FavoriteResponse, AxiosError, FavoriteArgs, null>({
mutationFn: (args) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.deleteFavorite({ ...args, apiClientProps: { server } });
return api.controller.deleteFavorite({
...args,
apiClientProps: { serverId: args.apiClientProps.serverId },
});
},
onSuccess: (_data, variables) => {
const { serverId } = variables;
if (!serverId) return;
const { apiClientProps } = variables;
const serverId = apiClientProps.serverId;
for (const id of variables.query.id) {
// Set the userFavorite property to false for the album in the album list data store
@@ -55,7 +50,9 @@ export const useDeleteFavorite = (args: MutationHookArgs) => {
// We only need to set if we're already on the album detail page
if (variables.query.type === LibraryItem.ALBUM && variables.query.id.length === 1) {
const queryKey = queryKeys.albums.detail(serverId, { id: variables.query.id[0] });
const queryKey = queryKeys.albums.detail(serverId, {
id: variables.query.id[0],
});
const previous = queryClient.getQueryData<AlbumDetailResponse>(queryKey);
if (previous) {
src/renderer/features/shared/mutations/set-rating-mutation.ts
+6 -5
View File
@@ -5,7 +5,7 @@ import isElectron from 'is-electron';
import { api } from '/@/renderer/api';
import { queryKeys } from '/@/renderer/api/query-keys';
import { MutationHookArgs } from '/@/renderer/lib/react-query';
import { getServerById, useSetAlbumListItemDataById, useSetQueueRating } from '/@/renderer/store';
import { useSetAlbumListItemDataById, useSetQueueRating } from '/@/renderer/store';
import { useRatingEvent } from '/@/renderer/store/event.store';
import {
Album,
@@ -30,13 +30,14 @@ export const useSetRating = (args: MutationHookArgs) => {
return useMutation<
RatingResponse,
AxiosError,
Omit<SetRatingArgs, 'apiClientProps' | 'server'>,
SetRatingArgs,
{ previous: undefined | { items: AnyLibraryItems } }
>({
mutationFn: (args) => {
const server = getServerById(args.serverId);
if (!server) throw new Error('Server not found');
return api.controller.setRating({ ...args, apiClientProps: { server } });
return api.controller.setRating({
...args,
apiClientProps: { serverId: args.apiClientProps.serverId },
});
},
onError: (_error, _variables, context) => {
for (const item of context?.previous?.items || []) {