Merge pull request #1000 from ONLYOFFICE/bugfix/displaying-info-panel-information
Bugfix/displaying info panel information
This commit is contained in:
commit
59ff978ea1
@ -12,8 +12,8 @@ class MembersHelper {
|
||||
getOptions = () => {
|
||||
return {
|
||||
docSpaceAdmin: {
|
||||
key: "docSpaceAdmin",
|
||||
label: this.t("Common:DocSpaceAdmin"),
|
||||
key: "owner",
|
||||
label: this.t("Common:Owner"),
|
||||
access: ShareAccessRights.FullAccess,
|
||||
},
|
||||
roomAdmin: {
|
||||
|
@ -17,6 +17,8 @@ const StyledUserTypeHeader = styled.div`
|
||||
}
|
||||
|
||||
.icon {
|
||||
cursor: pointer;
|
||||
|
||||
path,
|
||||
rect {
|
||||
fill: ${(props) => props.theme.infoPanel.members.iconColor};
|
||||
|
@ -78,13 +78,13 @@ const User = ({
|
||||
<div className="name">
|
||||
{isExpect ? user.email : user.displayName || user.email}
|
||||
</div>
|
||||
{currentMember.id === user.id && (
|
||||
{currentMember?.id === user.id && (
|
||||
<div className="me-label"> {`(${t("Common:MeLabel")})`}</div>
|
||||
)}
|
||||
|
||||
{userRole && userRoleOptions && (
|
||||
<div className="role-wrapper">
|
||||
{currCanEditUsers && currentMember.id !== user.id ? (
|
||||
{currCanEditUsers && currentMember?.id !== user.id ? (
|
||||
<ComboBox
|
||||
className="role-combobox"
|
||||
selectedOption={userRole}
|
||||
|
@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
|
||||
import { inject, observer } from "mobx-react";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import toastr from "@docspace/components/toast/toastr";
|
||||
|
||||
import { FolderType } from "@docspace/common/constants";
|
||||
import Loaders from "@docspace/common/components/Loaders";
|
||||
|
||||
import { StyledUserList, StyledUserTypeHeader } from "../../styles/members";
|
||||
@ -19,7 +19,7 @@ const Members = ({
|
||||
selfId,
|
||||
isOwner,
|
||||
isAdmin,
|
||||
|
||||
isArchiveRoot,
|
||||
selection,
|
||||
|
||||
selectionParentRoom,
|
||||
@ -118,8 +118,8 @@ const Members = ({
|
||||
);
|
||||
|
||||
const currCanEditUsers =
|
||||
currentMember.isOwner ||
|
||||
currentMember.isAdmin ||
|
||||
currentMember?.isOwner ||
|
||||
currentMember?.isAdmin ||
|
||||
currentMember?.access === ShareAccessRights.FullAccess ||
|
||||
currentMember?.access === ShareAccessRights.RoomManager;
|
||||
|
||||
@ -129,7 +129,7 @@ const Members = ({
|
||||
<Text className="title">
|
||||
{t("UsersInRoom")} : {members.inRoom.length}
|
||||
</Text>
|
||||
{currCanEditUsers && (
|
||||
{currCanEditUsers && !isArchiveRoot && (
|
||||
<IconButton
|
||||
className={"icon"}
|
||||
title={t("Common:AddUsers")}
|
||||
@ -163,7 +163,7 @@ const Members = ({
|
||||
{!!members.expected.length && (
|
||||
<StyledUserTypeHeader isExpect>
|
||||
<Text className="title">{t("ExpectPeople")}</Text>
|
||||
{currCanEditUsers && (
|
||||
{currCanEditUsers && !isArchiveRoot && (
|
||||
<IconButton
|
||||
className={"icon"}
|
||||
title={t("Repeat invitation")}
|
||||
@ -198,7 +198,14 @@ const Members = ({
|
||||
};
|
||||
|
||||
export default inject(
|
||||
({ auth, filesStore, peopleStore, dialogsStore, accessRightsStore }) => {
|
||||
({
|
||||
auth,
|
||||
filesStore,
|
||||
peopleStore,
|
||||
dialogsStore,
|
||||
accessRightsStore,
|
||||
selectedFolderStore,
|
||||
}) => {
|
||||
const { selectionParentRoom, setSelectionParentRoom } = auth.infoPanelStore;
|
||||
const {
|
||||
getRoomMembers,
|
||||
@ -209,6 +216,9 @@ export default inject(
|
||||
const { setInvitePanelOptions } = dialogsStore;
|
||||
const { changeType: changeUserType } = peopleStore;
|
||||
const { canInviteUserInRoom } = accessRightsStore;
|
||||
const { rootFolderType } = selectedFolderStore;
|
||||
|
||||
const isArchiveRoot = rootFolderType === FolderType.Archive;
|
||||
|
||||
return {
|
||||
selectionParentRoom,
|
||||
@ -226,6 +236,7 @@ export default inject(
|
||||
|
||||
changeUserType,
|
||||
canInviteUserInRoom,
|
||||
isArchiveRoot,
|
||||
};
|
||||
}
|
||||
)(
|
||||
|
@ -31,7 +31,6 @@ const InfoPanelHeaderContent = (props) => {
|
||||
getIsGallery,
|
||||
getIsAccounts,
|
||||
isRootFolder,
|
||||
canRemoveUserFromRoom,
|
||||
rootFolderType,
|
||||
} = props;
|
||||
|
||||
@ -51,7 +50,6 @@ const InfoPanelHeaderContent = (props) => {
|
||||
const setDetails = () => setView("details");
|
||||
|
||||
const isArchiveRoot = rootFolderType === FolderType.Archive;
|
||||
const canRemove = canRemoveUserFromRoom({ access: selection?.access });
|
||||
|
||||
const submenuData = [
|
||||
{
|
||||
@ -75,9 +73,7 @@ const InfoPanelHeaderContent = (props) => {
|
||||
];
|
||||
|
||||
const roomsSubmenu = isArchiveRoot
|
||||
? !canRemove
|
||||
? [{ ...submenuData[2] }]
|
||||
: [{ ...submenuData[0] }, { ...submenuData[2] }]
|
||||
? [{ ...submenuData[0] }, { ...submenuData[2] }]
|
||||
: [...submenuData];
|
||||
const personalSubmenu = [submenuData[1], submenuData[2]];
|
||||
|
||||
@ -132,7 +128,7 @@ const InfoPanelHeaderContent = (props) => {
|
||||
);
|
||||
};
|
||||
|
||||
export default inject(({ auth, selectedFolderStore, accessRightsStore }) => {
|
||||
export default inject(({ auth, selectedFolderStore }) => {
|
||||
const {
|
||||
selection,
|
||||
setIsVisible,
|
||||
@ -145,7 +141,6 @@ export default inject(({ auth, selectedFolderStore, accessRightsStore }) => {
|
||||
getIsAccounts,
|
||||
} = auth.infoPanelStore;
|
||||
const { isRootFolder, rootFolderType } = selectedFolderStore;
|
||||
const { canRemoveUserFromRoom } = accessRightsStore;
|
||||
|
||||
return {
|
||||
selection,
|
||||
@ -160,7 +155,6 @@ export default inject(({ auth, selectedFolderStore, accessRightsStore }) => {
|
||||
|
||||
isRootFolder,
|
||||
rootFolderType,
|
||||
canRemoveUserFromRoom,
|
||||
};
|
||||
})(
|
||||
withTranslation(["Common", "InfoPanel"])(
|
||||
|
Loading…
Reference in New Issue
Block a user