From 4ceba4841b7878f0c18cd9c0f2497d72ce9faf41 Mon Sep 17 00:00:00 2001 From: Tom <144813356+ttalty@users.noreply.github.com> Date: Mon, 2 Jun 2025 13:35:14 -0400 Subject: [PATCH] Removing critical applications feature flag and logic (#14889) --- .../access-intelligence/all-applications.component.html | 2 -- .../dirt/access-intelligence/all-applications.component.ts | 6 ------ .../app-table-row-scrollable.component.html | 4 ++-- .../app-table-row-scrollable.component.ts | 1 - .../critical-applications.component.html | 1 - .../dirt/access-intelligence/risk-insights.component.html | 2 +- .../app/dirt/access-intelligence/risk-insights.component.ts | 6 ------ libs/common/src/enums/feature-flag.enum.ts | 2 -- 8 files changed, 3 insertions(+), 21 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html index 0dfe55bed4..d383d1153c 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.html @@ -59,7 +59,6 @@ type="button" [buttonType]="'primary'" bitButton - *ngIf="isCriticalAppsFeatureEnabled" [disabled]="!selectedUrls.size" [loading]="markingAsCritical" (click)="markAppsAsCritical()" @@ -74,7 +73,6 @@ [showRowCheckBox]="true" [showRowMenuForCriticalApps]="false" [selectedUrls]="selectedUrls" - [isCriticalAppsFeatureEnabled]="isCriticalAppsFeatureEnabled" [isDrawerIsOpenForThisRecord]="isDrawerOpenForTableRow" [checkboxChange]="onCheckboxChange" [showAppAtRiskMembers]="showAppAtRiskMembers" diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts index 17525b4ed0..8225571cb9 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/all-applications.component.ts @@ -21,7 +21,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 { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -74,13 +73,8 @@ export class AllApplicationsComponent implements OnInit { destroyRef = inject(DestroyRef); isLoading$: Observable = of(false); - isCriticalAppsFeatureEnabled = false; async ngOnInit() { - this.isCriticalAppsFeatureEnabled = await this.configService.getFeatureFlag( - FeatureFlag.CriticalApps, - ); - const organizationId = this.activatedRoute.snapshot.paramMap.get("organizationId") ?? ""; const userId = await firstValueFrom(getUserId(this.accountService.activeAccount$)); diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html index 10dbb17951..383780b450 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/app-table-row-scrollable.component.html @@ -1,7 +1,7 @@ - + {{ "application" | i18n }} {{ "atRiskPasswords" | i18n }} @@ -12,7 +12,7 @@ = new Set(); - @Input() isCriticalAppsFeatureEnabled: boolean = false; @Input() isDrawerIsOpenForThisRecord!: (applicationName: string) => boolean; @Input() showAppAtRiskMembers!: (applicationName: string) => void; @Input() unmarkAsCriticalApp!: (applicationName: string) => void; diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html index a74c1964d9..4e2b4e5c40 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/critical-applications.component.html @@ -82,7 +82,6 @@ [dataSource]="dataSource" [showRowCheckBox]="false" [showRowMenuForCriticalApps]="true" - [isCriticalAppsFeatureEnabled]="true" [isDrawerIsOpenForThisRecord]="isDrawerOpenForTableRow" [showAppAtRiskMembers]="showAppAtRiskMembers" [unmarkAsCriticalApp]="unmarkAsCriticalApp" diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html index f759e483bd..c9408b806f 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.html @@ -38,7 +38,7 @@ - + {{ "criticalApplicationsWithCount" | i18n: (criticalApps$ | async)?.length ?? 0 }} diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts index e47e185109..54c02617f0 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/risk-insights.component.ts @@ -15,7 +15,6 @@ import { DrawerType, PasswordHealthReportApplicationsResponse, } from "@bitwarden/bit-common/dirt/reports/risk-insights/models/password-health"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { devFlagEnabled } from "@bitwarden/common/platform/misc/flags"; import { OrganizationId } from "@bitwarden/common/types/guid"; @@ -70,7 +69,6 @@ export class RiskInsightsComponent implements OnInit { dataLastUpdated: Date = new Date(); - isCriticalAppsFeatureEnabled: boolean = false; criticalApps$: Observable = new Observable(); showDebugTabs: boolean = false; @@ -100,10 +98,6 @@ export class RiskInsightsComponent implements OnInit { } async ngOnInit() { - this.isCriticalAppsFeatureEnabled = await this.configService.getFeatureFlag( - FeatureFlag.CriticalApps, - ); - this.showDebugTabs = devFlagEnabled("showRiskInsightsDebug"); this.route.paramMap diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index b3b8cc9992..dd7c5834a1 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -36,7 +36,6 @@ export enum FeatureFlag { UseOrganizationWarningsService = "use-organization-warnings-service", /* Data Insights and Reporting */ - CriticalApps = "pm-14466-risk-insights-critical-application", EnableRiskInsightsNotifications = "enable-risk-insights-notifications", /* Key Management */ @@ -93,7 +92,6 @@ export const DefaultFeatureFlagValue = { [FeatureFlag.MacOsNativeCredentialSync]: FALSE, /* Data Insights and Reporting */ - [FeatureFlag.CriticalApps]: FALSE, [FeatureFlag.EnableRiskInsightsNotifications]: FALSE, /* Tools */