From 0189934ca0274c2a649b9777747e2afbeb3662d8 Mon Sep 17 00:00:00 2001
From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com>
Date: Tue, 29 Apr 2025 12:07:50 -0400
Subject: [PATCH] Remove feature flag (#14325)

---
 .../clients/manage-clients.component.html     | 52 +++++++------------
 .../clients/manage-clients.component.ts       |  6 ---
 libs/common/src/enums/feature-flag.enum.ts    |  2 -
 3 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
index ffcda9fccfa..fa2e347e9c8 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
@@ -1,39 +1,25 @@
 <app-header [title]="pageTitle">
   <bit-search [placeholder]="'search' | i18n" [formControl]="searchControl"></bit-search>
-  <ng-container *ngIf="addExistingOrgsFromProviderPortal$ | async; else addExistingOrgsDisabled">
-    <button
-      bitButton
-      buttonType="primary"
-      type="button"
-      [bitMenuTriggerFor]="clientMenu"
-      appA11yTitle="{{ 'add' | i18n }}"
-    >
-      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-      {{ "add" | i18n }}
+  <button
+    bitButton
+    buttonType="primary"
+    type="button"
+    [bitMenuTriggerFor]="clientMenu"
+    appA11yTitle="{{ 'add' | i18n }}"
+  >
+    <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
+    {{ "add" | i18n }}
+  </button>
+  <bit-menu #clientMenu>
+    <button type="button" bitMenuItem (click)="createClient()">
+      <i aria-hidden="true" class="bwi bwi-business"></i>
+      {{ newClientButtonLabel }}
     </button>
-    <bit-menu #clientMenu>
-      <button type="button" bitMenuItem (click)="createClient()">
-        <i aria-hidden="true" class="bwi bwi-business"></i>
-        {{ newClientButtonLabel }}
-      </button>
-      <button type="button" bitMenuItem (click)="addExistingOrganization()">
-        <i aria-hidden="true" class="bwi bwi-filter"></i>
-        {{ "existingOrganization" | i18n }}
-      </button>
-    </bit-menu>
-  </ng-container>
-  <ng-template #addExistingOrgsDisabled>
-    <a
-      type="button"
-      bitButton
-      *ngIf="isProviderAdmin"
-      buttonType="primary"
-      (click)="createClient()"
-    >
-      <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-      {{ "addNewOrganization" | i18n }}
-    </a>
-  </ng-template>
+    <button type="button" bitMenuItem (click)="addExistingOrganization()">
+      <i aria-hidden="true" class="bwi bwi-filter"></i>
+      {{ "existingOrganization" | i18n }}
+    </button>
+  </bit-menu>
 </app-header>
 
 <ng-container *ngIf="loading">
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
index 3322fd3a85b..a57e6351349 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.ts
@@ -15,8 +15,6 @@ import { Provider } from "@bitwarden/common/admin-console/models/domain/provider
 import { ProviderOrganizationOrganizationDetailsResponse } from "@bitwarden/common/admin-console/models/response/provider/provider-organization.response";
 import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response";
-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 { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
 import {
@@ -73,9 +71,6 @@ export class ManageClientsComponent {
 
   protected searchControl = new FormControl("", { nonNullable: true });
   protected plans: PlanResponse[] = [];
-  protected addExistingOrgsFromProviderPortal$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM15179_AddExistingOrgsFromProviderPortal,
-  );
 
   pageTitle = this.i18nService.t("clients");
   clientColumnHeader = this.i18nService.t("client");
@@ -91,7 +86,6 @@ export class ManageClientsComponent {
     private toastService: ToastService,
     private validationService: ValidationService,
     private webProviderService: WebProviderService,
-    private configService: ConfigService,
     private billingNotificationService: BillingNotificationService,
   ) {
     this.activatedRoute.queryParams.pipe(first(), takeUntilDestroyed()).subscribe((queryParams) => {
diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts
index 4eabb8ea114..0e0956b0460 100644
--- a/libs/common/src/enums/feature-flag.enum.ts
+++ b/libs/common/src/enums/feature-flag.enum.ts
@@ -31,7 +31,6 @@ export enum FeatureFlag {
 
   /* Billing */
   TrialPaymentOptional = "PM-8163-trial-payment",
-  PM15179_AddExistingOrgsFromProviderPortal = "pm-15179-add-existing-orgs-from-provider-portal",
   PM12276_BreadcrumbEventLogs = "pm-12276-breadcrumbing-for-business-features",
   PM18794_ProviderPaymentMethod = "pm-18794-provider-payment-method",
   PM17772_AdminInitiatedSponsorships = "pm-17772-admin-initiated-sponsorships",
@@ -119,7 +118,6 @@ export const DefaultFeatureFlagValue = {
 
   /* Billing */
   [FeatureFlag.TrialPaymentOptional]: FALSE,
-  [FeatureFlag.PM15179_AddExistingOrgsFromProviderPortal]: FALSE,
   [FeatureFlag.PM12276_BreadcrumbEventLogs]: FALSE,
   [FeatureFlag.PM18794_ProviderPaymentMethod]: FALSE,
   [FeatureFlag.PM17772_AdminInitiatedSponsorships]: FALSE,