From 341ec38841d6c1cd67273c08b6782831188145bb Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Mon, 9 Jan 2023 11:17:28 +0200
Subject: [PATCH] RED-5908: update common-ui & permissions mapping model

---
 .../entity-permissions.service.ts                 | 15 ++++++---------
 .../src/app/services/files/files-map.service.ts   |  2 +-
 .../src/app/services/files/files.service.ts       |  2 +-
 .../lib/permissions/permissions-mapping.model.ts  |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/red-ui/src/app/services/entity-permissions/entity-permissions.service.ts b/apps/red-ui/src/app/services/entity-permissions/entity-permissions.service.ts
index a1a2d0cb6..97b96ebfd 100644
--- a/apps/red-ui/src/app/services/entity-permissions/entity-permissions.service.ts
+++ b/apps/red-ui/src/app/services/entity-permissions/entity-permissions.service.ts
@@ -17,14 +17,14 @@ export class EntityPermissionsService extends GenericService<IPermissionsMapping
 
     loadConfigFor(targetObject: string): Observable<PermissionsMapping[]> {
         return this._http.get<IPermissionsMapping[]>(`/${this._defaultModelPath}/${targetObject}/mapping`).pipe(
-            mapEach(mapping => new PermissionsMapping(mapping, targetObject)),
+            mapEach(mapping => new PermissionsMapping(mapping)),
             tap(mappings => this.#permissionsConfigurationMapService.set(targetObject, mappings)),
         );
     }
 
     loadFor(targetObject: string): Observable<PermissionsMapping[]> {
         return this._http.get<IPermissionsMapping[]>(`/${this._defaultModelPath}/${targetObject}`).pipe(
-            mapEach(mapping => new PermissionsMapping(mapping, targetObject)),
+            mapEach(mapping => new PermissionsMapping(mapping)),
             tap(mappings => {
                 this.#addMissingPermissions(mappings, targetObject);
                 this.#permissionsMapService.set(targetObject, mappings);
@@ -53,13 +53,10 @@ export class EntityPermissionsService extends GenericService<IPermissionsMapping
         for (const mapping of configuration) {
             const targetPermission: string = mapping.targetPermission.name;
             if (!mappings.some(p => p.targetPermission.name === targetPermission)) {
-                const missingConfig: PermissionsMapping = new PermissionsMapping(
-                    {
-                        mappedPermissions: [],
-                        targetPermission: mapping.targetPermission,
-                    },
-                    targetObject,
-                );
+                const missingConfig: PermissionsMapping = new PermissionsMapping({
+                    mappedPermissions: [],
+                    targetPermission: mapping.targetPermission,
+                });
                 mappings.push(missingConfig);
             }
         }
diff --git a/apps/red-ui/src/app/services/files/files-map.service.ts b/apps/red-ui/src/app/services/files/files-map.service.ts
index 387d8a5e3..1eb98daf7 100644
--- a/apps/red-ui/src/app/services/files/files-map.service.ts
+++ b/apps/red-ui/src/app/services/files/files-map.service.ts
@@ -18,6 +18,6 @@ export class FilesMapService extends EntitiesMapService<IFile, File> {
                     file.reviewerName,
                 ),
         );
-        this.replace(newFiles);
+        this.replace(newFiles[0].dossierId, newFiles);
     }
 }
diff --git a/apps/red-ui/src/app/services/files/files.service.ts b/apps/red-ui/src/app/services/files/files.service.ts
index 01e3b8b67..69ee46922 100644
--- a/apps/red-ui/src/app/services/files/files.service.ts
+++ b/apps/red-ui/src/app/services/files/files.service.ts
@@ -38,7 +38,7 @@ export class FilesService extends EntitiesService<IFile, File> {
         return super._getOne([dossierId, file.id]).pipe(
             map(_file => new File(_file, this._userService.getName(_file.assignee))),
             switchMap(_file => this._dossierStatsService.getFor([dossierId]).pipe(map(() => _file))),
-            map(_file => this._filesMapService.replace([_file])),
+            map(_file => this._filesMapService.replace(dossierId, [_file])),
             tap(() => this._logger.info('[FILE] Reloaded')),
         );
     }
diff --git a/libs/red-domain/src/lib/permissions/permissions-mapping.model.ts b/libs/red-domain/src/lib/permissions/permissions-mapping.model.ts
index d06839806..e0dcd2920 100644
--- a/libs/red-domain/src/lib/permissions/permissions-mapping.model.ts
+++ b/libs/red-domain/src/lib/permissions/permissions-mapping.model.ts
@@ -10,7 +10,7 @@ export class PermissionsMapping extends Entity<IPermissionsMapping> implements I
 
     readonly #currentValuesMap = new Map<string, boolean>();
 
-    constructor(permissionsMapping: IPermissionsMapping, readonly targetObject: string) {
+    constructor(permissionsMapping: IPermissionsMapping) {
         super(permissionsMapping);
         this.mappedPermissions = permissionsMapping.mappedPermissions;
         this.targetPermission = permissionsMapping.targetPermission;