From 973c12429daa9e108637cf63ab91a174a6f78552 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Tue, 20 Jul 2021 12:37:44 +0300
Subject: [PATCH 1/2] minor fixes

---
 .../file-actions/file-actions.component.html        | 13 +++----------
 .../file-workload/file-workload.component.html      |  6 +++++-
 .../src/app/services/router-history.service.ts      | 12 +++++-------
 apps/red-ui/src/assets/styles/red-text-styles.scss  |  6 ++++++
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
index dc7c5b5db..a379400af 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-actions/file-actions.component.html
@@ -1,9 +1,6 @@
 <div *ngIf="screen === 'dossier-overview'" [class.active]="actionMenuOpen" class="action-buttons">
     <ng-container *ngTemplateOutlet="actions"></ng-container>
-    <redaction-status-bar
-        *ngIf="fileStatus.isWorkable"
-        [config]="statusBarConfig"
-    ></redaction-status-bar>
+    <redaction-status-bar *ngIf="fileStatus?.isWorkable" [config]="statusBarConfig"></redaction-status-bar>
 </div>
 
 <ng-container *ngIf="screen === 'file-preview'">
@@ -11,7 +8,7 @@
 </ng-container>
 
 <ng-template #actions>
-    <div class="file-actions">
+    <div class="file-actions" *ngIf="fileStatus">
         <!-- delete-->
         <redaction-circle-button
             (action)="openDeleteFileDialog($event)"
@@ -94,11 +91,7 @@
             *ngIf="permissionsService.isReadyForApproval(fileStatus)"
             [disabled]="!permissionsService.canApprove(fileStatus)"
             [tooltipPosition]="tooltipPosition"
-            [tooltip]="
-                permissionsService.canApprove(fileStatus)
-                    ? 'dossier-overview.approve'
-                    : 'dossier-overview.approve-disabled'
-            "
+            [tooltip]="permissionsService.canApprove(fileStatus) ? 'dossier-overview.approve' : 'dossier-overview.approve-disabled'"
             [type]="buttonType"
             icon="red:approved"
         ></redaction-circle-button>
diff --git a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
index 29cd7505d..35627cdd2 100644
--- a/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
+++ b/apps/red-ui/src/app/modules/dossier/components/file-workload/file-workload.component.html
@@ -133,7 +133,11 @@
                         <redaction-empty-state [horizontalPadding]="24" [verticalPadding]="40" icon="red:document" screen="file-preview">
                             <ng-container *ngIf="fileData?.fileStatus?.excludedPages?.includes(activeViewerPage)">
                                 {{ 'file-preview.tabs.annotations.page-is' | translate }}
-                                <a (click)="actionPerformed.emit('view-exclude-pages')" translate="file-preview.excluded-from-redaction">
+                                <a
+                                    (click)="actionPerformed.emit('view-exclude-pages')"
+                                    class="with-underline"
+                                    translate="file-preview.excluded-from-redaction"
+                                >
                                 </a
                                 >.
                             </ng-container>
diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts
index 10ca5e383..5c9fbf827 100644
--- a/apps/red-ui/src/app/services/router-history.service.ts
+++ b/apps/red-ui/src/app/services/router-history.service.ts
@@ -9,13 +9,11 @@ export class RouterHistoryService {
     private _lastDossiersScreen = '/main/dossiers';
 
     constructor(private readonly _router: Router) {
-        this._router.events
-            .pipe(filter(event => event instanceof NavigationEnd))
-            .subscribe((event: NavigationEnd) => {
-                if (event.url.startsWith('/main/dossiers')) {
-                    this._lastDossiersScreen = event.url;
-                }
-            });
+        this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => {
+            if (event.url.startsWith('/main/dossiers')) {
+                this._lastDossiersScreen = event.url;
+            }
+        });
     }
 
     navigateToLastDossiersScreen() {
diff --git a/apps/red-ui/src/assets/styles/red-text-styles.scss b/apps/red-ui/src/assets/styles/red-text-styles.scss
index 9e72c84fd..b80aa2226 100644
--- a/apps/red-ui/src/assets/styles/red-text-styles.scss
+++ b/apps/red-ui/src/assets/styles/red-text-styles.scss
@@ -9,6 +9,12 @@ a {
         color: lighten($primary, 10%);
     }
 
+    &.with-underline {
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+
     cursor: pointer;
 }
 

From 1c953c5b2f98bca6a92217c2e13f1e2bed3aee97 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Tue, 20 Jul 2021 12:38:43 +0300
Subject: [PATCH 2/2] tslint warnings

---
 .../screens/default-colors/default-colors-screen.component.ts   | 2 +-
 .../components/page-exclusion/page-exclusion.component.ts       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
index 043eb25a8..fcaad3be4 100644
--- a/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
+++ b/apps/red-ui/src/app/modules/admin/screens/default-colors/default-colors-screen.component.ts
@@ -9,7 +9,7 @@ import { FilterService } from '@shared/services/filter.service';
 import { SearchService } from '@shared/services/search.service';
 import { ScreenStateService } from '@shared/services/screen-state.service';
 import { BaseListingComponent } from '@shared/base/base-listing.component';
-import { SortingOrders, SortingService } from '../../../../services/sorting.service';
+import { SortingService } from '../../../../services/sorting.service';
 
 @Component({
     templateUrl: './default-colors-screen.component.html',
diff --git a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts
index 0dd8eb2bb..1555cef37 100644
--- a/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/components/page-exclusion/page-exclusion.component.ts
@@ -5,7 +5,6 @@ import { PageRange, ReanalysisControllerService } from '@redaction/red-ui-http';
 import { FileDataModel } from '../../../../models/file/file-data.model';
 import { Toaster } from '../../../../services/toaster.service';
 import { LoadingService } from '../../../../services/loading.service';
-import { TranslateService } from '@ngx-translate/core';
 
 @Component({
     selector: 'redaction-page-exclusion',