From a141d06c00f030adf31a372b197cf37365edf098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Sat, 11 May 2024 14:54:12 +0100
Subject: [PATCH] =?UTF-8?q?[AC-2484]=C2=A0Fix=20bug=20where=20Custom=20Use?=
 =?UTF-8?q?rs=20with=20"Delete=20any=20collection"=20permission=20incorrec?=
 =?UTF-8?q?tly=20see=20"Can=20Edit"=20permission=20for=20Unassigned=20Coll?=
 =?UTF-8?q?ection=20(#8858)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [AC-2484] Fix bug where Custom Users with "Delete any collection" permission incorrectly see "Can Edit" permission for Unassigned Collection

* [AC-2484] Undo change on permission tooltip permission check

* [AC-2484] Fix permission text for unassigned collection
---
 .../vault-items/vault-collection-row.component.ts         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
index 3090eeea423..75f2cf83223 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
+++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.ts
@@ -56,14 +56,16 @@ export class VaultCollectionRowComponent {
   }
 
   get permissionText() {
-    if (this.collection.id != Unassigned && !(this.collection as CollectionAdminView).assigned) {
-      return this.i18nService.t("noAccess");
-    } else {
+    if (this.collection.id == Unassigned && this.organization?.canEditUnassignedCiphers()) {
+      return this.i18nService.t("canEdit");
+    }
+    if ((this.collection as CollectionAdminView).assigned) {
       const permissionList = getPermissionList(this.organization?.flexibleCollections);
       return this.i18nService.t(
         permissionList.find((p) => p.perm === convertToPermission(this.collection))?.labelId,
       );
     }
+    return this.i18nService.t("noAccess");
   }
 
   get permissionTooltip() {