[PM-25993] Automatically select default collection on adding a new cipher (#1973)

Author: fedemkr

BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemProcessor.swift

@@ -301,7 +301,12 @@ final class AddEditItemProcessor: StateProcessor<// swiftlint:disable:this type_
                 state.owner = ownershipOptions.first
             }
 
-            if !state.configuration.isAdding {
+            if state.configuration.isAdding {
+                let defaultCollection = state.collectionsForOwner.first(where: { $0.type == .defaultUserCollection })
+                if let defaultCollectionId = defaultCollection?.id, state.collectionIds.isEmpty {
+                    state.collectionIds.append(defaultCollectionId)
+                }
+            } else {
                 await services.eventService.collect(eventType: .cipherClientViewed, cipherId: state.cipher.id)
             }
         } catch {

BitwardenShared/UI/Vault/VaultItem/AddEditItem/AddEditItemProcessorTests.swift

@@ -1128,6 +1128,134 @@ class AddEditItemProcessorTests: BitwardenTestCase {
         XCTAssertTrue(subject.state.canAssignToCollection)
     }
 
+    /// `perform(_:)` with `.fetchCipherOptions` fetches the ownership options for a cipher from the repository
+    /// and selects the default user collection when there's any on adding mode.
+    @MainActor
+    func test_perform_fetchCipherOptions_defaultUserCollection() async {
+        let collections: [CollectionView] = [
+            .fixture(id: "1", name: "Design", organizationId: "1"),
+            .fixture(id: "2", name: "Engineering", organizationId: "1", type: .defaultUserCollection),
+            .fixture(id: "3", name: "Platform", organizationId: "1"),
+        ]
+
+        policyService.policyAppliesToUserResult[.personalOwnership] = true
+        vaultRepository.fetchCipherOwnershipOptions = [.organization(id: "1", name: "OrgTest")]
+        vaultRepository.fetchCollectionsResult = .success(collections)
+
+        await subject.perform(.fetchCipherOptions)
+
+        XCTAssertEqual(subject.state.allUserCollections, collections)
+        XCTAssertEqual(subject.state.ownershipOptions, [.organization(id: "1", name: "OrgTest")])
+        XCTAssertEqual(subject.state.collectionIds, ["2"])
+    }
+
+    /// `perform(_:)` with `.fetchCipherOptions` fetches the ownership options for a cipher from the repository
+    /// and selects the first default user collection when there are multiple on adding mode.
+    /// This shouldn't actually happen, but just in case check that the first one is selected.
+    @MainActor
+    func test_perform_fetchCipherOptions_defaultUserCollectionMultiple() async {
+        let collections: [CollectionView] = [
+            .fixture(id: "1", name: "Design", organizationId: "1"),
+            .fixture(id: "2", name: "Engineering", organizationId: "1", type: .defaultUserCollection),
+            .fixture(id: "3", name: "Platform", organizationId: "1", type: .defaultUserCollection),
+        ]
+
+        policyService.policyAppliesToUserResult[.personalOwnership] = true
+        vaultRepository.fetchCipherOwnershipOptions = [.organization(id: "1", name: "OrgTest")]
+        vaultRepository.fetchCollectionsResult = .success(collections)
+
+        await subject.perform(.fetchCipherOptions)
+
+        XCTAssertEqual(subject.state.allUserCollections, collections)
+        XCTAssertEqual(subject.state.ownershipOptions, [.organization(id: "1", name: "OrgTest")])
+        XCTAssertEqual(subject.state.collectionIds, ["2"])
+    }
+
+    /// `perform(_:)` with `.fetchCipherOptions` fetches the ownership options for a cipher from the repository
+    /// and doesn't select the default user collection when there isn't any on adding mode.
+    @MainActor
+    func test_perform_fetchCipherOptions_defaultUserCollectionNotFound() async {
+        let collections: [CollectionView] = [
+            .fixture(id: "1", name: "Design", organizationId: "1", type: .sharedCollection),
+            .fixture(id: "2", name: "Engineering", organizationId: "1", type: .sharedCollection),
+        ]
+
+        policyService.policyAppliesToUserResult[.personalOwnership] = true
+        vaultRepository.fetchCipherOwnershipOptions = [.organization(id: "1", name: "OrgTest")]
+        vaultRepository.fetchCollectionsResult = .success(collections)
+
+        await subject.perform(.fetchCipherOptions)
+
+        XCTAssertEqual(subject.state.allUserCollections, collections)
+        XCTAssertEqual(subject.state.ownershipOptions, [.organization(id: "1", name: "OrgTest")])
+        XCTAssertEqual(subject.state.collectionIds, [])
+    }
+
+    /// `perform(_:)` with `.fetchCipherOptions` fetches the ownership options for a cipher from the repository
+    /// and doesn't select the default user collection when personal ownership policy is disabled.
+    @MainActor
+    func test_perform_fetchCipherOptions_defaultUserCollectionPersonalOwnershipDisabled() async {
+        let collections: [CollectionView] = [
+            .fixture(id: "1", name: "Design", organizationId: "1", type: .defaultUserCollection),
+            .fixture(id: "2", name: "Engineering", organizationId: "1", type: .sharedCollection),
+        ]
+
+        policyService.policyAppliesToUserResult[.personalOwnership] = false
+        vaultRepository.fetchCipherOwnershipOptions = [.organization(id: "1", name: "OrgTest")]
+        vaultRepository.fetchCollectionsResult = .success(collections)
+
+        await subject.perform(.fetchCipherOptions)
+
+        XCTAssertEqual(subject.state.allUserCollections, collections)
+        XCTAssertEqual(subject.state.ownershipOptions, [.organization(id: "1", name: "OrgTest")])
+        XCTAssertEqual(subject.state.collectionIds, [])
+    }
+
+    /// `perform(_:)` with `.fetchCipherOptions` fetches the ownership options for a cipher from the repository
+    /// and doesn't select the default user collection when it has `nil` ID.
+    @MainActor
+    func test_perform_fetchCipherOptions_defaultUserCollectionIDNil() async {
+        let collections: [CollectionView] = [
+            .fixture(id: nil, name: "Design", organizationId: "1", type: .defaultUserCollection),
+            .fixture(id: "2", name: "Engineering", organizationId: "1"),
+        ]
+
+        policyService.policyAppliesToUserResult[.personalOwnership] = true
+        vaultRepository.fetchCipherOwnershipOptions = [.organization(id: "1", name: "OrgTest")]
+        vaultRepository.fetchCollectionsResult = .success(collections)
+
+        await subject.perform(.fetchCipherOptions)
+
+        XCTAssertEqual(subject.state.allUserCollections, collections)
+        XCTAssertEqual(subject.state.ownershipOptions, [.organization(id: "1", name: "OrgTest")])
+        XCTAssertEqual(subject.state.collectionIds, [])
+    }
+
+    /// `perform(_:)` with `.fetchCipherOptions` fetches the ownership options for a cipher from the repository
+    /// and doesn't select the default user collection when it's editing a cipher instead of adding.
+    @MainActor
+    func test_perform_fetchCipherOptions_defaultUserCollectionEditing() async throws {
+        subject.state = try XCTUnwrap(CipherItemState(
+            existing: CipherView.fixture(),
+            hasPremium: false
+        ))
+
+        let collections: [CollectionView] = [
+            .fixture(id: "1", name: "Design", organizationId: "1", type: .defaultUserCollection),
+            .fixture(id: "2", name: "Engineering", organizationId: "1"),
+        ]
+
+        policyService.policyAppliesToUserResult[.personalOwnership] = true
+        vaultRepository.fetchCipherOwnershipOptions = [.organization(id: "1", name: "OrgTest")]
+        vaultRepository.fetchCollectionsResult = .success(collections)
+
+        await subject.perform(.fetchCipherOptions)
+
+        XCTAssertEqual(subject.state.allUserCollections, collections)
+        XCTAssertEqual(subject.state.ownershipOptions, [.organization(id: "1", name: "OrgTest")])
+        XCTAssertEqual(subject.state.collectionIds, [])
+    }
+
     /// `perform(_:)` with `.savePressed` displays an alert if name field is invalid.
     @MainActor
     func test_perform_savePressed_invalidName() async throws {