From f502cda56bed1b40a16b4812ec00994fa9619f79 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Tue, 20 Apr 2021 22:43:14 +0300
Subject: [PATCH] Some refactor

---
 .../file-workload/file-workload.component.html       |  4 ++--
 .../file-workload/file-workload.component.ts         | 12 ++++++------
 .../shared/components/filter/filter.component.ts     |  5 ++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.html
index 5c88ae2bd..b89a4ecdc 100644
--- a/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.html
@@ -153,8 +153,8 @@
 </div>
 
 <ng-template #annotationFilterTemplate let-filter="filter">
-    <redaction-type-filter *ngIf="filter.topLevelFilter" [filter]="filter"></redaction-type-filter>
-    <ng-container *ngIf="!filter.topLevelFilter">
+    <redaction-type-filter *ngIf="_(filter).topLevelFilter" [filter]="filter"></redaction-type-filter>
+    <ng-container *ngIf="!_(filter).topLevelFilter">
         <redaction-dictionary-annotation-icon [dictionaryKey]="filter.key"></redaction-dictionary-annotation-icon>
         {{ filter.key | humanize: false }}
     </ng-container>
diff --git a/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.ts b/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.ts
index 2ab4eb6b4..ba2859840 100644
--- a/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.ts
+++ b/apps/red-ui/src/app/modules/projects/components/file-workload/file-workload.component.ts
@@ -28,13 +28,13 @@ export class FileWorkloadComponent {
     @Input() selectedAnnotations: AnnotationWrapper[];
     @Input() activeViewerPage: number;
     @Input() shouldDeselectAnnotationsOnPageChange: boolean;
-    @Output() shouldDeselectAnnotationsOnPageChangeChange = new EventEmitter<boolean>();
     @Input() dialogRef: MatDialogRef<any>;
     @Input() annotationFilters: FilterModel[];
     @Input() fileData: FileDataModel;
     @Input() hideSkipped: boolean;
     @Input() annotationActionsTemplate: TemplateRef<any>;
 
+    @Output() shouldDeselectAnnotationsOnPageChangeChange = new EventEmitter<boolean>();
     @Output() selectAnnotations = new EventEmitter<AnnotationWrapper[] | { annotations: AnnotationWrapper[]; multiSelect: boolean }>();
     @Output() deselectAnnotations = new EventEmitter<AnnotationWrapper[]>();
     @Output() selectPage = new EventEmitter<number>();
@@ -66,11 +66,7 @@ export class FileWorkloadComponent {
         }
     }
 
-    constructor(
-        private _changeDetectorRef: ChangeDetectorRef,
-        private _annotationProcessingService: AnnotationProcessingService,
-        private readonly _permissionsService: PermissionsService
-    ) {}
+    constructor(private readonly _changeDetectorRef: ChangeDetectorRef, private readonly _annotationProcessingService: AnnotationProcessingService) {}
 
     private get firstSelectedAnnotation() {
         return this.selectedAnnotations?.length ? this.selectedAnnotations[0] : null;
@@ -345,4 +341,8 @@ export class FileWorkloadComponent {
         const elements: any[] = this._quickNavigationElement.nativeElement.querySelectorAll(`#quick-nav-page-${page}`);
         FileWorkloadComponent._scrollToFirstElement(elements);
     }
+
+    _(filter): FilterModel {
+        return filter as FilterModel;
+    }
 }
diff --git a/apps/red-ui/src/app/modules/shared/components/filter/filter.component.ts b/apps/red-ui/src/app/modules/shared/components/filter/filter.component.ts
index 345f73c7e..03007cda0 100644
--- a/apps/red-ui/src/app/modules/shared/components/filter/filter.component.ts
+++ b/apps/red-ui/src/app/modules/shared/components/filter/filter.component.ts
@@ -29,7 +29,6 @@ export class FilterComponent implements OnChanges {
     @Input() enableFilterOptions = false;
     @Input() icon: string;
     @Input() chevron = false;
-
     @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
 
     mouseOver = true;
@@ -76,11 +75,11 @@ export class FilterComponent implements OnChanges {
         this._setAllFilters(true);
     }
 
-    public deactivateAllFilters() {
+    deactivateAllFilters() {
         this._setAllFilters(false);
     }
 
-    public get hasActiveFilters(): boolean {
+    get hasActiveFilters(): boolean {
         for (const filter of this.filters ? this.filters : []) {
             if (filter.checked || filter.indeterminate) {
                 return true;