From ef9e2d713eab933464fde78a40724f9419f5c51e Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Thu, 17 Jun 2021 22:24:26 +0300 Subject: [PATCH 1/3] Fixed UI fails when inactive user is assigneed to a task/job --- cvat-core/package-lock.json | 2 +- cvat-core/package.json | 2 +- cvat-core/src/api-implementation.js | 5 +---- cvat-ui/package-lock.json | 2 +- cvat-ui/package.json | 2 +- cvat-ui/src/components/task-page/user-selector.tsx | 5 +++-- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/cvat-core/package-lock.json b/cvat-core/package-lock.json index 16741ff659a..6daac70214e 100644 --- a/cvat-core/package-lock.json +++ b/cvat-core/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-core", - "version": "3.13.2", + "version": "3.13.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-core/package.json b/cvat-core/package.json index b70014c21d0..e71098c0498 100644 --- a/cvat-core/package.json +++ b/cvat-core/package.json @@ -1,6 +1,6 @@ { "name": "cvat-core", - "version": "3.13.2", + "version": "3.13.3", "description": "Part of Computer Vision Tool which presents an interface for client-side integration", "main": "babel.config.js", "scripts": { diff --git a/cvat-core/src/api-implementation.js b/cvat-core/src/api-implementation.js index f4549b9f6bd..787c4303f90 100644 --- a/cvat-core/src/api-implementation.js +++ b/cvat-core/src/api-implementation.js @@ -126,10 +126,7 @@ users = await serverProxy.users.self(); users = [users]; } else { - // get list of active users as default - const searchParams = { - is_active: true, - }; + const searchParams = {}; for (const key in filter) { if (filter[key] && key !== 'self') { searchParams[key] = filter[key]; diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 809bd8a177b..88aa60b9a5a 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.20.4", + "version": "1.20.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-ui/package.json b/cvat-ui/package.json index ef310bf9207..9d50d3eaee2 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.20.4", + "version": "1.20.5", "description": "CVAT single-page application", "main": "src/index.tsx", "scripts": { diff --git a/cvat-ui/src/components/task-page/user-selector.tsx b/cvat-ui/src/components/task-page/user-selector.tsx index 39ee21104f1..43b25f9ef85 100644 --- a/cvat-ui/src/components/task-page/user-selector.tsx +++ b/cvat-ui/src/components/task-page/user-selector.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2020-2021 Intel Corporation // // SPDX-License-Identifier: MIT @@ -29,6 +29,7 @@ const searchUsers = debounce( .get({ search: searchValue, limit: 10, + is_active: true, }) .then((result: User[]) => { if (result) { @@ -50,7 +51,7 @@ export default function UserSelector(props: Props): JSX.Element { const autocompleteRef = useRef(null); useEffect(() => { - core.users.get({ limit: 10 }).then((result: User[]) => { + core.users.get({ limit: 10, is_active: true }).then((result: User[]) => { if (result) { setInitialUsers(result); } From 08824bc7460a92a092af00a98896a19a8d640266 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Thu, 17 Jun 2021 22:26:13 +0300 Subject: [PATCH 2/3] Updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c2b180d869..7dfb735f3ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - TypeError: Cannot read property 'clientX' of undefined when draw cuboids with hotkeys () - Duplication of the cuboids when redraw them () - Some code issues in Deep Extreme Cut handler code () +- UI fails when inactive user is assigneed to a task/job () ### Security From c3fde7098c8adff7511592d51a9ac6682c6d3301 Mon Sep 17 00:00:00 2001 From: Boris Sekachev Date: Thu, 17 Jun 2021 23:49:32 +0300 Subject: [PATCH 3/3] Fixed tests --- tests/cypress/support/commands_review_pipeline.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/cypress/support/commands_review_pipeline.js b/tests/cypress/support/commands_review_pipeline.js index 3454dce1d7c..e1add3e8a5d 100644 --- a/tests/cypress/support/commands_review_pipeline.js +++ b/tests/cypress/support/commands_review_pipeline.js @@ -144,9 +144,7 @@ Cypress.Commands.add('resolveReopenIssue', (issueLabel, resolveText, reopen) => cy.get('.cvat-issue-dialog-input').type(resolveText); cy.get('.cvat-issue-dialog-footer').within(() => { cy.contains('button', 'Comment').click(); - reopen - ? cy.contains('button', 'Reopen').click() - : cy.contains('button', 'Resolve').click(); + reopen ? cy.contains('button', 'Reopen').click() : cy.contains('button', 'Resolve').click(); }); if (reopen) cy.get('.cvat-issue-dialog-header').find('[aria-label="close"]').click(); cy.wait('@postComment').its('response.statusCode').should('equal', 201); @@ -157,7 +155,7 @@ Cypress.Commands.add('submitReview', (decision, user) => { cy.get('.cvat-submit-review-dialog').within(() => { cy.contains(new RegExp(`^${decision}$`, 'g')).click(); if (decision === 'Review next') { - cy.intercept('GET', `/api/v1/users?is_active=true&search=${user}&limit=10`).as('searchUsers'); + cy.intercept('GET', `/api/v1/users?search=${user}&limit=10&is_active=true`).as('searchUsers'); cy.get('.cvat-user-search-field').within(() => { cy.get('input[type="search"]').clear().type(`${user}`); cy.wait('@searchUsers').its('response.statusCode').should('equal', 200);