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

Marathon match submission management features

Author: jmgasper

src/apps/admin/src/config/busEvent.config.ts

@@ -3,6 +3,8 @@
  */
 import { v4 as uuidv4 } from 'uuid'
 
+import { EnvironmentConfig } from '~/config'
+
 import {
     RequestBusAPI,
     RequestBusAPIAVScan,
@@ -41,9 +43,9 @@ export const CREATE_BUS_EVENT_AV_RESCAN = (
     payload: RequestBusAPIAVScanPayload,
 ): RequestBusAPIAVScan => ({
     'mime-type': 'application/json',
-    originator: 'submission-processor',
+    originator: 'review-api-v6',
     payload,
     timestamp: new Date()
         .toISOString(),
-    topic: 'avscan.action.scan',
+    topic: EnvironmentConfig.ADMIN.AVSCAN_TOPIC,
 })

src/apps/admin/src/lib/components/SubmissionTable/SubmissionTable.module.scss

@@ -24,3 +24,25 @@
         vertical-align: middle;
     }
 }
+
+.virusScanStatus {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-height: 24px;
+    min-width: 24px;
+    color: $black-80;
+
+    svg {
+        height: 20px;
+        width: 20px;
+    }
+}
+
+.virusScanStatusSuccess {
+    color: $green-120;
+}
+
+.virusScanStatusFailed {
+    color: $red-110;
+}

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

@@ -6,7 +6,7 @@ import _ from 'lodash'
 import classNames from 'classnames'
 
 import { useWindowSize, WindowSize } from '~/libs/shared'
-import { ConfirmModal, Table, TableColumn } from '~/libs/ui'
+import { ConfirmModal, IconOutline, Table, TableColumn } from '~/libs/ui'
 import { EnvironmentConfig } from '~/config'
 import { getRatingColor } from '~/libs/core'
 
@@ -20,6 +20,40 @@ import SubmissionTableActions from './SubmissionTableActions'
 import SubmissionTableActionsNonMM from './SubmissionTableActionsNonMM'
 import styles from './SubmissionTable.module.scss'
 
