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

reason for recommendation and remove from dictionary for hints

Browse Source
This commit is contained in:
Timo Bejan 2021-08-17 09:53:31 +03:00
parent 8412e9f9b8
commit 9f6fa4b545
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/models/file/annotation.permissions.ts
View File

@ -32,7 +32,7 @@ export class AnnotationPermissions {
permissions.canRemoveOrSuggestToRemoveOnlyHere = annotation.isRedacted;
permissions.canRemoveOrSuggestToRemoveFromDictionary =
annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped);
annotation.isModifyDictionary && (annotation.isRedacted || annotation.isSkipped || annotation.isHint);
permissions.canAcceptSuggestion = isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion);
permissions.canRejectSuggestion = isApprover && annotation.isSuggestion;

33
apps/red-ui/src/app/models/file/file-data.model.ts
View File

@ -76,14 +76,8 @@ export class FileDataModel {
}
});
const reasonAnnotationIds = [];
const reasonAnnotationIds: { [key: string]: RedactionLogEntryWrapper[] } = {};
this.redactionLog.redactionLogEntry?.forEach(redactionLogEntry => {
if (redactionLogEntry.manual && (redactionLogEntry.status === 'APPROVED' || redactionLogEntry.status === 'REQUESTED')) {
// for dictionary entries -> I.E accepted recommendations or false positives,
// check reason
reasonAnnotationIds.push(redactionLogEntry.reason);
}
const existingChangeLogEntry = this.redactionChangeLog?.redactionLogEntry?.find(rle => rle.id === redactionLogEntry.id);
// copy the redactionLog Entry
@ -102,15 +96,30 @@ export class FileDataModel {
} else {
result.push(redactionLogEntryWrapper);
}
if (redactionLogEntry.manual && (redactionLogEntry.status === 'APPROVED' || redactionLogEntry.status === 'REQUESTED')) {
// for dictionary entries -> I.E accepted recommendations or false positives,
// check reason
if (!reasonAnnotationIds[redactionLogEntry.reason]) {
reasonAnnotationIds[redactionLogEntry.reason] = [redactionLogEntryWrapper];
} else {
reasonAnnotationIds[redactionLogEntry.reason].push(redactionLogEntryWrapper);
}
}
});
result = result.filter(r => reasonAnnotationIds.indexOf(r.id) < 0);
const reasonKeys = Object.keys(reasonAnnotationIds);
result = result.filter(r => {
const matched = reasonKeys.indexOf(r.id) >= 0;
if (matched) {
reasonAnnotationIds[r.id].forEach(value => {
value.reason = null;
});
}
return !matched;
});
result.forEach(redactionLogEntry => {
if (redactionLogEntry.id === '96a9fad412ac0ccc340c9ee53f97986b') {
redactionLogEntry.dictionaryEntry = true;
}
redactionLogEntry.legalBasisMapping = this.redactionLog.legalBasis;
});