This is an automated email from the ASF dual-hosted git repository. robin0716 pushed a commit to branch test in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 8d86140b1031adc29844e9dc106d8667b55f8dbb Author: shuai <[email protected]> AuthorDate: Wed Sep 25 12:15:16 2024 +0800 fix: badge detail params change --- ui/src/pages/Badges/Detail/index.tsx | 2 +- ui/src/services/client/badges.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ui/src/pages/Badges/Detail/index.tsx b/ui/src/pages/Badges/Detail/index.tsx index c5713e2b..b5daccaa 100644 --- a/ui/src/pages/Badges/Detail/index.tsx +++ b/ui/src/pages/Badges/Detail/index.tsx @@ -44,7 +44,7 @@ const Index = () => { const { data: badgeInfo, isLoading: isHeaderLoading } = useGetBadgeInfo(badge_id); const { data: badges, isLoading: isDetailLoading } = useBadgeDetailList({ - badge_id, + badge_id: badgeInfo?.id || '', page, page_size: pageSize, username: urlSearchParams.get('username') || null, diff --git a/ui/src/services/client/badges.ts b/ui/src/services/client/badges.ts index e1617aab..bc5c97bd 100644 --- a/ui/src/services/client/badges.ts +++ b/ui/src/services/client/badges.ts @@ -54,11 +54,13 @@ export const useGetBadgeInfo = (id: string) => { }; export const useBadgeDetailList = (params: Type.BadgeDetailListReq) => { - if (!params.badge_id) return { data: null, isLoading: false, error: null }; + const path = params.badge_id + ? `/answer/api/v1/badge/awards/page?${qs.stringify(params, { + skipNulls: true, + })}` + : null; const { data, error, mutate } = useSWR<Type.BadgeDetailListRes, Error>( - `/answer/api/v1/badge/awards/page?${qs.stringify(params, { - skipNulls: true, - })}`, + path, (url) => request.get(url, { allow404: true,
