Label deleting

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
     "python.pythonPath": ".env/bin/python",
-    "eslint.enable": true,
     "eslint.probe": [
         "javascript",
         "typescript",
@@ -19,8 +18,10 @@
             "!cwd": true
         }
     ],
+    "npm.exclude": "**/.env/**",
+    "python.linting.enabled": true,
     "python.linting.pylintEnabled": true,
-    "python.testing.unittestEnabled": true,
+    "python.linting.pycodestyleEnabled": false,
     "licenser.license": "Custom",
     "licenser.customHeader": "Copyright (C) @YEAR@ Intel Corporation\n\nSPDX-License-Identifier: MIT",
     "files.trimTrailingWhitespace": true

CHANGELOG.md

@@ -20,8 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Pre-built [cvat_server](https://hub.docker.com/r/openvino/cvat_server) and
   [cvat_ui](https://hub.docker.com/r/openvino/cvat_ui) images were published on DockerHub (<https://github.com/openvinotoolkit/cvat/pull/2766>)
 - Project task subsets (<https://github.com/openvinotoolkit/cvat/pull/2774>)
-- [WiderFace](http://shuoyang1213.me/WIDERFACE/) format support (<https://github.com/openvinotoolkit/cvat/pull/2864>)
 - [VGGFace2](https://github.com/ox-vgg/vgg_face2) format support (<https://github.com/openvinotoolkit/cvat/pull/2865>)
+- [WiderFace](http://shuoyang1213.me/WIDERFACE/) format support (<https://github.com/openvinotoolkit/cvat/pull/2864>)
+- Label deletion from tasks and projects (<https://github.com/openvinotoolkit/cvat/pull/2881>)
 
 ### Changed
 

cvat-core/src/project.js

@@ -43,6 +43,7 @@
 
             data.labels = [];
             data.tasks = [];
+            data.deleted_labels = [];
 
             if (Array.isArray(initialData.labels)) {
                 for (const label of initialData.labels) {
@@ -186,6 +187,12 @@
                                 );
                             }
 
+                            for (const label of data.labels) {
+                                if (!labels.filter((_label) => _label.id === label.id).length) {
+                                    data.deleted_labels.push(label);
+                                }
+                            }
+
                             data.labels = [...labels];
                         },
                     },
@@ -211,6 +218,9 @@
                     subsets: {
                         get: () => [...data.task_subsets],
                     },
+                    _deletedLabels: {
+                        get: () => [...data.deleted_labels],
+                    },
                 }),
             );
         }
@@ -257,7 +267,14 @@
                 name: this.name,
                 assignee_id: this.assignee ? this.assignee.id : null,
                 bug_tracker: this.bugTracker,
-                labels: [...this.labels.map((el) => el.toJSON())],
+                labels: [
+                    ...this.labels.map((el) => el.toJSON()),
+                    ...this._deletedLabels.map((label) => {
+                        const labelJSON = label.toJSON();
+                        labelJSON.deleted = true;
+                        return labelJSON;
+                    }),
+                ],
             };
 
             await serverProxy.projects.save(this.id, projectData);

cvat-core/src/session.js

@@ -1006,6 +1006,7 @@
             if (data.owner) data.owner = new User(data.owner);
 
             data.labels = [];
+            data.deleted_labels = [];
             data.jobs = [];
             data.files = Object.freeze({
                 server_files: [],
@@ -1318,6 +1319,12 @@
                                 }
                             }
 
+                            for (const label of data.labels) {
+                                if (!labels.filter((_label) => _label.id === label.id).length) {
+                                    data.deleted_labels.push(label);
+                                }
+                            }
+
                             updatedFields.labels = true;
                             data.labels = [...labels];
                         },
@@ -1485,12 +1492,6 @@
                     dataChunkType: {
                         get: () => data.data_compressed_chunk_type,
                     },
-                    __updatedFields: {
-                        get: () => updatedFields,
-                        set: (fields) => {
-                            updatedFields = fields;
-                        },
-                    },
                     dimension: {
                         /**
                          * @name enabled
@@ -1501,6 +1502,15 @@
                          */
                         get: () => data.dimension,
                     },
+                    __updatedFields: {
+                        get: () => updatedFields,
+                        set: (fields) => {
+                            updatedFields = fields;
+                        },
+                    },
+                    _deletedLabels: {
+                        get: () => [...data.deleted_labels],
+                    },
                 }),
             );
 
@@ -1920,7 +1930,14 @@
                         taskData.subset = this.subset;
                         break;
                     case 'labels':
-                        taskData.labels = [...this.labels.map((el) => el.toJSON())];
+                        taskData.labels = [
+                            ...this.labels.map((el) => el.toJSON()),
+                            ...this._deletedLabels.map((label) => {
+                                const labelJSON = label.toJSON();
+                                labelJSON.deleted = true;
+                                return labelJSON;
+                            }),
+                        ];
                         break;
                     default:
                         break;

