feat(forms): prevent form elements deletion when they are used by conditions #19219
Conversation
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
ccailly
force-pushed
the
feature/form-prevent-deleting-block-conditions
branch
from
c24e35b to
4e576b8
Compare
… openConditionEditor in e2e tests
AdrienClairembault
requested changes
Apr 17, 2025
| # http://glpi-project.org | ||
| # | ||
| # @copyright 2015-2025 Teclib' and contributors. | ||
| # @copyright 2003-2014 by the INDEPNET Development Team. |
There was a problem hiding this comment.
Suggested change
| # @copyright 2003-2014 by the INDEPNET Development Team. |
| * @param {jQuery} block The block element to check | ||
| * @returns {boolean} True if the block can be deleted, false otherwise | ||
| */ | ||
| #checkBlockConditionDependencies(type, block) { |
There was a problem hiding this comment.
Small distinction here but aren't block only questions and comments ?
If this is also used on sections, which are block, the name should be more generic (checkItemConditionDependencies ?)
| @@ -1460,4 +1460,188 @@ describe ('Conditions', () => { | |||
| 'First section', | |||
| ]); | |||
| }); | |||
|
|
|||
| it('can delete a question used in conditions', () => { | |||
There was a problem hiding this comment.
Suggested change
| it('can delete a question used in conditions', () => { | |
| it("can't delete a question used in conditions", () => { |
| cy.findByRole('dialog', {'name': 'Block has conditions and cannot be deleted'}).should('not.exist'); | ||
| }); | ||
|
|
||
| it('can delete a comment used in conditions', () => { |
There was a problem hiding this comment.
Suggested change
| it('can delete a comment used in conditions', () => { | |
| it("can't delete a comment used in conditions", () => { |
| cy.findByRole('dialog', {'name': 'Block has conditions and cannot be deleted'}).should('not.exist'); | ||
| }); | ||
|
|
||
| it('can delete a section used in conditions', () => { |
There was a problem hiding this comment.
Suggested change
| it('can delete a section used in conditions', () => { | |
| it("can't delete a section used in conditions", () => { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Checklist before requesting a review
Please delete options that are not relevant.
Description
#19204 must be merged before
Prevent the deletion of a question, section or comment if it is used as a condition.
Add a modal to display which elements have conditions that use the element you wish to delete.
Screenshots (if appropriate):