fix(forms): unable to add conditions to an unsaved question

Author: ccailly

js/modules/Forms/EditorController.js

@@ -1014,6 +1014,9 @@ export class GlpiFormEditorController
 
         const new_question = this.#addBlock(target, template);
 
+        // Set UUID
+        this.#setUuid(new_question);
+
         // Mark as active
         this.#setActiveItem(new_question);
 
@@ -1903,6 +1906,9 @@ export class GlpiFormEditorController
 
         const new_comment = this.#addBlock(target, template);
 
+        // Set UUID
+        this.#setUuid(new_comment);
+
         // Mark as active
         this.#setActiveItem(new_comment);
 

src/Glpi/Controller/Form/Condition/EditorController.php

@@ -39,6 +39,7 @@
 use Glpi\Form\Condition\ConditionData;
 use Glpi\Form\Condition\EditorManager;
 use Glpi\Form\Condition\FormData;
+use Glpi\Form\Condition\QuestionData;
 use Glpi\Form\Condition\Type;
 use Glpi\Form\Question;
 use InvalidArgumentException;
@@ -90,24 +91,21 @@ public function validationEditor(Request $request): Response
             );
         }
 
-        // Get the question by UUID
-        $question = Question::getByUuid($form_data->getSelectedItemUuid());
-        if ($question === null) {
-            throw new NotFoundHttpException(
-                sprintf(
-                    'Question with UUID "%s" not found.',
-                    $form_data->getSelectedItemUuid()
-                )
-            );
-        }
+        // Retrieve the question data
+        $question_uuid = $form_data->getSelectedItemUuid();
+        $question_name = current(array_filter(
+            $form_data->getQuestionsData(),
+            fn (QuestionData $question) => $question->getUuid() === $question_uuid
+        ))->getName();
 
+        // Retrieve the conditions data
         $conditions = $form_data->getConditionsData();
         $default_value_operator = current(array_keys($this->editor_manager->getValueOperatorForValidationDropdownValues(
-            $question->fields['uuid']
+            $question_uuid
         )));
         if (empty($conditions)) {
             $conditions[] = new ConditionData(
-                item_uuid: $question->fields['uuid'],
+                item_uuid: $question_uuid,
                 item_type: Type::QUESTION->value,
                 value_operator: $default_value_operator,
                 value: null,
@@ -118,15 +116,16 @@ public function validationEditor(Request $request): Response
         $last_index = count($conditions) - 1;
         if (empty($conditions[$last_index]->getItemUuid())) {
             $conditions[$last_index] = new ConditionData(
-                item_uuid: $question->fields['uuid'],
+                item_uuid: $question_uuid,
                 item_type: Type::QUESTION->value,
                 value_operator: $default_value_operator,
                 value: null,
             );
         }
 
         return $this->render('pages/admin/form/conditional_validation_editor.html.twig', [
-            'question'           => $question,
+            'question_uuid'      => $question_uuid,
+            'question_name'      => $question_name,
             'manager'            => $this->editor_manager,
             'defined_conditions' => $conditions,
             'items_values'       => $this->editor_manager->getItemsDropdownValues(),

templates/pages/admin/form/conditional_validation_editor.html.twig

@@ -67,12 +67,12 @@
                         </span>
                     {% endif %}
 
-                    {% set question_key = 'question-' ~ question.fields.uuid %}
+                    {% set question_key = 'question-' ~ question_uuid %}
                     <span class="me-2 question-selector">
                         {% do call('Dropdown::showFromArray', [
                             '_validation_conditions[' ~ loop.index0 ~ '][item]',
                             {
-                                (question_key): question.getName(),
+                                (question_key): question_name,
                             },
                             {
                                 'value': question_key,