From e3616df0dac848b6203a1678a6b49ed1a9d7fc7a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinin Date: Mon, 26 Jul 2021 23:04:58 +0300 Subject: [PATCH] Fixed creation task problem (#3454) * Fixed existng labels issue * Added CHANGELOG, increased package versions * Fixed project search field * Fixed cypress test --- CHANGELOG.md | 1 + cvat-ui/package-lock.json | 2 +- cvat-ui/package.json | 2 +- .../create-task-page/create-task-content.tsx | 10 +++++---- .../create-task-page/project-search-field.tsx | 14 +++++------- ...ng_more_one_tasks_from_project_per_time.js | 22 ++++--------------- 6 files changed, 18 insertions(+), 33 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 783ba09c..1582131e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,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 71ecb471..e1a4936e 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 ae6d753a..b3bb6360 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": { 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 9221889c..d23b42d7 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, + })); } } @@ -127,10 +128,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 => { 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 b37c236d..f85c35ca 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); }; 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 91d6b8c5..83f8f72b 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.', () => {