From 7ae427e713733f43f4d916b1208aa990e39fd54c Mon Sep 17 00:00:00 2001
From: SmithThe4th <gsmith@bitwarden.com>
Date: Thu, 19 Sep 2024 13:27:08 -0400
Subject: [PATCH] Revert "[PM-11200] Move delete item permission to Can Manage
 (#10890)" (#11155)

* Revert "[PM-11200] Move delete item permission to Can Manage (#10890)"

This reverts commit 8921230b4f5f33d0948572e47261604a6a3d731e.

* Removed provider access
---
 .../vault-cipher-row.component.html           |  2 +-
 .../vault-items/vault-cipher-row.component.ts |  1 -
 .../vault-items/vault-items.component.html    |  3 --
 .../vault-items/vault-items.component.ts      | 39 ++++---------------
 .../individual-vault/vault.component.html     |  1 -
 5 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index 6a04ff6071..524d9dff20 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -157,7 +157,7 @@
     </button>
     <button
       bitMenuItem
-      *ngIf="canManageCollection || !vaultBulkManagementActionEnabled"
+      *ngIf="canEditCipher || !vaultBulkManagementActionEnabled"
       (click)="deleteCipher()"
       type="button"
     >
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
index be111de6a5..72d6a57aad 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.ts
@@ -36,7 +36,6 @@ export class VaultCipherRowComponent implements OnInit {
   @Input() viewingOrgVault: boolean;
   @Input() canEditCipher: boolean;
   @Input() vaultBulkManagementActionEnabled: boolean;
-  @Input() canManageCollection: boolean;
 
   @Output() onEvent = new EventEmitter<VaultItemEvent>();
 
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.html b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
index 7b427d2f12..de7bc0ec16 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.html
@@ -132,9 +132,6 @@
           [collections]="allCollections"
           [checked]="selection.isSelected(item)"
           [canEditCipher]="canEditCipher(item.cipher) && vaultBulkManagementActionEnabled"
-          [canManageCollection]="
-            canManageCollection(item.cipher) && vaultBulkManagementActionEnabled
-          "
           [vaultBulkManagementActionEnabled]="vaultBulkManagementActionEnabled"
           (checkedToggled)="selection.toggle(item)"
           (onEvent)="event($event)"
diff --git a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
index 05f32b22ab..6ac19b7565 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-items.component.ts
@@ -47,7 +47,6 @@ export class VaultItemsComponent {
   @Input() addAccessStatus: number;
   @Input() addAccessToggle: boolean;
   @Input() vaultBulkManagementActionEnabled = false;
-  @Input() activeCollection: CollectionView | undefined;
 
   private _ciphers?: CipherView[] = [];
   @Input() get ciphers(): CipherView[] {
@@ -215,33 +214,6 @@ export class VaultItemsComponent {
     return (organization.canEditAllCiphers && this.viewingOrgVault) || cipher.edit;
   }
 
-  protected canManageCollection(cipher: CipherView) {
-    if (cipher.organizationId == null) {
-      return true;
-    }
-
-    // Check for admin access in AC vault
-    if (this.showAdminActions) {
-      const organization = this.allOrganizations.find((o) => o.id === cipher.organizationId);
-
-      if (organization?.permissions.editAnyCollection) {
-        return true;
-      }
-
-      if (organization?.allowAdminAccessToAllCollectionItems && organization.isAdmin) {
-        return true;
-      }
-    }
-
-    if (this.activeCollection) {
-      return this.activeCollection.manage;
-    }
-
-    return this.allCollections
-      .filter((c) => cipher.collectionIds.includes(c.id))
-      .some((collection) => collection.manage);
-  }
-
   private refreshItems() {
     const collections: VaultItem[] = this.collections.map((collection) => ({ collection }));
     const ciphers: VaultItem[] = this.ciphers.map((cipher) => ({ cipher }));
@@ -317,16 +289,19 @@ export class VaultItemsComponent {
 
     const hasPersonalItems = this.hasPersonalItems();
     const uniqueCipherOrgIds = this.getUniqueOrganizationIds();
+    const organizations = Array.from(uniqueCipherOrgIds, (orgId) =>
+      this.allOrganizations.find((o) => o.id === orgId),
+    );
 
-    const canManageCollectionCiphers = this.selection.selected
-      .filter((item) => item.cipher)
-      .every(({ cipher }) => this.canManageCollection(cipher));
+    const canEditOrManageAllCiphers =
+      organizations.length > 0 && organizations.every((org) => org?.canEditAllCiphers);
 
     const canDeleteCollections = this.selection.selected
       .filter((item) => item.collection)
       .every((item) => item.collection && this.canDeleteCollection(item.collection));
 
-    const userCanDeleteAccess = canManageCollectionCiphers && canDeleteCollections;
+    const userCanDeleteAccess =
+      (canEditOrManageAllCiphers || this.allCiphersHaveEditAccess()) && canDeleteCollections;
 
     if (
       userCanDeleteAccess ||
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 7e49bbbdb9..b19a4509c1 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -57,7 +57,6 @@
       [showBulkAddToCollections]="vaultBulkManagementActionEnabled$ | async"
       (onEvent)="onVaultItemsEvent($event)"
       [vaultBulkManagementActionEnabled]="vaultBulkManagementActionEnabled$ | async"
-      [activeCollection]="selectedCollection?.node"
     >
     </app-vault-items>
     <div