Added user search filed for assignee

cvat-core/src/api-implementation.js

@@ -17,26 +17,6 @@
     const { ArgumentError } = require('./exceptions');
     const { Task } = require('./session');
 
-    function attachUsers(task, users) {
-        if (task.assignee !== null) {
-            [task.assignee] = users.filter((user) => user.id === task.assignee);
-        }
-
-        for (const segment of task.segments) {
-            for (const job of segment.jobs) {
-                if (job.assignee !== null) {
-                    [job.assignee] = users.filter((user) => user.id === job.assignee);
-                }
-            }
-        }
-
-        if (task.owner !== null) {
-            [task.owner] = users.filter((user) => user.id === task.owner);
-        }
-
-        return task;
-    }
-
     function implementAPI(cvat) {
         cvat.plugins.list.implementation = PluginRegistry.list;
         cvat.plugins.register.implementation = PluginRegistry.register.bind(cvat);
@@ -122,7 +102,10 @@
 
         cvat.users.get.implementation = async (filter) => {
             checkFilter(filter, {
+                id: isInteger,
                 self: isBoolean,
+                search: isString,
+                limit: isInteger,
             });
 
             let users = null;
@@ -130,7 +113,13 @@
                 users = await serverProxy.users.getSelf();
                 users = [users];
             } else {
-                users = await serverProxy.users.getUsers();
+                const searchParams = {};
+                for (const key in filter) {
+                    if (filter[key] && key !== 'self') {
+                        searchParams[key] = filter[key];
+                    }
+                }
+                users = await serverProxy.users.getUsers(new URLSearchParams(searchParams).toString());
             }
 
             users = users.map((user) => new User(user));
@@ -163,8 +152,7 @@
 
             // If task was found by its id, then create task instance and get Job instance from it
             if (tasks !== null && tasks.length) {
-                const users = (await serverProxy.users.getUsers()).map((userData) => new User(userData));
+                const task = new Task(tasks[0]);
-                const task = new Task(attachUsers(tasks[0], users));
 
                 return filter.jobID ? task.jobs.filter((job) => job.id === filter.jobID) : task.jobs;
             }
@@ -203,9 +191,8 @@
                 }
             }
 
-            const users = (await serverProxy.users.getUsers()).map((userData) => new User(userData));
             const tasksData = await serverProxy.tasks.getTasks(searchParams.toString());
-            const tasks = tasksData.map((task) => attachUsers(task, users)).map((task) => new Task(task));
+            const tasks = tasksData.map((task) => new Task(task));
 
             tasks.count = tasksData.count;
 

cvat-core/src/server-proxy.js

@@ -500,20 +500,14 @@
                 }
             }
 
-            async function getUsers(id = null) {
+            async function getUsers(filter = 'page_size=all') {
                 const { backendAPI } = config;
 
                 let response = null;
                 try {
-                    if (id === null) {
+                    response = await Axios.get(`${backendAPI}/users?${filter}`, {
-                        response = await Axios.get(`${backendAPI}/users?page_size=all`, {
+                        proxy: config.proxy,
-                            proxy: config.proxy,
+                    });
-                        });
-                    } else {
-                        response = await Axios.get(`${backendAPI}/users/${id}`, {
-                            proxy: config.proxy,
-                        });
-                    }
                 } catch (errorData) {
                     throw generateError(errorData);
                 }

cvat-core/src/session.js

@@ -686,6 +686,8 @@
                 }
             }
 
