IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Client: fixed TabContainer rerender on accessRights page

Browse Source
This commit is contained in:
Nikita Gopienko 2019-11-12 09:57:49 +03:00
parent 0c82308d7c
commit a79c5c02e4
1 changed files with 244 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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