From c9df95315f166205a12207b95b7de0376f629834 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Wed, 28 Jul 2021 08:57:51 +0300 Subject: [PATCH] indexed file status flag & remove from dict of skipped annotations --- apps/red-ui/src/app/models/file/annotation.permissions.ts | 3 ++- apps/red-ui/src/app/models/file/file-status.wrapper.ts | 1 + .../dossier/translations/file-status-translations.ts | 1 + apps/red-ui/src/assets/i18n/en.json | 1 + libs/red-ui-http/src/lib/model/fileStatus.ts | 6 ++++-- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/red-ui/src/app/models/file/annotation.permissions.ts b/apps/red-ui/src/app/models/file/annotation.permissions.ts index 2dee7abbc..bb341df90 100644 --- a/apps/red-ui/src/app/models/file/annotation.permissions.ts +++ b/apps/red-ui/src/app/models/file/annotation.permissions.ts @@ -51,7 +51,8 @@ export class AnnotationPermissions { permissions.canRemoveOrSuggestToRemoveOnlyHere = annotation.isRedacted && !annotation.force; permissions.canRemoveOrSuggestToRemoveFromDictionary = - annotation.isRedacted && !annotation.isManualRedaction && annotation.isModifyDictionary && !annotation.force; + (annotation.isRedacted && !annotation.isManualRedaction && annotation.isModifyDictionary && !annotation.force) || + (annotation.isSkipped && annotation.isModifyDictionary); permissions.canAcceptSuggestion = isApprover && (annotation.isSuggestion || annotation.isDeclinedSuggestion); permissions.canRejectSuggestion = diff --git a/apps/red-ui/src/app/models/file/file-status.wrapper.ts b/apps/red-ui/src/app/models/file/file-status.wrapper.ts index 34cfff788..0b43d0b05 100644 --- a/apps/red-ui/src/app/models/file/file-status.wrapper.ts +++ b/apps/red-ui/src/app/models/file/file-status.wrapper.ts @@ -142,6 +142,7 @@ export class FileStatusWrapper { FileStatus.StatusEnum.REPROCESS, FileStatus.StatusEnum.FULLREPROCESS, FileStatus.StatusEnum.OCRPROCESSING, + FileStatus.StatusEnum.INDEXING, FileStatus.StatusEnum.PROCESSING ].includes(this.status); } diff --git a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts b/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts index 7fd447e6e..f1d7221ec 100644 --- a/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts +++ b/apps/red-ui/src/app/modules/dossier/translations/file-status-translations.ts @@ -6,6 +6,7 @@ export const fileStatusTranslations: { [key in FileStatus.StatusEnum]: string } ERROR: _('file-status.error'), EXCLUDED: _('file-status.excluded'), FULLREPROCESS: _('file-status.full-reprocess'), + INDEXING: _('file-status.indexing'), OCR_PROCESSING: _('file-status.ocr-processing'), PROCESSING: _('file-status.processing'), REPROCESS: _('file-status.reprocess'), diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index f19399f80..d536e8b72 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -952,6 +952,7 @@ "ocr-processing": "OCR Processing", "processing": "Processing", "reprocess": "Processing", + "indexing": "Processing", "unassigned": "Unassigned", "under-approval": "Under Approval", "under-review": "Under Review", diff --git a/libs/red-ui-http/src/lib/model/fileStatus.ts b/libs/red-ui-http/src/lib/model/fileStatus.ts index fbefcfb9c..40fe392e3 100644 --- a/libs/red-ui-http/src/lib/model/fileStatus.ts +++ b/libs/red-ui-http/src/lib/model/fileStatus.ts @@ -154,7 +154,8 @@ export namespace FileStatus { | 'UNASSIGNED' | 'UNDER_APPROVAL' | 'UNDER_REVIEW' - | 'UNPROCESSED'; + | 'UNPROCESSED' + | 'INDEXING'; export const StatusEnum = { APPROVED: 'APPROVED' as StatusEnum, ERROR: 'ERROR' as StatusEnum, @@ -166,6 +167,7 @@ export namespace FileStatus { UNASSIGNED: 'UNASSIGNED' as StatusEnum, UNDERAPPROVAL: 'UNDER_APPROVAL' as StatusEnum, UNDERREVIEW: 'UNDER_REVIEW' as StatusEnum, - UNPROCESSED: 'UNPROCESSED' as StatusEnum + UNPROCESSED: 'UNPROCESSED' as StatusEnum, + INDEXING: 'INDEXING' as StatusEnum }; }