Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-6774 - fixed "cannot add hint here any longer" and hint types

Browse Source
This commit is contained in:
Valentin Mihai 2023-07-26 16:33:02 +03:00
parent fd9d1e06d5
commit 5989bcb1b6
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/red-ui/src/app/modules/file-preview/dialogs/add-hint-dialog/add-hint-dialog.component.ts
View File

@ -126,11 +126,7 @@ export class AddHintDialogComponent extends IqserDialogComponent<AddHintDialogCo
addRedactionRequest.value = this.form.get('selectedText').value; addRedactionRequest.value = this.form.get('selectedText').value;
const selectedType = this.dictionaries.find(d => d.type === addRedactionRequest.type); const selectedType = this.dictionaries.find(d => d.type === addRedactionRequest.type);
if (selectedType) { addRedactionRequest.addToDictionary = this.dictionaryRequest && !!selectedType?.hasDictionary;
addRedactionRequest.addToDictionary = selectedType.hasDictionary;
} else {
addRedactionRequest.addToDictionary = this.dictionaryRequest && addRedactionRequest.type !== 'dossier_redaction';
}
const commentValue = this.form.get('comment').value; const commentValue = this.form.get('comment').value;
addRedactionRequest.comment = commentValue ? { text: commentValue } : null; addRedactionRequest.comment = commentValue ? { text: commentValue } : null;

5
apps/red-ui/src/app/services/entity-services/dictionary.service.ts
View File

@ -166,10 +166,7 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
const dictionaries: Dictionary[] = []; const dictionaries: Dictionary[] = [];
this._dictionariesMapService.get(dossierTemplateId).forEach((d: Dictionary) => { this._dictionariesMapService.get(dossierTemplateId).forEach((d: Dictionary) => {
if ( if (d.hint || (dictionaryRequest && dossierDictionaryOnly && d.dossierDictionaryOnly && d.type !== 'dossier_redaction')) {
(d.hint && d.hasDictionary && d.addToDictionaryAction && d.type) ||
(dictionaryRequest && dossierDictionaryOnly && d.dossierDictionaryOnly)
) {
if (!dictionaryRequest) { if (!dictionaryRequest) {
if (!IMAGE_TYPES.includes(d.type)) { if (!IMAGE_TYPES.includes(d.type)) {
dictionaries.push(d); dictionaries.push(d);