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

Fixed various issues for efsa. Improved UI RED-3303 and others.

Browse Source
This commit is contained in:
Dan Percic 2022-01-28 12:50:22 +02:00 committed by Timo Bejan
parent 9fecd6b889
commit 1af8be9d39
11 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/dossier/dialogs/add-dossier-dialog/add-dossier-dialog.component.html
View File

@ -70,7 +70,7 @@
<p class="download-includes">{{ 'download-includes' | translate }}</p>
<div class="d-flex">
<redaction-select
[height]="150"
[height]="165"
[label]="'report-type.label' | translate: { length: reportTemplateIdsLength }"
[optionTemplate]="reportTemplateOptionTemplate"
[options]="availableReportTypes"
@ -79,7 +79,7 @@
formControlName="reportTemplateIds"
></redaction-select>
<redaction-select
[height]="150"
[height]="165"
[label]="'download-type.label' | translate: { length: downloadFileTypesLength }"
[options]="downloadTypes"
formControlName="downloadFileTypes"

2
apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.html
View File

@ -67,7 +67,7 @@
<input formControlName="classification" name="classification" type="text" />
</div>
<div [class.required]="!isDocumentAdmin" class="iqser-input-group w-300">
<div [class.required]="commentIsMandatory" class="iqser-input-group w-300">
<label translate="manual-annotation.dialog.content.comment"></label>
<textarea formControlName="comment" name="comment" redactionHasScrollbar rows="4" type="text"></textarea>
</div>

6
apps/red-ui/src/app/modules/dossier/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
View File

@ -113,11 +113,15 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
dictionary: this.isDictionaryRequest
? [this.isFalsePositiveRequest ? 'false_positive' : null, Validators.required]
: ['manual', Validators.required],
comment: this.isDocumentAdmin ? [null] : [null, Validators.required],
comment: this.commentIsMandatory ? [null, Validators.required] : [null],
classification: ['non-readable content'],
});
}
get commentIsMandatory() {
return !this.isDocumentAdmin && !this.isDictionaryRequest;
}
private _enhanceManualRedaction(addRedactionRequest: IAddRedactionRequest) {
const legalOption: LegalBasisOption = this.form.get('reason').value;
addRedactionRequest.type = this.form.get('dictionary').value;

2
apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.html
View File

@ -39,7 +39,7 @@
</li>
</ul>
<div [class.required]="!permissionsService.isApprover(this.data.dossier)" class="iqser-input-group w-300">
<div [class.required]="commentIsMandatory" class="iqser-input-group w-300">
<label translate="manual-annotation.dialog.content.comment"></label>
<textarea formControlName="comment" iqserHasScrollbar name="comment" rows="4" type="text"></textarea>
</div>

10
apps/red-ui/src/app/modules/dossier/dialogs/remove-annotations-dialog/remove-annotations-dialog.component.ts
View File

@ -29,7 +29,7 @@ export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
) {
super(_injector, _dialogRef);
this.form = this._formBuilder.group({
comment: this.permissionsService.isApprover(this.data.dossier) ? [null] : [null, Validators.required],
comment: this.commentIsMandatory ? [null, Validators.required] : [null],
});
this.initialFormValue = this.form.getRawValue();
}
@ -38,6 +38,14 @@ export class RemoveAnnotationsDialogComponent extends BaseDialogComponent {
this._dialogRef.close({ comment: this.form.getRawValue().comment });
}
get disabled(): boolean {
return !this.valid;
}
get commentIsMandatory() {
return !this.permissionsService.isApprover(this.data.dossier) && !this.data.removeFromDictionary;
}
printable(annotation: AnnotationWrapper) {
if (annotation.isImage) {
return this._translateService.instant('remove-annotations-dialog.image-type', {

2
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/file-workload/file-workload.component.html
View File

@ -1,7 +1,7 @@
<div class="needs-work">
<redaction-annotation-icon *ngIf="file.analysisRequired" [color]="analysisColor" label="A" type="square"></redaction-annotation-icon>
<redaction-annotation-icon
*ngIf="file.hasUpdates && file.assignee === userService.currentUser.id"
*ngIf="file.hasUpdates && file.assignee === userService.currentUser.id && !file.isApproved"
[color]="updatedColor"
label="U"
type="square"

8
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/view-switch/view-switch.component.scss
View File

@ -1,3 +1,11 @@
@use 'variables';
:host {
display: contents;
}
.disabled {
background-color: variables.$grey-6;
color: variables.$grey-3;
cursor: default;
}

13
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/file-preview-screen.component.ts
View File

@ -10,6 +10,7 @@ import {
ErrorService,
FilterService,
LoadingService,
NestedFilter,
OnAttach,
OnDetach,
processFilters,
@ -652,12 +653,15 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
return;
}
const currentFilters = this._filterService.getGroup('primaryFilters')?.filters || [];
this.rebuildFilters();
if (this.viewModeService.viewMode === 'STANDARD') {
const startTime = new Date().getTime();
const newAnnotations = newAnnotationsFilter ? this.visibleAnnotations.filter(newAnnotationsFilter) : this.visibleAnnotations;
this._handleDeltaAnnotationFilters(currentAnnotations ?? [], newAnnotations);
if (currentFilters) {
this._handleDeltaAnnotationFilters(currentFilters, this.visibleAnnotations);
}
await this._redrawAnnotations(newAnnotations);
console.log(
`[REDACTION] Annotations redraw time: ${new Date().getTime() - startTime} ms for ${newAnnotations.length} annotations`,
@ -675,7 +679,7 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
);
}
private _handleDeltaAnnotationFilters(currentPageAnnotations: AnnotationWrapper[], newPageAnnotations: AnnotationWrapper[]) {
private _handleDeltaAnnotationFilters(currentFilters: NestedFilter[], newAnnotations: AnnotationWrapper[]) {
const primaryFilterGroup = this._filterService.getGroup('primaryFilters');
const primaryFilters = primaryFilterGroup.filters;
const secondaryFilters = this._filterService.getGroup('secondaryFilters').filters;
@ -685,10 +689,9 @@ export class FilePreviewScreenComponent extends AutoUnsubscribe implements OnIni
return;
}
const oldPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(currentPageAnnotations);
const newPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(newPageAnnotations);
const newPageSpecificFilters = this._annotationProcessingService.getAnnotationFilter(newAnnotations);
handleFilterDelta(oldPageSpecificFilters, newPageSpecificFilters, primaryFilters);
handleFilterDelta(currentFilters, newPageSpecificFilters, primaryFilters);
this._filterService.addFilterGroup({
...primaryFilterGroup,
filters: primaryFilters,

3
apps/red-ui/src/app/modules/shared/components/select/select.component.scss
View File

@ -21,7 +21,8 @@
.mat-chip-list-wrapper {
height: 100%;
overflow: scroll;
overflow-x: hidden;
overflow-y: auto;
}
}
}

2
apps/red-ui/src/app/utils/filter-utils.ts
View File

@ -23,6 +23,8 @@ export function handleFilterDelta(oldFilters: INestedFilter[], newFilters: INest
}
}
console.log(newFiltersDelta);
for (const key of Object.keys(newFiltersDelta)) {
const foundFilter = allFilters.find(f => f.id === key);
if (foundFilter) {

2
apps/red-ui/src/app/utils/functions.ts
View File

@ -31,7 +31,7 @@ export function hexToRgb(hex) {
export function getFirstRelevantTextPart(text, direction: 'FORWARD' | 'BACKWARD') {
let spaceCount = 0;
let accumulator = '';
const breakChars = ['/', ':', ' '];
const breakChars = [':', ' '];
const handle = i => {
const char = text[i];