From 46510cbc3ef7af1285e395eba48e01bb6ba39cbe Mon Sep 17 00:00:00 2001 From: Farid Salau Date: Mon, 17 Feb 2025 10:38:23 -0600 Subject: [PATCH 1/3] Fix crash --- packages/common/src/api/tan-query/comments.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/api/tan-query/comments.ts b/packages/common/src/api/tan-query/comments.ts index b78747621c7..c7119bc14a1 100644 --- a/packages/common/src/api/tan-query/comments.ts +++ b/packages/common/src/api/tan-query/comments.ts @@ -1102,7 +1102,7 @@ export const useGetTrackCommentNotificationSetting = ( return useQuery({ queryKey: getTrackCommentNotificationSettingQueryKey(trackId), queryFn: async () => { - if (!currentUserId) return + if (!currentUserId) return null const sdk = await audiusSdk() return await sdk.tracks.trackCommentNotificationSetting({ trackId: Id.parse(trackId), From f44a208508d1cdcf4529376e7f9fbc034c0ffaac Mon Sep 17 00:00:00 2001 From: Farid Salau Date: Mon, 17 Feb 2025 10:47:38 -0600 Subject: [PATCH 2/3] Add eslint rule --- packages/common/.eslintrc.js | 21 +++++++++++++++++++ packages/common/src/api/tan-query/comments.ts | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/common/.eslintrc.js b/packages/common/.eslintrc.js index 91a3ae6e7b9..314d7ae6365 100644 --- a/packages/common/.eslintrc.js +++ b/packages/common/.eslintrc.js @@ -21,6 +21,27 @@ module.exports = { } ] } + ], + 'no-restricted-syntax': [ + 'error', + { + selector: + 'CallExpression[callee.name=useQuery] > ObjectExpression > Property[key.name=queryFn] ReturnStatement > Identifier[name=undefined]', + message: + 'Do not return undefined in React Query queryFn. Return null instead.' + }, + { + selector: + 'CallExpression[callee.name=useQuery] > ObjectExpression > Property[key.name=queryFn] IfStatement > BlockStatement > ReturnStatement:not([argument])', + message: + 'Do not return undefined in React Query queryFn. Return null instead.' + }, + { + selector: + 'CallExpression[callee.name=useQuery] > ObjectExpression > Property[key.name=queryFn] ReturnStatement:not([argument])', + message: + 'Do not return undefined in React Query queryFn. Return null instead.' + } ] } } diff --git a/packages/common/src/api/tan-query/comments.ts b/packages/common/src/api/tan-query/comments.ts index c7119bc14a1..b78747621c7 100644 --- a/packages/common/src/api/tan-query/comments.ts +++ b/packages/common/src/api/tan-query/comments.ts @@ -1102,7 +1102,7 @@ export const useGetTrackCommentNotificationSetting = ( return useQuery({ queryKey: getTrackCommentNotificationSettingQueryKey(trackId), queryFn: async () => { - if (!currentUserId) return null + if (!currentUserId) return const sdk = await audiusSdk() return await sdk.tracks.trackCommentNotificationSetting({ trackId: Id.parse(trackId), From f15a5d9b87ac7f26234bea16742cc95f727b2796 Mon Sep 17 00:00:00 2001 From: Farid Salau Date: Mon, 17 Feb 2025 10:48:37 -0600 Subject: [PATCH 3/3] re-add fix --- packages/common/src/api/tan-query/comments.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/api/tan-query/comments.ts b/packages/common/src/api/tan-query/comments.ts index b78747621c7..c7119bc14a1 100644 --- a/packages/common/src/api/tan-query/comments.ts +++ b/packages/common/src/api/tan-query/comments.ts @@ -1102,7 +1102,7 @@ export const useGetTrackCommentNotificationSetting = ( return useQuery({ queryKey: getTrackCommentNotificationSettingQueryKey(trackId), queryFn: async () => { - if (!currentUserId) return + if (!currentUserId) return null const sdk = await audiusSdk() return await sdk.tracks.trackCommentNotificationSetting({ trackId: Id.parse(trackId),