From d133070e0057275cc6ce8411a95f2128eb43ab03 Mon Sep 17 00:00:00 2001 From: Valentin Mihai Date: Wed, 4 Oct 2023 23:23:01 +0300 Subject: [PATCH] RED-7699 - Hint types in Edit Dossier effective dictionary list --- .../edit-dossier-dictionary.component.html | 18 ++++++++++++------ .../edit-dossier-dictionary.component.ts | 6 +++++- apps/red-ui/src/assets/i18n/redact/en.json | 2 +- apps/red-ui/src/assets/i18n/scm/en.json | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html index 19d556c87..e33ce13f5 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/dictionary/edit-dossier-dictionary.component.html @@ -6,7 +6,11 @@ [class.active]="dictionary.label === selectedDictionary.label" (click)="selectDictionary(dictionary)" > - +
{{ dictionary.label }}
@@ -34,25 +38,27 @@
- {{ 'edit-dossier-dialog.dictionary.entries' | translate : { length: entriesToDisplay.length } }} + {{ + 'edit-dossier-dialog.dictionary.entries' + | translate: { length: entriesToDisplay.length, hint: selectedDictionary.hint } + }} {{ - 'edit-dossier-dialog.dictionary.false-positive-entries' - | translate : { length: entriesToDisplay.length } + 'edit-dossier-dialog.dictionary.false-positive-entries' | translate: { length: entriesToDisplay.length } }} {{ 'edit-dossier-dialog.dictionary.false-recommendation-entries' - | translate : { length: entriesToDisplay.length } + | translate: { length: entriesToDisplay.length } }}
-
+
d.type); + let dictionaryTypes = [ + ...this._dictionaryService.getRedactTextDictionaries(dossierTemplateId, true), + ...this._dictionaryService.getAddHintDictionaries(dossierTemplateId, false, true), + ].map(d => d.type); dictionaryTypes = [...new Set(dictionaryTypes)]; this.dictionaries = await firstValueFrom( this._dictionaryService.loadDictionaryEntriesByType(dictionaryTypes, dossierTemplateId, dossierId), ); //TODO remove this when backend will send also the type this.#setType(dictionaryTypes); + this.dictionaries = this.dictionaries.sort((a, b) => a.label.localeCompare(b.label)); let dictionaryToSelect = this.dictionaries[0]; if (this.selectedDictionary) { dictionaryToSelect = this.dictionaries.find(d => d.type === this.selectedDictionary.type); diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 68c6b48ab..098bbce5c 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -1187,7 +1187,7 @@ "change-successful": "Dossier {dossierName} was updated.", "delete-successful": "Dossier {dossierName} was deleted.", "dictionary": { - "entries": "{length} {length, plural, one{entry} other{entries}} to redact", + "entries": "{length} {length, plural, one{entry} other{entries}} to {hint, select, true{annotate} other{redact}}", "false-positive-entries": "{length} false positive {length, plural, one{entry} other{entries}}", "false-positives": "False Positives", "false-recommendation-entries": "{length} false recommendation {length, plural, one{entry} other{entries}}", diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index 3511678ef..d5f97525b 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -1187,7 +1187,7 @@ "change-successful": "Dossier {dossierName} was updated.", "delete-successful": "Dossier {dossierName} was deleted.", "dictionary": { - "entries": "{length} {length, plural, one{entry} other{entries}} to redact", + "entries": "{length} {length, plural, one{entry} other{entries}} to {hint, select, true{annotate} other{redact}}", "false-positive-entries": "{length} false positive {length, plural, one{entry} other{entries}}", "false-positives": "False Positives", "false-recommendation-entries": "{length} false recommendation {length, plural, one{entry} other{entries}}",