fix(forms): Ensure consistent dropdown labels for Item questions in f… #23507
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,98 @@ | ||||||
| /** | ||||||
| * --------------------------------------------------------------------- | ||||||
| * | ||||||
| * GLPI - Gestionnaire Libre de Parc Informatique | ||||||
| * | ||||||
| * http://glpi-project.org | ||||||
| * | ||||||
| * @copyright 2015-2026 Teclib' and contributors. | ||||||
| * @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/>. | ||||||
| * | ||||||
| * --------------------------------------------------------------------- | ||||||
| */ | ||||||
|
|
||||||
| import { test, expect } from '../../../fixtures/glpi_fixture'; | ||||||
| import { FormPage } from '../../../pages/FormPage'; | ||||||
| import { Profiles } from '../../../utils/Profiles'; | ||||||
| import { getWorkerEntityId } from '../../../utils/WorkerEntities'; | ||||||
|
|
||||||
| test.describe('Item form question type', () => { | ||||||
| let form: FormPage; | ||||||
| let form_id: number; | ||||||
| let entity_id: number; | ||||||
|
|
||||||
| test.beforeEach(async ({ page, profile, entity, api, formImporter }) => { | ||||||
| await profile.set(Profiles.SuperAdmin); | ||||||
| form = new FormPage(page); | ||||||
|
|
||||||
| // Create new entity | ||||||
| entity_id = await api.createItem('Entity', { | ||||||
| name: `Entity ${Date.now()}`, | ||||||
| entities_id: getWorkerEntityId(), | ||||||
| }); | ||||||
|
|
||||||
| // Switch to the new entity and refresh session to ensure the new entity is taken into account in the session | ||||||
| entity.switchToWithoutRecursion(entity_id); | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| api.refreshSession(); | ||||||
|
|
||||||
| const info = await formImporter.importForm('question_types/item-editor-test.json'); | ||||||
| form_id = info.getId(); | ||||||
| await form.goto(form_id); | ||||||
|
|
||||||
| }); | ||||||
|
|
||||||
| test.afterEach(async ({ entity, api }) => { | ||||||
| // Reset entity to default one to avoid issues with other tests in the same worker | ||||||
| entity.resetToDefaultWorkerEntity(); | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| api.refreshSession(); | ||||||
| }); | ||||||
|
|
||||||
| test('Adding new item option and compare select option labels', async ({ api }) => { | ||||||
| // Add two computers | ||||||
| await api.createItem('Computer', { | ||||||
| name: 'Computer 1', | ||||||
| entities_id: entity_id | ||||||
| }); | ||||||
| await api.createItem('Computer', { | ||||||
| name: 'Computer 2', | ||||||
| entities_id: entity_id, | ||||||
| serial: '123456', | ||||||
| otherserial: '654321' | ||||||
| }); | ||||||
|
|
||||||
| const persisted_question = form.getLastQuestion(); | ||||||
| await persisted_question.click({ position: { x: 0, y: 0 } }); | ||||||
|
|
||||||
| form.getDropdownByLabel('Select an item', persisted_question).click(); | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| await expect(form.page.getByRole('option', { name: 'Computer 1' })).toBeVisible(); | ||||||
| await expect(form.page.getByRole('option', { name: 'Computer 2 - 654321 - 123456' })).toBeVisible(); | ||||||
|
|
||||||
| const new_question = await form.addQuestion('Item question'); | ||||||
| await form.setQuestionType(new_question, 'Item'); | ||||||
| await form.setSubQuestionType(new_question, 'GLPI Objects'); | ||||||
| await form.setItemTypeForItemQuestion(new_question, 'Computers'); | ||||||
|
|
||||||
| form.getDropdownByLabel('Select an item', new_question).click(); | ||||||
|
Contributor
There was a problem hiding this comment.
Suggested change
|
||||||
| await expect(form.page.getByRole('option', { name: 'Computer 1' })).toBeVisible(); | ||||||
| await expect(form.page.getByRole('option', { name: 'Computer 2 - 654321 - 123456' })).toBeVisible(); | ||||||
| }); | ||||||
| }); | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| { | ||
| "version": 1, | ||
| "forms": [ | ||
| { | ||
| "id": 1, | ||
| "uuid": "dd000001-0001-0001-0001-000000000001", | ||
| "name": "Tests form for the item form question type suite", | ||
| "header": null, | ||
| "description": null, | ||
| "entity_name": "Root entity", | ||
| "is_recursive": true, | ||
| "is_active": false, | ||
| "submit_button_visibility_strategy": "always_visible", | ||
| "illustration": "", | ||
| "submit_button_conditions": [], | ||
| "sections": [ | ||
| { | ||
| "id": 1, | ||
| "uuid": "dd000001-0001-0001-0001-000000000010", | ||
| "name": "First section", | ||
| "description": null, | ||
| "rank": 0, | ||
| "visibility_strategy": "always_visible", | ||
| "conditions": [] | ||
| } | ||
| ], | ||
| "comments": [], | ||
| "questions": [ | ||
| { | ||
| "id": 1, | ||
| "uuid": "dd000001-0001-0001-0001-000000000100", | ||
| "name": "Test item question", | ||
| "type": "Glpi\\Form\\QuestionType\\QuestionTypeItem", | ||
| "is_mandatory": false, | ||
| "vertical_rank": 0, | ||
| "horizontal_rank": null, | ||
| "description": "", | ||
| "default_value": "", | ||
| "extra_data": { | ||
| "root_items_id": "0", | ||
| "subtree_depth": "0", | ||
| "selectable_tree_root": "0", | ||
| "itemtype": "Computer" | ||
| }, | ||
| "section_id": 1, | ||
| "visibility_strategy": "always_visible", | ||
| "validation_strategy": "no_validation", | ||
| "conditions": [], | ||
| "validation_conditions": [] | ||
| } | ||
| ], | ||
| "policies": [ | ||
| { | ||
| "strategy": "Glpi\\Form\\AccessControl\\ControlType\\AllowList", | ||
| "config": { | ||
| "user_ids": [ | ||
| "all" | ||
| ], | ||
| "group_ids": [], | ||
| "profile_ids": [] | ||
| }, | ||
| "is_active": true | ||
| } | ||
| ], | ||
| "destinations": [], | ||
| "translations": [], | ||
| "data_requirements": [ | ||
| { | ||
| "itemtype": "Entity", | ||
| "name": "Root entity" | ||
| } | ||
| ], | ||
| "custom_types_requirements": [], | ||
| "plugin_requirements": [] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Method is public but is only used internally, is it normal?