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

@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [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>)
 - [Backup/Restore guide](cvat/apps/documentation/backup_guide.md) (<https://github.com/openvinotoolkit/cvat/pull/2964>)
+- Label deletion from tasks and projects (<https://github.com/openvinotoolkit/cvat/pull/2881>)
 
 ### Changed
 

cvat-core/src/labels.js

@@ -133,6 +133,7 @@
  id: undefined,
  name: undefined,
  color: undefined,
+ deleted: false,
  };
 
  for (const key in data) {
@@ -208,6 +209,12 @@
  attributes: {
  get: () => [...data.attributes],
  },
+ deleted: {
+ get: () => data.deleted,
+ set: (value) => {
+ data.deleted = value;
+ },
+ },
  }),
  );
  }
@@ -223,6 +230,10 @@
  object.id = this.id;
  }
 
+ if (this.deleted) {
+ object.deleted = this.deleted;
+ }
+
  return object;
  }
  }

cvat-core/src/project.js

@@ -186,7 +186,13 @@
  );
  }
 
- data.labels = [...labels];
+ const IDs = labels.map((_label) => _label.id);
+ const deletedLabels = data.labels.filter((_label) => !IDs.includes(_label.id));
+ deletedLabels.forEach((_label) => {
+ _label.deleted = true;
+ });
+
+ data.labels = [...deletedLabels, ...labels];
  },
  },
  /**
@@ -211,6 +217,9 @@
  subsets: {
  get: () => [...data.task_subsets],
  },
+ _internalData: {
+ get: () => data,
+ },
  }),
  );
  }
@@ -257,7 +266,7 @@
  name: this.name,
  assignee_id: this.assignee ? this.assignee.id : null,
  bug_tracker: this.bugTracker,
- labels: [...this.labels.map((el) => el.toJSON())],
+ labels: [...this._internalData.labels.map((el) => el.toJSON())],
  };
 
  await serverProxy.projects.save(this.id, projectData);

cvat-core/src/session.js

@@ -1304,7 +1304,7 @@
  * @throws {module:API.cvat.exceptions.ArgumentError}
  */
  labels: {
- get: () => [...data.labels],
+ get: () => data.labels.filter((_label) => !_label.deleted),
  set: (labels) => {
  if (!Array.isArray(labels)) {
  throw new ArgumentError('Value must be an array of Labels');
@@ -1318,8 +1318,14 @@
  }
  }
 
+ const IDs = labels.map((_label) => _label.id);
+ const deletedLabels = data.labels.filter((_label) => !IDs.includes(_label.id));
+ deletedLabels.forEach((_label) => {
+ _label.deleted = true;
+ });
+
  updatedFields.labels = true;
- data.labels = [...labels];
+ data.labels = [...deletedLabels, ...labels];
  },
  },
  /**
@@ -1485,12 +1491,6 @@
  dataChunkType: {
  get: () => data.data_compressed_chunk_type,
  },
- __updatedFields: {
- get: () => updatedFields,
- set: (fields) => {
- updatedFields = fields;
- },
- },
  dimension: {
  /**
  * @name enabled
@@ -1501,6 +1501,15 @@
  */
  get: () => data.dimension,
  },
+ _internalData: {
+ get: () => data,
+ },
+ __updatedFields: {
+ get: () => updatedFields,
+ set: (fields) => {
+ updatedFields = fields;
+ },
+ },
  }),
  );
 
@@ -1920,7 +1929,7 @@
  taskData.subset = this.subset;
  break;
  case 'labels':
- taskData.labels = [...this.labels.map((el) => el.toJSON())];
+ taskData.labels = [...this._internalData.labels.map((el) => el.toJSON())];
  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

@@ -2,6 +2,7 @@
 //
 // SPDX-License-Identifier: MIT
 
+import { MutableRefObject } from 'react';
 import {
  AnyAction, Dispatch, ActionCreator, Store,
 } from 'redux';
@@ -26,7 +27,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,10 +919,6 @@ 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`);
- }
-
  const frameNumber = Math.max(Math.min(job.stopFrame, initialFrame), job.startFrame);
  const frameData = await job.frames.get(frameNumber);
  // call first getting of frame data before rendering interface

cvat-ui/src/components/annotation-page/annotation-page.tsx

@@ -8,8 +8,10 @@ import { useHistory } from 'react-router';
 import Layout from 'antd/lib/layout';
 import Spin from 'antd/lib/spin';
 import Result from 'antd/lib/result';
+import notification from 'antd/lib/notification';
 
 import { Workspace } from 'reducers/interfaces';
+import { usePrevious } from 'utils/hooks';
 import AnnotationTopBarContainer from 'containers/annotation-page/top-bar/top-bar';
 import StatisticsModalContainer from 'containers/annotation-page/top-bar/statistics-modal';
 import StandardWorkspaceComponent from 'components/annotation-page/standard-workspace/standard-workspace';
@@ -33,6 +35,8 @@ export default function AnnotationPageComponent(props: Props): JSX.Element {
  const {
  job, fetching, getJob, closeJob, saveLogs, workspace,
  } = props;
+ const prevJob = usePrevious(job);
+ const prevFetching = usePrevious(fetching);
 
  const history = useHistory();
  useEffect(() => {
@@ -60,6 +64,26 @@ export default function AnnotationPageComponent(props: Props): JSX.Element {
  }
  }, [job, fetching]);
 
+ useEffect(() => {
+ if (prevFetching && !fetching && !prevJob && job && !job.task.labels.length) {
+ notification.warning({
+ message: 'No labels',
+ description: (
+ <span>
+ {`${job.task.projectId ? 'Project' : 'Task'} ${
+ job.task.projectId || job.task.id
+ } does not contain any label. `}
+ <a href={`/${job.task.projectId ? 'projects' : 'tasks'}/${job.task.projectId || job.task.id}/`}>
+ Add
+ </a>
+ {' the first one for editing annotation.'}
+ </span>
+ ),
+ placement: 'topRight',
+ });
+ }
+ }, [job, fetching, prevJob, prevFetching]);
+
  if (job === null) {
  return <Spin size='large' className='cvat-spinner' />;
  }