From f98df71ef3916dda1ea78cfb0770afa2e55dad46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Mon, 9 Aug 2021 16:27:21 +0300
Subject: [PATCH] Fixes

---
 .../admin/screens/trash/trash-screen.component.ts  | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
index 64c049be6..901f0fbb8 100644
--- a/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/trash/trash-screen.component.ts
@@ -68,13 +68,15 @@ export class TrashScreenComponent extends BaseListingComponent<DossierListItem>
 
     private get _canRestoreSelected$(): Observable<boolean> {
         return this.screenStateService.selectedEntities$.pipe(
-            map(entities => entities.length && this._canRestore()),
+            map(entities => entities.length && this._canRestore(entities)),
             distinctUntilChanged()
         );
     }
 
     async ngOnInit(): Promise<void> {
-        this._loadingService.loadWhile(this._loadDossiersData());
+        this._loadingService.start();
+        await this._loadDossiersData();
+        this._loadingService.stop();
     }
 
     getRestoreDate(softDeletedTime: string): string {
@@ -82,7 +84,6 @@ export class TrashScreenComponent extends BaseListingComponent<DossierListItem>
     }
 
     hardDelete(dossiers = this.screenStateService.selectedEntities) {
-        const period = this._appConfigService.getConfig('DELETE_RETENTION_HOURS');
         const data = new ConfirmationDialogInput({
             title: dossiers.length > 1 ? _('confirmation-dialog.delete-dossier.title-alt') : _('confirmation-dialog.delete-dossier.title'),
             titleColor: TitleColors.PRIMARY,
@@ -91,7 +92,10 @@ export class TrashScreenComponent extends BaseListingComponent<DossierListItem>
             confirmationText: _('confirmation-dialog.delete-dossier.confirmation-text'),
             requireInput: true,
             denyText: _('confirmation-dialog.delete-dossier.deny-text'),
-            translateParams: { dossierName: dossiers[0].dossierName, period: period }
+            translateParams: {
+                dossierName: dossiers[0].dossierName,
+                period: this._deleteRetentionHours
+            }
         });
         this._adminDialogService.openDialog('confirm', null, data, async () => {
             this._loadingService.loadWhile(this._hardDelete(dossiers));
@@ -106,7 +110,7 @@ export class TrashScreenComponent extends BaseListingComponent<DossierListItem>
         this.screenStateService.setEntities(this._toListItems(await this._dossiersService.getDeleted()));
     }
 
-    private _canRestore(dossiers = this.screenStateService.selectedEntities): boolean {
+    private _canRestore(dossiers: DossierListItem[]): boolean {
         return dossiers.reduce((prev, dossier) => prev && dossier.canRestore, true);
     }