Try to fix failing tests

Signed-off-by: Micke Nordin <kano@sunet.se>

Author: mickenordin

openapi.json

@@ -1621,6 +1621,19 @@
                                         "nullable": true,
                                         "default": null,
                                         "description": "(optional) id of the question that should be cloned"
+                                    },
+                                    "parentQuestionId": {
+                                        "type": "integer",
+                                        "format": "int64",
+                                        "nullable": true,
+                                        "default": null,
+                                        "description": "(optional) id of the parent conditional question (for subquestions)"
+                                    },
+                                    "branchId": {
+                                        "type": "string",
+                                        "nullable": true,
+                                        "default": null,
+                                        "description": "(optional) branch id within the parent conditional question"
                                     }
                                 }
                             }

src/components/Questions/BranchConditionEditor.vue

@@ -41,7 +41,7 @@
 					:options="textConditionTypes"
 					:placeholder="t('forms', 'Condition type')"
 					label="label"
-					:reduce="opt => opt.value"
+					:reduce="(opt) => opt.value"
 					class="condition-type-select" />
 				<NcTextField
 					v-model="conditionValue"
@@ -59,7 +59,7 @@
 						:options="valueConditionTypes"
 						:placeholder="t('forms', 'Condition type')"
 						label="label"
-						:reduce="opt => opt.value"
+						:reduce="(opt) => opt.value"
 						class="condition-type-select" />
 					<template v-if="conditionType === 'value_equals'">
 						<NcTextField
@@ -88,7 +88,9 @@
 							<template #icon>
 								<div
 									class="color-preview"
-									:style="{ backgroundColor: conditionValue || '#000000' }" />
+									:style="{
+										backgroundColor: conditionValue || '#000000',
+									}" />
 							</template>
 							{{ t('forms', 'Select color') }}
 						</NcButton>
@@ -118,7 +120,7 @@
 		<template v-else-if="triggerType === 'file'">
 			<div class="condition-row">
 				<NcCheckboxRadioSwitch
-					:checked="fileUploadedCondition"
+					:model-value="fileUploadedCondition"
 					@update:checked="onFileConditionChange">
 					{{ t('forms', 'File is uploaded') }}
 				</NcCheckboxRadioSwitch>
@@ -155,13 +157,15 @@ export default {
 			type: Object,
 			required: true,
 		},
+
 		/**
 		 * The trigger question type
 		 */
 		triggerType: {
 			type: String,
 			required: true,
 		},
+
 		/**
 		 * Options for option-based triggers (radio, dropdown, checkbox)
 		 */
@@ -178,7 +182,9 @@ export default {
 		 * Check if trigger is option-based (radio, dropdown, checkbox)
 		 */
 		isOptionBasedTrigger() {
-			return ['multiple_unique', 'dropdown', 'multiple'].includes(this.triggerType)
+			return ['multiple_unique', 'dropdown', 'multiple'].includes(
+				this.triggerType,
+			)
 		},
 
 		/**
@@ -223,7 +229,7 @@ export default {
 		 * Options list for NcSelect
 		 */
 		optionsList() {
-			return this.options.map(opt => ({
+			return this.options.map((opt) => ({
 				id: opt.id,
 				text: opt.text || t('forms', 'Option {id}', { id: opt.id }),
 			}))
@@ -240,12 +246,14 @@ export default {
 			let selectedIds
 			if (this.isSingleSelect) {
 				// Single select uses optionId in each condition
-				selectedIds = this.branch.conditions.map(c => c.optionId)
+				selectedIds = this.branch.conditions.map((c) => c.optionId)
 			} else {
 				// Multi select uses optionIds array in first condition
 				selectedIds = this.branch.conditions[0]?.optionIds || []
 			}
-			const selected = this.optionsList.filter(opt => selectedIds.includes(opt.id))
+			const selected = this.optionsList.filter((opt) =>
+				selectedIds.includes(opt.id),
+			)
 
 			return this.isSingleSelect ? selected[0] || null : selected
 		},
@@ -261,7 +269,7 @@ export default {
 			]
 			// Long text doesn't support string_equals
 			if (this.triggerType === 'long') {
-				return types.filter(t => t.value !== 'string_equals')
+				return types.filter((t) => t.value !== 'string_equals')
 			}
 			return types
 		},
@@ -283,6 +291,7 @@ export default {
 			get() {
 				return this.branch.conditions?.[0]?.type || this.defaultConditionType
 			},
+
 			set(value) {
 				this.updateCondition({ type: value })
 			},
@@ -305,6 +314,7 @@ export default {
 			get() {
 				return this.branch.conditions?.[0]?.value || ''
 			},
+
 			set(value) {
 				this.updateCondition({ value })
 			},
@@ -317,6 +327,7 @@ export default {
 			get() {
 				return this.branch.conditions?.[0]?.min || null
 			},
+
 			set(value) {
 				this.updateCondition({ min: value })
 			},
@@ -329,6 +340,7 @@ export default {
 			get() {
 				return this.branch.conditions?.[0]?.max || null
 			},
+
 			set(value) {
 				this.updateCondition({ max: value })
 			},
@@ -367,6 +379,8 @@ export default {
 	methods: {
 		/**
 		 * Handle single option selection (radio/dropdown)
+		 *
+		 * @param {object|null} option The selected option or null
 		 */
 		onSingleOptionSelect(option) {
 			const conditions = option ? [{ optionId: option.id }] : []
@@ -375,15 +389,19 @@ export default {
 
 		/**
 		 * Handle multiple option selection (checkbox)
+		 *
+		 * @param {Array} options The selected options array
 		 */
 		onMultipleOptionsSelect(options) {
-			const optionIds = options.map(opt => opt.id)
+			const optionIds = options.map((opt) => opt.id)
 			const conditions = optionIds.length > 0 ? [{ optionIds }] : []
 			this.emitUpdate({ conditions })
 		},
 
 		/**
 		 * Handle file condition change
+		 *
+		 * @param {boolean} checked Whether file is uploaded condition is checked
 		 */
 		onFileConditionChange(checked) {
 			const conditions = [{ fileUploaded: checked }]
@@ -392,6 +410,8 @@ export default {
 
 		/**
 		 * Update a condition property
+		 *
+		 * @param {object} updates The condition properties to update
 		 */
 		updateCondition(updates) {
 			const currentCondition = this.branch.conditions?.[0] || {}
@@ -405,6 +425,8 @@ export default {
 
 		/**
 		 * Emit branch update
+		 *
+		 * @param {object} updates The branch properties to update
 		 */
 		emitUpdate(updates) {
 			this.$emit('update:branch', {