Skip to content

fix(PM-3141): Respond to appeals #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kkartunov merged 5 commits into from
Dec 11, 2025
Merged

fix(PM-3141): Respond to appeals #1366

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da81018
fix: directly open scorecard in edit mode
hentrymartin Dec 10, 2025
5a25ed2
fix: revalidate appeals and response
hentrymartin Dec 10, 2025
d216fde
fix: revalidate appeals and response
hentrymartin Dec 10, 2025
b111246
fix: lint
hentrymartin Dec 10, 2025
548b0c4
fix: lint
hentrymartin Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/apps/review/src/lib/hooks/useFetchSubmissionReviews.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from 'react'
import { find, forEach, map } from 'lodash'
import { toast } from 'react-toastify'
import useSWR, { SWRResponse } from 'swr'
import useSWR, { SWRResponse, mutate } from 'swr'

import { handleError } from '~/apps/admin/src/lib/utils'

Expand Down Expand Up @@ -56,6 +56,7 @@ import { ReviewItemComment } from '../models/ReviewItemComment.model'
import { SUBMITTER } from '../../config/index.config'

import { useRole, useRoleProps } from './useRole'
import { EnvironmentConfig } from '~/config'

const hasSubmitterReviewDetails = (review?: BackendReview): boolean => {
if (!review) {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -857,8 +858,23 @@ 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 (resourceId) {
// re-fetch appeals for this resourceId
mutate(`EnvironmentConfig.API.V6/appeals/resourceId/${resourceId}`, (prev: any) => ({ ...prev, status: "processing" }), false)

}
Copy link

@github-actions github-actions bot Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[💡 style]
The removal of trailing whitespace on this line is a minor stylistic change. While it does not affect functionality, ensuring no trailing whitespace can help maintain a clean codebase.

if (reviewId) {
// re-fetch review data
mutate(`EnvironmentConfig.API.V6/reviews/${reviewId}`, (prev: any) => ({ ...prev, status: "processing" }), false)
}
} catch (e) {
// ignore mutate errors
}

toast.success('Appeal response saved successfully!')
success()
})
Expand All @@ -867,7 +883,7 @@ export function useFetchSubmissionReviews(reviewId: string = ''): useFetchSubmis
handleError(e)
})
},
[resourceId, reviewInfo, setUpdatedReviewInfo, updatedReviewInfo],
[resourceId, reviewInfo, setUpdatedReviewInfo, updatedReviewInfo, reviewId],
)

/**
Expand Down
2 changes: 1 addition & 1 deletion src/apps/review/src/lib/utils/routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Copy link

@github-actions github-actions bot Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[❗❗ correctness]
Adding &respondToAppeals=true to the query string changes the behavior of the route. Ensure that this change is intentional and that all parts of the application relying on this route are updated accordingly. If this parameter is optional, consider making it conditional to avoid potential issues with existing functionality.

}
}

Expand Down
8 changes: 7 additions & 1 deletion src/apps/review/src/pages/reviews/components/ReviewViewer/ReviewViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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')
Copy link

@github-actions github-actions bot Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[⚠️ correctness]
Using searchParams.get("respondToAppeals") === 'true' directly in the useState initializer can lead to unexpected behavior if the searchParams change after the component mounts. Consider using a useEffect to update respondToAppeals whenever searchParams change.

const {
reviewId,
setReviewStatus,
Expand Down Expand Up @@ -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])
Copy link

@github-actions github-actions bot Dec 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[❗❗ correctness]
The dependency array for this useEffect includes respondToAppeals, which is being set within the effect itself. This can lead to an infinite loop if not handled carefully. Ensure that the logic inside the effect does not inadvertently cause repeated state updates.


const toggleManagerEdit = useCallback(() => {
setIsManagerEdit(prev => !prev)
Expand Down
Loading