From 7f1035a5377c6c9db6e6aa85bf6dd5a89d3cfe90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adina=20=C8=9Aeudan?= <adina@devplant.ro>
Date: Thu, 13 Jan 2022 12:53:39 +0200
Subject: [PATCH] RED-3070 fix

---
 .../dossier-overview-screen.component.ts      | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
index 19e8e7e71..ccf776a8f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
@@ -15,7 +15,7 @@ import { FileDropOverlayService } from '@upload-download/services/file-drop-over
 import { FileUploadModel } from '@upload-download/model/file-upload.model';
 import { FileUploadService } from '@upload-download/services/file-upload.service';
 import { StatusOverlayService } from '@upload-download/services/status-overlay.service';
-import { Observable, Subscription } from 'rxjs';
+import { Observable } from 'rxjs';
 import { filter, skip, switchMap, tap } from 'rxjs/operators';
 import { convertFiles, Files, handleFileDrop } from '@utils/index';
 import {
@@ -37,7 +37,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { PermissionsService } from '@services/permissions.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { FileAttributesService } from '@services/entity-services/file-attributes.service';
-import { ConfigService as AppConfigService } from '@services/config.service';
 import { ConfigService } from '../config.service';
 import { DossiersService } from '@services/entity-services/dossiers.service';
 import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
@@ -45,7 +44,6 @@ import { LongPressEvent } from '@shared/directives/long-press.directive';
 import { UserPreferenceService } from '@services/user-preference.service';
 import { FilesMapService } from '@services/entity-services/files-map.service';
 import { FilesService } from '@services/entity-services/files.service';
-import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 
 @Component({
     templateUrl: './dossier-overview-screen.component.html',
@@ -74,28 +72,25 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
     @ViewChild('fileInput', { static: true }) private readonly _fileInput: ElementRef;
     @ViewChild(TableComponent) private readonly _tableComponent: TableComponent<Dossier>;
     private _fileAttributeConfigs: IFileAttributeConfig[];
-    private readonly _removableSubscriptions = new Subscription();
 
     constructor(
         protected readonly _injector: Injector,
         private readonly _router: Router,
-        readonly permissionsService: PermissionsService,
         private readonly _loadingService: LoadingService,
         private readonly _dossiersService: DossiersService,
-        private readonly _dossierStatsService: DossierStatsService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
-        private readonly _appConfigService: AppConfigService,
         private readonly _fileUploadService: FileUploadService,
         private readonly _filesService: FilesService,
         private readonly _statusOverlayService: StatusOverlayService,
         private readonly _fileDropOverlayService: FileDropOverlayService,
         private readonly _dossierAttributesService: DossierAttributesService,
         private readonly _fileAttributesService: FileAttributesService,
-        readonly configService: ConfigService,
         private readonly _userPreferenceService: UserPreferenceService,
         private readonly _fileMapService: FilesMapService,
         private readonly _errorService: ErrorService,
-        activatedRoute: ActivatedRoute,
+        readonly permissionsService: PermissionsService,
+        readonly configService: ConfigService,
+        readonly activatedRoute: ActivatedRoute,
     ) {
         super(_injector);
         this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId');
@@ -121,6 +116,8 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
     async ngOnInit(): Promise<void> {
         this._loadEntitiesFromState();
 
+        this._setRemovableSubscriptions();
+
         this.addSubscription = this._fileMapService
             .get$(this.dossierId)
             .pipe(
@@ -194,12 +191,10 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
     }
 
     private _setRemovableSubscriptions(): void {
-        this._removableSubscriptions.add(
-            this._dossiersService
-                .getEntityDeleted$(this.dossierId)
-                .pipe(tap(() => this._handleDeletedDossier()))
-                .subscribe(),
-        );
+        this.addActiveScreenSubscription = this._dossiersService
+            .getEntityDeleted$(this.dossierId)
+            .pipe(tap(() => this._handleDeletedDossier()))
+            .subscribe();
     }
 
     private _handleDeletedDossier(): void {