From c5465b8fb35999b29f4121af55352d81b7b97792 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 31 May 2022 11:36:37 +0300 Subject: [PATCH] RED-3800 VW Load Guard adaptation and new processing states --- apps/red-ui/src/app/app-routing.module.ts | 4 ++-- apps/red-ui/src/app/translations/file-status-translations.ts | 3 +++ apps/red-ui/src/assets/config/config.json | 4 ++-- libs/red-domain/src/lib/files/file.model.ts | 4 +++- libs/red-domain/src/lib/files/types.ts | 5 +++++ 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/red-ui/src/app/app-routing.module.ts b/apps/red-ui/src/app/app-routing.module.ts index 1ce33d29d..54a4e122b 100644 --- a/apps/red-ui/src/app/app-routing.module.ts +++ b/apps/red-ui/src/app/app-routing.module.ts @@ -95,9 +95,9 @@ const routes: Routes = [ }, { path: `:${DOSSIER_ID}/file/:${FILE_ID}`, - canActivate: [CompositeRouteGuard, WebViewerLoadedGuard], + canActivate: [CompositeRouteGuard], data: { - routeGuards: [DossierFilesGuard], + routeGuards: [DossierFilesGuard, WebViewerLoadedGuard], breadcrumbs: [BreadcrumbTypes.dossierTemplate, BreadcrumbTypes.dossier, BreadcrumbTypes.file], dossiersService: ACTIVE_DOSSIERS_SERVICE, }, diff --git a/apps/red-ui/src/app/translations/file-status-translations.ts b/apps/red-ui/src/app/translations/file-status-translations.ts index af4f7b0ac..1d3e07d00 100644 --- a/apps/red-ui/src/app/translations/file-status-translations.ts +++ b/apps/red-ui/src/app/translations/file-status-translations.ts @@ -24,4 +24,7 @@ export const processingFileStatusTranslations: { [key in ProcessingFileStatus]: REPROCESS: _('file-status.reprocess'), SURROUNDING_TEXT_PROCESSING: _('file-status.processing'), UNPROCESSED: _('file-status.unprocessed'), + PRE_PROCESSING: _('file-status.full-processing'), + PRE_PROCESSED: _('file-status.processed'), + PRE_PROCESSING_FAILED: _('file-status.error'), }; diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index f9a12cdad..322276d2f 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,7 +1,7 @@ { "ADMIN_CONTACT_NAME": null, "ADMIN_CONTACT_URL": null, - "API_URL": "https://dev-05.iqser.cloud/redaction-gateway-v1", + "API_URL": "https://dev-08.iqser.cloud/redaction-gateway-v1", "APP_NAME": "RedactManager", "AUTO_READ_TIME": 3, "BACKEND_APP_VERSION": "4.4.40", @@ -16,7 +16,7 @@ "MAX_RETRIES_ON_SERVER_ERROR": 3, "OAUTH_CLIENT_ID": "redaction", "OAUTH_IDP_HINT": null, - "OAUTH_URL": "https://dev-05.iqser.cloud/auth/realms/redaction", + "OAUTH_URL": "https://dev-08.iqser.cloud/auth/realms/redaction", "RECENT_PERIOD_IN_HOURS": 24, "SELECTION_MODE": "structural", "MANUAL_BASE_URL": "https://docs.redactmanager.com/preview" diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index 54d13b6d3..30d02bb63 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -104,7 +104,9 @@ export class File extends Entity implements IFile { this.numberOfAnalyses = file.numberOfAnalyses; this.processingStatus = file.processingStatus; this.workflowStatus = file.workflowStatus; - this.isError = this.processingStatus === ProcessingFileStatuses.ERROR; + this.isError = + this.processingStatus === ProcessingFileStatuses.ERROR || + this.processingStatus === ProcessingFileStatuses.PRE_PROCESSING_FAILED; this.isUnprocessed = this.processingStatus === ProcessingFileStatuses.UNPROCESSED; this.numberOfPages = this.isError ? 0 : file.numberOfPages ?? 0; this.rulesVersion = file.rulesVersion; diff --git a/libs/red-domain/src/lib/files/types.ts b/libs/red-domain/src/lib/files/types.ts index cde71691a..11b758caa 100644 --- a/libs/red-domain/src/lib/files/types.ts +++ b/libs/red-domain/src/lib/files/types.ts @@ -27,6 +27,9 @@ export const ProcessingFileStatuses = { REPROCESS: 'REPROCESS', SURROUNDING_TEXT_PROCESSING: 'SURROUNDING_TEXT_PROCESSING', UNPROCESSED: 'UNPROCESSED', + PRE_PROCESSING: 'PRE_PROCESSING', + PRE_PROCESSED: 'PRE_PROCESSED', + PRE_PROCESSING_FAILED: 'PRE_PROCESSING_FAILED', } as const; export type ProcessingFileStatus = keyof typeof ProcessingFileStatuses; @@ -42,6 +45,7 @@ export const isProcessingStatuses: List = [ ProcessingFileStatuses.PROCESSING, ProcessingFileStatuses.ANALYSE, ProcessingFileStatuses.FULL_PROCESSING, + ProcessingFileStatuses.PRE_PROCESSING, ] as const; export const isFullProcessingStatuses: List = [ @@ -53,6 +57,7 @@ export const isFullProcessingStatuses: List = [ ProcessingFileStatuses.NER_ANALYZING, ProcessingFileStatuses.OCR_PROCESSING, ProcessingFileStatuses.FULL_PROCESSING, + ProcessingFileStatuses.PRE_PROCESSING, ] as const; export interface StatusBarConfig {