From a78a17a89d660b686ddf742deaef8541b08aafb0 Mon Sep 17 00:00:00 2001 From: Jacob Fink Date: Tue, 3 Oct 2023 16:44:00 -0400 Subject: [PATCH] lazy load and move accept emergency component --- .../accept-emergency.component.html | 0 .../accept-emergency.component.ts | 17 ++++++++++------- apps/web/src/app/oss-routing.module.ts | 6 ++++-- .../src/app/shared/loose-components.module.ts | 3 --- 4 files changed, 14 insertions(+), 12 deletions(-) rename apps/web/src/app/auth/{ => emergency-access}/accept-emergency.component.html (100%) rename apps/web/src/app/auth/{ => emergency-access}/accept-emergency.component.ts (78%) diff --git a/apps/web/src/app/auth/accept-emergency.component.html b/apps/web/src/app/auth/emergency-access/accept-emergency.component.html similarity index 100% rename from apps/web/src/app/auth/accept-emergency.component.html rename to apps/web/src/app/auth/emergency-access/accept-emergency.component.html diff --git a/apps/web/src/app/auth/accept-emergency.component.ts b/apps/web/src/app/auth/emergency-access/accept-emergency.component.ts similarity index 78% rename from apps/web/src/app/auth/accept-emergency.component.ts rename to apps/web/src/app/auth/emergency-access/accept-emergency.component.ts index 8ade8d69025..f65df3d2600 100644 --- a/apps/web/src/app/auth/accept-emergency.component.ts +++ b/apps/web/src/app/auth/emergency-access/accept-emergency.component.ts @@ -1,16 +1,16 @@ import { Component } from "@angular/core"; import { ActivatedRoute, Params, Router } from "@angular/router"; -import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EmergencyAccessAcceptRequest } from "@bitwarden/common/auth/models/request/emergency-access-accept.request"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { BaseAcceptComponent } from "../common/base.accept.component"; +import { BaseAcceptComponent } from "../../common/base.accept.component"; +import { StateService } from "../../core"; +import { I18nService } from "../../core/i18n.service"; +import { EmergencyAccessApiService } from "../core/services/emergency-access/emergency-access-api.service"; @Component({ - selector: "app-accept-emergency", + standalone: true, templateUrl: "accept-emergency.component.html", }) export class AcceptEmergencyComponent extends BaseAcceptComponent { @@ -25,7 +25,7 @@ export class AcceptEmergencyComponent extends BaseAcceptComponent { platformUtilsService: PlatformUtilsService, i18nService: I18nService, route: ActivatedRoute, - private apiService: ApiService, + private emergencyAccessApiService: EmergencyAccessApiService, stateService: StateService ) { super(router, platformUtilsService, i18nService, route, stateService); @@ -34,7 +34,10 @@ export class AcceptEmergencyComponent extends BaseAcceptComponent { async authedHandler(qParams: Params): Promise { const request = new EmergencyAccessAcceptRequest(); request.token = qParams.token; - this.actionPromise = this.apiService.postEmergencyAccessAccept(qParams.id, request); + this.actionPromise = this.emergencyAccessApiService.postEmergencyAccessAccept( + qParams.id, + request + ); await this.actionPromise; await this.stateService.setEmergencyAccessInvitation(null); this.platformUtilService.showToast( diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 3a08a5863a5..6ec42dc5be2 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -18,7 +18,6 @@ import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/ import { FamiliesForEnterpriseSetupComponent } from "./admin-console/organizations/sponsorships/families-for-enterprise-setup.component"; import { CreateOrganizationComponent } from "./admin-console/settings/create-organization.component"; import { SponsoredFamiliesComponent } from "./admin-console/settings/sponsored-families.component"; -import { AcceptEmergencyComponent } from "./auth/accept-emergency.component"; import { AcceptOrganizationComponent } from "./auth/accept-organization.component"; import { HintComponent } from "./auth/hint.component"; import { LockComponent } from "./auth/lock.component"; @@ -125,8 +124,11 @@ const routes: Routes = [ }, { path: "accept-emergency", - component: AcceptEmergencyComponent, data: { titleId: "acceptEmergency", doNotSaveUrl: false }, + loadComponent: () => + import("./auth/emergency-access/accept-emergency.component").then( + (mod) => mod.AcceptEmergencyComponent + ), }, { path: "accept-families-for-enterprise", diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index d73747dd80d..56ba554e5b6 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -18,7 +18,6 @@ import { CreateOrganizationComponent } from "../admin-console/settings/create-or import { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component"; import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component"; import { AuthModule } from "../auth"; -import { AcceptEmergencyComponent } from "../auth/accept-emergency.component"; import { AcceptOrganizationComponent } from "../auth/accept-organization.component"; import { HintComponent } from "../auth/hint.component"; import { LockComponent } from "../auth/lock.component"; @@ -132,7 +131,6 @@ import { SharedModule } from "./shared.module"; SecretsManagerBillingModule, ], declarations: [ - AcceptEmergencyComponent, AcceptFamilySponsorshipComponent, AcceptOrganizationComponent, AccessComponent, @@ -234,7 +232,6 @@ import { SharedModule } from "./shared.module"; exports: [ UserVerificationModule, PremiumBadgeComponent, - AcceptEmergencyComponent, AcceptOrganizationComponent, AccessComponent, AccountComponent,