Merge branch 'develop' into ay/add-icdar

CHANGELOG.md

@@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved maintanance of popups visibility (<https://github.com/openvinotoolkit/cvat/pull/2809>)
 - Image visualizations settings on canvas for faster access (<https://github.com/openvinotoolkit/cvat/pull/2872>)
 - Better scale management of left panel when screen is too small (<https://github.com/openvinotoolkit/cvat/pull/2880>)
+- Improved error messages for annotation import (<https://github.com/openvinotoolkit/cvat/pull/2935>)
 
 ### Deprecated
 

cvat-core/tests/api/projects.js

@@ -1,4 +1,4 @@
-// Copyright (C) 2019-2020 Intel Corporation
+// Copyright (C) 2019-2021 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -168,3 +168,20 @@ describe('Feature: delete a project', () => {
         expect(result).toHaveLength(0);
     });
 });
+
+describe('Feature: delete a label', () => {
+    test('delete a label', async () => {
+        let result = await window.cvat.projects.get({
+            id: 2,
+        });
+
+        const labelsLength = result[0].labels.length;
+        const deletedLabels = result[0].labels.filter((el) => el.name !== 'bicycle');
+        result[0].labels = deletedLabels;
+        result[0].save();
+        result = await window.cvat.projects.get({
+            id: 2,
+        });
+        expect(result[0].labels).toHaveLength(labelsLength - 1);
+    });
+});

cvat-core/tests/api/tasks.js

@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2021 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -196,3 +196,20 @@ describe('Feature: delete a task', () => {
         expect(result).toHaveLength(0);
     });
 });
+
+describe('Feature: delete a label', () => {
+    test('delete a label', async () => {
+        let result = await window.cvat.tasks.get({
+            id: 100,
+        });
+
+        const labelsLength = result[0].labels.length;
+        const deletedLabels = result[0].labels.filter((el) => el.name !== 'person');
+        result[0].labels = deletedLabels;
+        result[0].save();
+        result = await window.cvat.tasks.get({
+            id: 100,
+        });
+        expect(result[0].labels).toHaveLength(labelsLength - 1);
+    });
+});

cvat-core/tests/mocks/dummy-data.mock.js

@@ -189,6 +189,12 @@ const projectsDummyData = {
                         },
                     ],
                 },
+                {
+                    id: 2,
+                    name: 'bicycle',
+                    color: '#bb20c0',
+                    attributes: [],
+                },
             ],
             tasks: [
                 {