PROD - Reports portal deploy and lots of small fixes

.circleci/config.yml

@@ -229,6 +229,7 @@ workflows:
                               - mm-final-2025-reveal
                               - engagements
                               - HOTFIX-PM-3269
+                              - reports
 
             - deployQa:
                   context: org-global

.github/workflows/trivy.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run Trivy scanner in repo mode
-        uses: aquasecurity/trivy-action@0.33.1
+        uses: aquasecurity/trivy-action@0.35.0
         with:
           scan-type: "fs"
           ignore-unfixed: true

src/apps/admin/src/AdminHomeRedirect.tsx

@@ -0,0 +1,22 @@
+import { FC } from 'react'
+import { Navigate } from 'react-router-dom'
+
+import { reportsRootRoute } from '~/apps/reports'
+import { ProfileContextData, useProfileContext } from '~/libs/core'
+
+import { manageChallengeRouteId } from './config/routes.config'
+import { isAdministrator } from './lib/utils'
+
+/**
+ * Redirects authenticated admin-app users to the first route they can access.
+ */
+const AdminHomeRedirect: FC = () => {
+    const { profile }: ProfileContextData = useProfileContext()
+    const defaultRoute: string = isAdministrator(profile?.roles)
+        ? manageChallengeRouteId
+        : reportsRootRoute
+
+    return <Navigate replace to={defaultRoute} />
+}
+
+export default AdminHomeRedirect

src/apps/admin/src/admin-app.routes.tsx

@@ -4,8 +4,6 @@ import {
     lazyLoad,
     LazyLoadedComponent,
     PlatformRoute,
-    Rewrite,
-    UserRole,
 } from '~/libs/core'
 
 import {
@@ -17,12 +15,13 @@ import {
     paymentsRouteId,
     permissionManagementRouteId,
     platformRouteId,
-    reportsRouteId,
     rootRoute,
     termsRouteId,
     userManagementRouteId,
 } from './config/routes.config'
+import { administratorOnlyRoles, adminReportsAccessRoles } from './lib/utils'
 import { platformSkillRouteId } from './platform/routes.config'
+import AdminHomeRedirect from './AdminHomeRedirect'
 
 const AdminApp: LazyLoadedComponent = lazyLoad(() => import('./AdminApp'))
 
@@ -173,10 +172,6 @@ const PaymentsPage: LazyLoadedComponent = lazyLoad(
     () => import('./payments/PaymentsPage'),
     'PaymentsPage',
 )
-const ReportsPage: LazyLoadedComponent = lazyLoad(
-    () => import('./reports/ReportsPage'),
-    'ReportsPage',
-)
 
 export const toolTitle: string = ToolTitle.admin
 
@@ -186,7 +181,7 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
         authRequired: true,
         children: [
             {
-                element: <Rewrite to={manageChallengeRouteId} />,
+                element: <AdminHomeRedirect />,
                 route: '',
             },
             // Challenge Management Module
@@ -220,12 +215,14 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                 ],
                 element: <ChallengeManagement />,
                 id: manageChallengeRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: manageChallengeRouteId,
             },
             // User Management Module
             {
                 element: <UserManagementPage />,
                 id: userManagementRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: userManagementRouteId,
             },
             // Reviewer Management Module
@@ -244,6 +241,7 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                 ],
                 element: <ReviewManagement />,
                 id: manageReviewRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: manageReviewRouteId,
             },
             // Billing Account Module
@@ -297,6 +295,7 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                 ],
                 element: <BillingAccount />,
                 id: billingAccountRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: billingAccountRouteId,
             },
             // Permission Management Module
@@ -335,6 +334,7 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                 ],
                 element: <PermissionManagement />,
                 id: permissionManagementRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: permissionManagementRouteId,
             },
 
@@ -408,25 +408,21 @@ export const adminRoutes: ReadonlyArray<PlatformRoute> = [
                 ],
                 element: <Platform />,
                 id: platformRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: platformRouteId,
             },
             // Payments Module
             {
                 element: <PaymentsPage />,
                 id: paymentsRouteId,
+                rolesRequired: administratorOnlyRoles,
                 route: paymentsRouteId,
             },
