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

small tweaks in InfoPanelBody component

Browse Source
This commit is contained in:
mushka 2022-09-16 15:08:38 +03:00
parent 15ea8b4785
commit 5ce0cbbc4f
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/client/src/pages/Home/InfoPanel/Body/index.js
View File

@ -30,6 +30,8 @@ const InfoPanelBodyContent = ({
getIsRoomCategory, getIsRoomCategory,
getIsGallery, getIsGallery,
gallerySelected,
setBufferSelection, setBufferSelection,
isRootFolder, isRootFolder,
@ -77,12 +79,14 @@ const InfoPanelBodyContent = ({
selfId: props.selfId, selfId: props.selfId,
getRoomMembers: props.getRoomMembers, getRoomMembers: props.getRoomMembers,
}, },
historyProps: {}, historyProps: {
getRoomHistory: props.getRoomHistory,
getItemIcon: props.getItemIcon,
openFileAction: props.openFileAction,
},
galleryProps: { galleryProps: {
getIcon, getIcon,
gallerySelected: props.gallerySelected, gallerySelected,
personal: props.personal,
culture: props.culture,
}, },
}); });
@ -95,10 +99,9 @@ const InfoPanelBodyContent = ({
}; };
const getView = () => { const getView = () => {
if (isSeveralItems) return viewHelper.SeveralItemsView();
if (isNoItem) return viewHelper.NoItemView(); if (isNoItem) return viewHelper.NoItemView();
console.log(selection);
if (isGallery) return viewHelper.GalleryView(); if (isGallery) return viewHelper.GalleryView();
if (isSeveralItems) return viewHelper.SeveralItemsView();
switch (isRoomCategory ? roomsView : fileView) { switch (isRoomCategory ? roomsView : fileView) {
case "members": { case "members": {
@ -117,12 +120,13 @@ const InfoPanelBodyContent = ({
// Removing mark set with choosing item from context menu // Removing mark set with choosing item from context menu
// for it to updated after selctedItems or selectedFolder change // for it to updated after selctedItems or selectedFolder change
// (only for non-oforms items)
useEffect(() => { useEffect(() => {
if (selection && selection.isContextMenuSelection) if (isGallery || !selection?.isContextMenuSelection) return;
setSelection(normalizeSelection(selection)); setSelection(normalizeSelection(selection));
}, [selection]); }, [selection]);
// Setting selection after selctedItems or selectedFolder update // Setting selection after selectedItems or selectedFolder update
useEffect(() => { useEffect(() => {
if (selection && selection.isContextMenuSelection) return; if (selection && selection.isContextMenuSelection) return;
const newSelection = getSelection(); const newSelection = getSelection();
@ -133,8 +137,8 @@ const InfoPanelBodyContent = ({
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
// Updating SelectedItems only if // Updating SelectedItems only if
// a) Length of an array changed // a) Length of an array changed
// b) Single chosen item changed // b) Single chosen item changed
useEffect(() => { useEffect(() => {
const selectedItemsLengthChanged = const selectedItemsLengthChanged =
selectedItems.length !== props.selectedItems.length; selectedItems.length !== props.selectedItems.length;
@ -155,6 +159,8 @@ const InfoPanelBodyContent = ({
// Updating selectionParentRoom after selectFolder change // Updating selectionParentRoom after selectFolder change
// if it is located in another room // if it is located in another room
useEffect(async () => { useEffect(async () => {
if (isGallery) return;
const currentFolderRoomId = selectedFolder.pathParts[1]; const currentFolderRoomId = selectedFolder.pathParts[1];
const storeRoomId = selectionParentRoom?.id; const storeRoomId = selectionParentRoom?.id;
@ -164,15 +170,15 @@ const InfoPanelBodyContent = ({
const newSelectionParentRoom = await getRoomInfo(currentFolderRoomId); const newSelectionParentRoom = await getRoomInfo(currentFolderRoomId);
if (storeRoomId !== newSelectionParentRoom.id) { if (storeRoomId !== newSelectionParentRoom.id) {
setSelectionParentRoom(normalizeSelection(newSelectionParentRoom)); setSelectionParentRoom(normalizeSelection(newSelectionParentRoom));
console.log("Parent room: ", newSelectionParentRoom); console.log("\nfor-dev Parent room: ", newSelectionParentRoom);
} }
}, [selectedFolder]); }, [selectedFolder]);
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
useEffect(() => { useEffect(() => {
console.log("\nSelected items: ", selectedItems); console.log("\nfor-dev Selected items: ", selectedItems);
console.log("\nSelected folder: ", selectedFolder); console.log("\nfor-dev Selected folder: ", selectedFolder);
}, [selectedItems, selectedFolder]); }, [selectedItems, selectedFolder]);
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
@ -209,14 +215,13 @@ export default inject(
settingsStore, settingsStore,
filesActionsStore, filesActionsStore,
dialogsStore, dialogsStore,
treeFoldersStore,
selectedFolderStore, selectedFolderStore,
oformsStore, oformsStore,
}) => { }) => {
const selfId = auth.userStore.user.id; const selfId = auth.userStore.user.id;
const { personal, culture } = auth.settingsStore; const { personal, culture } = auth.settingsStore;
const { getIcon, getFolderIcon } = settingsStore; const { getIcon, getFolderIcon } = settingsStore;
const { onSelectItem } = filesActionsStore; const { onSelectItem, openFileAction } = filesActionsStore;
const { setSharingPanelVisible } = dialogsStore; const { setSharingPanelVisible } = dialogsStore;
const { isRootFolder } = selectedFolderStore; const { isRootFolder } = selectedFolderStore;
const { gallerySelected } = oformsStore; const { gallerySelected } = oformsStore;
@ -229,6 +234,7 @@ export default inject(
normalizeSelection, normalizeSelection,
roomsView, roomsView,
fileView, fileView,
getItemIcon,
getIsFileCategory, getIsFileCategory,
getIsRoomCategory, getIsRoomCategory,
getIsGallery, getIsGallery,
@ -241,11 +247,10 @@ export default inject(
getFolderInfo, getFolderInfo,
getShareUsers, getShareUsers,
getRoomMembers, getRoomMembers,
getRoomHistory,
createThumbnail, createThumbnail,
} = filesStore; } = filesStore;
console.log(filesStoreSelection, bufferSelection);
const selectedItems = const selectedItems =
filesStoreSelection?.length > 0 ? [...filesStoreSelection] : []; filesStoreSelection?.length > 0 ? [...filesStoreSelection] : [];
@ -274,6 +279,7 @@ export default inject(
normalizeSelection, normalizeSelection,
roomsView, roomsView,
fileView, fileView,
getItemIcon,
getIsFileCategory, getIsFileCategory,
getIsRoomCategory, getIsRoomCategory,
getIsGallery, getIsGallery,
@ -286,11 +292,13 @@ export default inject(
onSelectItem, onSelectItem,
getShareUsers, getShareUsers,
getRoomMembers, getRoomMembers,
getRoomHistory,
setSharingPanelVisible, setSharingPanelVisible,
getIcon, getIcon,
getFolderIcon, getFolderIcon,
createThumbnail, createThumbnail,
openFileAction,
gallerySelected, gallerySelected,