From 44a5e7f16b9c7e3fac08d77372e1cc788e9fa578 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 28 Jul 2021 16:04:04 +0300 Subject: [PATCH 1/3] Added missed modals --- cvat-ui/src/components/project-page/top-bar.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cvat-ui/src/components/project-page/top-bar.tsx b/cvat-ui/src/components/project-page/top-bar.tsx index dde03ecb9288..adc3cc2d30bb 100644 --- a/cvat-ui/src/components/project-page/top-bar.tsx +++ b/cvat-ui/src/components/project-page/top-bar.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT @@ -12,7 +12,9 @@ import Text from 'antd/lib/typography/Text'; import { Project } from 'reducers/interfaces'; import ActionsMenu from 'components/projects-page/actions-menu'; +import MoveTaskModal from 'components/move-task-modal/move-task-modal'; import { MenuIcon } from 'icons'; +import ModelRunnerDialog from 'components/model-runner-modal/model-runner-dialog'; interface DetailsComponentProps { projectInstance: Project; @@ -38,6 +40,8 @@ export default function ProjectTopBar(props: DetailsComponentProps): JSX.Element + + ); From 1260c9e6bed3489c57e1e25381af9b2977654ba9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 28 Jul 2021 16:09:38 +0300 Subject: [PATCH 2/3] Added CHANGELOG, increased version --- CHANGELOG.md | 1 + cvat-ui/package-lock.json | 2 +- cvat-ui/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 482f2efd38ad..8f40c1049804 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed issue when save filtered object in AAM () - Context image disappears after undo/redo () - Using combined data sources (directory and image) when create a task () +- Move task and autoannotation modals were invisible from project page () ### Security diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 71ecb471969e..e1a4936e74c5 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.21.0", + "version": "1.21.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-ui/package.json b/cvat-ui/package.json index ae6d753afc37..b3bb6360c2a1 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.21.0", + "version": "1.21.1", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": { From f414105fcaf2509e29d24907e39ff3e15bc54297 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Wed, 28 Jul 2021 17:09:03 +0300 Subject: [PATCH 3/3] Changed modal location --- cvat-ui/src/components/project-page/project-page.tsx | 4 ++++ cvat-ui/src/components/project-page/top-bar.tsx | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cvat-ui/src/components/project-page/project-page.tsx b/cvat-ui/src/components/project-page/project-page.tsx index 385d58c519ac..ef44d03122cf 100644 --- a/cvat-ui/src/components/project-page/project-page.tsx +++ b/cvat-ui/src/components/project-page/project-page.tsx @@ -17,6 +17,8 @@ import { CombinedState, Task } from 'reducers/interfaces'; import { getProjectsAsync } from 'actions/projects-actions'; import { cancelInferenceAsync } from 'actions/models-actions'; import TaskItem from 'components/tasks-page/task-item'; +import MoveTaskModal from 'components/move-task-modal/move-task-modal'; +import ModelRunnerDialog from 'components/model-runner-modal/model-runner-dialog'; import DetailsComponent from './details'; import ProjectTopBar from './top-bar'; @@ -109,6 +111,8 @@ export default function ProjectPageComponent(): JSX.Element { ))} + + ); } diff --git a/cvat-ui/src/components/project-page/top-bar.tsx b/cvat-ui/src/components/project-page/top-bar.tsx index adc3cc2d30bb..aa5720a7fbd4 100644 --- a/cvat-ui/src/components/project-page/top-bar.tsx +++ b/cvat-ui/src/components/project-page/top-bar.tsx @@ -12,9 +12,7 @@ import Text from 'antd/lib/typography/Text'; import { Project } from 'reducers/interfaces'; import ActionsMenu from 'components/projects-page/actions-menu'; -import MoveTaskModal from 'components/move-task-modal/move-task-modal'; import { MenuIcon } from 'icons'; -import ModelRunnerDialog from 'components/model-runner-modal/model-runner-dialog'; interface DetailsComponentProps { projectInstance: Project; @@ -40,8 +38,6 @@ export default function ProjectTopBar(props: DetailsComponentProps): JSX.Element - - );