fix(forms-migration): Handle service catalog description and deleted status

ccailly · cedric-anne · commit 938f337efee3 · 2025-05-19T16:22:04.000+02:00
diff --git a/phpunit/functional/Glpi/Form/Migration/FormMigrationTest.php b/phpunit/functional/Glpi/Form/Migration/FormMigrationTest.php
@@ -723,6 +723,7 @@ public static function provideFormMigrationTranslations(): iterable
             'raw_translations'      => [
                 'Test form migration for translations' => 'Tester la migration des formulaires pour les traductions',
                 'This is a description to test the translation' => 'Voici une description pour tester la traduction',
+                '<p>This is a header to test the translation</p>' => '<p>Voici un en-tête pour tester la traduction</p>',
                 'First section' => 'Première section',
                 'First question' => 'Première question',
                 '&#60;p&#62;&#60;strong&#62;Test description for &#60;/strong&#62;first&#60;strong&#62; &#60;span style="color: #b96ad9;"&#62;question&#60;/span&#62;&#60;/strong&#62;&#60;/p&#62;' => '&#60;p&#62;&#60;strong&#62;Test de description&#60;/strong&#62; pour la première &#60;span style="color: #b96ad9;"&#62;&#60;strong&#62;question&#60;/strong&#62;&#60;/span&#62;&#60;/p&#62;',
@@ -768,6 +769,12 @@ public static function provideFormMigrationTranslations(): iterable
                         'items_id' => $form->getID(),
                         'itemtype' => Form::class,
                         'key'      => Form::TRANSLATION_KEY_HEADER,
+                        'translations' => ['one' => '<p>Voici un en-tête pour tester la traduction</p>'],
+                    ],
+                    [
+                        'items_id' => $form->getID(),
+                        'itemtype' => Form::class,
+                        'key'      => Form::TRANSLATION_KEY_DESCRIPTION,
                         'translations' => ['one' => 'Voici une description pour tester la traduction'],
                     ],
                     [
@@ -1031,6 +1038,84 @@ public function testFormMigrationUpdateHorizontalRanks(): void
         }
     }
 
