Merged develop

CHANGELOG.md

@@ -26,7 +26,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Django templates for email and user guide (<https://github.com/openvinotoolkit/cvat/pull/2412>)
-- Saving relative paths in dummy chunks instead of absolute(<https://github.com/openvinotoolkit/cvat/pull/2424>)
+- Saving relative paths in dummy chunks instead of absolute (<https://github.com/openvinotoolkit/cvat/pull/2424>)
+- Objects with a specific label cannot be displayed if at least one tag with the label exist (<https://github.com/openvinotoolkit/cvat/pull/2435>)
+- Wrong attribute can be removed in labels editor (<https://github.com/openvinotoolkit/cvat/pull/2436>)
 - UI fails with the error "Cannot read property 'label' of undefined" (<https://github.com/openvinotoolkit/cvat/pull/2442>)
 
 ### Security

Dockerfile.ui

@@ -21,8 +21,6 @@ COPY cvat-canvas/package*.json /tmp/cvat-canvas/
 COPY cvat-ui/package*.json /tmp/cvat-ui/
 COPY cvat-data/package*.json /tmp/cvat-data/
 
-RUN npm config set loglevel info
-
 # Install cvat-data dependencies
 WORKDIR /tmp/cvat-data/
 RUN npm ci

cvat-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.10.1",
+  "version": "1.10.3",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {
@@ -57,7 +57,7 @@
     "@types/react-router-dom": "^5.1.6",
     "@types/react-share": "^3.0.3",
     "@types/redux-logger": "^3.0.8",
-    "antd": "^3.26.18",
+    "antd": "^3.26.19",
     "copy-to-clipboard": "^3.3.1",
     "cvat-canvas": "file:../cvat-canvas",
     "cvat-core": "file:../cvat-core",

cvat-ui/src/components/labels-editor/label-form.tsx

@@ -18,7 +18,9 @@ import ColorPicker from 'components/annotation-page/standard-workspace/objects-s
 import { ColorizeIcon } from 'icons';
 import patterns from 'utils/validation-patterns';
 import consts from 'consts';
-import { equalArrayHead, idGenerator, Label, Attribute } from './common';
+import {
+    equalArrayHead, idGenerator, Label, Attribute,
+} from './common';
 
 export enum AttributeType {
     SELECT = 'SELECT',
@@ -318,9 +320,9 @@ class LabelForm extends React.PureComponent<Props, {}> {
         );
     }
 
-    private renderAttribute = (key: number, index: number): JSX.Element => {
+    private renderAttribute = (key: number): JSX.Element => {
         const { label, form } = this.props;
-        const attr = label && index < label.attributes.length ? label.attributes[index] : null;
+        const attr = label ? label.attributes.filter((_attr: any): boolean => _attr.id === key)[0] : null;
 
         return (
             <Form.Item key={key}>

cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/label-item.tsx

@@ -8,7 +8,7 @@ import { connect } from 'react-redux';
 import { updateAnnotationsAsync } from 'actions/annotation-actions';
 
 import LabelItemComponent from 'components/annotation-page/standard-workspace/objects-side-bar/label-item';
-import { CombinedState } from 'reducers/interfaces';
+import { CombinedState, ObjectType } from 'reducers/interfaces';
 
 interface OwnProps {
     labelID: number;
@@ -92,8 +92,8 @@ class LabelItemContainer extends React.PureComponent<Props, State> {
         let statesLocked = true;
 
         ownObjectStates.forEach((objectState: any) => {
-            const { lock } = objectState;
-            if (!lock) {
+            const { lock, objectType } = objectState;
+            if (!lock && objectType !== ObjectType.TAG) {
                 statesHidden = statesHidden && objectState.hidden;
                 statesLocked = statesLocked && objectState.lock;
             }