diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts index e365144d7..f69410fe2 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-data.service.ts @@ -45,12 +45,12 @@ export class FileDataService extends EntitiesService([]); readonly #earmarks = signal>(new Map()); #originalViewedPages: ViewedPage[] = []; + readonly #isDocumine = getConfig().IS_DOCUMINE; protected readonly _entityClass = AnnotationWrapper; missingTypes = new Set(); readonly earmarks: Signal>; readonly annotations: Signal; readonly annotations$: Observable; - readonly #isDocumine = getConfig().IS_DOCUMINE; constructor( private readonly _state: FilePreviewStateService, @@ -184,12 +184,23 @@ export class FileDataService extends EntitiesService = {}; const dictionaries = this._state.dictionaries; const defaultColors = this._defaultColorsService.find(this._state.dossierTemplateId); let checkDictionary = true; for (const entry of redactionLog.redactionLogEntry) { + const pageNumber = entry.positions[0]?.page; + const manual = entry.manualChanges?.length > 0; + if (!manual && file.excludedPages.includes(pageNumber)) { + continue; + } + + const changeLogValues = this.#getChangeLogValues(entry, file); + if (changeLogValues.hidden) { + continue; + } + let dictionary = dictionaries.find(dict => dict.type === entry.type); if (!dictionary && checkDictionary) { const dictionaryRequest = this._dictionaryService.loadDictionaryDataForDossierTemplate(this._state.dossierTemplateId); @@ -203,17 +214,6 @@ export class FileDataService extends EntitiesService 0; - if (!manual && file.excludedPages.includes(pageNumber)) { - continue; - } - - const changeLogValues = this.#getChangeLogValues(entry, file); - if (changeLogValues.hidden) { - continue; - } - const annotation = AnnotationWrapper.fromData( entry, dictionaries, diff --git a/docker/red-ui/Dockerfile b/docker/red-ui/Dockerfile index 2aea4ec1e..5987c95ac 100644 --- a/docker/red-ui/Dockerfile +++ b/docker/red-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20.6-buster as builder +FROM node:20.8-buster as builder WORKDIR /ng-app