From f225457c35f5d8496b730f6686d2a8acb9d66c56 Mon Sep 17 00:00:00 2001
From: Valentin Mihai <Valentin-Gabriel.Mihai.ext@knecon.com>
Date: Wed, 25 Oct 2023 12:59:39 +0300
Subject: [PATCH] DM-538 - Components download returns wrong output

---
 .../services/files/component-log.service.ts   | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/red-ui/src/app/services/files/component-log.service.ts b/apps/red-ui/src/app/services/files/component-log.service.ts
index fc61b265a..99d095cd4 100644
--- a/apps/red-ui/src/app/services/files/component-log.service.ts
+++ b/apps/red-ui/src/app/services/files/component-log.service.ts
@@ -11,17 +11,22 @@ import { mapEach } from '@common-ui/utils';
 export class ComponentLogService extends GenericService<void> {
     protected readonly _defaultModelPath = '';
 
-    getComponentLogData(dossierTemplateId: string, dossierId: string, fileId: string): Observable<ComponentLogEntry[]> {
-        return this._http
-            .get<IComponentLogData>(`/api/dossier-templates/${dossierTemplateId}/dossiers/${dossierId}/files/${fileId}/components`, {
+    #componentLogRequest(dossierTemplateId: string, dossierId: string, fileId: string): Observable<IComponentLogData> {
+        return this._http.get<IComponentLogData>(
+            `/api/dossier-templates/${dossierTemplateId}/dossiers/${dossierId}/files/${fileId}/components`,
+            {
                 params: { includeDetails: true },
-            })
-            .pipe(
-                map(data => data.componentDetails),
-                catchError(() => of({} as ComponentDetails)),
-                map(componentDetails => this.#mapComponentDetails(componentDetails)),
-                mapEach(log => new ComponentLogEntry(log)),
-            );
+            },
+        );
+    }
+
+    getComponentLogData(dossierTemplateId: string, dossierId: string, fileId: string): Observable<ComponentLogEntry[]> {
+        return this.#componentLogRequest(dossierTemplateId, dossierId, fileId).pipe(
+            map(data => data.componentDetails),
+            catchError(() => of({} as ComponentDetails)),
+            map(componentDetails => this.#mapComponentDetails(componentDetails)),
+            mapEach(log => new ComponentLogEntry(log)),
+        );
     }
 
     override(dossierId: string, fileId: string, componentOverrides: Record<string, string>): Observable<void> {
@@ -32,8 +37,8 @@ export class ComponentLogService extends GenericService<void> {
         return this._post({ components }, `componentLog/override/revert/${dossierId}/${fileId}`);
     }
 
-    exportJSON(dossierTemplateId: string, dossierId: string, fileId: string, name: string): Observable<ComponentLogEntry[]> {
-        return this.getComponentLogData(dossierTemplateId, dossierId, fileId).pipe(
+    exportJSON(dossierTemplateId: string, dossierId: string, fileId: string, name: string): Observable<IComponentLogData> {
+        return this.#componentLogRequest(dossierTemplateId, dossierId, fileId).pipe(
             tap(data => {
                 const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' });
                 saveAs(blob, name + '.component_log.json');