Abort PR #2506 by customer request

main
Boris Sekachev 5 years ago
parent 76ff7eff03
commit c0c9074587

@ -41,7 +41,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Projects view layout fix (<https://github.com/openvinotoolkit/cvat/pull/2503>)
- Fixed the tasks view (infinite loading) when it is impossible to get a preview of the task (<https://github.com/openvinotoolkit/cvat/pull/2504>)
- Empty frames navigation (<https://github.com/openvinotoolkit/cvat/pull/2505>)
- Disabled position editing in AAM (<https://github.com/openvinotoolkit/cvat/pull/2506>)
- TypeError: Cannot read property 'toString' of undefined (<https://github.com/openvinotoolkit/cvat/pull/2517>)
- Extra shapes are drawn after Esc, or G pressed while drawing a region in grouping (<https://github.com/openvinotoolkit/cvat/pull/2507>)
- Reset state (reviews, issues) after logout or changing a job (<https://github.com/openvinotoolkit/cvat/pull/2525>)

@ -109,7 +109,7 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
autoborders: automaticBordering,
undefinedAttrValue: consts.UNDEFINED_ATTRIBUTE_VALUE,
displayAllText: showObjectsTextAlways,
forceDisableEditing: [Workspace.ATTRIBUTE_ANNOTATION, Workspace.REVIEW_WORKSPACE].includes(workspace),
forceDisableEditing: workspace === Workspace.REVIEW_WORKSPACE,
});
this.initialSetup();
@ -260,11 +260,11 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
}
if (prevProps.workspace !== workspace) {
if ([Workspace.ATTRIBUTE_ANNOTATION, Workspace.REVIEW_WORKSPACE].includes(workspace)) {
if (workspace === Workspace.REVIEW_WORKSPACE) {
canvasInstance.configure({
forceDisableEditing: true,
});
} else if ([Workspace.ATTRIBUTE_ANNOTATION, Workspace.REVIEW_WORKSPACE].includes(prevProps.workspace)) {
} else if (prevProps.workspace === Workspace.REVIEW_WORKSPACE) {
canvasInstance.configure({
forceDisableEditing: false,
});

@ -25,7 +25,7 @@ context("Object can't be draggable/resizable in AAM", () => {
});
describe(`Testing issue "${issueId}"`, () => {
it('Create, acttivate a object', () => {
it.skip('Create, acttivate a object', () => {
cy.createRectangle(createRectangleShape2Points);
cy.get('#cvat_canvas_shape_1')
.should('not.have.class', 'cvat_canvas_shape_activated')
@ -33,7 +33,7 @@ context("Object can't be draggable/resizable in AAM", () => {
.should('have.class', 'cvat_canvas_shape_activated');
});
it('Go to AAM', () => {
it.skip('Go to AAM', () => {
cy.changeWorkspace('Attribute annotation', labelName);
cy.get('#cvat_canvas_shape_1')
.then((shape) => {
@ -50,7 +50,7 @@ context("Object can't be draggable/resizable in AAM", () => {
});
});
it('Try to move/resize the object', () => {
it.skip('Try to move/resize the object', () => {
cy.get('.cvat-canvas-container')
.trigger('mousedown', { button: 0 })
.trigger('mousemove', 550, 251)

Loading…
Cancel
Save