From e6f3951c2aaacf2385661ff471cd1f7235affd4b Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 10 Nov 2020 12:23:03 +0200 Subject: [PATCH] reworked manual redaction entries condition --- .../src/app/screens/file/model/file-data.model.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/app/screens/file/model/file-data.model.ts b/apps/red-ui/src/app/screens/file/model/file-data.model.ts index d3bde71c3..5c4b4a2eb 100644 --- a/apps/red-ui/src/app/screens/file/model/file-data.model.ts +++ b/apps/red-ui/src/app/screens/file/model/file-data.model.ts @@ -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; }); } }