From 6a9f440b8a67ef74845fcf16c9f5ff6ecc9d9ff7 Mon Sep 17 00:00:00 2001 From: Nicoleta Panaghiu Date: Tue, 29 Oct 2024 15:22:48 +0200 Subject: [PATCH] RED-10275: differentiate available types by applyToAll flag state. --- .../redact-recommendation-dialog.component.ts | 6 +++++- .../redact-text-dialog/redact-text-dialog.component.ts | 6 +++++- .../src/app/services/entity-services/dictionary.service.ts | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-recommendation-dialog/redact-recommendation-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-recommendation-dialog/redact-recommendation-dialog.component.ts index 45422d827..479dd7820 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-recommendation-dialog/redact-recommendation-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-recommendation-dialog/redact-recommendation-dialog.component.ts @@ -162,7 +162,11 @@ export class RedactRecommendationDialogComponent } #setDictionaries() { - this.dictionaries = this._dictionaryService.getRedactTextDictionaries(this.#dossier.dossierId, !this.#applyToAllDossiers); + this.dictionaries = this._dictionaryService.getRedactTextDictionaries( + this.#dossier.dossierId, + !this.#applyToAllDossiers, + this.#dossier.dossierTemplateId, + ); } #selectReason() { diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts index be81ad416..8dd73df9b 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/redact-text-dialog/redact-text-dialog.component.ts @@ -219,7 +219,11 @@ export class RedactTextDialogComponent } #setDictionaries() { - this.dictionaries = this._dictionaryService.getRedactTextDictionaries(this.#dossier.dossierId, !this.#applyToAllDossiers); + this.dictionaries = this._dictionaryService.getRedactTextDictionaries( + this.#dossier.dossierId, + !this.#applyToAllDossiers, + this.#dossier.dossierTemplateId, + ); } #getForm(): FormGroup { diff --git a/apps/red-ui/src/app/services/entity-services/dictionary.service.ts b/apps/red-ui/src/app/services/entity-services/dictionary.service.ts index aa91e81f0..ee5011d4f 100644 --- a/apps/red-ui/src/app/services/entity-services/dictionary.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dictionary.service.ts @@ -152,8 +152,9 @@ export class DictionaryService extends EntitiesService .filter(d => d.model['typeId'] && (d.hasDictionary || d.addToDictionaryAction)); } - getRedactTextDictionaries(dossierId: string, dossierDictionaryOnly: boolean): Dictionary[] { - return this.#extractDossierLevelTypes(dossierId) + getRedactTextDictionaries(dossierId: string, dossierDictionaryOnly: boolean, dossierTemplateId: string): Dictionary[] { + const types = dossierDictionaryOnly ? this.#extractDossierLevelTypes(dossierId) : this.getDictionariesOptions(dossierTemplateId); + return types .filter(d => d.model['typeId'] && !d.hint && d.addToDictionaryAction && (dossierDictionaryOnly || !d.dossierDictionaryOnly)) .sort((a, b) => a.label.localeCompare(b.label)); }