From d2cce57319e352d40eadb5bbaa7ef0e49d2d1dc1 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Tue, 8 Aug 2023 14:29:01 +0300 Subject: [PATCH] RED-6801 - Effective dossier dictionary in Dossier Settings --- .../dictionary/edit-dossier-dictionary.component.ts | 4 +++- .../dictionary-manager/dictionary-manager.component.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts index 18f531fd3..ba4b859fa 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.ts @@ -108,7 +108,9 @@ export class EditDossierDictionaryComponent implements EditDossierSectionInterfa ); //TODO remove this when backend will send also the type this.#setType(dictionaryTypes); - this.selectDictionary(this.dictionaries[0], this.activeEntryType); + if (!this.selectedDictionary) { + this.selectDictionary(this.dictionaries[0], this.activeEntryType); + } } //TODO remove this when backend will send also the type diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts index dcada2b58..052c6f29a 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.ts @@ -208,7 +208,7 @@ export class DictionaryManagerComponent implements OnChanges { if (!changes.isLeavingPage) { this.revert(); } - if (changes.activeEntryType && this._dossier?.dossierTemplateId && this.dossier?.dossierId) { + if ((changes.selectedDictionaryType || changes.activeEntryType) && this._dossier?.dossierTemplateId && this.dossier?.dossierId) { this.#onDossierChanged(this._dossier.dossierTemplateId, this._dossier.dossierId).then(entries => { this.diffEditorText = entries; this.showDiffEditor = true;