updated existing preview tests and added a test for the single space cases

fixed a bug where was not possible to re-select the space members option with unknown spaces.

pr suggestions

ElementX/Sources/Mocks/Generated/GeneratedMocks.swift

@@ -16618,15 +16618,15 @@ class SpaceServiceProxyMock: SpaceServiceProxyProtocol, @unchecked Sendable {
     }
     //MARK: - joinedParents
 
-    var joinedParentsRoomIDUnderlyingCallsCount = 0
-    var joinedParentsRoomIDCallsCount: Int {
+    var joinedParentsChildIDUnderlyingCallsCount = 0
+    var joinedParentsChildIDCallsCount: Int {
         get {
             if Thread.isMainThread {
-                return joinedParentsRoomIDUnderlyingCallsCount
+                return joinedParentsChildIDUnderlyingCallsCount
             } else {
                 var returnValue: Int? = nil
                 DispatchQueue.main.sync {
-                    returnValue = joinedParentsRoomIDUnderlyingCallsCount
+                    returnValue = joinedParentsChildIDUnderlyingCallsCount
                 }
 
                 return returnValue!
@@ -16634,29 +16634,29 @@ class SpaceServiceProxyMock: SpaceServiceProxyProtocol, @unchecked Sendable {
         }
         set {
             if Thread.isMainThread {
-                joinedParentsRoomIDUnderlyingCallsCount = newValue
+                joinedParentsChildIDUnderlyingCallsCount = newValue
             } else {
                 DispatchQueue.main.sync {
-                    joinedParentsRoomIDUnderlyingCallsCount = newValue
+                    joinedParentsChildIDUnderlyingCallsCount = newValue
                 }
             }
         }
     }
-    var joinedParentsRoomIDCalled: Bool {
-        return joinedParentsRoomIDCallsCount > 0
+    var joinedParentsChildIDCalled: Bool {
+        return joinedParentsChildIDCallsCount > 0
     }
-    var joinedParentsRoomIDReceivedRoomID: String?
-    var joinedParentsRoomIDReceivedInvocations: [String] = []
+    var joinedParentsChildIDReceivedChildID: String?
+    var joinedParentsChildIDReceivedInvocations: [String] = []
 
-    var joinedParentsRoomIDUnderlyingReturnValue: Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>!
-    var joinedParentsRoomIDReturnValue: Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>! {
+    var joinedParentsChildIDUnderlyingReturnValue: Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>!
+    var joinedParentsChildIDReturnValue: Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>! {
         get {
             if Thread.isMainThread {
-                return joinedParentsRoomIDUnderlyingReturnValue
+                return joinedParentsChildIDUnderlyingReturnValue
             } else {
                 var returnValue: Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>? = nil
                 DispatchQueue.main.sync {
-                    returnValue = joinedParentsRoomIDUnderlyingReturnValue
+                    returnValue = joinedParentsChildIDUnderlyingReturnValue
                 }
 
                 return returnValue!
@@ -16664,26 +16664,26 @@ class SpaceServiceProxyMock: SpaceServiceProxyProtocol, @unchecked Sendable {
         }
         set {
             if Thread.isMainThread {
-                joinedParentsRoomIDUnderlyingReturnValue = newValue
+                joinedParentsChildIDUnderlyingReturnValue = newValue
             } else {
                 DispatchQueue.main.sync {
-                    joinedParentsRoomIDUnderlyingReturnValue = newValue
+                    joinedParentsChildIDUnderlyingReturnValue = newValue
                 }
             }
         }
     }
-    var joinedParentsRoomIDClosure: ((String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>)?
+    var joinedParentsChildIDClosure: ((String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>)?
 
-    func joinedParents(roomID: String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError> {
-        joinedParentsRoomIDCallsCount += 1
-        joinedParentsRoomIDReceivedRoomID = roomID
+    func joinedParents(childID: String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError> {
+        joinedParentsChildIDCallsCount += 1
+        joinedParentsChildIDReceivedChildID = childID
         DispatchQueue.main.async {
-            self.joinedParentsRoomIDReceivedInvocations.append(roomID)
+            self.joinedParentsChildIDReceivedInvocations.append(childID)
         }
-        if let joinedParentsRoomIDClosure = joinedParentsRoomIDClosure {
-            return await joinedParentsRoomIDClosure(roomID)
+        if let joinedParentsChildIDClosure = joinedParentsChildIDClosure {
+            return await joinedParentsChildIDClosure(childID)
         } else {
-            return joinedParentsRoomIDReturnValue
+            return joinedParentsChildIDReturnValue
         }
     }
 }

ElementX/Sources/Mocks/SpaceServiceProxyMock.swift

@@ -22,7 +22,7 @@ extension SpaceServiceProxyMock {
         self.init()
         
         joinedSpacesPublisher = .init(configuration.joinedSpaces)
-        joinedParentsRoomIDReturnValue = .success(configuration.joinedParentSpaces)
+        joinedParentsChildIDReturnValue = .success(configuration.joinedParentSpaces)
         spaceRoomListSpaceIDClosure = { spaceID in
             if let spaceRoomList = configuration.spaceRoomLists[spaceID] {
                 .success(spaceRoomList)

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenModels.swift

@@ -7,7 +7,6 @@
 //
 
 import Foundation
-import MatrixRustSDK
 
 enum SecurityAndPrivacyScreenViewModelAction {
     case displayEditAddressScreen
@@ -39,14 +38,11 @@ struct SecurityAndPrivacyScreenViewState: BindableState {
     var canEditHistoryVisibility = false
     var joinedParentSpaces: [SpaceRoomProxyProtocol] = []
     
+    /// The count of the intersection between the set of joined parent spaces and the set of spaces in the current access type
     var selectableSpacesCount: Int {
         Set(joinedParentSpaces.map(\.id) + currentSettings.accessType.spaceIDs).count
     }
     
-    private var desiredJoinedParentSpaces: [SpaceRoomProxyProtocol] {
-        joinedParentSpaces.filter { bindings.desiredSettings.accessType.spaceIDs.contains($0.id) }
-    }
-    
     private var hasChanges: Bool {
         currentSettings != bindings.desiredSettings
     }
@@ -111,13 +107,9 @@ struct SecurityAndPrivacyScreenViewState: BindableState {
     var spaceSelection: SpaceSelection {
         if selectableSpacesCount > 1 {
             .multiple
-        } else if let desiredJoinedParent = desiredJoinedParentSpaces.first {
-            // The parent space is joined by the user and is also currently selected
-            .singleJoined(desiredJoinedParent)
         } else if let joinedParent = joinedParentSpaces.first {
-            // The parent space is joined by the user but is not currently selected
             .singleJoined(joinedParent)
-        } else if let unknownSpaceID = bindings.desiredSettings.accessType.spaceIDs.first {
+        } else if let unknownSpaceID = currentSettings.accessType.spaceIDs.first {
             // The space is not joined by the user but is currently selected
             .singleUnknown(id: unknownSpaceID)
         } else {

ElementX/Sources/Screens/SecurityAndPrivacyScreen/SecurityAndPrivacyScreenViewModel.swift

@@ -47,7 +47,7 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
         setupRoomDirectoryVisibility()
         setupSubscriptions()
         Task {
-            switch await clientProxy.spaceService.joinedParents(roomID: roomProxy.id) {
+            switch await clientProxy.spaceService.joinedParents(childID: roomProxy.id) {
             case .success(let joinedParentSpaces):
                 state.joinedParentSpaces = joinedParentSpaces
             case .failure:

ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift

@@ -242,7 +242,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
                                                  clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
                                                                                     spaceServiceConfiguration: .init(joinedParentSpaces: [space]))),
                                                  userIndicatorController: UserIndicatorControllerMock(),
-                                                 appSettings: AppSettings())
+                                                 appSettings: appSettings)
     }()
     
     static let multipleSpacesMembersViewModel = {
@@ -259,7 +259,7 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
                                                  clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
                                                                                     spaceServiceConfiguration: .init(joinedParentSpaces: spaces))),
                                                  userIndicatorController: UserIndicatorControllerMock(),
-                                                 appSettings: AppSettings())
+                                                 appSettings: appSettings)
     }()
     
     static let askToJoinViewModel = {

ElementX/Sources/Services/Spaces/SpaceServiceProxy.swift

@@ -49,11 +49,11 @@ class SpaceServiceProxy: SpaceServiceProxyProtocol {
         }
     }
     
-    func joinedParents(roomID: String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError> {
+    func joinedParents(childID: String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError> {
         do {
-            return try await .success(spaceService.joinedParentsOfChild(childId: roomID).map(SpaceRoomProxy.init))
+            return try await .success(spaceService.joinedParentsOfChild(childId: childID).map(SpaceRoomProxy.init))
         } catch {
-            MXLog.error("Failed to get joined parents for \(roomID): \(error)")
+            MXLog.error("Failed to get joined parents for \(childID): \(error)")
             return .failure(.sdkError(error))
         }
     }

ElementX/Sources/Services/Spaces/SpaceServiceProxyProtocol.swift

@@ -19,6 +19,6 @@ protocol SpaceServiceProxyProtocol {
     
     func spaceRoomList(spaceID: String) async -> Result<SpaceRoomListProxyProtocol, SpaceServiceProxyError>
     func leaveSpace(spaceID: String) async -> Result<LeaveSpaceHandleProxy, SpaceServiceProxyError>
-    /// Returns all the parent spaces of a room that user has joined.
-    func joinedParents(roomID: String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>
+    /// Returns all the parent spaces of a child that user has joined.
+    func joinedParents(childID: String) async -> Result<[SpaceRoomProxyProtocol], SpaceServiceProxyError>
 }