From 9eed97154561e10093ff602139e05235400131cd Mon Sep 17 00:00:00 2001
From: Alexey Safronov <Alexey.Safronov@onlyoffice.com>
Date: Wed, 18 Dec 2019 13:59:08 +0300
Subject: [PATCH] web: Common: Added user role to PeopleSelector

---
 .../security/sub-components/admins.js          |  2 ++
 .../PeopleSelector/PeopleSelector.js           | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js b/web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
index 838cdd7894..6706859e39 100644
--- a/web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
+++ b/web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
@@ -374,6 +374,7 @@ class PureAdminsSettings extends Component {
                     id="people-admin-selector"
                     isOpen={showSelector}
                     isMultiSelect={true}
+                    role="user"
                     onSelect={this.onSelect}
                     onCancel={this.onCancelSelector}
                   />
@@ -391,6 +392,7 @@ class PureAdminsSettings extends Component {
                     id="full-admin-selector"
                     isOpen={showFullAdminSelector}
                     isMultiSelect={true}
+                    role="user"
                     onSelect={this.onSelectFullAdmin}
                     onCancel={this.onCancelSelector}
                   />
diff --git a/web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js b/web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
index dfc3075150..03355a362d 100644
--- a/web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
+++ b/web/ASC.Web.Common/src/components/PeopleSelector/PeopleSelector.js
@@ -82,15 +82,23 @@ class PeopleSelector extends React.Component {
     const pageCount = 100;
 
     this.setState({ isNextPageLoading: true }, () => {
+      const {role, useFake} = this.props;
+
       const filter = Filter.getDefault();
       filter.page = startIndex / pageCount;
       filter.pageCount = pageCount;
 
-      if (searchValue) filter.search = searchValue;
+      if (searchValue) { 
+        filter.search = searchValue;
+      }
+
+      if(role) {
+        filter.role = role;
+      }
 
       if (currentGroup && currentGroup !== "all") filter.group = currentGroup;
 
-      getUserList(filter, this.props.useFake)
+      getUserList(filter, useFake)
         .then(response => {
           const newOptions = (startIndex ? [...this.state.options] : []).concat(
             this.convertUsers(response.items)
@@ -225,13 +233,15 @@ PeopleSelector.propTypes = {
   isDisabled: PropTypes.bool,
   size: PropTypes.oneOf(["full", "compact"]),
   language: PropTypes.string,
-  t: PropTypes.func
+  t: PropTypes.func,
+  role: PropTypes.oneOf(["admin", "user", "guest"])
 };
 
 PeopleSelector.defaultProps = {
   useFake: false,
   size: "full",
-  language: "en"
+  language: "en",
+  role: null
 };
 
 const ExtendedPeopleSelector = withTranslation()(PeopleSelector);