Skip to content

Commit aae9c9b

Browse files
DejayJDDejayJD
authored
Reorganize query hooks (#11799)
1 parent 4964258 commit aae9c9b

File tree

125 files changed

+529
-452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+529
-452
lines changed

‎packages/common/src/api/index.ts‎

Lines changed: 107 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
// Audius query
2+
// TODO: migrate all of these to tan-query
13
export * from './account'
24
export * from './authorizedApps'
35
export * from './collection'
@@ -10,82 +12,113 @@ export * from './topArtists'
1012
export * from './track'
1113
export * from './trending'
1214
export * from './user'
13-
export * from './tan-query/comments'
14-
export * from './tan-query/events'
15+
16+
// TanStack Query Hooks
1517
export * from './tan-query/queryKeys'
16-
export * from './tan-query/useConnectedWallets'
17-
export * from './tan-query/useAudioBalance'
18-
export * from './tan-query/useCurrentUserId'
19-
export * from './tan-query/useDownloadTrackStems'
20-
export * from './tan-query/useTrackHistory'
21-
export * from './tan-query/useFeaturedPlaylists'
22-
export * from './tan-query/useFeaturedProfiles'
23-
export * from './tan-query/useSupportedUsers'
24-
export * from './tan-query/useSupporters'
25-
export * from './tan-query/useSupporter'
26-
export * from './tan-query/useHandleInUse'
27-
export * from './tan-query/useHandleReservedStatus'
28-
export * from './tan-query/useLibraryTracks'
29-
export * from './tan-query/usePurchases'
30-
export * from './tan-query/usePurchasesCount'
31-
export * from './tan-query/useRelatedArtists'
32-
export * from './tan-query/useSuggestedArtists'
33-
export * from './tan-query/useMutualFollowers'
34-
export * from './tan-query/useTopTags'
35-
export * from './tan-query/useTrack'
36-
export * from './tan-query/useTracks'
37-
export * from './tan-query/useTrackByPermalink'
38-
export * from './tan-query/useTrackByParams'
39-
export * from './tan-query/useUser'
40-
export * from './tan-query/useUsers'
41-
export * from './tan-query/useUserByHandle'
42-
export * from './tan-query/useUserCollectibles'
43-
export * from './tan-query/useUserPlaylists'
44-
export * from './tan-query/useUserAlbums'
45-
export * from './tan-query/useSearchAutocomplete'
46-
export * from './tan-query/useNotificationUnreadCount'
47-
export * from './tan-query/useNotifications'
48-
export * from './tan-query/useNotificationValidTypes'
49-
export * from './tan-query/useMarkNotificationsAsViewed'
50-
export * from './tan-query/useWalletCollectibles'
51-
export * from './tan-query/useUserByParams'
52-
export * from './tan-query/useCollection'
53-
export * from './tan-query/useCollectionByPermalink'
54-
export * from './tan-query/useFavoriteTrack'
55-
export * from './tan-query/useUnfavoriteTrack'
56-
export * from './tan-query/useToggleFavoriteTrack'
57-
export * from './tan-query/useDeleteTrack'
5818
export * from './tan-query/types'
59-
export * from './tan-query/useSearchResults'
60-
export * from './tan-query/useFollowers'
61-
export * from './tan-query/useCollectionFavorites'
62-
export * from './tan-query/useCollectionReposts'
63-
export * from './tan-query/useTrackFavorites'
64-
export * from './tan-query/useTrackReposts'
65-
export * from './tan-query/useFollowing'
66-
export * from './tan-query/useRemixers'
67-
export * from './tan-query/useRemixersCount'
68-
export * from './tan-query/usePurchasers'
69-
export * from './tan-query/usePurchasersCount'
70-
export * from './tan-query/useProfileReposts'
71-
export * from './tan-query/useProfileTracks'
72-
export * from './tan-query/useMutedUsers'
73-
export * from './tan-query/useTopArtistsInGenre'
74-
export * from './tan-query/useTopArtists'
75-
export * from './tan-query/useAudioTransactions'
76-
export * from './tan-query/useAudioTransactionsCount'
77-
export * from './tan-query/useFeed'
78-
export * from './tan-query/useTrending'
79-
export * from './tan-query/useRemixes'
80-
export * from './tan-query/useTrackRank'
81-
export * from './tan-query/useWalletOwner'
82-
export * from './tan-query/useTokenPrice'
83-
export * from './tan-query/useUSDCBalance'
8419

85-
export * from './tan-query/useStems'
86-
export * from './tan-query/useFileSizes'
87-
export * from './tan-query/useTrackFileInfo'
20+
// Comments
21+
export * from './tan-query/comments'
22+
23+
// Collection
24+
export * from './tan-query/collection/useCollection'
25+
export * from './tan-query/collection/useCollectionByPermalink'
26+
export * from './tan-query/collection/useCollectionFavorites'
27+
export * from './tan-query/collection/useCollectionReposts'
28+
export * from './tan-query/collection/useCollectionTracksWithUid'
29+
export * from './tan-query/collection/useFeaturedPlaylists'
30+
31+
// Events
32+
export * from './tan-query/events'
33+
34+
// Lineups
35+
export * from './tan-query/lineups/useFeed'
36+
export * from './tan-query/lineups/useLibraryTracks'
37+
export * from './tan-query/lineups/useProfileReposts'
38+
export * from './tan-query/lineups/useProfileTracks'
39+
export * from './tan-query/lineups/useTrending'
40+
export * from './tan-query/lineups/useTrackPageLineup'
41+
42+
// Notifications
43+
export * from './tan-query/notifications/useMarkNotificationsAsViewed'
44+
export * from './tan-query/notifications/useNotifications'
45+
export * from './tan-query/notifications/useNotificationUnreadCount'
46+
export * from './tan-query/notifications/useNotificationValidTypes'
47+
48+
// Purchases
49+
export * from './tan-query/purchases/useAudioTransactions'
50+
export * from './tan-query/purchases/useAudioTransactionsCount'
51+
export * from './tan-query/purchases/usePurchases'
52+
export * from './tan-query/purchases/usePurchasesCount'
53+
export * from './tan-query/purchases/usePurchasers'
54+
export * from './tan-query/purchases/usePurchasersCount'
55+
56+
// Remixes
57+
export * from './tan-query/remixes/useRemixes'
58+
export * from './tan-query/remixes/useRemixers'
59+
export * from './tan-query/remixes/useRemixersCount'
60+
61+
// Search
62+
export * from './tan-query/search/useSearchAutocomplete'
63+
export * from './tan-query/search/useSearchResults'
64+
export * from './tan-query/search/useTopTags'
65+
66+
// Tracks
67+
export * from './tan-query/tracks/useDeleteTrack'
68+
export * from './tan-query/tracks/useDownloadTrackStems'
69+
export * from './tan-query/tracks/useFavoriteTrack'
70+
export * from './tan-query/tracks/useToggleFavoriteTrack'
71+
export * from './tan-query/tracks/useTrack'
72+
export * from './tan-query/tracks/useTrackByParams'
73+
export * from './tan-query/tracks/useTrackByPermalink'
74+
export * from './tan-query/tracks/useTrackFavorites'
75+
export * from './tan-query/tracks/useTrackHistory'
76+
export * from './tan-query/tracks/useTrackReposts'
77+
export * from './tan-query/tracks/useTracks'
78+
export * from './tan-query/tracks/useUnfavoriteTrack'
79+
export * from './tan-query/tracks/useTrackRank'
80+
export * from './tan-query/tracks/useStems'
81+
export * from './tan-query/tracks/useFileSizes'
82+
export * from './tan-query/tracks/useTrackFileInfo'
83+
export * from './tan-query/tracks/useUpdateTrack'
84+
85+
// Users
86+
export * from './tan-query/users/account/useCurrentUserId'
87+
export * from './tan-query/users/account/useCurrentUser'
88+
export * from './tan-query/users/account/useAddToPlaylistFolder'
89+
export * from './tan-query/users/account/useCurrentAccount'
90+
export * from './tan-query/users/account/usePlaylistLibrary'
91+
export * from './tan-query/users/account/useReorderLibrary'
92+
export * from './tan-query/users/account/useUpdatePlaylistLibrary'
93+
export * from './tan-query/users/useFeaturedProfiles'
94+
export * from './tan-query/users/useFollowers'
95+
export * from './tan-query/users/useFollowing'
96+
export * from './tan-query/users/useHandleInUse'
97+
export * from './tan-query/users/useHandleReservedStatus'
98+
export * from './tan-query/users/useMutualFollowers'
99+
export * from './tan-query/users/useMutedUsers'
100+
export * from './tan-query/users/useRelatedArtists'
101+
export * from './tan-query/users/useSuggestedArtists'
102+
export * from './tan-query/users/useSupporter'
103+
export * from './tan-query/users/useSupporters'
104+
export * from './tan-query/users/useSupportedUsers'
105+
export * from './tan-query/users/useTopArtists'
106+
export * from './tan-query/users/useTopArtistsInGenre'
107+
export * from './tan-query/users/useUser'
108+
export * from './tan-query/users/useUserAlbums'
109+
export * from './tan-query/users/useUserByHandle'
110+
export * from './tan-query/users/useUserByParams'
111+
export * from './tan-query/users/useUserCollectibles'
112+
export * from './tan-query/users/useUserPlaylists'
113+
export * from './tan-query/users/useUsers'
114+
115+
// Wallet logic
116+
export * from './tan-query/wallets/useAudioBalance'
117+
export * from './tan-query/wallets/useConnectedWallets'
118+
export * from './tan-query/wallets/useTokenPrice'
119+
export * from './tan-query/wallets/useWalletCollectibles'
120+
export * from './tan-query/wallets/useWalletOwner'
121+
export * from './tan-query/wallets/useUSDCBalance'
122+
88123
// Saga fetch utils, remove when migration is complete
89124
export * from './tan-query/saga-utils'
90-
export * from './tan-query/useCollectionTracksWithUid'
91-
export * from './tan-query/useTrackPageLineup'

‎packages/common/src/api/tan-query/developerApps.ts‎ renamed to ‎packages/common/src/api/tan-query/authorized-apps/developerApps.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { useAudiusQueryContext } from '~/audius-query'
77
import { ID } from '~/models/Identifiers'
88
import { Nullable } from '~/utils/typeUtils'
99

10-
import { QUERY_KEYS } from './queryKeys'
11-
import { QueryKey, SelectableQueryOptions } from './types'
12-
import { useCurrentUserId } from './useCurrentUserId'
10+
import { QUERY_KEYS } from '../queryKeys'
11+
import { QueryKey, SelectableQueryOptions } from '../types'
12+
import { useCurrentUserId } from '../users/account/useCurrentUserId'
1313

1414
export const DEVELOPER_APP_DESCRIPTION_MAX_LENGTH = 128
1515
export const DEVELOPER_APP_NAME_MAX_LENGTH = 50

‎packages/common/src/api/tan-query/useAuthorizedApps.ts‎ renamed to ‎packages/common/src/api/tan-query/authorized-apps/useAuthorizedApps.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import { useAudiusQueryContext } from '~/audius-query'
55
import { ID } from '~/models'
66
import { Nullable } from '~/utils/typeUtils'
77

8-
import { QUERY_KEYS } from './queryKeys'
9-
import { QueryKey, SelectableQueryOptions } from './types'
10-
import { useCurrentUserId } from './useCurrentUserId'
8+
import { QUERY_KEYS } from '../queryKeys'
9+
import { QueryKey, SelectableQueryOptions } from '../types'
10+
import { useCurrentUserId } from '../users/account/useCurrentUserId'
1111

1212
export const getAuthorizedAppsQueryKey = (userId: Nullable<ID>) => {
1313
return [QUERY_KEYS.authorizedApps, userId] as unknown as QueryKey<

‎packages/common/src/api/tan-query/useRemoveAuthorizedApp.ts‎ renamed to ‎packages/common/src/api/tan-query/authorized-apps/useRemoveAuthorizedApp.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import { cloneDeep } from 'lodash'
55
import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext'
66
import { ID } from '~/models'
77

8+
import { QUERY_KEYS } from '../queryKeys'
9+
import { QueryKey } from '../types'
10+
811
import { DeveloperApp } from './developerApps'
9-
import { QUERY_KEYS } from './queryKeys'
10-
import { QueryKey } from './types'
1112

1213
export type UseRemoveAuthorizedAppArgs = {
1314
apiKey: string

‎packages/common/src/api/tan-query/useCollection.ts‎ renamed to ‎packages/common/src/api/tan-query/collection/useCollection.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import { useDispatch } from 'react-redux'
66
import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext'
77
import { ID } from '~/models'
88

9-
import { getCollectionsBatcher } from './batchers/getCollectionsBatcher'
10-
import { TQCollection } from './models'
11-
import { QUERY_KEYS } from './queryKeys'
12-
import { QueryKey, SelectableQueryOptions } from './types'
13-
import { useCurrentUserId } from './useCurrentUserId'
9+
import { getCollectionsBatcher } from '../batchers/getCollectionsBatcher'
10+
import { TQCollection } from '../models'
11+
import { QUERY_KEYS } from '../queryKeys'
12+
import { QueryKey, SelectableQueryOptions } from '../types'
13+
import { useCurrentUserId } from '../users/account/useCurrentUserId'
1414

1515
export const getCollectionQueryKey = (collectionId: ID | null | undefined) => {
1616
return [

‎packages/common/src/api/tan-query/useCollectionByParams.ts‎ renamed to ‎packages/common/src/api/tan-query/collection/useCollectionByParams.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import {
99
CollectionsPageType
1010
} from '~/store/pages'
1111

12-
import { TQCollection } from './models'
13-
import { SelectableQueryOptions } from './types'
12+
import { TQCollection } from '../models'
13+
import { SelectableQueryOptions } from '../types'
14+
1415
import { useCollection } from './useCollection'
1516
import { useCollectionByPermalink } from './useCollectionByPermalink'
1617

‎packages/common/src/api/tan-query/useCollectionByPermalink.ts‎ renamed to ‎packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ import { userCollectionMetadataFromSDK } from '~/adapters/collection'
77
import { useAudiusQueryContext } from '~/audius-query'
88
import { ID } from '~/models/Identifiers'
99

10-
import { TQCollection } from './models'
11-
import { QUERY_KEYS } from './queryKeys'
12-
import { QueryKey, QueryOptions, SelectableQueryOptions } from './types'
10+
import { TQCollection } from '../models'
11+
import { QUERY_KEYS } from '../queryKeys'
12+
import { QueryKey, QueryOptions, SelectableQueryOptions } from '../types'
13+
import { useCurrentUserId } from '../users/account/useCurrentUserId'
14+
import { primeCollectionData } from '../utils/primeCollectionData'
15+
1316
import { useCollection } from './useCollection'
14-
import { useCurrentUserId } from './useCurrentUserId'
15-
import { primeCollectionData } from './utils/primeCollectionData'
1617

1718
const STALE_TIME = Infinity
1819

‎packages/common/src/api/tan-query/useCollectionFavorites.ts‎ renamed to ‎packages/common/src/api/tan-query/collection/useCollectionFavorites.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import { userMetadataListFromSDK } from '~/adapters/user'
1010
import { useAudiusQueryContext } from '~/audius-query'
1111
import { ID } from '~/models/Identifiers'
1212

13-
import { QUERY_KEYS } from './queryKeys'
14-
import { QueryKey, QueryOptions } from './types'
15-
import { useCurrentUserId } from './useCurrentUserId'
16-
import { primeUserData } from './utils/primeUserData'
13+
import { QUERY_KEYS } from '../queryKeys'
14+
import { QueryKey, QueryOptions } from '../types'
15+
import { useCurrentUserId } from '../users/account/useCurrentUserId'
16+
import { primeUserData } from '../utils/primeUserData'
1717

1818
const DEFAULT_PAGE_SIZE = 20
1919

‎packages/common/src/api/tan-query/useCollectionReposts.ts‎ renamed to ‎packages/common/src/api/tan-query/collection/useCollectionReposts.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import { userMetadataListFromSDK } from '~/adapters/user'
1010
import { useAudiusQueryContext } from '~/audius-query'
1111
import { ID } from '~/models/Identifiers'
1212

13-
import { QUERY_KEYS } from './queryKeys'
14-
import { QueryKey, QueryOptions } from './types'
15-
import { useCurrentUserId } from './useCurrentUserId'
16-
import { primeUserData } from './utils/primeUserData'
13+
import { QUERY_KEYS } from '../queryKeys'
14+
import { QueryKey, QueryOptions } from '../types'
15+
import { useCurrentUserId } from '../users/account/useCurrentUserId'
16+
import { primeUserData } from '../utils/primeUserData'
1717

1818
const DEFAULT_PAGE_SIZE = 20
1919

‎packages/common/src/api/tan-query/useCollectionTracksWithUid.ts‎ renamed to ‎packages/common/src/api/tan-query/collection/useCollectionTracksWithUid.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { useMemo } from 'react'
33
import { TrackMetadata, UID } from '~/models'
44
import { Uid } from '~/utils'
55

6-
import { TQCollection } from './models'
7-
import { useTracks } from './useTracks'
6+
import { TQCollection } from '../models'
7+
import { useTracks } from '../tracks/useTracks'
88

99
export type CollectionTrackWithUid = TrackMetadata & {
1010
uid: UID

0 commit comments

Comments
 (0)