bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2026-01-07 19:13:15 +00:00
Code Issues Releases Wiki Activity

[refactor] Dont directly change activeFilter in VaultFilterComponent

Browse Source
This commit is contained in:
addison
2022-03-31 11:59:52 -04:00
parent 629542b90c
commit 8e01081de2
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
angular/src/modules/vault-filter/vault-filter.component.ts
View File

@@ -62,8 +62,8 @@ export class VaultFilterComponent implements OnInit {
async applyFilter(filter: VaultFilter) {
if (filter.refreshCollectionsAndFolders) {
await this.reloadCollectionsAndFolders(filter);
filter = this.pruneInvalidatedFilterSelections(filter);
}
this.fixInvalidFilterSelections(filter);
this.onFilterChange.emit(filter);
}
@@ -82,24 +82,27 @@ export class VaultFilterComponent implements OnInit {
this.onEditFolder.emit(folder);
}
protected fixInvalidFilterSelections(filter: VaultFilter) {
this.fixInvalidFolderSelection(filter);
this.fixInvalidCollectionSelection(filter);
protected pruneInvalidatedFilterSelections(filter: VaultFilter): VaultFilter {
filter = this.pruneInvalidFolderSelection(filter);
filter = this.pruneInvalidCollectionSelection(filter);
return filter;
}
protected fixInvalidFolderSelection(filter: VaultFilter) {
protected pruneInvalidFolderSelection(filter: VaultFilter): VaultFilter {
if (filter.selectedFolder && !this.folders.hasId(filter.selectedFolderId)) {
this.activeFilter.selectedFolder = false;
this.activeFilter.selectedFolderId = null;
filter.selectedFolder = false;
filter.selectedFolderId = null;
}
return filter;
}
protected fixInvalidCollectionSelection(filter: VaultFilter) {
protected pruneInvalidCollectionSelection(filter: VaultFilter): VaultFilter {
if (
filter.selectedCollectionId != null &&
!this.collections.hasId(filter.selectedCollectionId)
) {
this.activeFilter.selectedCollectionId = null;
filter.selectedCollectionId = null;
}
return filter;
}
}