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

RED-3800 type fix

Browse Source
This commit is contained in:
Timo Bejan 2022-11-21 16:48:59 +02:00
parent 6b63e70c1b
commit 1a0f5a0844
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/models/file/annotation.wrapper.ts
View File

@ -528,7 +528,7 @@ export class AnnotationWrapper implements IListable, Record<string, unknown> {
switch (lastManualChange.annotationStatus) { switch (lastManualChange.annotationStatus) {
case LogEntryStatus.APPROVED: case LogEntryStatus.APPROVED:
case LogEntryStatus.DECLINED: case LogEntryStatus.DECLINED:
return redactionLogEntry.type === 'manual' ? SuperTypes.ManualRedaction : SuperTypes.Redaction; return redactionLogEntry.type === SuperTypes.ManualRedaction ? SuperTypes.ManualRedaction : SuperTypes.Redaction;
case LogEntryStatus.REQUESTED: case LogEntryStatus.REQUESTED:
return SuperTypes.SuggestionChangeLegalBasis; return SuperTypes.SuggestionChangeLegalBasis;
} }
@ -540,7 +540,9 @@ export class AnnotationWrapper implements IListable, Record<string, unknown> {
if (redactionLogEntry.recommendation) { if (redactionLogEntry.recommendation) {
return SuperTypes.Recommendation; return SuperTypes.Recommendation;
} else if (redactionLogEntry.redacted) { } else if (redactionLogEntry.redacted) {
return redactionLogEntry.type === 'manual' ? SuperTypes.ManualRedaction : SuperTypes.Redaction; return redactionLogEntry.type === SuperTypes.ManualRedaction
? SuperTypes.ManualRedaction
: SuperTypes.Redaction;
} else if (redactionLogEntry.hint) { } else if (redactionLogEntry.hint) {
return SuperTypes.Hint; return SuperTypes.Hint;
} }

4
apps/red-ui/src/app/modules/file-preview/dialogs/manual-redaction-dialog/manual-annotation-dialog.component.ts
View File

@ -3,7 +3,7 @@ import { UntypedFormGroup, Validators } from '@angular/forms';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper'; import { ManualRedactionEntryWrapper } from '@models/file/manual-redaction-entry.wrapper';
import { JustificationsService } from '@services/entity-services/justifications.service'; import { JustificationsService } from '@services/entity-services/justifications.service';
import { Dictionary, Dossier, File, IAddRedactionRequest } from '@red/domain'; import { Dictionary, Dossier, File, IAddRedactionRequest, SuperTypes } from '@red/domain';
import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service'; import { ActiveDossiersService } from '@services/dossiers/active-dossiers.service';
import { DictionaryService } from '@services/entity-services/dictionary.service'; import { DictionaryService } from '@services/entity-services/dictionary.service';
import { BaseDialogComponent, CircleButtonTypes } from '@iqser/common-ui'; import { BaseDialogComponent, CircleButtonTypes } from '@iqser/common-ui';
@ -151,7 +151,7 @@ export class ManualAnnotationDialogComponent extends BaseDialogComponent impleme
reason: this.isDictionaryRequest ? [null] : [null, Validators.required], reason: this.isDictionaryRequest ? [null] : [null, Validators.required],
dictionary: this.isDictionaryRequest dictionary: this.isDictionaryRequest
? [this.isFalsePositiveRequest ? 'false_positive' : null, Validators.required] ? [this.isFalsePositiveRequest ? 'false_positive' : null, Validators.required]
: [this.manualRedactionTypeExists ? 'manual' : null, Validators.required], : [this.manualRedactionTypeExists ? SuperTypes.ManualRedaction : null, Validators.required],
comment: [null], comment: [null],
classification: ['non-readable content'], classification: ['non-readable content'],
multiplePages: '', multiplePages: '',

2
apps/red-ui/src/app/services/entity-services/dictionary.service.ts
View File

@ -144,7 +144,7 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
} }
hasManualType(dossierTemplateId: string): boolean { hasManualType(dossierTemplateId: string): boolean {
return !!this._dictionariesMapService.get(dossierTemplateId).find(e => e.type === 'manual'); return !!this._dictionariesMapService.get(dossierTemplateId).find(e => e.type === SuperTypes.ManualRedaction && !e.virtual);
} }
getRedactionTypes(dossierTemplateId: string): Dictionary[] { getRedactionTypes(dossierTemplateId: string): Dictionary[] {