From 19046aa033c4b9614d6add513365bac1f2e4fe31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rui=20Tom=C3=A9?=
 <108268980+r-tome@users.noreply.github.com>
Date: Mon, 11 Nov 2024 10:51:13 +0000
Subject: [PATCH] [PM-10326] Hide 'remove' option for organization managed
 members (#11874)

* Hide 'remove' option for organization managed members

* Refactor member component to conditionally show remove and delete buttons based on account deprovisioning feature flag

* Refactor member dialog component to conditionally show remove and delete buttons based on account deprovisioning feature flag

* Refactor member dialog and members components to simplify conditional rendering of remove and delete buttons based on account deprovisioning feature flag
---
 .../member-dialog/member-dialog.component.html           | 8 ++++++--
 .../components/member-dialog/member-dialog.component.ts  | 7 +++++++
 .../organizations/members/members.component.html         | 9 +++++++--
 .../organizations/members/members.component.ts           | 4 ++++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
index b2812727473..c77c8fc935f 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -262,7 +262,9 @@
           {{ "revokeAccess" | i18n }}
         </button>
         <button
-          *ngIf="editMode"
+          *ngIf="
+            editMode && (!(accountDeprovisioningEnabled$ | async) || !params.managedByOrganization)
+          "
           type="button"
           bitIconButton="bwi-close"
           buttonType="danger"
@@ -272,7 +274,9 @@
           [disabled]="loading"
         ></button>
         <button
-          *ngIf="editMode && params.managedByOrganization === true"
+          *ngIf="
+            editMode && (accountDeprovisioningEnabled$ | async) && params.managedByOrganization
+          "
           type="button"
           bitIconButton="bwi-trash"
           buttonType="danger"
diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
index bc8c068bc40..75c943fe579 100644
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts
@@ -29,6 +29,8 @@ import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permi
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { DialogService, ToastService } from "@bitwarden/components";
 
@@ -125,6 +127,10 @@ export class MemberDialogComponent implements OnDestroy {
     manageResetPassword: false,
   });
 
+  protected accountDeprovisioningEnabled$: Observable<boolean> = this.configService.getFeatureFlag$(
+    FeatureFlag.AccountDeprovisioning,
+  );
+
   private destroy$ = new Subject<void>();
 
   get customUserTypeSelected(): boolean {
@@ -145,6 +151,7 @@ export class MemberDialogComponent implements OnDestroy {
     private accountService: AccountService,
     organizationService: OrganizationService,
     private toastService: ToastService,
+    private configService: ConfigService,
   ) {
     this.organization$ = organizationService
       .get$(this.params.organizationId)
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index e21e1f65923..f87934dbe81 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -315,13 +315,18 @@
                   <i aria-hidden="true" class="bwi bwi-minus-circle"></i>
                   {{ "revokeAccess" | i18n }}
                 </button>
-                <button type="button" bitMenuItem (click)="remove(u)">
+                <button
+                  *ngIf="!(accountDeprovisioningEnabled$ | async) || !u.managedByOrganization"
+                  type="button"
+                  bitMenuItem
+                  (click)="remove(u)"
+                >
                   <span class="tw-text-danger">
                     <i aria-hidden="true" class="bwi bwi-close"></i> {{ "remove" | i18n }}
                   </span>
                 </button>
                 <button
-                  *ngIf="u.managedByOrganization === true"
+                  *ngIf="(accountDeprovisioningEnabled$ | async) && u.managedByOrganization"
                   type="button"
                   bitMenuItem
                   (click)="deleteUser(u)"
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts
index dd3965f94cf..f49fb13d6c8 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.ts
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts
@@ -102,6 +102,10 @@ export class MembersComponent extends BaseMembersComponent<OrganizationUserView>
     FeatureFlag.EnableUpgradePasswordManagerSub,
   );
 
+  protected accountDeprovisioningEnabled$: Observable<boolean> = this.configService.getFeatureFlag$(
+    FeatureFlag.AccountDeprovisioning,
+  );
+
   // Fixed sizes used for cdkVirtualScroll
   protected rowHeight = 62;
   protected rowHeightClass = `tw-h-[62px]`;