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

Normalize album artist list store

Browse source
This commit is contained in:
jeffvli 2023-03-05 21:02:05 -08:00
parent 828cca9c19
commit 123478a24f
14 changed files with 186 additions and 1656 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/renderer/features/artists/routes/album-artist-detail-discography-route.tsx
View file

@ -1,83 +0,0 @@
import { useParams } from 'react-router';
import { AlbumListSort, SortOrder, SongListSort } from '/@/renderer/api/types';
import { VirtualGridContainer } from '/@/renderer/components';
import { useAlbumList } from '/@/renderer/features/albums';
import { AnimatedPage } from '/@/renderer/features/shared';
import { useSongList } from '/@/renderer/features/songs';
// import { useSongListStore } from '/@/renderer/store';
// import { usePlayQueueAdd } from '/@/renderer/features/player';
// import { Play } from '/@/renderer/types';
// import { useAlbumArtistDetail } from '/@/renderer/features/artists/queries/album-artist-detail-query';
const AlbumArtistDetailDiscographyRoute = () => {
const { albumArtistId } = useParams() as { albumArtistId: string };
// const albumArtistQuery = useAlbumArtistDetail({ id: albumArtistId });
const albumsQuery = useAlbumList({
jfParams: { artistIds: albumArtistId },
ndParams: { artist_id: albumArtistId },
sortBy: AlbumListSort.YEAR,
sortOrder: SortOrder.DESC,
startIndex: 0,
});
const songsQuery = useSongList(
{
albumIds: albumsQuery.data?.items?.map((album) => album.id),
sortBy: SongListSort.ALBUM,
sortOrder: SortOrder.ASC,
startIndex: 0,
},
{
enabled: !albumsQuery.isLoading,
},
);
// const page = useSongListStore();
// const handlePlayQueueAdd = usePlayQueueAdd();
if (albumsQuery.isLoading || songsQuery.isLoading) return null;
// const handlePlay = (play: Play, data: any[]) => {
// handlePlayQueueAdd?.({
// byData: data,
// play,
// });
// };
return (
<AnimatedPage>
<VirtualGridContainer>
{/* <AlbumArtistDiscographyHeader />
<PageHeader>
<Group
position="apart"
w="100%"
>
{albumArtistQuery?.data?.name || ''}
<Group spacing="xs">
<Button
compact
radius="xl"
variant="subtle"
>
<RiListUnordered size="1.5em" />
</Button>
<Button
compact
radius="xl"
variant="subtle"
>
<RiLayoutGridFill size="1.5em" />
</Button>
</Group>
</Group>
</PageHeader> *
<AlbumArtistDiscographyDetailList /> */}
</VirtualGridContainer>
</AnimatedPage>
);
};
export default AlbumArtistDetailDiscographyRoute;

62
src/renderer/features/artists/routes/album-artist-detail-song-list-route.tsx
View file

@ -1,62 +0,0 @@
import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
import { useSetState } from '@mantine/hooks';
import { useRef } from 'react';
import { useParams } from 'react-router';
import { SongListSort, SortOrder } from '/@/renderer/api/types';
import { AlbumArtistDetailSongListContent } from '/@/renderer/features/artists/components/album-artist-detail-song-list-content';
import { AlbumArtistDetailSongListHeader } from '/@/renderer/features/artists/components/album-artist-detail-song-list-header';
import { useAlbumArtistDetail } from '/@/renderer/features/artists/queries/album-artist-detail-query';
import { AnimatedPage } from '/@/renderer/features/shared';
import { useSongList } from '/@/renderer/features/songs';
import { SongListFilter } from '/@/renderer/store';
const AlbumArtistDetailSongListRoute = () => {
const tableRef = useRef<AgGridReactType | null>(null);
const { albumArtistId } = useParams() as { albumArtistId: string };
const detailQuery = useAlbumArtistDetail({ id: albumArtistId });
const [filter, setFilter] = useSetState<SongListFilter>({
artistIds: [albumArtistId],
sortBy: SongListSort.ALBUM,
sortOrder: SortOrder.ASC,
});
const itemCountCheck = useSongList(
{
limit: 1,
startIndex: 0,
...filter,
},
{
cacheTime: 1000 * 60 * 60 * 2,
staleTime: 1000 * 60 * 60 * 2,
},
);
const itemCount =
itemCountCheck.data?.totalRecordCount === null
? undefined
: itemCountCheck.data?.totalRecordCount;
if (detailQuery.isLoading) return null;
return (
<AnimatedPage>
<AlbumArtistDetailSongListHeader
filter={filter}
itemCount={itemCount}
setFilter={setFilter}
tableRef={tableRef}
title={detailQuery?.data?.name || 'Unknown'}
/>
<AlbumArtistDetailSongListContent
filter={filter}
itemCount={itemCount}
tableRef={tableRef}
/>
</AnimatedPage>
);
};
export default AlbumArtistDetailSongListRoute;

34
src/renderer/features/artists/routes/album-artist-list-route.tsx
View file

@ -5,23 +5,25 @@ import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/li
import { useRef } from 'react';
import { AlbumArtistListContent } from '/@/renderer/features/artists/components/album-artist-list-content';
import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
import { useAlbumArtistListStore } from '/@/renderer/store';
import { generatePageKey, useAlbumArtistListFilter } from '/@/renderer/store';
import { AlbumArtistListContext } from '/@/renderer/features/artists/context/album-artist-list-context';
const AlbumArtistListRoute = () => {
const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
const tableRef = useRef<AgGridReactType | null>(null);
const page = useAlbumArtistListStore();
const filters = page.filter;
const pageKey = generatePageKey('albumArtist', undefined);
const albumArtistListFilter = useAlbumArtistListFilter({ id: undefined, key: pageKey });
const itemCountCheck = useAlbumArtistList(
{
limit: 1,
startIndex: 0,
...filters,
...albumArtistListFilter,
},
{
cacheTime: 1000 * 60 * 60 * 2,
staleTime: 1000 * 60 * 60 * 2,
cacheTime: 1000 * 60,
staleTime: 1000 * 60,
},
);
@ -32,15 +34,17 @@ const AlbumArtistListRoute = () => {
return (
<AnimatedPage>
<AlbumArtistListHeader
gridRef={gridRef}
itemCount={itemCount}
tableRef={tableRef}
/>
<AlbumArtistListContent
gridRef={gridRef}
tableRef={tableRef}
/>
<AlbumArtistListContext.Provider value={{ id: undefined, pageKey }}>
<AlbumArtistListHeader
gridRef={gridRef}
itemCount={itemCount}
tableRef={tableRef}
/>
<AlbumArtistListContent
gridRef={gridRef}
tableRef={tableRef}
/>
</AlbumArtistListContext.Provider>
</AnimatedPage>
);
};