Merge branch 'feat/v6' of github.com:topcoder-platform/platform-ui into feat/v6

Author: jmgasper

src/apps/review/src/lib/components/ChallengePhaseInfo/ChallengePhaseInfo.tsx

@@ -19,6 +19,7 @@ interface Props {
     className?: string
     challengeInfo: ChallengeInfo
     reviewProgress: number
+    reviewInProgress: boolean
     variant?: 'active' | 'past'
 }
 
@@ -112,6 +113,7 @@ export const ChallengePhaseInfo: FC<Props> = (props: Props) => {
     const uiItems = useMemo(() => {
         const data = props.challengeInfo
         const variant = props.variant ?? 'active'
+        const reviewInProgress = props.reviewInProgress
 
         const items: any[] = []
 
@@ -172,18 +174,21 @@ export const ChallengePhaseInfo: FC<Props> = (props: Props) => {
                 value: data.timeLeft || '-',
             })
 
-            items.push({
-                title: 'Review Progress',
-                type: PROGRESS_TYPE,
-                value: props.reviewProgress,
-            })
+            if (!reviewInProgress) {
+                items.push({
+                    title: 'Review Progress',
+                    type: PROGRESS_TYPE,
+                    value: props.reviewProgress,
+                })
+            }
         }
 
         return items
     }, [
         myChallengeRoles,
         props.challengeInfo,
         props.reviewProgress,
+        props.reviewInProgress,
         props.variant,
         hasPayment,
         paymentAmount,

src/apps/review/src/lib/components/TableReviewAppeals/TableReviewAppeals.tsx

@@ -700,7 +700,8 @@ export const TableReviewAppeals: FC<Props> = (props: Props) => {
                 label: 'Review Score',
                 renderer: (data: SubmissionRow) => {
                     const scoreDisplay = data.aggregated?.averageFinalScoreDisplay
-                    if (!scoreDisplay) {
+                    const isReviewInProgress = data.review?.status === 'IN_PROGRESS'
+                    if (!scoreDisplay || isReviewInProgress) {
                         return (
                             <span className={styles.statusBadgePending}>
                                 Pending Review

src/apps/review/src/pages/active-review-assignements/ChallengeDetailsPage/ChallengeDetailsPage.tsx

@@ -510,6 +510,8 @@ export const ChallengeDetailsPage: FC<Props> = (props: Props) => {
         () => location.pathname.includes(`/${pastReviewAssignmentsRouteId}/`),
         [location.pathname],
     )
+    const latestReview = review.find(r => r.isLatest)
+    const reviewInProgress = latestReview?.review?.status === 'IN_PROGRESS'
     const currentUserResource = useMemo<BackendResource | undefined>(() => myResources
         .find(resource => typeof resource.phaseChangeNotifications === 'boolean')
         ?? myResources[0], [myResources])
@@ -1579,6 +1581,7 @@ export const ChallengeDetailsPage: FC<Props> = (props: Props) => {
                             <ChallengePhaseInfo
                                 challengeInfo={challengeInfo}
                                 reviewProgress={reviewProgress}
+                                reviewInProgress={reviewInProgress}
                                 variant={isPastReviewDetail ? 'past' : 'active'}
                             />
                         )}