From f163579e52b89c15d2a574a3aaffa0f559df5c2d Mon Sep 17 00:00:00 2001 From: Maciej Zieniuk Date: Fri, 11 Apr 2025 11:22:17 +0100 Subject: [PATCH] splitting the web client --- ...onfirm-key-connector-domain.component.html | 35 +++++++++++++++++++ .../confirm-key-connector-domain.component.ts | 22 ++++++++++++ apps/web/src/app/oss-routing.module.ts | 3 +- .../confirm-key-connector-domain.component.ts | 21 ++--------- 4 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.html create mode 100644 apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts diff --git a/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.html b/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.html new file mode 100644 index 00000000000..9841b038c54 --- /dev/null +++ b/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.html @@ -0,0 +1,35 @@ +@if (loading) { +
+ + {{ "loading" | i18n }} +
+} @else { +

{{ "confirmKeyConnectorDomain" | i18n }}.

+

{{ "keyConnectorDomain" | i18n }}:

+

{{ keyConnectorUrl }}

+ + + +} diff --git a/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts b/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts new file mode 100644 index 00000000000..1d2392faa09 --- /dev/null +++ b/apps/web/src/app/key-management/key-connector/confirm-key-connector-domain.component.ts @@ -0,0 +1,22 @@ +import { CommonModule } from "@angular/common"; +import { Component } from "@angular/core"; +import { RouterModule } from "@angular/router"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { AsyncActionsModule, ButtonModule, IconButtonModule } from "@bitwarden/components"; +import { ConfirmKeyConnectorDomainComponent as BaseConfirmKeyConnectorDomainComponent } from "@bitwarden/key-management-ui"; + +@Component({ + selector: "app-confirm-key-connector-domain", + templateUrl: "confirm-key-connector-domain.component.html", + standalone: true, + imports: [ + CommonModule, + JslibModule, + ButtonModule, + AsyncActionsModule, + IconButtonModule, + RouterModule, + ], +}) +export class ConfirmKeyConnectorDomainComponent extends BaseConfirmKeyConnectorDomainComponent {} diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 67e7fd54c6a..c0801514b91 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -41,7 +41,7 @@ import { NewDeviceVerificationComponent, DeviceVerificationIcon, } from "@bitwarden/auth/angular"; -import { ConfirmKeyConnectorDomainComponent, LockComponent } from "@bitwarden/key-management-ui"; +import { LockComponent } from "@bitwarden/key-management-ui"; import { NewDeviceVerificationNoticePageOneComponent, NewDeviceVerificationNoticePageTwoComponent, @@ -74,6 +74,7 @@ import { CompleteTrialInitiationComponent } from "./billing/trial-initiation/com import { freeTrialTextResolver } from "./billing/trial-initiation/complete-trial-initiation/resolver/free-trial-text.resolver"; import { EnvironmentSelectorComponent } from "./components/environment-selector/environment-selector.component"; import { RouteDataProperties } from "./core"; +import { ConfirmKeyConnectorDomainComponent } from "./key-management/key-connector/confirm-key-connector-domain.component"; import { RemovePasswordComponent } from "./key-management/key-connector/remove-password.component"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; diff --git a/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts b/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts index db25791f228..441c65b2d77 100644 --- a/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts +++ b/libs/key-management-ui/src/key-connector/confirm-key-connector-domain.component.ts @@ -1,29 +1,14 @@ -import { CommonModule } from "@angular/common"; -import { Component, OnInit } from "@angular/core"; -import { ActivatedRoute, Router, RouterModule } from "@angular/router"; +import { Directive, OnInit } from "@angular/core"; +import { ActivatedRoute, Router } from "@angular/router"; -import { JslibModule } from "@bitwarden/angular/jslib.module"; import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { SyncService } from "@bitwarden/common/platform/sync"; import { UserId } from "@bitwarden/common/types/guid"; -import { AsyncActionsModule, ButtonModule, IconButtonModule } from "@bitwarden/components"; import { KdfType } from "@bitwarden/key-management"; -@Component({ - selector: "confirm-key-connector-domain", - templateUrl: "confirm-key-connector-domain.component.html", - standalone: true, - imports: [ - CommonModule, - JslibModule, - ButtonModule, - AsyncActionsModule, - IconButtonModule, - RouterModule, - ], -}) +@Directive() export class ConfirmKeyConnectorDomainComponent implements OnInit { protected loading = true; protected keyConnectorUrl!: string;