diff --git a/CHANGELOG.md b/CHANGELOG.md index 802b64c10832..1ea7fb084c56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add support for Azure Blob Storage connection string authentication() ### Changed -- TDB +- Moving a task from a project to another project is disabled () ### Deprecated - TDB diff --git a/cvat-ui/package.json b/cvat-ui/package.json index 286fa567e48b..786d91bc4b47 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.50.0", + "version": "1.50.1", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": { diff --git a/cvat-ui/src/components/actions-menu/actions-menu.tsx b/cvat-ui/src/components/actions-menu/actions-menu.tsx index 0dd123b5a3a9..cc6403b8c2e7 100644 --- a/cvat-ui/src/components/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/components/actions-menu/actions-menu.tsx @@ -14,6 +14,7 @@ import { DimensionType } from 'cvat-core-wrapper'; interface Props { taskID: number; + projectID: number | null; taskMode: string; bugTracker: string; loaders: any[]; @@ -37,6 +38,7 @@ export enum Actions { function ActionsMenuComponent(props: Props): JSX.Element { const { taskID, + projectID, bugTracker, inferenceIsActive, backupIsActive, @@ -86,7 +88,9 @@ function ActionsMenuComponent(props: Props): JSX.Element { Backup Task - Move to project + { projectID === null && ( + Move to project + )} Delete ); diff --git a/cvat-ui/src/containers/actions-menu/actions-menu.tsx b/cvat-ui/src/containers/actions-menu/actions-menu.tsx index 27ae25c3e817..7435b18ccf5d 100644 --- a/cvat-ui/src/containers/actions-menu/actions-menu.tsx +++ b/cvat-ui/src/containers/actions-menu/actions-menu.tsx @@ -111,6 +111,7 @@ function ActionsMenuContainer(props: OwnProps & StateToProps & DispatchToProps): return ( { }); describe(`Testing "Case ${caseID}"`, () => { - it('Move a task between projects from a project.', () => { + it('Check not able to move a task from one project to another.', () => { + checkTask(secondProject.name, 'not.exist'); + checkTask(firtsProject.name, 'exist'); + cy.contains('.cvat-item-open-task-actions', 'Actions').click(); + cy.get('.cvat-actions-menu') + .should('be.visible') + .find('[role="menuitem"]') + .filter(':contains("Move to project")') + .should('not.exist'); + }); + + it.skip('Move a task between projects from a project.', () => { checkTask(secondProject.name, 'not.exist'); checkTask(firtsProject.name, 'exist'); cy.movingTask(taskName, secondProject.name, firtsProject.label, secondProject.label); @@ -112,14 +123,14 @@ context('Move a task between projects.', () => { checkTask(secondProject.name, 'exist'); }); - it('Move a task between projects from task list.', () => { + it.skip('Move a task between projects from task list.', () => { cy.goToTaskList(); cy.movingTask(taskName, secondProject.name, firtsProject.label, secondProject.label); checkTask(firtsProject.name, 'not.exist'); checkTask(secondProject.name, 'exist'); }); - it('Move a task between projects from a task.', () => { + it.skip('Move a task between projects from a task.', () => { cy.goToTaskList(); cy.openTask(taskName); cy.movingTask(taskName, secondProject.name, firtsProject.label, secondProject.label, true);