Skip to content

Commit 4056533

Browse files
committed
Fix error in warnings modal for invalid relation fields
1 parent e1ba7b8 commit 4056533

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

desktop/src/app/components/navbar/warnings/warnings-modal.component.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Component } from '@angular/core';
22
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
3-
import { Map, flatten, intersect, isArray, nop, set } from 'tsfun';
3+
import { Map, flatten, intersect, isArray, isString, nop, set } from 'tsfun';
44
import { CategoryForm, ConfigurationDocument, Datastore, Document, FieldDocument, IndexFacade, Labels,
55
ProjectConfiguration, WarningType, ConfigReader, Group, Resource, Field, Tree, InvalidDataUtil, OutlierWarnings,
66
RelationTargetWarnings } from 'idai-field-core';
@@ -594,6 +594,8 @@ export class WarningsModalComponent {
594594
document.resource.relations[fieldName],
595595
document.warnings.invalidRelationTargets.targetIds
596596
) : document.resource.relations[fieldName];
597+
598+
if (!isArray(targetIds) || !targetIds.every(targetId => isString(targetId))) return undefined;
597599

598600
return this.datastore.getMultiple(targetIds);
599601
}

desktop/src/app/components/navbar/warnings/warnings-modal.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,12 @@
185185
<div *ngIf="section.type === 'unconfiguredFields' || section.type === 'invalidFields' || section.type === 'missingIdentifierPrefix'"
186186
class="data-info">
187187
<div><b i18n="@@navbar.taskbar.warnings.enteredData">Eingetragene Daten:</b></div>
188-
<div *ngIf="section.dataLabel && !section.isRelationField" class="data-info-content" [innerHTML]="section.dataLabel"></div>
189-
<div *ngIf="section.isRelationField" class="data-info-content">
188+
<div *ngIf="section.dataLabel && !section.relationTargets" class="data-info-content" [innerHTML]="section.dataLabel"></div>
189+
<div *ngIf="section.relationTargets" class="data-info-content">
190190
<document-teaser *ngFor="let targetDocument of section.relationTargets"
191191
[document]="targetDocument"></document-teaser>
192192
</div>
193-
<div *ngIf="!section.dataLabel && !section.isRelationField" class="data-info-content"
193+
<div *ngIf="!section.dataLabel && !section.relationTargets" class="data-info-content"
194194
i18n="@@navbar.taskbar.warnings.fieldData.none"><i>Keine</i></div>
195195
</div>
196196
<div *ngIf="section.type === 'unconfiguredCategory'" class="data-info">

0 commit comments

Comments
 (0)