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

Add initial fetch for all grid views

Browse source
This commit is contained in:
jeffvli 2023-08-08 01:26:02 -07:00
parent e542fcb8aa
commit d1e5571163
6 changed files with 101 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -150,10 +150,12 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
...customFilters,
};
const queryKey = queryKeys.albums.list(server?.id || '', query, id);
const queriesFromCache: [QueryKey, AlbumListResponse][] = queryClient.getQueriesData({
exact: false,
fetchStatus: 'idle',
queryKey: queryKeys.albums.list(server?.id || '', query),
queryKey,
stale: false,
});
@ -162,7 +164,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
for (const [, data] of queriesFromCache) {
const { items, startIndex } = data || {};
if (items && startIndex !== undefined) {
if (items && items.length !== 1 && startIndex !== undefined) {
let itemIndex = 0;
for (
let rowIndex = startIndex;
@ -176,7 +178,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
}
return itemData;
}, [customFilters, filter, queryClient, server?.id]);
}, [customFilters, filter, id, queryClient, server?.id]);
const fetch = useCallback(
async ({ skip, take }: { skip: number; take: number }) => {
@ -191,7 +193,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
...customFilters,
};
const queryKey = queryKeys.albums.list(server?.id || '', query);
const queryKey = queryKeys.albums.list(server?.id || '', query, id);
const albums = await queryClient.fetchQuery(queryKey, async ({ signal }) =>
controller.getAlbumList({
@ -205,7 +207,7 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
return albums;
},
[customFilters, filter, queryClient, server],
[customFilters, filter, id, queryClient, server],
);
return (

6
src/renderer/features/albums/queries/album-list-query.ts
View file

@ -22,7 +22,11 @@ export const useAlbumList = (args: QueryHookArgs<AlbumListQuery>) => {
query,
});
},
queryKey: queryKeys.albums.list(serverId || '', query),
queryKey: queryKeys.albums.list(
serverId || '',
query,
query?.artistIds?.length === 1 ? query?.artistIds[0] : undefined,
),
...options,
});
};