From 63384bead9ac14094f5f5160536edef2e05deceb Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Fri, 29 Dec 2023 09:54:00 +1000
Subject: [PATCH] Fix Delete button not showing in collection modal (#7304)

---
 .../collection-dialog/collection-dialog.component.html |  2 +-
 .../collection-dialog/collection-dialog.component.ts   | 10 +++-------
 2 files changed, 4 insertions(+), 8 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 30227222e6..462a82e012 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,7 +109,7 @@
         {{ "cancel" | i18n }}
       </button>
       <button
-        *ngIf="canDelete$ | async"
+        *ngIf="showDeleteButton"
         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 644e6ca284..a244f29804 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
@@ -94,6 +94,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     selectedOrg: "",
   });
   protected PermissionMode = PermissionMode;
+  protected showDeleteButton = false;
 
   constructor(
     @Inject(DIALOG_DATA) private params: CollectionDialogParams,
@@ -198,6 +199,8 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
               parent,
               access: accessSelections,
             });
+
+            this.showDeleteButton = this.collection.canDelete(organization, flexibleCollections);
           } else {
             this.nestOptions = collections;
             const parent = collections.find((c) => c.id === this.params.parentCollectionId);
@@ -313,13 +316,6 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
     this.close(CollectionDialogAction.Deleted, this.collection);
   };
 
-  protected canDelete$ = this.flexibleCollectionsEnabled$.pipe(
-    map(
-      (flexibleCollectionsEnabled) =>
-        this.editMode && this.collection.canDelete(this.organization, flexibleCollectionsEnabled),
-    ),
-  );
-
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();