zoriya/Chromacase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Front: Fix genre view

Browse Source
This commit is contained in:
Arthur Jamet
2023-09-07 17:10:18 +02:00
parent 16cd794e3b
commit b1d0415ba0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front/views/GenreDetailsView.tsx
+6 -5
View File
@@ -15,10 +15,11 @@ type GenreDetailsViewProps = {
const GenreDetailsView = ({ genreId }: RouteProps<GenreDetailsViewProps>) => {
const genreQuery = useQuery(API.getGenre(genreId))
const songsQuery = useQuery(API.getSongsByGenre(genreId))
const artistQueries = useQueries(songsQuery.data.map((song) => song.artistId).map((artistId) => API.getArtist(artistId)));
const songWithArtist = songsQuery.data.map((song) => ({
const artistQueries = useQueries(songsQuery.data?.map((song) => song.artistId).map((artistId) => API.getArtist(artistId)) ?? []);
// Here, .artist will always be defined
const songWithArtist = songsQuery?.data?.map((song) => ({
...song,
artist: artistQueries.find((query) => query.data.id == song.artistId)
artist: artistQueries.find((query) => query.data?.id == song.artistId)?.data
})).filter((song) => song.artist !== undefined);
const screenSize = useBreakpointValue({ base: "small", md: "big" });
@@ -29,7 +30,7 @@ const GenreDetailsView = ({ genreId }: RouteProps<GenreDetailsViewProps>) => {
navigation.navigate('Error');
return <></>;
}
if (!genreQuery.data || songsQuery.data === undefined) {
if (!genreQuery.data || songsQuery.data === undefined || songWithArtist === undefined) {
return <LoadingView />;
}
@@ -57,7 +58,7 @@ const GenreDetailsView = ({ genreId }: RouteProps<GenreDetailsViewProps>) => {
content={songWithArtist.map((songData) => ({
name: songData.name,
cover: songData.cover,
artistName: songData.artist.name,
artistName: songData.artist!.name,
songId: songData.id,
onPress: () => {
API.createSearchHistoryEntry(songData.name, 'song');