From 2313d98cb66fb12611bc86bfd781b1609631652c Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Tue, 19 Jul 2022 12:05:31 +0300 Subject: [PATCH] RED-4638: rename document status to document state --- .../file-preview/services/file-preview-state.service.ts | 7 ++----- apps/red-ui/src/assets/i18n/en.json | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts index 6e029e6a5..6be628d8d 100644 --- a/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts +++ b/apps/red-ui/src/app/modules/file-preview/services/file-preview-state.service.ts @@ -1,6 +1,6 @@ import { Injectable, Injector } from '@angular/core'; import { combineLatest, firstValueFrom, from, merge, Observable, of, pairwise, Subject, switchMap } from 'rxjs'; -import { Dictionary, Dossier, DOSSIER_ID, File, FILE_ID } from '@red/domain'; +import { Dictionary, Dossier, DOSSIER_ID, DOSSIER_TEMPLATE_ID, File, FILE_ID } from '@red/domain'; import { Router } from '@angular/router'; import { FilesMapService } from '@services/files/files-map.service'; import { PermissionsService } from '@services/permissions.service'; @@ -40,7 +40,7 @@ export class FilePreviewStateService { readonly isWritable$: Observable; readonly dossierId: string = getParam(DOSSIER_ID); - readonly dossierTemplateId: string; + readonly dossierTemplateId: string = getParam(DOSSIER_TEMPLATE_ID); readonly fileId: string = getParam(FILE_ID); dossier: Dossier; dialogRef: MatDialogRef; @@ -62,9 +62,6 @@ export class FilePreviewStateService { private readonly _loadingService: LoadingService, ) { const dossiersService = dossiersServiceResolver(_injector, router); - - this.dossierTemplateId = dossiersService.find(this.dossierId).dossierTemplateId; - this.dossier$ = dossiersService.getEntityChanged$(this.dossierId).pipe(tap(dossier => (this.dossier = dossier))); this.file$ = filesMapService.watch$(this.dossierId, this.fileId).pipe(tap(file => (this.file = file))); [this.isReadonly$, this.isWritable$] = boolFactory( diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 7cd5252d6..876f57998 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -799,7 +799,7 @@ "total-people": "Total users" }, "table-col-names": { - "documents-status": "Documents Status", + "documents-status": "Documents State", "dossier-state": "Dossier State", "last-modified": "Last modified", "name": "Name", @@ -1413,7 +1413,7 @@ }, "filters": { "assigned-people": "Assignee(s)", - "documents-status": "Documents Status", + "documents-status": "Documents State", "dossier-state": "Dossier State", "dossier-templates": "Dossier Templates", "empty": "Empty",