From 5d97da46cb39dfc9ecb276922ac646a83fdafdbc Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Wed, 29 Nov 2023 14:35:51 +0200 Subject: [PATCH] DM-604 hide watermark options & skip dossier_redaction dictionary --- apps/red-ui/src/app/guards/dossier-files-guard.ts | 13 ++++++++----- .../add-dossier-dialog.component.html | 6 ++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/apps/red-ui/src/app/guards/dossier-files-guard.ts b/apps/red-ui/src/app/guards/dossier-files-guard.ts index 45ece236d..7c8b7263a 100644 --- a/apps/red-ui/src/app/guards/dossier-files-guard.ts +++ b/apps/red-ui/src/app/guards/dossier-files-guard.ts @@ -1,16 +1,19 @@ import { Injectable, Injector, ProviderToken } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; -import { FilesMapService } from '@services/files/files-map.service'; -import { FilesService } from '@services/files/files.service'; -import { firstValueFrom } from 'rxjs'; +import { getConfig } from '@iqser/common-ui'; +import { TenantsService } from '@iqser/common-ui/lib/tenants'; import { DOSSIER_ID, DOSSIER_TEMPLATE_ID } from '@red/domain'; import { DossiersService } from '@services/dossiers/dossiers.service'; import { DictionaryService } from '@services/entity-services/dictionary.service'; import { DossierDictionariesMapService } from '@services/entity-services/dossier-dictionaries-map.service'; -import { TenantsService } from '@iqser/common-ui/lib/tenants'; +import { FilesMapService } from '@services/files/files-map.service'; +import { FilesService } from '@services/files/files.service'; +import { firstValueFrom } from 'rxjs'; @Injectable({ providedIn: 'root' }) export class DossierFilesGuard implements CanActivate { + readonly isDocumine = getConfig().IS_DOCUMINE; + constructor( private readonly _injector: Injector, private readonly _tenantsService: TenantsService, @@ -45,7 +48,7 @@ export class DossierFilesGuard implements CanActivate { async loadDossierData(dossierId: string, dossierTemplateId: string) { const promises = []; - if (!this._dictionaryMapService.has(dossierId)) { + if (!this._dictionaryMapService.has(dossierId) && !this.isDocumine) { const dictionaryPromise = this._dictionaryService.loadDossierDictionary(dossierTemplateId, dossierId); promises.push(dictionaryPromise); } diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index 4b123aad6..7863f8f8e 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -52,12 +52,14 @@