From e483d7ef4df708ffe956e39f1db0cf022365c3f5 Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Tue, 14 May 2024 14:40:08 +0200
Subject: [PATCH] Fix init page and storing of default values

---
 rdmo/projects/assets/js/interview/utils/page.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/rdmo/projects/assets/js/interview/utils/page.js b/rdmo/projects/assets/js/interview/utils/page.js
index 59b7bdd37..fe8e1d931 100644
--- 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