Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

mreged fixes from release

Browse Source
This commit is contained in:
Timo Bejan 2021-09-22 19:11:21 +03:00
parent f086b3d458
commit 21a611c49e
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/red-ui/src/app/modules/auth/auth.module.ts
View File

@ -5,6 +5,8 @@ import { HttpClientModule } from '@angular/common/http';
import { KeycloakAngularModule, KeycloakOptions, KeycloakService } from 'keycloak-angular'; import { KeycloakAngularModule, KeycloakOptions, KeycloakService } from 'keycloak-angular';
import { ConfigService } from '@services/config.service'; import { ConfigService } from '@services/config.service';
import { BASE_HREF } from '../../tokens'; 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> { export function keycloakInitializer(keycloakService: KeycloakService, configService: ConfigService, baseUrl: string): () => Promise<void> {
let url = configService.values.OAUTH_URL; let url = configService.values.OAUTH_URL;
@ -19,8 +21,10 @@ export function keycloakInitializer(keycloakService: KeycloakService, configServ
}, },
initOptions: { initOptions: {
checkLoginIframe: false, checkLoginIframe: false,
onLoad: 'check-sso', onLoad: 'login-required',
silentCheckSsoRedirectUri: window.location.origin + baseUrl + '/assets/oauth/silent-refresh.html', silentCheckSsoRedirectUri: environment.production
? window.location.origin + baseUrl + '/assets/oauth/silent-refresh.html'
: null,
flow: 'standard' flow: 'standard'
}, },
enableBearerInterceptor: true enableBearerInterceptor: true

14
apps/red-ui/src/app/modules/dossier/services/pdf-viewer-data.service.ts
View File

@ -1,6 +1,6 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { forkJoin, Observable, of } from 'rxjs'; import { forkJoin, Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators'; import { catchError, map, tap } from 'rxjs/operators';
import { import {
FileManagementControllerService, FileManagementControllerService,
ManualRedactionControllerService, ManualRedactionControllerService,
@ -24,9 +24,13 @@ export class PdfViewerDataService {
) {} ) {}
loadActiveFileRedactionLog() { loadActiveFileRedactionLog() {
return this._redactionLogControllerService.getRedactionLog( return this._redactionLogControllerService
this._appStateService.activeDossierId, .getRedactionLog(this._appStateService.activeDossierId, this._appStateService.activeFileId)
this._appStateService.activeFileId .pipe(
tap(
redactionLog => redactionLog.redactionLogEntry.sort((a, b) => a.positions[0].page - b.positions[0].page),
catchError(() => of({}))
)
); );
} }
@ -35,7 +39,7 @@ export class PdfViewerDataService {
const fileId = this._appStateService.activeFileId; const fileId = this._appStateService.activeFileId;
const file$ = this.downloadOriginalFile(this._appStateService.activeFile); 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 const redactionChangeLog$ = this._redactionLogControllerService
.getRedactionChangeLog(dossierId, fileId) .getRedactionChangeLog(dossierId, fileId)
.pipe(catchError(() => of({}))); .pipe(catchError(() => of({})));

6
apps/red-ui/src/assets/config/config.json
View File

@ -1,9 +1,7 @@
{ {
"ADMIN_CONTACT_NAME": null, "OAUTH_URL": "https://demo.redactmanager.com/auth/realms/redaction",
"ADMIN_CONTACT_URL": null,
"API_URL": "https://demo.redactmanager.com/redaction-gateway-v1", "API_URL": "https://demo.redactmanager.com/redaction-gateway-v1",
"APP_NAME": "RedactManager", "OAUTH_CLIENT_ID": "redaction",
"AUTO_READ_TIME": 1.5,
"BACKEND_APP_VERSION": "4.4.40", "BACKEND_APP_VERSION": "4.4.40",
"DELETE_RETENTION_HOURS": 96, "DELETE_RETENTION_HOURS": 96,
"EULA_URL": "EULA_URL", "EULA_URL": "EULA_URL",