mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 16:10:20 +00:00
implemented a way to update the desired setting after pressing done, and added tests
This commit is contained in:
+5
-3
@@ -5,6 +5,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Combine
|
||||||
import Foundation
|
import Foundation
|
||||||
|
|
||||||
enum ManageAuthorizedSpacesScreenViewModelAction {
|
enum ManageAuthorizedSpacesScreenViewModelAction {
|
||||||
@@ -16,7 +17,7 @@ struct ManageAuthorizedSpacesScreenViewState: BindableState {
|
|||||||
var desiredSelectedIDs: Set<String>
|
var desiredSelectedIDs: Set<String>
|
||||||
|
|
||||||
var hasChanges: Bool {
|
var hasChanges: Bool {
|
||||||
authorizedSpacesSelection.selectedIDs != desiredSelectedIDs
|
authorizedSpacesSelection.currentSelectedIDs != desiredSelectedIDs
|
||||||
}
|
}
|
||||||
|
|
||||||
var isDoneButtonDisabled: Bool {
|
var isDoneButtonDisabled: Bool {
|
||||||
@@ -25,7 +26,7 @@ struct ManageAuthorizedSpacesScreenViewState: BindableState {
|
|||||||
|
|
||||||
init(authorizedSpacesSelection: AuthorizedSpacesSelection) {
|
init(authorizedSpacesSelection: AuthorizedSpacesSelection) {
|
||||||
self.authorizedSpacesSelection = authorizedSpacesSelection
|
self.authorizedSpacesSelection = authorizedSpacesSelection
|
||||||
desiredSelectedIDs = authorizedSpacesSelection.selectedIDs
|
desiredSelectedIDs = authorizedSpacesSelection.currentSelectedIDs
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -38,5 +39,6 @@ enum ManageAuthorizedSpacesScreenViewAction {
|
|||||||
struct AuthorizedSpacesSelection {
|
struct AuthorizedSpacesSelection {
|
||||||
let joinedParentSpaces: [SpaceRoomProxyProtocol]
|
let joinedParentSpaces: [SpaceRoomProxyProtocol]
|
||||||
let unknownSpacesIDs: [String]
|
let unknownSpacesIDs: [String]
|
||||||
let selectedIDs: Set<String>
|
let currentSelectedIDs: Set<String>
|
||||||
|
let desiredSelectIDs: PassthroughSubject<Set<String>, Never> = .init()
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -30,8 +30,8 @@ class ManageAuthorizedSpacesScreenViewModel: ManageAuthorizedSpacesScreenViewMod
|
|||||||
case .cancel:
|
case .cancel:
|
||||||
actionsSubject.send(.dismiss)
|
actionsSubject.send(.dismiss)
|
||||||
case .done:
|
case .done:
|
||||||
// TODO: Implement
|
state.authorizedSpacesSelection.desiredSelectIDs.send(state.desiredSelectedIDs)
|
||||||
break
|
actionsSubject.send(.dismiss)
|
||||||
case .toggle(let spaceID):
|
case .toggle(let spaceID):
|
||||||
if state.desiredSelectedIDs.contains(spaceID) {
|
if state.desiredSelectedIDs.contains(spaceID) {
|
||||||
state.desiredSelectedIDs.remove(spaceID)
|
state.desiredSelectedIDs.remove(spaceID)
|
||||||
|
|||||||
+3
-3
@@ -104,9 +104,9 @@ struct ManageAuthorizedSpacesScreen_Previews: PreviewProvider, TestablePreview {
|
|||||||
unknownSpacesIDs: ["!unknown-space-id-1",
|
unknownSpacesIDs: ["!unknown-space-id-1",
|
||||||
"!unknown-space-id-2",
|
"!unknown-space-id-2",
|
||||||
"!unknown-space-id-3"],
|
"!unknown-space-id-3"],
|
||||||
selectedIDs: ["space1",
|
currentSelectedIDs: ["space1",
|
||||||
"space3",
|
"space3",
|
||||||
"!unknown-space-id-2"]),
|
"!unknown-space-id-2"]),
|
||||||
mediaProvider: MediaProviderMock(configuration: .init()))
|
mediaProvider: MediaProviderMock(configuration: .init()))
|
||||||
|
|
||||||
static var previews: some View {
|
static var previews: some View {
|
||||||
|
|||||||
+11
-4
@@ -252,12 +252,19 @@ class SecurityAndPrivacyScreenViewModel: SecurityAndPrivacyScreenViewModelType,
|
|||||||
private func displayManageAuthorizedSpacesScreen() {
|
private func displayManageAuthorizedSpacesScreen() {
|
||||||
let joinedParentSpaces = state.joinedParentSpaces
|
let joinedParentSpaces = state.joinedParentSpaces
|
||||||
let unknownSpaceIDs = state.currentSettings.accessType.spaceIDs.filter { id in
|
let unknownSpaceIDs = state.currentSettings.accessType.spaceIDs.filter { id in
|
||||||
!joinedParentSpaces.contains(where: { $0.id == id })
|
!joinedParentSpaces.contains { $0.id == id }
|
||||||
}
|
}
|
||||||
let selectedIDs = Set(state.bindings.desiredSettings.accessType.spaceIDs)
|
let selectedIDs = Set(state.bindings.desiredSettings.accessType.spaceIDs)
|
||||||
actionsSubject.send(.displayManageAuthorizedSpacesScreen(.init(joinedParentSpaces: joinedParentSpaces,
|
let authorizedSpacesSelection = AuthorizedSpacesSelection(joinedParentSpaces: joinedParentSpaces,
|
||||||
unknownSpacesIDs: unknownSpaceIDs,
|
unknownSpacesIDs: unknownSpaceIDs,
|
||||||
selectedIDs: selectedIDs)))
|
currentSelectedIDs: selectedIDs)
|
||||||
|
authorizedSpacesSelection.desiredSelectIDs
|
||||||
|
.sink { [weak self] desiredSelectedIDs in
|
||||||
|
self?.state.bindings.desiredSettings.accessType = .spaceUsers(spaceIDs: desiredSelectedIDs.sorted())
|
||||||
|
}
|
||||||
|
.store(in: &cancellables)
|
||||||
|
|
||||||
|
actionsSubject.send(.displayManageAuthorizedSpacesScreen(authorizedSpacesSelection))
|
||||||
}
|
}
|
||||||
|
|
||||||
private static let loadingIndicatorIdentifier = "\(EditRoomAddressScreenViewModel.self)-Loading"
|
private static let loadingIndicatorIdentifier = "\(EditRoomAddressScreenViewModel.self)-Loading"
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
// Please see LICENSE files in the repository root for full details.
|
// Please see LICENSE files in the repository root for full details.
|
||||||
//
|
//
|
||||||
|
|
||||||
|
import Combine
|
||||||
import MatrixRustSDK
|
import MatrixRustSDK
|
||||||
import XCTest
|
import XCTest
|
||||||
|
|
||||||
@@ -88,6 +89,96 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testMultipleKnownSpacesMembersSelection() async throws {
|
||||||
|
let spaces = [SpaceRoomProxyProtocol].mockJoinedSpaces2
|
||||||
|
setupViewModel(isSpaceSettingsEnabled: true, joinedParentSpaces: spaces, joinRule: .public)
|
||||||
|
|
||||||
|
let deferred = deferFulfillment(context.$viewState) { $0.joinedParentSpaces.count == 3 }
|
||||||
|
try await deferred.fulfill()
|
||||||
|
|
||||||
|
XCTAssertEqual(context.viewState.currentSettings.accessType, .anyone)
|
||||||
|
XCTAssertTrue(context.viewState.isSaveDisabled)
|
||||||
|
XCTAssertTrue(context.viewState.isSpaceMembersOptionSelectable)
|
||||||
|
guard case .multiple = context.viewState.spaceSelection else {
|
||||||
|
XCTFail("Expected spaceSelection to be .singleSpace")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var desiredSpaceIDs: PassthroughSubject<Set<String>, Never>!
|
||||||
|
let deferredAction = deferFulfillment(viewModel.actionsPublisher) { action in
|
||||||
|
switch action {
|
||||||
|
case .displayManageAuthorizedSpacesScreen(let authorizedSpacesSelection):
|
||||||
|
defer { desiredSpaceIDs = authorizedSpacesSelection.desiredSelectIDs }
|
||||||
|
return authorizedSpacesSelection.joinedParentSpaces.map(\.id) == spaces.map(\.id) &&
|
||||||
|
authorizedSpacesSelection.unknownSpacesIDs.isEmpty &&
|
||||||
|
authorizedSpacesSelection.currentSelectedIDs.isEmpty
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
context.send(viewAction: .selectedSpaceMembersAccess)
|
||||||
|
try await deferredAction.fulfill()
|
||||||
|
desiredSpaceIDs.send([spaces[0].id])
|
||||||
|
XCTAssertEqual(context.desiredSettings.accessType, .spaceUsers(spaceIDs: [spaces[0].id]))
|
||||||
|
XCTAssertNotNil(context.viewState.accessSectionFooter)
|
||||||
|
XCTAssertFalse(context.viewState.isSaveDisabled)
|
||||||
|
|
||||||
|
let expectation = expectation(description: "Join rule has updated")
|
||||||
|
roomProxy.updateJoinRuleClosure = { value in
|
||||||
|
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomId: spaces[0].id)]))
|
||||||
|
expectation.fulfill()
|
||||||
|
return .success(())
|
||||||
|
}
|
||||||
|
context.send(viewAction: .save)
|
||||||
|
await fulfillment(of: [expectation])
|
||||||
|
}
|
||||||
|
|
||||||
|
func testMultipleSpacesMembersSelection() async throws {
|
||||||
|
let spaces = [SpaceRoomProxyProtocol].mockJoinedSpaces2
|
||||||
|
setupViewModel(isSpaceSettingsEnabled: true,
|
||||||
|
joinedParentSpaces: spaces,
|
||||||
|
joinRule: .restricted(rules: [.roomMembership(roomId: "unknownSpaceID")]))
|
||||||
|
|
||||||
|
let deferred = deferFulfillment(context.$viewState) { $0.selectableSpacesCount == 4 }
|
||||||
|
try await deferred.fulfill()
|
||||||
|
|
||||||
|
XCTAssertTrue(context.viewState.currentSettings.accessType.isSpaceUsers)
|
||||||
|
XCTAssertTrue(context.viewState.isSaveDisabled)
|
||||||
|
XCTAssertTrue(context.viewState.isSpaceMembersOptionSelectable)
|
||||||
|
guard case .multiple = context.viewState.spaceSelection else {
|
||||||
|
XCTFail("Expected spaceSelection to be .singleSpace")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
var desiredSpaceIDs: PassthroughSubject<Set<String>, Never>!
|
||||||
|
let deferredAction = deferFulfillment(viewModel.actionsPublisher) { action in
|
||||||
|
switch action {
|
||||||
|
case .displayManageAuthorizedSpacesScreen(let authorizedSpacesSelection):
|
||||||
|
defer { desiredSpaceIDs = authorizedSpacesSelection.desiredSelectIDs }
|
||||||
|
return authorizedSpacesSelection.joinedParentSpaces.map(\.id) == spaces.map(\.id) &&
|
||||||
|
authorizedSpacesSelection.unknownSpacesIDs == ["unknownSpaceID"] &&
|
||||||
|
authorizedSpacesSelection.currentSelectedIDs == ["unknownSpaceID"]
|
||||||
|
default:
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
context.send(viewAction: .manageSpaces)
|
||||||
|
try await deferredAction.fulfill()
|
||||||
|
desiredSpaceIDs.send([spaces[0].id, "unknownSpaceID"])
|
||||||
|
XCTAssertEqual(context.desiredSettings.accessType, .spaceUsers(spaceIDs: [spaces[0].id, "unknownSpaceID"]))
|
||||||
|
XCTAssertNotNil(context.viewState.accessSectionFooter)
|
||||||
|
XCTAssertFalse(context.viewState.isSaveDisabled)
|
||||||
|
|
||||||
|
let expectation = expectation(description: "Join rule has updated")
|
||||||
|
roomProxy.updateJoinRuleClosure = { value in
|
||||||
|
XCTAssertEqual(value, .restricted(rules: [.roomMembership(roomId: spaces[0].id), .roomMembership(roomId: "unknownSpaceID")]))
|
||||||
|
expectation.fulfill()
|
||||||
|
return .success(())
|
||||||
|
}
|
||||||
|
context.send(viewAction: .save)
|
||||||
|
await fulfillment(of: [expectation])
|
||||||
|
}
|
||||||
|
|
||||||
func testSave() async throws {
|
func testSave() async throws {
|
||||||
setupViewModel(isSpaceSettingsEnabled: false, joinedParentSpaces: [], joinRule: .public)
|
setupViewModel(isSpaceSettingsEnabled: false, joinedParentSpaces: [], joinRule: .public)
|
||||||
|
|
||||||
@@ -110,7 +201,14 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
|
|||||||
|
|
||||||
XCTAssertNotNil(context.alertInfo)
|
XCTAssertNotNil(context.alertInfo)
|
||||||
|
|
||||||
let deferred = deferFulfillment(viewModel.actionsPublisher) { $0 == .dismiss }
|
let deferred = deferFulfillment(viewModel.actionsPublisher) {
|
||||||
|
switch $0 {
|
||||||
|
case .dismiss:
|
||||||
|
true
|
||||||
|
default:
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
context.alertInfo?.secondaryButton?.action?() // Discard
|
context.alertInfo?.secondaryButton?.action?() // Discard
|
||||||
try await deferred.fulfill()
|
try await deferred.fulfill()
|
||||||
}
|
}
|
||||||
@@ -125,7 +223,14 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
|
|||||||
|
|
||||||
XCTAssertNotNil(context.alertInfo)
|
XCTAssertNotNil(context.alertInfo)
|
||||||
|
|
||||||
let deferred = deferFulfillment(viewModel.actionsPublisher) { $0 == .dismiss }
|
let deferred = deferFulfillment(viewModel.actionsPublisher) {
|
||||||
|
switch $0 {
|
||||||
|
case .dismiss:
|
||||||
|
true
|
||||||
|
default:
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
context.alertInfo?.primaryButton.action?() // Save
|
context.alertInfo?.primaryButton.action?() // Save
|
||||||
try await deferred.fulfill()
|
try await deferred.fulfill()
|
||||||
}
|
}
|
||||||
@@ -160,6 +265,7 @@ class SecurityAndPrivacyScreenViewModelTests: XCTestCase {
|
|||||||
joinRule: joinRule,
|
joinRule: joinRule,
|
||||||
isVisibleInPublicDirectory: true))
|
isVisibleInPublicDirectory: true))
|
||||||
roomProxy.updateJoinRuleReturnValue = .success(())
|
roomProxy.updateJoinRuleReturnValue = .success(())
|
||||||
|
roomProxy.updateRoomDirectoryVisibilityReturnValue = .success(())
|
||||||
|
|
||||||
viewModel = SecurityAndPrivacyScreenViewModel(roomProxy: roomProxy,
|
viewModel = SecurityAndPrivacyScreenViewModel(roomProxy: roomProxy,
|
||||||
clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
|
clientProxy: ClientProxyMock(.init(userIDServerName: "matrix.org",
|
||||||
|
|||||||
Reference in New Issue
Block a user