cvat-core/tests/mocks/server-proxy.mock.js

@@ -1,4 +1,4 @@
-// Copyright (C) 2020 Intel Corporation
+// Copyright (C) 2020-2021 Intel Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -97,7 +97,11 @@ class ServerProxy {
                     Object.prototype.hasOwnProperty.call(projectData, prop)
                     && Object.prototype.hasOwnProperty.call(object, prop)
                 ) {
-                    object[prop] = projectData[prop];
+                    if (prop === 'labels') {
+                        object[prop] = projectData[prop].filter((label) => !label.deleted);
+                    } else {
+                        object[prop] = projectData[prop];
+                    }
                 }
             }
         }
@@ -156,7 +160,11 @@ class ServerProxy {
                     Object.prototype.hasOwnProperty.call(taskData, prop)
                     && Object.prototype.hasOwnProperty.call(object, prop)
                 ) {
-                    object[prop] = taskData[prop];
+                    if (prop === 'labels') {
+                        object[prop] = taskData[prop].filter((label) => !label.deleted);
+                    } else {
+                        object[prop] = taskData[prop];
+                    }
                 }
             }
         }

cvat-ui/src/actions/annotation-actions.ts

@@ -5,6 +5,8 @@
 import {
     AnyAction, Dispatch, ActionCreator, Store,
 } from 'redux';
