fix: Fixed field deletion blocked when at least one form question use another field

Author: ccailly

inc/field.class.php

@@ -355,9 +355,10 @@ public function pre_deleteItem()
         $question = new Question();
         $found = $question->find([
             'type' => PluginFieldsQuestionType::class,
-            $this->fields['id'] => new QueryExpression(sprintf(
-                "JSON_VALUE(%s, '$.field_id')",
+            new QueryExpression(sprintf(
+                "JSON_VALUE(%s, '$.field_id') = %s",
                 DBmysql::quoteName('extra_data'),
+                DBmysql::quoteValue((int) $this->fields['id']),
             )),
         ]);
         if (!empty($found)) {

tests/Units/FieldQuestionTypeTest.php

@@ -177,6 +177,60 @@ public function testFieldsQuestionSubmitEmptyDropdown(): void
         ]);
     }
 
+    public function testFieldDeletionWhenUsedInForm(): void
+    {
+        $this->login();
+
+        // Arrange: create form with Field question
+        $builder = new FormBuilder("My form");
+        $builder->addQuestion(
+            "My question",
+            PluginFieldsQuestionType::class,
+            extra_data: json_encode($this->getFieldExtraDataConfig('glpi_item')),
+        );
+        $this->createForm($builder);
+
+        // Act: try to delete field
+        $response = $this->fields['glpi_item']->delete($this->fields['glpi_item']->fields);
+
+        // Assert: deletion is blocked with appropriate message
+        $this->assertFalse($response);
+        $this->hasSessionMessageThatContains('The field "GLPI Item" cannot be deleted because it is used in a form question', ERROR);
+    }
+
+    public function testFieldDeletionWhenNotUsedInForm(): void
+    {
+        $this->login();
+
+        // Act: try to delete field
+        $response = $this->fields['glpi_item']->delete($this->fields['glpi_item']->fields);
+
+        // Assert: deletion is successful
+        $this->assertTrue($response);
+        $this->hasNoSessionMessage(ERROR);
+    }
+
+    public function testFieldDeletionWhenAnotherFieldUsedInForm(): void
+    {
+        $this->login();
+
+        // Arrange: create form with Field question using dropdown field
+        $builder = new FormBuilder("My form");
+        $builder->addQuestion(
+            "My question",
+            PluginFieldsQuestionType::class,
+            extra_data: json_encode($this->getFieldExtraDataConfig('dropdown')),
+        );
+        $this->createForm($builder);
+
+        // Act: try to delete glpi_item field which isn't used in form but exists
+        $response = $this->fields['glpi_item']->delete($this->fields['glpi_item']->fields);
+
+        // Assert: deletion is successful and not blocked by the fact that another field is used in form
+        $this->assertTrue($response);
+        $this->hasNoSessionMessage(ERROR);
+    }
+
     private function getFieldExtraDataConfig(string $field_name): PluginFieldsQuestionTypeExtraDataConfig
     {
         if (!$this->block instanceof PluginFieldsContainer || !$this->fields[$field_name] instanceof PluginFieldsField) {