Merge pull request #1276 from topcoder-platform/feat/v6

Feat/v6

Author: jmgasper

src/apps/review/src/lib/components/common/TableColumnRenderers.tsx

@@ -242,8 +242,11 @@ export function renderReviewScoreCell(
                 .trim()
                 .toUpperCase()
             : ''
+        const hasValidScore = typeof review.finalScore === 'number'
+            && Number.isFinite(review.finalScore)
+
         if (!normalizedStatus) {
-            return true
+            return !hasValidScore
         }
 
         return normalizedStatus !== 'COMPLETED'
@@ -540,9 +543,9 @@ export function renderScoreCell(
     }
 
     const reviewInfo = reviewDetail.reviewInfo
-    const reviewId = reviewInfo?.id || reviewDetail.reviewId
+    const reviewId = reviewInfo?.id ?? reviewDetail.reviewId
 
-    if (!reviewInfo || !reviewId) {
+    if (!reviewId) {
         return (
             <span className={styles.notReviewed}>
                 --

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

@@ -12,8 +12,52 @@ import {
     fetchAllResourceRoles,
     fetchChallengeResouces,
 } from '../services/resources.service'
-import { BackendResourceRole, BackendSubmission, ChallengeRealtiveInfosMapping } from '../models'
 import { fetchSubmissions } from '../services'
+import { BackendResourceRole, BackendSubmission, ChallengeRealtiveInfosMapping } from '../models'
+
+const FALLBACK_RESOURCE_ROLES: BackendResourceRole[] = [
+    {
+        fullReadAccess: false,
+        fullWriteAccess: false,
+        id: 'fd672cca-556e-4d16-b0a2-718218edd412',
+        isActive: true,
+        legacyId: 19,
+        name: 'Checkpoint Screener',
+        selfObtainable: false,
+    },
+    {
+        fullReadAccess: true,
+        fullWriteAccess: false,
+        id: '3970272b-85b4-48d8-8439-672b4f6031bd',
+        isActive: true,
+        legacyId: 20,
+        name: 'Checkpoint Reviewer',
+        selfObtainable: false,
+    },
+]
+
+const ensureResourceRoleMapping = (
+    mapping: { [key: string]: BackendResourceRole } | undefined,
+): { [key: string]: BackendResourceRole } => {
+    const base = { ...(mapping ?? {}) }
+
+    FALLBACK_RESOURCE_ROLES.forEach(role => {
+        const existing = base[role.id]
+        if (!existing) {
+            base[role.id] = role
+            return
+        }
+
+        if (!existing.name) {
+            base[role.id] = {
+                ...existing,
+                name: role.name,
+            }
+        }
+    })
+
+    return base
+}
 
 export interface useFetchChallengeRelativeDatasProps {
     challengeRelativeInfosMapping: ChallengeRealtiveInfosMapping // from challenge id to list of my role
@@ -57,20 +101,21 @@ export function useFetchChallengeRelativeDatas(
                 setResourceRoleReviewer(find(results.data, {
                     name: 'Reviewer',
                 }))
-                setResourceRoleMapping(
-                    reduce(
-                        results.data,
-                        (mappingResult, resourceRole: BackendResourceRole) => ({
-                            ...mappingResult,
-                            [resourceRole.id]: resourceRole,
-                        }),
-                        {},
-                    ),
-                )
+                const mapping = ensureResourceRoleMapping(reduce(
+                    results.data,
+                    (mappingResult, resourceRole: BackendResourceRole) => ({
+                        ...mappingResult,
+                        [resourceRole.id]: resourceRole,
+                    }),
+                    {},
+                ))
+
+                setResourceRoleMapping(mapping)
                 setIsLoadingResourceRoles(false)
             })
             .catch(e => {
                 handleError(e)
+                setResourceRoleMapping(current => ensureResourceRoleMapping(current))
                 setIsLoadingResourceRoles(false)
             })
     })

src/apps/review/src/lib/models/ReviewResult.model.ts

@@ -11,6 +11,7 @@ import { BackendReview } from './BackendReview.model'
  * Review result info
  */
 export interface ReviewResult {
+    id?: string
     appeals: AppealResult[]
     createdAt: string | Date
     createdAtString?: string // this field is calculated at frontend
@@ -111,6 +112,7 @@ export function convertBackendReviewToReviewResult(
         appeals: [],
         createdAt,
         createdAtString,
+        id: data.id,
         phaseName,
         resourceId: data.resourceId,
         reviewDate,

src/apps/review/src/lib/models/SubmissionInfo.model.ts

@@ -22,6 +22,7 @@ export interface SubmissionInfo {
     memberId: string
     userInfo?: BackendResource // this field is calculated at frontend
     review?: ReviewInfo
+    reviewInfos?: ReviewInfo[]
     reviews?: ReviewResult[]
     /**
      * Backend review type identifier (e.g. 'Post-Mortem Review').
@@ -109,6 +110,9 @@ export function convertBackendSubmissionToSubmissionInfo(
         ? isPassingReviewRaw
         : undefined
     const reviewEntries = Array.isArray(data.review) ? data.review : []
+    const reviewInfos = reviewEntries.map(convertBackendReviewToReviewInfo)
+    const reviewResults = reviewEntries.map(convertBackendReviewToReviewResult)
+    const primaryReviewInfo = reviewInfos[0]
     const primaryReview = reviewEntries[0]
 
     return {
@@ -117,11 +121,9 @@ export function convertBackendSubmissionToSubmissionInfo(
         isLatest: data.isLatest,
         isPassingReview,
         memberId: data.memberId,
-        review:
-            primaryReview
-                ? convertBackendReviewToReviewInfo(primaryReview)
-                : undefined,
-        reviews: reviewEntries.map(convertBackendReviewToReviewResult),
+        review: primaryReviewInfo,
+        reviewInfos,
+        reviews: reviewResults,
         reviewTypeId: primaryReview?.typeId ?? undefined,
         submittedDate,
         submittedDateString,