diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts index 4fa8a6779b9..695a3fc18f0 100644 --- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts +++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/view/all-activities.service.ts @@ -1,5 +1,5 @@ -import { BehaviorSubject, Subject } from "rxjs"; -import { takeUntil } from "rxjs/operators"; +import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; +import { BehaviorSubject } from "rxjs"; import { ApplicationHealthReportDetailEnriched } from "../../models"; import { OrganizationReportSummary } from "../../models/report-models"; @@ -12,8 +12,6 @@ export class AllActivitiesService { /// Going forward, this class can be simplified by using the RiskInsightsDataService /// as it contains the application summary data. - private _destroy$ = new Subject(); - private reportSummarySubject$ = new BehaviorSubject({ totalMemberCount: 0, totalCriticalMemberCount: 0, @@ -43,7 +41,7 @@ export class AllActivitiesService { constructor(private dataService: RiskInsightsDataService) { // All application summary changes - this.dataService.enrichedReportData$.pipe(takeUntil(this._destroy$)).subscribe((report) => { + this.dataService.enrichedReportData$.pipe(takeUntilDestroyed()).subscribe((report) => { if (report) { this.setAllAppsReportSummary(report.summaryData); this.setAllAppsReportDetails(report.reportData); @@ -51,14 +49,14 @@ export class AllActivitiesService { }); // Critical application summary changes - this.dataService.criticalReportResults$.pipe(takeUntil(this._destroy$)).subscribe((report) => { + this.dataService.criticalReportResults$.pipe(takeUntilDestroyed()).subscribe((report) => { if (report) { this.setCriticalAppsReportSummary(report.summaryData); } }); // New applications changes (from orchestrator's reactive pipeline) - this.dataService.newApplications$.pipe(takeUntil(this._destroy$)).subscribe((newApps) => { + this.dataService.newApplications$.pipe(takeUntilDestroyed()).subscribe((newApps) => { this.setNewApplications(newApps); }); } @@ -111,14 +109,4 @@ export class AllActivitiesService { newApplications: newApps, }); } - - /** - * Cleanup method to prevent memory leaks. - * Should be called when the service is no longer needed. - * Complies with ADR-0003 (Observable Data Services) requirements. - */ - destroy(): void { - this._destroy$.next(); - this._destroy$.complete(); - } }