Merge pull request #1366 from topcoder-platform/pm-3141_1

fix(PM-3141): Respond to appeals

Author: kkartunov

src/apps/review/src/lib/hooks/useFetchSubmissionReviews.ts

@@ -15,9 +15,10 @@ import {
 } from 'react'
 import { find, forEach, map } from 'lodash'
 import { toast } from 'react-toastify'
-import useSWR, { SWRResponse } from 'swr'
+import useSWR, { mutate, SWRResponse } from 'swr'
 
 import { handleError } from '~/apps/admin/src/lib/utils'
+import { EnvironmentConfig } from '~/config'
 
 import {
     AppealInfo,
@@ -458,7 +459,7 @@ export function useFetchSubmissionReviews(reviewId: string = ''): useFetchSubmis
         data: appeals,
         error: fetchAppealsError,
     }: SWRResponse<AppealInfo[], Error> = useSWR<AppealInfo[], Error>(
-        `EnvironmentConfig.API.V6/appeals/resourceId/${resourceId}`,
+        `${EnvironmentConfig.API.V6}/appeals/resourceId/${resourceId}`,
         {
             fetcher: () => fetchAppeals(1, 100, resourceId),
             isPaused: () => !resourceId,
@@ -857,8 +858,18 @@ export function useFetchSubmissionReviews(reviewId: string = ''): useFetchSubmis
 
             setIsSavingAppealResponse(true)
             Promise.all(listRequest)
-                .then(() => {
+                .then(async () => {
                     setIsSavingAppealResponse(false)
+                    // Revalidate SWR caches so other components using the raw SWR data update immediately
+                    try {
+                        if (reviewId) {
+                            // re-fetch review data
+                            mutate(`EnvironmentConfig.API.V6/reviews/${reviewId}`)
+                        }
+                    } catch (e) {
+                        // ignore mutate errors
+                    }
+
                     toast.success('Appeal response saved successfully!')
                     success()
                 })
@@ -867,7 +878,7 @@ export function useFetchSubmissionReviews(reviewId: string = ''): useFetchSubmis
                     handleError(e)
                 })
         },
-        [resourceId, reviewInfo, setUpdatedReviewInfo, updatedReviewInfo],
+        [resourceId, reviewInfo, setUpdatedReviewInfo, updatedReviewInfo, reviewId],
     )
 
     /**

src/apps/review/src/lib/utils/routes.ts

@@ -26,7 +26,7 @@ export function getReviewRoute(
                 ? `${prefix}/${match[1]}/${match[2]}`
                 : `/${match[1]}/${match[2]}`
 
-            return `${basePath}/reviews/${submissionId}?reviewId=${encodedReviewId}`
+            return `${basePath}/reviews/${submissionId}?reviewId=${encodedReviewId}&respondToAppeals=true`
         }
     }
 

src/apps/review/src/pages/reviews/components/ReviewViewer/ReviewViewer.tsx

@@ -1,5 +1,6 @@
 import { mutate } from 'swr'
 import { FC, useCallback, useEffect, useMemo, useState } from 'react'
+import { useSearchParams } from 'react-router-dom'
 
 import { ChallengeLinksForAdmin } from '~/apps/review/src/lib/components/ChallengeLinksForAdmin'
 import { ScorecardViewer } from '~/apps/review/src/lib/components/Scorecard'
@@ -25,6 +26,8 @@ import styles from './ReviewViewer.module.scss'
 
 const ReviewViewer: FC = () => {
     const navigate = useAppNavigate()
+    const [searchParams] = useSearchParams()
+    const [respondToAppeals, setRespondToAppeals] = useState(searchParams.get('respondToAppeals') === 'true')
     const {
         reviewId,
         setReviewStatus,
@@ -205,8 +208,11 @@ const ReviewViewer: FC = () => {
     useEffect(() => {
         if (!canEditScorecard && isManagerEdit) {
             setIsManagerEdit(false)
+        } else if (!isManagerEdit && respondToAppeals) {
+            setIsManagerEdit(true)
+            setRespondToAppeals(false)
         }
-    }, [canEditScorecard, isManagerEdit])
+    }, [canEditScorecard, isManagerEdit, respondToAppeals])
 
     const toggleManagerEdit = useCallback(() => {
         setIsManagerEdit(prev => !prev)