Prefer constructor init

This commit is contained in:
Matt Gibson 2024-04-25 10:49:09 -04:00
parent 7d43c62c2e
commit f310da3a72
No known key found for this signature in database
GPG Key ID: 963EE038B0581878
1 changed files with 4 additions and 13 deletions

View File

@ -1,8 +1,8 @@
import { animate, state, style, transition, trigger } from "@angular/animations";
import { ConnectedPosition } from "@angular/cdk/overlay";
import { Component, OnDestroy, OnInit } from "@angular/core";
import { Component } from "@angular/core";
import { Router } from "@angular/router";
import { combineLatest, firstValueFrom, map, Observable, Subject, switchMap } from "rxjs";
import { combineLatest, firstValueFrom, map, Observable, switchMap } from "rxjs";
import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
@ -50,7 +50,7 @@ type InactiveAccount = ActiveAccount & {
]),
],
})
export class AccountSwitcherComponent implements OnInit, OnDestroy {
export class AccountSwitcherComponent {
activeAccount$: Observable<ActiveAccount | null>;
inactiveAccounts$: Observable<{ [userId: string]: InactiveAccount }>;
authStatus = AuthenticationStatus;
@ -72,8 +72,6 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy {
},
];
private destroy$ = new Subject<void>();
showSwitcher$: Observable<boolean>;
numberOfAccounts$: Observable<number>;
@ -87,9 +85,7 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy {
private environmentService: EnvironmentService,
private loginEmailService: LoginEmailServiceAbstraction,
private accountService: AccountService,
) {}
async ngOnInit(): Promise<void> {
) {
this.activeAccount$ = this.accountService.activeAccount$.pipe(
switchMap(async (active) => {
if (active == null) {
@ -147,11 +143,6 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy {
);
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
toggle() {
this.isOpen = !this.isOpen;
}