React UI: batch of fixes (#1404)

* React UI has become a primary UI * Temporary disabled cuboid in cvat-core
cvat-ai · Apr 14, 2020 · 018925d · 018925d
1 parent 4bcd959
commit 018925d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Increase preview size of a task till 256, 256 on the server
 - Minor style updates
 - Public ssh-keys are displayed in a dedicated window instead of console when create a task with a repository
+- React UI has become is a primary UI
 
 ### Deprecated
 -

diff --git a/cvat-core/src/annotations-collection.js b/cvat-core/src/annotations-collection.js
@@ -150,6 +150,7 @@
             }
 
             for (const shape of data.shapes) {
+                if (shape.type === 'cuboid') continue;
                 const clientID = ++this.count;
                 const shapeModel = shapeFactory(shape, clientID, this.injection);
                 this.shapes[shapeModel.frame] = this.shapes[shapeModel.frame] || [];

diff --git a/cvat-ui/src/components/task-page/job-list.tsx b/cvat-ui/src/components/task-page/job-list.tsx
@@ -51,20 +51,20 @@ function JobListComponent(props: Props & RouteComponentProps): JSX.Element {
         key: 'job',
         render: (id: number): JSX.Element => (
             <div>
-                <Button type='link' href={`${baseURL}/?id=${id}`}>{`Job #${id}`}</Button>
+                <Button
+                    type='link'
+                    onClick={(): void => {
+                        push(`/tasks/${taskId}/jobs/${id}`);
+                    }}
+                >
+                    {`Job #${id}`}
+                </Button>
                 |
-                <Tooltip title='Beta version of new UI written in React. It is to get
-                                acquainted only, we do not recommend use it to annotation
-                                process because it lacks of some features and can be unstable.'
+                <Tooltip title='Old version of UI is deprecated and will be removed from
+                                new versions of UI. We still recomend it only if you use
+                                specific features from it like cuboids annotation.'
                 >
-                    <Button
-                        type='link'
-                        onClick={(): void => {
-                            push(`/tasks/${taskId}/jobs/${id}`);
-                        }}
-                    >
-                        Try new UI
-                    </Button>
+                    <Button type='link' href={`${baseURL}/?id=${id}`}>Old UI</Button>
                 </Tooltip>
             </div>
         ),