Skip to content

Commit c0041f7

Browse files
committed
Tweaks for showing specific details to mixed roles
1 parent 0d1ef7c commit c0041f7

File tree

5 files changed

+335
-193
lines changed

5 files changed

+335
-193
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,11 @@ export function renderReviewScoreCell(
242242
.trim()
243243
.toUpperCase()
244244
: ''
245+
const hasValidScore = typeof review.finalScore === 'number'
246+
&& Number.isFinite(review.finalScore)
247+
245248
if (!normalizedStatus) {
246-
return true
249+
return !hasValidScore
247250
}
248251

249252
return normalizedStatus !== 'COMPLETED'
@@ -540,9 +543,9 @@ export function renderScoreCell(
540543
}
541544

542545
const reviewInfo = reviewDetail.reviewInfo
543-
const reviewId = reviewInfo?.id || reviewDetail.reviewId
546+
const reviewId = reviewInfo?.id ?? reviewDetail.reviewId
544547

545-
if (!reviewInfo || !reviewId) {
548+
if (!reviewId) {
546549
return (
547550
<span className={styles.notReviewed}>
548551
--

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { BackendReview } from './BackendReview.model'
1111
* Review result info
1212
*/
1313
export interface ReviewResult {
14+
id?: string
1415
appeals: AppealResult[]
1516
createdAt: string | Date
1617
createdAtString?: string // this field is calculated at frontend
@@ -111,6 +112,7 @@ export function convertBackendReviewToReviewResult(
111112
appeals: [],
112113
createdAt,
113114
createdAtString,
115+
id: data.id,
114116
phaseName,
115117
resourceId: data.resourceId,
116118
reviewDate,

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export interface SubmissionInfo {
2222
memberId: string
2323
userInfo?: BackendResource // this field is calculated at frontend
2424
review?: ReviewInfo
25+
reviewInfos?: ReviewInfo[]
2526
reviews?: ReviewResult[]
2627
/**
2728
* Backend review type identifier (e.g. 'Post-Mortem Review').
@@ -109,6 +110,9 @@ export function convertBackendSubmissionToSubmissionInfo(
109110
? isPassingReviewRaw
110111
: undefined
111112
const reviewEntries = Array.isArray(data.review) ? data.review : []
113+
const reviewInfos = reviewEntries.map(convertBackendReviewToReviewInfo)
114+
const reviewResults = reviewEntries.map(convertBackendReviewToReviewResult)
115+
const primaryReviewInfo = reviewInfos[0]
112116
const primaryReview = reviewEntries[0]
113117

114118
return {
@@ -117,11 +121,9 @@ export function convertBackendSubmissionToSubmissionInfo(
117121
isLatest: data.isLatest,
118122
isPassingReview,
119123
memberId: data.memberId,
120-
review:
121-
primaryReview
122-
? convertBackendReviewToReviewInfo(primaryReview)
123-
: undefined,
124-
reviews: reviewEntries.map(convertBackendReviewToReviewResult),
124+
review: primaryReviewInfo,
125+
reviewInfos,
126+
reviews: reviewResults,
125127
reviewTypeId: primaryReview?.typeId ?? undefined,
126128
submittedDate,
127129
submittedDateString,

0 commit comments

Comments
 (0)