From 696d35cb6523a76e990a588515bc1b17dfb9c7f0 Mon Sep 17 00:00:00 2001
From: Dan Percic <dan@devplant.ro>
Date: Fri, 28 Jan 2022 10:39:37 +0200
Subject: [PATCH] fix compile errors

---
 .../document-info/document-info.component.html       |  2 +-
 .../document-info/document-info.component.ts         |  5 ++---
 .../services/file-preview-state.service.ts           | 12 ++++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html
index 399c3cbbb..8e4bdd16f 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html
@@ -26,7 +26,7 @@
             </div>
         </div>
 
-        <div class="section small-label stats-subtitle">
+        <div *ngIf="stateService.dossier$ | async as dossier" class="section small-label stats-subtitle">
             <div>
                 <mat-icon svgIcon="red:folder"></mat-icon>
                 <span>{{ 'file-preview.tabs.document-info.details.dossier' | translate: { dossierName: dossier.dossierName } }}</span>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
index bac4a4366..d5d0aa41d 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
@@ -26,11 +26,10 @@ export class DocumentInfoComponent {
         readonly permissionsService: PermissionsService,
         readonly documentInfoService: DocumentInfoService,
     ) {
-        const _dossier$ = this.stateService.file$.pipe(switchMap(file => this._dossiersService.getEntityChanged$(file.dossierId)));
-        this.fileAttributes$ = combineLatest([this.stateService.file$, _dossier$]).pipe(
+        this.fileAttributes$ = combineLatest([this.stateService.file$, this.stateService.dossier$]).pipe(
             switchMap(([file, dossier]) => this.documentInfoService.fileAttributes$(file.fileId, dossier.id, dossier.dossierTemplateId)),
         );
-        this.dossierTemplateName$ = _dossier$.pipe(
+        this.dossierTemplateName$ = this.stateService.dossier$.pipe(
             switchMap(dossier => this._dossierTemplatesService.getEntityChanged$(dossier.dossierTemplateId)),
             map(dossierTemplate => dossierTemplate.name),
         );
diff --git a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
index 56f43b124..1722e7889 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
@@ -1,20 +1,28 @@
 import { Injectable } from '@angular/core';
 import { BehaviorSubject, Observable, switchMap } from 'rxjs';
 import { FileDataModel } from '@models/file/file-data.model';
-import { File } from '@red/domain';
+import { Dossier, File } from '@red/domain';
 import { filter } from 'rxjs/operators';
+import { DossiersService } from '../../../../../services/entity-services/dossiers.service';
+import { shareLast } from '../../../../../../../../../libs/common-ui/src';
 
 @Injectable()
 export class FilePreviewStateService {
     readonly fileData$: Observable<FileDataModel>;
     readonly file$: Observable<File>;
+    readonly dossier$: Observable<Dossier>;
     private readonly _fileData$ = new BehaviorSubject<FileDataModel>(undefined);
 
-    constructor() {
+    constructor(private readonly _dossiersService: DossiersService) {
         this.fileData$ = this._fileData$.asObservable();
         this.file$ = this.fileData$.pipe(
             filter(fileData => !!fileData),
             switchMap(fileData => fileData.file$),
+            shareLast(),
+        );
+        this.dossier$ = this.file$.pipe(
+            switchMap(file => this._dossiersService.getEntityChanged$(file.dossierId)),
+            shareLast(),
         );
     }