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

jmgasper · web-flow · commit ca933dce5ade · 2025-11-01T15:22:03.000+11:00
Better handling of TG Task URL only submissions
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/ChallengeDetailsContent.tsx b/src/apps/review/src/lib/components/ChallengeDetailsContent/ChallengeDetailsContent.tsx
@@ -203,7 +203,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                 if (typeof window !== 'undefined') {
                     const openedWindow = window.open(targetUrl, '_blank', 'noopener,noreferrer')
                     if (openedWindow === null) {
-                        toast.error('We could not open the submission URL. Check your pop-up blocker and try again.')
+                        window.location.assign(targetUrl)
                     }
                 } else {
                     toast.error('Unable to open the submission URL from this environment.')
diff --git a/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.tsx b/src/apps/review/src/lib/components/ChallengeDetailsContent/TabContentSubmissions.tsx
@@ -232,7 +232,10 @@ export const TabContentSubmissions: FC<Props> = props => {
                         }
 
                         const isRestrictedBase = isSubmissionDownloadRestrictedForMember(submission.memberId)
-                        const failedScan = submission.virusScan === false
+                        const normalizedVirusScan = submission.isFileSubmission === false
+                            ? undefined
+                            : submission.virusScan
+                        const failedScan = normalizedVirusScan === false
                         const isRestricted = isRestrictedBase || failedScan
                         const tooltipMessage = failedScan
                             ? VIRUS_SCAN_FAILED_MESSAGE
@@ -320,6 +323,10 @@ export const TabContentSubmissions: FC<Props> = props => {
                     label: 'Virus Scan',
                     propertyName: 'virusScan',
                     renderer: (submission: BackendSubmission) => {
+                        if (submission.isFileSubmission === false) {
+                            return <span>N/A</span>
+                        }
+
                         if (submission.virusScan === true) {
                             return (
                                 <span className={styles.virusOkIcon} title='Scan passed' aria-label='Scan passed'>
diff --git a/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx b/src/apps/review/src/lib/components/SubmissionHistoryModal/SubmissionHistoryModal.tsx
@@ -174,7 +174,9 @@ export const SubmissionHistoryModal: FC<SubmissionHistoryModalProps> = (props: S
     const renderHistoryRow = useCallback((submission: SubmissionInfo): JSX.Element => {
         const fallbackMeta = props.getSubmissionMeta?.(submission.id) ?? undefined
         const resolvedVirusScan = submission.virusScan ?? fallbackMeta?.virusScan
-        const failedScan = resolvedVirusScan === false
+        const isFileSubmission = submission.isFileSubmission ?? fallbackMeta?.isFileSubmission
+        const normalizedVirusScan = isFileSubmission === false ? undefined : resolvedVirusScan
+        const failedScan = normalizedVirusScan === false
         const restriction = props.getRestriction
             ? props.getRestriction(submission)
             : { restricted: false }
@@ -234,11 +236,13 @@ export const SubmissionHistoryModal: FC<SubmissionHistoryModalProps> = (props: S
                     {submittedDisplay}
                 </td>
                 <td className={styles.cellVirusScan}>
-                    {resolvedVirusScan === true ? (
+                    {isFileSubmission === false ? (
+                        <span>N/A</span>
+                    ) : normalizedVirusScan === true ? (
                         <span className={styles.virusOkIcon} title='Scan passed' aria-label='Scan passed'>
                             <IconOutline.CheckCircleIcon />
                         </span>
-                    ) : resolvedVirusScan === false ? (
+                    ) : normalizedVirusScan === false ? (
                         <span className={styles.virusWarnIcon} title='Scan failed' aria-label='Scan failed'>
                             <IconOutline.ExclamationIcon />
                         </span>
diff --git a/src/apps/review/src/lib/components/TableCheckpointSubmissions/TableCheckpointSubmissions.tsx b/src/apps/review/src/lib/components/TableCheckpointSubmissions/TableCheckpointSubmissions.tsx
@@ -171,7 +171,10 @@ export const TableCheckpointSubmissions: FC<Props> = (props: Props) => {
                 propertyName: 'submissionId',
                 renderer: (data: Screening) => {
                     const isRestrictedBase = isSubmissionDownloadRestrictedForMember(data.memberId)
-                    const failedScan = data.virusScan === false
+                    const normalizedVirusScan = data.isFileSubmission === false
+                        ? undefined
+                        : data.virusScan
+                    const failedScan = normalizedVirusScan === false
                     const isRestrictedForRow = isRestrictedBase || failedScan
                     const tooltipMessage = failedScan
                         ? 'Submission failed virus scan'
diff --git a/src/apps/review/src/lib/components/TableIterativeReview/TableIterativeReview.tsx b/src/apps/review/src/lib/components/TableIterativeReview/TableIterativeReview.tsx
@@ -662,6 +662,7 @@ export const TableIterativeReview: FC<Props> = (props: Props) => {
             columnId: 'submission-id',
             label: 'Submission ID',
             propertyName: 'id',
+            // eslint-disable-next-line complexity -- Renderer must account for multiple submission restriction states.
             renderer: (data: SubmissionInfo) => {
                 const isOwnedSubmission = data.memberId
                     ? ownedMemberIds.has(data.memberId)
@@ -675,7 +676,10 @@ export const TableIterativeReview: FC<Props> = (props: Props) => {
                 const memberRestrictionMessage = getRestrictionMessageForMember(
                     data.memberId,
                 )
-                const failedScan = (data as SubmissionInfo).virusScan === false
+                const normalizedVirusScan = data.isFileSubmission === false
+                    ? undefined
+                    : data.virusScan
+                const failedScan = normalizedVirusScan === false
                 const isButtonDisabled = Boolean(
                     isDownloading[data.id]
                     || isRestrictedForMember
@@ -685,14 +689,6 @@ export const TableIterativeReview: FC<Props> = (props: Props) => {
                 const downloadButton = (
                     <button
                         onClick={function onClick() {
-                            if (
-                                isRestrictedForMember
-                                || failedScan
-                                || isOwnershipRestricted
-                            ) {
-                                return
-                            }
-
                             downloadSubmission(data.id)
                         }}
                         className={styles.textBlue}
@@ -708,27 +704,19 @@ export const TableIterativeReview: FC<Props> = (props: Props) => {
                 ): Promise<void> {
                     event.stopPropagation()
                     event.preventDefault()
-
-                    if (!data.id) {
-                        return
-                    }
-
                     await copyTextToClipboard(data.id)
                     toast.success('Submission ID copied to clipboard', {
                         toastId: `challenge-submission-id-copy-${data.id}`,
                     })
                 }
 
-                let tooltipContent: string | undefined
-                if (failedScan) {
-                    tooltipContent = 'Submission failed virus scan'
-                } else if (isRestrictedForMember) {
-                    tooltipContent = memberRestrictionMessage ?? restrictionMessage
-                } else if (isOwnershipRestricted) {
-                    tooltipContent = DOWNLOAD_OWN_SUBMISSION_TOOLTIP
-                } else if (isSubmissionDownloadRestricted && restrictionMessage) {
-                    tooltipContent = restrictionMessage
-                }
+                const tooltipContent = failedScan
+                    ? 'Submission failed virus scan'
+                    : isRestrictedForMember
+                        ? memberRestrictionMessage ?? restrictionMessage
+                        : isOwnershipRestricted
+                            ? DOWNLOAD_OWN_SUBMISSION_TOOLTIP
+                            : (isSubmissionDownloadRestricted && restrictionMessage) || undefined
 
                 const downloadControl = isOwnershipRestricted ? (
                     <span className={styles.textBlue}>
diff --git a/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx b/src/apps/review/src/lib/components/TableSubmissionScreening/TableSubmissionScreening.tsx
@@ -125,7 +125,10 @@ const createSubmissionColumn = (config: SubmissionColumnConfig): TableColumn<Scr
     propertyName: 'submissionId',
     renderer: (data: Screening) => {
         const isRestrictedBase = config.isSubmissionDownloadRestrictedForMember(data.memberId)
-        const failedScan = data.virusScan === false
+        const normalizedVirusScan = data.isFileSubmission === false
+            ? undefined
+            : data.virusScan
+        const failedScan = normalizedVirusScan === false
         const isRestrictedForRow = isRestrictedBase || failedScan
         const tooltipMessage = failedScan
             ? 'Submission failed virus scan'
@@ -231,6 +234,10 @@ const createVirusScanColumn = (): TableColumn<Screening> => ({
     label: 'Virus Scan',
     propertyName: 'virusScan',
     renderer: (data: Screening) => {
+        if (data.isFileSubmission === false) {
+            return <span>N/A</span>
+        }
+
         if (data.virusScan === true) {
             return (
                 <span className={styles.virusOkIcon} title='Scan passed' aria-label='Scan passed'>
@@ -765,6 +772,7 @@ export const TableSubmissionScreening: FC<Props> = (props: Props) => {
             map.set(submissionId, {
                 ...existing,
                 id: existing?.id ?? submissionId,
+                isFileSubmission: screening.isFileSubmission ?? existing?.isFileSubmission,
                 isLatest: screening.isLatest ?? existing?.isLatest,
                 memberId: screening.memberId ?? existing?.memberId ?? '',
                 submittedDate: createdAt,
diff --git a/src/apps/review/src/lib/components/common/TableColumnRenderers.tsx b/src/apps/review/src/lib/components/common/TableColumnRenderers.tsx
@@ -38,6 +38,7 @@ import styles from './TableColumnRenderers.module.scss'
 /**
  * Renders the submission ID cell with download controls and copy-to-clipboard actions.
  */
+// eslint-disable-next-line complexity -- Handles multiple restriction scenarios for submission downloads.
 export function renderSubmissionIdCell(
     submission: SubmissionRow,
     config: DownloadButtonConfig,
@@ -62,7 +63,10 @@ export function renderSubmissionIdCell(
     const isOwnershipRestricted = shouldRestrictSubmitterToOwnSubmission && !isOwnedSubmission
     const isRestrictedForMember = isSubmissionDownloadRestrictedForMember(submission.memberId)
     const memberRestrictionMessage = getRestrictionMessageForMember(submission.memberId)
-    const failedScan = submission.virusScan === false
+    const normalizedVirusScan = submission.isFileSubmission === false
+        ? undefined
+        : submission.virusScan
+    const failedScan = normalizedVirusScan === false
     const isButtonDisabled = Boolean(
         isDownloading[submission.id]
         || isRestrictedForMember
@@ -72,10 +76,6 @@ export function renderSubmissionIdCell(
     const downloadButton = (
         <button
             onClick={function onClick() {
-                if (isRestrictedForMember || failedScan || isOwnershipRestricted) {
-                    return
-                }
-
                 downloadSubmission(submission.id)
             }}
             className={classNames(styles.textBlue, styles.linkButton)}
@@ -91,29 +91,21 @@ export function renderSubmissionIdCell(
     ): Promise<void> {
         event.stopPropagation()
         event.preventDefault()
-
-        if (!submission.id) {
-            return
-        }
-
         await copyTextToClipboard(submission.id)
         toast.success('Submission ID copied to clipboard', {
             toastId: `challenge-submission-id-copy-${submission.id}`,
         })
     }
 
-    let tooltipContent: string | undefined
-    if (failedScan) {
-        tooltipContent = virusScanFailedMessage
-    } else if (isRestrictedForMember) {
-        tooltipContent = memberRestrictionMessage
-            ?? restrictionMessage
-            ?? downloadOwnSubmissionTooltip
-    } else if (isOwnershipRestricted) {
-        tooltipContent = downloadOwnSubmissionTooltip
-    } else if (isSubmissionDownloadRestricted && restrictionMessage) {
-        tooltipContent = restrictionMessage
-    }
+    const tooltipContent = failedScan
+        ? virusScanFailedMessage
+        : isRestrictedForMember
+            ? memberRestrictionMessage
+                ?? restrictionMessage
+                ?? downloadOwnSubmissionTooltip
+            : isOwnershipRestricted
+                ? downloadOwnSubmissionTooltip
+                : (isSubmissionDownloadRestricted && restrictionMessage) || undefined
 
     const downloadControl = isOwnershipRestricted ? (
         <span className={styles.textBlue}>
diff --git a/src/apps/review/src/lib/models/Screening.model.ts b/src/apps/review/src/lib/models/Screening.model.ts
@@ -57,6 +57,10 @@ export interface Screening {
      * Submission type (e.g. CONTEST_SUBMISSION, CHECKPOINT_SUBMISSION).
      */
     type?: string
+    /**
+     * Flag indicating whether the submission includes an uploaded file.
+     */
+    isFileSubmission?: boolean
     /**
      * The phase name of the associated review (e.g., 'Screening', 'Review').
      * Used for defensive filtering to ensure phase data isolation.
@@ -96,6 +100,7 @@ export function convertBackendSubmissionToScreening(
         challengeId: data.challengeId,
         createdAt,
         createdAtString,
+        isFileSubmission: data.isFileSubmission,
         isLatest: data.isLatest,
         memberId: data.memberId,
         result,
diff --git a/ssl-local/local.topcoder.com-key.pem b/ssl-local/local.topcoder.com-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDMuiy2OYMuuVyy
+Zudim1AFxDQOCXoab+R/qvhjMbHXBxgvKjqsDv/h9viO1yeamRdLgg1c2otjcHLB
+wcZfW73CWH3Ezqqju4EoTLM6ww0JMESKWRS3Fc9yuoOCnEr7xYo8FgtqOw7gPaDw
+tCXz7I270zSPOatjAszu3Z2fuGHbxYz2xlvllsjDlkUXyAHbyi2ZHY3sJms2BBbQ
+MCYFgUFK8Ea8zfhViWFWkbaW+pUyJKtgUnsZjBf72YqnHQ2srphuqIGht0aNv1Ip
+FbZ1ZdkhlLiudaB9hOwl70D/CY8A0qw9NiOOv/PaGkea5wa1HUuzrEqskO6ze8yG
+y+DwpcCdAgMBAAECggEBAJ0bfjZ1GkOgAg/yQjz8vUM/l0byZN6m4W5L0QOmXjiK
+fDetq4rgk+NfeM19NSpBs4vBiOmp2O/9mkMwpkAFkjDzYcjHZFH0EaDQg3ZjurxD
+a0XUKL57oVAE6+kucaiWpoeHz0i9e6QAB2LQjJONBBOQeDQ1aF26B3SDY3PvtkFF
+D9Z3JGTYLNBf39+pIFHvkQMec0FG8Hs1ZUd9rW9zBLJB5nGSbD8EiKaLLGVG1ohQ
+Cek2GUMcPH8u5CO6rhOsxwEtv5SvGYajJbNrHiO+f/pMVf19Qx/agQAa8wVCcklo
+6eljC1y1sMWwigLSzwv2RK4drqN5s/2smpxZWPGj2iECgYEA9Df3DA94+GZB5fcC
+TJdnsAWjzlgQfbJkC1XFaYZwIvcjgmQpy/QySUUOyiOwuxqRoD2R5SeXp7UoKaPk
+v3sdeA9VTD7Ev8eefu3BzbUQ5dZIPlZUlkb21tKhhMlqfn40Xc5B/gwPSbNEym/l
+QYx0vIXg/TjCQxow4DtA4Qm36IkCgYEA1pqAcLv3IV8xtM2VaFQwtsk+7Kc/yRaQ
+VDjv68iNJmI47fdX5eeRtDWCkAKyolLKYKty5FuwwGDHLbNTVdJtX+2wLochQ2rC
+5Pu/UwEV82MEcLmHONK+ZRXVwlt5fbxhcQo6x24cOksRvNwGDTi3YOwreO/ZE8w7
+aW1RBBdiKnUCgYEAm+I9Js2ZgbSDy63nIcxiutBexo8ft5vuj+2nnLvbR/ZIDCqz
+IyQ0FOCnmA8/96311jp2rbaf7sSLZkje8fo7zS68W3aVT3SzjoFke1Ff/9TPODsS
+svmJBYZc4s1N1H/qHRZSuT4pY/mxpyXVSAnHWa569icMmJhXKkmoF/yED0ECgYEA
+tUJGHfIFKCC5YRcLjNUfWCPejBAvpe7y9NAqhSIdZkAsCYKSsVLIFEfmATDmJIh8
++u2U2yA+yB513TnLt39GdnHSD1p/U+wGtVWVIcyW9724cGWjuvD1c3ff1otgsDy+
+qLWVNADiwrHJR5UnX196M9kGVt1uonQr8j4s4aHGfkkCgYBPrAMkdSFd2XZlHgvB
+KBsnJWMet8ZqtMkHdphkQaRIiwMhXiDJzqQBMZRu6N166HlKkQA3DIy8CWgAThCc
+ec/0dmAOaBvRG6WiPF6W79Yw7db8AvjeaFaaLFZh/9ICt8RJ4yBzaOhG7OlLURKW
+4phJAlDyYfZ5tbZu91yxlLRIkQ==
+-----END PRIVATE KEY-----
diff --git a/ssl-local/local.topcoder.com.pem b/ssl-local/local.topcoder.com.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEajCCAtKgAwIBAgIQDXQVrgMqu2zr0wgZaSESSTANBgkqhkiG9w0BAQsFADCB
+lzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTYwNAYDVQQLDC1qbWdh
+c3BlckBqbWdhc3Blci13b3Jrc3RhdGlvbiAoSnVzdGluIEdhc3BlcikxPTA7BgNV
+BAMMNG1rY2VydCBqbWdhc3BlckBqbWdhc3Blci13b3Jrc3RhdGlvbiAoSnVzdGlu
+IEdhc3BlcikwHhcNMjUxMDMxMDMyOTE3WhcNMjgwMTMxMDMyOTE3WjBhMScwJQYD
+VQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxNjA0BgNVBAsMLWpt
+Z2FzcGVyQGptZ2FzcGVyLXdvcmtzdGF0aW9uIChKdXN0aW4gR2FzcGVyKTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMy6LLY5gy65XLJm52KbUAXENA4J
+ehpv5H+q+GMxsdcHGC8qOqwO/+H2+I7XJ5qZF0uCDVzai2NwcsHBxl9bvcJYfcTO
+qqO7gShMszrDDQkwRIpZFLcVz3K6g4KcSvvFijwWC2o7DuA9oPC0JfPsjbvTNI85
+q2MCzO7dnZ+4YdvFjPbGW+WWyMOWRRfIAdvKLZkdjewmazYEFtAwJgWBQUrwRrzN
++FWJYVaRtpb6lTIkq2BSexmMF/vZiqcdDayumG6ogaG3Ro2/UikVtnVl2SGUuK51
+oH2E7CXvQP8JjwDSrD02I46/89oaR5rnBrUdS7OsSqyQ7rN7zIbL4PClwJ0CAwEA
+AaNnMGUwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1Ud
+IwQYMBaAFCCVQwZNwHdcVw9seUq6zOF51Vu6MB0GA1UdEQQWMBSCEmxvY2FsLnRv
+cGNvZGVyLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEABmxMnJ1YZEY/dzwXqB1JlYBo
+OxBN3kY18KwRcDuawUmuopdfkIaNyCrLLsA+Ick9lMpiEHzYd854FhRWvktk9O+J
+ExuvyCkubKMsKKdpTPCdui6W5hHz562nOr9HCf/1PLtHTnwo9r1ZeT/rYvgGL9Fv
+tFK6Y/+u8kZruSJw1hro5SZEKmzsEFReDAzrsDES7kkX3tOesOXMgq4cNziP+LJ3
+sty9f1dyBYO8RBKWlQi4Bo1noM1IsZcoLucTpr2xuMvswp/EL+DOZfcQxmh5v6Q2
+2FbJBFaOeJPU06sL0II/1hHZzCQcspCiZ9axcE0Hqy8ATJFuCshLup8Dsllzojw/
+Tao0NjWvbufhhfCsM7jFtpYjtK3/93HEVnYxcE2aqd4pcAkT+pwT6XrbM50Pdv0d
+zHGzB08z2U4UoeipPK8An36rRZu1gP7XTwKxJNUYIFqKY+ZKR3hbXgiYlapvH5bD
+ZLoY9QoZGsWBimeHAoBx0vwF6d91uT8cffzH91wL
+-----END CERTIFICATE-----

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {`
`203`	`203`	`if (typeof window !== 'undefined') {`
`204`	`204`	`const openedWindow = window.open(targetUrl, '_blank', 'noopener,noreferrer')`
`205`	`205`	`if (openedWindow === null) {`
`206`		`- toast.error('We could not open the submission URL. Check your pop-up blocker and try again.')`
	`206`	`+ window.location.assign(targetUrl)`
`207`	`207`	`}`
`208`	`208`	`} else {`
`209`	`209`	`toast.error('Unable to open the submission URL from this environment.')`