Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-12-28 17:27:50 +01:00
Code Issues Projects Releases Wiki Activity

filter state in query params

Browse Source
This commit is contained in:
Kyle Spearrin 2018-01-26 23:56:43 -05:00
parent 375f2a1e02
commit b0e78be1f6
3 changed files with 59 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/vault/ciphers.component.ts
View File

@ -27,7 +27,7 @@ export class CiphersComponent implements OnInit {
}
async ngOnInit() {
await this.load();
//await this.load();
}
async load(filter: (cipher: CipherView) => boolean = null) {

4
src/app/vault/vault.component.html
View File

@ -3,8 +3,8 @@
(onAllClicked)="clearGroupingFilters()"
(onFavoritesClicked)="filterFavorites()"
(onCipherTypeClicked)="filterCipherType($event)"
(onFolderClicked)="filterFolder($event)"
(onCollectionClicked)="filterCollection($event)">
(onFolderClicked)="filterFolder($event.id)"
(onCollectionClicked)="filterCollection($event.id)">
</app-vault-groupings>
<app-vault-ciphers id="items"
(onCipherClicked)="viewCipher($event)"

63
src/app/vault/vault.component.ts
View File

@ -28,14 +28,18 @@ import { FolderView } from 'jslib/models/view/folderView';
export class VaultComponent implements OnInit {
@ViewChild(CiphersComponent) ciphersComponent: CiphersComponent;
cipherId: string;
action: string;
cipherId: string = null;
favorites: boolean = false;
type: CipherType = null;
folderId: string = null;
collectionId: string = null;
constructor(private route: ActivatedRoute, private router: Router, private location: Location) {
}
async ngOnInit() {
this.route.queryParams.subscribe((params) => {
this.route.queryParams.subscribe(async (params) => {
if (params['cipherId']) {
const cipherView = new CipherView();
cipherView.id = params['cipherId'];
@ -47,6 +51,18 @@ export class VaultComponent implements OnInit {
} else if (params['action'] === 'add') {
this.addCipher();
}
if (params['favorites']) {
await this.filterFavorites();
} else if (params['type']) {
await this.filterCipherType(parseInt(params['type']));
} else if (params['folderId']) {
await this.filterFolder(params['folderId']);
} else if (params['collectionId']) {
await this.filterCollection(params['collectionId']);
} else {
await this.ciphersComponent.load();
}
});
}
@ -106,25 +122,58 @@ export class VaultComponent implements OnInit {
async clearGroupingFilters() {
await this.ciphersComponent.load();
this.clearFilters();
this.go();
}
async filterFavorites() {
await this.ciphersComponent.load((c) => c.favorite);
this.clearFilters();
this.favorites = true;
this.go();
}
async filterCipherType(type: CipherType) {
await this.ciphersComponent.load((c) => c.type === type);
this.clearFilters();
this.type = type;
this.go();
}
async filterFolder(folder: FolderView) {
await this.ciphersComponent.load((c) => c.folderId === folder.id);
async filterFolder(folderId: string) {
folderId = folderId === 'none' ? null : folderId;
await this.ciphersComponent.load((c) => c.folderId === folderId);
this.clearFilters();
this.folderId = folderId == null ? 'none' : folderId;
this.go();
}
async filterCollection(collection: CollectionView) {
await this.ciphersComponent.load((c) => c.collectionIds.indexOf(collection.id) > -1);
async filterCollection(collectionId: string) {
await this.ciphersComponent.load((c) => c.collectionIds.indexOf(collectionId) > -1);
this.clearFilters();
this.collectionId = collectionId;
this.go();
}
private go(queryParams: any) {
private clearFilters() {
this.folderId = null;
this.collectionId = null;
this.favorites = false;
this.type = null;
}
private go(queryParams: any = null) {
if (queryParams == null) {
queryParams = {
action: this.action,
cipherId: this.cipherId,
favorites: this.favorites ? true : null,
type: this.type,
folderId: this.folderId,
collectionId: this.collectionId,
};
}
const url = this.router.createUrlTree(['vault'], { queryParams: queryParams }).toString();
this.location.go(url);
}