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

jmgasper · jmgasper · commit 2a17ea4da5d6 · 2025-12-16T08:13:56.000+11:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -226,7 +226,6 @@ workflows:
                       branches:
                           only:
                               - dev
-                              - pm-3141_3
 
             - deployQa:
                   context: org-global
diff --git a/src/apps/profiles/src/lib/helpers.ts b/src/apps/profiles/src/lib/helpers.ts
@@ -90,7 +90,7 @@ export function subTrackLabelToHumanName(label: string): string {
 export function isValidURL(urlToValidate: string): boolean {
     const pattern = new RegExp(
         '^(https?:\\/\\/)?' // protocol
-        + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' // domain name
+        + '((([a-z\\d](?:[a-z\\d-]*[a-z\\d])?)\\.)+[a-z]{2,}|' // domain name, forbid leading/trailing dash in label
         + '((\\d{1,3}\\.){3}\\d{1,3}))' // OR IP (v4) address
         + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' // port and path
         + '(\\?[;&a-z\\d%_.~+=-]*)?' // query string
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/ChallengeDetailsContent.tsx b/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}
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentCheckpoint.tsx b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentCheckpoint.tsx
@@ -1,7 +1,7 @@
 /**
  * Content of checkpoint tab.
  */
-import { FC, useContext, useMemo } from 'react'
+import { FC, useCallback, useContext, useMemo } from 'react'
 
 import { TableLoading } from '~/apps/admin/src/lib'
 import { IsRemovingType } from '~/apps/admin/src/lib/models'
@@ -75,6 +75,32 @@ export const TabContentCheckpoint: FC<Props> = (props: Props) => {
         [props.checkpointReview, myMemberIds, props.checkpointReviewMinimumPassingScore],
     )
 
+    const checkpointScreeningOutcome = useMemo(
+        () => {
+            const passingSubmissionIds = new Set<string>()
+            const failingSubmissionIds = new Set<string>()
+
+            props.checkpoint.forEach(entry => {
+                if (!entry?.submissionId) {
+                    return
+                }
+
+                const normalizedResult = (entry.result || '').toUpperCase()
+                if (normalizedResult === 'PASS') {
+                    passingSubmissionIds.add(`${entry.submissionId}`)
+                } else if (normalizedResult === 'NO PASS') {
+                    failingSubmissionIds.add(`${entry.submissionId}`)
+                }
+            })
+
+            return {
+                failingSubmissionIds,
+                passingSubmissionIds,
+            }
+        },
+        [props.checkpoint],
+    )
+
     const filteredCheckpoint = useMemo<Screening[]>(
         () => {
             const baseRows = props.checkpoint ?? []
@@ -107,9 +133,15 @@ export const TabContentCheckpoint: FC<Props> = (props: Props) => {
         ],
     )
 
+    const filterCheckpointReviewByScreeningResult = useCallback(
+        (screening: Screening[]) => screening
+            .filter(row => checkpointScreeningOutcome.passingSubmissionIds.has(`${row.submissionId}`)),
+        [checkpointScreeningOutcome],
+    )
+
     const filteredCheckpointReview = useMemo<Screening[]>(
         () => {
-            const baseRows = props.checkpointReview ?? []
+            const baseRows = filterCheckpointReviewByScreeningResult(props.checkpointReview ?? [])
 
             if (isPrivilegedRole || (isChallengeCompleted && hasPassedCheckpointReviewThreshold)) {
                 return baseRows
@@ -135,6 +167,7 @@ export const TabContentCheckpoint: FC<Props> = (props: Props) => {
             hasPassedCheckpointReviewThreshold,
             checkpointReviewerResourceIds,
             myMemberIds,
+            checkpointScreeningOutcome,
         ],
     )
 
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentReview.tsx b/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}
diff --git a/src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx b/src/apps/review/src/lib/components/FieldMarkdownEditor/FieldMarkdownEditor.tsx
@@ -135,7 +135,7 @@ const toggleStrategy = {
     },
     italic: (start: any, end: any) => {
         const startType = start.replace(/(\*|_)(?![\s\S]*(\*|_))/, '')
-        const endType = end.replace(/(\*|_)/, '')
+        const endType = end.replace(/(\*|_)/g, '')
         return { endType, startType }
     },
     strikethrough: (start: any, end: any) => {
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardQuestion/ReviewResponse/ReviewManagerComment/ReviewManagerComment.tsx
@@ -31,6 +31,7 @@ interface ReviewManagerCommentProps {
 const ReviewManagerComment: FC<ReviewManagerCommentProps> = props => {
     const {
         isManagerEdit,
+        canAddManagerComment,
         isSavingManagerComment,
         addManagerComment,
     }: ScorecardViewerContextValue = useScorecardViewerContext()
@@ -118,7 +119,7 @@ const ReviewManagerComment: FC<ReviewManagerCommentProps> = props => {
                     <div className={styles.content}>
                         <MarkdownReview value={comment} />
                     </div>
-                    {isManagerEdit && (
+                    {isManagerEdit && canAddManagerComment && (
                         <button
                             type='button'
                             onClick={handleShowCommentForm}
@@ -131,7 +132,7 @@ const ReviewManagerComment: FC<ReviewManagerCommentProps> = props => {
                 </div>
             )}
 
-            {!showCommentForm && !comment && isManagerEdit && (
+            {!showCommentForm && !comment && isManagerEdit && canAddManagerComment && (
                 <button
                     type='button'
                     onClick={handleShowCommentForm}
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardViewer.context.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardViewer.context.tsx
@@ -22,6 +22,7 @@ export interface ScorecardViewerContextProps {
     children: ReactNode;
     scorecard: Scorecard | ScorecardInfo
     aiFeedbackItems?: AiFeedbackItem[]
+    canAddManagerComment?: boolean
     reviewInfo?: ReviewInfo
     isEdit?: boolean
     isManagerEdit?: boolean
@@ -66,6 +67,7 @@ export interface ScorecardViewerContextProps {
 
 export type ScorecardViewerContextValue = {
     aiFeedbackItems?: AiFeedbackItem[]
+    canAddManagerComment?: boolean
     toggledItems: {[key: string]: boolean}
     toggleItem: (id: string, toggle?: boolean) => void
     reviewInfo?: ReviewInfo
@@ -142,6 +144,7 @@ export const ScorecardViewerContextProvider: FC<ScorecardViewerContextProps> = p
         addAppealResponse: props.addAppealResponse,
         addManagerComment: props.addManagerComment,
         aiFeedbackItems: props.aiFeedbackItems,
+        canAddManagerComment: props.canAddManagerComment,
         doDeleteAppeal: props.doDeleteAppeal,
         form: props.isEdit ? reviewFormCtx.form : undefined,
         formErrors: props.isEdit ? reviewFormCtx.form.formState.errors : undefined,
@@ -161,6 +164,7 @@ export const ScorecardViewerContextProvider: FC<ScorecardViewerContextProps> = p
         touchedAllFields: reviewFormCtx.touchedAllFields,
     }), [
         props.aiFeedbackItems,
+        props.canAddManagerComment,
         props.reviewInfo,
         props.isEdit,
         props.isManagerEdit,
diff --git a/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardViewer.tsx b/src/apps/review/src/lib/components/Scorecard/ScorecardViewer/ScorecardViewer.tsx
@@ -44,6 +44,7 @@ interface ScorecardViewerProps {
     isSavingAppeal?: boolean
     isSavingAppealResponse?: boolean
     isSavingManagerComment?: boolean
+    canAddManagerComment?: boolean
     setReviewStatus?: (status: ReviewCtxStatus) => void
     setActionButtons?: (buttons?: ReactNode) => void
     saveReviewInfo?: (
@@ -335,6 +336,7 @@ const ScorecardViewer: FC<ScorecardViewerProps> = props => (
     <ScorecardViewerContextProvider
         scorecard={props.scorecard}
         aiFeedbackItems={props.aiFeedback}
+        canAddManagerComment={props.canAddManagerComment}
         reviewInfo={props.reviewInfo}
         isEdit={props.isEdit}
         isManagerEdit={props.isManagerEdit}
diff --git a/src/apps/review/src/lib/components/TableAppeals/TableAppeals.tsx b/src/apps/review/src/lib/components/TableAppeals/TableAppeals.tsx
@@ -256,6 +256,7 @@ export const TableAppeals: FC<TableAppealsProps> = (props: TableAppealsProps) =>
                         ? ownedMemberIds.has(submissionOwnerId)
                         : false
                 },
+                canRespondToAppeals: isAdmin || hasReviewerRole,
                 canViewScorecard: canAccessScorecards,
                 isAppealsTab: true,
             }
diff --git a/src/apps/review/src/lib/components/TableAppealsResponse/TableAppealsResponse.tsx b/src/apps/review/src/lib/components/TableAppealsResponse/TableAppealsResponse.tsx
@@ -319,10 +319,11 @@ export const TableAppealsResponse: FC<TableAppealsResponseProps> = (props: Table
     const scoreVisibilityConfig = useMemo<ScoreVisibilityConfig>(
         () => ({
             canDisplayScores: () => true,
+            canRespondToAppeals,
             canViewScorecard: true,
             isAppealsTab: false,
         }),
-        [],
+        [canRespondToAppeals],
     )
 
     const columns = useMemo<TableColumn<SubmissionRow>[]>(() => {
@@ -467,7 +468,7 @@ export const TableAppealsResponse: FC<TableAppealsResponseProps> = (props: Table
                                 >
                                     <Link
                                         className={styles.respondButton}
-                                        to={getReviewRoute(submission.id, reviewId)}
+                                        to={getReviewRoute(submission.id, reviewId, canRespondToAppeals)}
                                     >
                                         Respond to Appeals
                                     </Link>
diff --git a/src/apps/review/src/lib/components/TableReview/TableReview.tsx b/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[]>(() => (
diff --git a/src/apps/review/src/lib/components/common/TableColumnRenderers.tsx b/src/apps/review/src/lib/components/common/TableColumnRenderers.tsx
@@ -522,6 +522,7 @@ export function renderScoreCell(
         canViewScorecard,
         viewOwnScorecardTooltip = VIEW_OWN_SCORECARD_TOOLTIP,
         getReviewUrl,
+        canRespondToAppeals,
     }: ScoreVisibilityConfig = configWithDefaults
 
     const reviewDetail = submission.aggregated?.reviews?.[reviewIndex]
@@ -585,7 +586,9 @@ export function renderScoreCell(
         )
     }
 
-    const reviewUrl = getReviewUrl ? getReviewUrl(reviewId) : getReviewRoute(submission.id, reviewId)
+    const reviewUrl = getReviewUrl
+        ? getReviewUrl(reviewId)
+        : getReviewRoute(submission.id, reviewId, canRespondToAppeals)
 
     return (
         <div className={styles.scoreReopenBlock}>
@@ -615,6 +618,7 @@ export function renderAppealsCell(
         canViewScorecard,
         viewOwnScorecardTooltip = VIEW_OWN_SCORECARD_TOOLTIP,
         getReviewUrl,
+        canRespondToAppeals,
     }: ScoreVisibilityConfig = configWithDefaults
 
     const reviewDetail = submission.aggregated?.reviews?.[reviewIndex]
@@ -668,7 +672,9 @@ export function renderAppealsCell(
         )
     }
 
-    const reviewUrl = getReviewUrl ? getReviewUrl(reviewId) : getReviewRoute(submission.id, reviewId)
+    const reviewUrl = getReviewUrl
+        ? getReviewUrl(reviewId)
+        : getReviewRoute(submission.id, reviewId, canRespondToAppeals)
 
     return (
         <Link
diff --git a/src/apps/review/src/lib/components/common/types.ts b/src/apps/review/src/lib/components/common/types.ts
@@ -75,6 +75,8 @@ export interface ScoreVisibilityConfig {
     isAppealsTab?: boolean
     /** Optional function to build review detail URLs by ID. */
     getReviewUrl?: (reviewId: string) => string
+    /** Indicates whether the viewer can appeal to respond. */
+    canRespondToAppeals?: boolean
 }
 
 export type { AggregatedReviewDetail, AggregatedSubmissionReviews }
diff --git a/src/apps/review/src/lib/utils/metadataMatching.ts b/src/apps/review/src/lib/utils/metadataMatching.ts
@@ -112,9 +112,14 @@ export function findMetadataPhaseMatch(
             return { source: 'stringExact' }
         }
 
-        const escapedTarget = escapeRegexLiteral(target)
-            .replace(/ /g, '\\ ')
-        const sepInsensitive = new RegExp(`\\b${escapedTarget.replace(/\\ /g, '[-_\\s]+')}\\b`)
+        // Replace all sequences of space, underscore, or hyphen in the target with a placeholder
+        const WORDSEP_PLACEHOLDER = '__WORDSEP__'
+        const sepPattern = /[ \-_]+/g
+        const targetWithPlaceholder = target.replace(sepPattern, WORDSEP_PLACEHOLDER)
+        // Properly escape ALL regex metacharacters (including backslash), leaving the placeholder intact
+        const escapedTarget = escapeRegexLiteral(targetWithPlaceholder)
+            .replace(new RegExp(escapeRegexLiteral(WORDSEP_PLACEHOLDER), 'g'), '[-_\\s]+')
+        const sepInsensitive = new RegExp(`\\b${escapedTarget}\\b`)
         if (sepInsensitive.test(normalizedMetadata)) {
             return { source: 'stringBoundary' }
         }
diff --git a/src/apps/review/src/lib/utils/routes.ts b/src/apps/review/src/lib/utils/routes.ts
@@ -6,6 +6,7 @@ const CHALLENGE_DETAILS_SEGMENT = /(active-challenges|past-challenges)\/([^/]+)\
 export function getReviewRoute(
     submissionId: string,
     reviewId: string,
+    addRespondToAppeals?: boolean,
     currentPathname?: string,
 ): string {
     const encodedReviewId = encodeURIComponent(reviewId)
@@ -26,7 +27,9 @@ export function getReviewRoute(
                 ? `${prefix}/${match[1]}/${match[2]}`
                 : `/${match[1]}/${match[2]}`
 
-            return `${basePath}/reviews/${submissionId}?reviewId=${encodedReviewId}&respondToAppeals=true`
+            const respondToAppeals = addRespondToAppeals ? '&respondToAppeals=true' : ''
+
+            return `${basePath}/reviews/${submissionId}?reviewId=${encodedReviewId}${respondToAppeals}`
         }
     }
 
diff --git a/src/apps/review/src/pages/reviews/components/ReviewViewer/ReviewViewer.tsx b/src/apps/review/src/pages/reviews/components/ReviewViewer/ReviewViewer.tsx
@@ -272,6 +272,12 @@ const ReviewViewer: FC = () => {
                             isSavingAppeal={isSavingAppeal}
                             isSavingAppealResponse={isSavingAppealResponse}
                             isSavingManagerComment={isSavingManagerComment}
+                            canAddManagerComment={
+                                hasChallengeAdminRole
+                                || hasTopcoderAdminRole
+                                || hasChallengeManagerRole
+                                || hasChallengeCopilotRole
+                            }
                             saveReviewInfo={saveReviewInfo}
                             addAppeal={addAppeal}
                             addAppealResponse={addAppealResponse}

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,7 @@ export const TableAppeals: FC<TableAppealsProps> = (props: TableAppealsProps) =>`
`256`	`256`	`? ownedMemberIds.has(submissionOwnerId)`
`257`	`257`	`: false`
`258`	`258`	`},`
	`259`	`+ canRespondToAppeals: isAdmin \|\| hasReviewerRole,`
`259`	`260`	`canViewScorecard: canAccessScorecards,`
`260`	`261`	`isAppealsTab: true,`
`261`	`262`	`}`