Merge pull request #206 from topcoder-platform/bug-hunt-set-currentStep

Bug hunt - Set current step

Author: dave-armstrong-topcoder

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

@@ -112,11 +112,6 @@ export function buildUpdateBody(workTypeConfig: WorkTypeConfig, challenge: Chall
     const form: IntakeForm = !!intakeForm?.value ? JSON.parse(intakeForm.value)?.form : {}
     form.basicInfo = formData
 
-    // TODO: Add the progress.currentStep to form to determine if it's in the review phase (review page)
-    // or not. The legacy intakes use currentStep 7 for review and 5 for taking the user to the login step
-    // as those numbers map to the routes configured for each work type (see IntakeForm.jsx for an example).
-    // We can probably clean that up as we don't need that many routes
-
     // --- Build Metadata --- //
     const intakeMetadata: Array<ChallengeMetadata> = [
         {

src-ts/tools/work/work-self-service/intake-forms/bug-hunt/BugHuntIntakeForm.tsx

@@ -58,10 +58,6 @@ const BugHuntIntakeForm: React.FC = () => {
         [ChallengeMetadataName.packageType]: 'standard',
     })
 
-    function findMetadata(metadataName: ChallengeMetadataName): ChallengeMetadata | undefined {
-        return challenge?.metadata?.find((item: ChallengeMetadata) => item.name === metadataName)
-    }
-
     const [selectedPackage, setSelectedPackage]: [PricePackageName, Dispatch<SetStateAction<PricePackageName>>]
         = useState<PricePackageName>(formValues.packageType)
 
@@ -78,17 +74,9 @@ const BugHuntIntakeForm: React.FC = () => {
 
                 const intakeFormBH: ChallengeMetadata | undefined = response.metadata?.find((item: ChallengeMetadata) => item.name === ChallengeMetadataName.intakeForm)
                 if (intakeFormBH) {
-                    const formData: Record<string, any> = JSON.parse(intakeFormBH.value)
-                    // TODO: Set the correct currentStep into challenge's form data when saving form and moving on to a new page
-                    if (formData.currentStep && formData.currentStep !== 'basicInfo') {
-                        if (!isLoggedIn) {
-                            navigate(WorkIntakeFormRoutes[WorkType.bugHunt]['loginPrompt'])
-                        } else {
-                            navigate(WorkIntakeFormRoutes[WorkType.bugHunt][formData.currentStep])
-                        }
-                    }
+                    const formData: Record<string, any> = JSON.parse(intakeFormBH.value).form.basicInfo
 
-                    setFormValues(formData.form.basicInfo)
+                    setFormValues(formData)
 
                     if (formData.form.basicInfo.packageType !== selectedPackage) {
                         setSelectedPackage(formData.form.basicInfo.packageType)
@@ -129,6 +117,11 @@ const BugHuntIntakeForm: React.FC = () => {
 
     const onSave: (val: any) => Promise<void> = (val: any) => {
         if (!challenge) { return Promise.resolve() }
+        if (action === 'save') {
+            val.currentStep = 'basicInfo'
+        } else if (action === 'submit') {
+            val.currentStep = 'review'
+        }
 
         return workUpdateAsync(WorkType.bugHunt, challenge, val)
     }

src-ts/tools/work/work-self-service/intake-forms/review/Review.tsx

@@ -29,7 +29,7 @@ interface FormFieldValues {
 
 const Review: React.FC = () => {
     const workId: string | undefined = useParams().workId
-    const redirectUrl: string = WorkIntakeFormRoutes[WorkType.bugHunt]['basicInfo']
+    const redirectUrl: string = `${WorkIntakeFormRoutes[WorkType.bugHunt]['basicInfo']}/${workId}`
 
     const [formData, setFormData]: [any, Dispatch<any>] = useState({})