Fix init page and storing of default values

rdmorganiser · May 14, 2024 · e483d7e · e483d7e
1 parent ee638be
commit e483d7e
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/rdmo/projects/assets/js/interview/utils/page.js b/rdmo/projects/assets/js/interview/utils/page.js
@@ -19,12 +19,20 @@ const initQuestionSet = (questionset) => {
 
   // aggregate questionsets from decendants
   questionset.questionsets = questionset.elements.reduce((questionsets, element) => {
-    return (element.model == 'questions.questionset') ? [...questionsets, element] : questionsets
+    if (element.model == 'questions.questionset') {
+      return questionsets.concat(element.questionsets)
+    } else {
+      return questionsets
+    }
   }, [])
 
   // aggregate optionsets from decendants
   questionset.questions = questionset.elements.reduce((questions, element) => {
-    return (element.model == 'questions.question') ? [...questions, element] : questions
+    if (element.model == 'questions.questionset') {
+      return questions.concat(element.questions)
+    } else {
+      return [...questions, element]
+    }
   }, [])
 
   // aggregate optionsets from decendants