From 572e6e7ee22d15745aeb1d7e61bb33d9e2907ef9 Mon Sep 17 00:00:00 2001
From: Rui Tome <rtome@bitwarden.com>
Date: Tue, 21 Nov 2023 10:21:10 +0000
Subject: [PATCH] =?UTF-8?q?[AC-1139]=C2=A0Fixed=20CanDelete=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-dialog/collection-dialog.component.html    | 5 +----
 .../collection-dialog/collection-dialog.component.ts      | 8 ++++++++
 .../bulk-delete-dialog/bulk-delete-dialog.component.ts    | 8 ++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html
index 05368edd848..30227222e65 100644
--- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html
+++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.html
@@ -109,10 +109,7 @@
         {{ "cancel" | i18n }}
       </button>
       <button
-        *ngIf="
-          editMode &&
-          ((flexibleCollectionsEnabled$ | async) || organization?.canDeleteAssignedCollections)
-        "
+        *ngIf="canDelete$ | async"
         type="button"
         bitIconButton="bwi-trash"
         buttonType="danger"
diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts
index 898831c2204..cb70913ac7d 100644
--- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts
+++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts
@@ -316,6 +316,14 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     this.close(CollectionDialogAction.Deleted, this.collection);
   };
 
+  protected canDelete$ = this.flexibleCollectionsEnabled$.pipe(
+    switchMap(async (flexibleCollectionsEnabled) => {
+      return (
+        this.editMode && this.collection?.canDelete(this.organization!, flexibleCollectionsEnabled)
+      );
+    })
+  );
+
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
index 3cf38c38af0..257d12f5709 100644
--- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
+++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts
@@ -135,7 +135,9 @@ export class BulkDeleteDialogComponent {
     // From org vault
     if (this.organization) {
       if (
-        (flexibleCollectionsEnabled || !this.organization.canDeleteAssignedCollections) &&
+        (flexibleCollectionsEnabled
+          ? this.collections.some((c) => !c.canDelete)
+          : !this.organization.canDeleteAssignedCollections) &&
         !this.organization.canDeleteAnyCollection
       ) {
         this.platformUtilsService.showToast(
@@ -151,7 +153,9 @@ export class BulkDeleteDialogComponent {
       const deletePromises: Promise<any>[] = [];
       for (const organization of this.organizations) {
         if (
-          (flexibleCollectionsEnabled || !this.organization.canDeleteAssignedCollections) &&
+          (flexibleCollectionsEnabled
+            ? this.collections.some((c) => !c.canDelete)
+            : !this.organization.canDeleteAssignedCollections) &&
           !organization.canDeleteAnyCollection
         ) {
           this.platformUtilsService.showToast(