From f6497be47949782ff895e29958ac70bdf356f154 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Mon, 4 Mar 2024 17:01:06 +0200
Subject: [PATCH] RED-8226: filtering out entities with REMOVED state.

---
 .../services/file-data.service.ts             | 40 +++++++++++++------
 1 file changed, 27 insertions(+), 13 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 ee0355afc..2bf2a4e8a 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
@@ -3,7 +3,18 @@ import { toObservable } from '@angular/core/rxjs-interop';
 import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
 import { EntitiesService, getConfig, Toaster } from '@iqser/common-ui';
 import { AnnotationWrapper } from '@models/file/annotation.wrapper';
-import { ChangeType, ChangeTypes, File, IEntityLog, IEntityLogEntry, SuperTypeMapper, ViewedPage, ViewMode, ViewModes } from '@red/domain';
+import {
+    ChangeType,
+    ChangeTypes,
+    EntryStates,
+    File,
+    IEntityLog,
+    IEntityLogEntry,
+    SuperTypeMapper,
+    ViewedPage,
+    ViewMode,
+    ViewModes,
+} from '@red/domain';
 import { DictionaryService } from '@services/entity-services/dictionary.service';
 import { EarmarksService } from '@services/files/earmarks.service';
 import { EntityLogService } from '@services/files/entity-log.service';
@@ -179,21 +190,24 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
                 continue;
             }
 
-            const canBeMappedToASuperType = !!SuperTypeMapper[entry.entryType][entry.state](entry);
-            if (!canBeMappedToASuperType && this.#isIqserDevMode) {
-                this.#logger.error(
-                    `[ENTITY_LOG] Entity ${entry.value} (${entry.entryType}, ${entry.state}) cannot be mapped to a super type!`,
-                    entry,
-                );
-                this.#toaster.info(`Skipping entity ${entry.value} (${entry.entryType}, ${entry.state}). Check console for details.`, {
-                    timeOut: 10000,
-                    easing: 'ease-in-out',
-                    easeTime: 500,
-                    useRaw: true,
-                });
+            if (entry.state === EntryStates.REMOVED) {
+                continue;
             }
 
+            const canBeMappedToASuperType = !!SuperTypeMapper[entry.entryType][entry.state](entry);
             if (!canBeMappedToASuperType) {
+                if (this.#isIqserDevMode) {
+                    this.#logger.warn(
+                        `[ENTITY_LOG] Entity ${entry.value} (${entry.entryType}, ${entry.state}) cannot be mapped to a super type!`,
+                        entry,
+                    );
+                    this.#toaster.info(`Skipping entity ${entry.value} (${entry.entryType}, ${entry.state}). Check console for details.`, {
+                        timeOut: 10000,
+                        easing: 'ease-in-out',
+                        easeTime: 500,
+                        useRaw: true,
+                    });
+                }
                 continue;
             }