diff --git a/apps/red-ui/proxy.conf.json b/apps/red-ui/proxy.conf.json index b4abf4ba7..33f39510b 100644 --- a/apps/red-ui/proxy.conf.json +++ b/apps/red-ui/proxy.conf.json @@ -5,7 +5,7 @@ "changeOrigin": true, "logLevel": "debug" }, - "/reanalyse": { + "/reanalyze": { "target": "https://timo-redaction-dev.iqser.cloud/", "secure": false, "changeOrigin": true, diff --git a/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts index d3797ecda..021851e5e 100644 --- a/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts +++ b/apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts @@ -1,4 +1,4 @@ -import {Component, Input, OnInit} from '@angular/core'; +import {Component, Input, OnChanges, OnInit, SimpleChanges} from '@angular/core'; import { Color } from '../../utils/types'; export class DoughnutChartConfig { @@ -12,7 +12,7 @@ export class DoughnutChartConfig { templateUrl: './simple-doughnut-chart.component.html', styleUrls: ['./simple-doughnut-chart.component.scss'] }) -export class SimpleDoughnutChartComponent implements OnInit { +export class SimpleDoughnutChartComponent implements OnChanges { @Input() subtitle: string; @Input() config: DoughnutChartConfig[] = []; @@ -30,7 +30,7 @@ export class SimpleDoughnutChartComponent implements OnInit { constructor() { } - ngOnInit() { + ngOnChanges(changes: SimpleChanges): void { this.calculateChartData(); this.cx = this.radius + (this.strokeWidth / 2); this.cy = this.radius + (this.strokeWidth / 2); @@ -76,4 +76,6 @@ export class SimpleDoughnutChartComponent implements OnInit { public get parsedConfig() { return this.config.filter((el) => el.value); } + + } diff --git a/apps/red-ui/src/app/screens/file/manual-redaction-dialog/manual-redaction-dialog.component.ts b/apps/red-ui/src/app/screens/file/manual-redaction-dialog/manual-redaction-dialog.component.ts index 77484f389..a9c0cf5cf 100644 --- a/apps/red-ui/src/app/screens/file/manual-redaction-dialog/manual-redaction-dialog.component.ts +++ b/apps/red-ui/src/app/screens/file/manual-redaction-dialog/manual-redaction-dialog.component.ts @@ -49,7 +49,7 @@ export class ManualRedactionDialogComponent implements OnInit { saveManualRedaction() { const mre = Object.assign({}, this.addRedactionRequest); this._enhanceManualRedaction(mre); - this._manualRedactionControllerService.requestAddRedaction(mre, this._appStateService.activeProject.project.projectId, this._appStateService.activeFile.fileId).subscribe(ok => { + this._manualRedactionControllerService.addRedaction(mre, this._appStateService.activeProject.project.projectId, this._appStateService.activeFile.fileId).subscribe(ok => { this._notificationService.showToastNotification(this._translateService.instant('manual-redaction.dialog.add-redaction.success.label'), null, NotificationType.SUCCESS); this.dialogRef.close(); }, (err) => { diff --git a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html index b7c72cab2..b1bc8f435 100644 --- a/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html +++ b/apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html @@ -34,7 +34,7 @@
- {{'project-overview.table-header.title.label'| translate:{ length: appStateService.activeProject?.files.length || 0 } }} + {{'project-overview.table-header.title.label'| translate:{length: appStateService.activeProject?.files.length || 0} }}
@@ -58,9 +58,9 @@
+ [routerLink]="canOpenFile(fileStatus.status) ? ['/ui/projects/'+projectId+'/file/'+fileStatus.fileId] : []">
{{ fileStatus.filename }}
@@ -91,10 +91,6 @@ [matTooltip]="'project-overview.delete.action.label'|translate"> - - - - - 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 cd90da7a9..674ad8dfc 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 @@ -190,4 +190,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy { } + canOpenFile(fileStatus: FileStatus): boolean { + return fileStatus === 'PROCESSED' || fileStatus === 'REVIEWED'; + } } diff --git a/docker/common/nginx/nginx.conf.template b/docker/common/nginx/nginx.conf.template index 47823c96d..10d20d315 100644 --- a/docker/common/nginx/nginx.conf.template +++ b/docker/common/nginx/nginx.conf.template @@ -23,7 +23,7 @@ server { location /manualRedaction { proxy_pass $API_URL; } - location /reanalyse { + location /reanalyze { proxy_pass $API_URL; } location /upload {