Fixed: cannot read property 'label' of undefined (#2311)

* Fixed: cannot read property 'label' of undefined * Updated UI package version & changelog * Fixed tests
cvat-ai · Oct 13, 2020 · bcc8bba · bcc8bba
1 parent 975d726
commit bcc8bba
Show file tree

Hide file tree

Showing 8 changed files with 86 additions and 200 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   A problem in exporting of tracks, where tracks could be truncated (<https://github.com/openvinotoolkit/cvat/issues/2129>)
 -   Fixed CVAT startup process if the user has `umask 077` in .bashrc file (<https://github.com/openvinotoolkit/cvat/pull/2293>)
 -   Exception: Cannot read property "each" of undefined after drawing a single point (<https://github.com/openvinotoolkit/cvat/pull/2307>)
+-   Cannot read property 'label' of undefined (Fixed?) (<https://github.com/openvinotoolkit/cvat/pull/2311>)
 
 ### 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.9.12",
+    "version": "1.9.13",
     "description": "CVAT single-page application",
     "main": "src/index.tsx",
     "scripts": {

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-context-menu.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-context-menu.tsx
@@ -9,18 +9,14 @@ import ObjectItemContainer from 'containers/annotation-page/standard-workspace/o
 
 interface Props {
     activatedStateID: number | null;
+    objectStates: any[];
     visible: boolean;
     left: number;
     top: number;
 }
 
 export default function CanvasContextMenu(props: Props): JSX.Element | null {
-    const {
-        activatedStateID,
-        visible,
-        left,
-        top,
-    } = props;
+    const { activatedStateID, objectStates, visible, left, top } = props;
 
     if (!visible || activatedStateID === null) {
         return null;
@@ -31,6 +27,7 @@ export default function CanvasContextMenu(props: Props): JSX.Element | null {
             <ObjectItemContainer
                 key={activatedStateID}
                 clientID={activatedStateID}
+                objectStates={objectStates}
                 initialCollapsed
             />
         </div>,

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/objects-list.tsx
@@ -15,6 +15,7 @@ interface Props {
     statesCollapsedAll: boolean;
     statesOrdering: StatesOrdering;
     sortedStatesID: number[];
+    objectStates: any[];
     switchLockAllShortcut: string;
     switchHiddenAllShortcut: string;
     changeStatesOrdering(value: StatesOrdering): void;
@@ -34,6 +35,7 @@ function ObjectListComponent(props: Props): JSX.Element {
         statesCollapsedAll,
         statesOrdering,
         sortedStatesID,
+        objectStates,
         switchLockAllShortcut,
         switchHiddenAllShortcut,
         changeStatesOrdering,
@@ -63,13 +65,16 @@ function ObjectListComponent(props: Props): JSX.Element {
                 showAllStates={showAllStates}
             />
             <div className='cvat-objects-sidebar-states-list'>
-                { sortedStatesID.map((id: number): JSX.Element => (
-                    <ObjectItemContainer
-                        key={id}
-                        clientID={id}
-                        initialCollapsed={statesCollapsedAll}
-                    />
-                ))}
+                {sortedStatesID.map(
+                    (id: number): JSX.Element => (
+                        <ObjectItemContainer
+                            objectStates={objectStates}
+                            key={id}
+                            clientID={id}
+                            initialCollapsed={statesCollapsedAll}
+                        />
+                    ),
+                )}
             </div>
         </div>
     );

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
@@ -11,6 +11,7 @@ import CanvasContextMenuComponent from 'components/annotation-page/standard-work
 
 interface StateToProps {
     activatedStateID: number | null;
+    objectStates: any[];
     visible: boolean;
     top: number;
     left: number;
@@ -21,24 +22,17 @@ interface StateToProps {
 function mapStateToProps(state: CombinedState): StateToProps {
     const {
         annotation: {
-            annotations: {
-                activatedStateID,
-                collapsed,
-            },
+            annotations: { activatedStateID, collapsed, states: objectStates },
             canvas: {
-                contextMenu: {
-                    visible,
-                    top,
-                    left,
-                    type,
-                },
+                contextMenu: { visible, top, left, type },
             },
         },
     } = state;
 
     return {
         activatedStateID,
         collapsed: activatedStateID !== null ? collapsed[activatedStateID] : undefined,
+        objectStates,
         visible,
         left,
         top,
@@ -76,8 +70,7 @@ class CanvasContextMenuContainer extends React.PureComponent<Props, State> {
     }
 
     static getDerivedStateFromProps(props: Props, state: State): State | null {
-        if (props.left === state.latestLeft
-            && props.top === state.latestTop) {
+        if (props.left === state.latestLeft && props.top === state.latestTop) {
             return null;
         }
 
@@ -100,9 +93,13 @@ class CanvasContextMenuContainer extends React.PureComponent<Props, State> {
 
         const [element] = window.document.getElementsByClassName('cvat-canvas-context-menu');
         if (collapsed !== prevProps.collapsed && element) {
-            element.addEventListener('transitionend', () => {
-                this.updatePositionIfOutOfScreen();
-            }, { once: true });
+            element.addEventListener(
+                'transitionend',
+                () => {
+                    this.updatePositionIfOutOfScreen();
+                },
+                { once: true },
+            );
         } else if (element) {
             this.updatePositionIfOutOfScreen();
         }
@@ -145,15 +142,9 @@ class CanvasContextMenuContainer extends React.PureComponent<Props, State> {
     };
 
     private updatePositionIfOutOfScreen(): void {
-        const {
-            top,
-            left,
-        } = this.state;
+        const { top, left } = this.state;
 
-        const {
-            innerWidth,
-            innerHeight,
-        } = window;
+        const { innerWidth, innerHeight } = window;
 
         const [element] = window.document.getElementsByClassName('cvat-canvas-context-menu');
         if (element) {
@@ -170,24 +161,17 @@ class CanvasContextMenuContainer extends React.PureComponent<Props, State> {
     }
 
     public render(): JSX.Element {
-        const {
-            left,
-            top,
-        } = this.state;
-
-        const {
-            visible,
-            activatedStateID,
-            type,
-        } = this.props;
+        const { left, top } = this.state;
+        const { visible, activatedStateID, objectStates, type } = this.props;
 
         return (
             <>
-                { type === ContextMenuType.CANVAS_SHAPE && (
+                {type === ContextMenuType.CANVAS_SHAPE && (
                     <CanvasContextMenuComponent
                         left={left}
                         top={top}
                         visible={visible}
+                        objectStates={objectStates}
                         activatedStateID={activatedStateID}
                     />
                 )}
@@ -196,6 +180,4 @@ class CanvasContextMenuContainer extends React.PureComponent<Props, State> {
     }
 }
 
-export default connect(
-    mapStateToProps,
-)(CanvasContextMenuContainer);
+export default connect(mapStateToProps)(CanvasContextMenuContainer);