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

Feat/v6

Author: jmgasper

src/apps/admin/src/lib/components/ChallengeList/ChallengeList.tsx

@@ -261,15 +261,15 @@ const Actions: FC<{
                         {hasLegacyId && (
                             <a
                                 href={
-                                    `${EnvironmentConfig.ADMIN.ONLINE_REVIEW_URL}/actions/ViewProjectDetails?pid=${props.challenge.legacyId}` /* eslint-disable-line max-len */
+                                    `${EnvironmentConfig.ADMIN.REVIEW_UI_URL}/=${props.challenge.id}` /* eslint-disable-line max-len */
                                 }
                                 target='_blank'
                                 rel='noreferrer'
                             >
-                                Online Review
+                                Review UI
                             </a>
                         )}
-                        {!hasLegacyId && <span>Online Review</span>}
+                        {!hasLegacyId && <span>Review UI</span>}
                     </li>
                 </ul>
             </DropdownMenu>

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

@@ -1,7 +1,8 @@
 /**
  * Challenge Details Content.
  */
-import { FC, ReactNode, useContext, useMemo } from 'react'
+import { FC, ReactNode, useCallback, useContext, useMemo } from 'react'
+import { toast } from 'react-toastify'
 
 import { ActionLoading } from '~/apps/admin/src/lib'
 
@@ -185,6 +186,37 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
         isLoadingBool: isDownloadingSubmissionBool,
         downloadSubmission,
     }: useDownloadSubmissionProps = useDownloadSubmission()
+    const submissionsById = useMemo(() => {
+        const map = new Map<string, BackendSubmission>()
+        props.submissions.forEach(submission => {
+            if (submission?.id) {
+                map.set(submission.id, submission)
+            }
+        })
+        return map
+    }, [props.submissions])
+    const handleSubmissionDownload = useCallback((submissionId: string) => {
+        const submission = submissionsById.get(submissionId)
+        if (submission && submission.isFileSubmission === false) {
+            const targetUrl = submission.url?.trim()
+            if (targetUrl) {
+                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.')
+                    }
+                } else {
+                    toast.error('Unable to open the submission URL from this environment.')
+                }
+            } else {
+                toast.error('Submission URL is not available for this entry.')
+            }
+
+            return
+        }
+
+        downloadSubmission(submissionId)
+    }, [downloadSubmission, submissionsById])
     const {
         isLoading: isLoadingProjectResult,
         projectResults,
@@ -335,7 +367,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
 
         if (SUBMISSION_TAB_KEYS.has(selectedTabNormalized)) {
             return renderSubmissionTab({
-                downloadSubmission,
+                downloadSubmission: handleSubmissionDownload,
                 isActiveChallenge: props.isActiveChallenge,
                 isDownloadingSubmission,
                 isLoadingSubmission: props.isLoadingSubmission,
@@ -361,7 +393,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                     checkpointReviewMinimumPassingScore={props.checkpointReviewMinimumPassingScore}
                     isLoading={props.isLoadingSubmission}
                     isDownloading={isDownloadingSubmission}
-                    downloadSubmission={downloadSubmission}
+                    downloadSubmission={handleSubmissionDownload}
                     mode={checkpointMode}
                 />
             )
@@ -373,7 +405,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                     isLoading={isLoadingProjectResult}
                     projectResults={projectResults}
                     isDownloading={isDownloadingSubmission}
-                    downloadSubmission={downloadSubmission}
+                    downloadSubmission={handleSubmissionDownload}
                 />
             )
         }
@@ -386,7 +418,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                     approvalMinimumPassingScore={props.approvalMinimumPassingScore}
                     isLoadingReview={props.isLoadingSubmission}
                     isDownloading={isDownloadingSubmission}
-                    downloadSubmission={downloadSubmission}
+                    downloadSubmission={handleSubmissionDownload}
                     isActiveChallenge={props.isActiveChallenge}
                 />
             )
