Web: Hidden extra menu items in the archive room.
This commit is contained in:
parent
60c70fea1d
commit
335e2d85db
@ -12,6 +12,7 @@ const CommentEditor = ({
|
||||
|
||||
setSelection,
|
||||
isRecycleBinFolder,
|
||||
isArchiveFolderRoot,
|
||||
fetchFileVersions,
|
||||
updateCommentVersion,
|
||||
}) => {
|
||||
@ -60,7 +61,7 @@ const CommentEditor = ({
|
||||
{comment}
|
||||
</Text>
|
||||
)}
|
||||
{!isRecycleBinFolder && (
|
||||
{!isRecycleBinFolder && !isArchiveFolderRoot && (
|
||||
<div className="edit_toggle" onClick={onOpenEditor}>
|
||||
<ReactSVG
|
||||
className="edit_toggle-icon"
|
||||
@ -107,10 +108,12 @@ export default inject(({ auth, versionHistoryStore, treeFoldersStore }) => {
|
||||
const { setSelection } = auth.infoPanelStore;
|
||||
|
||||
const { fetchFileVersions, updateCommentVersion } = versionHistoryStore;
|
||||
const { isRecycleBinFolder } = treeFoldersStore;
|
||||
const { isRecycleBinFolder, isArchiveFolderRoot } = treeFoldersStore;
|
||||
|
||||
return {
|
||||
setSelection,
|
||||
isRecycleBinFolder,
|
||||
isArchiveFolderRoot,
|
||||
fetchFileVersions,
|
||||
updateCommentVersion,
|
||||
};
|
||||
|
@ -15,6 +15,7 @@ const User = ({
|
||||
currCanEditUsers,
|
||||
selectionParentRoom,
|
||||
setSelectionParentRoom,
|
||||
isArchiveRoot,
|
||||
}) => {
|
||||
if (!selectionParentRoom) return null;
|
||||
if (!user.displayName && !user.email) return null;
|
||||
@ -65,6 +66,12 @@ const User = ({
|
||||
}
|
||||
};
|
||||
|
||||
const isAvailable =
|
||||
!isArchiveRoot &&
|
||||
currCanEditUsers &&
|
||||
currentMember?.id !== user.id &&
|
||||
userRole.access !== ShareAccessRights.FullAccess;
|
||||
|
||||
return (
|
||||
<StyledUser isExpect={isExpect} key={user.id}>
|
||||
<Avatar
|
||||
@ -84,9 +91,7 @@ const User = ({
|
||||
|
||||
{userRole && userRoleOptions && (
|
||||
<div className="role-wrapper">
|
||||
{currCanEditUsers &&
|
||||
currentMember?.id !== user.id &&
|
||||
userRole.access !== ShareAccessRights.FullAccess ? (
|
||||
{isAvailable ? (
|
||||
<ComboBox
|
||||
className="role-combobox"
|
||||
selectedOption={userRole}
|
||||
|
@ -156,6 +156,7 @@ const Members = ({
|
||||
roomType={selectionParentRoom.roomType}
|
||||
selectionParentRoom={selectionParentRoom}
|
||||
setSelectionParentRoom={setSelectionParentRoom}
|
||||
isArchiveRoot={isArchiveRoot}
|
||||
/>
|
||||
))}
|
||||
</StyledUserList>
|
||||
@ -190,6 +191,7 @@ const Members = ({
|
||||
roomType={selectionParentRoom.roomType}
|
||||
selectionParentRoom={selectionParentRoom}
|
||||
setSelectionParentRoom={setSelectionParentRoom}
|
||||
isArchiveRoot={isArchiveRoot}
|
||||
/>
|
||||
))}
|
||||
</StyledUserList>
|
||||
@ -204,7 +206,7 @@ export default inject(
|
||||
peopleStore,
|
||||
dialogsStore,
|
||||
accessRightsStore,
|
||||
selectedFolderStore,
|
||||
treeFoldersStore,
|
||||
}) => {
|
||||
const { selectionParentRoom, setSelectionParentRoom } = auth.infoPanelStore;
|
||||
const {
|
||||
@ -216,9 +218,8 @@ export default inject(
|
||||
const { setInvitePanelOptions } = dialogsStore;
|
||||
const { changeType: changeUserType } = peopleStore;
|
||||
const { canInviteUserInRoom } = accessRightsStore;
|
||||
const { rootFolderType } = selectedFolderStore;
|
||||
|
||||
const isArchiveRoot = rootFolderType === FolderType.Archive;
|
||||
const { isArchiveFolderRoot } = treeFoldersStore;
|
||||
|
||||
return {
|
||||
selectionParentRoom,
|
||||
@ -236,7 +237,7 @@ export default inject(
|
||||
|
||||
changeUserType,
|
||||
canInviteUserInRoom,
|
||||
isArchiveRoot,
|
||||
isArchiveRoot: isArchiveFolderRoot,
|
||||
};
|
||||
}
|
||||
)(
|
||||
|
@ -198,6 +198,10 @@ class TreeFoldersStore {
|
||||
);
|
||||
}
|
||||
|
||||
get isArchiveFolderRoot() {
|
||||
return FolderType.Archive === this.selectedFolderStore.rootFolderType;
|
||||
}
|
||||
|
||||
get selectedKeys() {
|
||||
const selectedKeys =
|
||||
this.selectedTreeNode.length > 0 &&
|
||||
|
Loading…
Reference in New Issue
Block a user