[PM-15113] Disable add button in SSH Keys screen (#4364)

bitwarden · Nov 22, 2024 · 76b6853 · 76b6853
1 parent 89935ac
commit 76b6853
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 1 deletion.
diff --git a/...c/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt b/...c/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt
@@ -2084,7 +2084,7 @@ data class VaultItemListingState(
              */
             data object SshKey : Vault() {
                 override val titleText: Text get() = R.string.ssh_keys.asText()
-                override val hasFab: Boolean get() = true
+                override val hasFab: Boolean get() = false
             }
 
             /**

diff --git a/...a/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt b/...a/com/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensions.kt
@@ -200,6 +200,7 @@ fun VaultData.toViewState(
         val shouldShowAddButton = when (itemListingType) {
             is VaultItemListingState.ItemListingType.Vault.Folder,
             VaultItemListingState.ItemListingType.Vault.Trash,
+            VaultItemListingState.ItemListingType.Vault.SshKey,
                 -> false
 
             else -> true

diff --git a/.../test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt b/.../test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt
@@ -648,6 +648,16 @@ class VaultItemListingScreenTest : BaseComposeTest() {
             )
         }
 
+        composeTestRule
+            .onNodeWithContentDescription("Add item")
+            .assertDoesNotExist()
+
+        mutableStateFlow.update {
+            it.copy(
+                itemListingType = VaultItemListingState.ItemListingType.Vault.SshKey,
+            )
+        }
+
         composeTestRule
             .onNodeWithContentDescription("Add item")
             .assertDoesNotExist()

diff --git a/...m/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt b/...m/x8bit/bitwarden/ui/vault/feature/itemlisting/util/VaultItemListingDataExtensionsTest.kt
@@ -729,6 +729,28 @@ class VaultItemListingDataExtensionsTest {
             ),
         )
 
+        // SSH keys
+        assertEquals(
+            VaultItemListingState.ViewState.NoItems(
+                header = R.string.save_and_protect_your_data.asText(),
+                message = R.string.no_items.asText(),
+                shouldShowAddButton = false,
+                buttonText = R.string.add_an_item.asText(),
+            ),
+            vaultData.toViewState(
+                itemListingType = VaultItemListingState.ItemListingType.Vault.SshKey,
+                vaultFilterType = VaultFilterType.AllVaults,
+                hasMasterPassword = true,
+                baseIconUrl = Environment.Us.environmentUrlData.baseIconUrl,
+                isIconLoadingDisabled = false,
+                autofillSelectionData = null,
+                fido2CreationData = null,
+                fido2CredentialAutofillViews = null,
+                totpData = null,
+                isPremiumUser = true,
+            ),
+        )
+
         // Other ciphers
         assertEquals(
             VaultItemListingState.ViewState.NoItems(