From b2b1129590c8462e5a905715c6821a810b79dc53 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Sat, 19 Aug 2023 13:24:19 +0300 Subject: [PATCH] RED-6801 - Effective dossier dictionary in Dossier Settings --- .../edit-dossier-dictionary.component.ts | 3 +- .../dictionary-manager.component.ts | 3 ++ .../entity-services/dictionary.service.ts | 33 ------------------- 3 files changed, 5 insertions(+), 34 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 3a4d731eb..002f09ec4 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 @@ -104,7 +104,8 @@ export class EditDossierDictionaryComponent implements OnInit { async #updateDossierDictionary() { const { dossierId, dossierTemplateId } = this.dossier; - const dictionaryTypes = this._dictionaryService.getPossibleDictionaries(dossierTemplateId, false, true).map(d => d.type); + let dictionaryTypes = this._dictionaryService.getRedactTextDictionaries(dossierTemplateId, true).map(d => d.type); + dictionaryTypes = [...new Set(dictionaryTypes)]; this.dictionaries = await firstValueFrom( this._dictionaryService.loadDictionaryEntriesByType(dictionaryTypes, dossierTemplateId, dossierId), ); 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 35f43e23e..4b2be5f2f 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 @@ -211,6 +211,9 @@ export class DictionaryManagerComponent implements OnChanges { this.showDiffEditor = true; }); } + if (changes.selectedDictionaryType) { + this.searchText = ''; + } } private _applySearchDecorations() { 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 732595cd0..f56033ffc 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 @@ -203,39 +203,6 @@ export class DictionaryService extends EntitiesService return dictionaries.sort((a, b) => a.label.localeCompare(b.label)); } - getPossibleDictionaries( - dossierTemplateId: string, - hintTypes: boolean, - dossierDictionaryOnly = false, - dictionaryRequest = false, - ): Dictionary[] { - const possibleDictionaries: Dictionary[] = []; - - this._dictionariesMapService.get(dossierTemplateId).forEach((d: Dictionary) => { - if (!hintTypes) { - if ( - (!d.virtual && !d.hint && !d.systemManaged && d.hasDictionary && d.addToDictionaryAction) || - (dossierDictionaryOnly && d.dossierDictionaryOnly) - ) { - possibleDictionaries.push(d); - } - } else if ( - (d.hint && d.hasDictionary && d.addToDictionaryAction && d.type) || - (dictionaryRequest && dossierDictionaryOnly && d.dossierDictionaryOnly) - ) { - if (!dictionaryRequest) { - if (!IMAGE_TYPES.includes(d.type)) { - possibleDictionaries.push(d); - } - } else { - possibleDictionaries.push(d); - } - } - }); - - return possibleDictionaries.sort((a, b) => a.label.localeCompare(b.label)); - } - getRedactionTypes(dossierTemplateId: string): Dictionary[] { const possibleDictionaries: Dictionary[] = [];