Client: fix
This commit is contained in:
parent
e6a0aeaf7f
commit
f7dc448104
@ -89,6 +89,8 @@ const withHotkeys = (Component) => {
|
|||||||
security,
|
security,
|
||||||
copyToClipboard,
|
copyToClipboard,
|
||||||
uploadClipboardFiles,
|
uploadClipboardFiles,
|
||||||
|
|
||||||
|
isGroupMenuBlocked,
|
||||||
} = props;
|
} = props;
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
@ -317,7 +319,7 @@ const withHotkeys = (Component) => {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isAvailableOption("delete")) {
|
if (isAvailableOption("delete") && !isGroupMenuBlocked) {
|
||||||
if (isRecentFolder) return;
|
if (isRecentFolder) return;
|
||||||
|
|
||||||
if (isFavoritesFolder) {
|
if (isFavoritesFolder) {
|
||||||
@ -460,6 +462,7 @@ const withHotkeys = (Component) => {
|
|||||||
setFavoriteAction,
|
setFavoriteAction,
|
||||||
deleteRooms,
|
deleteRooms,
|
||||||
archiveRooms,
|
archiveRooms,
|
||||||
|
isGroupMenuBlocked,
|
||||||
} = filesActionsStore;
|
} = filesActionsStore;
|
||||||
|
|
||||||
const { visible: mediaViewerIsVisible } = mediaViewerDataStore;
|
const { visible: mediaViewerIsVisible } = mediaViewerDataStore;
|
||||||
@ -533,6 +536,8 @@ const withHotkeys = (Component) => {
|
|||||||
copyToClipboard,
|
copyToClipboard,
|
||||||
|
|
||||||
uploadClipboardFiles,
|
uploadClipboardFiles,
|
||||||
|
|
||||||
|
isGroupMenuBlocked,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
)(observer(WithHotkeys));
|
)(observer(WithHotkeys));
|
||||||
|
@ -1690,12 +1690,7 @@ class FilesActionStore {
|
|||||||
case "delete":
|
case "delete":
|
||||||
const canDelete = selection.every((s) => s.security?.Delete);
|
const canDelete = selection.every((s) => s.security?.Delete);
|
||||||
|
|
||||||
return (
|
return !allFilesIsEditing && canDelete && hasSelection;
|
||||||
!allFilesIsEditing &&
|
|
||||||
!this.isGroupMenuBlocked &&
|
|
||||||
canDelete &&
|
|
||||||
hasSelection
|
|
||||||
);
|
|
||||||
case "create-room":
|
case "create-room":
|
||||||
const canCreateRoom = selection.some((s) => s.security?.CreateRoomFrom);
|
const canCreateRoom = selection.some((s) => s.security?.CreateRoomFrom);
|
||||||
return canCreateRoom;
|
return canCreateRoom;
|
||||||
|
Loading…
Reference in New Issue
Block a user