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

reworked manual redaction entries condition

Browse Source
This commit is contained in:
Timo Bejan 2020-11-10 12:23:03 +02:00
parent 7ccc42b80f
commit e6f3951c2a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/red-ui/src/app/screens/file/model/file-data.model.ts
View File

@ -16,12 +16,14 @@ export class FileDataModel {
}
get entriesToAdd(): ManualRedactionEntry[] {
return this.manualRedactions.entriesToAdd.filter((e) => {
const notDeclined = e.status !== 'DECLINED';
const notAlreadyDrawn = !this.redactionLogEntry.find((r) => r.id === e.id);
const alreadyProcessed = !!e.processedDate && new Date(e.processedDate).getTime() < new Date(this.fileStatus.lastProcessed).getTime();
return this.manualRedactions.entriesToAdd.filter((manualRedaction) => {
const isRequested =
manualRedaction.status === 'REQUESTED' && new Date(manualRedaction.requestDate).getTime() > new Date(this.fileStatus.lastProcessed).getTime();
const isApprovedOrDeclined =
(manualRedaction.status === 'APPROVED' || manualRedaction.status === 'DECLINED') &&
new Date(manualRedaction.requestDate).getTime() > new Date(this.fileStatus.lastProcessed).getTime();
return notDeclined && notAlreadyDrawn && !alreadyProcessed;
return isRequested || isApprovedOrDeclined;
});
}
}