From 0f2860c7161d9a047beac4c3976d8ebc19a309e7 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Thu, 5 Apr 2018 11:11:32 -0400 Subject: [PATCH] move groupings, ciphers, and search pipe to jslib --- src/app/app.module.ts | 2 +- src/app/pipes/search-ciphers.pipe.ts | 36 ---------- src/app/vault/ciphers.component.html | 4 +- src/app/vault/ciphers.component.ts | 60 ++--------------- src/app/vault/groupings.component.ts | 99 ++-------------------------- 5 files changed, 14 insertions(+), 187 deletions(-) delete mode 100644 src/app/pipes/search-ciphers.pipe.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 6e5e2bd05f..31dea4ebd3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -35,7 +35,7 @@ import { StopClickDirective } from 'jslib/angular/directives/stop-click.directiv import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive'; import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe'; -import { SearchCiphersPipe } from './pipes/search-ciphers.pipe'; +import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe'; import { AddEditComponent } from './vault/add-edit.component'; import { AttachmentsComponent } from './vault/attachments.component'; diff --git a/src/app/pipes/search-ciphers.pipe.ts b/src/app/pipes/search-ciphers.pipe.ts deleted file mode 100644 index ca20167c40..0000000000 --- a/src/app/pipes/search-ciphers.pipe.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { - Pipe, - PipeTransform, -} from '@angular/core'; - -import { CipherView } from 'jslib/models/view/cipherView'; - -@Pipe({ - name: 'searchCiphers', -}) -export class SearchCiphersPipe implements PipeTransform { - transform(ciphers: CipherView[], searchText: string): CipherView[] { - if (ciphers == null || ciphers.length === 0) { - return []; - } - - if (searchText == null || searchText.length < 2) { - return ciphers; - } - - searchText = searchText.toLowerCase(); - return ciphers.filter((c) => { - if (c.name != null && c.name.toLowerCase().indexOf(searchText) > -1) { - return true; - } - if (c.subTitle != null && c.subTitle.toLowerCase().indexOf(searchText) > -1) { - return true; - } - if (c.login && c.login.uri != null && c.login.uri.toLowerCase().indexOf(searchText) > -1) { - return true; - } - - return false; - }); - } -} diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index a7e2401358..19633e0f1d 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -8,8 +8,8 @@
- diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts index 851783ca69..0323e24e86 100644 --- a/src/app/vault/ciphers.component.ts +++ b/src/app/vault/ciphers.component.ts @@ -1,67 +1,17 @@ import * as template from './ciphers.component.html'; -import { - Component, - EventEmitter, - Input, - Output, -} from '@angular/core'; +import { Component } from '@angular/core'; import { CipherService } from 'jslib/abstractions/cipher.service'; -import { CipherView } from 'jslib/models/view/cipherView'; +import { CiphersComponent as BaseCiphersComponent } from 'jslib/angular/components/ciphers.component'; @Component({ selector: 'app-vault-ciphers', template: template, }) -export class CiphersComponent { - @Input() activeCipherId: string = null; - @Output() onCipherClicked = new EventEmitter(); - @Output() onCipherRightClicked = new EventEmitter(); - @Output() onAddCipher = new EventEmitter(); - @Output() onAddCipherOptions = new EventEmitter(); - - loaded: boolean = false; - ciphers: CipherView[] = []; - searchText: string; - searchPlaceholder: string = null; - private filter: (cipher: CipherView) => boolean = null; - - constructor(private cipherService: CipherService) { } - - async load(filter: (cipher: CipherView) => boolean = null) { - this.filter = filter; - const ciphers = await this.cipherService.getAllDecrypted(); - - if (this.filter == null) { - this.ciphers = ciphers; - } else { - this.ciphers = ciphers.filter(this.filter); - } - - this.loaded = true; - } - - async refresh() { - this.loaded = false; - this.ciphers = []; - await this.load(this.filter); - } - - cipherClicked(cipher: CipherView) { - this.onCipherClicked.emit(cipher); - } - - cipherRightClicked(cipher: CipherView) { - this.onCipherRightClicked.emit(cipher); - } - - addCipher() { - this.onAddCipher.emit(); - } - - addCipherOptions() { - this.onAddCipherOptions.emit(); +export class CiphersComponent extends BaseCiphersComponent { + constructor(cipherService: CipherService) { + super(cipherService); } } diff --git a/src/app/vault/groupings.component.ts b/src/app/vault/groupings.component.ts index 6df86d8dc9..7dd03ed38d 100644 --- a/src/app/vault/groupings.component.ts +++ b/src/app/vault/groupings.component.ts @@ -1,105 +1,18 @@ import * as template from './groupings.component.html'; -import { - Component, - EventEmitter, - Input, - Output, -} from '@angular/core'; - -import { CipherType } from 'jslib/enums/cipherType'; - -import { CollectionView } from 'jslib/models/view/collectionView'; -import { FolderView } from 'jslib/models/view/folderView'; +import { Component } from '@angular/core'; import { CollectionService } from 'jslib/abstractions/collection.service'; import { FolderService } from 'jslib/abstractions/folder.service'; +import { GroupingsComponent as BaseGroupingsComponent } from 'jslib/angular/components/groupings.component'; + @Component({ selector: 'app-vault-groupings', template: template, }) -export class GroupingsComponent { - @Output() onAllClicked = new EventEmitter(); - @Output() onFavoritesClicked = new EventEmitter(); - @Output() onCipherTypeClicked = new EventEmitter(); - @Output() onFolderClicked = new EventEmitter(); - @Output() onAddFolder = new EventEmitter(); - @Output() onEditFolder = new EventEmitter(); - @Output() onCollectionClicked = new EventEmitter(); - - folders: FolderView[]; - collections: CollectionView[]; - loaded: boolean = false; - cipherType = CipherType; - selectedAll: boolean = false; - selectedFavorites: boolean = false; - selectedType: CipherType = null; - selectedFolder: boolean = false; - selectedFolderId: string = null; - selectedCollectionId: string = null; - - constructor(private collectionService: CollectionService, private folderService: FolderService) { } - - async load() { - await this.loadFolders(); - await this.loadCollections(); - this.loaded = true; - } - - async loadCollections() { - this.collections = await this.collectionService.getAllDecrypted(); - } - - async loadFolders() { - this.folders = await this.folderService.getAllDecrypted(); - } - - selectAll() { - this.clearSelections(); - this.selectedAll = true; - this.onAllClicked.emit(); - } - - selectFavorites() { - this.clearSelections(); - this.selectedFavorites = true; - this.onFavoritesClicked.emit(); - } - - selectType(type: CipherType) { - this.clearSelections(); - this.selectedType = type; - this.onCipherTypeClicked.emit(type); - } - - selectFolder(folder: FolderView) { - this.clearSelections(); - this.selectedFolder = true; - this.selectedFolderId = folder.id; - this.onFolderClicked.emit(folder); - } - - addFolder() { - this.onAddFolder.emit(); - } - - editFolder(folder: FolderView) { - this.onEditFolder.emit(folder); - } - - selectCollection(collection: CollectionView) { - this.clearSelections(); - this.selectedCollectionId = collection.id; - this.onCollectionClicked.emit(collection); - } - - clearSelections() { - this.selectedAll = false; - this.selectedFavorites = false; - this.selectedType = null; - this.selectedFolder = false; - this.selectedFolderId = null; - this.selectedCollectionId = null; +export class GroupingsComponent extends BaseGroupingsComponent { + constructor(collectionService: CollectionService, folderService: FolderService) { + super(collectionService, folderService); } }