fix: badge detail params change

apache · Sep 25, 2024 · 3cf4cd6 · 3cf4cd6
1 parent 88dabcc
commit 3cf4cd6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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,