diff --git a/packages/common/src/api/index.ts b/packages/common/src/api/index.ts index 5ca7351cb29..f604a4daebf 100644 --- a/packages/common/src/api/index.ts +++ b/packages/common/src/api/index.ts @@ -111,7 +111,6 @@ export * from './tan-query/tracks/useFileSizes' export * from './tan-query/tracks/useTrackFileInfo' export * from './tan-query/tracks/useUpdateTrack' export * from './tan-query/tracks/useRemixedTracks' -export * from './tan-query/tracks/useRecommendedTracks' export * from './tan-query/tracks/useSuggestedPlaylistTracks' export * from './tan-query/tracks/useFeelingLuckyTrack' export * from './tan-query/tracks/useRecentlyPlayedTracks' diff --git a/packages/common/src/api/tan-query/queryKeys.ts b/packages/common/src/api/tan-query/queryKeys.ts index 8cd09ef3a20..2fd96d37362 100644 --- a/packages/common/src/api/tan-query/queryKeys.ts +++ b/packages/common/src/api/tan-query/queryKeys.ts @@ -81,7 +81,6 @@ export const QUERY_KEYS = { purchasers: 'purchasers', purchasersCount: 'purchasersCount', remixedTracks: 'remixedTracks', - recommendedTracks: 'recommendedTracks', mutedUsers: 'mutedUsers', salesAggregate: 'salesAggregate', usdcTransactionsCount: 'usdcTransactionsCount', diff --git a/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts b/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts deleted file mode 100644 index 361682e6bef..00000000000 --- a/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Id, type GetUserRecommendedTracksRequest } from '@audius/sdk' -import { - InfiniteData, - useInfiniteQuery, - useQueryClient -} from '@tanstack/react-query' - -import { userTrackMetadataFromSDK } from '~/adapters/track' -import { transformAndCleanList } from '~/adapters/utils' -import { primeTrackData, useQueryContext } from '~/api/tan-query/utils' -import { SDKInfiniteQueryArgs } from '~/api/types' -import { ID } from '~/models' - -import { QUERY_KEYS } from '../queryKeys' -import { QueryKey, QueryOptions } from '../types' -import { useCurrentUserId } from '../users/account/useCurrentUserId' - -const DEFAULT_PAGE_SIZE = 10 - -// `id` is automatically added by the hook -export type UseRecommendedTracksArgs = Omit< - SDKInfiniteQueryArgs, - 'id' -> - -export const getRecommendedTracksQueryKey = ( - userId: ID | null | undefined, - args: UseRecommendedTracksArgs -) => { - return [QUERY_KEYS.recommendedTracks, userId, args] as unknown as QueryKey< - InfiniteData - > -} - -export const useRecommendedTracks = ( - { pageSize = DEFAULT_PAGE_SIZE, ...args }: UseRecommendedTracksArgs = {}, - options?: QueryOptions -) => { - const { audiusSdk } = useQueryContext() - const { data: currentUserId } = useCurrentUserId() - const queryClient = useQueryClient() - - return useInfiniteQuery({ - queryKey: getRecommendedTracksQueryKey(currentUserId, { - pageSize, - ...args - }), - initialPageParam: 0, - getNextPageParam: (lastPage: ID[], allPages) => { - if (lastPage.length < pageSize) return undefined - return allPages.length * pageSize - }, - queryFn: async ({ pageParam }) => { - if (!currentUserId) return [] - const sdk = await audiusSdk() - const { data = [] } = await sdk.users.getUserRecommendedTracks({ - ...args, - id: Id.parse(currentUserId), - userId: Id.parse(currentUserId), - limit: pageSize, - offset: pageParam - }) - const tracks = primeTrackData({ - tracks: transformAndCleanList(data, userTrackMetadataFromSDK), - queryClient - }) - - return tracks.map(({ track_id }) => track_id) - }, - select: (data) => data.pages.flat(), - ...options, - enabled: options?.enabled !== false && !!currentUserId - }) -} diff --git a/packages/common/src/messages/explore.ts b/packages/common/src/messages/explore.ts index 76551450db9..3e0158613e7 100644 --- a/packages/common/src/messages/explore.ts +++ b/packages/common/src/messages/explore.ts @@ -7,7 +7,6 @@ export const exploreMessages = { fanClubs: 'Fan Clubs', featuredRemixContests: 'Featured Remix Contests', contests: 'Contests', - forYou: 'For You', recentlyListedForSale: 'Recently Listed for Sale', bestSelling: 'Best Selling', topAlbumsThisMonth: 'Top Albums This Month', diff --git a/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx b/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx index c91d1ec2011..8f5e78cea76 100644 --- a/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx +++ b/packages/mobile/src/screens/explore-screen/components/ExploreContent.tsx @@ -11,7 +11,6 @@ import { BestSellingAlbums } from './BestSellingAlbums' import { FeaturedPlaylists } from './FeaturedPlaylists' import { FeaturedRemixContests } from './FeaturedRemixContests' import { FeelingLucky } from './FeelingLucky' -import { ForYouTracks } from './ForYouTracks' import { LabelSpotlight } from './LabelSpotlight' import { NewAlbumReleases } from './NewAlbumReleases' import { RecentlyPlayedTracks } from './RecentlyPlayed' @@ -31,7 +30,6 @@ export const ExploreContent = () => { return ( - {showTrackContent && showUserContextualContent && } {showPlaylistContent && } {showTrackContent && } {showAlbumContent && } diff --git a/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx b/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx deleted file mode 100644 index 347ac115070..00000000000 --- a/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import React from 'react' - -import { useRecommendedTracks } from '@audius/common/api' -import { exploreMessages as messages } from '@audius/common/messages' -import { QueueSource } from '@audius/common/store' -import { GetRecommendedTracksTimeEnum } from '@audius/sdk' - -import { useExploreSectionTracking } from '../hooks/useExploreSectionTracking' - -import { ExploreSection } from './ExploreSection' -import { TrackTileCarousel } from './TrackTileCarousel' - -export const ForYouTracks = () => { - const { inView, InViewWrapper } = - useExploreSectionTracking('Recommended Tracks') - const { data: recommendedTracks, isPending } = useRecommendedTracks( - { pageSize: 10, timeRange: GetRecommendedTracksTimeEnum.Week }, - { enabled: inView } - ) - - return ( - - - - - - ) -} diff --git a/packages/web/src/components/queue-popover/getQuerySourceLabel.ts b/packages/web/src/components/queue-popover/getQuerySourceLabel.ts index ddad977ea1b..c71c708814b 100644 --- a/packages/web/src/components/queue-popover/getQuerySourceLabel.ts +++ b/packages/web/src/components/queue-popover/getQuerySourceLabel.ts @@ -25,7 +25,6 @@ const LABELS: Record = { tracksByAlbum: 'Album', trackPageLineup: 'More tracks', remixes: 'Remixes', - recommendedTracks: 'Recommended', search: 'Search results' } diff --git a/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx b/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx deleted file mode 100644 index 3733b29586d..00000000000 --- a/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { useRecommendedTracks } from '@audius/common/api' -import { exploreMessages as messages } from '@audius/common/messages' -import { GetRecommendedTracksTimeEnum } from '@audius/sdk' - -import { Carousel } from './Carousel' -import { TilePairs, TileSkeletons } from './TileHelpers' -import { useExploreSectionTracking } from './useExploreSectionTracking' - -export const RecommendedTracksSection = () => { - const { ref, inView } = useExploreSectionTracking('Recommended Tracks') - const { data, isLoading, isError, isSuccess } = useRecommendedTracks( - { - pageSize: 10, - timeRange: GetRecommendedTracksTimeEnum.Week - }, - { - enabled: inView - } - ) - - if (isError || (isSuccess && !data?.length)) { - return null - } - - return ( - - {!inView || isLoading || !data ? ( - - ) : ( - - )} - - ) -} diff --git a/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx b/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx index c210f6ecc20..c1c8c280892 100644 --- a/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx +++ b/packages/web/src/pages/search-explore-page/components/desktop/SearchExplorePage.tsx @@ -50,7 +50,6 @@ import { NewAlbumReleasesSection } from './NewAlbumReleasesSection' import { QuickSearchGrid } from './QuickSearchGrid' import { RecentSearchesSection } from './RecentSearchesSection' import { RecentlyPlayedSection } from './RecentlyPlayedSection' -import { RecommendedTracksSection } from './RecommendedTracksSection' import { TopAlbumsThisMonthSection } from './TopAlbumsThisMonthSection' import { TrendingGenresSection } from './TrendingGenresSection' import { UndergroundTrendingTracksSection } from './UndergroundTrendingTracksSection' @@ -177,11 +176,6 @@ const SearchExplorePage = ({ shouldRender: boolean element: ReactNode }[] = [ - { - key: 'recommendedTracks', - shouldRender: showTrackContent && showUserContextualContent, - element: - }, { key: 'featuredPlaylists', shouldRender: showPlaylistContent, diff --git a/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx b/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx index 168b0b36fdc..2554f68179f 100644 --- a/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx +++ b/packages/web/src/pages/search-explore-page/components/mobile/SearchExplorePage.tsx @@ -46,7 +46,6 @@ import { NewAlbumReleasesSection } from '../desktop/NewAlbumReleasesSection' import { QuickSearchGrid } from '../desktop/QuickSearchGrid' import { RecentSearchesSection } from '../desktop/RecentSearchesSection' import { RecentlyPlayedSection } from '../desktop/RecentlyPlayedSection' -import { RecommendedTracksSection } from '../desktop/RecommendedTracksSection' import { TopAlbumsThisMonthSection } from '../desktop/TopAlbumsThisMonthSection' import { UndergroundTrendingTracksSection } from '../desktop/UndergroundTrendingTracksSection' @@ -228,9 +227,6 @@ const SearchExplorePage = ({ display: inputValue || showSearchResults ? 'none' : undefined }} > - {showTrackContent && showUserContextualContent ? ( - - ) : null} {isTracksTab ? : null} {showTrackContent && showUserContextualContent ? (