Merge remote-tracking branch 'origin/main' into gated-content-updates

* origin/main: (26 commits)
  [C-1608 C-2750] Fix edit profile/cover photo (#3735)
  [C-2711] Remove app-store link in force-upgrade for saga (#3737)
  Pin lerna version (#3738)
  Update announcement notification style and hover behavior retry (#3736)
  [CON-765] Default v2 signup and fix local EM (#3730)
  Update announcement notification style and hover behavior (#3733)
  Update announcement notification style and hover behavior (#3733)
  [C-2844] Ensure all tracks fetched on collection page (#3734)
  Add dev storage bootstrap nodes (#3731)
  [QA-565] Fix notification overflow bug (#3732)
  [C-2547] Lineup pagination fixes (#3728)
  [C-2679] Track Availability Modal Form (#3720)
  [C-2785] Update collection screen focus effect to fetch lineup (#3722)
  Make embed not fetch metadata from CN (#3710)
  [C-2809] Remove user from image hooks (#3723)
  [C-2834] Remove replica set usage in web (#3721)
  [C-2829] Finalize SuggestedTracks (#3706)
  [PAY-1569] Update blog post link (#3719)
  Call the DN selection callback in AudiusBackend if using a cached DN (#3718)
  DMs: Add space to learn more text (#3714)
  ...

packages/common/package.json

@@ -28,7 +28,7 @@
     "url": "https://github.com/AudiusProject/audius-client/issues"
   },
   "dependencies": {
-    "@audius/sdk": "3.0.3-beta.63",
+    "@audius/sdk": "3.0.3-beta.76",
     "@fingerprintjs/fingerprintjs-pro": "3.5.6",
     "@metaplex-foundation/mpl-token-metadata": "2.5.2",
     "@optimizely/optimizely-sdk": "4.0.0",

packages/common/src/api/index.ts

@@ -4,3 +4,4 @@ export * from './collection'
 export * from './user'
 export * from './developerApps'
 export * from './suggestedTracks'
+export * from './trending'

packages/common/src/api/reducer.ts

@@ -5,6 +5,7 @@ import { developerAppsApiReducer } from './developerApps'
 import { favoritesApiReducer } from './favorites'
 import { relatedArtistsApiReducer } from './relatedArtists'
 import { trackApiReducer } from './track'
+import { trendingApiReducer } from './trending'
 import { userApiReducer } from './user'
 
 export default combineReducers({
@@ -13,5 +14,6 @@ export default combineReducers({
   trackApi: trackApiReducer,
   userApi: userApiReducer,
   developerAppsApi: developerAppsApiReducer,
-  favoritesApi: favoritesApiReducer
+  favoritesApi: favoritesApiReducer,
+  trendingApi: trendingApiReducer
 })

packages/common/src/api/suggestedTracks.ts

@@ -1,31 +1,132 @@
-import { useMemo } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 
-import { sampleSize } from 'lodash'
-import { useSelector } from 'react-redux'
+import { difference, 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 { getCollection } from 'store/cache/collections/selectors'
+import { getTrack } from 'store/cache/tracks/selectors'
+import { CommonState } from 'store/index'
 
 import { useGetFavoritedTrackList } from './favorites'
 import { useGetTracksByIds } from './track'
+import { useGetTrending } from './trending'
 
-export const useGetSuggestedTracks = () => {
+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 }
+  })
+}
+
+const selectCollectionTrackIds = (state: CommonState, collectionId: ID) => {
+  const collection = getCollection(state, { id: collectionId })
+  if (!collection) return []
+  return collection?.playlist_contents.track_ids.map((trackId) => trackId.track)
+}
+
+export const useGetSuggestedTracks = (collectionId: ID) => {
   const currentUserId = useSelector(getUserId)
-  const { data: favoritedTracks } = useGetFavoritedTrackList(
-    { currentUserId },
-    { disabled: !currentUserId }
+  const dispatch = useDispatch()
+  const [suggestedTrackIds, setSuggestedTrackIds] = useState<ID[]>([])
+
+  const collectionTrackIds = useSelector((state: CommonState) =>
+    selectCollectionTrackIds(state, collectionId)
   )
 
-  const favoritedTracksSample = useMemo(() => {
-    return sampleSize(favoritedTracks, 5)
+  const { data: favoritedTracks, status: favoritedStatus } =
+    useGetFavoritedTrackList({ currentUserId }, { disabled: !currentUserId })
+
+  useEffect(() => {
+    if (favoritedTracks) {
+      const suggestedTrackIds = difference(
+        shuffle(favoritedTracks).map((track) => track.save_item_id),
+        collectionTrackIds
+      )
+      setSuggestedTrackIds(suggestedTrackIds)
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [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) {
+      const trendingTrackIds = difference(
+        trendingTracks.map((track) => track.track_id),
+        collectionTrackIds
+      )
+      setSuggestedTrackIds([...suggestedTrackIds, ...trendingTrackIds])
+    }
+    // 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
+  }
 }

packages/common/src/api/trending.ts

@@ -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

packages/common/src/audius-query/hooks/usePaginatedQuery.ts

@@ -1,27 +1,42 @@
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 
 import { isEqual } from 'lodash'
 import { useCustomCompareEffect } from 'react-use'
 
 import { Status } from 'models/Status'
 
-import { QueryHookResults } from '../types'
+import { QueryHookOptions, QueryHookResults } from '../types'
 
 export const usePaginatedQuery = <
-  Data extends [],
-  ArgsType extends { limit: number; offset: number },
-  HookType extends (args: ArgsType) => QueryHookResults<Data>
+  Data,
+  ArgsType extends { limit: number; offset: number }
 >(
-  useQueryHook: HookType,
-  baseArgs: Exclude<ArgsType, 'limit' | 'offset'>,
-  pageSize: number
+  useQueryHook: (
+    args: ArgsType,
+    options?: QueryHookOptions
+  ) => QueryHookResults<Data[]>,
+  baseArgs: Omit<ArgsType, 'limit' | 'offset'>,
+  options: { pageSize: number } & QueryHookOptions
 ) => {
+  const { pageSize, ...queryHookOptions } = options
+  const { disabled } = queryHookOptions
   const [page, setPage] = useState(0)
-  const args = { ...baseArgs, limit: pageSize, offset: page * pageSize }
-  const result = useQueryHook(args)
+  const args = {
+    ...baseArgs,
+    limit: pageSize,
+    offset: page * pageSize
+  } as ArgsType
+  const result = useQueryHook(args, queryHookOptions)
+
+  const loadMore = useCallback(() => {
+    if (!disabled) {
+      setPage(page + 1)
+    }
+  }, [disabled, page])
+
   return {
     ...result,
-    loadMore: () => setPage(page + 1),
+    loadMore,
     hasMore:
       result.status === Status.IDLE ||
       (!result.data && result.status === Status.LOADING) ||
@@ -31,21 +46,24 @@ export const usePaginatedQuery = <
 
 export const useAllPaginatedQuery = <
   Data,
-  ArgsType extends { limit: number; offset: number },
-  HookType extends (args: ArgsType) => QueryHookResults<Data[]>
+  ArgsType extends { limit: number; offset: number }
 >(
-  useQueryHook: HookType,
+  useQueryHook: (
+    args: ArgsType,
+    options?: QueryHookOptions
+  ) => QueryHookResults<Data[]>,
   baseArgs: Omit<ArgsType, 'limit' | 'offset'>,
-  pageSize: number
+  options: { pageSize: number } & QueryHookOptions
 ) => {
+  const { pageSize, ...queryHookOptions } = options
   const [page, setPage] = useState(0)
   const [allData, setAllData] = useState<Data[]>([])
   const args = {
     ...baseArgs,
     limit: pageSize,
     offset: page * pageSize
   } as ArgsType
-  const result = useQueryHook(args)
+  const result = useQueryHook(args, queryHookOptions)
   useEffect(() => {
     if (result.status !== Status.SUCCESS) return
     setAllData((allData) => [...allData, ...result.data])

packages/common/src/models/Lineup.ts

@@ -38,7 +38,6 @@ export type LineupState<T> = {
   page: number
   isMetadataLoading: boolean
   dedupe?: boolean
-  containsDeleted: boolean
   maxEntries: Nullable<number>
   entryIds?: Nullable<Set<UID>>
 }