implement new lists for songs

This commit is contained in:
jeffvli
2025-10-13 20:16:06 -07:00
parent 6f35cad349
commit 5aa9407765
14 changed files with 583 additions and 1237 deletions
@@ -1,51 +1,36 @@
import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
import { useQuery } from '@tanstack/react-query';
import isEmpty from 'lodash/isEmpty';
import { useCallback, useMemo, useRef } from 'react';
import { useMemo, useState } from 'react';
import { useParams, useSearchParams } from 'react-router-dom';
import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid/virtual-infinite-grid';
import { ListContext } from '/@/renderer/context/list-context';
import { genresQueries } from '/@/renderer/features/genres/api/genres-api';
import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
import { AnimatedPage } from '/@/renderer/features/shared/components/animated-page';
import { songsQueries } from '/@/renderer/features/songs/api/songs-api';
import { SongListContent } from '/@/renderer/features/songs/components/song-list-content';
import { SongListHeader } from '/@/renderer/features/songs/components/song-list-header';
import { useCurrentServer, useListFilterByKey } from '/@/renderer/store';
import { GenreListSort, LibraryItem, SongListQuery, SortOrder } from '/@/shared/types/domain-types';
import { Play } from '/@/shared/types/types';
import { useCurrentServer } from '/@/renderer/store';
import { GenreListSort, SortOrder } from '/@/shared/types/domain-types';
const TrackListRoute = () => {
const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
const tableRef = useRef<AgGridReactType | null>(null);
const server = useCurrentServer();
const [searchParams] = useSearchParams();
const { albumArtistId, genreId } = useParams();
const pageKey = albumArtistId ? `albumArtistSong` : 'song';
const customFilters = useMemo(() => {
const value = {
...(albumArtistId && { artistIds: [albumArtistId] }),
...(genreId && {
genreIds: [genreId],
}),
};
// const customFilters = useMemo(() => {
// const value = {
// ...(albumArtistId && { artistIds: [albumArtistId] }),
// ...(genreId && {
// genreIds: [genreId],
// }),
// };
if (isEmpty(value)) {
return undefined;
}
// if (isEmpty(value)) {
// return undefined;
// }
return value;
}, [albumArtistId, genreId]);
const handlePlayQueueAdd = usePlayQueueAdd();
const songListFilter = useListFilterByKey<SongListQuery>({
filter: customFilters,
key: pageKey,
});
// return value;
// }, [albumArtistId, genreId]);
const genreList = useQuery(
genresQueries.list({
@@ -71,57 +56,16 @@ const TrackListRoute = () => {
return genre?.name;
}, [genreId, genreList.data]);
const itemCountCheck = useQuery(
songsQueries.listCount({
options: {
gcTime: 1000 * 60,
},
query: songListFilter,
serverId: server?.id,
}),
);
const itemCount = itemCountCheck.data === null ? undefined : itemCountCheck.data;
const handlePlay = useCallback(
async (args: { initialSongId?: string; playType: Play }) => {
if (!itemCount || itemCount === 0) return;
const { initialSongId, playType } = args;
const query: SongListQuery = { ...songListFilter, limit: itemCount, startIndex: 0 };
if (albumArtistId) {
handlePlayQueueAdd?.({
byItemType: {
id: [albumArtistId],
type: LibraryItem.ALBUM_ARTIST,
},
initialSongId,
playType,
query,
});
} else {
handlePlayQueueAdd?.({
byItemType: {
id: [],
type: LibraryItem.SONG,
},
initialSongId,
playType,
query,
});
}
},
[albumArtistId, handlePlayQueueAdd, itemCount, songListFilter],
);
const [itemCount, setItemCount] = useState<number | undefined>(undefined);
const providerValue = useMemo(() => {
return {
customFilters,
handlePlay,
id: albumArtistId ?? genreId,
itemCount,
pageKey,
setItemCount,
};
}, [albumArtistId, customFilters, genreId, handlePlay, pageKey]);
}, [albumArtistId, genreId, itemCount, pageKey, setItemCount]);
const artist = searchParams.get('artistName');
const title = artist ? artist : genreId ? genreTitle : undefined;
@@ -129,14 +73,8 @@ const TrackListRoute = () => {
return (
<AnimatedPage>
<ListContext.Provider value={providerValue}>
<SongListHeader
genreId={genreId}
gridRef={gridRef}
itemCount={itemCount}
tableRef={tableRef}
title={title}
/>
<SongListContent gridRef={gridRef} itemCount={itemCount} tableRef={tableRef} />
<SongListHeader title={title} />
<SongListContent />
</ListContext.Provider>
</AnimatedPage>
);