Skip to content

Commit d7c755f

Browse files
committed
fix unapprove redirect url
1 parent 54ed591 commit d7c755f

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

src/apps/admin/src/lib/components/common/Tab/SystemAdminTabs.tsx

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Dispatch, FC, SetStateAction, useMemo, useState } from 'react'
1+
import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react'
22
import { NavigateFunction, useLocation, useNavigate } from 'react-router-dom'
33

44
import { TabsNavbar } from '~/libs/ui'
@@ -24,6 +24,14 @@ const SystemAdminTabs: FC = () => {
2424
navigate(childTabId)
2525
}
2626

27+
// If url is changed by navigator on different tabs, we need set activeTab
28+
useEffect(() => {
29+
const pathTabId = getTabIdFromPathName(pathname)
30+
if (pathTabId !== activeTab) {
31+
setActiveTab(pathTabId)
32+
}
33+
}, [pathname]) // eslint-disable-line react-hooks/exhaustive-deps
34+
2735
return (
2836
<div className={styles.container}>
2937
<TabsNavbar

src/apps/admin/src/review-management/ManageReviewerPage/ManageReviewerPage.tsx

+14-4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
} from '../../lib/models'
3333
import {
3434
approveApplication,
35+
getChallengeByLegacyId,
3536
getChallengeReviewers,
3637
getChallengeReviewOpportunities,
3738
rejectPending,
@@ -76,6 +77,7 @@ export const ManageReviewerPage: FC = () => {
7677
Array<Reviewer>,
7778
Dispatch<SetStateAction<Array<Reviewer>>>
7879
] = useState<Array<Reviewer>>([])
80+
const [challengeUuid, setChallengeUuid] = useState('')
7981

8082
const {
8183
search: doSearch,
@@ -136,17 +138,25 @@ export const ManageReviewerPage: FC = () => {
136138
})
137139

138140
const unapprove = useEventCallback((): void => {
139-
// how to get challenge Id?
140-
// Now we use one specific challenge id for testing
141-
const realChallengeId = 'c713e250-ecb4-4192-8717-d607ddda8db4'
142-
navigate(`${rootRoute}/challenge-management/${realChallengeId}/manage-user`)
141+
if (challengeUuid) {
142+
navigate(`${rootRoute}/challenge-management/${challengeUuid}/manage-user`)
143+
}
143144
})
144145

145146
// Init
146147
useEffect(() => {
147148
search()
148149
}, [challengeId]) // eslint-disable-line react-hooks/exhaustive-deps -- missing dependency: search
149150

151+
// Gets the challenge details by legacyId
152+
useEffect(() => {
153+
getChallengeByLegacyId(+challengeId)
154+
.then(challenge => {
155+
setChallengeUuid(challenge.id)
156+
})
157+
// eslint-disable-next-line react-hooks/exhaustive-deps -- missing dependency: setChallengeUuid
158+
}, [challengeId, getChallengeByLegacyId])
159+
150160
// Page change
151161
const [pageChangeEvent, setPageChangeEvent] = useState(false)
152162
const previousPageChangeEvent = useRef(false)

0 commit comments

Comments
 (0)