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 38e2c1763..8982b0a09 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 @@ -130,6 +130,6 @@ export class EditDossierDictionaryComponent implements OnInit { } #toString(entries: string[]) { - return entries.sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'accent' })); + return entries.sort((a, b) => a.localeCompare(b)); } } diff --git a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html index 00f4ce51d..5745c2912 100644 --- a/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dictionary-manager/dictionary-manager.component.html @@ -66,13 +66,18 @@
- - {{ selectDossier.dossierName | translate }} + - + {{ dossier.dossierName }} - + 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 4aa64c2dd..aea47021a 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 @@ -63,7 +63,7 @@ export class DictionaryManagerComponent implements OnChanges { } as Dictionary; #compareDictionary = this.selectDictionary; selectDossierTemplate = { name: _('dictionary-overview.compare.select-dossier-template') } as DossierTemplate; - compare: false; + compare = false; dictionaries: List = this.#dictionaries; constructor( @@ -99,11 +99,11 @@ export class DictionaryManagerComponent implements OnChanges { private _dossier = this.selectDossier; - get dossier() { + get selectedDossier() { return this._dossier; } - set dossier(dossier: Dossier) { + set selectedDossier(dossier: Dossier) { this._dossier = dossier; if (dossier.dossierName === this.selectDossier.dossierName) { @@ -161,7 +161,7 @@ export class DictionaryManagerComponent implements OnChanges { if (this.filterByDossierTemplate) { return this.selectDictionary.label === this.#compareDictionary.label; } - return this.dossier.dossierName === this.selectDossier.dossierName; + return this.selectedDossier.dossierName === this.selectDossier.dossierName; } get helpModeKey(): string { @@ -217,7 +217,11 @@ export class DictionaryManagerComponent implements OnChanges { } ngOnChanges(changes: SimpleChanges): void { - if ((changes.selectedDictionaryType || changes.activeEntryType) && this._dossier?.dossierTemplateId && this.dossier?.dossierId) { + if ( + (changes.selectedDictionaryType || changes.activeEntryType) && + this._dossier?.dossierTemplateId && + this.selectedDossier?.dossierId + ) { this.#onDossierChanged(this._dossier.dossierTemplateId, this._dossier.dossierId).then(entries => { this.diffEditorText = entries; this.showDiffEditor = true; @@ -273,7 +277,6 @@ export class DictionaryManagerComponent implements OnChanges { } #toString(entries: string[]): string { - entries.sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'accent' })); - return entries.join('\n'); + return entries.sort((a, b) => a.localeCompare(b)).join('\n'); } }