+    public function testFormMigrationWithDeletedForm(): void
+    {
+        /**
+         * @var \DBmysql $DB
+         */
+        global $DB;
+
+        // Insert a new form
+        $this->assertTrue($DB->insert(
+            'glpi_plugin_formcreator_forms',
+            [
+                'name'       => 'Test form migration for deleted form',
+                'is_deleted' => 1,
+            ]
+        ));
+
+        // Insert a new section
+        $this->assertTrue($DB->insert(
+            'glpi_plugin_formcreator_sections',
+            [
+                'name'                        => 'Test form migration for deleted form - Section',
+                'plugin_formcreator_forms_id' => $DB->insertId(),
+            ]
+        ));
+
+        // Process migration
+        $migration = new FormMigration($DB, FormAccessControlManager::getInstance());
+        $this->setPrivateProperty($migration, 'result', new PluginMigrationResult());
+        $this->assertTrue($this->callPrivateMethod($migration, 'processMigration'));
+
+        $form = getItemByTypeName(Form::class, 'Test form migration for deleted form');
+        $this->assertTrue((bool) $form->isDeleted());
+    }
+
+    public function testFormMigrationFormContentField(): void
+    {
+        /**
+         * @var \DBmysql $DB
+         */
+        global $DB;
+
+        // Insert a new form
+        $this->assertTrue($DB->insert(
+            'glpi_plugin_formcreator_forms',
+            [
+                'name'        => 'Test form migration for form content field',
+                'description' => '<p>Test description</p>',
+                'content'     => '<p>Test header</p>',
+            ]
+        ));
+
+        // Insert a new section
+        $this->assertTrue($DB->insert(
+            'glpi_plugin_formcreator_sections',
+            [
+                'name'                        => 'Test form migration for form content field - Section',
+                'plugin_formcreator_forms_id' => $DB->insertId(),
+            ]
+        ));
+
+        // Process migration
+        $migration = new FormMigration($DB, FormAccessControlManager::getInstance());
+        $this->setPrivateProperty($migration, 'result', new PluginMigrationResult());
+        $this->assertTrue($this->callPrivateMethod($migration, 'processMigration'));
+
+        $form = getItemByTypeName(Form::class, 'Test form migration for form content field');
+        $this->assertNotFalse($form);
+
+        $this->assertEquals(
+            '<p>Test description</p>',
+            $form->fields['description']
+        );
+        $this->assertEquals(
+            '<p>Test header</p>',
+            $form->fields['header']
+        );
+    }
+
     public static function provideFormMigrationTagConversion(): iterable
     {
         yield 'Single question tag' => [
diff --git a/src/Glpi/Form/Migration/FormMigration.php b/src/Glpi/Form/Migration/FormMigration.php
@@ -382,12 +382,14 @@ private function processMigrationOfBasicProperties(): void
         $raw_forms = $this->db->request([
             'SELECT' => [
                 'id',
-                'description AS header',
+                'description',
+                'content AS header',
                 'name',
                 'plugin_formcreator_categories_id',
                 'entities_id',
                 'is_recursive',
                 'is_visible AS is_active',
+                'is_deleted',
             ],
             'FROM'   => 'glpi_plugin_formcreator_forms',
         ]);
@@ -398,13 +400,15 @@ private function processMigrationOfBasicProperties(): void
                 [
                     'name'                  => $raw_form['name'],
                     'header'                => $raw_form['header'],
+                    'description'           => $raw_form['description'],
                     'forms_categories_id'   => $this->getMappedItemTarget(
                         'PluginFormcreatorCategory',
                         $raw_form['plugin_formcreator_categories_id']
                     )['items_id'] ?? 0,
                     'entities_id'           => $raw_form['entities_id'],
                     'is_recursive'          => $raw_form['is_recursive'],
                     'is_active'             => $raw_form['is_active'],
+                    'is_deleted'            => $raw_form['is_deleted'],
                     '_from_migration'       =>  true,
                 ],
                 [
diff --git a/tests/glpi-formcreator-migration-data.sql b/tests/glpi-formcreator-migration-data.sql
@@ -157,7 +157,7 @@ CREATE TABLE `glpi_plugin_formcreator_forms` (
 --
 
 LOCK TABLES `glpi_plugin_formcreator_forms` WRITE;
-INSERT INTO `glpi_plugin_formcreator_forms` VALUES (4,'Test form migration for basic properties',0,0,'0','#999999','#e7e7e7',1,'','',0,1,'',0,0,0,0,0,0,1,'Test form migration for basic properties',1,'13d0d449-91f5039d-678638f86ff479.66501068'),(5,'Test form migration for basic properties with form category',0,0,'0','#999999','#e7e7e7',1,'','',1,1,'',0,0,0,0,0,0,1,'Test form migration for basic properties with form category',1,'13d0d449-91f5039d-67865f9ebd9f58.29603668'),(6,'Test form migration for sections',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for sections',1,'13d0d449-91f5039d-67868bc224e124.20535500'),(7,'Test form migration for questions',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for questions',1,'13d0d449-91f5039d-67877f5c4ee3c3.90813653'),(8,'Test form migration for access types with public access',0,0,'0','#999999','#e7e7e7',0,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for access types',1,'13d0d449-91f5039d-678f630f4a4737.71277458'),(9,'Test form migration for access types with private access',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for access types with private access',1,'13d0d449-91f5039d-678f634493d8b7.87824440'),(10,'Test form migration for access types with restricted access',0,0,'0','#999999','#e7e7e7',2,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for access types with restricted access',1,'13d0d449-91f5039d-678f63553754a9.65767968'),(17,'Test form migration for targets',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for target problem',1,'13d0d449-91f5039d-679209f7eaae69.42097688'),(19,'Test form migration for translations',0,0,'0','#999999','#e7e7e7',1,'This is a description to test the translation','',0,0,'',0,0,0,0,0,0,1,'Test form migration for translations',1,'18b24cbd-91f5039d-67e3d8f1d06864.47103399');
+INSERT INTO `glpi_plugin_formcreator_forms` VALUES (4,'Test form migration for basic properties',0,0,'0','#999999','#e7e7e7',1,'','',0,1,'',0,0,0,0,0,0,1,'Test form migration for basic properties',1,'13d0d449-91f5039d-678638f86ff479.66501068'),(5,'Test form migration for basic properties with form category',0,0,'0','#999999','#e7e7e7',1,'','',1,1,'',0,0,0,0,0,0,1,'Test form migration for basic properties with form category',1,'13d0d449-91f5039d-67865f9ebd9f58.29603668'),(6,'Test form migration for sections',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for sections',1,'13d0d449-91f5039d-67868bc224e124.20535500'),(7,'Test form migration for questions',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for questions',1,'13d0d449-91f5039d-67877f5c4ee3c3.90813653'),(8,'Test form migration for access types with public access',0,0,'0','#999999','#e7e7e7',0,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for access types',1,'13d0d449-91f5039d-678f630f4a4737.71277458'),(9,'Test form migration for access types with private access',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for access types with private access',1,'13d0d449-91f5039d-678f634493d8b7.87824440'),(10,'Test form migration for access types with restricted access',0,0,'0','#999999','#e7e7e7',2,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for access types with restricted access',1,'13d0d449-91f5039d-678f63553754a9.65767968'),(17,'Test form migration for targets',0,0,'0','#999999','#e7e7e7',1,'','',0,0,'',0,0,0,0,0,0,1,'Test form migration for target problem',1,'13d0d449-91f5039d-679209f7eaae69.42097688'),(19,'Test form migration for translations',0,0,'0','#999999','#e7e7e7',1,'This is a description to test the translation','&#60;p&#62;This is a header to test the translation&#60;/p&#62;',0,0,'',0,0,0,0,0,0,1,'Test form migration for translations',1,'18b24cbd-91f5039d-67e3d8f1d06864.47103399');
 UNLOCK TABLES;
 
 --
