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

RED-7041 - Take into consideration if entity type only has dossier dictionaries

Browse Source
This commit is contained in:
Valentin Mihai 2023-08-02 17:06:47 +03:00
parent 4ca6e05b9f
commit 848720b39a
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,8 +153,9 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
this._dictionariesMapService.get(dossierTemplateId).forEach((d: Dictionary) => { this._dictionariesMapService.get(dossierTemplateId).forEach((d: Dictionary) => {
if ( if (
(!d.virtual && !d.hint && !d.systemManaged && d.hasDictionary && d.addToDictionaryAction) || !d.hint &&
(dossierDictionaryOnly && d.dossierDictionaryOnly) ((!d.virtual && !d.systemManaged && d.hasDictionary && d.addToDictionaryAction && !d.dossierDictionaryOnly) ||
(dossierDictionaryOnly && d.dossierDictionaryOnly))
) { ) {
dictionaries.push(d); dictionaries.push(d);
} }
@ -164,7 +165,6 @@ export class DictionaryService extends EntitiesService<IDictionary, Dictionary>
} }
getEditableRedactionTypes(dossierTemplateId: string, isImage: boolean): Dictionary[] { getEditableRedactionTypes(dossierTemplateId: string, isImage: boolean): Dictionary[] {
console.log(this._dictionariesMapService.get(dossierTemplateId));
return this._dictionariesMapService return this._dictionariesMapService
.get(dossierTemplateId) .get(dossierTemplateId)
.filter(d => (isImage ? IMAGE_CATEGORIES.includes(d.type) : d.hasDictionary && !d.virtual && !d.systemManaged)) .filter(d => (isImage ? IMAGE_CATEGORIES.includes(d.type) : d.hasDictionary && !d.virtual && !d.systemManaged))
@ -175,12 +175,18 @@ 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 (d.hint || (dictionaryRequest && dossierDictionaryOnly && d.dossierDictionaryOnly && d.type !== 'dossier_redaction')) { if (d.hint) {
if (!dictionaryRequest) { if (dictionaryRequest) {
if (!IMAGE_TYPES.includes(d.type)) { if (d.hasDictionary && d.addToDictionaryAction) {
dictionaries.push(d); if (d.dossierDictionaryOnly) {
if (dossierDictionaryOnly) {
dictionaries.push(d);
}
} else {
dictionaries.push(d);
}
} }
} else if (d.hasDictionary) { } else if (!d.dossierDictionaryOnly && !IMAGE_TYPES.includes(d.type)) {
dictionaries.push(d); dictionaries.push(d);
} }
} }