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

fixed corner case issues

Browse Source
This commit is contained in:
Timo Bejan 2020-10-19 11:37:29 +03:00
parent a5f8a0a502
commit b61e7cae31
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/proxy.conf.json
View File

@ -5,7 +5,7 @@
"changeOrigin": true,
"logLevel": "debug"
},
"/reanalyse": {
"/reanalyze": {
"target": "https://timo-redaction-dev.iqser.cloud/",
"secure": false,
"changeOrigin": true,

8
apps/red-ui/src/app/components/simple-doughnut-chart/simple-doughnut-chart.component.ts
View File

@ -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);
}
}

2
apps/red-ui/src/app/screens/file/manual-redaction-dialog/manual-redaction-dialog.component.ts
View File

@ -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) => {

12
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
View File

@ -34,7 +34,7 @@
<div class="left-container">
<div class="table-header">
<span class="all-caps-label">
{{'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} }}
</span>
<div class="actions">
<div translate="project-overview.table-header.bulk-select.label"></div>
@ -58,9 +58,9 @@
</div>
<div class="table-item"
[class.pointer]="fileStatus.status === 'PROCESSED'"
[class.pointer]="canOpenFile(fileStatus.status)"
*ngFor="let fileStatus of appStateService.activeProject.files | sortBy: sortingOption.order:sortingOption.column; trackBy:fileId"
[routerLink]="fileStatus.status === 'PROCESSED' ? ['/ui/projects/'+projectId+'/file/'+fileStatus.fileId] : []">
[routerLink]="canOpenFile(fileStatus.status) ? ['/ui/projects/'+projectId+'/file/'+fileStatus.fileId] : []">
<div class="flex-6 table-item-title min-width" [matTooltip]="'['+fileStatus.status+'] '+fileStatus.filename ">
{{ fileStatus.filename }}
</div>
@ -91,10 +91,6 @@
[matTooltip]="'project-overview.delete.action.label'|translate">
<mat-icon svgIcon="red:trash"></mat-icon>
</button>
<!-- <button (click)="reanalyseFile($event,fileStatus)" color="accent" mat-icon-button-->
<!-- [matTooltip]="'project-overview.reanalyse.action.label'|translate">-->
<!-- <mat-icon svgIcon="red:refresh"></mat-icon>-->
<!-- </button>-->
<button (click)="$event.stopPropagation()" color="accent" mat-icon-button
[matTooltip]="'project-overview.report.action.label'|translate">
<mat-icon svgIcon="red:report"></mat-icon>
@ -103,7 +99,7 @@
[matTooltip]="'project-overview.assign.action.label'|translate">
<mat-icon svgIcon="red:assign"></mat-icon>
</button>
<button (click)="$event.stopPropagation()" color="accent" mat-icon-button
<button (click)="reanalyseFile($event,fileStatus)" color="accent" mat-icon-button
[matTooltip]="'project-overview.bar-charts.action.label'|translate">
<mat-icon svgIcon="red:analyse"></mat-icon>
</button>

3
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.ts
View File

@ -190,4 +190,7 @@ export class ProjectOverviewScreenComponent implements OnInit, OnDestroy {
}
canOpenFile(fileStatus: FileStatus): boolean {
return fileStatus === 'PROCESSED' || fileStatus === 'REVIEWED';
}
}

2
docker/common/nginx/nginx.conf.template
View File

@ -23,7 +23,7 @@ server {
location /manualRedaction {
proxy_pass $API_URL;
}
location /reanalyse {
location /reanalyze {
proxy_pass $API_URL;
}
location /upload {