Merge pull request #209 from topcoder-platform/PROD-2568_timeline

PROD-2468 Timeline -> PROD-2321

Author: mmattlin

src-ts/tools/work/work-lib/work-constants/config.json

@@ -0,0 +1,7 @@
+{
+    "PHASE_ID_APPEALS": "1c24cfb3-5b0a-4dbd-b6bd-4b0dff5349c6",
+    "PHASE_ID_APPEALS_RESPONSE": "797a6af7-cd3f-4436-9fca-9679f773bee9",
+    "PHASE_ID_REGISTRATION": "a93544bc-c165-4af4-b55e-18f3593b457a",
+    "PHASE_ID_REVIEW": "aa5a3f78-79e0-4bf7-93ff-b11e8f5b398b",
+    "PHASE_ID_SUBMISSION": "6950164f-3c5e-4bdc-abc8-22aaf5a1bd49"
+}

src-ts/tools/work/work-lib/work-constants/index.ts

@@ -1 +1,2 @@
 export { default as WorkStrings } from './strings.json'
+export { default as WorkConfigConstants } from './config.json'

src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work.factory.ts

@@ -1,6 +1,6 @@
 import moment from 'moment'
 
-import { WorkStrings } from '../../../work-constants'
+import { WorkConfigConstants, WorkStrings } from '../../../work-constants'
 import {
     Challenge,
     ChallengeCreateBody,
@@ -10,14 +10,14 @@ import {
     ChallengePhase,
     ChallengePhaseName,
     ChallengeUpdateBody,
+    PricePackageName,
     Work,
     WorkPrice,
-    WorkPriceBreakdown,
     WorkPricesType,
-    WorkPrize,
     WorkProgress,
     WorkProgressStep,
     WorkStatus,
+    WorkTimelinePhase,
     WorkType,
     WorkTypeCategory,
     WorkTypeConfig,
@@ -150,12 +150,21 @@ export function buildUpdateBody(workTypeConfig: WorkTypeConfig, challenge: Chall
     }
     // ---- End Build Markdown string ---- //
 
+    // If the duration of the Submission phase depends on the package selected (i.e.: Bug Hunt),
+    // then update the duration for that phase to the correct value
+    const timeline: Array<WorkTimelinePhase> = workTypeConfig.timeline.map((phase) => {
+        if (workTypeConfig.submissionPhaseDuration && phase.phaseId === WorkConfigConstants.PHASE_ID_SUBMISSION) {
+            phase.duration = workTypeConfig.submissionPhaseDuration[formData[ChallengeMetadataName.packageType] as PricePackageName] || 0
+        }
+        return phase
+    })
+
     const body: ChallengeUpdateBody = {
         description: templateString.join(''),
         id: challenge.id,
         metadata: intakeMetadata,
         name: formData.projectTitle,
-        phases: workTypeConfig.timeline,
+        phases: timeline,
         prizeSets: priceConfig.getPrizeSets(priceConfig, formData.packageType),
     }
 

src-ts/tools/work/work-lib/work-provider/work-functions/work-store/index.ts

@@ -20,6 +20,7 @@ export * from './work-progress.model'
 export * from './work-progress-step.model'
 export * from './work-status-filter.enum'
 export * from './work-status.enum'
+export * from './work-timeline-phase.model'
 export {
     bugHuntConfig as workBugHuntConfig,
     WorkTypeConfigs

src-ts/tools/work/work-lib/work-provider/work-functions/work-store/work-timeline.model.ts

@@ -1,5 +1,5 @@
 import { WorkTimelinePhase } from './work-timeline-phase.model'
 
 export interface WorkTimeline {
-    [workType: string]: ReadonlyArray<WorkTimelinePhase>
+    [workType: string]: Array<WorkTimelinePhase>
 }

src-ts/tools/work/work-lib/work-provider/work-functions/work-store/work-timelines.config.ts

@@ -1,3 +1,5 @@
+import { WorkConfigConstants } from '../../../work-constants'
+
 import { WorkTimeline } from './work-timeline.model'
 import { WorkType } from './work-type.enum'
 
@@ -6,28 +8,28 @@ export const WorkTimelines: WorkTimeline = {
     [WorkType.bugHunt]: [
         {
             // Registration
-            duration: 259200, // 3 days
-            phaseId: 'a93544bc-c165-4af4-b55e-18f3593b457a',
+            duration: 43200, // 0.5 day
+            phaseId: WorkConfigConstants.PHASE_ID_REGISTRATION,
         },
         {
             // Submission
-            duration: 259200, // 3 days
-            phaseId: '6950164f-3c5e-4bdc-abc8-22aaf5a1bd49',
+            duration: 86400, // 1 day, will vary by package
+            phaseId: WorkConfigConstants.PHASE_ID_SUBMISSION,
         },
         {
             // Review
-            duration: 86400, // 1 day
-            phaseId: 'aa5a3f78-79e0-4bf7-93ff-b11e8f5b398b',
+            duration: 172800, // 2 days
+            phaseId: WorkConfigConstants.PHASE_ID_REVIEW,
         },
         {
             // Appeals
-            duration: 86400, // 1 day
-            phaseId: '1c24cfb3-5b0a-4dbd-b6bd-4b0dff5349c6',
+            duration: 43200, // 0.5 day
+            phaseId: WorkConfigConstants.PHASE_ID_APPEALS,
         },
         {
             // Appeals response
-            duration: 259200, // 3 days
-            phaseId: '797a6af7-cd3f-4436-9fca-9679f773bee9',
+            duration: 43200, // 0.5 day
+            phaseId: WorkConfigConstants.PHASE_ID_APPEALS_RESPONSE,
         },
     ],
 }

src-ts/tools/work/work-lib/work-provider/work-functions/work-store/work-type.config.ts

@@ -35,6 +35,11 @@ export const WorkTypeConfigs: { [workType: string]: WorkTypeConfig } = {
                 },
                 shortDescription: 'Find bugs quickly and vigorously',
                 startRoute: WorkIntakeFormRoutes[WorkType.bugHunt]['basicInfo'],
+                submissionPhaseDuration: {
+                        'advanced': 172800, // 2 days
+                        'premium': 259200, // 3 days
+                        'standard': 86400, // 1 day
+                },
                 subtitle: `Conduct a time based testing bug hunt where Topcoder experts scramble to find bugs or issues in the system`,
                 tags: [ChallengeTag.qa],
                 timeline: WorkTimelines[WorkType.bugHunt],

src-ts/tools/work/work-lib/work-provider/work-functions/work-store/work-type.model.ts

@@ -1,5 +1,5 @@
 import { ChallengeTag } from './challenge-tag.enum'
-import { WorkPrice } from './work-price.model'
+import { PricePackageName, WorkPrice } from './work-price.model'
 import { WorkTimelinePhase } from './work-timeline-phase.model'
 import { WorkType } from './work-type.enum'
 
@@ -21,9 +21,12 @@ export interface WorkTypeConfig {
     }
     shortDescription: string,
     startRoute: string,
+    submissionPhaseDuration?: {
+        [key in PricePackageName]?: number
+    },
     subtitle: string,
     tags: Array<ChallengeTag>,
-    timeline: ReadonlyArray<WorkTimelinePhase>
+    timeline: Array<WorkTimelinePhase>
     timelineTemplateId: string,
     title: string,
     trackId: string,

src-ts/tools/work/work.routes.tsx

@@ -64,20 +64,20 @@ export const workRoutes: Array<PlatformRoute> = [
                 route: `bug-hunt/basic-info/:workId`,
                 title: intakeFormsTitle,
             },
-            // General
             {
-                element: <WorkLoginPrompt />,
-                route: `:workType/login-prompt`,
+                element: <Review />,
+                route: `bug-hunt/review`,
                 title: intakeFormsTitle,
             },
             {
                 element: <Review />,
-                route: `:workType/review`,
+                route: `bug-hunt/review/:workId`,
                 title: intakeFormsTitle,
             },
+            // General
             {
-                element: <Review />,
-                route: `:workType/review/:workId`,
+                element: <WorkLoginPrompt />,
+                route: `:workType/login-prompt`,
                 title: intakeFormsTitle,
             },
             {