Helpdesk forms: add support for conditions on radio/checkbox/dropdown questions

Author: AdrienClairembault

js/modules/Forms/Condition/Engine.js

@@ -61,6 +61,7 @@ export class GlpiFormConditionEngine
     #getQuestionsData(container)
     {
         const questions_data = new Map();
+        const array_values = new Map(); // Store array values temporarily
 
         // Map questions that can be used as condition critera by others items.
         const questions_criteria_ids = [];
@@ -75,26 +76,57 @@ export class GlpiFormConditionEngine
         const data = new FormData(container);
         for (const entry of data.entries()) {
             const key = entry[0];
+            const value = entry[1];
 
             // Skip data unrelated to form answers
             if (key.indexOf('answers_') == -1) {
                 continue;
             }
 
-            if (key.indexOf('[') == -1) {
-                // Read simple text value
-                const simple_key_regex = RegExp('answers_(.*)');
+            if (key.includes('[')) {
+                // Handle array values: answers_questionId[] or answers_questionId[key]
+                const array_key_regex = /^answers_([^[]+)(\[\d*\]|\[[^\]]*\])$/;
+                const match = array_key_regex.exec(key);
+
+                if (match && match[1]) {
+                    const question_id = match[1];
+
+                    // Check if this question is a criteria
+                    if (questions_criteria_ids.indexOf(question_id) !== -1) {
+                        // Initialize array for this question if needed
+                        if (!array_values.has(question_id)) {
+                            array_values.set(question_id, []);
+                        }
+
+                        // Add value to the array
+                        if (value !== '') {
+                            array_values.get(question_id).push(value);
+                        }
+                    }
+                }
+            } else {
+                // Handle simple values: answers_questionId
+                const simple_key_regex = /^answers_(.*)$/;
                 const match = simple_key_regex.exec(key);
 
-                // Extra value if it is from a criteria
-                if (questions_criteria_ids.indexOf(match[1]) != -1) {
-                    questions_data.set(match[1], entry[1]);
+                if (match && match[1]) {
+                    const question_id = match[1];
+
+                    // Extra value if it is from a criteria
+                    if (questions_criteria_ids.indexOf(question_id) !== -1) {
+                        questions_data.set(question_id, value);
+                    }
                 }
-            } else {
-                // Value is an array, not yet supported (TODO)
             }
         };
 
+        // Add collected array values to questions_data
+        for (const [question_id, values] of array_values.entries()) {
+            if (values.length > 0) {
+                questions_data.set(question_id, values);
+            }
+        }
+
         return questions_data;
     }
 
@@ -103,8 +135,14 @@ export class GlpiFormConditionEngine
         // Build POST data
         const form_data = new FormData();
         form_data.append('form_id', this.#form_id);
-        for (const entry of data.answers.entries()) {
-            form_data.append(`answers[${entry[0]}]`, entry[1]);
+        for (const [key, value] of data.answers.entries()) {
+            if (Array.isArray(value)) {
+                value.forEach((v, i) => {
+                    form_data.append(`answers[${key}][${i}]`, v);
+                });
+            } else {
+                form_data.append(`answers[${key}]`, value);
+            }
         }
 
         // Send request

js/modules/Forms/ConditionEditorController.js

@@ -222,8 +222,13 @@ export class GlpiFormConditionEditorController
             const condition_value = $(condition).find(
                 '[data-glpi-conditions-editor-value]'
             );
-            if (condition_value.length > 0) {
+            if (condition_value.length === 1) {
                 condition_data.value = condition_value.val();
+            } else if (condition_value.length > 1) {
+                condition_data.value = [];
+                condition_value.each((_index, element) => {
+                    condition_data.value.push(element.value);
+                });
             }
 
             conditions_data.push(condition_data);

js/modules/Forms/EditorController.js

@@ -1268,7 +1268,28 @@ export class GlpiFormEditorController
                 name = input.name;
             }
 
-            extra_data[name] = input.value;
+            const is_map = name.indexOf("[") !== -1
+                && name.indexOf("]") !== -1
+                && name.indexOf("[]") === -1
+            ;
+
+            if (is_map) {
+                // Handle complex arrays with key and values
+                const matches = name.match(/^(.*)\[(.*)\]$/);
+                if (matches === null) {
+                    throw new Error(`Unexpected input name: ${name}`);
+                }
+                if (extra_data[matches[1]] === undefined) {
+                    extra_data[matches[1]] = {};
+                }
+                if (extra_data[matches[1]][matches[2]] === undefined) {
+                    extra_data[matches[1]][matches[2]] = {};
+                }
+                extra_data[matches[1]][matches[2]] = input.value;
+            } else {
+                // Simple value
+                extra_data[name] = input.value;
+            }
         }
 
         return extra_data;