@@ -400,7 +432,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                     postMortemMinimumPassingScore={props.postMortemMinimumPassingScore}
                     isLoadingReview={props.isLoadingSubmission}
                     isDownloading={isDownloadingSubmission}
-                    downloadSubmission={downloadSubmission}
+                    downloadSubmission={handleSubmissionDownload}
                     isActiveChallenge={props.isActiveChallenge}
                     columnLabel='Post-Mortem'
                 />
@@ -415,7 +447,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                     postMortemMinimumPassingScore={props.postMortemMinimumPassingScore}
                     isLoadingReview={props.isLoadingSubmission}
                     isDownloading={isDownloadingSubmission}
-                    downloadSubmission={downloadSubmission}
+                    downloadSubmission={handleSubmissionDownload}
                     isActiveChallenge={props.isActiveChallenge}
                     phaseIdFilter={props.selectedPhaseId}
                 />
@@ -430,7 +462,7 @@ export const ChallengeDetailsContent: FC<Props> = (props: Props) => {
                 reviewMinimumPassingScore={props.reviewMinimumPassingScore}
                 isLoadingReview={props.isLoadingSubmission}
                 isDownloading={isDownloadingSubmission}
-                downloadSubmission={downloadSubmission}
+                downloadSubmission={handleSubmissionDownload}
                 mappingReviewAppeal={props.mappingReviewAppeal}
                 isActiveChallenge={props.isActiveChallenge}
             />

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

@@ -48,6 +48,11 @@ export interface BackendSubmission {
      * Indicates whether the submission is the latest for the member.
      */
     isLatest?: boolean
+    /**
+     * Flag indicating whether the submission includes a downloadable file.
+     * When false the submission is represented only by a URL.
+     */
+    isFileSubmission?: boolean
 }
 
 /**

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

@@ -56,6 +56,10 @@ export interface SubmissionInfo {
      * Submission type (e.g. CONTEST_SUBMISSION, CHECKPOINT_SUBMISSION).
      */
     type?: string
+    /**
+     * Flag indicating whether the submission includes an uploaded file.
+     */
+    isFileSubmission?: boolean
 }
 
 /**
@@ -118,6 +122,7 @@ export function convertBackendSubmissionToSubmissionInfo(
     return {
         aggregateScore,
         id: data.id,
+        isFileSubmission: data.isFileSubmission,
         isLatest: data.isLatest,
         isPassingReview,
         memberId: data.memberId,

src/config/environments/default.env.ts

@@ -155,6 +155,7 @@ export const ADMIN = {
     DEFAULT_PAYMENT_TERMS: 1,
     DIRECT_URL: 'https://www.topcoder-dev.com/direct',
     ONLINE_REVIEW_URL: 'https://software.topcoder-dev.com/review',
+    REVIEW_UI_URL: 'https://review.topcoder-dev.com',
     SUBMISSION_SCAN_TOPIC: 'submission.scan.complete',
     WORK_MANAGER_URL: 'https://challenges.topcoder-dev.com',
 }

src/config/environments/global-config.model.ts

@@ -62,6 +62,7 @@ export interface GlobalConfig {
         DIRECT_URL: string
         WORK_MANAGER_URL: string
         ONLINE_REVIEW_URL: string
+        REVIEW_UI_URL: string
         CHALLENGE_URL: string
         AV_SCAN_SCORER_REVIEW_TYPE_ID: string
         AGREE_ELECTRONICALLY: string

src/config/environments/prod.env.ts

@@ -23,6 +23,7 @@ export const ADMIN = {
     DEFAULT_PAYMENT_TERMS: 1,
     DIRECT_URL: 'https://www.topcoder.com/direct',
     ONLINE_REVIEW_URL: 'https://software.topcoder.com/review',
+    REVIEW_UI_URL: 'https://review.topcoder.com',
     SUBMISSION_SCAN_TOPIC: 'submission.scan.complete',
     WORK_MANAGER_URL: 'https://challenges.topcoder.com',
 }