OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6109 from matrix-org/t3chguy/fix/17387 

Fix misleading child counts in spaces
pull/21833/head
Michael Telatynski 2021-05-27 12:35:00 +01:00 committed by GitHub
parent 526bde4d9e d6d0922753
commit 086ce7c621
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/structures/SpaceRoomDirectory.tsx
View File

@ -319,7 +319,7 @@ export const HierarchyLevel = ({
key={roomId} key={roomId}
room={rooms.get(roomId)} room={rooms.get(roomId)}
numChildRooms={Array.from(relations.get(roomId)?.values() || []) numChildRooms={Array.from(relations.get(roomId)?.values() || [])
.filter(ev => rooms.get(ev.state_key)?.room_type !== RoomType.Space).length} .filter(ev => rooms.has(ev.state_key) && !rooms.get(ev.state_key).room_type).length}
suggested={relations.get(spaceId)?.get(roomId)?.content.suggested} suggested={relations.get(spaceId)?.get(roomId)?.content.suggested}
selected={selectedMap?.get(spaceId)?.has(roomId)} selected={selectedMap?.get(spaceId)?.has(roomId)}
onViewRoomClick={(autoJoin) => { onViewRoomClick={(autoJoin) => {
@ -437,7 +437,7 @@ export const SpaceHierarchy: React.FC<IHierarchyProps> = ({
let content; let content;
if (roomsMap) { if (roomsMap) {
const numRooms = Array.from(roomsMap.values()).filter(r => r.room_type !== RoomType.Space).length; const numRooms = Array.from(roomsMap.values()).filter(r => !r.room_type).length;
const numSpaces = roomsMap.size - numRooms - 1; // -1 at the end to exclude the space we are looking at const numSpaces = roomsMap.size - numRooms - 1; // -1 at the end to exclude the space we are looking at
let countsStr; let countsStr;