From 59f5a884b9109c4a8d4391b3b2a7d4cbd626c731 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo@devplant.ro>
Date: Fri, 30 Oct 2020 15:54:52 +0200
Subject: [PATCH] some filter fixes

---
 .../file-preview-screen.component.html              | 13 +++----------
 .../file-preview-screen.component.ts                |  2 --
 .../project-overview-screen.component.ts            |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
index fb97c259d..797b0110b 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.html
@@ -100,7 +100,7 @@
                         <mat-icon svgIcon="red:arrow-down"></mat-icon>
                     </button>
                     <div class="dot" *ngIf="hasActiveFilters"></div>
-                    <mat-menu #filterMenu="matMenu" xPosition="before">
+                    <mat-menu #filterMenu="matMenu" xPosition="before" (closed)="applyFilters()">
                         <div class="filter-menu-header">
                             <div
                                 class="all-caps-label"
@@ -110,19 +110,13 @@
                                 <div
                                     class="all-caps-label primary pointer"
                                     translate="file-preview.filter-menu.all.label"
-                                    (click)="
-                                        setAllFilters(filters, true);
-                                        applyFilters();
-                                        $event.stopPropagation()
-                                    "
+                                    (click)="setAllFilters(filters, true); $event.stopPropagation()"
                                 ></div>
                                 <div
                                     class="all-caps-label primary pointer"
                                     translate="file-preview.filter-menu.none.label"
                                     (click)="
-                                        setAllFilters(filters, false);
-                                        applyFilters();
-                                        $event.stopPropagation()
+                                        setAllFilters(filters, false); $event.stopPropagation()
                                     "
                                 ></div>
                             </div>
@@ -174,7 +168,6 @@
                                 >
                                     <mat-checkbox
                                         [(ngModel)]="filters[key][subkey]"
-                                        (change)="applyFilters()"
                                         color="primary"
                                     >
                                         <redaction-annotation-icon
diff --git a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
index 95a99ca8a..b5554d63a 100644
--- a/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/file/file-preview-screen/file-preview-screen.component.ts
@@ -295,8 +295,6 @@ export class FilePreviewScreenComponent implements OnInit {
                 }
             }
         }
-
-        this.applyFilters();
     }
 
     public isChecked(key: string): boolean {
diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
index 4c38935ab..462f9eeb5 100644
--- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
+++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
@@ -280,7 +280,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
     }
     public canOpenFile(fileStatus: FileStatus): boolean {
         // TODO check correct condition for this
-        return !this.isError(fileStatus) && (fileStatus.status === 'PROCESSING' || true);
+        return !this.isError(fileStatus) && !this.isProcessing(fileStatus);
     }
 
     public toggleSortByAddedOn() {