From 77cd899724e06530aa3db9ccabd750a4813d1ade Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Thu, 22 Jul 2021 14:29:11 +0300 Subject: [PATCH 1/4] Fixed existng labels issue --- .../src/components/create-task-page/create-task-content.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index 9221889c785..8e16920340b 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -127,10 +127,11 @@ class CreateTaskContent extends React.PureComponent { const { projectId, subset } = this.state; - this.setState({ + this.setState((state) => ({ projectId: value, subset: value && value === projectId ? subset : '', - }); + labels: value ? [] : state.labels, + })); }; private handleSubmitBasicConfiguration = (values: BaseConfiguration): void => { From b74ac2141479d4d1113df4afe88eb7e13d99e69e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Thu, 22 Jul 2021 14:33:29 +0300 Subject: [PATCH 2/4] Added CHANGELOG, increased package versions --- 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 482f2efd38a..0dea0c80bcc 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 () +- Creating task with labels in project () ### Security diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index d654c11a2b1..52229d04b57 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 2158072dd07..6e18e7efc8c 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 f4b14de3ec490b632077211c487271c03e76d5c0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Fri, 23 Jul 2021 10:01:55 +0300 Subject: [PATCH 3/4] Fixed project search field --- .../create-task-page/create-task-content.tsx | 5 +++-- .../create-task-page/project-search-field.tsx | 14 +++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cvat-ui/src/components/create-task-page/create-task-content.tsx b/cvat-ui/src/components/create-task-page/create-task-content.tsx index 8e16920340b..d23b42d7377 100644 --- a/cvat-ui/src/components/create-task-page/create-task-content.tsx +++ b/cvat-ui/src/components/create-task-page/create-task-content.tsx @@ -103,9 +103,10 @@ class CreateTaskContent extends React.PureComponent ({ ...defaultState, - }); + projectId: state.projectId, + })); } } diff --git a/cvat-ui/src/components/create-task-page/project-search-field.tsx b/cvat-ui/src/components/create-task-page/project-search-field.tsx index b37c236dac7..f85c35ca103 100644 --- a/cvat-ui/src/components/create-task-page/project-search-field.tsx +++ b/cvat-ui/src/components/create-task-page/project-search-field.tsx @@ -28,15 +28,11 @@ export default function ProjectSearchField(props: Props): JSX.Element { const [projects, setProjects] = useState([]); const handleSearch = (searchValue: string): void => { - if (searchValue) { - core.projects.searchNames(searchValue).then((result: Project[]) => { - if (result) { - setProjects(result); - } - }); - } else { - setProjects([]); - } + core.projects.searchNames(searchValue).then((result: Project[]) => { + if (result) { + setProjects(result); + } + }); setSearchPhrase(searchValue); onSelect(null); }; From 38ce5cd07ea412149f00ecf9961e276234a3dfbd Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Mon, 26 Jul 2021 11:37:19 +0300 Subject: [PATCH 4/4] Fixed cypress test --- ...ng_more_one_tasks_from_project_per_time.js | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js b/tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js index 91d6b8c5de0..83f8f72ba96 100644 --- a/tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js +++ b/tests/cypress/integration/actions_projects_models/issue_2900_creating_more_one_tasks_from_project_per_time.js @@ -24,25 +24,11 @@ context('Create more than one task per time when create from project.', () => { const imagesFolder = `cypress/fixtures/${imageFileName}`; const directoryToArchive = imagesFolder; - function createTask(nameTaskToCreate, repeatCreation) { - let projectSearchField; - if (!repeatCreation) { - projectSearchField = projectName; - } else { - projectSearchField = ''; - } + function createTask(nameTaskToCreate) { cy.get('[id="name"]').clear().type(nameTaskToCreate); cy.get('.cvat-project-search-field').within(() => { - cy.get('[type="search"]').should('have.value', projectSearchField); + cy.get('[type="search"]').should('have.value', projectName); }); - if (repeatCreation) { - cy.get('.cvat-project-search-field').click(); - cy.get('.ant-select-dropdown') - .not('.ant-select-dropdown-hidden') - .within(() => { - cy.get(`.ant-select-item-option[title="${projectName}"]`).click(); - }); - } cy.get('.cvat-constructor-viewer-new-item').should('not.exist'); cy.get('input[type="file"]').attachFile(archiveName, { subjectType: 'drag-n-drop' }); cy.contains('button', 'Submit').click(); @@ -59,8 +45,8 @@ context('Create more than one task per time when create from project.', () => { describe(`Testing "Issue ${issueID}"`, () => { it('Create more than one task per time from project.', () => { cy.get('#cvat-create-task-button').click(); - createTask(taskName.firstTask, false); - createTask(taskName.secondTask, true); + createTask(taskName.firstTask); + createTask(taskName.secondTask); }); it('The tasks successfully created. Remove the project.', () => {