diff --git a/CHANGELOG.md b/CHANGELOG.md index 783ba09cc3f1b1fb8608aab082965350f5e4a54a..1582131ecb1efa23fbe9174f3a1e62246b7dff26 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 71ecb471969e210ae02bffd9eaa1020723e4e505..e1a4936e74c50a93e3db79ffb1f69b9236a1460e 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 ae6d753afc37f79ec461b947304c8e08c6568e6c..b3bb6360c2a1bd5f9963c8307326f5505ea8f392 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 9221889c785e8ac37448258198ff0aac362abc46..d23b42d7377b122379892b0d29426debf389c1fe 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 b37c236dac7847e889da008550c1c0fcdfb461c8..f85c35ca103ba11732520f3818aeed3954735086 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 91d6b8c5de014bc2c8fd96f50b81c431e9d297c4..83f8f72ba96b4bf68c57d0d942505a3ad73fb939 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.', () => {