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 7506f6c5d0b..dc283c99315 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 @@ -4,8 +4,6 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { ActivatedRoute, Router } from "@angular/router"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; import { CipherFormConfigService, DefaultCipherFormConfigService } from "@bitwarden/vault"; @@ -13,7 +11,6 @@ import { CipherFormConfigService, DefaultCipherFormConfigService } from "@bitwar import { EmergencyAccessService } from "../../../emergency-access"; import { EmergencyAccessAttachmentsComponent } from "../attachments/emergency-access-attachments.component"; -import { EmergencyAddEditCipherComponent } from "./emergency-add-edit-cipher.component"; import { EmergencyViewDialogComponent } from "./emergency-view-dialog.component"; @Component({ @@ -23,8 +20,6 @@ import { EmergencyViewDialogComponent } from "./emergency-view-dialog.component" }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class EmergencyAccessViewComponent implements OnInit { - @ViewChild("cipherAddEdit", { read: ViewContainerRef, static: true }) - cipherAddEditModalRef: ViewContainerRef; @ViewChild("attachments", { read: ViewContainerRef, static: true }) attachmentsModalRef: ViewContainerRef; @@ -37,7 +32,6 @@ export class EmergencyAccessViewComponent implements OnInit { private router: Router, private route: ActivatedRoute, private emergencyAccessService: EmergencyAccessService, - private configService: ConfigService, private dialogService: DialogService, ) {} @@ -57,30 +51,10 @@ export class EmergencyAccessViewComponent implements OnInit { } async selectCipher(cipher: CipherView) { - const browserRefreshEnabled = await this.configService.getFeatureFlag( - FeatureFlag.ExtensionRefresh, - ); - - if (browserRefreshEnabled) { - EmergencyViewDialogComponent.open(this.dialogService, { - cipher, - }); - return; - } - - // FIXME PM-15385: Remove below dialog service logic once extension refresh is live. - - // eslint-disable-next-line - const [_, childComponent] = await this.modalService.openViewRef( - EmergencyAddEditCipherComponent, - this.cipherAddEditModalRef, - (comp) => { - comp.cipherId = cipher == null ? null : cipher.id; - comp.cipher = cipher; - }, - ); - - return childComponent; + EmergencyViewDialogComponent.open(this.dialogService, { + cipher, + }); + return; } async load() { @@ -88,6 +62,7 @@ export class EmergencyAccessViewComponent implements OnInit { this.loaded = true; } + // FIXME PM-17747: This will also need to be replaced with the new AttachmentViewDialog async viewAttachments(cipher: CipherView) { await this.modalService.openViewRef( EmergencyAccessAttachmentsComponent, diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts deleted file mode 100644 index 78e3b805eb8..00000000000 --- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts +++ /dev/null @@ -1,104 +0,0 @@ -// FIXME: Update this file to be type safe and remove this and next line -// @ts-strict-ignore -import { DatePipe } from "@angular/common"; -import { Component, OnInit } from "@angular/core"; - -import { CollectionService } from "@bitwarden/admin-console/common"; -import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; -import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; -import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; -import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { SdkService } from "@bitwarden/common/platform/abstractions/sdk/sdk.service"; -import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; -import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; -import { CipherAuthorizationService } from "@bitwarden/common/vault/services/cipher-authorization.service"; -import { DialogService, ToastService } from "@bitwarden/components"; -import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy"; -import { PasswordRepromptService } from "@bitwarden/vault"; - -import { AddEditComponent as BaseAddEditComponent } from "../../../../vault/individual-vault/add-edit.component"; - -@Component({ - selector: "app-org-vault-add-edit", - templateUrl: "../../../../vault/individual-vault/add-edit.component.html", -}) -export class EmergencyAddEditCipherComponent extends BaseAddEditComponent implements OnInit { - originalCipher: Cipher = null; - viewOnly = true; - protected override componentName = "app-org-vault-add-edit"; - - constructor( - cipherService: CipherService, - folderService: FolderService, - i18nService: I18nService, - platformUtilsService: PlatformUtilsService, - auditService: AuditService, - accountService: AccountService, - collectionService: CollectionService, - totpService: TotpService, - passwordGenerationService: PasswordGenerationServiceAbstraction, - messagingService: MessagingService, - eventCollectionService: EventCollectionService, - policyService: PolicyService, - passwordRepromptService: PasswordRepromptService, - organizationService: OrganizationService, - logService: LogService, - dialogService: DialogService, - datePipe: DatePipe, - configService: ConfigService, - billingAccountProfileStateService: BillingAccountProfileStateService, - cipherAuthorizationService: CipherAuthorizationService, - toastService: ToastService, - sdkService: SdkService, - ) { - super( - cipherService, - folderService, - i18nService, - platformUtilsService, - auditService, - accountService, - collectionService, - totpService, - passwordGenerationService, - messagingService, - eventCollectionService, - policyService, - organizationService, - logService, - passwordRepromptService, - dialogService, - datePipe, - configService, - billingAccountProfileStateService, - cipherAuthorizationService, - toastService, - sdkService, - ); - } - - async load() { - this.title = this.i18nService.t("viewItem"); - } - - async ngOnInit(): Promise { - await super.ngOnInit(); - // The base component `ngOnInit` calculates the `viewOnly` property based on cipher properties - // In the case of emergency access, `viewOnly` should always be true, set it manually here after - // the base `ngOnInit` is complete. - this.viewOnly = true; - } - - protected async loadCipher() { - return Promise.resolve(this.originalCipher); - } -} diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 881b87e0819..b565621b776 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -35,7 +35,6 @@ import { EmergencyAccessAddEditComponent } from "../auth/settings/emergency-acce import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emergency-access.component"; import { EmergencyAccessTakeoverComponent } from "../auth/settings/emergency-access/takeover/emergency-access-takeover.component"; import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/view/emergency-access-view.component"; -import { EmergencyAddEditCipherComponent } from "../auth/settings/emergency-access/view/emergency-add-edit-cipher.component"; import { ApiKeyComponent } from "../auth/settings/security/api-key.component"; import { ChangeKdfModule } from "../auth/settings/security/change-kdf/change-kdf.module"; import { SecurityKeysComponent } from "../auth/settings/security/security-keys.component"; @@ -124,7 +123,6 @@ import { SharedModule } from "./shared.module"; EmergencyAccessConfirmComponent, EmergencyAccessTakeoverComponent, EmergencyAccessViewComponent, - EmergencyAddEditCipherComponent, FolderAddEditComponent, FrontendLayoutComponent, HintComponent, @@ -188,7 +186,6 @@ import { SharedModule } from "./shared.module"; EmergencyAccessConfirmComponent, EmergencyAccessTakeoverComponent, EmergencyAccessViewComponent, - EmergencyAddEditCipherComponent, FolderAddEditComponent, FrontendLayoutComponent, HintComponent,