+import { MutableRefObject } from 'react';
+import notification from 'antd/lib/notification';
 import { ThunkAction } from 'utils/redux';
 
 import {
@@ -26,7 +28,6 @@ import getCore from 'cvat-core-wrapper';
 import logger, { LogType } from 'cvat-logger';
 import { RectDrawingMethod } from 'cvat-canvas-wrapper';
 import { getCVATStore } from 'cvat-store';
-import { MutableRefObject } from 'react';
 
 interface AnnotationsParameters {
     filters: string[];
@@ -919,8 +920,14 @@ export function getJobAsync(tid: number, jid: number, initialFrame: number, init
                 throw new Error(`Task ${tid} doesn't contain the job ${jid}`);
             }
 
-            if (!task.labels.length && task.projectId) {
-                throw new Error(`Project ${task.projectId} does not contain any label`);
+            if (!task.labels.length) {
+                notification.warning({
+                    message: 'No labels',
+                    description: `${task.projectId ? 'Project' : 'Task'} ${
+                        task.projectId || task.id
+                    } does not contain any label`,
+                    placement: 'topRight',
+                });
             }
 
             const frameNumber = Math.max(Math.min(job.stopFrame, initialFrame), job.startFrame);

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/controls-side-bar.tsx

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: MIT
 
 import React from 'react';
-import GlobalHotKeys, { KeyMap } from 'utils/mousetrap-react';
 import Layout from 'antd/lib/layout';
+import GlobalHotKeys, { KeyMap } from 'utils/mousetrap-react';
 
 import { ActiveControl, Rotation } from 'reducers/interfaces';
 import { Canvas } from 'cvat-canvas-wrapper';
@@ -32,6 +32,7 @@ interface Props {
     activeControl: ActiveControl;
     keyMap: KeyMap;
     normalizedKeyMap: Record<string, string>;
+    labels: any[];
 
     mergeObjects(enabled: boolean): void;
     groupObjects(enabled: boolean): void;
@@ -64,10 +65,11 @@ const ObservedSplitControl = ControlVisibilityObserver<SplitControlProps>(SplitC
 
 export default function ControlsSideBarComponent(props: Props): JSX.Element {
     const {
-        canvasInstance,
         activeControl,
+        canvasInstance,
         normalizedKeyMap,
         keyMap,
+        labels,
         mergeObjects,
         groupObjects,
         splitTrack,
@@ -114,6 +116,8 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
                 ActiveControl.OPENCV_TOOLS,
             ].includes(activeControl);
 
+            if (!labels.length) return;
+
             if (!drawing) {
                 canvasInstance.cancel();
                 // repeateDrawShapes gets all the latest parameters
@@ -136,6 +140,7 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
         },
         SWITCH_MERGE_MODE: (event: KeyboardEvent | undefined) => {
             preventDefault(event);
+            if (!labels.length) return;
             const merging = activeControl === ActiveControl.MERGE;
             if (!merging) {
                 canvasInstance.cancel();
@@ -145,6 +150,7 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
         },
         SWITCH_SPLIT_MODE: (event: KeyboardEvent | undefined) => {
             preventDefault(event);
+            if (!labels.length) return;
             const splitting = activeControl === ActiveControl.SPLIT;
             if (!splitting) {
                 canvasInstance.cancel();
@@ -154,6 +160,7 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
         },
         SWITCH_GROUP_MODE: (event: KeyboardEvent | undefined) => {
             preventDefault(event);
+            if (!labels.length) return;
             const grouping = activeControl === ActiveControl.GROUP;
             if (!grouping) {
                 canvasInstance.cancel();
@@ -213,24 +220,29 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
             <ObservedDrawRectangleControl
                 canvasInstance={canvasInstance}
                 isDrawing={activeControl === ActiveControl.DRAW_RECTANGLE}
+                disabled={!labels.length}
             />
             <ObservedDrawPolygonControl
                 canvasInstance={canvasInstance}
                 isDrawing={activeControl === ActiveControl.DRAW_POLYGON}
+                disabled={!labels.length}
             />
             <ObservedDrawPolylineControl
                 canvasInstance={canvasInstance}
                 isDrawing={activeControl === ActiveControl.DRAW_POLYLINE}
+                disabled={!labels.length}
             />
             <ObservedDrawPointsControl
                 canvasInstance={canvasInstance}
                 isDrawing={activeControl === ActiveControl.DRAW_POINTS}
+                disabled={!labels.length}
             />
             <ObservedDrawCuboidControl
                 canvasInstance={canvasInstance}
                 isDrawing={activeControl === ActiveControl.DRAW_CUBOID}
+                disabled={!labels.length}
             />
-            <ObservedSetupTagControl canvasInstance={canvasInstance} isDrawing={false} />
+            <ObservedSetupTagControl canvasInstance={canvasInstance} isDrawing={false} disabled={!labels.length} />
 
             <hr />
 
@@ -239,19 +251,22 @@ export default function ControlsSideBarComponent(props: Props): JSX.Element {
                 canvasInstance={canvasInstance}
                 activeControl={activeControl}
                 mergeObjects={mergeObjects}
+                disabled={!labels.length}
             />
             <ObservedGroupControl
                 switchGroupShortcut={normalizedKeyMap.SWITCH_GROUP_MODE}
                 resetGroupShortcut={normalizedKeyMap.RESET_GROUP}
                 canvasInstance={canvasInstance}
                 activeControl={activeControl}
                 groupObjects={groupObjects}
+                disabled={!labels.length}
             />
             <ObservedSplitControl
                 canvasInstance={canvasInstance}
                 switchSplitShortcut={normalizedKeyMap.SWITCH_SPLIT_MODE}
                 activeControl={activeControl}
                 splitTrack={splitTrack}
+                disabled={!labels.length}
             />
 
             <ExtraControlsControl />

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-cuboid-control.tsx

@@ -17,11 +17,12 @@ import withVisibilityHandling from './handle-popover-visibility';
 export interface Props {
     canvasInstance: Canvas;
     isDrawing: boolean;
+    disabled?: boolean;
 }
 
 const CustomPopover = withVisibilityHandling(Popover, 'draw-cuboid');
 function DrawPolygonControl(props: Props): JSX.Element {
-    const { canvasInstance, isDrawing } = props;
+    const { canvasInstance, isDrawing, disabled } = props;
     const dynamcPopoverPros = isDrawing ?
         {
             overlayStyle: {
@@ -41,7 +42,9 @@ function DrawPolygonControl(props: Props): JSX.Element {
             className: 'cvat-draw-cuboid-control',
         };
 
-    return (
+    return disabled ? (
+        <Icon className='cvat-draw-cuboid-control cvat-disabled-canvas-control' component={CubeIcon} />
+    ) : (
         <CustomPopover
             {...dynamcPopoverPros}
             overlayClassName='cvat-draw-shape-popover'

cvat-ui/src/components/annotation-page/standard-workspace/controls-side-bar/draw-points-control.tsx

@@ -16,11 +16,12 @@ import withVisibilityHandling from './handle-popover-visibility';
 export interface Props {
     canvasInstance: Canvas;
     isDrawing: boolean;
+    disabled?: boolean;
 }
 
 const CustomPopover = withVisibilityHandling(Popover, 'draw-points');
 function DrawPointsControl(props: Props): JSX.Element {
-    const { canvasInstance, isDrawing } = props;
+    const { canvasInstance, isDrawing, disabled } = props;
     const dynamcPopoverPros = isDrawing ?
         {
             overlayStyle: {
@@ -40,7 +41,9 @@ function DrawPointsControl(props: Props): JSX.Element {
             className: 'cvat-draw-points-control',
         };
 
-    return (
+    return disabled ? (
+        <Icon className='cvat-draw-points-control cvat-disabled-canvas-control' component={PointIcon} />
+    ) : (
         <CustomPopover
             {...dynamcPopoverPros}
             overlayClassName='cvat-draw-shape-popover'