From 1cb9deac7c34e4e7f9a2ac14cc4d18785ade6d27 Mon Sep 17 00:00:00 2001 From: Oscar Hinton Date: Fri, 25 Jul 2025 23:42:33 +0200 Subject: [PATCH] [PM-22111] Migrate emergency access to standalone (#14958) Migrate emergency access to standalone. --- .../confirm/emergency-access-confirm.component.ts | 5 +++-- .../emergency-access-add-edit.component.ts | 5 +++-- .../emergency-access/emergency-access.component.ts | 6 ++++-- .../emergency-access-takeover-dialog.component.ts | 1 - .../view/emergency-access-view.component.ts | 4 ++-- apps/web/src/app/shared/loose-components.module.ts | 12 ------------ 6 files changed, 12 insertions(+), 21 deletions(-) diff --git a/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts b/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts index cd7a585f3b1..641dde66cc4 100644 --- a/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/confirm/emergency-access-confirm.component.ts @@ -8,6 +8,8 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service" import { DialogConfig, DialogRef, DIALOG_DATA, DialogService } from "@bitwarden/components"; import { KeyService } from "@bitwarden/key-management"; +import { SharedModule } from "../../../../shared"; + // FIXME: update to use a const object instead of a typescript enum // eslint-disable-next-line @bitwarden/platform/no-enums export enum EmergencyAccessConfirmDialogResult { @@ -24,9 +26,8 @@ type EmergencyAccessConfirmDialogData = { publicKey: Uint8Array; }; @Component({ - selector: "emergency-access-confirm", templateUrl: "emergency-access-confirm.component.html", - standalone: false, + imports: [SharedModule], }) export class EmergencyAccessConfirmComponent implements OnInit { loading = true; diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts index 2f3f3a20b04..baa0f396fc5 100644 --- a/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts @@ -14,6 +14,8 @@ import { ToastService, } from "@bitwarden/components"; +import { SharedModule } from "../../../shared/shared.module"; +import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component"; import { EmergencyAccessService } from "../../emergency-access"; import { EmergencyAccessType } from "../../emergency-access/enums/emergency-access-type"; @@ -34,9 +36,8 @@ export enum EmergencyAccessAddEditDialogResult { Deleted = "deleted", } @Component({ - selector: "emergency-access-add-edit", templateUrl: "emergency-access-add-edit.component.html", - standalone: false, + imports: [SharedModule, PremiumBadgeComponent], }) export class EmergencyAccessAddEditComponent implements OnInit { loading = true; diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts index bc4bfc5ef1d..6de647dc5ce 100644 --- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts @@ -18,6 +18,9 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DialogService, ToastService } from "@bitwarden/components"; +import { HeaderModule } from "../../../layouts/header/header.module"; +import { SharedModule } from "../../../shared/shared.module"; +import { PremiumBadgeComponent } from "../../../vault/components/premium-badge.component"; import { EmergencyAccessService } from "../../emergency-access"; import { EmergencyAccessStatusType } from "../../emergency-access/enums/emergency-access-status-type"; import { EmergencyAccessType } from "../../emergency-access/enums/emergency-access-type"; @@ -40,9 +43,8 @@ import { } from "./takeover/emergency-access-takeover-dialog.component"; @Component({ - selector: "emergency-access", templateUrl: "emergency-access.component.html", - standalone: false, + imports: [SharedModule, HeaderModule, PremiumBadgeComponent], }) export class EmergencyAccessComponent implements OnInit { loaded = false; 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 3ad9ce6b1fb..2619e6852b3 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 @@ -49,7 +49,6 @@ export type EmergencyAccessTakeoverDialogResultType = * @link https://bitwarden.com/help/emergency-access/ */ @Component({ - standalone: true, selector: "auth-emergency-access-takeover-dialog", templateUrl: "./emergency-access-takeover-dialog.component.html", imports: [ diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts index 607e6e6a2c7..ce46e624972 100644 --- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-access-view.component.ts @@ -7,15 +7,15 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; import { CipherFormConfigService, DefaultCipherFormConfigService } from "@bitwarden/vault"; +import { SharedModule } from "../../../../shared/shared.module"; import { EmergencyAccessService } from "../../../emergency-access"; import { EmergencyViewDialogComponent } from "./emergency-view-dialog.component"; @Component({ - selector: "emergency-access-view", templateUrl: "emergency-access-view.component.html", providers: [{ provide: CipherFormConfigService, useClass: DefaultCipherFormConfigService }], - standalone: false, + imports: [SharedModule], }) export class EmergencyAccessViewComponent implements OnInit { id: EmergencyAccessId | null = null; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 4de217f331b..637e1b77ce0 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -15,10 +15,6 @@ import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations import { RecoverDeleteComponent } from "../auth/recover-delete.component"; import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component"; import { DangerZoneComponent } from "../auth/settings/account/danger-zone.component"; -import { EmergencyAccessConfirmComponent } from "../auth/settings/emergency-access/confirm/emergency-access-confirm.component"; -import { EmergencyAccessAddEditComponent } from "../auth/settings/emergency-access/emergency-access-add-edit.component"; -import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emergency-access.component"; -import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/view/emergency-access-view.component"; import { UserVerificationModule } from "../auth/shared/components/user-verification"; import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; @@ -66,10 +62,6 @@ import { SharedModule } from "./shared.module"; ], declarations: [ AcceptFamilySponsorshipComponent, - EmergencyAccessAddEditComponent, - EmergencyAccessComponent, - EmergencyAccessConfirmComponent, - EmergencyAccessViewComponent, OrgEventsComponent, OrgExposedPasswordsReportComponent, OrgInactiveTwoFactorReportComponent, @@ -89,10 +81,6 @@ import { SharedModule } from "./shared.module"; exports: [ UserVerificationModule, PremiumBadgeComponent, - EmergencyAccessAddEditComponent, - EmergencyAccessComponent, - EmergencyAccessConfirmComponent, - EmergencyAccessViewComponent, OrganizationLayoutComponent, OrgEventsComponent, OrgExposedPasswordsReportComponent,