devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Show folders and properly filter collections (#2688)

This commit is contained in:
Robyn MacCallum 2022-05-16 12:18:04 -04:00 committed by GitHub
parent b11e13007c
commit fae7fd9378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/browser/src/popup/vault/ciphers.component.ts
View File

@ -115,7 +115,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
} }
await this.load(this.buildFilter()); await this.load(this.buildFilter());
} else if (params.folderId) { } else if (params.folderId) {
this.showVaultFilter = false; this.showVaultFilter = true;
this.folderId = params.folderId === "none" ? null : params.folderId; this.folderId = params.folderId === "none" ? null : params.folderId;
this.searchPlaceholder = this.i18nService.t("searchFolder"); this.searchPlaceholder = this.i18nService.t("searchFolder");
if (this.folderId != null) { if (this.folderId != null) {

2
apps/browser/src/popup/vault/vault-filter.component.html
View File

@ -115,7 +115,7 @@
</button> </button>
</div> </div>
</div> </div>
<div class="box list" *ngIf="!selectedOrganization && nestedFolders?.length"> <div class="box list" *ngIf="nestedFolders?.length">
<h2 class="box-header"> <h2 class="box-header">
{{ "folders" | i18n }} {{ "folders" | i18n }}
<span class="flex-right">{{ folderCount }}</span> <span class="flex-right">{{ folderCount }}</span>

4
apps/browser/src/popup/vault/vault-filter.component.ts
View File

@ -174,7 +174,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
} }
async loadCollections() { async loadCollections() {
const allCollections = await this.vaultFilterService.buildCollections(); const allCollections = await this.vaultFilterService.buildCollections(
this.selectedOrganization
);
this.collections = allCollections.fullList; this.collections = allCollections.fullList;
this.nestedCollections = allCollections.nestedList; this.nestedCollections = allCollections.nestedList;
} }