From 00e88a24e0053634aa9de4413255029a2270eae3 Mon Sep 17 00:00:00 2001
From: Leslie Tilton <23057410+Banrion@users.noreply.github.com>
Date: Wed, 22 Oct 2025 09:27:09 -0500
Subject: [PATCH] Fixe remove critical applications

---
 .../view/risk-insights-data.service.ts        | 46 ++-----------------
 .../access-intelligence.module.ts             |  2 +-
 2 files changed, 5 insertions(+), 43 deletions(-)

diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts
index bc6e9fc3671..89f120cbded 100644
--- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts
+++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/risk-insights-data.service.ts
@@ -1,13 +1,11 @@
-import { BehaviorSubject, EMPTY, firstValueFrom, Observable, of, Subject, throwError } from "rxjs";
-import { catchError, distinctUntilChanged, exhaustMap, map } from "rxjs/operators";
+import { BehaviorSubject, firstValueFrom, Observable, of, Subject } from "rxjs";
+import { distinctUntilChanged, map } from "rxjs/operators";
 
 import { OrganizationId } from "@bitwarden/common/types/guid";
 
 import { getAtRiskApplicationList, getAtRiskMemberList } from "../../helpers";
 import { ReportState, DrawerDetails, DrawerType, RiskInsightsEnrichedData } from "../../models";
-import { CriticalAppsService } from "../domain/critical-apps.service";
 import { RiskInsightsOrchestratorService } from "../domain/risk-insights-orchestrator.service";
-import { RiskInsightsReportService } from "../domain/risk-insights-report.service";
 
 export class RiskInsightsDataService {
   private _destroy$ = new Subject<void>();
@@ -44,11 +42,7 @@ export class RiskInsightsDataService {
   drawerDetails$ = this.drawerDetailsSubject.asObservable();
 
   // --------------------------- Critical Application data ---------------------
-  constructor(
-    private criticalAppsService: CriticalAppsService,
-    private reportService: RiskInsightsReportService,
-    private orchestrator: RiskInsightsOrchestratorService,
-  ) {
+  constructor(private orchestrator: RiskInsightsOrchestratorService) {
     this.reportState$ = this.orchestrator.rawReportData$;
     this.isGeneratingReport$ = this.orchestrator.generatingReport$;
     this.organizationDetails$ = this.orchestrator.organizationDetails$;
@@ -183,42 +177,10 @@ export class RiskInsightsDataService {
 
   // ------------------------------ Critical application methods --------------
   saveCriticalApplications(selectedUrls: string[]) {
-    // Saving critical applications to the report
     return this.orchestrator.saveCriticalApplications$(selectedUrls);
-
-    // Legacy saving CriticalAppsService for backward compatibility
-    // return this.organizationDetails$.pipe(
-    //   exhaustMap((organizationDetails) => {
-    //     if (!organizationDetails?.organizationId) {
-    //       return EMPTY;
-    //     }
-    //     return this.criticalAppsService.setCriticalApps(
-    //       organizationDetails?.organizationId,
-    //       selectedUrls,
-    //     );
-    //   }),
-    //   catchError((error: unknown) => {
-    //     this.errorSubject.next("Failed to save critical applications");
-    //     return throwError(() => error);
-    //   }),
-    // );
   }
 
   removeCriticalApplication(hostname: string) {
-    return this.organizationDetails$.pipe(
-      exhaustMap((organizationDetails) => {
-        if (!organizationDetails?.organizationId) {
-          return EMPTY;
-        }
-        return this.criticalAppsService.dropCriticalAppByUrl(
-          organizationDetails?.organizationId,
-          hostname,
-        );
-      }),
-      catchError((error: unknown) => {
-        this.errorSubject.next("Failed to remove critical application");
-        return throwError(() => error);
-      }),
-    );
+    return this.orchestrator.removeCriticalApplication$(hostname);
   }
 }
diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
index 336ffa56070..2cb9140f174 100644
--- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
+++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/access-intelligence.module.ts
@@ -73,7 +73,7 @@ import { AccessIntelligenceSecurityTasksService } from "./shared/security-tasks.
     }),
     safeProvider({
       provide: RiskInsightsDataService,
-      deps: [CriticalAppsService, RiskInsightsReportService, RiskInsightsOrchestratorService],
+      deps: [RiskInsightsOrchestratorService],
     }),
     safeProvider({
       provide: RiskInsightsEncryptionService,