+            if (data.assignee) data.assignee = new User(data.assignee);
+
             Object.defineProperties(
                 this,
                 Object.freeze({
@@ -883,6 +885,9 @@
                 }
             }
 
+            if (data.assignee) data.assignee = new User(data.assignee);
+            if (data.owner) data.owner = new User(data.owner);
+
             data.labels = [];
             data.jobs = [];
             data.files = Object.freeze({
@@ -1440,7 +1445,7 @@
         if (this.id) {
             const jobData = {
                 status: this.status,
-                assignee: this.assignee ? this.assignee.id : null,
+                assignee_id: this.assignee ? this.assignee.id : null,
             };
 
             await serverProxy.jobs.saveJob(this.id, jobData);
@@ -1649,7 +1654,7 @@
         if (typeof this.id !== 'undefined') {
             // If the task has been already created, we update it
             const taskData = {
-                assignee: this.assignee ? this.assignee.id : null,
+                assignee_id: this.assignee ? this.assignee.id : null,
                 name: this.name,
                 bug_tracker: this.bugTracker,
                 labels: [...this.labels.map((el) => el.toJSON())],

cvat-ui/src/actions/users-actions.ts

@@ -1,36 +0,0 @@
-// Copyright (C) 2020 Intel Corporation
-//
-// SPDX-License-Identifier: MIT
-
-import { ActionUnion, createAction, ThunkAction } from 'utils/redux';
-import getCore from 'cvat-core-wrapper';
-
-const core = getCore();
-
-export enum UsersActionTypes {
-    GET_USERS = 'GET_USERS',
-    GET_USERS_SUCCESS = 'GET_USERS_SUCCESS',
-    GET_USERS_FAILED = 'GET_USERS_FAILED',
-}
-
-const usersActions = {
-    getUsers: () => createAction(UsersActionTypes.GET_USERS),
-    getUsersSuccess: (users: any[]) => createAction(UsersActionTypes.GET_USERS_SUCCESS, { users }),
-    getUsersFailed: (error: any) => createAction(UsersActionTypes.GET_USERS_FAILED, { error }),
-};
-
-export type UsersActions = ActionUnion<typeof usersActions>;
-
-export function getUsersAsync(): ThunkAction {
-    return async (dispatch): Promise<void> => {
-        dispatch(usersActions.getUsers());
-
-        try {
-            const users = await core.users.get();
-            const wrappedUsers = users.map((userData: any): any => new core.classes.User(userData));
-            dispatch(usersActions.getUsersSuccess(wrappedUsers));
-        } catch (error) {
-            dispatch(usersActions.getUsersFailed(error));
-        }
-    };
-}

cvat-ui/src/components/cvat-app.tsx

@@ -34,7 +34,6 @@ import '../styles.scss';
 
 interface CVATAppProps {
     loadFormats: () => void;
-    loadUsers: () => void;
     loadAbout: () => void;
     verifyAuthorized: () => void;
     loadUserAgreements: () => void;
@@ -54,8 +53,6 @@ interface CVATAppProps {
     modelsFetching: boolean;
     formatsInitialized: boolean;
     formatsFetching: boolean;
-    usersInitialized: boolean;
-    usersFetching: boolean;
     aboutInitialized: boolean;
     aboutFetching: boolean;
     userAgreementsFetching: boolean;
@@ -92,7 +89,6 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
         const {
             verifyAuthorized,
             loadFormats,
-            loadUsers,
             loadAbout,
             loadUserAgreements,
             initPlugins,
@@ -102,8 +98,6 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             userFetching,
             formatsInitialized,
             formatsFetching,
-            usersInitialized,
-            usersFetching,
             aboutInitialized,
             aboutFetching,
             pluginsInitialized,
@@ -143,10 +137,6 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
             loadFormats();
         }
 
-        if (!usersInitialized && !usersFetching) {
-            loadUsers();
-        }
-
         if (!aboutInitialized && !aboutFetching) {
             loadAbout();
         }
@@ -235,7 +225,6 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
     public render(): JSX.Element {
         const {
             userInitialized,
-            usersInitialized,
             aboutInitialized,
             pluginsInitialized,
             formatsInitialized,
@@ -248,7 +237,7 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
 
         const readyForRender =
             (userInitialized && (user == null || !user.isVerified)) ||
-            (userInitialized && formatsInitialized && pluginsInitialized && usersInitialized && aboutInitialized);
+            (userInitialized && formatsInitialized && pluginsInitialized && aboutInitialized);
 
         const subKeyMap = {
             SWITCH_SHORTCUTS: keyMap.SWITCH_SHORTCUTS,
@@ -270,7 +259,10 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
 
         if (showPlatformNotification()) {
             stopNotifications(false);
-            const info = platformInfo();
+            const {
+                name, version, engine, os,
+            } = platformInfo();
+
             Modal.warning({
                 title: 'Unsupported platform detected',
                 content: (
@@ -278,7 +270,7 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
                         <Row>
                             <Col>
                                 <Text>
-                                    {`The browser you are using is ${info.name} ${info.version} based on ${info.engine} .` +
+                                    {`The browser you are using is ${name} ${version} based on ${engine}.` +
                                         ' CVAT was tested in the latest versions of Chrome and Firefox.' +
                                         ' We recommend to use Chrome (or another Chromium based browser)'}
                                 </Text>
@@ -286,7 +278,7 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
                         </Row>
                         <Row>
                             <Col>
-                                <Text type='secondary'>{`The operating system is ${info.os}`}</Text>
+                                <Text type='secondary'>{`The operating system is ${os}`}</Text>
                             </Col>
                         </Row>
                     </>

cvat-ui/src/components/task-page/details.tsx

@@ -18,7 +18,7 @@ import patterns from 'utils/validation-patterns';
 import { getReposData, syncRepos } from 'utils/git-utils';
 import { ActiveInference } from 'reducers/interfaces';
 import AutomaticAnnotationProgress from 'components/tasks-page/automatic-annotation-progress';
-import UserSelector from './user-selector';
+import UserSelector, { User } from './user-selector';
 import LabelsEditorComponent from '../labels-editor/labels-editor';
 
 const core = getCore();
@@ -27,7 +27,6 @@ interface Props {
     previewImage: string;
     taskInstance: any;
     installedGit: boolean; // change to git repos url
-    registeredUsers: any[];
     activeInference: ActiveInference | null;
     cancelAutoAnnotation(): void;
     onTaskUpdate: (taskInstance: any) => void;
@@ -196,35 +195,26 @@ export default class DetailsComponent extends React.PureComponent<Props, State>
     }
 
     private renderUsers(): JSX.Element {
-        const { taskInstance, registeredUsers, onTaskUpdate } = this.props;
+        const { taskInstance, onTaskUpdate } = this.props;
         const owner = taskInstance.owner ? taskInstance.owner.username : null;
-        const assignee = taskInstance.assignee ? taskInstance.assignee.username : null;
+        const assignee = taskInstance.assignee ? taskInstance.assignee : null;
         const created = moment(taskInstance.createdDate).format('MMMM Do YYYY');
         const assigneeSelect = (
             <UserSelector
-                users={registeredUsers}
                 value={assignee}
-                onChange={(value: string): void => {
+                onSelect={(value: User | null): void => {
-                    let [userInstance] = registeredUsers.filter((user: any) => user.username === value);
+                    taskInstance.assignee = value;
-
-                    if (userInstance === undefined) {
-                        userInstance = null;
-                    }
-
-                    taskInstance.assignee = userInstance;
                     onTaskUpdate(taskInstance);
                 }}
             />
         );
 
         return (
-            <Row type='flex' justify='space-between' align='middle'>
+            <Row className='cvat-task-details-user-block' type='flex' justify='space-between' align='middle'>
                 <Col span={12}>{owner && <Text type='secondary'>{`Created by ${owner} on ${created}`}</Text>}</Col>
                 <Col span={10}>
-                    <Text type='secondary'>
+                    <Text type='secondary'>Assigned to</Text>
-                        Assigned to
+                    {assigneeSelect}
-                        {assigneeSelect}
-                    </Text>
                 </Col>
             </Row>
         );

cvat-ui/src/components/task-page/job-list.tsx

@@ -15,7 +15,7 @@ import moment from 'moment';
 import copy from 'copy-to-clipboard';
 
 import getCore from 'cvat-core-wrapper';
-import UserSelector from './user-selector';
+import UserSelector, { User } from './user-selector';
 
 const core = getCore();
 
@@ -23,14 +23,12 @@ const baseURL = core.config.backendAPI.slice(0, -7);
 
 interface Props {
     taskInstance: any;
-    registeredUsers: any[];
     onJobUpdate(jobInstance: any): void;
 }
 
 function JobListComponent(props: Props & RouteComponentProps): JSX.Element {
     const {
         taskInstance,
-        registeredUsers,
         onJobUpdate,
         history: { push },
     } = props;
@@ -100,21 +98,14 @@ function JobListComponent(props: Props & RouteComponentProps): JSX.Element {
             dataIndex: 'assignee',
             key: 'assignee',
             render: (jobInstance: any): JSX.Element => {
-                const assignee = jobInstance.assignee ? jobInstance.assignee.username : null;
+                const assignee = jobInstance.assignee ? jobInstance.assignee : null;
 
                 return (
                     <UserSelector
-                        users={registeredUsers}
                         value={assignee}
-                        onChange={(value: string): void => {
+                        onSelect={(value: User | null): void => {
-                            let [userInstance] = [...registeredUsers].filter((user: any) => user.username === value);
-
-                            if (userInstance === undefined) {
-                                userInstance = null;
-                            }
-
                             // eslint-disable-next-line
-                            jobInstance.assignee = userInstance;
+                            jobInstance.assignee = value;
                             onJobUpdate(jobInstance);
                         }}
                     />

cvat-ui/src/components/task-page/styles.scss

@@ -17,6 +17,12 @@
         padding: 20px;
         background: $background-color-1;
 
+        .cvat-task-details-user-block {
+            > div:nth-child(2) > span {
+                margin-right: 8px;
+            }
+        }
+
         > div:nth-child(2) {
             > div:nth-child(2) {
                 padding-left: 20px;

cvat-ui/src/components/task-page/user-selector.tsx

@@ -2,30 +2,97 @@
 //
 // SPDX-License-Identifier: MIT
 
-import React from 'react';
+import React, { useState, useEffect } from 'react';
-import Select from 'antd/lib/select';
+import Autocomplete from 'antd/lib/auto-complete';
+
+import getCore from 'cvat-core-wrapper';
+import { SelectValue } from 'antd/lib/select';
+
+const core = getCore();
+
+export interface User {
+    id: number;
+    username: string;
+}
 
 interface Props {
-    value: string | null;
+    value: User | null;
-    users: any[];
+    onSelect: (user: User | null) => void;
-    onChange: (user: string) => void;
 }
 
 export default function UserSelector(props: Props): JSX.Element {
-    const { value, users, onChange } = props;
+    const { value, onSelect } = props;
+    const [searchPhrase, setSearchPhrase] = useState('');
+
+    const [users, setUsers] = useState<User[]>([]);
+
+    const handleSearch = (searchValue: string): void => {
+        if (searchValue) {
+            core.users
+                .get({
+                    search: searchValue,
+                    limit: 10,
+                })
+                .then((result: User[]) => {
+                    if (result) {
+                        setUsers(result);
+                    }
+                });
+        } else {
+            setUsers([]);
+        }
+        setSearchPhrase(searchValue);
+    };
+
+    const handleFocus = (open: boolean): void => {
+        if (!users.length && open) {
+            core.users.get({ limit: 10 }).then((result: User[]) => {
+                if (result) {
+                    setUsers(result);
+                }
+            });
+        }
+        if (!open && searchPhrase && searchPhrase !== value?.username) {
+            setSearchPhrase('');
+            if (value) {
+                onSelect(null);
+            }
+        }
+    };
+
+    const handleSelect = (_value: SelectValue): void => {
+        setSearchPhrase(users.filter((user) => user.id === +_value)[0].username);
+        onSelect(_value ? users.filter((user) => user.id === +_value)[0] : null);
+    };
+
+    useEffect(() => {
+        if (value && !users.filter((user) => user.id === value.id).length) {
+            core.users.get({ id: value.id }).then((result: User[]) => {
+                const [user] = result;
+                setUsers([
+                    ...users,
+                    {
+                        id: user.id,
+                        username: user.username,
+                    },
+                ]);
+                setSearchPhrase(user.username);
+            });
+        }
+    }, [value]);
 
     return (
-        <Select defaultValue={value || '—'} size='small' showSearch className='cvat-user-selector' onChange={onChange}>
+        <Autocomplete
-            <Select.Option key='-1' value='—'>
+            value={searchPhrase}
-                —
+            placeholder='Select user'
-            </Select.Option>
+            onSearch={handleSearch}
-            {users.map(
+            onSelect={handleSelect}
-                (user): JSX.Element => (
+            className='cvat-user-search-field'
-                    <Select.Option key={user.id} value={user.username}>
+            onDropdownVisibleChange={handleFocus}
-                        {user.username}
+            dataSource={users.map((user) => ({
-                    </Select.Option>
+                value: user.id.toString(),
-                ),
+                text: user.username,
-            )}
+            }))}
-        </Select>
+        />
     );
 }

cvat-ui/src/containers/task-page/details.tsx

@@ -15,7 +15,6 @@ interface OwnProps {
 }
 
 interface StateToProps {
-    registeredUsers: any[];
     activeInference: ActiveInference | null;
     installedGit: boolean;
 }
@@ -29,7 +28,6 @@ function mapStateToProps(state: CombinedState, own: OwnProps): StateToProps {
     const { list } = state.plugins;
 
     return {
-        registeredUsers: state.users.users,
         installedGit: list.GIT_INTEGRATION,
         activeInference: state.models.inferences[own.task.instance.id] || null,
     };
@@ -47,14 +45,15 @@ function mapDispatchToProps(dispatch: any, own: OwnProps): DispatchToProps {
 }
 
 function TaskPageContainer(props: StateToProps & DispatchToProps & OwnProps): JSX.Element {
-    const { task, installedGit, activeInference, registeredUsers, cancelAutoAnnotation, onTaskUpdate } = props;
+    const {
+        task, installedGit, activeInference, cancelAutoAnnotation, onTaskUpdate,
+    } = props;
 
     return (
         <DetailsComponent
             previewImage={task.preview}
             taskInstance={task.instance}
             installedGit={installedGit}
-            registeredUsers={registeredUsers}
             activeInference={activeInference}
             onTaskUpdate={onTaskUpdate}
             cancelAutoAnnotation={cancelAutoAnnotation}

cvat-ui/src/containers/task-page/job-list.tsx

@@ -7,38 +7,26 @@ import { connect } from 'react-redux';
 
 import JobListComponent from 'components/task-page/job-list';
 import { updateJobAsync } from 'actions/tasks-actions';
-import { Task, CombinedState } from 'reducers/interfaces';
+import { Task } from 'reducers/interfaces';
 
 interface OwnProps {
     task: Task;
 }
 
-interface StateToProps {
-    registeredUsers: any[];
-}
-
 interface DispatchToProps {
     onJobUpdate(jobInstance: any): void;
 }
 
-function mapStateToProps(state: CombinedState): StateToProps {
-    return {
-        registeredUsers: state.users.users,
-    };
-}
-
 function mapDispatchToProps(dispatch: any): DispatchToProps {
     return {
         onJobUpdate: (jobInstance: any): void => dispatch(updateJobAsync(jobInstance)),
     };
 }
 
-function TaskPageContainer(props: StateToProps & DispatchToProps & OwnProps): JSX.Element {
+function TaskPageContainer(props: DispatchToProps & OwnProps): JSX.Element {
-    const { task, registeredUsers, onJobUpdate } = props;
+    const { task, onJobUpdate } = props;
 
-    return (
+    return <JobListComponent taskInstance={task.instance} onJobUpdate={onJobUpdate} />;
-        <JobListComponent taskInstance={task.instance} registeredUsers={registeredUsers} onJobUpdate={onJobUpdate} />
-    );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(TaskPageContainer);
+export default connect(null, mapDispatchToProps)(TaskPageContainer);

cvat-ui/src/index.tsx

@@ -10,7 +10,6 @@ import { getPluginsAsync } from 'actions/plugins-actions';
 import { switchSettingsDialog } from 'actions/settings-actions';
 import { shortcutsActions } from 'actions/shortcuts-actions';
 import { getUserAgreementsAsync } from 'actions/useragreements-actions';
-import { getUsersAsync } from 'actions/users-actions';
 import CVATApplication from 'components/cvat-app';
 import LayoutGrid from 'components/layout-grid/layout-grid';
 import logger, { LogType } from 'cvat-logger';
@@ -34,8 +33,6 @@ interface StateToProps {
     modelsFetching: boolean;
     userInitialized: boolean;
     userFetching: boolean;
-    usersInitialized: boolean;
-    usersFetching: boolean;
     aboutInitialized: boolean;
     aboutFetching: boolean;
     formatsInitialized: boolean;
@@ -55,7 +52,6 @@ interface StateToProps {
 interface DispatchToProps {
     loadFormats: () => void;
     verifyAuthorized: () => void;
-    loadUsers: () => void;
     loadAbout: () => void;
     initModels: () => void;
     initPlugins: () => void;
@@ -71,7 +67,6 @@ function mapStateToProps(state: CombinedState): StateToProps {
     const { plugins } = state;
     const { auth } = state;
     const { formats } = state;
-    const { users } = state;
     const { about } = state;
     const { shortcuts } = state;
     const { userAgreements } = state;
@@ -84,8 +79,6 @@ function mapStateToProps(state: CombinedState): StateToProps {
         pluginsFetching: plugins.fetching,
         modelsInitialized: models.initialized,
         modelsFetching: models.fetching,
-        usersInitialized: users.initialized,
-        usersFetching: users.fetching,
         aboutInitialized: about.initialized,
         aboutFetching: about.fetching,
         formatsInitialized: formats.initialized,
@@ -110,7 +103,6 @@ function mapDispatchToProps(dispatch: any): DispatchToProps {
         loadUserAgreements: (): void => dispatch(getUserAgreementsAsync()),
         initPlugins: (): void => dispatch(getPluginsAsync()),
         initModels: (): void => dispatch(getModelsAsync()),
-        loadUsers: (): void => dispatch(getUsersAsync()),
         loadAbout: (): void => dispatch(getAboutAsync()),
         resetErrors: (): void => dispatch(resetErrors()),
         resetMessages: (): void => dispatch(resetMessages()),

cvat-ui/src/reducers/interfaces.ts

@@ -93,12 +93,6 @@ export interface PluginsState {
     list: PluginsList;
 }
 
-export interface UsersState {
-    users: any[];
-    fetching: boolean;
-    initialized: boolean;
-}
-
 export interface AboutState {
     server: any;
     packageVersion: {
@@ -494,7 +488,6 @@ export interface MetaState {
 export interface CombinedState {
     auth: AuthState;
     tasks: TasksState;
-    users: UsersState;
     about: AboutState;
     share: ShareState;
     formats: FormatsState;

cvat-ui/src/reducers/notifications-reducer.ts

@@ -9,7 +9,6 @@ import { FormatsActionTypes } from 'actions/formats-actions';
 import { ModelsActionTypes } from 'actions/models-actions';
 import { ShareActionTypes } from 'actions/share-actions';
 import { TasksActionTypes } from 'actions/tasks-actions';
-import { UsersActionTypes } from 'actions/users-actions';
 import { AboutActionTypes } from 'actions/about-actions';
 import { AnnotationActionTypes } from 'actions/annotation-actions';
 import { NotificationsActionType } from 'actions/notification-actions';
@@ -357,8 +356,7 @@ export default function (state = defaultState, action: AnyAction): Notifications
                     tasks: {
                         ...state.errors.tasks,
                         updating: {
-                            message:
+                            message: `Could not update <a href="/tasks/${taskID}" target="_blank">task ${taskID}</a>`,
-                                'Could not update ' + `<a href="/tasks/${taskID}" target="_blank">task ${taskID}</a>`,
                             reason: action.payload.error.toString(),
                         },
                     },
@@ -431,21 +429,6 @@ export default function (state = defaultState, action: AnyAction): Notifications
                 },
             };
         }
-        case UsersActionTypes.GET_USERS_FAILED: {
-            return {
-                ...state,
-                errors: {
-                    ...state.errors,
-                    users: {
-                        ...state.errors.users,
-                        fetching: {
-                            message: 'Could not get users from the server',
-                            reason: action.payload.error.toString(),
-                        },
-                    },
-                },
-            };
-        }
         case AboutActionTypes.GET_ABOUT_FAILED: {
             return {
                 ...state,

cvat-ui/src/reducers/root-reducer.ts

@@ -5,7 +5,6 @@
 import { combineReducers, Reducer } from 'redux';
 import authReducer from './auth-reducer';
 import tasksReducer from './tasks-reducer';
-import usersReducer from './users-reducer';
 import aboutReducer from './about-reducer';
 import shareReducer from './share-reducer';
 import formatsReducer from './formats-reducer';
@@ -21,7 +20,6 @@ export default function createRootReducer(): Reducer {
     return combineReducers({
         auth: authReducer,
         tasks: tasksReducer,
-        users: usersReducer,
         about: aboutReducer,
         share: shareReducer,
         formats: formatsReducer,

cvat-ui/src/reducers/users-reducer.ts

@@ -1,48 +0,0 @@
-// Copyright (C) 2020 Intel Corporation
-//
-// SPDX-License-Identifier: MIT
-
-import { BoundariesActionTypes, BoundariesActions } from 'actions/boundaries-actions';
-import { AuthActionTypes, AuthActions } from 'actions/auth-actions';
-import { UsersActionTypes, UsersActions } from 'actions/users-actions';
-import { UsersState } from './interfaces';
-
-const defaultState: UsersState = {
-    users: [],
-    fetching: false,
-    initialized: false,
-};
-
-export default function (
-    state: UsersState = defaultState,
-    action: UsersActions | AuthActions | BoundariesActions,
-): UsersState {
-    switch (action.type) {
-        case UsersActionTypes.GET_USERS: {
-            return {
-                ...state,
-                fetching: true,
-                initialized: false,
-            };
-        }
-        case UsersActionTypes.GET_USERS_SUCCESS:
-            return {
-                ...state,
-                fetching: false,
-                initialized: true,
-                users: action.payload.users,
-            };
-        case UsersActionTypes.GET_USERS_FAILED:
-            return {
-                ...state,
-                fetching: false,
-                initialized: true,
-            };
-        case BoundariesActionTypes.RESET_AFTER_ERROR:
-        case AuthActionTypes.LOGOUT_SUCCESS: {
-            return { ...defaultState };
-        }
-        default:
-            return state;
-    }
-}

cvat/apps/engine/serializers.py

@@ -13,6 +13,36 @@ from cvat.apps.engine import models
 from cvat.apps.engine.log import slogger
 from cvat.apps.dataset_manager.formats.utils import get_label_color
 
+class BasicUserSerializer(serializers.ModelSerializer):
+    def validate(self, data):
+        if hasattr(self, 'initial_data'):
+            unknown_keys = set(self.initial_data.keys()) - set(self.fields.keys())
+            if unknown_keys:
+                if set(['is_staff', 'is_superuser', 'groups']) & unknown_keys:
+                    message = 'You do not have permissions to access some of' + \
+                        ' these fields: {}'.format(unknown_keys)
+                else:
+                    message = 'Got unknown fields: {}'.format(unknown_keys)
+                raise serializers.ValidationError(message)
+        return data
+
+    class Meta:
+        model = User
+        fields = ('url', 'id', 'username', 'first_name', 'last_name')
+        ordering = ['-id']
+
+class UserSerializer(serializers.ModelSerializer):
+    groups = serializers.SlugRelatedField(many=True,
+        slug_field='name', queryset=Group.objects.all())
+
+    class Meta:
+        model = User
+        fields = ('url', 'id', 'username', 'first_name', 'last_name', 'email',
+            'groups', 'is_staff', 'is_superuser', 'is_active', 'last_login',
+            'date_joined')
+        read_only_fields = ('last_login', 'date_joined')
+        write_only_fields = ('password', )
+        ordering = ['-id']
 
 class AttributeSerializer(serializers.ModelSerializer):
     class Meta:
@@ -53,16 +83,21 @@ class JobSerializer(serializers.ModelSerializer):
     task_id = serializers.ReadOnlyField(source="segment.task.id")
     start_frame = serializers.ReadOnlyField(source="segment.start_frame")
     stop_frame = serializers.ReadOnlyField(source="segment.stop_frame")
+    assignee = BasicUserSerializer(allow_null=True)
+    assignee_id = serializers.IntegerField(write_only=True, allow_null=True)
 
     class Meta:
         model = models.Job
-        fields = ('url', 'id', 'assignee', 'status', 'start_frame',
+        fields = ('url', 'id', 'assignee', 'assignee_id', 'status', 'start_frame',
             'stop_frame', 'task_id')
 
 class SimpleJobSerializer(serializers.ModelSerializer):
+    assignee = BasicUserSerializer(allow_null=True)
+    assignee_id = serializers.IntegerField(write_only=True, allow_null=True)
+
     class Meta:
         model = models.Job
-        fields = ('url', 'id', 'assignee', 'status')
+        fields = ('url', 'id', 'assignee', 'assignee_id', 'status')
 
 class SegmentSerializer(serializers.ModelSerializer):
     jobs = SimpleJobSerializer(many=True, source='job_set')
@@ -239,10 +274,14 @@ class TaskSerializer(WriteOnceMixin, serializers.ModelSerializer):
     size = serializers.ReadOnlyField(source='data.size')
     image_quality = serializers.ReadOnlyField(source='data.image_quality')
     data = serializers.ReadOnlyField(source='data.id')
+    owner = BasicUserSerializer()
+    owner_id = serializers.IntegerField(write_only=True, allow_null=True)
+    assignee = BasicUserSerializer(allow_null=True)
+    assignee_id = serializers.IntegerField(write_only=True, allow_null=True)
 
     class Meta:
         model = models.Task
-        fields = ('url', 'id', 'name', 'mode', 'owner', 'assignee',
+        fields = ('url', 'id', 'name', 'mode', 'owner', 'assignee', 'owner_id', 'assignee_id',
             'bug_tracker', 'created_date', 'updated_date', 'overlap',
             'segment_size', 'status', 'labels', 'segments',
             'project', 'data_chunk_size', 'data_compressed_chunk_type', 'data_original_chunk_type', 'size', 'image_quality', 'data')
@@ -278,8 +317,8 @@ class TaskSerializer(WriteOnceMixin, serializers.ModelSerializer):
     # pylint: disable=no-self-use
     def update(self, instance, validated_data):
         instance.name = validated_data.get('name', instance.name)
-        instance.owner = validated_data.get('owner', instance.owner)
+        instance.owner_id = validated_data.get('owner_id', instance.owner_id)
-        instance.assignee = validated_data.get('assignee', instance.assignee)
+        instance.assignee_id = validated_data.get('assignee_id', instance.assignee_id)
         instance.bug_tracker = validated_data.get('bug_tracker',
             instance.bug_tracker)
         instance.project = validated_data.get('project', instance.project)
@@ -339,37 +378,6 @@ class ProjectSerializer(serializers.ModelSerializer):
         read_only_fields = ('created_date', 'updated_date', 'status')
         ordering = ['-id']
 
-class BasicUserSerializer(serializers.ModelSerializer):
-    def validate(self, data):
-        if hasattr(self, 'initial_data'):
-            unknown_keys = set(self.initial_data.keys()) - set(self.fields.keys())
-            if unknown_keys:
-                if set(['is_staff', 'is_superuser', 'groups']) & unknown_keys:
-                    message = 'You do not have permissions to access some of' + \
-                        ' these fields: {}'.format(unknown_keys)
-                else:
-                    message = 'Got unknown fields: {}'.format(unknown_keys)
-                raise serializers.ValidationError(message)
-        return data
-
-    class Meta:
-        model = User
-        fields = ('url', 'id', 'username', 'first_name', 'last_name')
-        ordering = ['-id']
-
-class UserSerializer(serializers.ModelSerializer):
-    groups = serializers.SlugRelatedField(many=True,
-        slug_field='name', queryset=Group.objects.all())
-
-    class Meta:
-        model = User
-        fields = ('url', 'id', 'username', 'first_name', 'last_name', 'email',
-            'groups', 'is_staff', 'is_superuser', 'is_active', 'last_login',
-            'date_joined')
-        read_only_fields = ('last_login', 'date_joined')
-        write_only_fields = ('password', )
-        ordering = ['-id']
-
 class ExceptionSerializer(serializers.Serializer):
     system = serializers.CharField(max_length=255)
     client = serializers.CharField(max_length=255)

cvat/apps/engine/views.py

@@ -704,7 +704,16 @@ class JobViewSet(viewsets.GenericViewSet,
                     return Response(data=str(e), status=status.HTTP_400_BAD_REQUEST)
                 return Response(data)
 
+class UserFilter(filters.FilterSet):
+    class Meta:
+        model = User
+        fields = ("id",)
+
+
 @method_decorator(name='list', decorator=swagger_auto_schema(
+    manual_parameters=[
+            openapi.Parameter('id',openapi.IN_QUERY,description="A unique number value identifying this user",type=openapi.TYPE_NUMBER),
+    ],
     operation_summary='Method provides a paginated list of users registered on the server'))
 @method_decorator(name='retrieve', decorator=swagger_auto_schema(
     operation_summary='Method provides information of a specific user'))
@@ -716,6 +725,8 @@ class UserViewSet(viewsets.GenericViewSet, mixins.ListModelMixin,
     mixins.RetrieveModelMixin, mixins.UpdateModelMixin, mixins.DestroyModelMixin):
     queryset = User.objects.prefetch_related('groups').all().order_by('id')
     http_method_names = ['get', 'post', 'head', 'patch', 'delete']
+    search_fields = ('username', 'first_name', 'last_name')
+    filterset_class = UserFilter
 
     def get_serializer_class(self):
         user = self.request.user