Test: expose the number of children each space room has.

Author: stefanceriu

bindings/matrix-sdk-ffi/src/spaces.rs

@@ -183,6 +183,7 @@ pub struct SpaceServiceRoom {
     pub world_readable: Option<bool>,
     pub guest_can_join: bool,
 
+    pub children_count: u64,
     pub state: Option<Membership>,
     pub heroes: Option<Vec<RoomHero>>,
 }
@@ -200,6 +201,7 @@ impl From<UISpaceServiceRoom> for SpaceServiceRoom {
             join_rule: room.join_rule.map(Into::into),
             world_readable: room.world_readable,
             guest_can_join: room.guest_can_join,
+            children_count: room.children_count,
             state: room.state.map(Into::into),
             heroes: room.heroes.map(|heroes| heroes.into_iter().map(Into::into).collect()),
         }

crates/matrix-sdk-ui/src/spaces/graph.rs

@@ -49,6 +49,10 @@ impl SpaceServiceGraph {
         self.nodes.values().filter(|node| node.parents.is_empty()).map(|node| &node.id).collect()
     }
 
+    pub fn children_of(&self, node_id: &OwnedRoomId) -> Vec<&OwnedRoomId> {
+        self.nodes.get(node_id).map_or(vec![], |node| node.children.iter().collect())
+    }
+
     pub fn add_node(&mut self, node_id: OwnedRoomId) {
         self.nodes.entry(node_id.clone()).or_insert(SpaceServiceGraphNode::new(node_id));
     }

crates/matrix-sdk-ui/src/spaces/mod.rs

@@ -147,8 +147,13 @@ impl SpaceService {
         joined_spaces
             .iter()
             .flat_map(|room| {
-                if root_notes.contains(&&room.room_id().to_owned()) {
-                    Some(SpaceServiceRoom::new_from_known(room.clone()))
+                let room_id = room.room_id().to_owned();
+
+                if root_notes.contains(&&room_id) {
+                    Some(SpaceServiceRoom::new_from_known(
+                        room.clone(),
+                        graph.children_of(&room_id).len() as u64,
+                    ))
                 } else {
                     None
                 }
@@ -248,6 +253,12 @@ mod tests {
             vec![parent_space_id]
         );
 
+        // and it has 2 children
+        assert_eq!(
+            space_service.joined_spaces().iter().map(|s| s.children_count).collect::<Vec<_>>(),
+            vec![2]
+        );
+
         let parent_space = client.get_room(parent_space_id).unwrap();
         assert!(parent_space.is_space());
 
@@ -315,7 +326,7 @@ mod tests {
 
         assert_eq!(
             space_service.joined_spaces(),
-            vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap())]
+            vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0)]
         );
 
         // Join the second space
@@ -335,17 +346,17 @@ mod tests {
         assert_eq!(
             space_service.joined_spaces(),
             vec![
-                SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap()),
-                SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap())
+                SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0),
+                SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap(), 0)
             ]
         );
 
         // The subscriber yields new results when a space is joined
         assert_next_eq!(
             joined_spaces_subscriber,
             vec![
-                SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap()),
-                SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap())
+                SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0),
+                SpaceServiceRoom::new_from_known(client.get_room(second_space_id).unwrap(), 0)
             ]
         );
 
@@ -354,7 +365,7 @@ mod tests {
         // and when one is left
         assert_next_eq!(
             joined_spaces_subscriber,
-            vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap())]
+            vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0)]
         );
 
         // but it doesn't when a non-space room gets joined
@@ -370,7 +381,7 @@ mod tests {
         assert_pending!(joined_spaces_subscriber);
         assert_eq!(
             space_service.joined_spaces(),
-            vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap())]
+            vec![SpaceServiceRoom::new_from_known(client.get_room(first_space_id).unwrap(), 0)]
         );
     }
 }

crates/matrix-sdk-ui/src/spaces/room.rs

@@ -32,12 +32,17 @@ pub struct SpaceServiceRoom {
     pub world_readable: Option<bool>,
     pub guest_can_join: bool,
 
+    pub children_count: u64,
     pub state: Option<RoomState>,
     pub heroes: Option<Vec<RoomHero>>,
 }
 
 impl SpaceServiceRoom {
-    pub fn new_from_summary(summary: &RoomSummary, known_room: Option<Room>) -> Self {
+    pub fn new_from_summary(
+        summary: &RoomSummary,
+        known_room: Option<Room>,
+        children_count: u64,
+    ) -> Self {
         Self {
             room_id: summary.room_id.clone(),
             canonical_alias: summary.canonical_alias.clone(),
@@ -49,12 +54,13 @@ impl SpaceServiceRoom {
             join_rule: Some(summary.join_rule.clone()),
             world_readable: Some(summary.world_readable),
             guest_can_join: summary.guest_can_join,
+            children_count,
             state: known_room.as_ref().map(|r| r.state()),
             heroes: known_room.map(|r| r.heroes()),
         }
     }
 
-    pub fn new_from_known(known_room: Room) -> Self {
+    pub fn new_from_known(known_room: Room, children_count: u64) -> Self {
         let room_info = known_room.clone_info();
 
         Self {
@@ -70,6 +76,7 @@ impl SpaceServiceRoom {
                 .history_visibility()
                 .map(|vis| *vis == HistoryVisibility::WorldReadable),
             guest_can_join: known_room.guest_access() == GuestAccess::CanJoin,
+            children_count,
             state: Some(known_room.state()),
             heroes: Some(room_info.heroes().to_vec()),
         }

crates/matrix-sdk-ui/src/spaces/room_list.rs

@@ -69,7 +69,10 @@ impl SpaceServiceRoomList {
                                 new_rooms.iter_mut().find(|room| &room.room_id == updated_room_id)
                                 && let Some(update_room) = client_clone.get_room(updated_room_id)
                             {
-                                *room = SpaceServiceRoom::new_from_known(update_room);
+                                *room = SpaceServiceRoom::new_from_known(
+                                    update_room,
+                                    room.children_count,
+                                );
                             }
                         });
 
@@ -151,8 +154,16 @@ impl SpaceServiceRoomList {
                     result
                         .rooms
                         .iter()
-                        .map(|room| (&room.summary, self.client.get_room(&room.summary.room_id)))
-                        .map(|(summary, room)| SpaceServiceRoom::new_from_summary(summary, room))
+                        .map(|room| {
+                            (
+                                &room.summary,
+                                self.client.get_room(&room.summary.room_id),
+                                room.children_state.len(),
+                            )
+                        })
+                        .map(|(summary, room, children_count)| {
+                            SpaceServiceRoom::new_from_summary(summary, room, children_count as u64)
+                        })
                         .collect::<Vec<_>>(),
                 );
 
@@ -251,6 +262,7 @@ mod tests {
                         false,
                     ),
                     None,
+                    0
                 ),
                 SpaceServiceRoom::new_from_summary(
                     &RoomSummary::new(
@@ -261,6 +273,7 @@ mod tests {
                         false,
                     ),
                     None,
+                    0
                 ),
             ]
         );