From 35bbe8e59acb5fb2cd7bc7ecb6917a2f43cb7da1 Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Wed, 13 Mar 2024 17:35:55 +0200
Subject: [PATCH 1/2] RED-8684: fixed missing type warning bug.

---
 .../src/app/services/entity-services/dictionary.service.ts  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 92efcf4df..26c515fe4 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
@@ -268,7 +268,11 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
 
                 return dictionaries;
             }),
-            tap(dictionaries => this._dictionariesMapService.set(dossierTemplateId, dictionaries)),
+            tap(dictionaries => {
+                if (!readOnlyFile) {
+                    this._dictionariesMapService.set(dossierTemplateId, dictionaries);
+                }
+            }),
         );
     }
 

From 06eb6323d95022fdd482307eb6f991e6b5f47afe Mon Sep 17 00:00:00 2001
From: Nicoleta Panaghiu <nicoleta.panaghiu.ext@knecon.com>
Date: Thu, 14 Mar 2024 14:27:31 +0200
Subject: [PATCH 2/2] RED-8684: keep readonly check in file-data service &
 clean up.

---
 .../services/file-data.service.ts             |  2 +-
 .../entity-services/dictionary.service.ts     | 41 +++++--------------
 2 files changed, 11 insertions(+), 32 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 6589ef272..6c11e64e6 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
@@ -213,7 +213,7 @@ export class FileDataService extends EntitiesService<AnnotationWrapper, Annotati
 
             let dictionary = dictionaries.find(dict => dict.type === entry.type);
             if (!dictionary && checkDictionary) {
-                const dictionaryRequest = this._dictionaryService.loadDictionaryDataForDossierTemplate(
+                const dictionaryRequest = this._dictionaryService.loadTemporaryDictionaryData(
                     this._state.dossierTemplateId,
                     this._state.isReadonly(),
                 );
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 26c515fe4..48a1f5f0e 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
@@ -56,7 +56,9 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
         if (readOnly) {
             queryParams.push({ key: 'includeDeleted', value: true });
         }
-        return this._getOne<{ types: IDictionary[] }>(['type', dossierTemplateId], this._defaultModelPath, queryParams);
+        return this._getOne<{ types: IDictionary[] }>(['type', dossierTemplateId], this._defaultModelPath, queryParams).pipe(
+            map(typesResponse => typesResponse.types.map(type => new Dictionary(type))),
+        );
     }
 
     /**
@@ -243,39 +245,16 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
         return forkJoin(observables);
     }
 
-    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;
-                for (const dictionary of dictionaries) {
-                    if (dictionary.type === SuperTypes.ManualRedaction) {
-                        manualTypeExists = true;
-                        break;
-                    }
-                }
-                if (!manualTypeExists) {
-                    dictionaries.push(
-                        new Dictionary(
-                            {
-                                hexColor: FALLBACK_COLOR,
-                                type: SuperTypes.ManualRedaction,
-                            },
-                            true,
-                        ),
-                    );
-                }
-
-                return dictionaries;
-            }),
-            tap(dictionaries => {
-                if (!readOnlyFile) {
-                    this._dictionariesMapService.set(dossierTemplateId, dictionaries);
-                }
-            }),
+    loadDictionaryDataForDossierTemplate(dossierTemplateId: string): Observable<Dictionary[]> {
+        return this.getAllDictionaries(dossierTemplateId).pipe(
+            tap(dictionaries => this._dictionariesMapService.set(dossierTemplateId, dictionaries)),
         );
     }
 
+    loadTemporaryDictionaryData(dossierTemplateId: string, readOnlyFile = true): Observable<Dictionary[]> {
+        return this.getAllDictionaries(dossierTemplateId, readOnlyFile);
+    }
+
     loadDictionaryEntriesByType(types: string[], dossierTemplateId: string, dossierId: string): Observable<Dictionary[]> {
         const queryParams = [{ key: 'dossierId', value: dossierId }];
         const requests = [];