filter ciphers before doing select all, resolves #227

This commit is contained in:
Kyle Spearrin 2018-07-27 21:59:49 -04:00
parent 229b9cf40a
commit 15fc4e5f2d
1 changed files with 12 additions and 2 deletions

View File

@ -18,6 +18,8 @@ import { CipherType } from 'jslib/enums/cipherType';
import { CipherView } from 'jslib/models/view/cipherView'; import { CipherView } from 'jslib/models/view/cipherView';
import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe';
const MaxCheckedCount = 500; const MaxCheckedCount = 500;
@Component({ @Component({
@ -32,10 +34,13 @@ export class CiphersComponent extends BaseCiphersComponent {
cipherType = CipherType; cipherType = CipherType;
private searchPipe: SearchCiphersPipe;
constructor(cipherService: CipherService, protected analytics: Angulartics2, constructor(cipherService: CipherService, protected analytics: Angulartics2,
protected toasterService: ToasterService, protected i18nService: I18nService, protected toasterService: ToasterService, protected i18nService: I18nService,
protected platformUtilsService: PlatformUtilsService) { protected platformUtilsService: PlatformUtilsService) {
super(cipherService); super(cipherService);
this.searchPipe = new SearchCiphersPipe(platformUtilsService);
} }
checkCipher(c: CipherView, select?: boolean) { checkCipher(c: CipherView, select?: boolean) {
@ -46,9 +51,14 @@ export class CiphersComponent extends BaseCiphersComponent {
if (select) { if (select) {
this.selectAll(false); this.selectAll(false);
} }
const selectCount = select && this.ciphers.length > MaxCheckedCount ? MaxCheckedCount : this.ciphers.length; let filteredCiphers = this.ciphers;
if (select) {
filteredCiphers = this.searchPipe.transform(this.ciphers, this.searchText);
}
const selectCount = select && filteredCiphers.length > MaxCheckedCount ?
MaxCheckedCount : filteredCiphers.length;
for (let i = 0; i < selectCount; i++) { for (let i = 0; i < selectCount; i++) {
this.checkCipher(this.ciphers[i], select); this.checkCipher(filteredCiphers[i], select);
} }
} }