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

Client:Components:Article:Body:Items Fixed dragging to the my documents and refactoring

Browse Source
This commit is contained in:
Akmal Isomadinov 2023-12-01 15:33:18 +05:00
parent 54c868803c
commit b8fcf7ca4b
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/client/src/components/Article/Body/Items.js
View File

@ -160,7 +160,6 @@ const Items = ({
isVisitor,
isCollaborator,
isAdmin,
isRoomAdmin,
myId,
commonId,
currentId,
@ -185,6 +184,7 @@ const Items = ({
isCommunity,
isPaymentPageAvailable,
currentDeviceType,
folderAccess,
}) => {
const getEndOfBlock = React.useCallback(
(item) => {
@ -229,38 +229,35 @@ const Items = ({
return true;
}
if (isAdmin || isRoomAdmin) {
if (
item.rootFolderType === FolderType.TRASH &&
startDrag &&
!isArchive
) {
return draggableItems.some(
(draggableItem) => draggableItem.security.Delete
);
}
if (
(item.rootFolderType === FolderType.TRASH && startDrag && !isArchive) ||
item.rootFolderType === FolderType.USER
) {
return (
folderAccess === ShareAccessRights.None ||
folderAccess === ShareAccessRights.FullAccess ||
folderAccess === ShareAccessRights.RoomManager
);
}
if (isAdmin) {
if (
(item.pathParts &&
(item.pathParts[0].id === myId ||
item.pathParts[0].id === commonId)) ||
item.rootFolderType === FolderType.USER ||
item.rootFolderType === FolderType.COMMON
) {
return true;
}
} else {
if (
(item.pathParts && item.pathParts[0].id === myId) ||
item.rootFolderType === FolderType.USER
) {
if (item.pathParts && item.pathParts[0].id === myId) {
return true;
}
}
return false;
},
[currentId, draggableItems, isAdmin, isRoomAdmin]
[currentId, draggableItems, isAdmin]
);
const onMoveTo = React.useCallback(
@ -427,7 +424,7 @@ export default inject(
const { treeFolders, myFolderId, commonFolderId, isPrivacyFolder } =
treeFoldersStore;
const { id } = selectedFolderStore;
const { id, access: folderAccess } = selectedFolderStore;
const {
moveDragItems,
uploadEmptyFolders,
@ -440,7 +437,6 @@ export default inject(
isAdmin: auth.isAdmin,
isVisitor: auth.userStore.user.isVisitor,
isCollaborator: auth.userStore.user.isCollaborator,
isRoomAdmin: auth.isRoomAdmin,
myId: myFolderId,
commonId: commonFolderId,
isPrivacy: isPrivacyFolder,
@ -471,6 +467,7 @@ export default inject(
isCommunity,
isPaymentPageAvailable,
currentDeviceType,
folderAccess,
};
}
)(withTranslation(["Files", "Common", "Translations"])(observer(Items)));