antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-08 13:41:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

7
src/renderer/features/albums/api/album-api.ts
View file

@ -3,7 +3,6 @@ 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 { AlbumDetailQuery, AlbumListQuery, ListCountQuery } from '/@/shared/types/domain-types';
export const albumQueries = {
@ -11,7 +10,7 @@ export const albumQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getAlbumDetail({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
@ -23,7 +22,7 @@ export const albumQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getAlbumList({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
@ -39,7 +38,7 @@ export const albumQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getAlbumListCount({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},

4
src/renderer/features/albums/components/album-detail-content.tsx
View file

@ -290,19 +290,19 @@ export const AlbumDetailContent = ({ background, tableRef }: AlbumDetailContentP
if (detailQuery.data.userFavorite) {
deleteFavoriteMutation.mutate({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
id: [detailQuery.data.id],
type: LibraryItem.ALBUM,
},
serverId: detailQuery.data.serverId,
});
} else {
createFavoriteMutation.mutate({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
id: [detailQuery.data.id],
type: LibraryItem.ALBUM,
},
serverId: detailQuery.data.serverId,
});
}
};

2
src/renderer/features/albums/components/album-detail-header.tsx
View file

@ -118,11 +118,11 @@ export const AlbumDetailHeader = forwardRef(
if (!detailQuery?.data) return;
updateRatingMutation.mutate({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
item: [detailQuery.data],
rating,
},
serverId: detailQuery.data.serverId,
});
};

4
src/renderer/features/albums/components/album-list-grid-view.tsx
View file

@ -35,7 +35,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
const scrollOffset = searchParams.get('scrollOffset');
const initialScrollOffset = Number(id ? scrollOffset : grid?.scrollOffset) || 0;
const handleFavorite = useHandleFavorite({ gridRef, server });
const handleFavorite = useHandleFavorite({ gridRef });
const cardRows = useMemo(() => {
const rows: CardRow<Album>[] = [ALBUM_CARD_ROWS.name];
@ -177,7 +177,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
queryFn: async ({ signal }) =>
controller.getAlbumList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query,

4
src/renderer/features/albums/components/navidrome-album-filters.tsx
View file

@ -12,7 +12,7 @@ import { genresQueries } from '/@/renderer/features/genres/api/genres-api';
import { sharedQueries } from '/@/renderer/features/shared/api/shared-api';
import {
AlbumListFilter,
getServerById,
useCurrentServer,
useListStoreActions,
useListStoreByKey,
} from '/@/renderer/store';
@ -53,7 +53,7 @@ export const NavidromeAlbumFilters = ({
const { t } = useTranslation();
const { filter } = useListStoreByKey<AlbumListQuery>({ key: pageKey });
const { setFilter } = useListStoreActions();
const server = getServerById(serverId);
const server = useCurrentServer();
const genreListQuery = useQuery(
genresQueries.list({

2
src/renderer/features/albums/routes/album-list-route.tsx
View file

@ -107,7 +107,7 @@ const AlbumListRoute = () => {
const albumListRes = await queryClient.fetchQuery({
queryFn: ({ signal }) => {
return api.controller.getAlbumList({
apiClientProps: { server, signal },
apiClientProps: { serverId: server?.id || '', signal },
query,
});
},

7
src/renderer/features/albums/routes/dummy-album-detail-route.tsx
View file

@ -42,9 +42,8 @@ const DummyAlbumDetailRoute = () => {
const queryKey = queryKeys.songs.detail(server?.id || '', albumId);
const detailQuery = useQuery({
queryFn: ({ signal }) => {
if (!server) throw new Error('Server not found');
return api.controller.getSongDetail({
apiClientProps: { server, signal },
apiClientProps: { serverId: server?.id || '', signal },
query: { id: albumId },
});
},
@ -70,19 +69,19 @@ const DummyAlbumDetailRoute = () => {
try {
if (wasFavorite) {
await deleteFavoriteMutation.mutateAsync({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
id: [detailQuery.data.id],
type: LibraryItem.SONG,
},
serverId: detailQuery.data.serverId,
});
} else {
await createFavoriteMutation.mutateAsync({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
id: [detailQuery.data.id],
type: LibraryItem.SONG,
},
serverId: detailQuery.data.serverId,
});
}