This repository has been archived by the owner on Oct 4, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 43
[C-2829] Finalize SuggestedTracks #3706
Merged
Merged
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
f447aef
Add refresh and add
dylanjeffers 79a4705
Update add
dylanjeffers 57ca8bf
Add toggle buttons
dylanjeffers 73a2c0c
Improve loading state
dylanjeffers 9292e3e
Add trending
dylanjeffers 7b9032e
Merge branch 'main' into dj-c-2829-finalize-suggested-tracks
dylanjeffers 96bfc1d
Filter collectionId and fix lineup
dylanjeffers 2e3d9c9
Update mobile
dylanjeffers File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,118 @@ | ||
import { useMemo } from 'react' | ||
import { useCallback, useEffect, useState } from 'react' | ||
|
||
import { sampleSize } from 'lodash' | ||
import { useSelector } from 'react-redux' | ||
import { shuffle } from 'lodash' | ||
import { useSelector, useDispatch } from 'react-redux' | ||
|
||
import { usePaginatedQuery } from 'audius-query' | ||
import { ID } from 'models/Identifiers' | ||
import { Status } from 'models/Status' | ||
import { TimeRange } from 'models/TimeRange' | ||
import { getUserId } from 'store/account/selectors' | ||
import { addTrackToPlaylist } from 'store/cache/collections/actions' | ||
import { getTrack } from 'store/cache/tracks/selectors' | ||
import { CommonState } from 'store/index' | ||
|
||
import { useGetFavoritedTrackList } from './favorites' | ||
import { useGetTracksByIds } from './track' | ||
import { useGetTrending } from './trending' | ||
|
||
const suggestedTrackCount = 5 | ||
|
||
const selectSuggestedTracks = (state: CommonState, ids: ID[]) => { | ||
return ids.map((id) => { | ||
const track = getTrack(state, { id }) | ||
if (!track) return { id, isLoading: true as const } | ||
return { id, track, isLoading: false as const } | ||
}) | ||
} | ||
|
||
export const useGetSuggestedTracks = () => { | ||
const currentUserId = useSelector(getUserId) | ||
const { data: favoritedTracks } = useGetFavoritedTrackList( | ||
{ currentUserId }, | ||
{ disabled: !currentUserId } | ||
) | ||
const dispatch = useDispatch() | ||
const [suggestedTrackIds, setSuggestedTrackIds] = useState<ID[]>([]) | ||
|
||
const { data: favoritedTracks, status: favoritedStatus } = | ||
useGetFavoritedTrackList({ currentUserId }, { disabled: !currentUserId }) | ||
|
||
const favoritedTracksSample = useMemo(() => { | ||
return sampleSize(favoritedTracks, 5) | ||
useEffect(() => { | ||
if (favoritedTracks) { | ||
const suggestedTrackIds = shuffle(favoritedTracks).map( | ||
(track) => track.save_item_id | ||
) | ||
setSuggestedTrackIds(suggestedTrackIds) | ||
} | ||
}, [favoritedTracks]) | ||
|
||
return useGetTracksByIds( | ||
const { | ||
data: trendingTracks, | ||
status: trendingStatus, | ||
loadMore | ||
} = usePaginatedQuery( | ||
useGetTrending, | ||
{ | ||
timeRange: TimeRange.WEEK, | ||
currentUserId, | ||
genre: null | ||
}, | ||
{ | ||
pageSize: 10, | ||
disabled: favoritedStatus !== Status.SUCCESS | ||
} | ||
) | ||
|
||
useEffect(() => { | ||
if (trendingStatus === Status.SUCCESS) { | ||
setSuggestedTrackIds([ | ||
...suggestedTrackIds, | ||
...trendingTracks.map((track) => track.track_id) | ||
]) | ||
} | ||
// eslint-disable-next-line react-hooks/exhaustive-deps | ||
}, [trendingStatus]) | ||
|
||
useEffect(() => { | ||
if (suggestedTrackIds.length < 5) { | ||
loadMore() | ||
} | ||
// eslint-disable-next-line react-hooks/exhaustive-deps | ||
}, [suggestedTrackIds.length]) | ||
|
||
const suggestedTracks = useSelector((state: CommonState) => | ||
selectSuggestedTracks( | ||
state, | ||
suggestedTrackIds.slice(0, suggestedTrackCount) | ||
) | ||
) | ||
|
||
useGetTracksByIds( | ||
{ | ||
currentUserId, | ||
ids: favoritedTracksSample?.map((favorite) => favorite.save_item_id) | ||
ids: suggestedTracks | ||
.filter((suggestedTrack) => suggestedTrack.isLoading) | ||
.map((suggestedTrack) => suggestedTrack.id) | ||
}, | ||
{ | ||
disabled: !currentUserId || favoritedTracksSample.length === 0 | ||
disabled: !currentUserId || suggestedTrackIds.length === 0 | ||
} | ||
) | ||
|
||
const handleAddTrack = useCallback( | ||
(trackId: ID, collectionId: ID) => { | ||
dispatch(addTrackToPlaylist(trackId, collectionId)) | ||
const trackIndexToRemove = suggestedTrackIds.indexOf(trackId) | ||
suggestedTrackIds.splice(trackIndexToRemove, 1) | ||
setSuggestedTrackIds(suggestedTrackIds) | ||
}, | ||
[dispatch, suggestedTrackIds] | ||
) | ||
|
||
const handleRefresh = useCallback(() => { | ||
setSuggestedTrackIds(suggestedTrackIds.slice(suggestedTrackCount)) | ||
}, [suggestedTrackIds]) | ||
|
||
return { | ||
suggestedTracks, | ||
onRefresh: handleRefresh, | ||
onAddTrack: handleAddTrack | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { createApi } from 'audius-query' | ||
import { ID } from 'models/Identifiers' | ||
import { Kind } from 'models/Kind' | ||
import { TimeRange } from 'models/TimeRange' | ||
import { Genre } from 'utils/genres' | ||
import { Nullable } from 'utils/typeUtils' | ||
|
||
type GetTrendingArgs = { | ||
timeRange: TimeRange | ||
genre: Nullable<Genre> | ||
offset: number | ||
limit: number | ||
currentUserId: Nullable<ID> | ||
} | ||
|
||
const trendingApi = createApi({ | ||
reducerPath: 'trendingApi', | ||
endpoints: { | ||
getTrending: { | ||
fetch: async (args: GetTrendingArgs, { apiClient }) => { | ||
return await apiClient.getTrending(args) | ||
}, | ||
options: { | ||
kind: Kind.TRACKS, | ||
schemaKey: 'tracks' | ||
} | ||
} | ||
} | ||
}) | ||
|
||
export const { useGetTrending } = trendingApi.hooks | ||
export const trendingApiReducer = trendingApi.reducer |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
might have missed the logic for this, but would be good to make sure that the tracks that are already in the playlist do not appear in the suggestions. might be tough to do though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh yeah great call! will add