From c2eafba442d04a612926c2828824eee1f749c5f5 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Mon, 13 Apr 2020 15:13:10 -0400
Subject: [PATCH 1/3] [Soft Delete] - Added trash to desktop app

---
 jslib                                  |  2 +-
 src/app/vault/ciphers.component.html   |  4 +--
 src/app/vault/groupings.component.html |  5 +++
 src/app/vault/vault.component.html     |  5 +--
 src/app/vault/vault.component.ts       | 50 +++++++++++++++++++-------
 src/app/vault/view.component.html      | 15 ++++++--
 src/locales/en/messages.json           | 28 +++++++++++++++
 7 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/jslib b/jslib
index 72e3893f8e..e9db844285 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 72e3893f8eee79f1e3678839aa194f1096c343ea
+Subproject commit e9db844285e21525f5152e782063f04e02543553
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 4c97530f79..55faedc2ce 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -39,8 +39,8 @@
     </ng-container>
 </div>
 <div class="footer">
-    <button appBlurClick (click)="addCipher()" (contextmenu)="addCipherOptions()" class="block primary"
-        appA11yTitle="{{'addItem' | i18n}}">
+    <button appBlurClick (click)="(deleted ? false : addCipher())" (contextmenu)="addCipherOptions()" 
+        class="block primary" appA11yTitle="{{'addItem' | i18n}}" [disabled]="deleted">
         <i class="fa fa-plus fa-lg" aria-hidden="true"></i>
     </button>
 </div>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index 4f47e43c88..2104dec5a9 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -13,6 +13,11 @@
                     <i class="fa fa-fw fa-star" aria-hidden="true"></i>&nbsp;{{'favorites' | i18n}}
                 </a>
             </li>
+            <li [ngClass]="{active: selectedTrash}">
+                <a href="#" appStopClick appBlurClick (click)="selectTrash()">
+                    <i class="fa fa-fw fa-trash-o" aria-hidden="true"></i>&nbsp;{{'trash' | i18n}}
+                </a>
+            </li>
         </ul>
         <h2>{{'types' | i18n}}</h2>
         <ul>
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 98ab31d7d5..93938ac95f 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -2,7 +2,7 @@
     <app-vault-groupings id="groupings" (onAllClicked)="clearGroupingFilters()" (onFavoritesClicked)="filterFavorites()"
         (onCipherTypeClicked)="filterCipherType($event)" (onFolderClicked)="filterFolder($event.id)"
         (onAddFolder)="addFolder()" (onEditFolder)="editFolder($event.id)"
-        (onCollectionClicked)="filterCollection($event.id)">
+        (onCollectionClicked)="filterCollection($event.id)" (onTrashClicked)="filterDeleted()">
     </app-vault-groupings>
     <app-vault-ciphers id="items" [activeCipherId]="cipherId" (onCipherClicked)="viewCipher($event)"
         (onCipherRightClicked)="viewCipherMenu($event)" (onAddCipher)="addCipher($event)"
@@ -10,7 +10,8 @@
     </app-vault-ciphers>
     <app-vault-view id="details" *ngIf="cipherId && action === 'view'" [cipherId]="cipherId"
         (onCloneCipher)="cloneCipher($event)" (onEditCipher)="editCipher($event)" 
-        (onViewCipherPasswordHistory)="viewCipherPasswordHistory($event)">
+        (onViewCipherPasswordHistory)="viewCipherPasswordHistory($event)" (onRestoredCipher)="restoredCipher($event)"
+        (onDeletedCipher)="deletedCipher($event)">
     </app-vault-view>
     <app-vault-add-edit id="details" *ngIf="action === 'add' || action === 'edit' || action === 'clone'"
         [cloneMode]="action === 'clone'"
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index ef28bb59c3..a7e8cb2f1f 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -76,6 +76,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     addOrganizationId: string = null;
     addCollectionIds: string[] = null;
     showingModal = false;
+    deleted = false;
 
     private modal: ModalComponent = null;
 
@@ -218,7 +219,10 @@ export class VaultComponent implements OnInit, OnDestroy {
                     await this.addCipher();
                 }
 
-                if (params.favorites) {
+                if (params.deleted) {
+                    this.groupingsComponent.selectedTrash = true;
+                    await this.filterDeleted();
+                } else if (params.favorites) {
                     this.groupingsComponent.selectedFavorites = true;
                     await this.filterFavorites();
                 } else if (params.type) {
@@ -263,18 +267,20 @@ export class VaultComponent implements OnInit, OnDestroy {
                 this.viewCipher(cipher);
             }),
         }));
