From 7d2d4eafcb2302db212f2b8c45a69cb868db2d98 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 29 Jan 2018 17:57:58 -0500 Subject: [PATCH] highlight active cipher and default folder for add --- src/app/vault/add-edit.component.ts | 2 +- src/app/vault/ciphers.component.html | 14 +++++++------- src/app/vault/ciphers.component.ts | 1 + src/app/vault/vault.component.html | 3 ++- src/scss/list.scss | 7 ++++++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts index 51cb6c6ca7..6e54122ade 100644 --- a/src/app/vault/add-edit.component.ts +++ b/src/app/vault/add-edit.component.ts @@ -113,7 +113,7 @@ export class AddEditComponent implements OnChanges { this.cipher = await cipher.decrypt(); } else { this.cipher = new CipherView(); - this.cipher.folderId = null; // TODO + this.cipher.folderId = this.folderId; this.cipher.type = CipherType.Login; this.cipher.login = new LoginView(); this.cipher.card = new CardView(); diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html index 8a099e8512..504c63dbc1 100644 --- a/src/app/vault/ciphers.component.html +++ b/src/app/vault/ciphers.component.html @@ -11,17 +11,17 @@
diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts index 3856c9ac94..b0a3a34836 100644 --- a/src/app/vault/ciphers.component.ts +++ b/src/app/vault/ciphers.component.ts @@ -17,6 +17,7 @@ import { CipherService } from 'jslib/abstractions/cipher.service'; template: template, }) export class CiphersComponent implements OnInit { + @Input() activeCipherId: string = null; @Output() onCipherClicked = new EventEmitter(); @Output() onAddCipher = new EventEmitter(); diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html index f709c96eee..d7c365a04d 100644 --- a/src/app/vault/vault.component.html +++ b/src/app/vault/vault.component.html @@ -7,6 +7,7 @@ (onCollectionClicked)="filterCollection($event.id)"> @@ -17,7 +18,7 @@