States "genericity"

inc/define.php

@@ -338,6 +338,7 @@
 $CFG_GLPI['itemdevices'] = [];
 foreach ($CFG_GLPI['device_types'] as $dtype) {
     $CFG_GLPI['location_types'][] = 'Item_' . $dtype;
+    $CFG_GLPI['state_types'][] = 'Item_' . $dtype;
     $CFG_GLPI["itemdevices"][] = 'Item_' . $dtype;
 }
 

inc/relation.constant.php

@@ -1404,6 +1404,7 @@
         'glpi_devicesensors'             => 'states_id',
         'glpi_enclosures'                => 'states_id',
         'glpi_items_devicebatteries'     => 'states_id',
+        'glpi_items_devicecameras'       => 'states_id',
         'glpi_items_devicecases'         => 'states_id',
         'glpi_items_devicecontrols'      => 'states_id',
         'glpi_items_devicedrives'        => 'states_id',

install/migrations/update_10.0.x_to_11.0.0/states.php

@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * ---------------------------------------------------------------------
+ *
+ * GLPI - Gestionnaire Libre de Parc Informatique
+ *
+ * http://glpi-project.org
+ *
+ * @copyright 2015-2024 Teclib' and contributors.
+ * @copyright 2003-2014 by the INDEPNET Development Team.
+ * @licence   https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * ---------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of GLPI.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * ---------------------------------------------------------------------
+ */
+
+/**
+ * @var \DBmysql $DB
+ * @var \Migration $migration
+ */
+
+$default_charset = DBConnection::getDefaultCharset();
+$default_collation = DBConnection::getDefaultCollation();
+$default_key_sign = DBConnection::getDefaultPrimaryKeySignOption();
+
+if (!$DB->tableExists('glpi_dropdownvisibilities')) {
+    $known_visibilities = [
+        'computer',
+        'monitor',
+        'networkequipment',
+        'peripheral',
+        'phone',
+        'printer',
+        'softwareversion',
+        'softwarelicense',
+        'line',
+        'certificate',
+        'rack',
+        'passivedcequipment',
+        'enclosure',
+        'pdu',
+        'cluster',
+        'contract',
+        'appliance',
+        'databaseinstance',
+        'cable',
+        'unmanaged'
+    ];
+
+    $query = "CREATE TABLE `glpi_dropdownvisibilities` (
+        `id` int {$default_key_sign} NOT NULL AUTO_INCREMENT,
+        `itemtype` varchar(100) NOT NULL DEFAULT '',
+        `items_id` int {$default_key_sign} NOT NULL DEFAULT '0',
+        `visible_itemtype` varchar(100) NOT NULL DEFAULT '',
+        `is_visible` tinyint NOT NULL DEFAULT '1',
+        PRIMARY KEY (`id`),
+        KEY `visible_itemtype` (`visible_itemtype`),
+        KEY `item` (`itemtype`,`items_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET={$default_charset} COLLATE={$default_collation} ROW_FORMAT=DYNAMIC;";
+    $DB->doQueryOrDie($query, "10.1.0 add table glpi_dropdownvisibilities");
+
+    $states = $DB->request('glpi_states');
+    foreach ($states as $state) {
+        $insert_data = [
+            'itemtype' => 'State',
+            'items_id' => $state['id'],
+        ];
+
+        foreach ($known_visibilities as $known_visibility) {
+            if (isset($state['is_visible_' . $known_visibility])) {
+                $insert_data['visible_itemtype'] = $known_visibility;
+                $insert_data['is_visible'] = $state['is_visible_' . $known_visibility];
+                $DB->doQueryOrDie($DB->buildInsert('glpi_dropdownvisibilities', $insert_data));
+            }
+        }
+    }
+
+    foreach ($known_visibilities as $known_visibility) {
+        if ($DB->fieldExists('glpi_states', 'is_visible_' . $known_visibility)) {
+            $migration->dropField('glpi_states', 'is_visible_' . $known_visibility);
+        }
+    }
+}
+$migration->displayWarning(
+    'States dropdown in devices items forms are now filtered, and, by default, existing states are not visible.'
+);
+
+// Add missing field
+$migration->addField('glpi_items_devicecameras', 'states_id', 'fkey');
+$migration->addKey('glpi_items_devicecameras', 'states_id');
+
+// Drop unexpected fields
+$migration->dropField('glpi_devicegenerics', 'states_id');
+$migration->dropField('glpi_devicesensors', 'states_id');

install/mysql/glpi-empty.sql

@@ -1842,7 +1842,6 @@ CREATE TABLE `glpi_devicegenerics` (
   `entities_id` int unsigned NOT NULL DEFAULT '0',
   `is_recursive` tinyint NOT NULL DEFAULT '0',
   `locations_id` int unsigned NOT NULL DEFAULT '0',
-  `states_id` int unsigned NOT NULL DEFAULT '0',
   `devicegenericmodels_id` int unsigned DEFAULT NULL,
   `date_mod` timestamp NULL DEFAULT NULL,
   `date_creation` timestamp NULL DEFAULT NULL,
@@ -1853,7 +1852,6 @@ CREATE TABLE `glpi_devicegenerics` (
   KEY `entities_id` (`entities_id`),
   KEY `is_recursive` (`is_recursive`),
   KEY `locations_id` (`locations_id`),
-  KEY `states_id` (`states_id`),
   KEY `date_mod` (`date_mod`),
   KEY `date_creation` (`date_creation`),
   KEY `devicegenericmodels_id` (`devicegenericmodels_id`)
@@ -2011,6 +2009,7 @@ CREATE TABLE `glpi_items_devicecameras` (
   `entities_id` int unsigned NOT NULL DEFAULT '0',
   `is_recursive` tinyint NOT NULL DEFAULT '0',
   `locations_id` int unsigned NOT NULL DEFAULT '0',
+  `states_id` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   KEY `items_id` (`items_id`),
   KEY `devicecameras_id` (`devicecameras_id`),
@@ -2019,6 +2018,7 @@ CREATE TABLE `glpi_items_devicecameras` (
   KEY `entities_id` (`entities_id`),
   KEY `is_recursive` (`is_recursive`),
   KEY `locations_id` (`locations_id`),
+  KEY `states_id` (`states_id`),
   KEY `item` (`itemtype`,`items_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
@@ -2376,7 +2376,6 @@ CREATE TABLE `glpi_devicesensors` (
   `entities_id` int unsigned NOT NULL DEFAULT '0',
   `is_recursive` tinyint NOT NULL DEFAULT '0',
   `locations_id` int unsigned NOT NULL DEFAULT '0',
-  `states_id` int unsigned NOT NULL DEFAULT '0',
   `date_mod` timestamp NULL DEFAULT NULL,
   `date_creation` timestamp NULL DEFAULT NULL,
   PRIMARY KEY (`id`),
@@ -2386,7 +2385,6 @@ CREATE TABLE `glpi_devicesensors` (
   KEY `entities_id` (`entities_id`),
   KEY `is_recursive` (`is_recursive`),
   KEY `locations_id` (`locations_id`),
-  KEY `states_id` (`states_id`),
   KEY `date_mod` (`date_mod`),
   KEY `date_creation` (`date_creation`),
   KEY `devicesensormodels_id` (`devicesensormodels_id`)
@@ -6990,26 +6988,6 @@ CREATE TABLE `glpi_states` (
   `level` int NOT NULL DEFAULT '0',
   `ancestors_cache` longtext,
   `sons_cache` longtext,
-  `is_visible_computer` tinyint NOT NULL DEFAULT '1',
-  `is_visible_monitor` tinyint NOT NULL DEFAULT '1',
-  `is_visible_networkequipment` tinyint NOT NULL DEFAULT '1',
-  `is_visible_peripheral` tinyint NOT NULL DEFAULT '1',
-  `is_visible_phone` tinyint NOT NULL DEFAULT '1',
-  `is_visible_printer` tinyint NOT NULL DEFAULT '1',
-  `is_visible_softwareversion` tinyint NOT NULL DEFAULT '1',
-  `is_visible_softwarelicense` tinyint NOT NULL DEFAULT '1',
-  `is_visible_line` tinyint NOT NULL DEFAULT '1',
-  `is_visible_certificate` tinyint NOT NULL DEFAULT '1',
-  `is_visible_rack` tinyint NOT NULL DEFAULT '1',
-  `is_visible_passivedcequipment` tinyint NOT NULL DEFAULT '1',
-  `is_visible_enclosure` tinyint NOT NULL DEFAULT '1',
-  `is_visible_pdu` tinyint NOT NULL DEFAULT '1',
-  `is_visible_cluster` tinyint NOT NULL DEFAULT '1',
-  `is_visible_contract` tinyint NOT NULL DEFAULT '1',
-  `is_visible_appliance` tinyint NOT NULL DEFAULT '1',
-  `is_visible_databaseinstance` tinyint NOT NULL DEFAULT '1',
-  `is_visible_cable` tinyint NOT NULL DEFAULT '1',
-  `is_visible_unmanaged` tinyint NOT NULL DEFAULT '1',
   `is_helpdesk_visible` tinyint NOT NULL DEFAULT '1',
   `date_mod` timestamp NULL DEFAULT NULL,
   `date_creation` timestamp NULL DEFAULT NULL,
@@ -7018,32 +6996,23 @@ CREATE TABLE `glpi_states` (
   KEY `name` (`name`),
   KEY `entities_id` (`entities_id`),
   KEY `is_recursive` (`is_recursive`),
-  KEY `is_visible_computer` (`is_visible_computer`),
-  KEY `is_visible_monitor` (`is_visible_monitor`),
-  KEY `is_visible_networkequipment` (`is_visible_networkequipment`),
-  KEY `is_visible_peripheral` (`is_visible_peripheral`),
-  KEY `is_visible_phone` (`is_visible_phone`),
-  KEY `is_visible_printer` (`is_visible_printer`),
-  KEY `is_visible_softwareversion` (`is_visible_softwareversion`),
-  KEY `is_visible_softwarelicense` (`is_visible_softwarelicense`),
-  KEY `is_visible_line` (`is_visible_line`),
-  KEY `is_visible_certificate` (`is_visible_certificate`),
-  KEY `is_visible_rack` (`is_visible_rack`),
-  KEY `is_visible_passivedcequipment` (`is_visible_passivedcequipment`),
-  KEY `is_visible_enclosure` (`is_visible_enclosure`),
-  KEY `is_visible_pdu` (`is_visible_pdu`),
-  KEY `is_visible_cluster` (`is_visible_cluster`),
-  KEY `is_visible_contract` (`is_visible_contract`),
-  KEY `is_visible_appliance` (`is_visible_appliance`),
-  KEY `is_visible_databaseinstance` (`is_visible_databaseinstance`),
-  KEY `is_visible_cable` (`is_visible_cable`),
-  KEY `is_visible_unmanaged` (`is_visible_unmanaged`),
   KEY `is_helpdesk_visible` (`is_helpdesk_visible`),
   KEY `date_mod` (`date_mod`),
   KEY `date_creation` (`date_creation`),
   KEY `level` (`level`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
+DROP TABLE IF EXISTS glpi_dropdownvisibilities;
+CREATE TABLE `glpi_dropdownvisibilities` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `itemtype` varchar(100) NOT NULL DEFAULT '',
+  `items_id` int unsigned NOT NULL DEFAULT '0',
+  `visible_itemtype` varchar(100) NOT NULL DEFAULT '',
+  `is_visible` tinyint NOT NULL DEFAULT '1',
+  PRIMARY KEY (`id`),
+  KEY `visible_itemtype` (`visible_itemtype`),
+  KEY `item` (`itemtype`,`items_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 ### Dump table glpi_suppliers
 

src/Api/HL/Controller/DropdownController.php

@@ -76,6 +76,9 @@ final class DropdownController extends AbstractController
 
     protected static function getRawKnownSchemas(): array
     {
+        /** @var array $CFG_GLPI */
+        global $CFG_GLPI;
+
         $schemas = [];
 
         $schemas['Location'] = [
@@ -129,30 +132,39 @@ protected static function getRawKnownSchemas(): array
                 'is_recursive' => ['type' => Doc\Schema::TYPE_BOOLEAN],
                 'parent' => self::getDropdownTypeSchema(class: State::class, full_schema: 'State'),
                 'level' => ['type' => Doc\Schema::TYPE_INTEGER],
-                'is_visible_computer' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_monitor' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_network_equipment' => ['x-field' => 'is_visible_networkequipment','type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_peripheral' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_phone' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_printer' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_software_version' => ['x-field' => 'is_visible_softwareversion','type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_software_license' => ['x-field' => 'is_visible_softwarelicense','type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_line' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_certificate' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_rack' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_passive_dcequipment' => ['x-field' => 'is_visible_passivedcequipment', 'type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_enclosure' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_pdu' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_cluster' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_contract' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_appliance' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_cable' => ['type' => Doc\Schema::TYPE_BOOLEAN],
-                'is_visible_database_instance' => ['x-field' => 'is_visible_databaseinstance', 'type' => Doc\Schema::TYPE_BOOLEAN],
                 'is_visible_helpdesk' => ['x-field' => 'is_helpdesk_visible', 'type' => Doc\Schema::TYPE_BOOLEAN],
                 'date_creation' => ['type' => Doc\Schema::TYPE_STRING, 'format' => Doc\Schema::FORMAT_STRING_DATE_TIME],
                 'date_mod' => ['type' => Doc\Schema::TYPE_STRING, 'format' => Doc\Schema::FORMAT_STRING_DATE_TIME],
             ]
         ];
+        $visiblities = array_map('strtolower', $CFG_GLPI['state_types']);
+
+        $schemas['State_Visibilities'] = [
+            'type' => Doc\Schema::TYPE_OBJECT,
+            'properties' => []
+        ];
+        $schemas['State']['properties']['visibilities'] = [
+            'type' => Doc\Schema::TYPE_OBJECT,
+            'x-full-schema' => 'State_Visibilities',
+        ];
+
+        foreach ($visiblities as $visiblity) {
+            $schemas['State_Visibilities']['properties'][$visiblity] = [
+                'type' => Doc\Schema::TYPE_BOOLEAN,
+                'x-field' => 'is_visible',
+                'x-readonly' => true,
+                'x-join' => [
+                    'table' => \DropdownVisibility::getTable(),
+                    'fkey' => 'id',
+                    'field' => 'items_id',
+                    'condition' => [
+                        'itemtype' => 'State',
+                        'visible_itemtype' => $visiblity
+                    ]
+                ]
+            ];
+        }
+        $schemas['State']['properties']['visibilities']['properties'] = $schemas['State_Visibilities']['properties'];
 
         $schemas['Manufacturer'] = [
             'type' => Doc\Schema::TYPE_OBJECT,

src/Api/HL/Controller/ReportController.php

@@ -241,18 +241,8 @@ protected static function getRawKnownSchemas(): array
                             'name' => [
                                 'type' => Doc\Schema::TYPE_STRING,
                             ],
-                            'entity' => [
-                                'type' => Doc\Schema::TYPE_OBJECT,
+                            'entity' => self::getDropdownTypeSchema(class: \Entity::class, full_schema: 'Entity') + [
                                 'description' => 'The entity the item belongs to',
-                                'properties' => [
-                                    'id' => [
-                                        'type' => Doc\Schema::TYPE_INTEGER,
-                                        'format' => Doc\Schema::FORMAT_INTEGER_INT64,
-                                    ],
-                                    'name' => [
-                                        'type' => Doc\Schema::TYPE_STRING,
-                                    ],
-                                ]
                             ],
                             'is_deleted' => [
                                 'type' => Doc\Schema::TYPE_BOOLEAN,

src/Api/HL/Doc/Schema.php

@@ -265,6 +265,24 @@ public static function getJoins(array $props, string $prefix = '', ?array $paren
                 }
             }
         }
+        if ($prefix === '') {
+            // Fix parent_join for all joins
+            foreach ($joins as $join_name => $join) {
+                if (isset($join['join_parent'])) {
+                    // This join is supposed to have a parent
+                    // The set parent may not be correct currently. The join's parent may in fact be an ancestor of the one set
+                    // We need to check if the current parent exists in the list of joins. If not, we need to find the correct parent by walking up the tree
+                    $parent = $join['join_parent'];
+                    while ($parent !== '') {
+                        if (isset($joins[$parent])) {
+                            $joins[$join_name]['join_parent'] = $parent;
+                            break;
+                        }
+                        $parent = substr($parent, 0, strrpos($parent, chr(0x1F)));
+                    }
+                }
+            }
+        }
         return $joins;
     }
 

src/Api/HL/GraphQL.php

@@ -84,6 +84,7 @@ public static function processRequest(Request $request): array
                 }
             );
         } catch (\Throwable $e) {
+            trigger_error("Error processing GraphQL request: {$e->getMessage()}", E_USER_WARNING);
             return [];
         }
         return $result->toArray();

src/Api/HL/GraphQLGenerator.php

@@ -93,9 +93,6 @@ private function loadTypes()
     {
         $component_schemas = OpenAPIGenerator::getComponentSchemas();
         foreach ($component_schemas as $schema_name => $schema) {
-            if (!isset($schema['x-itemtype'])) {
-                continue;
-            }
             $new_types = $this->getTypesForSchema($schema_name, $schema);
             foreach ($new_types as $type_name => $type) {
                 $this->types[$type_name] = $type;