From 4949bce99290ed3a9820e0c2d89a4a24f10c3638 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Wed, 6 Mar 2024 17:06:42 +0200
Subject: [PATCH] RED-8684: removed deleted types warning for readonly files.

---
 .../file-preview/services/file-data.service.ts     | 11 +++++++----
 .../services/entity-services/dictionary.service.ts | 14 ++++++++++----
 2 files changed, 17 insertions(+), 8 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 2bf2a4e8a..40599598d 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
@@ -179,8 +179,8 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
     async #convertData(entityLog: IEntityLog) {
         const file = this._state.file();
         const annotations: AnnotationWrapper[] = [];
-        const dictionaries = this._state.dictionaries;
         const defaultColors = this._defaultColorsService.find(this._state.dossierTemplateId);
+        let dictionaries = this._state.dictionaries;
         let checkDictionary = true;
 
         for (const entry of entityLog.entityLogEntry) {
@@ -213,10 +213,13 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
 
             let dictionary = dictionaries.find(dict => dict.type === entry.type);
             if (!dictionary && checkDictionary) {
-                const dictionaryRequest = this._dictionaryService.loadDictionaryDataForDossierTemplate(this._state.dossierTemplateId);
-                await firstValueFrom(dictionaryRequest);
-                checkDictionary = false;
+                const dictionaryRequest = this._dictionaryService.loadDictionaryDataForDossierTemplate(
+                    this._state.dossierTemplateId,
+                    this._state.isReadonly(),
+                );
+                dictionaries = await firstValueFrom(dictionaryRequest);
                 dictionary = dictionaries.find(dict => dict.type === entry.type);
+                checkDictionary = false;
             }
 
             if (!dictionary) {
diff --git a/apps/red-ui/src/app/services/entity-services/dictionary.service.ts b/apps/red-ui/src/app/services/entity-services/dictionary.service.ts
index a94c5c167..92efcf4df 100644
--- a/apps/red-ui/src/app/services/entity-services/dictionary.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/dictionary.service.ts
@@ -48,8 +48,14 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
         );
     }
 
-    getAllDictionaries(dossierTemplateId: string, dossierId?: string) {
-        const queryParams = dossierId ? [{ key: 'dossierId', value: dossierId }] : undefined;
+    getAllDictionaries(dossierTemplateId: string, readOnly = false, dossierId?: string) {
+        const queryParams = [];
+        if (dossierId) {
+            queryParams.push({ key: 'dossierId', value: dossierId });
+        }
+        if (readOnly) {
+            queryParams.push({ key: 'includeDeleted', value: true });
+        }
         return this._getOne<{ types: IDictionary[] }>(['type', dossierTemplateId], this._defaultModelPath, queryParams);
     }
 
@@ -237,8 +243,8 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
         return forkJoin(observables);
     }
 
-    loadDictionaryDataForDossierTemplate(dossierTemplateId: string): Observable<Dictionary[]> {
-        return this.getAllDictionaries(dossierTemplateId).pipe(
+    loadDictionaryDataForDossierTemplate(dossierTemplateId: string, readOnlyFile = false): Observable<Dictionary[]> {
+        return this.getAllDictionaries(dossierTemplateId, readOnlyFile).pipe(
             map(typesResponse => typesResponse.types.map(type => new Dictionary(type))),
             map(dictionaries => {
                 let manualTypeExists = false;