[PM-24550] Remove Feature Flag Code for PM-12276 (#16173)

* tests: remove feature flag use in tests * tests: remove breadcrumbingPolicyTests and add service tests * refactor: remove event log use of flag from org-layout component * refactor: remove new policy code from org-layout component * refactor: remove event log use of flag from events component * refactor: remove event log use from collection dialog component * refactor: remove event log use from vault-header component * refactor: remove event-log route logic for org-reporting * refactor: remove logic from org-settings routing * refactor: remove breadcrumbing function and from billing service * refactor: remove ConfigService from DI for billing service * refactor: remove new policy code from policy-edit component * refactor: remove new policy code from policies component * refactor: remove feature flag * fix(Admin Console): revert to use of reactive observables pattern * fix(Admin Console): remove type artifact from reversion
2025-12-11 05:43:41 +00:00 · 2025-09-03 15:28:15 -04:00
parent 3a62e9c2f1
commit 363d6bea44
17 changed files with 279 additions and 342 deletions
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.html
@@ -55,10 +55,7 @@
      <bit-nav-item
        [text]="'eventLogs' | i18n"
        route="reporting/events"
-        *ngIf="
-          (organization.canAccessEventLogs && organization.useEvents) ||
-          (organization.isOwner && (isBreadcrumbEventLogsEnabled$ | async))
-        "
+        *ngIf="organization.canAccessEventLogs || organization.isOwner"
      ></bit-nav-item>
      <bit-nav-item
        [text]="'reports' | i18n"
@@ -102,7 +99,7 @@
      <bit-nav-item
        [text]="'policies' | i18n"
        route="settings/policies"
-        *ngIf="canShowPoliciesTab$ | async"
+        *ngIf="organization.canManagePolicies"
      ></bit-nav-item>
      <bit-nav-item
        [text]="'twoStepLogin' | i18n"
--- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
+++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts
@@ -68,9 +68,7 @@ export class OrganizationLayoutComponent implements OnInit {
  hideNewOrgButton$: Observable<boolean>;
  organizationIsUnmanaged$: Observable<boolean>;

-  protected isBreadcrumbEventLogsEnabled$: Observable<boolean>;
  protected showSponsoredFamiliesDropdown$: Observable<boolean>;
-  protected canShowPoliciesTab$: Observable<boolean>;

  protected paymentDetailsPageData$: Observable<{
    route: string;
@@ -94,9 +92,6 @@ export class OrganizationLayoutComponent implements OnInit {
  ) {}

  async ngOnInit() {
-    this.isBreadcrumbEventLogsEnabled$ = this.configService.getFeatureFlag$(
-      FeatureFlag.PM12276_BreadcrumbEventLogs,
-    );
    document.body.classList.remove("layout_frontend");

    this.organization$ = this.route.params.pipe(
@@ -141,18 +136,6 @@ export class OrganizationLayoutComponent implements OnInit {

    this.integrationPageEnabled$ = this.organization$.pipe(map((org) => org.canAccessIntegrations));

-    this.canShowPoliciesTab$ = this.organization$.pipe(
-      switchMap((organization) =>
-        this.organizationBillingService
-          .isBreadcrumbingPoliciesEnabled$(organization)
-          .pipe(
-            map(
-              (isBreadcrumbingEnabled) => isBreadcrumbingEnabled || organization.canManagePolicies,
-            ),
-          ),
-      ),
-    );
-
    this.paymentDetailsPageData$ = this.configService
      .getFeatureFlag$(FeatureFlag.PM21881_ManagePaymentDetailsOutsideCheckout)
      .pipe(
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.html
@@ -1,4 +1,4 @@
-@let usePlaceHolderEvents = !organization?.useEvents && (isBreadcrumbEventLogsEnabled$ | async);
+@let usePlaceHolderEvents = !organization?.useEvents;
 <app-header>
  <span
    bitBadge
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
@@ -19,7 +19,6 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ProductTierType } from "@bitwarden/common/billing/enums";
 import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response";
 import { EventSystemUser } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { EventResponse } from "@bitwarden/common/models/response/event.response";
 import { EventView } from "@bitwarden/common/models/view/event.view";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -62,10 +61,6 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
  private orgUsersUserIdMap = new Map<string, any>();
  readonly ProductTierType = ProductTierType;

-  protected isBreadcrumbEventLogsEnabled$ = this.configService.getFeatureFlag$(
-    FeatureFlag.PM12276_BreadcrumbEventLogs,
-  );
-
  constructor(
    private apiService: ApiService,
    private route: ActivatedRoute,
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.html
@@ -1,20 +1,7 @@
-<app-header>
-  @let organization = organization$ | async;
-  @if (isBreadcrumbingEnabled$ | async) {
-    <button
-      bitBadge
-      class="!tw-align-middle"
-      (click)="changePlan(organization)"
-      slot="title-suffix"
-      type="button"
-      variant="primary"
-    >
-      {{ "upgrade" | i18n }}
-    </button>
-  }
-</app-header>
+<app-header></app-header>

 <bit-container>
+  @let organization = organization$ | async;
  @if (loading) {
    <i
      class="bwi bwi-spinner bwi-spin tw-text-muted"
--- a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts
@@ -2,8 +2,8 @@
 // @ts-strict-ignore
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { firstValueFrom, lastValueFrom, map, Observable, switchMap } from "rxjs";
-import { first } from "rxjs/operators";
+import { firstValueFrom, lastValueFrom, Observable } from "rxjs";
+import { first, map } from "rxjs/operators";

 import {
  getOrganizationById,
@@ -14,18 +14,11 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { DialogService } from "@bitwarden/components";
-import {
-  ChangePlanDialogResultType,
-  openChangePlanDialog,
-} from "@bitwarden/web-vault/app/billing/organizations/change-plan-dialog.component";
-import { All } from "@bitwarden/web-vault/app/vault/individual-vault/vault-filter/shared/models/routed-vault-filter.model";

 import { PolicyListService } from "../../core/policy-list.service";
 import { BasePolicy } from "../policies";
-import { CollectionDialogTabType } from "../shared/components/collection-dialog";

 import { PolicyEditComponent, PolicyEditDialogResult } from "./policy-edit.component";

@@ -38,19 +31,17 @@ export class PoliciesComponent implements OnInit {
  loading = true;
  organizationId: string;
  policies: BasePolicy[];
-  protected organization$: Observable<Organization>;
+  organization$: Observable<Organization>;

  private orgPolicies: PolicyResponse[];
  protected policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
-  protected isBreadcrumbingEnabled$: Observable<boolean>;

  constructor(
    private route: ActivatedRoute,
-    private accountService: AccountService,
    private organizationService: OrganizationService,
+    private accountService: AccountService,
    private policyApiService: PolicyApiServiceAbstraction,
    private policyListService: PolicyListService,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
    private dialogService: DialogService,
    protected configService: ConfigService,
  ) {}
@@ -62,9 +53,11 @@ export class PoliciesComponent implements OnInit {
      const userId = await firstValueFrom(
        this.accountService.activeAccount$.pipe(map((a) => a?.id)),
      );
+
      this.organization$ = this.organizationService
        .organizations$(userId)
        .pipe(getOrganizationById(this.organizationId));
+
      this.policies = this.policyListService.getPolicies();

      await this.load();
@@ -100,11 +93,7 @@ export class PoliciesComponent implements OnInit {
    this.orgPolicies.forEach((op) => {
      this.policiesEnabledMap.set(op.type, op.enabled);
    });
-    this.isBreadcrumbingEnabled$ = this.organization$.pipe(
-      switchMap((organization) =>
-        this.organizationBillingService.isBreadcrumbingPoliciesEnabled$(organization),
-      ),
-    );
+
    this.loading = false;
  }

@@ -117,34 +106,8 @@ export class PoliciesComponent implements OnInit {
    });

    const result = await lastValueFrom(dialogRef.closed);
-    switch (result) {
-      case PolicyEditDialogResult.Saved:
-        await this.load();
-        break;
-      case PolicyEditDialogResult.UpgradePlan:
-        await this.changePlan(await firstValueFrom(this.organization$));
-        break;
+    if (result === PolicyEditDialogResult.Saved) {
+      await this.load();
    }
  }
-
-  protected readonly CollectionDialogTabType = CollectionDialogTabType;
-  protected readonly All = All;
-
-  protected async changePlan(organization: Organization) {
-    const reference = openChangePlanDialog(this.dialogService, {
-      data: {
-        organizationId: organization.id,
-        subscription: null,
-        productTierType: organization.productTierType,
-      },
-    });
-
-    const result = await lastValueFrom(reference.closed);
-
-    if (result === ChangePlanDialogResultType.Closed) {
-      return;
-    }
-
-    await this.load();
-  }
 }
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.html
@@ -1,17 +1,5 @@
 <form [formGroup]="formGroup" [bitSubmit]="submit">
  <bit-dialog [loading]="loading" [title]="'editPolicy' | i18n" [subtitle]="policy.name | i18n">
-    <ng-container bitDialogTitle>
-      <button
-        bitBadge
-        class="!tw-align-middle"
-        (click)="upgradePlan()"
-        *ngIf="isBreadcrumbingEnabled$ | async"
-        type="button"
-        variant="primary"
-      >
-        {{ "planNameEnterprise" | i18n }}
-      </button>
-    </ng-container>
    <ng-container bitDialogContent>
      <div *ngIf="loading">
        <i
@@ -30,7 +18,6 @@
    </ng-container>
    <ng-container bitDialogFooter>
      <button
-        *ngIf="!(isBreadcrumbingEnabled$ | async); else breadcrumbing"
        bitButton
        buttonType="primary"
        [disabled]="saveDisabled$ | async"
@@ -39,11 +26,6 @@
      >
        {{ "save" | i18n }}
      </button>
-      <ng-template #breadcrumbing>
-        <button bitButton buttonType="primary" bitFormButton type="button" (click)="upgradePlan()">
-          {{ "upgrade" | i18n }}
-        </button>
-      </ng-template>
      <button bitButton buttonType="secondary" bitDialogClose type="button">
        {{ "cancel" | i18n }}
      </button>
--- a/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
+++ b/apps/web/src/app/admin-console/organizations/policies/policy-edit.component.ts
@@ -9,20 +9,12 @@ import {
  ViewContainerRef,
 } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
-import { map, Observable, switchMap } from "rxjs";
+import { Observable, map } from "rxjs";

-import {
-  getOrganizationById,
-  OrganizationService,
-} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
-import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { PolicyRequest } from "@bitwarden/common/admin-console/models/request/policy.request";
 import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response";
-import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { getUserId } from "@bitwarden/common/auth/services/account.service";
-import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import {
  DIALOG_DATA,
@@ -45,7 +37,6 @@ export type PolicyEditDialogData = {
 // eslint-disable-next-line @bitwarden/platform/no-enums
 export enum PolicyEditDialogResult {
  Saved = "saved",
-  UpgradePlan = "upgrade-plan",
 }
@Component({
  selector: "app-policy-edit",
@@ -66,22 +57,15 @@ export class PolicyEditComponent implements AfterViewInit {
  formGroup = this.formBuilder.group({
    enabled: [this.enabled],
  });
-  protected organization$: Observable<Organization>;
-  protected isBreadcrumbingEnabled$: Observable<boolean>;
-
  constructor(
    @Inject(DIALOG_DATA) protected data: PolicyEditDialogData,
-    private accountService: AccountService,
    private policyApiService: PolicyApiServiceAbstraction,
-    private organizationService: OrganizationService,
    private i18nService: I18nService,
    private cdr: ChangeDetectorRef,
    private formBuilder: FormBuilder,
    private dialogRef: DialogRef<PolicyEditDialogResult>,
    private toastService: ToastService,
-    private organizationBillingService: OrganizationBillingServiceAbstraction,
  ) {}
-
  get policy(): BasePolicy {
    return this.data.policy;
  }
@@ -115,16 +99,6 @@ export class PolicyEditComponent implements AfterViewInit {
        throw e;
      }
    }
-    this.organization$ = this.accountService.activeAccount$.pipe(
-      getUserId,
-      switchMap((userId) => this.organizationService.organizations$(userId)),
-      getOrganizationById(this.data.organizationId),
-    );
-    this.isBreadcrumbingEnabled$ = this.organization$.pipe(
-      switchMap((organization) =>
-        this.organizationBillingService.isBreadcrumbingPoliciesEnabled$(organization),
-      ),
-    );
  }

  submit = async () => {
@@ -154,8 +128,4 @@ export class PolicyEditComponent implements AfterViewInit {
  static open = (dialogService: DialogService, config: DialogConfig<PolicyEditDialogData>) => {
    return dialogService.open<PolicyEditDialogResult>(PolicyEditComponent, config);
  };
-
-  protected upgradePlan(): void {
-    this.dialogRef.close(PolicyEditDialogResult.UpgradePlan);
-  }
 }
--- a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts
@@ -1,13 +1,10 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { inject, NgModule } from "@angular/core";
-import { CanMatchFn, RouterModule, Routes } from "@angular/router";
-import { map } from "rxjs";
+import { NgModule } from "@angular/core";
+import { RouterModule, Routes } from "@angular/router";

 import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
-import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";

 // eslint-disable-next-line no-restricted-imports
 import { ExposedPasswordsReportComponent } from "../../../dirt/reports/pages/organizations/exposed-passwords-report.component";
@@ -26,11 +23,6 @@ import { EventsComponent } from "../manage/events.component";

 import { ReportsHomeComponent } from "./reports-home.component";

-const breadcrumbEventLogsPermission$: CanMatchFn = () =>
-  inject(ConfigService)
-    .getFeatureFlag$(FeatureFlag.PM12276_BreadcrumbEventLogs)
-    .pipe(map((breadcrumbEventLogs) => breadcrumbEventLogs === true));
-
 const routes: Routes = [
  {
    path: "",
@@ -92,24 +84,10 @@ const routes: Routes = [
          },
        ],
      },
-      // Event routing is temporarily duplicated
      {
        path: "events",
        component: EventsComponent,
-        canMatch: [breadcrumbEventLogsPermission$], // if this matches, the flag is ON
-        canActivate: [
-          organizationPermissionsGuard(
-            (org) => (org.canAccessEventLogs && org.useEvents) || org.isOwner,
-          ),
-        ],
-        data: {
-          titleId: "eventLogs",
-        },
-      },
-      {
-        path: "events",
-        component: EventsComponent,
-        canActivate: [organizationPermissionsGuard((org) => org.canAccessEventLogs)],
+        canActivate: [organizationPermissionsGuard((org) => org.canAccessEventLogs || org.isOwner)],
        data: {
          titleId: "eventLogs",
        },
--- a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
+++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts
@@ -1,10 +1,8 @@
-import { NgModule, inject } from "@angular/core";
+import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
-import { map } from "rxjs";

 import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
-import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions";

 import { organizationPermissionsGuard } from "../../organizations/guards/org-permissions.guard";
 import { organizationRedirectGuard } from "../../organizations/guards/org-redirect.guard";
@@ -43,14 +41,7 @@ const routes: Routes = [
      {
        path: "policies",
        component: PoliciesComponent,
-        canActivate: [
-          organizationPermissionsGuard((o: Organization) => {
-            const organizationBillingService = inject(OrganizationBillingServiceAbstraction);
-            return organizationBillingService
-              .isBreadcrumbingPoliciesEnabled$(o)
-              .pipe(map((isBreadcrumbingEnabled) => o.canManagePolicies || isBreadcrumbingEnabled));
-          }),
-        ],
+        canActivate: [organizationPermissionsGuard((org) => org.canManagePolicies)],
        data: {
          titleId: "policies",
        },
--- a/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
+++ b/apps/web/src/app/admin-console/organizations/shared/components/collection-dialog/collection-dialog.component.ts
@@ -34,7 +34,6 @@ import {
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
-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 { getById } from "@bitwarden/common/platform/misc";
@@ -188,22 +187,16 @@ export class CollectionDialogComponent implements OnInit, OnDestroy {
      await this.loadOrg(this.params.organizationId);
    }

-    const isBreadcrumbEventLogsEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.PM12276_BreadcrumbEventLogs),
+    this.organizationSelected.setAsyncValidators(
+      freeOrgCollectionLimitValidator(
+        this.organizations$,
+        this.collectionService
+          .encryptedCollections$(userId)
+          .pipe(map((collections) => collections ?? [])),
+        this.i18nService,
+      ),
    );
-
-    if (isBreadcrumbEventLogsEnabled) {
-      this.organizationSelected.setAsyncValidators(
-        freeOrgCollectionLimitValidator(
-          this.organizations$,
-          this.collectionService
-            .encryptedCollections$(userId)
-            .pipe(map((collections) => collections ?? [])),
-          this.i18nService,
-        ),
-      );
-      this.formGroup.updateValueAndValidity();
-    }
+    this.formGroup.updateValueAndValidity();

    this.organizationSelected.valueChanges
      .pipe(
--- a/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
+++ b/apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
@@ -13,7 +13,6 @@ import { Organization } from "@bitwarden/common/admin-console/models/domain/orga
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/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 { CipherType } from "@bitwarden/common/vault/enums";
@@ -218,28 +217,22 @@ export class VaultHeaderComponent {
  }

  async addCollection(): Promise<void> {
-    const isBreadcrumbEventLogsEnabled = await firstValueFrom(
-      this.configService.getFeatureFlag$(FeatureFlag.PM12276_BreadcrumbEventLogs),
+    const organization = this.organizations?.find(
+      (org) => org.productTierType === ProductTierType.Free,
    );

-    if (isBreadcrumbEventLogsEnabled) {
-      const organization = this.organizations?.find(
-        (org) => org.productTierType === ProductTierType.Free,
-      );
-
-      if (this.organizations?.length == 1 && !!organization) {
-        const collections = await firstValueFrom(
-          this.accountService.activeAccount$.pipe(
-            getUserId,
-            switchMap((userId) =>
-              this.collectionAdminService.collectionAdminViews$(organization.id, userId),
-            ),
+    if (this.organizations?.length == 1 && !!organization) {
+      const collections = await firstValueFrom(
+        this.accountService.activeAccount$.pipe(
+          getUserId,
+          switchMap((userId) =>
+            this.collectionAdminService.collectionAdminViews$(organization.id, userId),
          ),
-        );
-        if (collections.length === organization.maxCollections) {
-          await this.showFreeOrgUpgradeDialog(organization);
-          return;
-        }
+        ),
+      );
+      if (collections.length === organization.maxCollections) {
+        await this.showFreeOrgUpgradeDialog(organization);
+        return;
      }
    }