From 0e171ee49927674bd7eb1389e45af61071ca0318 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 7 Mar 2024 15:58:01 +0200 Subject: [PATCH 1/4] RED-8711 toaster setup --- .../modules/file-preview/services/file-data.service.ts | 9 ++------- apps/red-ui/src/assets/styles/themes/redact.css | 7 +++++++ libs/common-ui | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 apps/red-ui/src/assets/styles/themes/redact.css 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 40599598d..b76c83925 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 @@ -15,6 +15,7 @@ import { ViewMode, ViewModes, } from '@red/domain'; +import { DefaultColorsService } from '@services/entity-services/default-colors.service'; import { DictionaryService } from '@services/entity-services/dictionary.service'; import { EarmarksService } from '@services/files/earmarks.service'; import { EntityLogService } from '@services/files/entity-log.service'; @@ -29,7 +30,6 @@ import { firstValueFrom, Observable } from 'rxjs'; import { FilePreviewStateService } from './file-preview-state.service'; import { MultiSelectService } from './multi-select.service'; import { ViewModeService } from './view-mode.service'; -import { DefaultColorsService } from '@services/entity-services/default-colors.service'; const DELTA_VIEW_TIME = 10 * 60 * 1000; // 10 minutes; @@ -201,13 +201,8 @@ export class FileDataService extends EntitiesService Date: Fri, 8 Mar 2024 11:10:39 +0200 Subject: [PATCH 2/4] RED-8711 - update common ui --- libs/common-ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common-ui b/libs/common-ui index 9b427b0ca..ecf9c8912 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9b427b0cac2facb514cb49f20453f77a529a74e5 +Subproject commit ecf9c8912e366fdcc0a454d112c0f3252245666a From 0aacc165bfdf137a0e910f57c4094c86eb2df1cc Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 25 Mar 2024 12:08:26 +0200 Subject: [PATCH 3/4] RED-8711 - Filter out entity log entries that have no positions and show a toast message in dev mode --- .../services/file-data.service.ts | 4 ---- .../app/services/files/entity-log.service.ts | 20 ++++++++++++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) 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 4ff31e95f..ba82979e4 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 @@ -190,10 +190,6 @@ export class FileDataService extends EntitiesService { protected readonly _defaultModelPath = ''; + readonly #isIqserDevMode = isIqserDevMode(); + readonly #toaster = inject(Toaster); async getEntityLog(dossierId: string, fileId: string) { const queryParams = [{ key: 'includeUnprocessed', value: true }]; const entityLog$ = this._getOne([dossierId, fileId], 'entityLog', queryParams); const entityLog = await firstValueFrom(entityLog$.pipe(catchError(() => of({} as IEntityLog)))); + entityLog.entityLogEntry = this.#filterInvalidEntries(entityLog.entityLogEntry); entityLog.entityLogEntry.sort((a, b) => a.positions[0].pageNumber - b.positions[0].pageNumber); return entityLog; } @@ -21,4 +24,15 @@ export class EntityLogService extends GenericService { getSectionGrid(dossierId: string, fileId: string) { return this._getOne([dossierId, fileId], 'sectionGrid'); } + + #filterInvalidEntries(entityLogEntry: IEntityLogEntry[]) { + return entityLogEntry.filter(entry => { + const hasPositions = !!entry.positions?.length; + const isRemoved = entry.state === EntryStates.REMOVED; + if (!hasPositions) { + this.#toaster.devInfo(`Entry ${entry.id} was skipped because it has no position`); + } + return hasPositions && !isRemoved; + }); + } } From bc3ef19666466fc14fc4ef256b8fec4a8aa50d9d Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Mon, 25 Mar 2024 12:11:31 +0200 Subject: [PATCH 4/4] RED-8711 - removed unused isIqserDevMode --- apps/red-ui/src/app/services/files/entity-log.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/red-ui/src/app/services/files/entity-log.service.ts b/apps/red-ui/src/app/services/files/entity-log.service.ts index 61eac9214..d47244478 100644 --- a/apps/red-ui/src/app/services/files/entity-log.service.ts +++ b/apps/red-ui/src/app/services/files/entity-log.service.ts @@ -9,7 +9,6 @@ import { catchError } from 'rxjs/operators'; }) export class EntityLogService extends GenericService { protected readonly _defaultModelPath = ''; - readonly #isIqserDevMode = isIqserDevMode(); readonly #toaster = inject(Toaster); async getEntityLog(dossierId: string, fileId: string) {