Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

fix compile errors

Browse Source
This commit is contained in:
Dan Percic 2022-01-28 10:39:37 +02:00
parent c3c4f4421d
commit 696d35cb65
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.html
View File

@ -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>

5
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/components/document-info/document-info.component.ts
View File

@ -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),
);

12
apps/red-ui/src/app/modules/dossier/screens/file-preview-screen/services/file-preview-state.service.ts
View File

@ -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(),
);
}