-        menu.append(new remote.MenuItem({
-            label: this.i18nService.t('edit'),
-            click: () => this.functionWithChangeDetection(() => {
-                this.editCipher(cipher);
-            }),
-        }));
-        menu.append(new remote.MenuItem({
-            label: this.i18nService.t('clone'),
-            click: () => this.functionWithChangeDetection(() => {
-                this.cloneCipher(cipher);
-            }),
-        }));
+        if (!cipher.isDeleted) {
+            menu.append(new remote.MenuItem({
+                label: this.i18nService.t('edit'),
+                click: () => this.functionWithChangeDetection(() => {
+                    this.editCipher(cipher);
+                }),
+            }));
+            menu.append(new remote.MenuItem({
+                label: this.i18nService.t('clone'),
+                click: () => this.functionWithChangeDetection(() => {
+                    this.cloneCipher(cipher);
+                }),
+            }));
+        }
 
         switch (cipher.type) {
             case CipherType.Login:
@@ -402,6 +408,13 @@ export class VaultComponent implements OnInit, OnDestroy {
         await this.ciphersComponent.refresh();
     }
 
+    async restoredCipher(cipher: CipherView) {
+        this.cipherId = null;
+        this.action = null;
+        this.go();
+        await this.ciphersComponent.refresh();
+    }
+
     editCipherAttachments(cipher: CipherView) {
         if (this.modal != null) {
             this.modal.close();
@@ -498,6 +511,15 @@ export class VaultComponent implements OnInit, OnDestroy {
         this.go();
     }
 
+    async filterDeleted() {
+        this.ciphersComponent.searchPlaceholder = this.i18nService.t('searchTrash');
+        this.ciphersComponent.deleted = true;
+        await this.ciphersComponent.reload(null, true);
+        this.clearFilters();
+        this.deleted = true;
+        this.go();
+    }
+
     async filterCipherType(type: CipherType) {
         this.ciphersComponent.searchPlaceholder = this.i18nService.t('searchType');
         await this.ciphersComponent.reload((c) => c.type === type);
@@ -630,6 +652,7 @@ export class VaultComponent implements OnInit, OnDestroy {
         this.addCollectionIds = null;
         this.addType = null;
         this.addOrganizationId = null;
+        this.deleted = false;
     }
 
     private go(queryParams: any = null) {
@@ -641,6 +664,7 @@ export class VaultComponent implements OnInit, OnDestroy {
                 type: this.type,
                 folderId: this.folderId,
                 collectionId: this.collectionId,
+                deleted: this.deleted ? true : null,
             };
         }
 
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index b197353aee..8752b096b0 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -273,10 +273,21 @@
     </div>
 </div>
 <div class="footer">
-    <button appBlurClick class="primary" (click)="edit()" appA11yTitle="{{'edit' | i18n}}">
+    <button appBlurClick class="primary" (click)="edit()" appA11yTitle="{{'edit' | i18n}}" *ngIf="!cipher.isDeleted">
         <i class="fa fa-pencil fa-fw fa-lg" aria-hidden="true"></i>
     </button>
-    <button appBlurClick class="primary" *ngIf="!cipher?.organizationId" (click)="clone()" appA11yTitle="{{'clone' | i18n}}">
+    <button appBlurClick class="primary" (click)="restore()" appA11yTitle="{{'restore' | i18n}}" 
+        *ngIf="cipher.isDeleted">
+        <i class="fa fa-undo fa-fw fa-lg" aria-hidden="true"></i>
+    </button>
+    <button appBlurClick class="primary" *ngIf="!cipher?.organizationId && !cipher.isDeleted" (click)="clone()" 
+        appA11yTitle="{{'clone' | i18n}}">
         <i class="fa fa-clone fa-fw fa-lg" aria-hidden="true"></i>
     </button>
+    <div class="right">
+        <button appBlurClick type="button" (click)="delete()" class="danger"
+            appA11yTitle="{{(cipher.isDeleted ? 'permanentlyDelete' : 'delete') | i18n}}">
+            <i class="fa fa-trash-o fa-lg fa-fw" aria-hidden="true"></i>
+        </button>
+    </div>
 </div>
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 2fe5e3ebf3..a932ec9b89 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -1292,5 +1292,33 @@
   "lock": {
     "message": "Lock",
     "description": "Verb form: to make secure or inaccesible by"
+  },
+  "trash": {
+    "message": "Trash",
+    "description": "Noun: a special folder to hold deleted items"
+  },
+  "searchTrash": {
+    "message": "Search trash"
+  },
+  "permanentlyDeleteItem": {
+    "message": "Permanently Delete Item"
+  },
+  "permanentlyDeleteItemConfirmation": {
+    "message": "Are you sure you want to permanently delete this item?"
+  },
+  "permanentlyDeletedItem": {
+    "message": "Permanently Deleted item"
+  },
+  "restoreItem": {
+    "message": "Restore Item"
+  },
+  "restoreItemConfirmation": {
+    "message": "Are you sure you want to restore this item?"
+  },
+  "restoredItem": {
+    "message": "Restored Item"
+  },
+  "permanentlyDelete": {
+    "message": "Permanently Delete"
   }
 }

From 129ecc1ca8bcf3b7d7913fe7fdd8f6bdacc06319 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Mon, 13 Apr 2020 15:29:15 -0400
Subject: [PATCH 2/3] [Soft Delete] - Ciphers add button cleanup

---
 src/app/vault/ciphers.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 55faedc2ce..9c441dab49 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -39,7 +39,7 @@
     </ng-container>
 </div>
 <div class="footer">
-    <button appBlurClick (click)="(deleted ? false : addCipher())" (contextmenu)="addCipherOptions()" 
+    <button appBlurClick (click)="addCipher()" (contextmenu)="addCipherOptions()" 
         class="block primary" appA11yTitle="{{'addItem' | i18n}}" [disabled]="deleted">
         <i class="fa fa-plus fa-lg" aria-hidden="true"></i>
     </button>

From 19a212f2630f278b3fe024ccbd8e454560294eb9 Mon Sep 17 00:00:00 2001
From: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Date: Tue, 14 Apr 2020 15:14:07 -0400
Subject: [PATCH 3/3] [Soft Delete] Changed deleted item toast (trash)

---
 src/locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index a932ec9b89..f5fde1a3cb 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -337,7 +337,7 @@
     "message": "Are you sure you want to delete this item?"
   },
   "deletedItem": {
-    "message": "Deleted item"
+    "message": "Sent item to trash"
   },
   "overwritePasswordConfirmation": {
     "message": "Are you sure you want to overwrite the current password?"