From 2da0b48c3dda5dfd167888d11789c043e7bd27f5 Mon Sep 17 00:00:00 2001
From: Brandon Treston <btreston@bitwarden.com>
Date: Fri, 31 Oct 2025 16:35:59 -0400
Subject: [PATCH] [PM-27688] fix events page not loading (#17166)

* remove unneeded rxjs filter

* add check for canManage

* add null check

* fix provider ID, clean up
---
 .../organizations/manage/events.component.ts  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
index ba758266059..62f6539cc16 100644
--- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts
+++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts
@@ -2,7 +2,7 @@
 // @ts-strict-ignore
 import { Component, OnDestroy, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { concatMap, firstValueFrom, lastValueFrom, map, switchMap, takeUntil } from "rxjs";
+import { concatMap, firstValueFrom, lastValueFrom, map, of, switchMap, takeUntil, tap } from "rxjs";
 
 import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe";
@@ -143,16 +143,23 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe
             getUserId,
             switchMap((userId) => this.providerService.get$(this.organization.providerId, userId)),
             map((provider) => provider != null && provider.canManageUsers),
-            switchMap(() => this.apiService.getProviderUsers(this.organization.id)),
-            map((providerUsersResponse) =>
-              providerUsersResponse.data.forEach((u) => {
-                const name = this.userNamePipe.transform(u);
-                this.orgUsersUserIdMap.set(u.userId, {
-                  name: `${name} (${this.organization.providerName})`,
-                  email: u.email,
+            switchMap((canManage) => {
+              if (canManage) {
+                return this.apiService.getProviderUsers(this.organization.providerId);
+              }
+              return of(null);
+            }),
+            tap((providerUsersResponse) => {
+              if (providerUsersResponse) {
+                providerUsersResponse.data.forEach((u) => {
+                  const name = this.userNamePipe.transform(u);
+                  this.orgUsersUserIdMap.set(u.userId, {
+                    name: `${name} (${this.organization.providerName})`,
+                    email: u.email,
+                  });
                 });
-              }),
-            ),
+              }
+            }),
           ),
         );
       } catch (e) {