From 21a611c49e66bb8b4dcc5c3a2296148e92611bf8 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Wed, 22 Sep 2021 19:11:21 +0300
Subject: [PATCH] mreged fixes from release

---
 apps/red-ui/src/app/modules/auth/auth.module.ts  |  8 ++++++--
 .../dossier/services/pdf-viewer-data.service.ts  | 16 ++++++++++------
 apps/red-ui/src/assets/config/config.json        |  6 ++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/apps/red-ui/src/app/modules/auth/auth.module.ts b/apps/red-ui/src/app/modules/auth/auth.module.ts
index da70513ff..58c0f1a4d 100644
--- a/apps/red-ui/src/app/modules/auth/auth.module.ts
+++ b/apps/red-ui/src/app/modules/auth/auth.module.ts
@@ -5,6 +5,8 @@ import { HttpClientModule } from '@angular/common/http';
 import { KeycloakAngularModule, KeycloakOptions, KeycloakService } from 'keycloak-angular';
 import { ConfigService } from '@services/config.service';
 import { BASE_HREF } from '../../tokens';
+import { APP_BOOTSTRAPPED } from '../bootstrap/app-bootstrap';
+import { environment } from '@environments/environment';
 
 export function keycloakInitializer(keycloakService: KeycloakService, configService: ConfigService, baseUrl: string): () => Promise<void> {
     let url = configService.values.OAUTH_URL;
@@ -19,8 +21,10 @@ export function keycloakInitializer(keycloakService: KeycloakService, configServ
         },
         initOptions: {
             checkLoginIframe: false,
-            onLoad: 'check-sso',
-            silentCheckSsoRedirectUri: window.location.origin + baseUrl + '/assets/oauth/silent-refresh.html',
+            onLoad: 'login-required',
+            silentCheckSsoRedirectUri: environment.production
+                ? window.location.origin + baseUrl + '/assets/oauth/silent-refresh.html'
+                : null,
             flow: 'standard'
         },
         enableBearerInterceptor: true
diff --git a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
index ee33a98b3..b27639250 100644
--- a/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { forkJoin, Observable, of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map, tap } from 'rxjs/operators';
 import {
     FileManagementControllerService,
     ManualRedactionControllerService,
@@ -24,10 +24,14 @@ export class PdfViewerDataService {
     ) {}
 
     loadActiveFileRedactionLog() {
-        return this._redactionLogControllerService.getRedactionLog(
-            this._appStateService.activeDossierId,
-            this._appStateService.activeFileId
-        );
+        return this._redactionLogControllerService
+            .getRedactionLog(this._appStateService.activeDossierId, this._appStateService.activeFileId)
+            .pipe(
+                tap(
+                    redactionLog => redactionLog.redactionLogEntry.sort((a, b) => a.positions[0].page - b.positions[0].page),
+                    catchError(() => of({}))
+                )
+            );
     }
 
     loadActiveFileData(): Observable<FileDataModel> {
@@ -35,7 +39,7 @@ export class PdfViewerDataService {
         const fileId = this._appStateService.activeFileId;
 
         const file$ = this.downloadOriginalFile(this._appStateService.activeFile);
-        const reactionLog$ = this._redactionLogControllerService.getRedactionLog(dossierId, fileId).pipe(catchError(() => of({})));
+        const reactionLog$ = this.loadActiveFileRedactionLog();
         const redactionChangeLog$ = this._redactionLogControllerService
             .getRedactionChangeLog(dossierId, fileId)
             .pipe(catchError(() => of({})));
diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json
index 22b208d48..4468805d4 100644
--- a/apps/red-ui/src/assets/config/config.json
+++ b/apps/red-ui/src/assets/config/config.json
@@ -1,9 +1,7 @@
 {
-  "ADMIN_CONTACT_NAME": null,
-  "ADMIN_CONTACT_URL": null,
+  "OAUTH_URL": "https://demo.redactmanager.com/auth/realms/redaction",
   "API_URL": "https://demo.redactmanager.com/redaction-gateway-v1",
-  "APP_NAME": "RedactManager",
-  "AUTO_READ_TIME": 1.5,
+  "OAUTH_CLIENT_ID": "redaction",
   "BACKEND_APP_VERSION": "4.4.40",
   "DELETE_RETENTION_HOURS": 96,
   "EULA_URL": "EULA_URL",