started building new funcitonality for saving parent room of given selection

This commit is contained in:
mushka 2022-09-09 13:20:19 +03:00
parent fcb0f3e85f
commit 02951cd79f
2 changed files with 48 additions and 34 deletions

View File

@ -12,15 +12,16 @@ import ViewHelper from "./helpers/ViewHelper";
import ItemTitle from "./sub-components/ItemTitle";
import { StyledInfoPanelBody } from "./styles/common";
import { getRoomInfo } from "@docspace/common/api/rooms";
const InfoPanelBodyContent = ({
t,
selection,
setSelection,
selectionParentRoom,
setSelectionParentRoom,
normalizeSelection,
currentRoomTitle,
setCurrentRoomTitle,
roomsView,
personalView,
@ -46,37 +47,34 @@ const InfoPanelBodyContent = ({
t,
selection,
setSelection,
personal: props.personal,
culture: props.culture,
isGallery,
isFileCategory,
personal: props.personal,
culture: props.culture,
isRootFolder: props.isRootFolder,
isRecycleBinFolder: props.isRecycleBinFolder,
isRecentFolder: props.isRecentFolder,
isFavoritesFolder: props.isFavoritesFolder,
},
detailsProps: {
getFolderInfo: props.getFolderInfo,
getIcon,
getFolderIcon,
getFolderInfo: props.getFolderInfo,
getShareUsers: props.getShareUsers,
onSelectItem: props.onSelectItem,
setSharingPanelVisible: props.setSharingPanelVisible,
createThumbnail: props.createThumbnail,
},
membersProps: {
selectionParentRoom,
setSelectionParentRoom,
selfId: props.selfId,
currentRoomMembers: props.currentRoomMembers,
setCurrentRoomMembers: props.setCurrentRoomMembers,
getRoomMembers: props.getRoomMembers,
},
historyProps: {
personal: props.personal,
culture: props.culture,
},
historyProps: {},
galleryProps: {
gallerySelected: props.gallerySelected,
getIcon,
gallerySelected: props.gallerySelected,
personal: props.personal,
culture: props.culture,
},
@ -124,12 +122,12 @@ const InfoPanelBodyContent = ({
const newSelection = getSelection();
if (selection && selection.id === newSelection.id) return;
setSelection(newSelection);
setCurrentRoomTitle({
title: newSelection.title,
isRoom: newSelection.isRoom,
icon: newSelection.icon,
logo: newSelection.logo,
});
// setCurrentRoomTitle({
// title: newSelection.title,
// isRoom: newSelection.isRoom,
// icon: newSelection.icon,
// logo: newSelection.logo,
// });
}, [selectedItems, selectedFolder]);
//////////////////////////////////////////////////////////
@ -150,6 +148,25 @@ const InfoPanelBodyContent = ({
//////////////////////////////////////////////////////////
// useEffect(() => {
// console.log("\nSelected items: ", selectedItems);
// console.log("\nSelected folder: ", selectedFolder);
// }, [selectedItems, selectedFolder]);
useEffect(async () => {
if (selectedFolder.pathParts[1]) {
const roomId = selectedFolder.pathParts[1];
const newSelectionParentRoom = await getRoomInfo(roomId);
console.log(roomId);
console.log("Parent room: ", newSelectionParentRoom);
if (selectionParentRoom.id !== newSelectionParentRoom.id) {
setSelectionParentRoom(newSelectionParentRoom);
console.log("Parent room: ", newSelectionParentRoom);
}
}
}, [selectedFolder]);
useEffect(() => {
console.log("\nSelected items: ", selectedItems);
console.log("\nSelected folder: ", selectedFolder);
@ -192,11 +209,10 @@ export default inject(
const {
selection,
setSelection,
selectionParentRoom,
setSelectionParentRoom,
normalizeSelection,
currentRoomTitle,
setCurrentRoomTitle,
currentRoomMembers,
setCurrentRoomMembers,
roomsView,
personalView,
} = auth.infoPanelStore;
@ -243,11 +259,9 @@ export default inject(
selection,
setSelection,
selectionParentRoom,
setSelectionParentRoom,
normalizeSelection,
currentRoomTitle,
setCurrentRoomTitle,
currentRoomMembers,
setCurrentRoomMembers,
roomsView,
personalView,

View File

@ -12,29 +12,29 @@ const Members = ({
selfId,
selection,
setSelection,
currentRoomMembers,
setCurrentRoomMembers,
selectionParentRoom,
setSelectionParentRoom,
getRoomMembers,
}) => {
const [isLoading, setIsLoading] = useState(false);
useEffect(async () => {
if (currentRoomMembers) return;
// if (selectionParentRoom.members) return;
setIsLoading(true);
const fetchedMembers = await getRoomMembers(selection.id);
setCurrentRoomMembers(fetchedMembers);
// setselectionParentRoom.members(fetchedMembers);
setIsLoading(false);
}, [currentRoomMembers]);
}, [selectionParentRoom]);
if (!currentRoomMembers || isLoading)
if (!selectionParentRoom || !selectionParentRoom.members || isLoading)
return <Loaders.InfoPanelMemberListLoader />;
return (
<>
<StyledUserTypeHeader>
<Text className="title">
{t("Users in room")} : {currentRoomMembers.length}
{t("Users in room")} : {selectionParentRoom.members.length}
</Text>
<IconButton
className={"icon"}
@ -47,7 +47,7 @@ const Members = ({
/>
</StyledUserTypeHeader>
<UserList t={t} users={currentRoomMembers} selfId={selfId} />
<UserList t={t} users={selectionParentRoom.members} selfId={selfId} />
{/* <StyledUserTypeHeader>
<Text className="title">{`${t("Expect people")}:`}</Text>