Fixed bug: Incorrect point deletion with keyboard shortcut #4420
Conversation
This file contains 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
|
@ActiveChooN Could you look on this fix, please? |
ActiveChooN
previously approved these changes
Mar 5, 2022
|
Yes, as a next step in this pr test will be added |
|
@bsekachev Could you look on this pr? |
|
Still reproducable using Ctrl |
bsekachev
reviewed
Mar 10, 2022
| }); | ||
|
|
||
| describe(`Testing issue "${issueId}"`, () => { | ||
| it('Crearte points shapes', () => { |
There was a problem hiding this comment.
Suggested change
| it('Crearte points shapes', () => { | |
| it('Create points shapes', () => { |
Comment on lines
42
to
71
| it('Remove point holding Alt key from each shape', () => { | ||
| cy.get('#cvat_canvas_shape_1').trigger('mousemove', { force: true }).trigger('mouseover', { force: true }); | ||
| cy.get('body').type('{alt}', { release: false }); | ||
| cy.get('#cvat_canvas_shape_1') | ||
| .children() | ||
| .then((children) => { | ||
| cy.get(children) | ||
| .eq(1) | ||
| .then((elem) => { | ||
| cy.get(elem).click(); | ||
| }); | ||
| }); | ||
| cy.get('#cvat_canvas_shape_2') | ||
| .children() | ||
| .then((children) => { | ||
| cy.get(children) | ||
| .eq(1) | ||
| .then((elem) => { | ||
| cy.get(elem).click(); | ||
| }); | ||
| }); | ||
| }); | ||
| it('Point must be removed from first shape, second one should stay the same', () => { | ||
| cy.get('#cvat_canvas_shape_1') | ||
| .children() | ||
| .should('have.length', 2); | ||
| cy.get('#cvat_canvas_shape_2') | ||
| .children() | ||
| .should('have.length', 3); | ||
| }); |
There was a problem hiding this comment.
It should be the same it(). In the first you do not check anything.
Comment on lines
36
to
40
| it('Crearte points shapes', () => { | ||
| cy.createPoint(firstPointsShape); | ||
| cy.get('#cvat-objects-sidebar-state-item-1').should('contain', '1').and('contain', 'POINTS SHAPE'); | ||
| cy.createPoint(secondPointsShape); | ||
| cy.get('#cvat-objects-sidebar-state-item-2').should('contain', '2').and('contain', 'POINTS SHAPE'); |
There was a problem hiding this comment.
Probably it should be a part of before section because we do not test creating points here
| const [state] = getController().objects.filter( | ||
| (_state: any): boolean => _state.clientID === activeElement.clientID, | ||
| ); | ||
| if (state.shapeType === 'points') { |
There was a problem hiding this comment.
Suggested change
| if (state.shapeType === 'points') { | |
| if (state?.shapeType === 'points') { |
There was a problem hiding this comment.
Maybe this condition should work for all the shapes, not only for points, do not you think so?
Comment on lines
896
to
898
| const selectedClientID = parseInt( | ||
| ((e.target as HTMLElement).parentElement as HTMLElement).getAttribute('clientID'), 10, | ||
| ); |
There was a problem hiding this comment.
Why not to use + operator here to cast to integer? It looks simpler
bsekachev
approved these changes
Mar 11, 2022
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.
Motivation and context
The point deletion with shortcut works not quite well if we start deleting points from another shape holding
AltSolution: implement the same behavior with points shape as with polylines. If we are holding
Altover one object, another one shouldn't be activated.Result:
Resolved #3821
How has this been tested?
Checklist
developbranchI have updated the documentation accordinglycvat-core, cvat-data and cvat-ui)
License
Feel free to contact the maintainers if that's a concern.