bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-10 00:06:22 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

[PM-26395] Hide "my items" collection when item is assigned to other collection (#6018)

Browse Source
This commit is contained in:
aj-rosado 2025-10-15 11:24:31 +01:00 committed by GitHub
parent b8482de96c
commit b8f4129691
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt
View File

@ -266,6 +266,8 @@ private fun UserState.Account.toAvailableOwners(
?.contains(collection.id))
?: (selectedCollectionId != null &&
collection.id == selectedCollectionId),
isDefaultUserCollection =
collection.type == CollectionType.DEFAULT_USER_COLLECTION,
)
},
)

2
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationContent.kt
View File

@ -64,7 +64,7 @@ fun VaultMoveToOrganizationContent(
}
collectionItemsSelector(
collectionList = state.selectedOrganization.collections,
collectionList = state.selectableCollections,
onCollectionSelect = collectionSelect,
isCollectionsTitleVisible = !showOnlyCollections,
)

22
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModel.kt
View File

@ -419,6 +419,28 @@ data class VaultMoveToOrganizationState(
val selectedOrganization: Organization
get() = organizations.first { it.id == selectedOrganizationId }
val selectableCollections: List<VaultCollection>
get() {
val collections = organizations
.first { it.id == selectedOrganizationId }
.collections
return collections.filter {
!it.isDefaultUserCollection ||
isDefaultUserCollectionSelected
}
}
private val isDefaultUserCollectionSelected: Boolean
get() =
cipherToMove
?.collectionIds
?.any { collectionId ->
selectedOrganization.collections.any {
it.id == collectionId && it.isDefaultUserCollection
}
}
?: false
/**
* Models an organization.
*

3
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationViewExtensions.kt
View File

@ -1,5 +1,6 @@
package com.x8bit.bitwarden.ui.vault.feature.movetoorganization.util
import com.bitwarden.collections.CollectionType
import com.bitwarden.collections.CollectionView
import com.bitwarden.ui.platform.resource.BitwardenString
import com.bitwarden.ui.util.asText
@ -55,6 +56,8 @@ fun Triple<CipherView?, List<CollectionView>, UserState?>.toViewState():
isSelected = currentCipher
.collectionIds
.contains(collection.id),
isDefaultUserCollection =
collection.type == CollectionType.DEFAULT_USER_COLLECTION,
)
},
)

2
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/model/VaultCollection.kt
View File

@ -9,10 +9,12 @@ import kotlinx.parcelize.Parcelize
* @property id the collection id.
* @property name the collection name.
* @property isSelected if the collection is selected or not.
* @property isDefaultUserCollection if the collection is the user default collection or not.
*/
@Parcelize
data class VaultCollection(
val id: String,
val name: String,
val isSelected: Boolean,
val isDefaultUserCollection: Boolean,
) : Parcelable

3
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt
View File

@ -2684,6 +2684,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
id = "mockCollectionId-2",
name = "mockCollectionName-2",
isSelected = false,
isDefaultUserCollection = false,
),
),
)
@ -4444,6 +4445,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
id = "mockCollectionId-new",
name = "mockCollectionName-new",
isSelected = true,
isDefaultUserCollection = false,
),
)
@ -4470,6 +4472,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
id = "mockCollectionId-2",
name = "mockCollectionName-2",
isSelected = false,
isDefaultUserCollection = false,
),
)

2
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt
View File

@ -4806,6 +4806,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
id = "mockId-1",
name = "mockName-1",
isSelected = isCollectionSelected,
isDefaultUserCollection = false,
),
)
} else {
@ -4823,6 +4824,7 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
id = "mockId-1",
name = "mockName-1",
isSelected = false,
isDefaultUserCollection = false,
),
)

16
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensionsTest.kt
View File

@ -524,7 +524,7 @@ class CipherViewExtensionsTest {
val expected = createSecureNoteViewState(
cipherView = mockCipherView,
availableOwners = listOf(ORGANIZATION_OWNER),
availableOwners = listOf(ORGANIZATION_OWNER_DEFAULT_COLLECTION),
availableFolders = listOf(NO_FOLDER_ITEM),
)
@ -803,6 +803,20 @@ private val ORGANIZATION_OWNER = VaultAddEditState.Owner(
id = "mockId-1",
name = "mockName-1",
isSelected = true,
isDefaultUserCollection = false,
),
),
)
private val ORGANIZATION_OWNER_DEFAULT_COLLECTION = VaultAddEditState.Owner(
id = "mockOrganizationId-1",
name = "organizationName",
collections = listOf(
VaultCollection(
id = "mockId-1",
name = "mockName-1",
isSelected = true,
isDefaultUserCollection = true,
),
),
)

2
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationScreenTest.kt
View File

@ -189,6 +189,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
id = "mockId-2",
name = "mockName-2",
isSelected = false,
isDefaultUserCollection = false,
),
),
),
@ -230,6 +231,7 @@ class VaultMoveToOrganizationScreenTest : BitwardenComposeTest() {
id = "mockId-1",
name = "mockName-1",
isSelected = true,
isDefaultUserCollection = false,
),
),
)

1
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationViewModelTest.kt
View File

@ -150,6 +150,7 @@ class VaultMoveToOrganizationViewModelTest : BaseViewModelTest() {
id = "mockId-1",
name = "mockName-1",
isSelected = true,
isDefaultUserCollection = false,
),
)
val expectedState = createVaultMoveToOrganizationState(

1
app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/util/VaultMoveToOrganizationTestUtil.kt
View File

@ -29,6 +29,7 @@ fun createMockOrganization(
id = "mockId-$number",
name = "mockName-$number",
isSelected = isCollectionSelected,
isDefaultUserCollection = false,
),
),
)