Merge branch 'master' of github.com:ONLYOFFICE/AppServer

web/ASC.Web.Client/src/components/pages/Settings/categories/security/accessRights.js

@@ -30,13 +30,12 @@ import {
 import { getUserRole } from "../../../../../store/settings/selectors";
 
 const MainContainer = styled.div`
-  /*padding: 16px 16px 16px 24px;*/
   padding-bottom: 16px;
   width: 100%;
 
   .page_loader {
     position: fixed;
-    left: 48%;
+    left: 50%;
   }
 `;
 
@@ -332,12 +331,16 @@ class PureAccessRights extends Component {
   render() {
     const { t, owner, admins, filter } = this.props;
     const { showSelector, options, selectedOptions, isLoading } = this.state;
-    const OwnerOpportunities = t("AccessRightsOwnerOpportunities").split("|");
 
+    const OwnerOpportunities = t("AccessRightsOwnerOpportunities").split("|");
     const countElements = filter.total;
+
     //console.log("accessRight render");
 
-    const array_items = [
+    return (
+      <MainContainer>
+        <TabContainer isDisabled={isLoading}>
+          {[
             {
               key: "0",
               title: "Owner settings",
@@ -354,7 +357,7 @@ class PureAccessRights extends Component {
                         size="big"
                         role="owner"
                         userName={owner.userName}
-                  source={owner.avatar}
+                        source={owner.avatarSmall}
                       />
                       <div className="avatar_body">
                         <Text.Body
@@ -395,6 +398,7 @@ class PureAccessRights extends Component {
               title: "Admins settings",
               content: (
                 <ToggleContentContainer>
+                  <div style={{ display: "flex" }}>
                     <Button
                       className="button_style"
                       size="medium"
@@ -410,6 +414,7 @@ class PureAccessRights extends Component {
                       isDisabled={isLoading}
                       onClick={() => toastr.info("Set portal admin")}
                     />
+                  </div>
 
                   {countElements > 25 ? (
                     <FilterInput
@@ -438,6 +443,7 @@ class PureAccessRights extends Component {
                     />
                   </div>
                   <div className="wrapper">
+                    <div className="height">
                       <RowContainer manualHeight={`${admins.length * 50}px`}>
                         {admins.map(user => {
                           const element = (
@@ -494,6 +500,7 @@ class PureAccessRights extends Component {
                         })}
                       </RowContainer>
                     </div>
+                  </div>
 
                   {countElements > 25 ? (
                     <div className="wrapper">
@@ -531,7 +538,9 @@ class PureAccessRights extends Component {
                     <ProjectsContainer>
                       <RadioButtonContainer>
                         <Text.Body>
-                    {t("AccessRightsAccessToProduct", { product: t("People") })}
+                          {t("AccessRightsAccessToProduct", {
+                            product: t("People")
+                          })}
                           :
                         </Text.Body>
                         <RadioButtonGroup
@@ -569,11 +578,8 @@ class PureAccessRights extends Component {
                 </ToggleContentContainer>
               )
             }
-    ];
-
-    return (
-      <MainContainer>
-        <TabContainer isDisabled={isLoading}>{array_items}</TabContainer>
+          ]}
+        </TabContainer>
         <RequestLoader
           visible={isLoading}
           zIndex={256}