From dd56c9bc8727617b9c7c8ecd464aeb1dac1830a2 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Tue, 27 Apr 2021 18:49:02 +0200
Subject: [PATCH] Add auto delete warning to trash page (#953)

* Add warning to trash page
---
 src/app/organizations/vault/vault.component.html | 3 +++
 src/app/organizations/vault/vault.component.ts   | 9 ++++++++-
 src/app/vault/vault.component.html               | 3 +++
 src/app/vault/vault.component.ts                 | 4 ++++
 src/locales/en/messages.json                     | 6 ++++++
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html
index 521f7e3650..23b396cd55 100644
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -29,6 +29,9 @@
                     </button>
                 </div>
             </div>
+            <app-callout type="warning" *ngIf="deleted" icon="fa-warning">
+                {{trashCleanupWarning}}
+            </app-callout>
             <app-org-vault-ciphers (onCipherClicked)="editCipher($event)"
                 (onAttachmentsClicked)="editCipherAttachments($event)" (onAddCipher)="addCipher()"
                 (onCollectionsClicked)="editCipherCollections($event)" (onEventsClicked)="viewEvents($event)"
diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts
index 74d9379f38..2aa1291b07 100644
--- a/src/app/organizations/vault/vault.component.ts
+++ b/src/app/organizations/vault/vault.component.ts
@@ -15,6 +15,7 @@ import {
 
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { MessagingService } from 'jslib/abstractions/messaging.service';
+import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { SyncService } from 'jslib/abstractions/sync.service';
 import { UserService } from 'jslib/abstractions/user.service';
 
@@ -52,6 +53,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     collectionId: string = null;
     type: CipherType = null;
     deleted: boolean = false;
+    trashCleanupWarning: string = null;
 
     modal: ModalComponent = null;
 
@@ -59,9 +61,14 @@ export class VaultComponent implements OnInit, OnDestroy {
         private router: Router, private changeDetectorRef: ChangeDetectorRef,
         private syncService: SyncService, private i18nService: I18nService,
         private componentFactoryResolver: ComponentFactoryResolver, private messagingService: MessagingService,
-        private broadcasterService: BroadcasterService, private ngZone: NgZone) { }
+        private broadcasterService: BroadcasterService, private ngZone: NgZone,
+        private platformUtilsService: PlatformUtilsService) { }
 
     ngOnInit() {
+        this.trashCleanupWarning = this.i18nService.t(
+            this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning'
+        );
+
         const queryParams = this.route.parent.params.subscribe(async params => {
             this.organization = await this.userService.getOrganization(params.organizationId);
             this.groupingsComponent.organization = this.organization;
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index ec8e015ea1..8752d5e15e 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -28,6 +28,9 @@
                     </button>
                 </div>
             </div>
+            <app-callout type="warning" *ngIf="deleted" icon="fa-warning">
+                {{trashCleanupWarning}}
+            </app-callout>
             <app-vault-ciphers (onCipherClicked)="editCipher($event)"
                 (onAttachmentsClicked)="editCipherAttachments($event)" (onAddCipher)="addCipher()"
                 (onShareClicked)="shareCipher($event)" (onCollectionsClicked)="editCipherCollections($event)"
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index a27b4dc82b..56f99588a3 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -65,6 +65,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     showUpdateKey = false;
     showPremiumCallout = false;
     deleted: boolean = false;
+    trashCleanupWarning: string = null;
 
     modal: ModalComponent = null;
 
@@ -79,6 +80,9 @@ export class VaultComponent implements OnInit, OnDestroy {
     async ngOnInit() {
         this.showVerifyEmail = !(await this.tokenService.getEmailVerified());
         this.showBrowserOutdated = window.navigator.userAgent.indexOf('MSIE') !== -1;
+        this.trashCleanupWarning = this.i18nService.t(
+            this.platformUtilsService.isSelfHost() ? 'trashCleanupWarningSelfHosted' : 'trashCleanupWarning'
+        );
 
         const queryParamsSub = this.route.queryParams.subscribe(async params => {
             await this.syncService.fullSync(false);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 8fc079df47..064aee50eb 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -3875,5 +3875,11 @@
         "example": "John Smith"
       }
     }
+  },
+  "trashCleanupWarning": {
+    "message": "Ciphers that have been in Trash more than 30 days will be automatically deleted."
+  },
+  "trashCleanupWarningSelfHosted": {
+    "message": "Ciphers that have been in Trash for a while will be automatically deleted."
   }
 }