-            // Reports Module
-            {
-                element: <ReportsPage />,
-                id: reportsRouteId,
-                route: reportsRouteId,
-            },
         ],
         domain: AppSubdomain.admin,
         element: <AdminApp />,
         id: toolTitle,
-        rolesRequired: [UserRole.administrator],
+        rolesRequired: adminReportsAccessRoles,
         route: rootRoute,
         title: toolTitle,
     },

src/apps/admin/src/challenge-management/ChallengeDetailsPage/ChallengeDetailsPage.module.scss

@@ -19,6 +19,21 @@
     gap: $sp-3;
 }
 
+.exportDescription {
+    margin: 0;
+    color: #555;
+}
+
+.exportActions {
+    display: flex;
+    flex-wrap: wrap;
+    gap: $sp-3;
+}
+
+.exportButton {
+    min-width: 220px;
+}
+
 .sectionTitle {
     margin: 0;
     font-size: 20px;

src/apps/admin/src/challenge-management/ChallengeDetailsPage/ChallengeDetailsPage.tsx

@@ -1,6 +1,7 @@
 import {
     ChangeEvent,
     FC,
+    MouseEvent,
     useEffect,
     useMemo,
     useState,
@@ -32,6 +33,10 @@ import {
     getResourceRoles,
     updateChallengeById,
 } from '../../lib/services'
+import {
+    downloadBlobFile,
+    downloadReportAsCsv,
+} from '../../lib/services/reports.service'
 import { createChallengeQueryString, handleError } from '../../lib/utils'
 
 import styles from './ChallengeDetailsPage.module.scss'
@@ -62,6 +67,22 @@ type RouteState = {
 
 type WinnerUpdate = Pick<ChallengeWinner, 'handle' | 'placement' | 'userId'>
 
+type ChallengeExportReportKey =
+    | 'registered-users'
+    | 'submitters'
+    | 'valid-submitters'
+    | 'winners'
+
+const CHALLENGE_EXPORT_REPORTS: Array<{
+    key: ChallengeExportReportKey
+    label: string
+}> = [
+    { key: 'registered-users', label: 'Registered Users' },
+    { key: 'submitters', label: 'Submitters' },
+    { key: 'valid-submitters', label: 'Valid Submitters' },
+    { key: 'winners', label: 'Winners' },
+]
+
 function formatStatusLabel(rawStatus: string): string {
     const normalized = rawStatus
         .trim()
@@ -188,6 +209,8 @@ export const ChallengeDetailsPage: FC = () => {
     const [isLoading, setIsLoading] = useState(false)
     const [isSavingStatus, setIsSavingStatus] = useState(false)
     const [isSavingWinners, setIsSavingWinners] = useState(false)
+    const [downloadingReportKey, setDownloadingReportKey]
+        = useState<ChallengeExportReportKey | undefined>()
     const [isLoadingSubmitters, setIsLoadingSubmitters] = useState(false)
     const [submitterOptions, setSubmitterOptions] = useState<InputSelectOption[]>([
         { label: 'Select submitter', value: '' },
@@ -328,6 +351,7 @@ export const ChallengeDetailsPage: FC = () => {
     }, [routeState.previousChallengeListFilter])
 
     const pageTitle = challengeInfo?.name || 'Challenge Details'
+    const isMarathonMatch = challengeInfo?.type?.name === 'Marathon Match'
     const currentWinnerHandleByUserId = useMemo(
         () => Object.fromEntries(
             (challengeInfo?.winners ?? []).map(winner => [`${winner.userId}`, winner.handle]),
@@ -414,6 +438,37 @@ export const ChallengeDetailsPage: FC = () => {
         }
     })
 
+    const handleExportReport = useEventCallback(async (reportKey: ChallengeExportReportKey) => {
+        if (!challengeId) {
+            return
+        }
+
+        setDownloadingReportKey(reportKey)
+
+        try {
+            const path = `/challenges/${encodeURIComponent(challengeId)}/${reportKey}`
+            const blob = await downloadReportAsCsv(path)
+            const fileName = `challenge-${reportKey}_${challengeId}.csv`
+
+            downloadBlobFile(blob, fileName)
+        } catch (error) {
+            handleError(error)
+        } finally {
+            setDownloadingReportKey(undefined)
+        }
+    })
+
+    const handleExportButtonClick = useEventCallback(
+        (event: MouseEvent<HTMLButtonElement>) => {
+            const reportKey = event.currentTarget.value as ChallengeExportReportKey
+            if (!reportKey) {
+                return
+            }
+
+            handleExportReport(reportKey)
+        },
+    )
+
     return (
         <PageWrapper
             pageTitle={pageTitle}
@@ -457,6 +512,34 @@ export const ChallengeDetailsPage: FC = () => {
             )}
             {!isLoading && challengeInfo && (
                 <>
+                    <section className={styles.section}>
+                        <h4 className={styles.sectionTitle}>Exports</h4>
+                        <p className={styles.exportDescription}>
+                            Download challenge detail reports as CSV.
+                            {isMarathonMatch && (
+                                ' Marathon Match submission-based exports include provisional '
+                                + 'score and final rank.'
+                            )}
+                        </p>
+                        <div className={styles.exportActions}>
+                            {CHALLENGE_EXPORT_REPORTS.map(report => (
+                                <Button
+                                    key={report.key}
+                                    secondary
+                                    size='lg'
+                                    className={styles.exportButton}
+                                    value={report.key}
+                                    disabled={downloadingReportKey !== undefined}
+                                    onClick={handleExportButtonClick}
+                                >
+                                    {downloadingReportKey === report.key
+                                        ? `Downloading ${report.label}…`
+                                        : `Export ${report.label}`}
+                                </Button>
+                            ))}
+                        </div>
+                    </section>
+
                     <section className={styles.section}>
                         <h4 className={styles.sectionTitle}>Status</h4>
                         <div className={styles.statusRow}>

src/apps/admin/src/config/routes.config.ts

@@ -18,4 +18,3 @@ export const termsRouteId = 'terms'
 export const defaultReviewersRouteId = 'default-reviewers'
 export const platformRouteId = 'platform'
 export const paymentsRouteId = 'payments'
-export const reportsRouteId = 'reports'

src/apps/admin/src/lib/components/common/Tab/SystemAdminTabs.tsx

@@ -1,16 +1,22 @@
 import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react'
 import { NavigateFunction, useLocation, useNavigate } from 'react-router-dom'
 
+import { ProfileContextData, useProfileContext } from '~/libs/core'
 import { TabsNavbar } from '~/libs/ui'
 
-import { getTabIdFromPathName, SystemAdminTabsConfig } from './config'
+import { getSystemAdminTabs, getTabIdFromPathName } from './config'
 import styles from './SystemAdminTabs.module.scss'
 
 const SystemAdminTabs: FC = () => {
     const navigate: NavigateFunction = useNavigate()
+    const { profile }: ProfileContextData = useProfileContext()
 
     const { pathname }: { pathname: string } = useLocation()
-    const activeTabPathName: string = useMemo<string>(() => getTabIdFromPathName(pathname), [pathname])
+    const tabs = useMemo(() => getSystemAdminTabs(profile?.roles), [profile?.roles])
+    const activeTabPathName: string = useMemo<string>(
+        () => getTabIdFromPathName(pathname, tabs),
+        [pathname, tabs],
+    )
     const [activeTab, setActiveTab]: [string, Dispatch<SetStateAction<string>>]
         = useState<string>(activeTabPathName)
 
@@ -26,17 +32,21 @@ const SystemAdminTabs: FC = () => {
 
     // If url is changed by navigator on different tabs, we need set activeTab
     useEffect(() => {
-        const pathTabId = getTabIdFromPathName(pathname)
+        const pathTabId = getTabIdFromPathName(pathname, tabs)
         if (pathTabId !== activeTab) {
             setActiveTab(pathTabId)
         }
-    }, [pathname]) // eslint-disable-line react-hooks/exhaustive-deps
+    }, [activeTab, pathname, tabs])
+
+    if (!tabs.length) {
+        return <></>
+    }
 
     return (
         <div className={styles.container}>
             <TabsNavbar
                 defaultActive={activeTab}
-                tabs={SystemAdminTabsConfig}
+                tabs={tabs}
                 onChange={handleTabChange}
                 onChildChange={handleChildTabChange}
             />