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

21
src/renderer/features/artists/api/artists-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 {
AlbumArtistDetailQuery,
AlbumArtistListQuery,
@ -17,11 +16,11 @@ export const artistsQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getAlbumArtistDetail({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
queryKey: queryKeys.albumArtists.detail(args.serverId || '', args.query),
queryKey: queryKeys.albumArtists.detail(args.serverId, args.query),
...args.options,
});
},
@ -29,11 +28,11 @@ export const artistsQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getAlbumArtistList({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
queryKey: queryKeys.albumArtists.list(args.serverId || '', args.query),
queryKey: queryKeys.albumArtists.list(args.serverId, args.query),
...args.options,
});
},
@ -41,12 +40,12 @@ export const artistsQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getAlbumArtistListCount({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
queryKey: queryKeys.albumArtists.count(
args.serverId || '',
args.serverId,
Object.keys(args.query).length === 0 ? undefined : args.query,
),
...args.options,
@ -56,12 +55,12 @@ export const artistsQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getArtistListCount({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
queryKey: queryKeys.albumArtists.count(
args.serverId || '',
args.serverId,
Object.keys(args.query).length === 0 ? undefined : args.query,
),
...args.options,
@ -71,11 +70,11 @@ export const artistsQueries = {
return queryOptions({
queryFn: ({ signal }) => {
return api.controller.getTopSongs({
apiClientProps: { server: getServerById(args.serverId), signal },
apiClientProps: { serverId: args.serverId, signal },
query: args.query,
});
},
queryKey: queryKeys.albumArtists.topSongs(args.serverId || '', args.query),
queryKey: queryKeys.albumArtists.topSongs(args.serverId, args.query),
...args.options,
});
},

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

@ -311,19 +311,19 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
if (detailQuery.data.userFavorite) {
deleteFavoriteMutation.mutate({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
id: [detailQuery.data.id],
type: LibraryItem.ALBUM_ARTIST,
},
serverId: detailQuery.data.serverId,
});
} else {
createFavoriteMutation.mutate({
apiClientProps: { serverId: detailQuery.data.serverId },
query: {
id: [detailQuery.data.id],
type: LibraryItem.ALBUM_ARTIST,
},
serverId: detailQuery.data.serverId,
});
}
};

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

@ -71,11 +71,11 @@ export const AlbumArtistDetailHeader = 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/artists/components/album-artist-list-grid-view.tsx
View file

@ -38,7 +38,7 @@ export const AlbumArtistListGridView = ({ gridRef, itemCount }: AlbumArtistListG
const { pageKey } = useListContext();
const { display, filter, grid } = useListStoreByKey<AlbumArtistListQuery>({ key: pageKey });
const { setGrid } = useListStoreActions();
const handleFavorite = useHandleFavorite({ gridRef, server });
const handleFavorite = useHandleFavorite({ gridRef });
const fetchInitialData = useCallback(() => {
const query: Omit<AlbumArtistListQuery, 'limit' | 'startIndex'> = {
@ -89,7 +89,7 @@ export const AlbumArtistListGridView = ({ gridRef, itemCount }: AlbumArtistListG
queryFn: async ({ signal }) =>
api.controller.getAlbumArtistList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query,

4
src/renderer/features/artists/components/album-artist-list-header-filters.tsx
View file

@ -184,7 +184,7 @@ export const AlbumArtistListHeaderFilters = ({
queryFn: async ({ signal }) =>
api.controller.getAlbumArtistList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query: {
@ -220,7 +220,7 @@ export const AlbumArtistListHeaderFilters = ({
queryFn: async ({ signal }) =>
api.controller.getAlbumArtistList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query: {

4
src/renderer/features/artists/components/artist-list-grid-view.tsx
View file

@ -39,7 +39,7 @@ export const ArtistListGridView = ({ gridRef, itemCount }: ArtistListGridViewPro
const { pageKey } = useListContext();
const { display, filter, grid } = useListStoreByKey<ArtistListQuery>({ key: pageKey });
const { setGrid } = useListStoreActions();
const handleFavorite = useHandleFavorite({ gridRef, server });
const handleFavorite = useHandleFavorite({ gridRef });
const fetchInitialData = useCallback(() => {
const query: Omit<ArtistListQuery, 'limit' | 'startIndex'> = {
@ -90,7 +90,7 @@ export const ArtistListGridView = ({ gridRef, itemCount }: ArtistListGridViewPro
queryFn: async ({ signal }) =>
api.controller.getArtistList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query,

4
src/renderer/features/artists/components/artist-list-header-filters.tsx
View file

@ -191,7 +191,7 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
queryFn: async ({ signal }) =>
api.controller.getArtistList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query: {
@ -227,7 +227,7 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
queryFn: async ({ signal }) =>
api.controller.getArtistList({
apiClientProps: {
server,
serverId: server?.id || '',
signal,
},
query: {