diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.html b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.html index b50f197a11..011bc75268 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.html +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.html @@ -5,7 +5,13 @@ class="tw-grow" > - @@ -17,7 +23,18 @@

- + +
+ +

{{ "loading" | i18n }}

+
+
+ + {{ "members" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts index 52ec290103..a05f0e6d4d 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/member-access-report.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit } from "@angular/core"; import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; import { FormControl } from "@angular/forms"; import { ActivatedRoute } from "@angular/router"; -import { debounceTime, firstValueFrom, lastValueFrom } from "rxjs"; +import { BehaviorSubject, debounceTime, firstValueFrom, lastValueFrom } from "rxjs"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider"; @@ -48,6 +48,7 @@ export class MemberAccessReportComponent implements OnInit { protected searchControl = new FormControl("", { nonNullable: true }); protected organizationId: OrganizationId; protected orgIsOnSecretsManagerStandalone: boolean; + protected isLoading$ = new BehaviorSubject(true); constructor( private route: ActivatedRoute, @@ -64,6 +65,8 @@ export class MemberAccessReportComponent implements OnInit { } async ngOnInit() { + this.isLoading$.next(true); + const params = await firstValueFrom(this.route.params); this.organizationId = params.organizationId; @@ -74,6 +77,8 @@ export class MemberAccessReportComponent implements OnInit { this.orgIsOnSecretsManagerStandalone = billingMetadata.isOnSecretsManagerStandalone; await this.load(); + + this.isLoading$.next(false); } async load() {