From 4dbcbc0c68fb0f8a5d44f586c766a99d01dfd663 Mon Sep 17 00:00:00 2001 From: JD Francis Date: Thu, 8 May 2025 17:38:51 -0500 Subject: [PATCH 1/7] Refactor withdrawals tab logic and remove user aq files --- packages/common/src/api/index.ts | 4 - packages/common/src/api/reducer.ts | 7 - packages/common/src/api/user.ts | 115 ----------- packages/common/src/store/reducers.ts | 3 - .../components/WithdrawalsTab.tsx | 188 ++++++++---------- 5 files changed, 87 insertions(+), 230 deletions(-) delete mode 100644 packages/common/src/api/reducer.ts delete mode 100644 packages/common/src/api/user.ts diff --git a/packages/common/src/api/index.ts b/packages/common/src/api/index.ts index 01cd5f2d28d..07001bebfc3 100644 --- a/packages/common/src/api/index.ts +++ b/packages/common/src/api/index.ts @@ -1,7 +1,3 @@ -// Audius query -// TODO: migrate all of these to tan-query -export * from './user' - // TanStack Query Hooks export * from './tan-query/queryKeys' export * from './tan-query/types' diff --git a/packages/common/src/api/reducer.ts b/packages/common/src/api/reducer.ts deleted file mode 100644 index 2359635ec91..00000000000 --- a/packages/common/src/api/reducer.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { combineReducers } from 'redux' - -import { userApiReducer } from './user' - -export default combineReducers({ - userApi: userApiReducer -}) diff --git a/packages/common/src/api/user.ts b/packages/common/src/api/user.ts deleted file mode 100644 index 5a59a8b290f..00000000000 --- a/packages/common/src/api/user.ts +++ /dev/null @@ -1,115 +0,0 @@ -import { full, Id, OptionalId } from '@audius/sdk' - -import { userMetadataListFromSDK } from '~/adapters/user' -import { createApi } from '~/audius-query' -import { ID, Kind, StringUSDC } from '~/models' -import { - USDCTransactionDetails, - USDCTransactionMethod, - USDCTransactionType -} from '~/models/USDCTransactions' -import { Nullable } from '~/utils/typeUtils' - -type GetUSDCTransactionListArgs = { - userId: Nullable - offset: number - limit: number - sortMethod?: full.GetUSDCTransactionsSortMethodEnum - sortDirection?: full.GetUSDCTransactionsSortDirectionEnum - type?: full.GetUSDCTransactionsTypeEnum[] - method?: full.GetUSDCTransactionsMethodEnum -} - -/** - * Parser to reformat transactions as they come back from the API. - * @param transaction the transaction to parse - */ -const parseTransaction = ({ - transaction -}: { - transaction: full.TransactionDetails -}): USDCTransactionDetails => { - const { change, balance, transactionType, method, ...rest } = transaction - return { - ...rest, - transactionType: transactionType as USDCTransactionType, - method: method as USDCTransactionMethod, - change: change as StringUSDC, - balance: balance as StringUSDC - } -} - -const userApi = createApi({ - reducerPath: 'userApi', - endpoints: { - // TODO: Remove these once fetch export calls are removed - getUserByHandle: { - fetch: async ( - { - handle, - currentUserId - }: { handle: string; currentUserId: Nullable }, - { audiusSdk } - ) => { - const sdk = await audiusSdk() - const { data: users = [] } = await sdk.full.users.getUserByHandle({ - handle, - userId: OptionalId.parse(currentUserId) - }) - return userMetadataListFromSDK(users)[0] - }, - options: { - kind: Kind.USERS, - schemaKey: 'user' - } - }, - getUsersByIds: { - fetch: async ( - args: { ids: ID[]; currentUserId?: Nullable }, - { audiusSdk } - ) => { - const { ids, currentUserId } = args - const sdk = await audiusSdk() - const { data: users = [] } = await sdk.full.users.getBulkUsers({ - id: ids.map((id) => Id.parse(id)), - userId: OptionalId.parse(currentUserId) - }) - return userMetadataListFromSDK(users) - }, - options: { idListArgKey: 'ids', kind: Kind.USERS, schemaKey: 'users' } - }, - getUSDCTransactions: { - fetch: async ( - { - offset, - limit, - userId, - sortDirection, - sortMethod, - type, - method - }: GetUSDCTransactionListArgs, - context - ) => { - const sdk = await context.audiusSdk() - const { data = [] } = await sdk.full.users.getUSDCTransactions({ - limit, - offset, - sortDirection, - sortMethod, - id: Id.parse(userId!), - type, - method - }) - - return data.map((transaction) => parseTransaction({ transaction })) - }, - options: { retry: true } - } - } -}) - -export const userApiReducer = userApi.reducer -export const userApiFetch = userApi.fetch -export const userApiActions = userApi.actions -export const userApiUtils = userApi.util diff --git a/packages/common/src/store/reducers.ts b/packages/common/src/store/reducers.ts index 01cb3155cf3..c905a24153e 100644 --- a/packages/common/src/store/reducers.ts +++ b/packages/common/src/store/reducers.ts @@ -2,7 +2,6 @@ import { History } from 'history' import { combineReducers } from 'redux' import type { Storage } from 'redux-persist' -import apiReducer from '../api/reducer' import { Kind } from '../models' import account from './account/slice' @@ -131,8 +130,6 @@ import wallet from './wallet/slice' export const reducers = (storage: Storage, history?: History) => ({ account, - api: apiReducer, - // TODO: Move to common // signOn: signOnReducer, // backend, diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index 95b51349709..17cc787cb0f 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -2,12 +2,10 @@ import { useCallback, useEffect, useState } from 'react' import { useUSDCTransactions, - useUSDCTransactionsCount, - userApiFetch + useUSDCTransactionsCount } from '@audius/common/api' -import { useAudiusQueryContext } from '@audius/common/audius-query' import { useUSDCBalance } from '@audius/common/hooks' -import { BNUSDC, Name, USDCTransactionDetails } from '@audius/common/models' +import { BNUSDC, ID, Name, USDCTransactionDetails } from '@audius/common/models' import { WithdrawUSDCModalPages, accountSelectors, @@ -15,7 +13,7 @@ import { useWithdrawUSDCModal, withdrawUSDCSelectors } from '@audius/common/store' -import { formatUSDCWeiToFloorCentsNumber, wait } from '@audius/common/utils' +import { formatUSDCWeiToFloorCentsNumber } from '@audius/common/utils' import { Id, full } from '@audius/sdk' import BN from 'bn.js' import { useDispatch } from 'react-redux' @@ -99,72 +97,81 @@ const NoWithdrawals = () => { ) } -const useWithdrawalTransactionPoller = () => { - const audiusQueryContext = useAudiusQueryContext() +const useWithdrawalTransactionPoller = ( + userId: ID | null, + lastCompletedTransaction: string | undefined, + sortMethod: full.GetUSDCTransactionsSortMethodEnum, + sortDirection: full.GetUSDCTransactionsSortDirectionEnum +) => { const [isPolling, setIsPolling] = useState(false) - const beginPolling = useCallback( - async ({ - userId, - signature, - onSuccess - }: { - userId: number - signature: string - onSuccess: () => void - }) => { - setIsPolling(true) - - const pollForTransaction = async () => { - let timedOut = false - const timerId = setTimeout(() => { - timedOut = true - }, 60000) - - let foundTransaction = false - let aborted = false - while (!aborted && !foundTransaction) { - // We don't yet have a single transaction fetch API, so grab the latest 5 and check - // for the desired signature in the response. Since this utility is meant to be used - // for the most recently completed transaction, this is a relatively safe strategy - const transactions: USDCTransactionDetails[] = - await userApiFetch.getUSDCTransactions( - { - userId, - sortMethod: full.GetUSDCTransactionsSortMethodEnum.Date, - sortDirection: full.GetUSDCTransactionsSortDirectionEnum.Desc, - method: full.GetUSDCTransactionsMethodEnum.Send, - offset: 0, - limit: 5 - }, - audiusQueryContext - ) - if (transactions.some((t) => t.signature === signature)) { - foundTransaction = true - } else if (timedOut) { - aborted = true - } - await wait(1000) - } - if (timedOut) { - throw new Error('Timed Out') - } + // Use the existing useUSDCTransactions hook + const { + data: transactions, + isFetching: transactionsIsFetching, + isSuccess: transactionsIsSuccess, + isError: transactionsIsError, + loadNextPage, + reset + } = useUSDCTransactions({ + sortMethod, + sortDirection, + type: [ + full.GetUSDCTransactionsTypeEnum.Withdrawal, + full.GetUSDCTransactionsTypeEnum.Transfer + ], + method: full.GetUSDCTransactionsMethodEnum.Send + }) + + useEffect(() => { + if (!lastCompletedTransaction || !userId) return + + setIsPolling(true) + let timedOut = false + const timerId = setTimeout(() => { + timedOut = true + setIsPolling(false) + }, 60000) + + const pollInterval = setInterval(async () => { + // Check if transaction exists in current data + const found = transactions?.some( + (t) => t.signature === lastCompletedTransaction + ) + + if (found) { + clearInterval(pollInterval) clearTimeout(timerId) + setIsPolling(false) + return } - try { - await pollForTransaction() - onSuccess() - setIsPolling(false) - } catch (e) { - console.error(`Failed to poll for transaction: ${signature}: ${e}`) - setIsPolling(false) + // If we've timed out, stop polling + if (timedOut) { + clearInterval(pollInterval) + return } - }, - [audiusQueryContext] - ) - return { isPolling, beginPolling } + // Refetch transactions + await reset() + }, 1000) + + // Cleanup + return () => { + clearInterval(pollInterval) + clearTimeout(timerId) + setIsPolling(false) + } + }, [lastCompletedTransaction, userId, transactions, reset]) + + return { + isPolling, + transactions, + transactionsIsFetching: transactionsIsFetching || isPolling, + transactionsIsSuccess, + transactionsIsError, + loadNextPage + } } export const useWithdrawals = () => { @@ -174,35 +181,30 @@ export const useWithdrawals = () => { const lastCompletedTransaction = useSelector( withdrawUSDCSelectors.getLastCompletedTransactionSignature ) - const { isPolling, beginPolling } = useWithdrawalTransactionPoller() // Defaults: sort method = date, sort direction = desc const [sortMethod, setSortMethod] = useState(DEFAULT_SORT_METHOD) const [sortDirection, setSortDirection] = useState(DEFAULT_SORT_DIRECTION) - const { onOpen: openDetailsModal } = useUSDCTransactionDetailsModal() - const { - data: transactions, - isPending: transactionsIsPending, - isSuccess: transactionsIsSuccess, - isError: transactionsIsError, - loadNextPage, - reset - } = useUSDCTransactions({ + transactions, + transactionsIsFetching, + transactionsIsSuccess, + transactionsIsError, + loadNextPage + } = useWithdrawalTransactionPoller( + userId, + lastCompletedTransaction, sortMethod, - sortDirection, - type: [ - full.GetUSDCTransactionsTypeEnum.Withdrawal, - full.GetUSDCTransactionsTypeEnum.Transfer - ], - method: full.GetUSDCTransactionsMethodEnum.Send - }) + sortDirection + ) + const { onOpen: openDetailsModal } = useUSDCTransactionDetailsModal() + const { isError: countIsError, - data: count, - isPending: countIsPending + data: transactionsCount, + isPending: transactionsCountIsPending } = useUSDCTransactionsCount({ method: full.GetUSDCTransactionsMethodEnum.Send }) @@ -220,22 +222,6 @@ export const useWithdrawals = () => { } }, [transactionsIsError, countIsError, dispatch]) - // Polling for new transactions - useEffect(() => { - if (lastCompletedTransaction && userId) { - // Wait for new transaction and re-sort table to show newest first - beginPolling({ - userId, - signature: lastCompletedTransaction, - onSuccess: () => { - setSortMethod(full.GetUSDCTransactionsSortMethodEnum.Date) - setSortDirection(full.GetUSDCTransactionsSortDirectionEnum.Desc) - reset() - } - }) - } - }, [lastCompletedTransaction, userId, beginPolling, reset, dispatch]) - const onSort = useCallback( ( method: WithdrawalsTableSortMethod, @@ -255,7 +241,7 @@ export const useWithdrawals = () => { ) const isEmpty = transactionsIsSuccess && transactions?.length === 0 - const isLoading = transactionsIsPending || countIsPending || isPolling + const isLoading = transactionsIsFetching || transactionsCountIsPending const downloadCSV = useCallback(async () => { const sdk = await audiusSdk() @@ -271,7 +257,7 @@ export const useWithdrawals = () => { }, [userId]) return { - count, + count: transactionsCount, data: transactions, fetchMore: loadNextPage, onSort, From 4323cc2a3971db431ce67384f3a9be7c011f30b5 Mon Sep 17 00:00:00 2001 From: JD Francis Date: Thu, 8 May 2025 18:28:23 -0500 Subject: [PATCH 2/7] move query context & rename it --- packages/common/README.md | 2 - packages/common/package.json | 1 - packages/common/src/api/tan-query/README.md | 12 +- .../authorized-apps/useAuthorizedApps.ts | 4 +- .../authorized-apps/useRemoveAuthorizedApp.ts | 4 +- .../api/tan-query/collection/useCollection.ts | 4 +- .../collection/useCollectionByPermalink.ts | 4 +- .../collection/useCollectionFavorites.ts | 4 +- .../collection/useCollectionReposts.ts | 4 +- .../tan-query/collection/useCollections.ts | 4 +- .../tan-query/collection/useExploreContent.ts | 4 +- .../collection/useLibraryCollections.ts | 4 +- .../collection/useUpdateCollection.ts | 4 +- .../src/api/tan-query/comments/useComment.ts | 4 +- .../tan-query/comments/useCommentReplies.ts | 4 +- .../tan-query/comments/useDeleteComment.ts | 4 +- .../api/tan-query/comments/useEditComment.ts | 4 +- .../useGetTrackCommentNotificationSetting.ts | 4 +- .../src/api/tan-query/comments/useMuteUser.ts | 4 +- .../api/tan-query/comments/usePinComment.ts | 4 +- .../api/tan-query/comments/usePostComment.ts | 4 +- .../tan-query/comments/useReactToComment.ts | 4 +- .../tan-query/comments/useReportComment.ts | 4 +- .../comments/useTrackCommentCount.ts | 4 +- .../tan-query/comments/useTrackComments.ts | 4 +- .../useUpdateCommentNotificationSetting.ts | 4 +- ...seUpdateTrackCommentNotificationSetting.ts | 4 +- .../api/tan-query/comments/useUserComments.ts | 4 +- .../developer-apps/useAddDeveloperApp.ts | 4 +- .../developer-apps/useDeleteDeveloperApp.ts | 4 +- .../developer-apps/useDeveloperApps.ts | 4 +- .../developer-apps/useEditDeveloperApp.ts | 4 +- .../src/api/tan-query/events/useAllEvents.ts | 4 +- .../api/tan-query/events/useCreateEvent.ts | 4 +- .../api/tan-query/events/useDeleteEvent.ts | 4 +- .../src/api/tan-query/events/useEvent.ts | 4 +- .../src/api/tan-query/events/useEvents.ts | 4 +- .../tan-query/events/useEventsByEntityId.ts | 4 +- .../api/tan-query/events/useUpdateEvent.ts | 4 +- .../src/api/tan-query/lineups/useAiTracks.ts | 4 +- .../src/api/tan-query/lineups/useFeed.ts | 4 +- .../api/tan-query/lineups/useLibraryTracks.ts | 4 +- .../api/tan-query/lineups/useLineupQuery.ts | 4 +- .../api/tan-query/lineups/usePremiumTracks.ts | 4 +- .../tan-query/lineups/useProfileReposts.ts | 4 +- .../api/tan-query/lineups/useProfileTracks.ts | 4 +- .../tan-query/lineups/useTrackPageLineup.ts | 4 +- .../src/api/tan-query/lineups/useTrending.ts | 4 +- .../tan-query/lineups/useTrendingPlaylists.ts | 4 +- .../lineups/useTrendingUnderground.ts | 4 +- .../useMarkNotificationsAsViewed.ts | 4 +- .../useNotificationUnreadCount.ts | 4 +- .../notifications/useNotifications.ts | 4 +- .../purchases/useAudioTransactions.ts | 4 +- .../purchases/useAudioTransactionsCount.ts | 4 +- .../api/tan-query/purchases/usePurchasers.ts | 4 +- .../tan-query/purchases/usePurchasersCount.ts | 4 +- .../api/tan-query/purchases/usePurchases.ts | 4 +- .../tan-query/purchases/usePurchasesCount.ts | 4 +- .../src/api/tan-query/purchases/useSales.ts | 4 +- .../tan-query/purchases/useSalesAggregate.ts | 4 +- .../api/tan-query/purchases/useSalesCount.ts | 4 +- .../purchases/useUSDCTransactions.ts | 4 +- .../purchases/useUSDCTransactionsCount.ts | 4 +- .../src/api/tan-query/remixes/useRemixers.ts | 4 +- .../api/tan-query/remixes/useRemixersCount.ts | 4 +- .../src/api/tan-query/remixes/useRemixes.ts | 4 +- .../tan-query/search/useSearchAutocomplete.ts | 4 +- .../api/tan-query/search/useSearchResults.ts | 4 +- .../src/api/tan-query/search/useTopTags.ts | 4 +- .../api/tan-query/tracks/useDeleteTrack.ts | 4 +- .../tan-query/tracks/useDownloadTrackStems.ts | 8 +- .../api/tan-query/tracks/useFavoriteTrack.ts | 4 +- .../tan-query/tracks/useFavoritedTracks.ts | 4 +- .../src/api/tan-query/tracks/useFileSizes.ts | 4 +- .../api/tan-query/tracks/useRemixedTracks.ts | 4 +- .../src/api/tan-query/tracks/useStems.ts | 4 +- .../src/api/tan-query/tracks/useTrack.ts | 4 +- .../tan-query/tracks/useTrackByPermalink.ts | 4 +- .../api/tan-query/tracks/useTrackFavorites.ts | 4 +- .../api/tan-query/tracks/useTrackFileInfo.ts | 4 +- .../api/tan-query/tracks/useTrackHistory.ts | 4 +- .../src/api/tan-query/tracks/useTrackRank.ts | 4 +- .../api/tan-query/tracks/useTrackReposts.ts | 4 +- .../src/api/tan-query/tracks/useTracks.ts | 4 +- .../tan-query/tracks/useUnfavoriteTrack.ts | 4 +- .../api/tan-query/tracks/useUpdateTrack.ts | 4 +- .../users/account/useApproveManagedAccount.ts | 4 +- .../users/account/useCurrentAccount.ts | 4 +- .../users/account/useManagedAccounts.ts | 4 +- .../tan-query/users/account/useManagers.ts | 4 +- .../users/account/useRemoveManager.ts | 4 +- .../users/account/useRequestAddManager.ts | 4 +- .../users/account/useResetPassword.ts | 4 +- .../users/account/useUpdatePlaylistLibrary.ts | 4 +- .../tan-query/users/account/useWalletUser.ts | 4 +- .../src/api/tan-query/users/useEmailInUse.ts | 8 +- .../src/api/tan-query/users/useFollowUser.ts | 4 +- .../src/api/tan-query/users/useFollowers.ts | 4 +- .../src/api/tan-query/users/useFollowing.ts | 4 +- .../src/api/tan-query/users/useHandleInUse.ts | 8 +- .../users/useHandleReservedStatus.ts | 8 +- .../src/api/tan-query/users/useMutedUsers.ts | 4 +- .../api/tan-query/users/useMutualFollowers.ts | 4 +- .../api/tan-query/users/useRelatedArtists.ts | 4 +- .../tan-query/users/useSuggestedArtists.ts | 4 +- .../api/tan-query/users/useSupportedUsers.ts | 4 +- .../src/api/tan-query/users/useSupporter.ts | 6 +- .../src/api/tan-query/users/useSupporters.ts | 4 +- .../tan-query/users/useTopArtistsInGenre.ts | 4 +- .../api/tan-query/users/useUnfollowUser.ts | 4 +- .../api/tan-query/users/useUpdateProfile.ts | 4 +- .../src/api/tan-query/users/useUpdateUser.ts | 4 +- .../common/src/api/tan-query/users/useUser.ts | 4 +- .../src/api/tan-query/users/useUserAlbums.ts | 4 +- .../api/tan-query/users/useUserByHandle.ts | 4 +- .../tan-query/users/useUserCollectibles.ts | 6 +- .../api/tan-query/users/useUserPlaylists.ts | 4 +- .../tan-query/users/useUserTracksByHandle.ts | 4 +- .../src/api/tan-query/users/useUsers.ts | 4 +- .../tan-query/utils/QueryContext.ts} | 58 +- .../common/src/api/tan-query/utils/index.ts | 1 + .../src/api/tan-query/utils/primeTrackData.ts | 1 - .../api/tan-query/wallets/useAudioBalance.ts | 6 +- .../tan-query/wallets/useConnectedWallets.ts | 8 +- .../api/tan-query/wallets/useUSDCBalance.ts | 4 +- .../wallets/useWalletCollectibles.ts | 4 +- .../api/tan-query/wallets/useWalletOwner.ts | 4 +- packages/common/src/audius-query/README.md | 405 --------- .../src/audius-query/audius-query.test.ts | 123 --- packages/common/src/audius-query/createApi.ts | 834 ------------------ .../src/audius-query/createRequestBatcher.ts | 157 ---- packages/common/src/audius-query/errors.ts | 6 - .../common/src/audius-query/hooks/index.ts | 1 - .../audius-query/hooks/usePaginatedQuery.ts | 141 --- packages/common/src/audius-query/index.ts | 5 - packages/common/src/audius-query/schema.ts | 91 -- packages/common/src/audius-query/types.ts | 221 ----- packages/common/src/audius-query/utils.ts | 45 - .../src/hooks/chats/useSetInboxPermissions.ts | 4 +- .../usePurchaseContentFormConfiguration.ts | 4 +- .../src/hooks/purchaseContent/validation.ts | 4 +- .../hooks/useChangeEmailFormConfiguration.ts | 12 +- .../useChangePasswordFormConfiguration.ts | 4 +- .../common/src/hooks/useCoinflowAdapter.ts | 6 +- .../src/hooks/useCreateUserbankIfNeeded.ts | 4 +- packages/common/src/hooks/useUSDCBalance.ts | 4 +- .../sign-on/createLoginDetailsSchema.ts | 8 +- .../common/src/schemas/sign-on/emailSchema.ts | 4 +- .../src/schemas/sign-on/pickHandleSchema.ts | 10 +- .../src/schemas/sign-on/signInSchema.ts | 4 +- packages/mobile/babel.config.js | 2 +- .../mobile/src/app/AudiusQueryProvider.tsx | 8 +- .../useResetNotificationBadgeCount.ts | 4 +- .../components/SignUpFlowInstagramAuth.tsx | 4 +- .../components/SignUpFlowTikTokAuth.tsx | 4 +- .../components/SignUpFlowTwitterAuth.tsx | 4 +- .../screens/CreateEmailScreen.tsx | 4 +- .../screens/CreateLoginDetailsScreen.tsx | 12 +- .../screens/PickHandleScreen.tsx | 4 +- .../screens/ReviewHandleScreen.tsx | 4 +- .../sign-on-screen/screens/SignInScreen.tsx | 8 +- packages/protocol-dashboard/tsconfig.json | 1 - packages/web/src/app/AudiusQueryProvider.tsx | 6 +- .../store/cache/tracks/utils/reformat.ts | 1 - .../components/CoinbaseBuyAudioButton.tsx | 4 +- .../components/StripeBuyAudioButton.tsx | 4 +- .../web/src/pages/audio-page/WalletModal.tsx | 4 +- .../AdvancedWalletDetails.tsx | 4 +- .../components/desktop/SettingsPage.tsx | 4 +- .../components/mobile/AccountSettingsPage.tsx | 4 +- .../web/src/pages/sign-in-page/SignInPage.tsx | 8 +- .../sign-up-page/hooks/socialMediaLogin.ts | 8 +- .../sign-up-page/pages/CreateEmailPage.tsx | 8 +- .../pages/CreateLoginDetailsPage.tsx | 12 +- .../sign-up-page/pages/PickHandlePage.tsx | 4 +- .../sign-up-page/pages/ReviewHandlePage.tsx | 4 +- .../sign-up-page/utils/loginDetailsSchema.ts | 6 +- packages/web/src/test/test-utils.tsx | 12 +- packages/web/tsconfig.json | 1 - 180 files changed, 397 insertions(+), 2442 deletions(-) rename packages/common/src/{audius-query/AudiusQueryContext.ts => api/tan-query/utils/QueryContext.ts} (55%) delete mode 100644 packages/common/src/audius-query/README.md delete mode 100644 packages/common/src/audius-query/audius-query.test.ts delete mode 100644 packages/common/src/audius-query/createApi.ts delete mode 100644 packages/common/src/audius-query/createRequestBatcher.ts delete mode 100644 packages/common/src/audius-query/errors.ts delete mode 100644 packages/common/src/audius-query/hooks/index.ts delete mode 100644 packages/common/src/audius-query/hooks/usePaginatedQuery.ts delete mode 100644 packages/common/src/audius-query/index.ts delete mode 100644 packages/common/src/audius-query/schema.ts delete mode 100644 packages/common/src/audius-query/types.ts delete mode 100644 packages/common/src/audius-query/utils.ts diff --git a/packages/common/README.md b/packages/common/README.md index 35bef2cc7f8..e221215de8a 100644 --- a/packages/common/README.md +++ b/packages/common/README.md @@ -4,8 +4,6 @@ ## Links -[audius-query docs](./src/audius-query/README.md) - ## Usage ``` diff --git a/packages/common/package.json b/packages/common/package.json index 8d73923aa78..b0314d028b7 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -10,7 +10,6 @@ "./adapters": "./src/adapters/index.ts", "./api": "./src/api/index.ts", "./assets": "./src/assets/index.ts", - "./audius-query": "./src/audius-query/index.ts", "./context": "./src/context/index.ts", "./hooks": "./src/hooks/index.ts", "./messages": "./src/messages/index.ts", diff --git a/packages/common/src/api/tan-query/README.md b/packages/common/src/api/tan-query/README.md index d223c43c790..806762c8438 100644 --- a/packages/common/src/api/tan-query/README.md +++ b/packages/common/src/api/tan-query/README.md @@ -192,14 +192,14 @@ The `as unknown as QueryKey` type cast is necessary for TanStack Query's 1. **Create the Hook:** - Use the `useQuery` or `useInfiniteQuery` (paginated) hook from `@tanstack/react-query`. - - Use `useAudiusQueryContext` to get access to the `audiusSdk`. + - Use `useQueryContext` to get access to the `audiusSdk`. - Implement the `queryFn` to call the relevant SDK method. - Use the query key function defined in step 1. ```typescript // useMyData.ts import { useQuery } from '@tanstack/react-query' - import { useAudiusQueryContext } from '~/audius-query' + import { useQueryContext } from '~/api' import { MyData } from '~/models' import { SelectableQueryOptions } from './types' @@ -214,7 +214,7 @@ The `as unknown as QueryKey` type cast is necessary for TanStack Query's params: UseMyDataParams, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { param } = params return useQuery({ @@ -238,7 +238,7 @@ The `as unknown as QueryKey` type cast is necessary for TanStack Query's 2. **Create the Hook:** - Use the `useMutation` hook from `@tanstack/react-query`. - - Use `useAudiusQueryContext` for the SDK and `useQueryClient` for cache interaction. + - Use `useQueryContext` for the SDK and `useQueryClient` for cache interaction. - Implement the `mutationFn` to call the SDK method that performs the change. - Implement `onMutate` for optimistic updates: - Cancel relevant ongoing queries (`queryClient.cancelQueries`). @@ -251,7 +251,7 @@ The `as unknown as QueryKey` type cast is necessary for TanStack Query's ```typescript // useMyMutation.ts import { useMutation, useQueryClient } from '@tanstack/react-query' - import { useAudiusQueryContext } from '~/audius-query' + import { useQueryContext } from '~/api' import { MyData } from '~/models' import { QUERY_KEYS } from './queryKeys' @@ -268,7 +268,7 @@ The `as unknown as QueryKey` type cast is necessary for TanStack Query's } export const useMyMutation = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() return useMutation({ diff --git a/packages/common/src/api/tan-query/authorized-apps/useAuthorizedApps.ts b/packages/common/src/api/tan-query/authorized-apps/useAuthorizedApps.ts index 320a3378eac..c4bbc2e8a71 100644 --- a/packages/common/src/api/tan-query/authorized-apps/useAuthorizedApps.ts +++ b/packages/common/src/api/tan-query/authorized-apps/useAuthorizedApps.ts @@ -1,7 +1,7 @@ import { AuthorizedApp, Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { Nullable } from '~/utils/typeUtils' @@ -18,7 +18,7 @@ export const getAuthorizedAppsQueryKey = (userId: Nullable) => { export const useAuthorizedApps = ( options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: userId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/authorized-apps/useRemoveAuthorizedApp.ts b/packages/common/src/api/tan-query/authorized-apps/useRemoveAuthorizedApp.ts index 7242a98fd47..ca135e60500 100644 --- a/packages/common/src/api/tan-query/authorized-apps/useRemoveAuthorizedApp.ts +++ b/packages/common/src/api/tan-query/authorized-apps/useRemoveAuthorizedApp.ts @@ -2,7 +2,7 @@ import { AuthorizedApp, Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -21,7 +21,7 @@ export const getRemoveAuthorizedAppQueryKey = (userId: ID) => { } export const useRemoveAuthorizedApp = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/collection/useCollection.ts b/packages/common/src/api/tan-query/collection/useCollection.ts index 96ae43dc564..6ce59932044 100644 --- a/packages/common/src/api/tan-query/collection/useCollection.ts +++ b/packages/common/src/api/tan-query/collection/useCollection.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { ID } from '~/models' import { getCollectionsBatcher } from '../batchers/getCollectionsBatcher' @@ -23,7 +23,7 @@ export const useCollection = ( collectionId: ID | null | undefined, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts b/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts index 57a92996daa..1473bb01ef4 100644 --- a/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts +++ b/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts @@ -4,7 +4,7 @@ import { pick } from 'lodash' import { useDispatch } from 'react-redux' import { userCollectionMetadataFromSDK } from '~/adapters/collection' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { TQCollection } from '../models' @@ -42,7 +42,7 @@ export const useCollectionByPermalink = ( permalink: string | undefined | null, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts b/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts index bfde965c9b8..6852e64c1c9 100644 --- a/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts +++ b/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -34,7 +34,7 @@ export const useCollectionFavorites = ( { collectionId, pageSize = DEFAULT_PAGE_SIZE }: UseCollectionFavoritesArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/collection/useCollectionReposts.ts b/packages/common/src/api/tan-query/collection/useCollectionReposts.ts index f70092cc9e5..a8fdadb3a09 100644 --- a/packages/common/src/api/tan-query/collection/useCollectionReposts.ts +++ b/packages/common/src/api/tan-query/collection/useCollectionReposts.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -34,7 +34,7 @@ export const useCollectionReposts = ( { collectionId, pageSize = DEFAULT_PAGE_SIZE }: UseCollectionRepostsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/collection/useCollections.ts b/packages/common/src/api/tan-query/collection/useCollections.ts index 653d6decee8..327248194a9 100644 --- a/packages/common/src/api/tan-query/collection/useCollections.ts +++ b/packages/common/src/api/tan-query/collection/useCollections.ts @@ -4,7 +4,7 @@ import { useQueryClient } from '@tanstack/react-query' import { keyBy } from 'lodash' import { useDispatch, useSelector } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { ID } from '~/models' import { CommonState } from '~/store' @@ -21,7 +21,7 @@ export const useCollections = ( collectionIds: ID[] | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/collection/useExploreContent.ts b/packages/common/src/api/tan-query/collection/useExploreContent.ts index 40e9ef51970..ddf1292fb4b 100644 --- a/packages/common/src/api/tan-query/collection/useExploreContent.ts +++ b/packages/common/src/api/tan-query/collection/useExploreContent.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -28,7 +28,7 @@ export const getExploreContentQueryKey = () => { export const useExploreContent = ( options?: SelectableQueryOptions ) => { - const { env } = useAudiusQueryContext() + const { env } = useQueryContext() const exploreContentUrl = env.EXPLORE_CONTENT_URL ?? STATIC_EXPLORE_CONTENT_URL diff --git a/packages/common/src/api/tan-query/collection/useLibraryCollections.ts b/packages/common/src/api/tan-query/collection/useLibraryCollections.ts index 1dcc860f42e..4b4e047c407 100644 --- a/packages/common/src/api/tan-query/collection/useLibraryCollections.ts +++ b/packages/common/src/api/tan-query/collection/useLibraryCollections.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userCollectionMetadataFromSDK } from '~/adapters/collection' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { CollectionType } from '~/store/saved-collections/types' @@ -61,7 +61,7 @@ export const useLibraryCollections = ( }: UseLibraryCollectionsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/collection/useUpdateCollection.ts b/packages/common/src/api/tan-query/collection/useUpdateCollection.ts index 2668594973c..05bfa4ac4e2 100644 --- a/packages/common/src/api/tan-query/collection/useUpdateCollection.ts +++ b/packages/common/src/api/tan-query/collection/useUpdateCollection.ts @@ -6,7 +6,7 @@ import { useDispatch, useSelector } from 'react-redux' import { playlistMetadataForUpdateWithSDK } from '~/adapters/collection' import { fileToSdk } from '~/adapters/track' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { isContentUSDCPurchaseGated } from '~/models' import { Collection } from '~/models/Collection' import { ID } from '~/models/Identifiers' @@ -41,7 +41,7 @@ export const useUpdateCollection = () => { const { audiusSdk, imageUtils: { generatePlaylistArtwork } - } = useAudiusQueryContext() + } = useQueryContext() const queryClient = useQueryClient() const account = useSelector(getAccountUser) const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/comments/useComment.ts b/packages/common/src/api/tan-query/comments/useComment.ts index fcc97279e7f..0824bd36a1e 100644 --- a/packages/common/src/api/tan-query/comments/useComment.ts +++ b/packages/common/src/api/tan-query/comments/useComment.ts @@ -3,7 +3,7 @@ import { useEffect } from 'react' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -11,7 +11,7 @@ import { CommentOrReply, messages } from './types' import { getCommentQueryKey } from './utils' export const useComment = (commentId: ID) => { - const { reportToSentry } = useAudiusQueryContext() + const { reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/comments/useCommentReplies.ts b/packages/common/src/api/tan-query/comments/useCommentReplies.ts index a3b8178026b..eea0c9e1404 100644 --- a/packages/common/src/api/tan-query/comments/useCommentReplies.ts +++ b/packages/common/src/api/tan-query/comments/useCommentReplies.ts @@ -5,7 +5,7 @@ import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { replyCommentFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Comment, Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -27,7 +27,7 @@ export const useCommentReplies = ( { commentId, pageSize = COMMENT_REPLIES_PAGE_SIZE }: GetRepliesArgs, options?: QueryOptions ) => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const startingLimit = 3 // comments will load in with 3 already so we don't start pagination at 0 diff --git a/packages/common/src/api/tan-query/comments/useDeleteComment.ts b/packages/common/src/api/tan-query/comments/useDeleteComment.ts index 4bbe49df710..812cc3fcd14 100644 --- a/packages/common/src/api/tan-query/comments/useDeleteComment.ts +++ b/packages/common/src/api/tan-query/comments/useDeleteComment.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Comment, Feature, ID, ReplyComment } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -22,7 +22,7 @@ export type DeleteCommentArgs = { } export const useDeleteComment = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() return useMutation({ diff --git a/packages/common/src/api/tan-query/comments/useEditComment.ts b/packages/common/src/api/tan-query/comments/useEditComment.ts index e602c09584c..49f1477d93a 100644 --- a/packages/common/src/api/tan-query/comments/useEditComment.ts +++ b/packages/common/src/api/tan-query/comments/useEditComment.ts @@ -2,7 +2,7 @@ import { EntityType, CommentMention } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -20,7 +20,7 @@ export type EditCommentArgs = { } export const useEditComment = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() return useMutation({ diff --git a/packages/common/src/api/tan-query/comments/useGetTrackCommentNotificationSetting.ts b/packages/common/src/api/tan-query/comments/useGetTrackCommentNotificationSetting.ts index 214fb578c4e..799dbacc165 100644 --- a/packages/common/src/api/tan-query/comments/useGetTrackCommentNotificationSetting.ts +++ b/packages/common/src/api/tan-query/comments/useGetTrackCommentNotificationSetting.ts @@ -1,7 +1,7 @@ import { Id, TrackCommentNotificationResponse } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { Nullable } from '~/utils' @@ -19,7 +19,7 @@ export const useGetTrackCommentNotificationSetting = ( trackId: ID, currentUserId: Nullable | undefined ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getTrackCommentNotificationSettingQueryKey(trackId), diff --git a/packages/common/src/api/tan-query/comments/useMuteUser.ts b/packages/common/src/api/tan-query/comments/useMuteUser.ts index 3d1cd79bd0d..38d7b8fb711 100644 --- a/packages/common/src/api/tan-query/comments/useMuteUser.ts +++ b/packages/common/src/api/tan-query/comments/useMuteUser.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Comment, Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -22,7 +22,7 @@ export type MuteUserArgs = { } export const useMuteUser = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/comments/usePinComment.ts b/packages/common/src/api/tan-query/comments/usePinComment.ts index dbf3954973e..091eae709eb 100644 --- a/packages/common/src/api/tan-query/comments/usePinComment.ts +++ b/packages/common/src/api/tan-query/comments/usePinComment.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { setPinnedCommentId } from '~/store/cache/tracks/actions' import { toast } from '~/store/ui/toast/slice' @@ -21,7 +21,7 @@ export type PinCommentArgs = { } export const usePinComment = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() return useMutation({ diff --git a/packages/common/src/api/tan-query/comments/usePostComment.ts b/packages/common/src/api/tan-query/comments/usePostComment.ts index fd99d029da6..455a81c3b1c 100644 --- a/packages/common/src/api/tan-query/comments/usePostComment.ts +++ b/packages/common/src/api/tan-query/comments/usePostComment.ts @@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Comment, Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -27,7 +27,7 @@ export type PostCommentArgs = { } export const usePostComment = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() diff --git a/packages/common/src/api/tan-query/comments/useReactToComment.ts b/packages/common/src/api/tan-query/comments/useReactToComment.ts index 8077aab9de6..a4c61e6425b 100644 --- a/packages/common/src/api/tan-query/comments/useReactToComment.ts +++ b/packages/common/src/api/tan-query/comments/useReactToComment.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -18,7 +18,7 @@ export type ReactToCommentArgs = { } export const useReactToComment = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() return useMutation({ diff --git a/packages/common/src/api/tan-query/comments/useReportComment.ts b/packages/common/src/api/tan-query/comments/useReportComment.ts index ef743ce950f..3304385f898 100644 --- a/packages/common/src/api/tan-query/comments/useReportComment.ts +++ b/packages/common/src/api/tan-query/comments/useReportComment.ts @@ -2,7 +2,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Comment, Feature, ID, ReplyComment } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -22,7 +22,7 @@ export type ReportCommentArgs = { } export const useReportComment = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() return useMutation({ diff --git a/packages/common/src/api/tan-query/comments/useTrackCommentCount.ts b/packages/common/src/api/tan-query/comments/useTrackCommentCount.ts index eed717c09cf..5d216521d7e 100644 --- a/packages/common/src/api/tan-query/comments/useTrackCommentCount.ts +++ b/packages/common/src/api/tan-query/comments/useTrackCommentCount.ts @@ -5,7 +5,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { usePrevious } from 'react-use' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { setTrackCommentCount } from '~/store/cache/tracks/actions' import { Nullable } from '~/utils' @@ -19,7 +19,7 @@ export const useTrackCommentCount = ( userId: Nullable, shouldPoll = false ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() const queryData = useQuery({ diff --git a/packages/common/src/api/tan-query/comments/useTrackComments.ts b/packages/common/src/api/tan-query/comments/useTrackComments.ts index f9fe29b485b..d26d77c87c4 100644 --- a/packages/common/src/api/tan-query/comments/useTrackComments.ts +++ b/packages/common/src/api/tan-query/comments/useTrackComments.ts @@ -9,7 +9,7 @@ import { import { useDispatch } from 'react-redux' import { commentFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -36,7 +36,7 @@ export const useTrackComments = ( }: GetCommentsByTrackArgs, options?: QueryOptions ) => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const isMutating = useIsMutating() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/comments/useUpdateCommentNotificationSetting.ts b/packages/common/src/api/tan-query/comments/useUpdateCommentNotificationSetting.ts index 81033f875e5..2781bc1742f 100644 --- a/packages/common/src/api/tan-query/comments/useUpdateCommentNotificationSetting.ts +++ b/packages/common/src/api/tan-query/comments/useUpdateCommentNotificationSetting.ts @@ -2,7 +2,7 @@ import { EntityManagerAction, EntityType } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -16,7 +16,7 @@ export type UpdateCommentNotificationSettingArgs = { } export const useUpdateCommentNotificationSetting = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() return useMutation({ diff --git a/packages/common/src/api/tan-query/comments/useUpdateTrackCommentNotificationSetting.ts b/packages/common/src/api/tan-query/comments/useUpdateTrackCommentNotificationSetting.ts index e6792242d09..217a31423ef 100644 --- a/packages/common/src/api/tan-query/comments/useUpdateTrackCommentNotificationSetting.ts +++ b/packages/common/src/api/tan-query/comments/useUpdateTrackCommentNotificationSetting.ts @@ -2,7 +2,7 @@ import { EntityManagerAction, EntityType } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -15,7 +15,7 @@ export type UpdateTrackCommentNotificationSettingArgs = { } export const useUpdateTrackCommentNotificationSetting = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/comments/useUserComments.ts b/packages/common/src/api/tan-query/comments/useUserComments.ts index e2d2aa3c846..30cddc167cb 100644 --- a/packages/common/src/api/tan-query/comments/useUserComments.ts +++ b/packages/common/src/api/tan-query/comments/useUserComments.ts @@ -9,7 +9,7 @@ import { import { useDispatch } from 'react-redux' import { commentFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -31,7 +31,7 @@ export const useUserComments = ( }, options?: QueryOptions ) => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const isMutating = useIsMutating() const queryClient = useQueryClient() diff --git a/packages/common/src/api/tan-query/developer-apps/useAddDeveloperApp.ts b/packages/common/src/api/tan-query/developer-apps/useAddDeveloperApp.ts index b9c1f6494bd..e2b5999ed13 100644 --- a/packages/common/src/api/tan-query/developer-apps/useAddDeveloperApp.ts +++ b/packages/common/src/api/tan-query/developer-apps/useAddDeveloperApp.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { DeveloperApp, NewAppPayload } from '~/schemas/developerApps' import { useCurrentUserId } from '../users/account/useCurrentUserId' @@ -9,7 +9,7 @@ import { useCurrentUserId } from '../users/account/useCurrentUserId' import { getDeveloperAppsQueryKey } from './useDeveloperApps' export const useAddDeveloperApp = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/developer-apps/useDeleteDeveloperApp.ts b/packages/common/src/api/tan-query/developer-apps/useDeleteDeveloperApp.ts index dc1844cccc0..4de8277937c 100644 --- a/packages/common/src/api/tan-query/developer-apps/useDeleteDeveloperApp.ts +++ b/packages/common/src/api/tan-query/developer-apps/useDeleteDeveloperApp.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { DeveloperApp } from '~/schemas/developerApps' import { useCurrentUserId } from '../users/account/useCurrentUserId' @@ -9,7 +9,7 @@ import { useCurrentUserId } from '../users/account/useCurrentUserId' import { getDeveloperAppsQueryKey } from './useDeveloperApps' export const useDeleteDeveloperApp = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/developer-apps/useDeveloperApps.ts b/packages/common/src/api/tan-query/developer-apps/useDeveloperApps.ts index 78931094a63..105e89db88c 100644 --- a/packages/common/src/api/tan-query/developer-apps/useDeveloperApps.ts +++ b/packages/common/src/api/tan-query/developer-apps/useDeveloperApps.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { DeveloperApp } from '~/schemas/developerApps' import { Nullable } from '~/utils/typeUtils' @@ -19,7 +19,7 @@ export const useDeveloperApps = ( userId: Nullable, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getDeveloperAppsQueryKey(userId), diff --git a/packages/common/src/api/tan-query/developer-apps/useEditDeveloperApp.ts b/packages/common/src/api/tan-query/developer-apps/useEditDeveloperApp.ts index e2c667278a4..9fe2923e1c0 100644 --- a/packages/common/src/api/tan-query/developer-apps/useEditDeveloperApp.ts +++ b/packages/common/src/api/tan-query/developer-apps/useEditDeveloperApp.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { DeveloperApp, EditAppPayload } from '~/schemas/developerApps' import { useCurrentUserId } from '../users/account/useCurrentUserId' @@ -9,7 +9,7 @@ import { useCurrentUserId } from '../users/account/useCurrentUserId' import { getDeveloperAppsQueryKey } from './useDeveloperApps' export const useEditDeveloperApp = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/events/useAllEvents.ts b/packages/common/src/api/tan-query/events/useAllEvents.ts index 408363fd675..1ddd5e89257 100644 --- a/packages/common/src/api/tan-query/events/useAllEvents.ts +++ b/packages/common/src/api/tan-query/events/useAllEvents.ts @@ -2,7 +2,7 @@ import { OptionalId, Event as SDKEvent } from '@audius/sdk' import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' import { eventMetadataFromSDK } from '~/adapters/event' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { removeNullable } from '~/utils' @@ -25,7 +25,7 @@ export const useAllEvents = ( { pageSize = DEFAULT_PAGE_SIZE }: UseAllEventsArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() diff --git a/packages/common/src/api/tan-query/events/useCreateEvent.ts b/packages/common/src/api/tan-query/events/useCreateEvent.ts index bd3769897c8..493cf44fdb5 100644 --- a/packages/common/src/api/tan-query/events/useCreateEvent.ts +++ b/packages/common/src/api/tan-query/events/useCreateEvent.ts @@ -2,7 +2,7 @@ import { EventEventTypeEnum, EventEntityTypeEnum } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Event, Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -19,7 +19,7 @@ export type CreateEventArgs = { } export const useCreateEvent = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() return useMutation({ diff --git a/packages/common/src/api/tan-query/events/useDeleteEvent.ts b/packages/common/src/api/tan-query/events/useDeleteEvent.ts index 5064b0fce12..6247201ff20 100644 --- a/packages/common/src/api/tan-query/events/useDeleteEvent.ts +++ b/packages/common/src/api/tan-query/events/useDeleteEvent.ts @@ -1,7 +1,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { cloneDeep } from 'lodash' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Event, Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -13,7 +13,7 @@ export type DeleteEventArgs = { } export const useDeleteEvent = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() return useMutation({ diff --git a/packages/common/src/api/tan-query/events/useEvent.ts b/packages/common/src/api/tan-query/events/useEvent.ts index 58522e14c15..3d76c1942a0 100644 --- a/packages/common/src/api/tan-query/events/useEvent.ts +++ b/packages/common/src/api/tan-query/events/useEvent.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Event } from '~/models/Event' import { ID } from '~/models/Identifiers' @@ -17,7 +17,7 @@ export const useEvent = ( eventId: ID | null | undefined, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/events/useEvents.ts b/packages/common/src/api/tan-query/events/useEvents.ts index 7ec71b366b4..ad7d35bdc57 100644 --- a/packages/common/src/api/tan-query/events/useEvents.ts +++ b/packages/common/src/api/tan-query/events/useEvents.ts @@ -4,7 +4,7 @@ import { useQueryClient } from '@tanstack/react-query' import { keyBy } from 'lodash' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Event } from '~/models/Event' import { ID } from '~/models/Identifiers' @@ -20,7 +20,7 @@ export const useEvents = ( eventIds: ID[] | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/events/useEventsByEntityId.ts b/packages/common/src/api/tan-query/events/useEventsByEntityId.ts index 35746859c7e..0cf6413ade4 100644 --- a/packages/common/src/api/tan-query/events/useEventsByEntityId.ts +++ b/packages/common/src/api/tan-query/events/useEventsByEntityId.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { getEventsByEntityIdBatcher } from '../batchers/getEventsByEntityIdBatcher' @@ -20,7 +20,7 @@ export const useEventIdsByEntityId = ( options?: SelectableQueryOptions ) => { const { entityId } = args ?? {} - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() diff --git a/packages/common/src/api/tan-query/events/useUpdateEvent.ts b/packages/common/src/api/tan-query/events/useUpdateEvent.ts index d3f2c425aa5..c56947653d1 100644 --- a/packages/common/src/api/tan-query/events/useUpdateEvent.ts +++ b/packages/common/src/api/tan-query/events/useUpdateEvent.ts @@ -1,7 +1,7 @@ import { EventEntityTypeEnum, EventEventTypeEnum } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Event, Feature, ID } from '~/models' import { toast } from '~/store/ui/toast/slice' @@ -18,7 +18,7 @@ export type UpdateEventArgs = { } export const useUpdateEvent = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() return useMutation({ diff --git a/packages/common/src/api/tan-query/lineups/useAiTracks.ts b/packages/common/src/api/tan-query/lineups/useAiTracks.ts index f9492fcee50..4fbcc26bb0d 100644 --- a/packages/common/src/api/tan-query/lineups/useAiTracks.ts +++ b/packages/common/src/api/tan-query/lineups/useAiTracks.ts @@ -10,7 +10,7 @@ import { useDispatch } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models' import { aiPageLineupActions, aiPageSelectors } from '~/store/pages' import { fetchAiUser } from '~/store/pages/ai/slice' @@ -41,7 +41,7 @@ export const useAiTracks = ( { handle, pageSize = DEFAULT_PAGE_SIZE }: UseAiTracksArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useFeed.ts b/packages/common/src/api/tan-query/lineups/useFeed.ts index 3a617ec58a9..fa28db6740c 100644 --- a/packages/common/src/api/tan-query/lineups/useFeed.ts +++ b/packages/common/src/api/tan-query/lineups/useFeed.ts @@ -3,7 +3,7 @@ import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { transformAndCleanList, userFeedItemFromSDK } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { FeedFilter, UserCollectionMetadata, @@ -53,7 +53,7 @@ export const useFeed = ( options?: QueryOptions ) => { const { data: currentUserId } = useCurrentUserId() - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts b/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts index de1b7b83896..f5e7b6ed51c 100644 --- a/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts +++ b/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts @@ -10,7 +10,7 @@ import { } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models/Analytics' import { ID } from '~/models/Identifiers' import { @@ -70,7 +70,7 @@ export const useLibraryTracks = ( config?: QueryOptions ) => { const { data: currentUserId } = useCurrentUserId() - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useLineupQuery.ts b/packages/common/src/api/tan-query/lineups/useLineupQuery.ts index 31befccdac7..4a72437695c 100644 --- a/packages/common/src/api/tan-query/lineups/useLineupQuery.ts +++ b/packages/common/src/api/tan-query/lineups/useLineupQuery.ts @@ -11,7 +11,7 @@ import { Selector, useDispatch, useSelector } from 'react-redux' import { usePrevious } from 'react-use' import { getCollectionQueryKey, getTrackQueryKey } from '~/api' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Collection, Feature, @@ -72,7 +72,7 @@ export const useLineupQuery = ({ playbackSource: PlaybackSource disableAutomaticCacheHandling?: boolean }) => { - const { reportToSentry } = useAudiusQueryContext() + const { reportToSentry } = useQueryContext() const queryClient = useQueryClient() const lineup = useSelector(lineupSelector) diff --git a/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts b/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts index 26db0089223..5edf65413a8 100644 --- a/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts +++ b/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models' import { premiumTracksPageLineupActions, @@ -38,7 +38,7 @@ export const usePremiumTracks = ( { pageSize = DEFAULT_PAGE_SIZE }: UsePremiumTracksArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useProfileReposts.ts b/packages/common/src/api/tan-query/lineups/useProfileReposts.ts index 364d44d6b47..f842afae959 100644 --- a/packages/common/src/api/tan-query/lineups/useProfileReposts.ts +++ b/packages/common/src/api/tan-query/lineups/useProfileReposts.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { repostActivityFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { UserTrackMetadata, UserCollectionMetadata } from '~/models' import { PlaybackSource } from '~/models/Analytics' import { @@ -43,7 +43,7 @@ export const useProfileReposts = ( { handle, pageSize = DEFAULT_PAGE_SIZE }: UseProfileRepostsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useProfileTracks.ts b/packages/common/src/api/tan-query/lineups/useProfileTracks.ts index 0b3819b492b..4400719974e 100644 --- a/packages/common/src/api/tan-query/lineups/useProfileTracks.ts +++ b/packages/common/src/api/tan-query/lineups/useProfileTracks.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { transformAndCleanList, userTrackMetadataFromSDK } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models/Analytics' import { profilePageSelectors, @@ -52,7 +52,7 @@ export const useProfileTracks = ( }: UseProfileTracksArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts b/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts index ee14df55573..b67154dee96 100644 --- a/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts +++ b/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID, PlaybackSource } from '~/models' import { UserTrackMetadata } from '~/models/Track' import { trackPageSelectors } from '~/store/pages' @@ -69,7 +69,7 @@ export const useTrackPageLineup = ( }: UseTrackPageLineupArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useTrending.ts b/packages/common/src/api/tan-query/lineups/useTrending.ts index bd34819f24f..2619b1373af 100644 --- a/packages/common/src/api/tan-query/lineups/useTrending.ts +++ b/packages/common/src/api/tan-query/lineups/useTrending.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models' import { TimeRange } from '~/models/TimeRange' import { StringKeys } from '~/services/remote-config' @@ -61,7 +61,7 @@ export const useTrending = ( }: GetTrendingArgs, options?: QueryOptions ) => { - const { audiusSdk, remoteConfigInstance } = useAudiusQueryContext() + const { audiusSdk, remoteConfigInstance } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useTrendingPlaylists.ts b/packages/common/src/api/tan-query/lineups/useTrendingPlaylists.ts index ba96605df75..59efe721dae 100644 --- a/packages/common/src/api/tan-query/lineups/useTrendingPlaylists.ts +++ b/packages/common/src/api/tan-query/lineups/useTrendingPlaylists.ts @@ -10,7 +10,7 @@ import { transformAndCleanList, userCollectionMetadataFromSDK } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models/Analytics' import { trendingPlaylistsPageLineupActions, @@ -46,7 +46,7 @@ export const useTrendingPlaylists = ( }: UseTrendingPlaylistsArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts b/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts index d0ce17cb020..b5b0291b792 100644 --- a/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts +++ b/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { transformAndCleanList, userTrackMetadataFromSDK } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models/Analytics' import { trendingUndergroundPageLineupActions, @@ -38,7 +38,7 @@ export const useTrendingUnderground = ( { pageSize = DEFAULT_PAGE_SIZE }: UseTrendingUndergroundArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/notifications/useMarkNotificationsAsViewed.ts b/packages/common/src/api/tan-query/notifications/useMarkNotificationsAsViewed.ts index afe673eb884..745e85458f2 100644 --- a/packages/common/src/api/tan-query/notifications/useMarkNotificationsAsViewed.ts +++ b/packages/common/src/api/tan-query/notifications/useMarkNotificationsAsViewed.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { useCurrentUserId } from '../users/account/useCurrentUserId' @@ -14,7 +14,7 @@ import { * Hook to mark all notifications as viewed */ export const useMarkNotificationsAsViewed = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const { data: unreadCount } = useNotificationUnreadCount() diff --git a/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts b/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts index 5becf50e02a..c67e5f291aa 100644 --- a/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts +++ b/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts @@ -5,7 +5,7 @@ import { useQuery } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { usePrevious } from 'react-use' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useRemoteVar } from '~/hooks/useRemoteVar' import { ID } from '~/models/Identifiers' import { getBalance } from '~/store/wallet/slice' @@ -32,7 +32,7 @@ export const getNotificationUnreadCountQueryKey = ( */ export const useNotificationUnreadCount = () => { const dispatch = useDispatch() - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const pollingFreqMs = useRemoteVar(IntKeys.NOTIFICATION_POLLING_FREQ_MS) const validTypes = useNotificationValidTypes() diff --git a/packages/common/src/api/tan-query/notifications/useNotifications.ts b/packages/common/src/api/tan-query/notifications/useNotifications.ts index d765366d876..98eab45c91d 100644 --- a/packages/common/src/api/tan-query/notifications/useNotifications.ts +++ b/packages/common/src/api/tan-query/notifications/useNotifications.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query' import { notificationFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { ID } from '~/models/Identifiers' import { Entity, @@ -182,7 +182,7 @@ export const getNotificationsQueryKey = ({ * Pagination is based on the timestamp and groupId of the last notification. */ export const useNotifications = (options?: QueryOptions) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const validTypes = useNotificationValidTypes() const pageSize = DEFAULT_LIMIT diff --git a/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts b/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts index 0b00b4b0f86..687ce4b7c3f 100644 --- a/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts +++ b/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts @@ -4,7 +4,7 @@ import { full, Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' import { audioTransactionFromSdk } from '~/adapters/audioTransactions' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { TransactionDetails, @@ -48,7 +48,7 @@ export const useAudioTransactions = ( args: GetAudioTransactionsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: userId } = useCurrentUserId() const { page = 0, diff --git a/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts b/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts index 17143c13ff2..f44a1db9b9a 100644 --- a/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts +++ b/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { Nullable } from '~/utils/typeUtils' @@ -19,7 +19,7 @@ export const getAudioTransactionsCountQueryKey = (userId: Nullable) => { export const useAudioTransactionsCount = ( options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: userId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/purchases/usePurchasers.ts b/packages/common/src/api/tan-query/purchases/usePurchasers.ts index 5e014f60be6..ef219e077ba 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchasers.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchasers.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { PurchaseableContentType } from '~/store' @@ -43,7 +43,7 @@ export const usePurchasers = ( options?: QueryOptions ) => { const { contentId, contentType, pageSize = PAGE_SIZE } = args - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts b/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts index 625b7f590dc..265b1614817 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts @@ -1,7 +1,7 @@ import { Id, OptionalId } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -29,7 +29,7 @@ export const usePurchasersCount = ( { contentId, contentType }: UsePurchasersCountArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/purchases/usePurchases.ts b/packages/common/src/api/tan-query/purchases/usePurchases.ts index 948c95944c4..7e8ac826bcf 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchases.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchases.ts @@ -4,7 +4,7 @@ import { full, Id } from '@audius/sdk' import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query' import { purchaseFromSDK } from '~/adapters/purchase' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { USDCContentPurchaseType, @@ -49,7 +49,7 @@ export const usePurchases = ( options?: QueryOptions ) => { const { userId, sortMethod, sortDirection, pageSize = PAGE_SIZE } = args - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryResult = useInfiniteQuery({ queryKey: getPurchasesQueryKey(args), initialPageParam: 0, diff --git a/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts b/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts index 65110ff1d5d..60cef358b59 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -21,7 +21,7 @@ export const usePurchasesCount = ( { userId }: UsePurchasesCountArgs, options?: QueryOptions ) => { - const context = useAudiusQueryContext() + const context = useQueryContext() const audiusSdk = context.audiusSdk return useQuery({ diff --git a/packages/common/src/api/tan-query/purchases/useSales.ts b/packages/common/src/api/tan-query/purchases/useSales.ts index ad2bc3163e5..f4d994053a5 100644 --- a/packages/common/src/api/tan-query/purchases/useSales.ts +++ b/packages/common/src/api/tan-query/purchases/useSales.ts @@ -4,7 +4,7 @@ import { full, Id } from '@audius/sdk' import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query' import { purchaseFromSDK } from '~/adapters/purchase' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { USDCContentPurchaseType, @@ -42,7 +42,7 @@ export const getSalesQueryKey = ({ export const useSales = (args: GetSalesListArgs, options?: QueryOptions) => { const { userId, sortMethod, sortDirection, pageSize = PAGE_SIZE } = args - const context = useAudiusQueryContext() + const context = useQueryContext() const { audiusSdk } = context const queryResult = useInfiniteQuery({ diff --git a/packages/common/src/api/tan-query/purchases/useSalesAggregate.ts b/packages/common/src/api/tan-query/purchases/useSalesAggregate.ts index 9dcc2437cca..f60c0afca22 100644 --- a/packages/common/src/api/tan-query/purchases/useSalesAggregate.ts +++ b/packages/common/src/api/tan-query/purchases/useSalesAggregate.ts @@ -1,7 +1,7 @@ import { Id, SalesAggregate } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -26,7 +26,7 @@ export const useSalesAggregate = < TResult > ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/purchases/useSalesCount.ts b/packages/common/src/api/tan-query/purchases/useSalesCount.ts index 032950e42f0..6f3b507fb09 100644 --- a/packages/common/src/api/tan-query/purchases/useSalesCount.ts +++ b/packages/common/src/api/tan-query/purchases/useSalesCount.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -15,7 +15,7 @@ export const useSalesCount = ( userId: ID | null | undefined, options?: QueryOptions ) => { - const context = useAudiusQueryContext() + const context = useQueryContext() const audiusSdk = context.audiusSdk return useQuery({ diff --git a/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts b/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts index 11267bfb976..da82549726e 100644 --- a/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts +++ b/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts @@ -8,7 +8,7 @@ import { useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { USDCTransactionDetails } from '~/models/USDCTransactions' @@ -79,7 +79,7 @@ export const useUSDCTransactions = ( }: UseUSDCTransactionsArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const queryKey = getUSDCTransactionsQueryKey(currentUserId, { diff --git a/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts b/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts index f48bb12409d..48d977eb93b 100644 --- a/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts +++ b/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts @@ -1,7 +1,7 @@ import { full, Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -29,7 +29,7 @@ export const useUSDCTransactionsCount = ( args?: UseUSDCTransactionsCountArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/remixes/useRemixers.ts b/packages/common/src/api/tan-query/remixes/useRemixers.ts index da20730c3ef..7e48b7aa819 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixers.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixers.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -36,7 +36,7 @@ export const useRemixers = ( { userId, trackId, pageSize = DEFAULT_PAGE_SIZE }: UseRemixersArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/remixes/useRemixersCount.ts b/packages/common/src/api/tan-query/remixes/useRemixersCount.ts index f481cadc8b3..ee1a8170222 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixersCount.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixersCount.ts @@ -1,7 +1,7 @@ import { Id, OptionalId } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -19,7 +19,7 @@ export const useRemixersCount = ( { trackId }: UseRemixersCountArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/remixes/useRemixes.ts b/packages/common/src/api/tan-query/remixes/useRemixes.ts index dad48327a53..b3815aa837f 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixes.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixes.ts @@ -9,7 +9,7 @@ import { import { useDispatch } from 'react-redux' import { transformAndCleanList, userTrackMetadataFromSDK } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { PlaybackSource } from '~/models/Analytics' import { @@ -67,7 +67,7 @@ export const useRemixes = ( }: UseRemixesArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts b/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts index d4c8fcc65fb..f2ee7f34078 100644 --- a/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts +++ b/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts @@ -2,7 +2,7 @@ import { OptionalId } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' import { SearchResults, searchResultsFromSDK } from '~/adapters/search' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useFeatureFlag } from '~/hooks/useFeatureFlag' import { FeatureFlags } from '~/services/remote-config' @@ -27,7 +27,7 @@ export const useSearchAutocomplete = ( { query, limit = DEFAULT_LIMIT }: UseSearchAutocompleteArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const { isEnabled: isUSDCEnabled } = useFeatureFlag( FeatureFlags.USDC_PURCHASES diff --git a/packages/common/src/api/tan-query/search/useSearchResults.ts b/packages/common/src/api/tan-query/search/useSearchResults.ts index d66fee93385..e2d338ba563 100644 --- a/packages/common/src/api/tan-query/search/useSearchResults.ts +++ b/packages/common/src/api/tan-query/search/useSearchResults.ts @@ -8,7 +8,7 @@ import { isEmpty } from 'lodash' import { useDispatch } from 'react-redux' import { searchResultsFromSDK } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Name, PlaybackSource, @@ -124,7 +124,7 @@ const useSearchQueryProps = ( pageSize, ...filters } - const { audiusSdk, getFeatureEnabled, analytics } = useAudiusQueryContext() + const { audiusSdk, getFeatureEnabled, analytics } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/search/useTopTags.ts b/packages/common/src/api/tan-query/search/useTopTags.ts index f81289460b8..03f7b372654 100644 --- a/packages/common/src/api/tan-query/search/useTopTags.ts +++ b/packages/common/src/api/tan-query/search/useTopTags.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -20,7 +20,7 @@ export const useTopTags = ( { userId, limit = 5 }: UseTopTagsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getTopTagsQueryKey(userId), diff --git a/packages/common/src/api/tan-query/tracks/useDeleteTrack.ts b/packages/common/src/api/tan-query/tracks/useDeleteTrack.ts index 22b6fd306d4..28119a82501 100644 --- a/packages/common/src/api/tan-query/tracks/useDeleteTrack.ts +++ b/packages/common/src/api/tan-query/tracks/useDeleteTrack.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useAppContext } from '~/context/appContext' import { Name } from '~/models/Analytics' import { Feature } from '~/models/ErrorReporting' @@ -29,7 +29,7 @@ type MutationContext = { } export const useDeleteTrack = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/tracks/useDownloadTrackStems.ts b/packages/common/src/api/tan-query/tracks/useDownloadTrackStems.ts index 1466356efb9..2001433f149 100644 --- a/packages/common/src/api/tan-query/tracks/useDownloadTrackStems.ts +++ b/packages/common/src/api/tan-query/tracks/useDownloadTrackStems.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature } from '~/models/ErrorReporting' import { ID } from '~/models/Identifiers' @@ -37,7 +37,7 @@ export const getDownloadTrackStemsQueryKey = (trackId: ID) => { } export const useDownloadTrackStems = ({ trackId }: { trackId: ID }) => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() @@ -75,7 +75,7 @@ export const useDownloadTrackStems = ({ trackId }: { trackId: ID }) => { } export const useCancelStemsArchiveJob = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() return useMutation({ @@ -101,7 +101,7 @@ export const useGetStemsArchiveJobStatus = ( { jobId }: { jobId?: string }, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getStemsArchiveJobQueryKey(jobId), diff --git a/packages/common/src/api/tan-query/tracks/useFavoriteTrack.ts b/packages/common/src/api/tan-query/tracks/useFavoriteTrack.ts index f06ab5e71d1..17651ee977b 100644 --- a/packages/common/src/api/tan-query/tracks/useFavoriteTrack.ts +++ b/packages/common/src/api/tan-query/tracks/useFavoriteTrack.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useAppContext } from '~/context/appContext' import { Name } from '~/models/Analytics' import { Feature } from '~/models/ErrorReporting' @@ -23,7 +23,7 @@ type FavoriteTrackArgs = { } export const useFavoriteTrack = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/tracks/useFavoritedTracks.ts b/packages/common/src/api/tan-query/tracks/useFavoritedTracks.ts index 4fcb57eab2c..1f5d986d6ae 100644 --- a/packages/common/src/api/tan-query/tracks/useFavoritedTracks.ts +++ b/packages/common/src/api/tan-query/tracks/useFavoritedTracks.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query' import { transformAndCleanList } from '~/adapters' import { favoriteFromSDK } from '~/adapters/favorite' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Favorite } from '~/models/Favorite' import { ID } from '~/models/Identifiers' @@ -18,7 +18,7 @@ export const useFavoritedTracks = ( userId: ID | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getFavoritedTracksQueryKey(userId), diff --git a/packages/common/src/api/tan-query/tracks/useFileSizes.ts b/packages/common/src/api/tan-query/tracks/useFileSizes.ts index 76b78490367..82356547eb7 100644 --- a/packages/common/src/api/tan-query/tracks/useFileSizes.ts +++ b/packages/common/src/api/tan-query/tracks/useFileSizes.ts @@ -1,7 +1,7 @@ import { Id, type BlobInfo } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { DownloadQuality } from '~/models' import { ID } from '~/models/Identifiers' @@ -31,7 +31,7 @@ export const useFileSizes = ( { trackIds, downloadQuality }: UseFileSizesProps, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getFileSizesQueryKey({ trackIds, downloadQuality }), diff --git a/packages/common/src/api/tan-query/tracks/useRemixedTracks.ts b/packages/common/src/api/tan-query/tracks/useRemixedTracks.ts index 1b39a2a5926..1f281d21ea3 100644 --- a/packages/common/src/api/tan-query/tracks/useRemixedTracks.ts +++ b/packages/common/src/api/tan-query/tracks/useRemixedTracks.ts @@ -1,7 +1,7 @@ import { HashId, Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -27,7 +27,7 @@ export const getRemixedTracksQueryKey = ({ userId }: UseRemixedTracksArgs) => { export const useRemixedTracks = ( options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() return useQuery({ diff --git a/packages/common/src/api/tan-query/tracks/useStems.ts b/packages/common/src/api/tan-query/tracks/useStems.ts index ad73d5573bf..5f9bb22c654 100644 --- a/packages/common/src/api/tan-query/tracks/useStems.ts +++ b/packages/common/src/api/tan-query/tracks/useStems.ts @@ -3,7 +3,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { stemTrackMetadataFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { StemTrack } from '~/models/Track' @@ -24,7 +24,7 @@ export const useStems = ( trackId: ID | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const validTrackId = !!trackId && trackId > 0 diff --git a/packages/common/src/api/tan-query/tracks/useTrack.ts b/packages/common/src/api/tan-query/tracks/useTrack.ts index b99cf02e709..6c4ba72bb85 100644 --- a/packages/common/src/api/tan-query/tracks/useTrack.ts +++ b/packages/common/src/api/tan-query/tracks/useTrack.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { getTracksBatcher } from '../batchers/getTracksBatcher' @@ -20,7 +20,7 @@ export const useTrack = ( trackId: ID | null | undefined, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts index e8aa54c3736..6b249c87880 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts @@ -4,7 +4,7 @@ import { pick } from 'lodash' import { useDispatch, useSelector } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { Status } from '~/models/Status' import { getAccountStatus } from '~/store/account/selectors' @@ -27,7 +27,7 @@ export const useTrackByPermalink = ( permalink: string | undefined | null, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts b/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts index 6aecaaba561..a7e7ab04c21 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -37,7 +37,7 @@ export const useTrackFavorites = ( { trackId, pageSize = DEFAULT_PAGE_SIZE }: UseFavoritesArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/tracks/useTrackFileInfo.ts b/packages/common/src/api/tan-query/tracks/useTrackFileInfo.ts index 8bfb5be251b..59c455f3975 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackFileInfo.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackFileInfo.ts @@ -1,7 +1,7 @@ import { BlobInfo, Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -24,7 +24,7 @@ export const useTrackFileInfo = ( original?: boolean } ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const validTrackId = !!trackId && trackId > 0 return useQuery({ diff --git a/packages/common/src/api/tan-query/tracks/useTrackHistory.ts b/packages/common/src/api/tan-query/tracks/useTrackHistory.ts index 4556624a42f..40418dc1a1d 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackHistory.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackHistory.ts @@ -3,7 +3,7 @@ import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { trackActivityFromSDK, transformAndCleanList } from '~/adapters' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { PlaybackSource } from '~/models/Analytics' import { historyPageTracksLineupActions, @@ -44,7 +44,7 @@ export const useTrackHistory = ( }: UseTrackHistoryArgs = {}, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/tracks/useTrackRank.ts b/packages/common/src/api/tan-query/tracks/useTrackRank.ts index 0fc5f2b6432..0e7d36a408e 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackRank.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackRank.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query' import { trendingIdsFromSDK } from '~/adapters/trending' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -34,7 +34,7 @@ export const getTrendingIdsQueryKey = (args?: GetTrendingIdsArgs) => { * Hook that returns trending track IDs for all time periods */ export const useGetTrendingIds = (args?: GetTrendingIdsArgs) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getTrendingIdsQueryKey(args), queryFn: async () => { diff --git a/packages/common/src/api/tan-query/tracks/useTrackReposts.ts b/packages/common/src/api/tan-query/tracks/useTrackReposts.ts index cf18b6d58a9..69fab41a6c5 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackReposts.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackReposts.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -37,7 +37,7 @@ export const useTrackReposts = ( { trackId, pageSize = DEFAULT_PAGE_SIZE }: UseTrackRepostsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/tracks/useTracks.ts b/packages/common/src/api/tan-query/tracks/useTracks.ts index 4661e48d738..6bdaaa7eebd 100644 --- a/packages/common/src/api/tan-query/tracks/useTracks.ts +++ b/packages/common/src/api/tan-query/tracks/useTracks.ts @@ -4,7 +4,7 @@ import { useQueryClient } from '@tanstack/react-query' import { keyBy } from 'lodash' import { useDispatch, useSelector } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { CommonState } from '~/store' @@ -25,7 +25,7 @@ export const useTracks = ( trackIds: ID[] | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/tracks/useUnfavoriteTrack.ts b/packages/common/src/api/tan-query/tracks/useUnfavoriteTrack.ts index d96cf0eac14..69f92844370 100644 --- a/packages/common/src/api/tan-query/tracks/useUnfavoriteTrack.ts +++ b/packages/common/src/api/tan-query/tracks/useUnfavoriteTrack.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useAppContext } from '~/context/appContext' import { Name } from '~/models/Analytics' import { Feature } from '~/models/ErrorReporting' @@ -25,7 +25,7 @@ export type UnfavoriteTrackArgs = { } export const useUnfavoriteTrack = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/tracks/useUpdateTrack.ts b/packages/common/src/api/tan-query/tracks/useUpdateTrack.ts index f852f87e025..a849bd4c80f 100644 --- a/packages/common/src/api/tan-query/tracks/useUpdateTrack.ts +++ b/packages/common/src/api/tan-query/tracks/useUpdateTrack.ts @@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch, useStore } from 'react-redux' import { fileToSdk, trackMetadataForUploadToSdk } from '~/adapters/track' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { UserTrackMetadata } from '~/models' import { Feature } from '~/models/ErrorReporting' import { ID } from '~/models/Identifiers' @@ -33,7 +33,7 @@ export type UpdateTrackParams = { } export const useUpdateTrack = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const store = useStore() diff --git a/packages/common/src/api/tan-query/users/account/useApproveManagedAccount.ts b/packages/common/src/api/tan-query/users/account/useApproveManagedAccount.ts index ff73dc91ee8..bede735a0c1 100644 --- a/packages/common/src/api/tan-query/users/account/useApproveManagedAccount.ts +++ b/packages/common/src/api/tan-query/users/account/useApproveManagedAccount.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { User, UserMetadata } from '~/models' import { getManagedAccountsQueryKey } from './useManagedAccounts' @@ -12,7 +12,7 @@ type ApproveManagedAccountPayload = { } export const useApproveManagedAccount = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() return useMutation({ mutationFn: async (payload: ApproveManagedAccountPayload) => { diff --git a/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts b/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts index 9be172c1680..771d2a1179e 100644 --- a/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts +++ b/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query' import { useSelector } from 'react-redux' import { accountFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useAppContext } from '~/context/appContext' import { ID } from '~/models/Identifiers' import { AccountUserMetadata } from '~/models/User' @@ -38,7 +38,7 @@ export const useCurrentAccount = < TResult > ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const walletAddresses = useSelector(getWalletAddresses) const currentUserWallet = walletAddresses[walletType] const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts b/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts index d2a7f29caec..b40d1c4d8d8 100644 --- a/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts +++ b/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' import { managedUserListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { ManagedUserMetadata } from '~/models/User' @@ -19,7 +19,7 @@ export const useManagedAccounts = ( userId?: ID | null, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getManagedAccountsQueryKey(userId), queryFn: async () => { diff --git a/packages/common/src/api/tan-query/users/account/useManagers.ts b/packages/common/src/api/tan-query/users/account/useManagers.ts index 3950ef8cbab..0eabc1295fe 100644 --- a/packages/common/src/api/tan-query/users/account/useManagers.ts +++ b/packages/common/src/api/tan-query/users/account/useManagers.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useQuery } from '@tanstack/react-query' import { userManagerListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { UserManagerMetadata } from '~/models/User' @@ -19,7 +19,7 @@ export const useManagers = ( userId?: ID | null, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getManagersQueryKey(userId), queryFn: async () => { diff --git a/packages/common/src/api/tan-query/users/account/useRemoveManager.ts b/packages/common/src/api/tan-query/users/account/useRemoveManager.ts index ef2ef41b1c5..9614624f7ad 100644 --- a/packages/common/src/api/tan-query/users/account/useRemoveManager.ts +++ b/packages/common/src/api/tan-query/users/account/useRemoveManager.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { getManagedAccountsQueryKey } from './useManagedAccounts' import { getManagersQueryKey } from './useManagers' @@ -12,7 +12,7 @@ type RemoveManagerPayload = { } export const useRemoveManager = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() return useMutation({ mutationFn: async (payload: RemoveManagerPayload) => { diff --git a/packages/common/src/api/tan-query/users/account/useRequestAddManager.ts b/packages/common/src/api/tan-query/users/account/useRequestAddManager.ts index 80417b34e60..3257a212930 100644 --- a/packages/common/src/api/tan-query/users/account/useRequestAddManager.ts +++ b/packages/common/src/api/tan-query/users/account/useRequestAddManager.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { User, UserMetadata } from '~/models' import { getManagersQueryKey } from './useManagers' @@ -12,7 +12,7 @@ type RequestAddManagerPayload = { } export const useRequestAddManager = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() return useMutation({ mutationFn: async (payload: RequestAddManagerPayload) => { diff --git a/packages/common/src/api/tan-query/users/account/useResetPassword.ts b/packages/common/src/api/tan-query/users/account/useResetPassword.ts index 0c0c53d0b3f..36999d4f78a 100644 --- a/packages/common/src/api/tan-query/users/account/useResetPassword.ts +++ b/packages/common/src/api/tan-query/users/account/useResetPassword.ts @@ -1,6 +1,6 @@ import { useMutation } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' type ResetPasswordArgs = { email: string @@ -8,7 +8,7 @@ type ResetPasswordArgs = { } export const useResetPassword = () => { - const { authService } = useAudiusQueryContext() + const { authService } = useQueryContext() return useMutation({ mutationFn: async ({ email, password }: ResetPasswordArgs) => { await authService.resetPassword({ diff --git a/packages/common/src/api/tan-query/users/account/useUpdatePlaylistLibrary.ts b/packages/common/src/api/tan-query/users/account/useUpdatePlaylistLibrary.ts index fd9abb484b8..395dafb4329 100644 --- a/packages/common/src/api/tan-query/users/account/useUpdatePlaylistLibrary.ts +++ b/packages/common/src/api/tan-query/users/account/useUpdatePlaylistLibrary.ts @@ -3,7 +3,7 @@ import { useQueryClient, useMutation, QueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' import { Dispatch } from 'redux' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { ID } from '~/models/Identifiers' import { PlaylistLibrary } from '~/models/PlaylistLibrary' import { AccountUserMetadata } from '~/models/User' @@ -19,7 +19,7 @@ export const useUpdatePlaylistLibrary = () => { const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useMutation({ mutationFn: async (playlistLibrary: PlaylistLibrary) => { updatePlaylistLibrary( diff --git a/packages/common/src/api/tan-query/users/account/useWalletUser.ts b/packages/common/src/api/tan-query/users/account/useWalletUser.ts index dd04673afa6..36e71682b3c 100644 --- a/packages/common/src/api/tan-query/users/account/useWalletUser.ts +++ b/packages/common/src/api/tan-query/users/account/useWalletUser.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query' import { useSelector } from 'react-redux' import { accountFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { AccountUserMetadata, UserMetadata } from '~/models' import { getWalletAddresses } from '~/store/account/selectors' @@ -46,7 +46,7 @@ export const useWalletAccount = < TResult > ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getWalletAccountQueryKey(wallet), diff --git a/packages/common/src/api/tan-query/users/useEmailInUse.ts b/packages/common/src/api/tan-query/users/useEmailInUse.ts index f7201fca396..e7c60288c3c 100644 --- a/packages/common/src/api/tan-query/users/useEmailInUse.ts +++ b/packages/common/src/api/tan-query/users/useEmailInUse.ts @@ -1,14 +1,14 @@ import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' -import { AudiusQueryContextType } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api' +import { QueryContextType } from '~/api/tan-query/utils/QueryContext' import { QUERY_KEYS } from '../queryKeys' import { QueryKey, SelectableQueryOptions } from '../types' export const fetchEmailInUse = async ( email: string | null | undefined, - { identityService }: AudiusQueryContextType + { identityService }: QueryContextType ) => { if (!email) return { exists: false, isGuest: false } return await identityService.checkIfEmailRegistered(email) @@ -31,7 +31,7 @@ export const useEmailInUse = ( TResult > ) => { - const context = useAudiusQueryContext() + const context = useQueryContext() return useQuery({ queryKey: getEmailInUseQueryKey(email), diff --git a/packages/common/src/api/tan-query/users/useFollowUser.ts b/packages/common/src/api/tan-query/users/useFollowUser.ts index dd90f66e716..19c3ec6249c 100644 --- a/packages/common/src/api/tan-query/users/useFollowUser.ts +++ b/packages/common/src/api/tan-query/users/useFollowUser.ts @@ -3,7 +3,7 @@ import { Action } from '@reduxjs/toolkit' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { useAppContext } from '~/context/appContext' import { Kind } from '~/models' import { Name, FollowSource } from '~/models/Analytics' @@ -28,7 +28,7 @@ type MutationContext = { } export const useFollowUser = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() const { diff --git a/packages/common/src/api/tan-query/users/useFollowers.ts b/packages/common/src/api/tan-query/users/useFollowers.ts index c9f7dcba8b0..67ee8fb0665 100644 --- a/packages/common/src/api/tan-query/users/useFollowers.ts +++ b/packages/common/src/api/tan-query/users/useFollowers.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -37,7 +37,7 @@ export const useFollowers = ( { userId, pageSize = DEFAULT_PAGE_SIZE }: UseFollowersArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useFollowing.ts b/packages/common/src/api/tan-query/users/useFollowing.ts index bb8ef4fdf79..51222624500 100644 --- a/packages/common/src/api/tan-query/users/useFollowing.ts +++ b/packages/common/src/api/tan-query/users/useFollowing.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -36,7 +36,7 @@ export const useFollowing = ( { userId, pageSize = DEFAULT_PAGE_SIZE }: UseFollowingArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useHandleInUse.ts b/packages/common/src/api/tan-query/users/useHandleInUse.ts index 817d39823c7..11e8a98b988 100644 --- a/packages/common/src/api/tan-query/users/useHandleInUse.ts +++ b/packages/common/src/api/tan-query/users/useHandleInUse.ts @@ -1,15 +1,15 @@ import { useQuery } from '@tanstack/react-query' import { isEmpty } from 'lodash' -import { useAudiusQueryContext } from '~/audius-query' -import { AudiusQueryContextType } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api' +import { QueryContextType } from '~/api/tan-query/utils/QueryContext' import { QUERY_KEYS } from '../queryKeys' import { QueryKey, QueryOptions } from '../types' export const fetchHandleInUse = async ( handle: string | null | undefined, - { audiusSdk }: AudiusQueryContextType + { audiusSdk }: QueryContextType ) => { if (!handle) return false const sdk = await audiusSdk() @@ -38,7 +38,7 @@ export const useHandleInUse = ( handle: string | null | undefined, options?: QueryOptions ) => { - const context = useAudiusQueryContext() + const context = useQueryContext() return useQuery({ queryKey: getHandleInUseQueryKey(handle), diff --git a/packages/common/src/api/tan-query/users/useHandleReservedStatus.ts b/packages/common/src/api/tan-query/users/useHandleReservedStatus.ts index 4ce2a76931f..6ae71a8e704 100644 --- a/packages/common/src/api/tan-query/users/useHandleReservedStatus.ts +++ b/packages/common/src/api/tan-query/users/useHandleReservedStatus.ts @@ -1,7 +1,7 @@ import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' -import { AudiusQueryContextType } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api' +import { QueryContextType } from '~/api/tan-query/utils/QueryContext' import { FeatureFlags } from '~/services/remote-config/feature-flags' import { IntKeys } from '~/services/remote-config/types' import { parseHandleReservedStatusFromSocial } from '~/utils/handleReservedStatus' @@ -19,7 +19,7 @@ export const fetchHandleReservedStatus = async ( identityService, remoteConfigInstance, env - }: AudiusQueryContextType + }: QueryContextType ) => { if (!handle) return 'notReserved' @@ -87,7 +87,7 @@ export const useHandleReservedStatus = ( handle: string | null | undefined, options?: QueryOptions ) => { - const context = useAudiusQueryContext() + const context = useQueryContext() return useQuery({ queryKey: getHandleReservedStatusQueryKey(handle), diff --git a/packages/common/src/api/tan-query/users/useMutedUsers.ts b/packages/common/src/api/tan-query/users/useMutedUsers.ts index d7393b3259c..690607eb7f6 100644 --- a/packages/common/src/api/tan-query/users/useMutedUsers.ts +++ b/packages/common/src/api/tan-query/users/useMutedUsers.ts @@ -4,7 +4,7 @@ import { pick } from 'lodash' import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { UserMetadata } from '~/models/User' @@ -22,7 +22,7 @@ export const getMutedUsersQueryKey = (currentUserId: ID | null | undefined) => { export const useMutedUsers = ( options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useMutualFollowers.ts b/packages/common/src/api/tan-query/users/useMutualFollowers.ts index 7188184e878..0384cec1547 100644 --- a/packages/common/src/api/tan-query/users/useMutualFollowers.ts +++ b/packages/common/src/api/tan-query/users/useMutualFollowers.ts @@ -7,7 +7,7 @@ import { import { useDispatch, useSelector } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { getUserId } from '~/store/account/selectors' @@ -34,7 +34,7 @@ export const useMutualFollowers = ( { userId, pageSize = DEFAULT_PAGE_SIZE }: UseMutualFollowersArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const currentUserId = useSelector(getUserId) const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useRelatedArtists.ts b/packages/common/src/api/tan-query/users/useRelatedArtists.ts index 873fad65e48..c213961e94c 100644 --- a/packages/common/src/api/tan-query/users/useRelatedArtists.ts +++ b/packages/common/src/api/tan-query/users/useRelatedArtists.ts @@ -7,7 +7,7 @@ import { import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -43,7 +43,7 @@ export const useRelatedArtists = ( }: UseRelatedArtistsArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useSuggestedArtists.ts b/packages/common/src/api/tan-query/users/useSuggestedArtists.ts index d816d10991c..c8d3bfb2548 100644 --- a/packages/common/src/api/tan-query/users/useSuggestedArtists.ts +++ b/packages/common/src/api/tan-query/users/useSuggestedArtists.ts @@ -1,6 +1,6 @@ import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { QUERY_KEYS } from '../queryKeys' import { QueryKey, QueryOptions } from '../types' @@ -12,7 +12,7 @@ export const getSuggestedArtistsQueryKey = () => { } export const useSuggestedArtists = (options?: QueryOptions) => { - const { env, fetch } = useAudiusQueryContext() + const { env, fetch } = useQueryContext() const { data: suggestedIds } = useQuery({ queryKey: getSuggestedArtistsQueryKey(), diff --git a/packages/common/src/api/tan-query/users/useSupportedUsers.ts b/packages/common/src/api/tan-query/users/useSupportedUsers.ts index 292010e82fa..791845dc240 100644 --- a/packages/common/src/api/tan-query/users/useSupportedUsers.ts +++ b/packages/common/src/api/tan-query/users/useSupportedUsers.ts @@ -6,7 +6,7 @@ import { } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { SupportedUserMetadata, @@ -38,7 +38,7 @@ export const useSupportedUsers = ( { userId, pageSize = SUPPORTING_PAGINATION_SIZE }: UseSupportedUsersArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useSupporter.ts b/packages/common/src/api/tan-query/users/useSupporter.ts index 41641a37a06..d62f50424df 100644 --- a/packages/common/src/api/tan-query/users/useSupporter.ts +++ b/packages/common/src/api/tan-query/users/useSupporter.ts @@ -2,7 +2,7 @@ import { Id, OptionalId } from '@audius/sdk' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { SupporterMetadata, @@ -38,7 +38,7 @@ export const useSupporter = ( { userId, supporterUserId }: UseSupporterArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() @@ -74,7 +74,7 @@ export const getTopSupporterQueryKey = (userId: ID | null | undefined) => { } export const useTopSupporter = (userId: ID | null | undefined) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useSupporters.ts b/packages/common/src/api/tan-query/users/useSupporters.ts index 00ff99f9956..a10887548a4 100644 --- a/packages/common/src/api/tan-query/users/useSupporters.ts +++ b/packages/common/src/api/tan-query/users/useSupporters.ts @@ -6,7 +6,7 @@ import { } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { SupporterMetadata, @@ -39,7 +39,7 @@ export const useSupporters = ( { userId, pageSize = DEFAULT_PAGE_SIZE }: UseSupportersArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts b/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts index 7442fb4aae7..5fb9005c664 100644 --- a/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts +++ b/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userMetadataFromSDK } from '~/adapters' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { QUERY_KEYS } from '../queryKeys' @@ -33,7 +33,7 @@ export const useTopArtistsInGenre = ( args: UseTopArtistsInGenreArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { genre, pageSize = ARTISTS_PER_GENRE_PAGE_SIZE } = args diff --git a/packages/common/src/api/tan-query/users/useUnfollowUser.ts b/packages/common/src/api/tan-query/users/useUnfollowUser.ts index 99a083db183..25a0f5b10d1 100644 --- a/packages/common/src/api/tan-query/users/useUnfollowUser.ts +++ b/packages/common/src/api/tan-query/users/useUnfollowUser.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { useAppContext } from '~/context/appContext' import { Kind } from '~/models' import { Name, FollowSource } from '~/models/Analytics' @@ -28,7 +28,7 @@ type MutationContext = { } export const useUnfollowUser = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { diff --git a/packages/common/src/api/tan-query/users/useUpdateProfile.ts b/packages/common/src/api/tan-query/users/useUpdateProfile.ts index d4c5b878356..1ae4d23829b 100644 --- a/packages/common/src/api/tan-query/users/useUpdateProfile.ts +++ b/packages/common/src/api/tan-query/users/useUpdateProfile.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { userMetadataToSdk } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Feature } from '~/models/ErrorReporting' import { UserMetadata, WriteableUserMetadata } from '~/models/User' import { dataURLtoFile } from '~/utils' @@ -16,7 +16,7 @@ export type MutationContext = { } export const useUpdateProfile = () => { - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/users/useUpdateUser.ts b/packages/common/src/api/tan-query/users/useUpdateUser.ts index b79b27e8af5..117c0accf11 100644 --- a/packages/common/src/api/tan-query/users/useUpdateUser.ts +++ b/packages/common/src/api/tan-query/users/useUpdateUser.ts @@ -2,7 +2,7 @@ import { AudiusSdk, OptionalId } from '@audius/sdk' import { useMutation, useQueryClient } from '@tanstack/react-query' import { userMetadataToSdk } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { PlaylistLibrary } from '~/models/PlaylistLibrary' import { UserMetadata } from '~/models/User' @@ -23,7 +23,7 @@ export type UpdateUserParams = { } export const useUpdateUser = () => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() return useMutation({ diff --git a/packages/common/src/api/tan-query/users/useUser.ts b/packages/common/src/api/tan-query/users/useUser.ts index 477fe11bd29..5bd80f135ee 100644 --- a/packages/common/src/api/tan-query/users/useUser.ts +++ b/packages/common/src/api/tan-query/users/useUser.ts @@ -3,7 +3,7 @@ import { useMemo } from 'react' import { useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch, useSelector } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { User } from '~/models/User' import { getUserId } from '~/store/account/selectors' @@ -20,7 +20,7 @@ export const useUser = ( userId: ID | null | undefined, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() const currentUserId = useSelector(getUserId) diff --git a/packages/common/src/api/tan-query/users/useUserAlbums.ts b/packages/common/src/api/tan-query/users/useUserAlbums.ts index f6b038e76f8..e0b977b9047 100644 --- a/packages/common/src/api/tan-query/users/useUserAlbums.ts +++ b/packages/common/src/api/tan-query/users/useUserAlbums.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userCollectionMetadataFromSDK } from '~/adapters/collection' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models' import { useCollections } from '../collection/useCollections' @@ -40,7 +40,7 @@ export const useUserAlbums = ( params: GetAlbumsOptions, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const { userId, pageSize = 10, sortMethod = 'recent' } = params const queryClient = useQueryClient() diff --git a/packages/common/src/api/tan-query/users/useUserByHandle.ts b/packages/common/src/api/tan-query/users/useUserByHandle.ts index a34000a5b2a..29d9a3aff40 100644 --- a/packages/common/src/api/tan-query/users/useUserByHandle.ts +++ b/packages/common/src/api/tan-query/users/useUserByHandle.ts @@ -4,7 +4,7 @@ import { omit } from 'lodash' import { useDispatch } from 'react-redux' import { userMetadataListFromSDK } from '~/adapters/user' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { User } from '~/models/User' @@ -23,7 +23,7 @@ export const useUserByHandle = ( handle: string | null | undefined, options?: SelectableQueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const queryClient = useQueryClient() const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/users/useUserCollectibles.ts b/packages/common/src/api/tan-query/users/useUserCollectibles.ts index 3a3695d833a..0fa9b1d1650 100644 --- a/packages/common/src/api/tan-query/users/useUserCollectibles.ts +++ b/packages/common/src/api/tan-query/users/useUserCollectibles.ts @@ -1,7 +1,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { CollectiblesMetadata, ID } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -26,7 +26,7 @@ export const useUserCollectibles = ( options?: QueryOptions ) => { const { userId } = args - const context = useAudiusQueryContext() + const context = useQueryContext() const { audiusSdk } = context const queryResult = useQuery({ @@ -55,7 +55,7 @@ type MutationContext = { } export const useUpdateUserCollectibles = () => { - const context = useAudiusQueryContext() + const context = useQueryContext() const queryClient = useQueryClient() const { audiusSdk } = context diff --git a/packages/common/src/api/tan-query/users/useUserPlaylists.ts b/packages/common/src/api/tan-query/users/useUserPlaylists.ts index 2cf8dd3d9b4..2250b64ccaf 100644 --- a/packages/common/src/api/tan-query/users/useUserPlaylists.ts +++ b/packages/common/src/api/tan-query/users/useUserPlaylists.ts @@ -8,7 +8,7 @@ import { useDispatch } from 'react-redux' import { userCollectionMetadataFromSDK } from '~/adapters/collection' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { useCollections } from '../collection/useCollections' @@ -40,7 +40,7 @@ export const useUserPlaylists = ( params: GetPlaylistsOptions, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() const { userId, pageSize = 10, sortMethod = 'recent' } = params const queryClient = useQueryClient() diff --git a/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts b/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts index 9bcd51eeac9..60b3afcb994 100644 --- a/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts +++ b/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts @@ -4,7 +4,7 @@ import { useDispatch } from 'react-redux' import { userTrackMetadataFromSDK } from '~/adapters/track' import { transformAndCleanList } from '~/adapters/utils' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { QUERY_KEYS } from '../queryKeys' import { useTracks } from '../tracks/useTracks' @@ -40,7 +40,7 @@ export const useUserTracksByHandle = ( args: GetTracksByUserHandleArgs, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const queryClient = useQueryClient() const dispatch = useDispatch() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/api/tan-query/users/useUsers.ts b/packages/common/src/api/tan-query/users/useUsers.ts index 960578ef704..25ae964c58a 100644 --- a/packages/common/src/api/tan-query/users/useUsers.ts +++ b/packages/common/src/api/tan-query/users/useUsers.ts @@ -4,7 +4,7 @@ import { useQueryClient } from '@tanstack/react-query' import { keyBy } from 'lodash' import { useDispatch, useSelector } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { ID } from '~/models/Identifiers' import { UserMetadata } from '~/models/User' import { CommonState } from '~/store' @@ -26,7 +26,7 @@ export const useUsers = ( userIds: ID[] | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const dispatch = useDispatch() const queryClient = useQueryClient() const { data: currentUserId } = useCurrentUserId() diff --git a/packages/common/src/audius-query/AudiusQueryContext.ts b/packages/common/src/api/tan-query/utils/QueryContext.ts similarity index 55% rename from packages/common/src/audius-query/AudiusQueryContext.ts rename to packages/common/src/api/tan-query/utils/QueryContext.ts index 73c271925e7..ca0933cff25 100644 --- a/packages/common/src/audius-query/AudiusQueryContext.ts +++ b/packages/common/src/api/tan-query/utils/QueryContext.ts @@ -19,9 +19,9 @@ import { AnalyticsEvent, IdentifyTraits, ReportToSentryArgs -} from '../models' +} from '../../../models' -export type AudiusQueryContextType = { +export type QueryContextType = { audiusSdk: () => Promise audiusBackend: AudiusBackend authService: AuthService @@ -59,62 +59,48 @@ export type AudiusQueryContextType = { } } -export const AudiusQueryContext = createContext( - null as any -) +export const QueryContext = createContext(null as any) -export const useAudiusQueryContext = () => { - const audiusQueryContext = useContext(AudiusQueryContext) +export const useQueryContext = () => { + const queryContext = useContext(QueryContext) - if (!audiusQueryContext) { + if (!queryContext) { throw new Error( - 'useAudiusQueryContext has to be used within ' + 'useQueryContext has to be used within ' ) } - return audiusQueryContext + return queryContext } -export function* getAudiusQueryContext(): Generator< - any, - AudiusQueryContextType, - any -> { +export function* getQueryContext(): Generator { // We can't use common typed `getContext` here because of circular dependency return { - audiusBackend: yield* getContext( + audiusBackend: yield* getContext( 'audiusBackendInstance' ), authService: - yield* getContext('authService'), + yield* getContext('authService'), identityService: - yield* getContext( - 'identityService' - ), - audiusSdk: - yield* getContext('audiusSdk'), + yield* getContext('identityService'), + audiusSdk: yield* getContext('audiusSdk'), solanaWalletService: yield* getContext< - AudiusQueryContextType['solanaWalletService'] + QueryContextType['solanaWalletService'] >('solanaWalletService'), - dispatch: yield* getContext('dispatch'), - env: yield* getContext('env'), + dispatch: yield* getContext('dispatch'), + env: yield* getContext('env'), fetch, getFeatureEnabled: - yield* getContext( + yield* getContext( 'getFeatureEnabled' ), remoteConfigInstance: yield* getContext< - AudiusQueryContextType['remoteConfigInstance'] + QueryContextType['remoteConfigInstance'] >('remoteConfigInstance'), reportToSentry: - yield* getContext( - 'reportToSentry' - ), - analytics: - yield* getContext('analytics'), - nftClient: - yield* getContext('nftClient'), - imageUtils: - yield* getContext('imageUtils') + yield* getContext('reportToSentry'), + analytics: yield* getContext('analytics'), + nftClient: yield* getContext('nftClient'), + imageUtils: yield* getContext('imageUtils') } } diff --git a/packages/common/src/api/tan-query/utils/index.ts b/packages/common/src/api/tan-query/utils/index.ts index 86877f5546c..67c3724f8bc 100644 --- a/packages/common/src/api/tan-query/utils/index.ts +++ b/packages/common/src/api/tan-query/utils/index.ts @@ -8,3 +8,4 @@ export { primeRelatedData } from './primeRelatedData' export { primeTrackData } from './primeTrackData' export { primeUserData } from './primeUserData' export { useQueries } from './useQueries' +export * from './QueryContext' diff --git a/packages/common/src/api/tan-query/utils/primeTrackData.ts b/packages/common/src/api/tan-query/utils/primeTrackData.ts index c22a915e685..2f5bdc1ccf0 100644 --- a/packages/common/src/api/tan-query/utils/primeTrackData.ts +++ b/packages/common/src/api/tan-query/utils/primeTrackData.ts @@ -83,7 +83,6 @@ const setDefaultFolloweeSaves = (track: T) => { export const reformat = (track: T): Track => { const t = track const withoutUser = omit(t, 'user') - // audius-query denormalization expects track.user to contain the id of the owner. const withUserIdAsUser = { ...withoutUser, user: t.owner_id } const withCosign = setIsCoSigned(withUserIdAsUser) const withFieldVisibility = setFieldVisibility(withCosign) diff --git a/packages/common/src/api/tan-query/wallets/useAudioBalance.ts b/packages/common/src/api/tan-query/wallets/useAudioBalance.ts index 247831bab03..ac2b23c64b8 100644 --- a/packages/common/src/api/tan-query/wallets/useAudioBalance.ts +++ b/packages/common/src/api/tan-query/wallets/useAudioBalance.ts @@ -5,7 +5,7 @@ import { PublicKey } from '@solana/web3.js' import { useQueries, useQuery } from '@tanstack/react-query' import { getAddress } from 'viem' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { Chain } from '~/models' import type { Env } from '~/services' @@ -78,7 +78,7 @@ export const useWalletAudioBalance = ( { address, includeStaked, chain }: UseWalletAudioBalanceParams, options?: QueryOptions ) => { - const { audiusSdk, env } = useAudiusQueryContext() + const { audiusSdk, env } = useQueryContext() return useQuery({ queryKey: getWalletAudioBalanceQueryKey({ address, includeStaked, chain }), @@ -105,7 +105,7 @@ export const useWalletAudioBalances = ( params: UseAudioBalancesParams, options?: QueryOptions ) => { - const { audiusSdk, env } = useAudiusQueryContext() + const { audiusSdk, env } = useQueryContext() return useQueries({ queries: params.wallets.map(({ address, chain }) => ({ queryKey: getWalletAudioBalanceQueryKey({ diff --git a/packages/common/src/api/tan-query/wallets/useConnectedWallets.ts b/packages/common/src/api/tan-query/wallets/useConnectedWallets.ts index bd2ec0a8732..0090a1f536b 100644 --- a/packages/common/src/api/tan-query/wallets/useConnectedWallets.ts +++ b/packages/common/src/api/tan-query/wallets/useConnectedWallets.ts @@ -2,7 +2,7 @@ import { Id } from '@audius/sdk' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { Chain, type ID } from '~/models' import { profilePageActions } from '~/store/pages' import { walletActions } from '~/store/wallet' @@ -28,7 +28,7 @@ export const getConnectedWalletsQueryKey = ({ > export const useConnectedWallets = (options?: QueryOptions) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: currentUserId } = useCurrentUserId() return useQuery({ @@ -61,7 +61,7 @@ type AddConnectedWalletParams = { export const useAddConnectedWallet = () => { const queryClient = useQueryClient() - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const { data: currentUserId } = useCurrentUserId() // for priming cache @@ -133,7 +133,7 @@ export type RemoveConnectedWalletParams = { export const useRemoveConnectedWallet = () => { const queryClient = useQueryClient() - const { audiusSdk, reportToSentry } = useAudiusQueryContext() + const { audiusSdk, reportToSentry } = useQueryContext() const { data: currentUserId } = useCurrentUserId() // for priming cache diff --git a/packages/common/src/api/tan-query/wallets/useUSDCBalance.ts b/packages/common/src/api/tan-query/wallets/useUSDCBalance.ts index 2250bdcb941..b673f88096f 100644 --- a/packages/common/src/api/tan-query/wallets/useUSDCBalance.ts +++ b/packages/common/src/api/tan-query/wallets/useUSDCBalance.ts @@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query' import BN from 'bn.js' import { useDispatch, useSelector } from 'react-redux' -import { useAudiusQueryContext } from '~/audius-query' +import { useQueryContext } from '~/api' import { Status } from '~/models/Status' import { BNUSDC, StringUSDC } from '~/models/Wallet' import { getUserbankAccountInfo } from '~/services/index' @@ -41,7 +41,7 @@ export const useUSDCBalance = ({ pollingInterval?: number commitment?: Commitment } & QueryOptions = {}) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() const { data: user } = useGetCurrentUser({}) const ethAddress = user?.wallet ?? null const dispatch = useDispatch() diff --git a/packages/common/src/api/tan-query/wallets/useWalletCollectibles.ts b/packages/common/src/api/tan-query/wallets/useWalletCollectibles.ts index b63a645a276..3f1c4aedd50 100644 --- a/packages/common/src/api/tan-query/wallets/useWalletCollectibles.ts +++ b/packages/common/src/api/tan-query/wallets/useWalletCollectibles.ts @@ -1,7 +1,7 @@ import type { CollectibleState } from '@audius/fetch-nft' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { Chain } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -30,7 +30,7 @@ export const useWalletCollectibles = ( { address, chain }: UseWalletCollectibles, options?: QueryOptions ) => { - const { nftClient } = useAudiusQueryContext() + const { nftClient } = useQueryContext() return useQuery({ queryKey: getWalletCollectiblesQueryKey({ address, chain }), diff --git a/packages/common/src/api/tan-query/wallets/useWalletOwner.ts b/packages/common/src/api/tan-query/wallets/useWalletOwner.ts index 6a920199eea..e9f0537c2d6 100644 --- a/packages/common/src/api/tan-query/wallets/useWalletOwner.ts +++ b/packages/common/src/api/tan-query/wallets/useWalletOwner.ts @@ -2,7 +2,7 @@ import { getAccount } from '@solana/spl-token' import { PublicKey } from '@solana/web3.js' import { useQuery } from '@tanstack/react-query' -import { useAudiusQueryContext } from '~/audius-query/AudiusQueryContext' +import { useQueryContext } from '~/api/tan-query/utils/QueryContext' import { SolanaWalletAddress } from '~/models' import { QUERY_KEYS } from '../queryKeys' @@ -27,7 +27,7 @@ export const useWalletOwner = ( walletAddress: SolanaWalletAddress | null | undefined, options?: QueryOptions ) => { - const { audiusSdk } = useAudiusQueryContext() + const { audiusSdk } = useQueryContext() return useQuery({ queryKey: getWalletOwnerQueryKey(walletAddress), diff --git a/packages/common/src/audius-query/README.md b/packages/common/src/audius-query/README.md deleted file mode 100644 index e708cb0962d..00000000000 --- a/packages/common/src/audius-query/README.md +++ /dev/null @@ -1,405 +0,0 @@ -# audius-query - -## Table of Contents - -- [audius-query](#audius-query) - - [Table of Contents](#table-of-contents) - - [Why audius-query](#why-audius-query) - - [Usage](#usage) - - [Make an api](#make-an-api) - - [Add a query endpoint](#add-a-query-endpoint) - - [Adding a mutation endpoint](#adding-a-mutation-endpoint) - - [Adding optimistic updates to your mutation endpoint](#adding-optimistic-updates-to-your-mutation-endpoint) - - [Paginating Your Query Endpoint](#paginating-your-query-endpoint) - - [Pre-fetching related entities](#pre-fetching-related-entities) - - [Cascading hooks](#cascading-hooks) - - [Pre-fetching in endpoint implementations](#pre-fetching-in-endpoint-implementations) - - [Batching requests](#batching-requests) - - [Query Hook options](#query-hook-options) - - [Caching](#caching) - - [Endpoint response caching](#endpoint-response-caching) - - [Entity caching](#entity-caching) - - [Enable entity caching on an endpoint](#enable-entity-caching-on-an-endpoint) - - [Enable single-entity cache hits](#enable-single-entity-cache-hits) - - [Example (useGetTrackById)](#example-usegettrackbyid) - - [Debugging](#debugging) - -## Why audius-query - -- Easy data access pattern -- No need to write sagas, slice, and selectors for each new endpoint -- Integrates with the existing entity cache for `Track`, `Collection`, and `User` - -## Usage - -## Make an api - -1. Call `createApi` which will automatically create a slice with scoped data and status for each endpoint - - ```typescript - const userApi = createApi({ - reducerPath: 'userApi', - endpoints: { - // ADD ENDPOINT DEFINITION HERE - } - }) - - export const { - /* NAMED HOOK EXPORTS */ - } = userApi.hooks - export const userApiReducer = userApi.reducer - ``` - -1. Add the reducer export to [reducer.ts](reducer.ts) - -## Add a query endpoint - -1. Implement the fetch function - - - `audiusClient` and `audiusBackend` are available from the context argument - - ```typescript - endpoints: { - getSomeData: { - fetch: async ( - { id } /* fetch args */, - { audiusBackend } /* context */ - ) => { - return await getSomeData({ id }) - }, - options: { - // see below - } - } - } - ``` - -1. Add relevant endpoint options - - - **`schemaKey`** - the corresponding key in `apiResponseSchema` see [schema.ts](./schema.ts). See [enable entity caching on an endpoint](#enable-entity-caching-on-an-endpoint) below - - _Note: A schema key is required, though any unreserved key can be used if the data does not contain any of the entities stored in the entity cache (i.e. any of the `Kinds` from [Kind.ts](/packages/common/src/models/Kind.ts))_ - - - **`kind`** - in combination with either `idArgKey` or `permalinkArgKey`, allows local cache hits for single entities. If an entity with the matching `kind` and the `id` or `permalink` exists in cache, we will return that instead of calling the fetch function. See [enable single entity cache hits](#enable-single-entity-cache-hits) below - - **`idArgKey`** - `fetchArgs[idArgKey]` must contain the id of the entity - - **`permalinkArgKey`** - `fetchArgs[permalinkArgKey]` must contain the permalink of the entity - - **`idListArgKey`** - works like `idArgKey` but for endpoints that return a list entities - - **`type`** - by default endpoint additions are viewed as "queries" ie methods that fetch data. Specifying `type: 'mutation'` tells audius-query you are implementing a method that will write data to the server. - - **`retry`** - enables retries for the endpoint. The fetch function will automatically be called multiple times, with the final error bubbling up if all retries are exhausted. Fetches resulting in `400`, `401`, and `403` are never retried. - - **`retryConfig`** - Overrides the default retry config for advanced use cases. The options are passed directly to [`async-retry`](https://github.com/vercel/async-retry). - - **`fetchBatch`** - If specified, the endpoint will automatically batch groups of requests that fall into a batch period. `fetchBatch` takes an args object containing an `ids` array and should return an array of entities. It requires that you specify both the `idArgKey` and `schemaKey` options - -1. Export the query hook - - A Hook will automatically be generated for each endpoint, using the naming convention `` [`use${capitalize(endpointName)}`] `` (e.g. `getSomeData` -> `useGetSomeData`) - - ```typescript - const userApi = createApi({ - endpoints: { - getSomeData: { - // ... - } - } - }) - - // Export the hook for each endpoint here - export const { useGetSomeData } = userApi.hooks - export default userApi.reducer - ``` - -1. Use the query hook - -- Generated fetch hooks take the same args as the fetch function plus an options object. They return the same type returned by the fetch function. - - ```typescript - type QueryHook = ( - fetchArgs: /* matches the first argument to the endpoint fetch fn */ - options: /* {...} */ - ) => { - data: /* return value from fetch function */ - status: Status - errorMessage?: string - } - ``` - -- In your component: - - ```typescript - const { - data: someData, - status, - errorMessage - } = useGetSomeData({ id: elementId }, /* optional */ { disabled: !elementId }) - - return status === Status.LOADING ? ( - - ) : ( - - ) - ``` - -## Adding a mutation endpoint - -1. Implement the fetch function - - ```typescript - endpoints: { - updateSomeData: { - fetch: async ( - { id } /* fetch args */, - { audiusBackend } /* context */ - ) => { - return await updateSomeData({ id }) - }, - options: { - type: 'mutation', // This turns endpoint into a mutation - // Same additional options as query endpoint - } - } - } - ``` - -1. Export hooks (same process as query endpoints) - -1. Use hook in your component - - ```typescript - const [updateSomeData, result] = useUpdateSomeData() - const { data: someData, status, errorMessage } = result - - - return ( -