From 2a15b5cf63338ee46ba11a6813c02885df57f099 Mon Sep 17 00:00:00 2001
From: rr-bw <102181210+rr-bw@users.noreply.github.com>
Date: Thu, 22 May 2025 11:53:29 -0700
Subject: [PATCH] [PM-18721] add initializing property
---
...ency-access-takeover-dialog.component.html | 27 +++++++++++++------
...rgency-access-takeover-dialog.component.ts | 17 +++++++-----
2 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
index 5bc10fcbe1f..b3fbc4e1bbb 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.html
@@ -5,15 +5,26 @@
-
{{
- "emergencyAccessLoggedOutWarning" | i18n: dialogData.grantorName
- }}
+ @if (initializing) {
+
+
+ {{ "loading" | i18n }}
+
+ } @else {
+
{{
+ "emergencyAccessLoggedOutWarning" | i18n: dialogData.grantorName
+ }}
-
+
+ }
diff --git a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
index 39e13689d3f..08c1a8c3423 100644
--- a/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
+++ b/apps/web/src/app/auth/settings/emergency-access/takeover/emergency-access-takeover-dialog.component.ts
@@ -65,6 +65,7 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
@ViewChild(InputPasswordComponent)
inputPasswordComponent!: InputPasswordComponent;
+ initializing = true;
inputPasswordFlow = InputPasswordFlow.ChangePasswordDelegation;
masterPasswordPolicyOptions?: MasterPasswordPolicyOptions;
@@ -80,14 +81,16 @@ export class EmergencyAccessTakeoverDialogComponent implements OnInit {
) {}
async ngOnInit() {
- const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
- const grantorPolicies = await this.emergencyAccessService.getGrantorPolicies(
- this.dialogData.emergencyAccessId,
- );
+ // const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
+ // const grantorPolicies = await this.emergencyAccessService.getGrantorPolicies(
+ // this.dialogData.emergencyAccessId,
+ // );
- this.masterPasswordPolicyOptions = await firstValueFrom(
- this.policyService.masterPasswordPolicyOptions$(activeUserId, grantorPolicies),
- );
+ // this.masterPasswordPolicyOptions = await firstValueFrom(
+ // this.policyService.masterPasswordPolicyOptions$(activeUserId, grantorPolicies),
+ // );
+
+ this.initializing = false;
}
protected handlePrimaryButtonClick = async () => {