bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-13 14:53:23 +00:00
Code Issues Releases Wiki Activity

Move ciphers paging logic from jslib to web (#436)

Browse Source 
* Remove paging logic from ciphers base class

* Fix linting

* Fix spacing

* Remove ngx-infinite-scroll (moved to web)
This commit is contained in:
Thomas Rittson
2021-08-04 08:58:37 +10:00
committed by GitHub
parent 65c998dd0d
commit cae26521cc
3 changed files with 5 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
angular/src/components/ciphers.component.ts
View File

@@ -19,19 +19,14 @@ export class CiphersComponent {
loaded: boolean = false;
ciphers: CipherView[] = [];
pagedCiphers: CipherView[] = [];
searchText: string;
searchPlaceholder: string = null;
filter: (cipher: CipherView) => boolean = null;
deleted: boolean = false;
protected searchPending = false;
protected didScroll = false;
protected pageSize = 100;
private searchTimeout: any = null;
private pagedCiphersCount = 0;
private refreshing = false;
constructor(protected searchService: SearchService) { }
@@ -41,37 +36,12 @@ export class CiphersComponent {
this.loaded = true;
}
loadMore() {
if (this.ciphers.length <= this.pageSize) {
return;
}
const pagedLength = this.pagedCiphers.length;
let pagedSize = this.pageSize;
if (this.refreshing && pagedLength === 0 && this.pagedCiphersCount > this.pageSize) {
pagedSize = this.pagedCiphersCount;
}
if (this.ciphers.length > pagedLength) {
this.pagedCiphers = this.pagedCiphers.concat(this.ciphers.slice(pagedLength, pagedLength + pagedSize));
}
this.pagedCiphersCount = this.pagedCiphers.length;
this.didScroll = this.pagedCiphers.length > this.pageSize;
}
async reload(filter: (cipher: CipherView) => boolean = null, deleted: boolean = false) {
this.loaded = false;
this.ciphers = [];
await this.load(filter, deleted);
}
async refresh() {
try {
this.refreshing = true;
await this.reload(this.filter, this.deleted);
} finally {
this.refreshing = false;
}
}
async applyFilter(filter: (cipher: CipherView) => boolean = null) {
this.filter = filter;
await this.search(null);
@@ -82,16 +52,13 @@ export class CiphersComponent {
if (this.searchTimeout != null) {
clearTimeout(this.searchTimeout);
}
const deletedFilter: (cipher: CipherView) => boolean = c => c.isDeleted === this.deleted;
if (timeout == null) {
this.ciphers = await this.searchService.searchCiphers(this.searchText, [this.filter, deletedFilter], indexedCiphers);
await this.resetPaging();
this.doSearch(indexedCiphers);
return;
}
this.searchPending = true;
this.searchTimeout = setTimeout(async () => {
this.ciphers = await this.searchService.searchCiphers(this.searchText, [this.filter, deletedFilter], indexedCiphers);
await this.resetPaging();
this.doSearch(indexedCiphers);
this.searchPending = false;
}, timeout);
}
@@ -116,16 +83,9 @@ export class CiphersComponent {
return !this.searchPending && this.searchService.isSearchable(this.searchText);
}
isPaging() {
const searching = this.isSearching();
if (searching && this.didScroll) {
this.resetPaging();
}
return !searching && this.ciphers.length > this.pageSize;
}
protected deletedFilter: (cipher: CipherView) => boolean = c => c.isDeleted === this.deleted;
async resetPaging() {
this.pagedCiphers = [];
this.loadMore();
protected async doSearch(indexedCiphers?: CipherView[]) {
this.ciphers = await this.searchService.searchCiphers(this.searchText, [this.filter, this.deletedFilter], indexedCiphers);
}
}