From f1b4783ab84a7153a1315d30f0ca63b3be9898a6 Mon Sep 17 00:00:00 2001
From: jng <jng@bitwarden.com>
Date: Thu, 19 Sep 2024 20:51:37 -0400
Subject: [PATCH] added logic around bulk access menu assign to collections.
 extra logic for the Edit and Delete as well for sub collections and items

---
 .../vault-items/vault-items.component.html    |  4 +-
 .../vault-items/vault-items.component.ts      | 43 +++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

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 8ef993baff..5494b0437c 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
@@ -52,7 +52,9 @@
             </button>
             <button
               *ngIf="
-                (showAdminActions || showAssignToCollections()) && bulkAssignToCollectionsAllowed
+                canAssignSelected &&
+                (showAdminActions || showAssignToCollections()) &&
+                bulkAssignToCollectionsAllowed
               "
               type="button"
               bitMenuItem
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 9161369cfd..68bf9bf519 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
@@ -74,13 +74,18 @@ export class VaultItemsComponent {
   protected selection = new SelectionModel<VaultItem>(true, [], true);
 
   // Only show Edit Access from Bulk Menu if all selected collections can be managed
+  // And no items selected
   // Or Custom User with Edit All permissions
   get canEditSelected() {
     const filteredSelectedItems = this.selection.selected.filter((item) => {
-      const organization = this.allOrganizations.find(
-        (o) => o.id === item.collection.organizationId,
-      );
-      return !item.collection.canEdit(organization);
+      if (item.collection) {
+        const organization = this.allOrganizations.find(
+          (o) => o.id === item.collection.organizationId,
+        );
+        return !item.collection.canEdit(organization);
+      } else if (item.cipher) {
+        return true;
+      }
     });
     if (filteredSelectedItems.length > 0) {
       return false;
@@ -92,10 +97,32 @@ export class VaultItemsComponent {
   // Or Custom User with Delete All permissions
   get canDeleteSelected() {
     const filteredSelectedItems = this.selection.selected.filter((item) => {
-      const organization = this.allOrganizations.find(
-        (o) => o.id === item.collection.organizationId,
-      );
-      return item.collection.canEdit(organization) && !item.collection.canDelete(organization);
+      if (item.collection) {
+        const organization = this.allOrganizations.find(
+          (o) => o.id === item.collection.organizationId,
+        );
+        return item.collection?.canEdit(organization) && !item.collection?.canDelete(organization);
+      } else if (item.cipher) {
+        return !item.cipher.edit;
+      }
+    });
+
+    if (filteredSelectedItems.length > 0) {
+      return false;
+    }
+    return true;
+  }
+
+  // Only show Assign To Collections from Bulk Menu if all selected items can be managed
+  // And no collections selected
+  // Or Custom User with Delete All permissions
+  get canAssignSelected() {
+    const filteredSelectedItems = this.selection.selected.filter((item) => {
+      if (item.collection) {
+        return true;
+      } else if (item.cipher) {
+        return !item.cipher.edit;
+      }
     });
 
     if (filteredSelectedItems.length > 0) {