diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts index 93955c7dbfb..141c5f94cbd 100644 --- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts +++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/models/report-models.ts @@ -55,7 +55,6 @@ export type OrganizationReportSummary = { totalCriticalMemberCount: number; totalCriticalAtRiskMemberCount: number; totalCriticalAtRiskApplicationCount: number; - newApplications: string[]; }; /** diff --git a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts index 470442a811b..47745b7e577 100644 --- a/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts +++ b/bitwarden_license/bit-common/src/dirt/reports/risk-insights/services/domain/risk-insights-report.service.ts @@ -56,23 +56,6 @@ export class RiskInsightsReportService { const atRiskMembers = reports.flatMap((x) => x.atRiskMemberDetails); const uniqueAtRiskMembers = getUniqueMembers(atRiskMembers); - // TODO: Replace with actual new applications detection logic (PM-26185) - const dummyNewApplications = [ - "github.com", - "google.com", - "stackoverflow.com", - "gitlab.com", - "bitbucket.org", - "npmjs.com", - "docker.com", - "aws.amazon.com", - "azure.microsoft.com", - "jenkins.io", - "terraform.io", - "kubernetes.io", - "atlassian.net", - ]; - return { totalMemberCount: uniqueMembers.length, totalAtRiskMemberCount: uniqueAtRiskMembers.length, @@ -82,7 +65,6 @@ export class RiskInsightsReportService { totalCriticalAtRiskMemberCount: 0, totalCriticalApplicationCount: 0, totalCriticalAtRiskApplicationCount: 0, - newApplications: dummyNewApplications, }; } 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 695a3fc18f0..862fa6f6c4f 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 @@ -21,7 +21,6 @@ export class AllActivitiesService { totalCriticalApplicationCount: 0, totalAtRiskApplicationCount: 0, totalCriticalAtRiskApplicationCount: 0, - newApplications: [], }); reportSummary$ = this.reportSummarySubject$.asObservable(); @@ -54,11 +53,6 @@ export class AllActivitiesService { this.setCriticalAppsReportSummary(report.summaryData); } }); - - // New applications changes (from orchestrator's reactive pipeline) - this.dataService.newApplications$.pipe(takeUntilDestroyed()).subscribe((newApps) => { - this.setNewApplications(newApps); - }); } setCriticalAppsReportSummary(summary: OrganizationReportSummary) { @@ -78,7 +72,6 @@ export class AllActivitiesService { totalAtRiskMemberCount: summary.totalAtRiskMemberCount, totalApplicationCount: summary.totalApplicationCount, totalAtRiskApplicationCount: summary.totalAtRiskApplicationCount, - // Note: newApplications now set separately via newApplications$ subscription }); } @@ -98,15 +91,4 @@ export class AllActivitiesService { setTaskCreatedCount(count: number) { this.taskCreatedCountSubject$.next(count); } - - /** - * Updates the newApplications list in the report summary. - * Called when the orchestrator's newApplications$ observable emits. - */ - private setNewApplications(newApps: string[]) { - this.reportSummarySubject$.next({ - ...this.reportSummarySubject$.getValue(), - newApplications: newApps, - }); - } } diff --git a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts index 9689110866a..cca4b1c7a06 100644 --- a/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts +++ b/bitwarden_license/bit-web/src/app/dirt/access-intelligence/activity/all-activity.component.ts @@ -69,8 +69,13 @@ export class AllActivityComponent implements OnInit { this.totalCriticalAppsAtRiskMemberCount = summary.totalCriticalAtRiskMemberCount; this.totalCriticalAppsCount = summary.totalCriticalApplicationCount; this.totalCriticalAppsAtRiskCount = summary.totalCriticalAtRiskApplicationCount; - this.newApplications = summary.newApplications; - this.newApplicationsCount = summary.newApplications.length; + }); + + this.dataService.newApplications$ + .pipe(takeUntilDestroyed(this.destroyRef)) + .subscribe((newApps) => { + this.newApplications = newApps; + this.newApplicationsCount = newApps.length; }); this.allActivitiesService.passwordChangeProgressMetricHasProgressBar$