[PM-20115] Delete button visibility based on cipher permissions (#1495)

Author: andrebispo5

BitwardenShared/UI/Vault/VaultItem/CipherItemState.swift

@@ -136,25 +136,27 @@ struct CipherItemState: Equatable {
 
     /// Whether or not this item can be deleted by the user.
     var canBeDeleted: Bool {
-        // New permission model from PM-18091
-        if restrictCipherItemDeletionFlagEnabled, let cipherPermissions = cipher.permissions {
-            return cipherPermissions.delete
+        // backwards compatibility for old server versions
+        guard restrictCipherItemDeletionFlagEnabled, let cipherPermissions = cipher.permissions else {
+            guard !collectionIds.isEmpty else { return true }
+            return collections.contains { collection in
+                guard let id = collection.id else { return false }
+                return collection.manage && collectionIds.contains(id)
+            }
         }
 
-        guard !collectionIds.isEmpty else { return true }
-        return collections.contains { collection in
-            guard let id = collection.id else { return false }
-            return collection.manage && collectionIds.contains(id)
-        }
+        // New permission model from PM-18091
+        return cipherPermissions.delete
     }
 
     /// Whether or not this item can be restored by the user.
-    /// New permission model from PM-18091
-    var canBeRestoredPermission: Bool {
+    var canBeRestored: Bool {
         // backwards compatibility for old server versions
-        guard let cipherPermissions = cipher.permissions else {
+        guard restrictCipherItemDeletionFlagEnabled, let cipherPermissions = cipher.permissions else {
             return isSoftDeleted
         }
+
+        // New permission model from PM-18091
         return cipherPermissions.restore && isSoftDeleted
     }
 

BitwardenShared/UI/Vault/VaultItem/CipherItemStateTests.swift

@@ -157,8 +157,8 @@ class CipherItemStateTests: BitwardenTestCase {
         XCTAssertFalse(state.canBeDeleted)
     }
 
-    /// `canBeRestoredPermission` cipher permissions is nil fallback to isSoftDeleted
-    func test_canBeRestoredPermission_permissions_nil() throws {
+    /// `canBeRestored` cipher permissions is nil fallback to isSoftDeleted
+    func test_canBeRestored_permissions_nil() throws {
         var cipher = CipherView.loginFixture(
             collectionIds: ["1", "2"],
             deletedDate: nil,
@@ -167,7 +167,7 @@ class CipherItemStateTests: BitwardenTestCase {
         )
         var state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true))
         state.restrictCipherItemDeletionFlagEnabled = true
-        XCTAssertFalse(state.canBeRestoredPermission)
+        XCTAssertFalse(state.canBeRestored)
 
         cipher = CipherView.loginFixture(
             collectionIds: ["1", "2"],
@@ -176,12 +176,12 @@ class CipherItemStateTests: BitwardenTestCase {
             permissions: nil
         )
         state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true))
-        XCTAssertTrue(state.canBeRestoredPermission)
+        XCTAssertTrue(state.canBeRestored)
     }
 
-    /// `canBeRestoredPermission` returns value from cipher permissions if not nil
+    /// `canBeRestored` returns value from cipher permissions if not nil
     /// restore value true
-    func test_canBeRestoredPermission_true() throws {
+    func test_canBeRestored_true() throws {
         let cipher = CipherView.loginFixture(
             deletedDate: Date(),
             login: .fixture(),
@@ -192,12 +192,12 @@ class CipherItemStateTests: BitwardenTestCase {
         )
         var state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true))
         state.restrictCipherItemDeletionFlagEnabled = true
-        XCTAssertTrue(state.canBeRestoredPermission)
+        XCTAssertTrue(state.canBeRestored)
     }
 
-    /// `canBeRestoredPermission` returns value from cipher permissions if not nil
+    /// `canBeRestored` returns value from cipher permissions if not nil
     /// restore value false
-    func test_canBeRestoredPermission_false() throws {
+    func test_canBeRestored_false() throws {
         let cipher = CipherView.loginFixture(
             deletedDate: Date(),
             login: .fixture(),
@@ -208,7 +208,7 @@ class CipherItemStateTests: BitwardenTestCase {
         )
         var state = try XCTUnwrap(CipherItemState(existing: cipher, hasPremium: true))
         state.restrictCipherItemDeletionFlagEnabled = true
-        XCTAssertFalse(state.canBeRestoredPermission)
+        XCTAssertFalse(state.canBeRestored)
     }
 
     /// `restrictCipherItemDeletionFlagEnable` default value is false

BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemState.swift

@@ -79,11 +79,12 @@ extension ViewItemState {
         hasPremium: Bool,
         restrictCipherItemDeletionFlagEnabled: Bool
     ) {
-        guard let cipherItemState = CipherItemState(
+        guard var cipherItemState = CipherItemState(
             existing: cipherView,
             hasMasterPassword: hasMasterPassword,
             hasPremium: hasPremium
         ) else { return nil }
+        cipherItemState.restrictCipherItemDeletionFlagEnabled = restrictCipherItemDeletionFlagEnabled
         self.init(loadingState: .data(cipherItemState))
         self.hasMasterPassword = hasMasterPassword
         hasPremiumFeatures = cipherItemState.accountHasPremium

BitwardenShared/UI/Vault/VaultItem/ViewItem/ViewItemView.swift

@@ -25,8 +25,8 @@ struct ViewItemView: View {
 
     /// Whether the restore option is available.
     /// New permission model from PM-18091
-    var isRestoredPermissionEnabled: Bool {
-        store.state.loadingState.data?.canBeRestoredPermission ?? false
+    var isRestoredEnabled: Bool {
+        store.state.loadingState.data?.canBeRestored ?? false
     }
 
     /// Whether to show the move to organization option in the toolbar menu.
@@ -68,10 +68,7 @@ struct ViewItemView: View {
 
             ToolbarItemGroup(placement: .navigationBarTrailing) {
                 if let state = store.state.loadingState.data {
-                    let restoreButtonVisible = store.state.restrictCipherItemDeletionFlagEnabled
-                        ? isRestoredPermissionEnabled
-                        : state.isSoftDeleted
-                    if restoreButtonVisible {
+                    if isRestoredEnabled {
                         toolbarButton(Localizations.restore) {
                             await store.perform(.restorePressed)
                         }