From 56241eba6b31ef0adeb216b52793e5ae67c3482d Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Wed, 17 Nov 2021 18:26:44 +0200
Subject: [PATCH] remove unnecessary event emmiters and move open dialog in
 dossier stats

---
 .../dossier-details.component.html            |  6 +++---
 .../dossier-details.component.ts              | 11 ++++++++--
 .../dossier-overview-screen.component.html    |  2 --
 .../dossier-overview-screen.component.ts      | 21 ++++---------------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
index e0ed918fb..ab5939449 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.html
@@ -23,8 +23,8 @@
                     [tooltip]="'dossier-details.edit-owner' | translate"
                     class="ml-14"
                     icon="iqser:edit"
-                    tooltipPosition="below"
                     iqserHelpMode="edit-dossier-owner"
+                    tooltipPosition="below"
                 ></iqser-circle-button>
             </ng-container>
         </div>
@@ -33,7 +33,7 @@
     <div class="mt-16">
         <div class="all-caps-label" translate="dossier-details.members"></div>
         <redaction-team-members
-            (openAssignDossierMembersDialog)="openAssignDossierMembersDialog.emit()"
+            (openAssignDossierMembersDialog)="openEditDossierDialog(dossier, 'members')"
             [memberIds]="dossier.memberIds"
             [perLine]="9"
         ></redaction-team-members>
@@ -66,7 +66,7 @@
 
         <div [class.mt-24]="!stats.hasFiles" class="pb-32">
             <redaction-dossier-details-stats
-                (openDossierDictionaryDialog)="openDossierDictionaryDialog.emit()"
+                (openDossierDictionaryDialog)="openEditDossierDialog(dossier, 'dossierDictionary')"
                 [dossierAttributes]="dossierAttributes"
                 [dossier]="dossier"
             ></redaction-dossier-details-stats>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
index 744641109..73f53d01c 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/dossier-details/dossier-details.component.ts
@@ -12,6 +12,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 import { DossierStatsService } from '@services/entity-services/dossier-stats.service';
 import { pluck, switchMap } from 'rxjs/operators';
+import { DossiersDialogService } from '../../../../services/dossiers-dialog.service';
 
 @Component({
     selector: 'redaction-dossier-details',
@@ -22,8 +23,6 @@ import { pluck, switchMap } from 'rxjs/operators';
 export class DossierDetailsComponent {
     editingOwner = false;
     @Input() dossierAttributes: DossierAttributeWithValue[];
-    @Output() readonly openAssignDossierMembersDialog = new EventEmitter();
-    @Output() readonly openDossierDictionaryDialog = new EventEmitter();
     @Output() readonly toggleCollapse = new EventEmitter();
     collapseTooltip = _('dossier-details.collapse');
     expandTooltip = _('dossier-details.expand');
@@ -43,6 +42,7 @@ export class DossierDetailsComponent {
         private readonly _userService: UserService,
         private readonly _dossierStatsService: DossierStatsService,
         private readonly _toaster: Toaster,
+        private readonly _dialogService: DossiersDialogService,
         activatedRoute: ActivatedRoute,
     ) {
         this.dossierId = activatedRoute.snapshot.paramMap.get('dossierId');
@@ -77,4 +77,11 @@ export class DossierDetailsComponent {
         const dossierName = dossier.dossierName;
         this._toaster.info(_('assignment.owner'), { params: { ownerName, dossierName } });
     }
+
+    openEditDossierDialog(dossier: Dossier, section: string): void {
+        const data = { dossierId: this.dossierId, section };
+        this._dialogService.openDialog('editDossier', null, data, async () => {
+            await this.appStateService.getFiles(dossier);
+        });
+    }
 }
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
index 9ee22c1c1..705a3304c 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.html
@@ -46,8 +46,6 @@
 
             <div [class.collapsed]="collapsedDetails" class="right-container" iqserHasScrollbar>
                 <redaction-dossier-details
-                    (openAssignDossierMembersDialog)="openAssignDossierMembersDialog()"
-                    (openDossierDictionaryDialog)="openDossierDictionaryDialog()"
                     (toggleCollapse)="collapsedDetails = !collapsedDetails"
                     [dossierAttributes]="dossierAttributes"
                 ></redaction-dossier-details>
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 8912203dc..a3920dc46 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
@@ -20,7 +20,6 @@ import * as moment from 'moment';
 import { Observable, timer } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
 import { convertFiles, Files, handleFileDrop } from '@utils/index';
-import { DossiersDialogService } from '../../../services/dossiers-dialog.service';
 import {
     CircleButtonTypes,
     DefaultListingServices,
@@ -84,7 +83,6 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
         private readonly _dossiersService: DossiersService,
         private readonly _dossierTemplatesService: DossierTemplatesService,
         private readonly _appConfigService: AppConfigService,
-        private readonly _dialogService: DossiersDialogService,
         private readonly _fileUploadService: FileUploadService,
         private readonly _statusOverlayService: StatusOverlayService,
         private readonly _fileDropOverlayService: FileDropOverlayService,
@@ -148,7 +146,10 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
 
         this.addSubscription = this._fileMapService
             .get$(this.dossierId)
-            .pipe(tap(files => this.entitiesService.setEntities(files)))
+            .pipe(
+                tap(files => this.entitiesService.setEntities(files)),
+                tap(() => this._computeAllFilters()),
+            )
             .subscribe();
 
         this._fileDropOverlayService.initFileDropHandling();
@@ -224,20 +225,6 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
         (this._fileInput as any).nativeElement.value = null;
     }
 
-    openAssignDossierMembersDialog(): void {
-        const data = { dossierId: this.dossierId, section: 'members' };
-        this._dialogService.openDialog('editDossier', null, data, async () => {
-            await this.reloadFiles();
-        });
-    }
-
-    openDossierDictionaryDialog() {
-        const data = { dossierId: this.dossierId, section: 'dossierDictionary' };
-        this._dialogService.openDialog('editDossier', null, data, async () => {
-            await this.reloadFiles();
-        });
-    }
-
     recentlyModifiedChecker = (file: File) =>
         moment(file.lastUpdated).add(this._appConfigService.values.RECENT_PERIOD_IN_HOURS, 'hours').isAfter(moment());