Merge pull request #1382 from topcoder-platform/pm-3216

fix(PM-3216, PM-2573): dont show edit manager comment to reviewer and filter reviews which are failed screening

Author: hentrymartin

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

@@ -508,6 +508,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                 selectedTab={props.selectedTab}
                 reviews={reviewTabReviews}
                 submitterReviews={reviewTabSubmitterReviews}
+                screeningOutcome={screeningOutcome}
                 reviewMinimumPassingScore={props.reviewMinimumPassingScore}
                 isLoadingReview={props.isLoadingSubmission}
                 isDownloading={isDownloadingSubmission}

src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.tsx

@@ -46,6 +46,10 @@ import { hasSubmitterPassedThreshold } from '../../utils/reviewScoring'
 interface Props {
     aiReviewers?: { aiWorkflowId: string }[]
     selectedTab: string
+    screeningOutcome: {
+        failingSubmissionIds: Set<string>;
+        passingSubmissionIds: Set<string>;
+    }
     reviews: SubmissionInfo[]
     submitterReviews: SubmissionInfo[]
     reviewMinimumPassingScore?: number | null
@@ -636,6 +640,7 @@ export const TabContentReview: FC<Props> = (props: Props) => {
         },
         [resolvedReviewsWithSubmitter],
     )
+
     const filteredSubmitterReviews = useMemo(
         () => {
             if (!resolvedSubmitterReviews.length) {
@@ -729,6 +734,7 @@ export const TabContentReview: FC<Props> = (props: Props) => {
         <TableReview
             aiReviewers={props.aiReviewers}
             datas={reviewRows}
+            screeningOutcome={props.screeningOutcome}
             isDownloading={props.isDownloading}
             downloadSubmission={props.downloadSubmission}
             mappingReviewAppeal={props.mappingReviewAppeal}

src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx

@@ -119,7 +119,7 @@ const ReviewManagerComment: FC<ReviewManagerCommentProps> = props => {
                     <div className={styles.content}>
                         <MarkdownReview value={comment} />
                     </div>
-                    {isManagerEdit && (
+                    {isManagerEdit && canAddManagerComment && (
                         <button
                             type='button'
                             onClick={handleShowCommentForm}

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

@@ -72,6 +72,10 @@ export interface TableReviewProps {
     aiReviewers?: { aiWorkflowId: string }[]
     className?: string
     datas: SubmissionInfo[]
+    screeningOutcome: {
+        failingSubmissionIds: Set<string>;
+        passingSubmissionIds: Set<string>;
+    }
     isDownloading: IsRemovingType
     downloadSubmission: (submissionId: string) => void
     mappingReviewAppeal: MappingReviewAppeal
@@ -230,9 +234,20 @@ export const TableReview: FC<TableReviewProps> = (props: TableReviewProps) => {
         [myReviewerResourceIds],
     )
 
+    const filterScreeningPassedReviews = useCallback(
+        (submissions: SubmissionInfo[]): SubmissionInfo[] => submissions.filter(
+            submission => props.screeningOutcome.passingSubmissionIds.has(submission.id ?? ''),
+        ),
+        [props.screeningOutcome.passingSubmissionIds],
+    )
+
     const submissionsForAggregation = useMemo<SubmissionInfo[]>(
-        () => (restrictToLatest ? latestSubmissions : reviewPhaseDatas),
-        [latestSubmissions, restrictToLatest, reviewPhaseDatas],
+        () => (
+            restrictToLatest
+                ? filterScreeningPassedReviews(latestSubmissions)
+                : filterScreeningPassedReviews(reviewPhaseDatas)
+        ),
+        [latestSubmissions, restrictToLatest, reviewPhaseDatas, filterScreeningPassedReviews],
     )
 
     const aggregatedSubmissionRows = useMemo<AggregatedSubmissionReviews[]>(() => (