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

View File

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