Merge pull request #187 from ONLYOFFICE/feature/access-rights-fix

Feature/access rights fix
This commit is contained in:
Artem Tarasov 2021-02-03 17:03:33 +03:00 committed by GitHub
commit 317518f45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 10 deletions

View File

@ -148,6 +148,7 @@ class AddGroupsPanelComponent extends React.Component {
<StyledBody ref={this.scrollRef}> <StyledBody ref={this.scrollRef}>
<GroupSelector <GroupSelector
className="groupSelector"
isOpen={visible} isOpen={visible}
isMultiSelect isMultiSelect
displayType="aside" displayType="aside"
@ -160,6 +161,7 @@ class AddGroupsPanelComponent extends React.Component {
directionX="right" directionX="right"
onAccessChange={this.onAccessChange} onAccessChange={this.onAccessChange}
accessOptions={accessOptions} accessOptions={accessOptions}
arrowIconColor="#000000"
/> />
} }
showCounter showCounter

View File

@ -140,6 +140,7 @@ class AddUsersPanelComponent extends React.Component {
directionX="right" directionX="right"
onAccessChange={this.onAccessChange} onAccessChange={this.onAccessChange}
accessOptions={accessOptions} accessOptions={accessOptions}
arrowIconColor="#000000"
/> />
), ),
} }
@ -180,6 +181,7 @@ class AddUsersPanelComponent extends React.Component {
<StyledBody ref={this.scrollRef}> <StyledBody ref={this.scrollRef}>
<PeopleSelector <PeopleSelector
className="peopleSelector"
role={isMultiSelect ? null : "user"} role={isMultiSelect ? null : "user"}
employeeStatus={1} employeeStatus={1}
displayType="aside" displayType="aside"

View File

@ -14,6 +14,7 @@ const AccessComboBox = (props) => {
itemId, itemId,
onAccessChange, onAccessChange,
t, t,
arrowIconColor,
} = props; } = props;
const { const {
FullAccess, FullAccess,
@ -100,12 +101,15 @@ const AccessComboBox = (props) => {
); );
const accessIcon = getAccessIcon(access); const accessIcon = getAccessIcon(access);
const selectedOption = arrowIconColor
? { key: 0, arrowIconColor }
: { key: 0 };
return ( return (
<ComboBox <ComboBox
advancedOptions={advancedOptions} advancedOptions={advancedOptions}
options={[]} options={[]}
selectedOption={{ key: 0 }} selectedOption={selectedOption}
size="content" size="content"
className="panel_combo-box" className="panel_combo-box"
scaled={false} scaled={false}

View File

@ -47,9 +47,11 @@ class LinkRow extends React.Component {
isDisabled={isDisabled} isDisabled={isDisabled}
/> />
) : ( ) : (
<Icons.AccessEditIcon <Icons.InvitationLinkIcon
size="medium" size="medium"
className="sharing_panel-owner-icon" className="sharing_panel-owner-icon"
isfill={true}
color="#A3A9AE"
/> />
) )
} }

View File

@ -7,14 +7,7 @@ const PanelStyles = css`
.optionalBlock { .optionalBlock {
margin-right: 4px; margin-right: 4px;
} display: flex;
&.add-groups {
.combo-buttons_arrow-icon {
flex: 0 0 5px;
width: 5px;
margin-top: 16px;
}
} }
.combo-button { .combo-button {
@ -26,6 +19,19 @@ const PanelStyles = css`
} }
} }
.groupSelector,
.peopleSelector {
.combo-buttons_arrow-icon {
flex: 0 0 6px;
width: 6px;
margin-top: auto;
margin-bottom: auto;
display: flex;
justify-content: center;
align-items: center;
}
}
.footer { .footer {
padding: 16px 0; padding: 16px 0;
width: calc(100% - 32px); width: calc(100% - 32px);