Merge pull request #2442 from openvinotoolkit/bs/fixed_issue_1823

Fixed issue: Cannot read property label of undefined
cvat-ai · Nov 17, 2020 · 414f011 · 414f011
2 parents 6bd68b8 + abaf7f5
commit 414f011
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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
 

diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.10.2",
+  "version": "1.10.3",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

diff --git a/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-context-menu.tsx b/cvat-ui/src/containers/annotation-page/standard-workspace/canvas-context-menu.tsx
@@ -24,7 +24,10 @@ function mapStateToProps(state: CombinedState): StateToProps {
         annotation: {
             annotations: { activatedStateID, collapsed, states: objectStates },
             canvas: {
-                contextMenu: { visible, top, left, type },
+                contextMenu: {
+                    visible, top, left, type,
+                },
+                ready,
             },
         },
     } = state;
@@ -33,7 +36,11 @@ function mapStateToProps(state: CombinedState): StateToProps {
         activatedStateID,
         collapsed: activatedStateID !== null ? collapsed[activatedStateID] : undefined,
         objectStates,
-        visible,
+        visible:
+            activatedStateID !== null &&
+            visible &&
+            ready &&
+            objectStates.map((_state: any): number => _state.clientID).includes(activatedStateID),
         left,
         top,
         type,
@@ -166,7 +173,9 @@ class CanvasContextMenuContainer extends React.PureComponent<Props, State> {
 
     public render(): JSX.Element {
         const { left, top } = this.state;
-        const { visible, activatedStateID, objectStates, type } = this.props;
+        const {
+            visible, activatedStateID, objectStates, type,
+        } = this.props;
 
         return (
             <>

diff --git a/cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/object-item.tsx b/cvat-ui/src/containers/annotation-page/standard-workspace/objects-side-bar/object-item.tsx
@@ -7,7 +7,9 @@ import copy from 'copy-to-clipboard';
 import { connect } from 'react-redux';
 
 import { LogType } from 'cvat-logger';
-import { ActiveControl, CombinedState, ColorBy, ShapeType } from 'reducers/interfaces';
+import {
+    ActiveControl, CombinedState, ColorBy, ShapeType,
+} from 'reducers/interfaces';
 import {
     collapseObjectItems,
     updateAnnotationsAsync,
@@ -83,40 +85,25 @@ function mapStateToProps(state: CombinedState, own: OwnProps): StateToProps {
     const stateIDs = states.map((_state: any): number => _state.clientID);
     const index = stateIDs.indexOf(clientID);
 
-    try {
-        const collapsedState =
-            typeof statesCollapsed[clientID] === 'undefined' ? initialCollapsed : statesCollapsed[clientID];
-
-        return {
-            objectState: states[index],
-            collapsed: collapsedState,
-            attributes: jobAttributes[states[index].label.id],
-            labels,
-            ready,
-            activeControl,
-            colorBy,
-            jobInstance,
-            frameNumber,
-            activated: activatedStateID === clientID,
-            minZLayer,
-            maxZLayer,
-            normalizedKeyMap,
-            aiToolsRef,
-        };
-    } catch (exception) {
-        // we have an exception here sometimes
-        // but I cannot understand when it happens and what is the root reason
-        // maybe this temporary hack helps us
-        const dataObject = {
-            index,
-            frameNumber,
-            clientID: own.clientID,
-            stateIDs,
-        };
-        throw new Error(
-            `${exception.toString()} in mapStateToProps of ObjectItemContainer. Data are ${JSON.stringify(dataObject)}`,
-        );
-    }
+    const collapsedState =
+        typeof statesCollapsed[clientID] === 'undefined' ? initialCollapsed : statesCollapsed[clientID];
+
+    return {
+        objectState: states[index],
+        collapsed: collapsedState,
+        attributes: jobAttributes[states[index].label.id],
+        labels,
+        ready,
+        activeControl,
+        colorBy,
+        jobInstance,
+        frameNumber,
+        activated: activatedStateID === clientID,
+        minZLayer,
+        maxZLayer,
+        normalizedKeyMap,
+        aiToolsRef,
+    };
 }
 
 function mapDispatchToProps(dispatch: any): DispatchToProps {
@@ -219,7 +206,9 @@ class ObjectItemContainer extends React.PureComponent<Props> {
     };
 
     private activate = (): void => {
-        const { activateObject, objectState, ready, activeControl } = this.props;
+        const {
+            activateObject, objectState, ready, activeControl,
+        } = this.props;
 
         if (ready && activeControl === ActiveControl.CURSOR) {
             activateObject(objectState.clientID);
@@ -324,7 +313,9 @@ class ObjectItemContainer extends React.PureComponent<Props> {
     }
 
     public render(): JSX.Element {
-        const { objectState, collapsed, labels, attributes, activated, colorBy, normalizedKeyMap } = this.props;
+        const {
+            objectState, collapsed, labels, attributes, activated, colorBy, normalizedKeyMap,
+        } = this.props;
 
         let stateColor = '';
         if (colorBy === ColorBy.INSTANCE) {