Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

React UI: batch of fixes #1404

Merged
merged 4 commits into from
Apr 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-
Expand Down
1 change: 1 addition & 0 deletions cvat-core/src/annotations-collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -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] || [];
Expand Down
24 changes: 12 additions & 12 deletions cvat-ui/src/components/task-page/job-list.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
),
Expand Down