+const renderVirusScanStatus = (submission: Submission): JSX.Element => {
+    if (submission.virusScan === true) {
+        return (
+            <span
+                className={classNames(
+                    styles.virusScanStatus,
+                    styles.virusScanStatusSuccess,
+                )}
+                role='img'
+                aria-label='Virus scan passed'
+            >
+                <IconOutline.CheckCircleIcon aria-hidden />
+            </span>
+        )
+    }
+
+    if (submission.virusScan === false) {
+        return (
+            <span
+                className={classNames(
+                    styles.virusScanStatus,
+                    styles.virusScanStatusFailed,
+                )}
+                role='img'
+                aria-label='Virus scan failed'
+            >
+                <IconOutline.XCircleIcon aria-hidden />
+            </span>
+        )
+    }
+
+    return <span className={styles.virusScanStatus}>--</span>
+}
+
 interface Props {
     className?: string
     data: Submission[]
@@ -89,6 +123,11 @@ export const SubmissionTable: FC<Props> = (props: Props) => {
                     propertyName: 'id',
                     type: 'text',
                 },
+                {
+                    label: 'Virus Scan',
+                    renderer: renderVirusScanStatus,
+                    type: 'element',
+                },
                 {
                     label: 'Submission date',
                     propertyName: 'submittedDateString',
@@ -163,6 +202,10 @@ export const SubmissionTable: FC<Props> = (props: Props) => {
                                 isRemovingReviewSummations={
                                     props.isRemovingReviewSummations
                                 }
+                                isDownloading={props.isDownloading}
+                                downloadSubmission={props.downloadSubmission}
+                                isDoingAvScan={props.isDoingAvScan}
+                                doPostBusEventAvScan={props.doPostBusEventAvScan}
                                 setShowConfirmDeleteSubmissionDialog={
                                     setShowConfirmDeleteSubmissionDialog
                                 }
@@ -189,6 +232,11 @@ export const SubmissionTable: FC<Props> = (props: Props) => {
                     propertyName: 'id',
                     type: 'text',
                 },
+                {
+                    label: 'Virus Scan',
+                    renderer: renderVirusScanStatus,
+                    type: 'element',
+                },
                 {
                     label: 'Time submitted',
                     propertyName: 'submittedDateString',

src/apps/admin/src/lib/components/SubmissionTable/SubmissionTableActions.tsx

@@ -17,6 +17,10 @@ interface Props {
     isRunningTest: IsRemovingType
     isRemovingSubmission: IsRemovingType
     isRemovingReviewSummations: IsRemovingType
+    isDownloading: IsRemovingType
+    isDoingAvScan: IsRemovingType
+    downloadSubmission: (submissionId: string) => void
+    doPostBusEventAvScan: (submission: Submission) => void
     doPostBusEvent: DoPostBusEvent
     setShowConfirmDeleteSubmissionDialog: Dispatch<
         SetStateAction<Submission | undefined>
@@ -82,6 +86,28 @@ export const SubmissionTableActions: FC<Props> = (props: Props) => {
                 >
                     Run Provisional Test
                 </li>
+                <li
+                    className={classNames({
+                        disabled: props.isDownloading[props.data.id],
+                    })}
+                    onClick={function onClick() {
+                        setOpenDropdown(false)
+                        props.downloadSubmission(props.data.id)
+                    }}
+                >
+                    Download
+                </li>
+                <li
+                    className={classNames({
+                        disabled: props.isDoingAvScan[props.data.id],
+                    })}
+                    onClick={function onClick() {
+                        setOpenDropdown(false)
+                        props.doPostBusEventAvScan(props.data)
+                    }}
+                >
+                    AV Rescan
+                </li>
                 <li
                     className={classNames({
                         disabled: props.isRemovingSubmission[props.data.id],

src/apps/admin/src/lib/components/common/Layout/Layout.module.scss

@@ -1,6 +1,10 @@
 @import '@libs/ui/styles/includes';
 @import '../../../styles/includes';
 
+.contentLayout {
+    width: 100%;
+}
+
 .layout {
     position: relative;
 

src/apps/admin/src/lib/components/common/Layout/Layout.tsx

@@ -24,6 +24,7 @@ export type LayoutProps = PropsWithChildren<{
 
 export const Layout: FC<LayoutProps> = props => (
     <ContentLayout
+        isFluid
         contentClass={cn(styles.contentLayout, props.classes?.contentClass)}
         innerClass={cn(styles.contentLayoutInner, props.classes?.innerClass)}
         outerClass={cn(styles.contentLayoutOuter, props.classes?.outerClass)}

src/apps/admin/src/lib/components/common/PageContent/PageContent.module.scss

@@ -5,8 +5,8 @@
     margin-top: $sp-4;
 
     .inner {
-        max-width: $xl-max;
-        margin: 0 auto;
+        width: 100%;
+        margin: 0;
         background-color: $tc-white;
         border-radius: 8px;
     }

src/apps/admin/src/lib/components/common/PageHeader/PageHeader.module.scss

@@ -7,8 +7,8 @@
     .inner {
         display: flex;
         flex-direction: column;
-        margin: 0 auto;
+        margin: 0;
         box-sizing: border-box;
-        max-width: $xl-max;
+        width: 100%;
     }
 }

src/apps/admin/src/lib/hooks/useManageChallengeSubmissions.ts

@@ -63,8 +63,11 @@ export function useManageChallengeSubmissions(
                     index++
                 ) {
                     const submission = memberSubmission.submissions[index]
-                    submission.hideToggleHistory = true
-                    results.push(submission)
+                    results.push({
+                        ...submission,
+                        hideToggleHistory: true,
+                        isTheLatestSubmission: false,
+                    })
                 }
             }
         })

src/apps/admin/src/lib/models/Submission.model.ts

@@ -46,10 +46,11 @@ export interface Submission {
     provisionalRank?: number // this field is calculated at frontend
     finalRank?: number // this field is calculated at frontend
     hideToggleHistory?: boolean // this field is calculated at frontend
-  isTheLatestSubmission?: boolean // this field is calculated at frontend
-  // Enriched fields from API (Admin/Copilot/M2M only)
-  submitterHandle?: string
-  submitterMaxRating?: number | null
+    virusScan?: boolean
+    isTheLatestSubmission?: boolean // this field is calculated at frontend
+    // Enriched fields from API (Admin/Copilot/M2M only)
+    submitterHandle?: string
+    submitterMaxRating?: number | null
 }
 
 /**