Prod deploy for engagement update and bug fixes

package.json

@@ -42,7 +42,7 @@
     "@uiw/react-codemirror": "^4.25.8",
     "amazon-s3-uri": "^0.1.1",
     "apexcharts": "^3.54.1",
-    "axios": "^1.13.2",
+    "axios": "^1.15.0",
     "browser-cookies": "^1.2.0",
     "city-timezones": "^1.3.2",
     "classnames": "^2.5.1",
@@ -66,7 +66,7 @@
     "highcharts-react-official": "^3.2.3",
     "highlight.js": "^11.11.1",
     "html2canvas": "^1.4.1",
-    "lodash": "^4.17.21",
+    "lodash": "^4.18.1",
     "markdown-it": "^13.0.2",
     "marked": "4.3.0",
     "moment": "^2.30.1",
@@ -213,7 +213,7 @@
     "sass-loader": "^13.3.3",
     "serve": "^14.2.5",
     "start-server-and-test": "^2.1.3",
-    "storybook": "7.6.20",
+    "storybook": "7.6.21",
     "style-loader": "^3.3.4",
     "systemjs-webpack-interop": "^2.3.7",
     "tsconfig-paths-webpack-plugin": "^4.2.0",

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

@@ -51,6 +51,7 @@ import {
     checkIsMM,
     getSubmissionReprocessTopic,
     handleError,
+    resolveManualUploadSubmissionType,
 } from '../../lib/utils'
 
 import styles from './ManageSubmissionPage.module.scss'
