bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-19 17:53:39 +00:00
Code Issues Releases Wiki Activity

Fix active account and searchBar observables/subscriptions (#3268)

Browse Source 
* Change subscription to rely on observables and not on BehaviourSubject

* Ensure OnDestroy is added to AppComponent

* Fix check for no active accounts to redirect to the login page instead of lock

* Change subscription handling on SearchBarService

* Fix naming convention: Observables should have a $ suffix

* Remove obsolete linter hint

* Fix activeAccountUnlocked getting exposed as Observable but is instantiated as BehaviourSubject
This commit is contained in:
Daniel James Smith
2022-08-09 21:11:51 +02:00
committed by GitHub
parent c4f9c2cca6
commit cfc8858ef9
13 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/desktop/src/app/layout/search/search-bar.service.ts
View File

@@ -8,15 +8,16 @@ export type SearchBarState = {
@Injectable()
export class SearchBarService {
searchText = new BehaviorSubject<string>(null);
private searchTextSubject = new BehaviorSubject<string>(null);
searchText$ = this.searchTextSubject.asObservable();
private _state = {
enabled: false,
placeholderText: "",
};
// tslint:disable-next-line:member-ordering
state = new BehaviorSubject<SearchBarState>(this._state);
private stateSubject = new BehaviorSubject<SearchBarState>(this._state);
state$ = this.stateSubject.asObservable();
setEnabled(enabled: boolean) {
this._state.enabled = enabled;
@@ -29,10 +30,10 @@ export class SearchBarService {
}
setSearchText(value: string) {
this.searchText.next(value);
this.searchTextSubject.next(value);
}
private updateState() {
this.state.next(this._state);
this.stateSubject.next(this._state);
}
}

9
apps/desktop/src/app/layout/search/search.component.ts
View File

@@ -1,5 +1,6 @@
import { Component, OnDestroy, OnInit } from "@angular/core";
import { UntypedFormControl } from "@angular/forms";
import { Subscription } from "rxjs";
import { StateService } from "@bitwarden/common/abstractions/state.service";
@@ -13,8 +14,10 @@ export class SearchComponent implements OnInit, OnDestroy {
state: SearchBarState;
searchText: UntypedFormControl = new UntypedFormControl(null);
private activeAccountSubscription: Subscription;
constructor(private searchBarService: SearchBarService, private stateService: StateService) {
this.searchBarService.state.subscribe((state) => {
this.searchBarService.state$.subscribe((state) => {
this.state = state;
});
@@ -24,13 +27,13 @@ export class SearchComponent implements OnInit, OnDestroy {
}
ngOnInit() {
this.stateService.activeAccount.subscribe((value) => {
this.activeAccountSubscription = this.stateService.activeAccount$.subscribe((value) => {
this.searchBarService.setSearchText("");
this.searchText.patchValue("");
});
}
ngOnDestroy() {
this.stateService.activeAccount.unsubscribe();
this.activeAccountSubscription.unsubscribe();
}
}