From 8c5841a76aa68375f43bf6b38554cd1e3a92dd63 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Tue, 14 May 2024 08:30:02 +1000
Subject: [PATCH] [AC-2500] Collection row menus - adjust feature flagging
 (#9116)

---
 .../vault-items/vault-collection-row.component.html    |  4 +---
 .../components/vault-items/vault-items.component.ts    |  2 +-
 .../src/app/vault/core/views/collection-admin.view.ts  |  9 ++++++++-
 .../org-vault/vault-header/vault-header.component.html | 10 ++++++----
 .../org-vault/vault-header/vault-header.component.ts   |  5 ++++-
 libs/common/src/vault/models/view/collection.view.ts   |  5 ++++-
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
index 7bad783f197..4f9e65454bc 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-collection-row.component.html
@@ -83,9 +83,7 @@
         {{ "access" | i18n }}
       </button>
     </ng-container>
-    <ng-container
-      *ngIf="flexibleCollectionsV1Enabled && !canEditCollection && canViewCollectionInfo"
-    >
+    <ng-container *ngIf="!canEditCollection && canViewCollectionInfo">
       <button type="button" bitMenuItem (click)="edit(true)">
         <i class="bwi bwi-fw bwi-pencil-square" aria-hidden="true"></i>
         {{ "viewInfo" | i18n }}
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 8fcf5b01b15..9d82ee2ef93 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
@@ -168,7 +168,7 @@ export class VaultItemsComponent {
 
   protected canViewCollectionInfo(collection: CollectionView) {
     const organization = this.allOrganizations.find((o) => o.id === collection.organizationId);
-    return collection.canViewCollectionInfo(organization);
+    return collection.canViewCollectionInfo(organization, this.flexibleCollectionsV1Enabled);
   }
 
   protected toggleAll() {
diff --git a/apps/web/src/app/vault/core/views/collection-admin.view.ts b/apps/web/src/app/vault/core/views/collection-admin.view.ts
index ad23584f6c6..40638268e1c 100644
--- a/apps/web/src/app/vault/core/views/collection-admin.view.ts
+++ b/apps/web/src/app/vault/core/views/collection-admin.view.ts
@@ -88,7 +88,14 @@ export class CollectionAdminView extends CollectionView {
   /**
    * Returns true if the user can view collection info and access in a read-only state from the Admin Console
    */
-  override canViewCollectionInfo(org: Organization | undefined): boolean {
+  override canViewCollectionInfo(
+    org: Organization | undefined,
+    flexibleCollectionsV1Enabled: boolean,
+  ): boolean {
+    if (!flexibleCollectionsV1Enabled) {
+      return false;
+    }
+
     if (this.isUnassignedCollection) {
       return false;
     }
diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
index 2e20e696fe6..426f1812c99 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.html
@@ -28,7 +28,11 @@
   </bit-breadcrumbs>
 
   <ng-container slot="title-suffix">
-    <ng-container *ngIf="collection != null && (canEditCollection || canDeleteCollection)">
+    <ng-container
+      *ngIf="
+        collection != null && (canEditCollection || canDeleteCollection || canViewCollectionInfo)
+      "
+    >
       <button
         bitIconButton="bwi-angle-down"
         [bitMenuTriggerFor]="editCollectionMenu"
@@ -55,9 +59,7 @@
             {{ "access" | i18n }}
           </button>
         </ng-container>
-        <ng-container
-          *ngIf="flexibleCollectionsV1Enabled && !canEditCollection && canViewCollectionInfo"
-        >
+        <ng-container *ngIf="!canEditCollection && canViewCollectionInfo">
           <button
             type="button"
             bitMenuItem
diff --git a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
index 58af5516cc6..1025745ee91 100644
--- a/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
@@ -211,7 +211,10 @@ export class VaultHeaderComponent implements OnInit {
   }
 
   get canViewCollectionInfo(): boolean {
-    return this.collection.node.canViewCollectionInfo(this.organization);
+    return this.collection.node.canViewCollectionInfo(
+      this.organization,
+      this.flexibleCollectionsV1Enabled,
+    );
   }
 
   get canCreateCollection(): boolean {
diff --git a/libs/common/src/vault/models/view/collection.view.ts b/libs/common/src/vault/models/view/collection.view.ts
index 5e49d0a6c00..d77af747f88 100644
--- a/libs/common/src/vault/models/view/collection.view.ts
+++ b/libs/common/src/vault/models/view/collection.view.ts
@@ -92,7 +92,10 @@ export class CollectionView implements View, ITreeNodeObject {
   /**
    * Returns true if the user can view collection info and access in a read-only state from the individual vault
    */
-  canViewCollectionInfo(org: Organization | undefined): boolean {
+  canViewCollectionInfo(
+    org: Organization | undefined,
+    flexibleCollectionsV1Enabled: boolean,
+  ): boolean {
     return false;
   }