@@ -92,7 +93,9 @@ interface ManualSubmissionUploadModalProps {
     selectedHandle?: SelectOption
     setSelectedHandle: (value: SelectOption) => void
     isUploading: boolean
+    isLoadingChallenge: boolean
     isLoadingSubmitters: boolean
+    submissionTypeLabel: string
     submitterOptions: SelectOption[]
     handleFileChange: (event: ChangeEvent<HTMLInputElement>) => void
     selectedFile?: File
@@ -160,6 +163,7 @@ const ManualSubmissionUploadModal: FC<ManualSubmissionUploadModalProps> = (
     props: ManualSubmissionUploadModalProps,
 ) => {
     const isHandleSelectDisabled = props.isUploading
+        || props.isLoadingChallenge
         || props.isLoadingSubmitters
         || props.submitterOptions.length === 0
     const memberHandleHint = !props.isLoadingSubmitters
@@ -179,6 +183,16 @@ const ManualSubmissionUploadModal: FC<ManualSubmissionUploadModalProps> = (
         >
             <div className={styles.uploadForm}>
                 <div className={styles.uploadFormFields}>
+                    <div className={styles.fileInputContainer}>
+                        <span className={styles.inputLabel}>
+                            Submission type
+                        </span>
+                        <span className={styles.selectedFile}>
+                            {props.isLoadingChallenge
+                                ? 'Loading challenge phases...'
+                                : props.submissionTypeLabel}
+                        </span>
+                    </div>
                     <FieldSingleSelect
                         label='Member Handle'
                         hint={memberHandleHint}
@@ -225,6 +239,7 @@ const ManualSubmissionUploadModal: FC<ManualSubmissionUploadModalProps> = (
                         onClick={props.handleUploadSubmission}
                         disabled={
                             props.isUploading
+                            || props.isLoadingChallenge
                             || props.isLoadingSubmitters
                             || !props.selectedHandle?.value
                             || !props.selectedFile
@@ -256,6 +271,18 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
         challengeInfo,
     }: useFetchChallengeProps = useFetchChallenge(challengeId)
     const isMM = useMemo(() => checkIsMM(challengeInfo), [challengeInfo])
+    const manualUploadSubmissionType = useMemo(
+        () => resolveManualUploadSubmissionType(challengeInfo),
+        [challengeInfo],
+    )
+    const manualUploadSubmissionTypeLabel = useMemo(
+        () => (
+            manualUploadSubmissionType === 'CHECKPOINT_SUBMISSION'
+                ? 'Checkpoint Submission'
+                : 'Submission'
+        ),
+        [manualUploadSubmissionType],
+    )
     const submissionReprocessTopic = useMemo(
         () => getSubmissionReprocessTopic(challengeInfo),
         [challengeInfo],
@@ -329,7 +356,12 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
     )
 
     const handleUploadSubmission = useCallback(async () => {
-        if (!challengeId || !selectedFile || !selectedHandle?.value) {
+        if (
+            !challengeId
+            || !challengeInfo
+            || !selectedFile
+            || !selectedHandle?.value
+        ) {
             return
         }
 
@@ -341,6 +373,7 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
                 fileName: selectedFile.name,
                 memberHandle: String(selectedHandle.label),
                 memberId: selectedHandle.value,
+                type: manualUploadSubmissionType,
             })
 
             toast.success('Submission uploaded successfully', {
@@ -354,7 +387,15 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
         } finally {
             setIsUploading(false)
         }
-    }, [challengeId, selectedFile, selectedHandle, resetUploadForm, refresh])
+    }, [
+        challengeId,
+        challengeInfo,
+        manualUploadSubmissionType,
+        refresh,
+        resetUploadForm,
+        selectedFile,
+        selectedHandle,
+    ])
 
     useEffect(() => {
         let isCancelled = false
@@ -415,7 +456,7 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
                     <Button
                         primary
                         size='lg'
-                        disabled={isUploading}
+                        disabled={isUploading || isLoadingChallenge || !challengeInfo}
                         onClick={openUploadModal}
                     >
                         Upload submission
@@ -459,7 +500,9 @@ export const ManageSubmissionPage: FC<Props> = (props: Props) => {
                 selectedHandle={selectedHandle}
                 setSelectedHandle={setSelectedHandle}
                 isUploading={isUploading}
+                isLoadingChallenge={isLoadingChallenge}
                 isLoadingSubmitters={isLoadingSubmitters}
+                submissionTypeLabel={manualUploadSubmissionTypeLabel}
                 submitterOptions={submitterOptions}
                 handleFileChange={handleFileChange}
                 selectedFile={selectedFile}

src/apps/admin/src/lib/utils/challenge.spec.ts

@@ -0,0 +1,63 @@
+import { Challenge } from '../models'
+
+import { resolveManualUploadSubmissionType } from './challenge'
+
+jest.mock('~/config', () => ({
+    EnvironmentConfig: {
+        ADMIN: {},
+    },
+}), { virtual: true })
+
+describe('challenge utils', () => {
+    describe('resolveManualUploadSubmissionType', () => {
+        it('returns checkpoint submission when checkpoint screening is open', () => {
+            const challenge = {
+                phases: [
+                    {
+                        isOpen: true,
+                        name: 'Checkpoint Screening',
+                        scheduledEndDate: '2026-04-15T00:00:00.000Z',
+                    },
+                ],
+            } as Challenge
+
+            expect(resolveManualUploadSubmissionType(challenge))
+                .toBe('CHECKPOINT_SUBMISSION')
+        })
+
+        it('returns checkpoint submission when checkpoint review is open', () => {
+            const challenge = {
+                phases: [
+                    {
+                        isOpen: true,
+                        name: 'Checkpoint Review',
+                        scheduledEndDate: '2026-04-15T00:00:00.000Z',
+                    },
+                ],
+            } as Challenge
+
+            expect(resolveManualUploadSubmissionType(challenge))
+                .toBe('CHECKPOINT_SUBMISSION')
+        })
+
+        it('returns contest submission when checkpoint phases are closed', () => {
+            const challenge = {
+                phases: [
+                    {
+                        isOpen: false,
+                        name: 'Checkpoint Screening',
+                        scheduledEndDate: '2026-04-15T00:00:00.000Z',
+                    },
+                    {
+                        isOpen: true,
+                        name: 'Screening',
+                        scheduledEndDate: '2026-04-15T00:00:00.000Z',
+                    },
+                ],
+            } as Challenge
+
+            expect(resolveManualUploadSubmissionType(challenge))
+                .toBe('CONTEST_SUBMISSION')
+        })
+    })
+})

src/apps/admin/src/lib/utils/challenge.ts

@@ -7,6 +7,18 @@ import _ from 'lodash'
 import { SUBMISSION_REPROCESS_TOPICS } from '../../config/busEvent.config'
 import { Challenge, MemberSubmission } from '../models'
 
+const CONTEST_SUBMISSION_TYPE = 'CONTEST_SUBMISSION'
+const CHECKPOINT_SUBMISSION_TYPE = 'CHECKPOINT_SUBMISSION'
+const CHECKPOINT_MANUAL_UPLOAD_PHASES = new Set([
+    'checkpoint screening',
+    'checkpoint review',
+])
+
+const normalizePhaseName = (value?: string): string => (
+    value?.trim()
+        .toLowerCase() ?? ''
+)
+
 /**
  * Check if the challenge is a marathon match challenge
  * @param challenge challenge info
@@ -43,6 +55,29 @@ export function getSubmissionReprocessTopic(
     return undefined
 }
 
+/**
+ * Resolve the submission type used by the admin manual-upload flow.
+ * Checkpoint uploads are only valid once checkpoint review phases are active,
+ * so the admin UI switches to checkpoint submission type whenever the
+ * challenge is currently in Checkpoint Screening or Checkpoint Review.
+ * @param challenge challenge info
+ * @returns submission type expected by review-api-v6 manual upload endpoint
+ */
+export function resolveManualUploadSubmissionType(
+    challenge?: Challenge,
+): string {
+    const hasOpenCheckpointManualUploadPhase = (challenge?.phases ?? []).some(
+        phase => phase?.isOpen
+            && CHECKPOINT_MANUAL_UPLOAD_PHASES.has(
+                normalizePhaseName(phase?.name),
+            ),
+    )
+
+    return hasOpenCheckpointManualUploadPhase
+        ? CHECKPOINT_SUBMISSION_TYPE
+        : CONTEST_SUBMISSION_TYPE
+}
+
 /**
  * Process each submission rank of MM challenge
  * @param submissions the array of submissions

src/apps/customer-portal/src/config/routes.config.ts

@@ -9,4 +9,3 @@ export const rootRoute: string
         : `/${AppSubdomain.customer}`
 
 export const talentSearchRouteId = 'talent-search'
-export const profileCompletionRouteId = 'profile-completion'

src/apps/customer-portal/src/customer-portal.routes.tsx

@@ -11,11 +11,10 @@ import {
 } from '~/libs/core'
 
 import {
-    profileCompletionRouteId,
     rootRoute,
+    talentSearchRouteId,
 } from './config/routes.config'
 import { customerPortalTalentSearchRoutes } from './pages/talent-search/talent-search.routes'
-import { customerPortalProfileCompletionRoutes } from './pages/profile-completion/profile-completion.routes'
 
 const CustomerPortalApp: LazyLoadedComponent = lazyLoad(() => import('./CustomerPortalApp'))
 
@@ -28,10 +27,9 @@ export const customerPortalRoutes: ReadonlyArray<PlatformRoute> = [
         children: [
             {
                 authRequired: true,
-                element: <Rewrite to={profileCompletionRouteId} />,
+                element: <Rewrite to={talentSearchRouteId} />,
                 route: '',
             },
-            ...customerPortalProfileCompletionRoutes,
             ...customerPortalTalentSearchRoutes,
         ],
         domain: AppSubdomain.customer,

src/apps/customer-portal/src/lib/components/NavTabs/config/tabs-config.ts

@@ -2,17 +2,13 @@ import _ from 'lodash'
 
 import { TabsNavItem } from '~/libs/ui'
 import {
-    profileCompletionRouteId,
     talentSearchRouteId,
 } from '~/apps/customer-portal/src/config/routes.config'
 
 export function getTabsConfig(userRoles: string[], isAnonymous: boolean, isUnprivilegedUser: boolean): TabsNavItem[] {
 
     const tabs: TabsNavItem[] = [
         ...(!isUnprivilegedUser ? [{
-            id: profileCompletionRouteId,
-            title: 'Profile Completion',
-        }, {
             id: talentSearchRouteId,
             title: 'Talent Search',
         }] : []),

src/apps/customer-portal/src/lib/services/index.ts

@@ -1,2 +1 @@
-export * from './profileCompletion.service'
 export * from './talentSearch.service'