:bug: Fixed bug: form dropdowns didn't index correctly

frontend/src/utils/survey.js

@@ -6,14 +6,21 @@ class SurveyFactory {
     constructor() {
         this.questionsFromDb = []
     }
-    _addResponses(responseKeys, possibleResponsesByCategory) {
+    async _addResponses(responseKeys, possibleResponsesByCategory) {
+        const validFormInputs = {}
         Object.keys(possibleResponsesByCategory).forEach(categoryKey => {
+            if (possibleResponsesByCategory[categoryKey].length) {
+                validFormInputs[categoryKey] = possibleResponsesByCategory[categoryKey]
+            }
+        })
+        Object.keys(validFormInputs).forEach(inputKey => {
             responseKeys.forEach(responseKey => {
-                if (possibleResponsesByCategory[categoryKey].length) {
-                    responseKey.responses = possibleResponsesByCategory[categoryKey]
+                if (responseKey.survey_stage == inputKey) {
+                    responseKey.responses = validFormInputs[inputKey]
                 }
             })
         })
+        console.log('responseKeys >>', responseKeys)
         return responseKeys
     }
     _addComponents(responseKeys) {
@@ -32,9 +39,19 @@ class SurveyFactory {
         })
         return responseKeys
     }
+    _addSurveySteps(responseKeys, surveyStages) {
+        responseKeys.forEach(responseKey => {
+            Object.keys(surveyStages).forEach((stage, i) => {
+                if (responseKey.response_key_id == stage) {
+                    responseKey.survey_stage = surveyStages[i + 1]
+                }
+            })
+        })
+        return responseKeys
+    }
     // TODO: Don't nest the for loop...
     _sortSurveySteps(mutatedResponseKeys, allSteps) {
-        const reordered = [] 
+        const reordered = []
         Object.values(allSteps).forEach(step => {
             Object.values(mutatedResponseKeys).forEach(val => {
                 if (surveyStages[val.response_key_id] === step)  {
@@ -48,7 +65,8 @@ class SurveyFactory {
     _setSteps() {
         const responseKeys = this.questionsFromDb
         const responsesByCategory = possible['usa']
-        let mutatedResponseKeys = this._addResponses(responseKeys, responsesByCategory)
+        let mutatedResponseKeys = this._addSurveySteps(responseKeys, surveyStages)
+        mutatedResponseKeys = this._addResponses(mutatedResponseKeys, responsesByCategory)
         mutatedResponseKeys = this._addComponents(responseKeys)
         mutatedResponseKeys = this._sortSurveySteps(mutatedResponseKeys, allSteps['usa'])
         // Splash page is placed at beginning of survey