Merge branch 'w2p-94060_Issue-1720_MyDSpace-support-entities_7.0' into w2p-94060_Issue-1720_MyDSpace-support-entities_7.2

Author: LotteHofstede

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html

@@ -2,10 +2,10 @@
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead"
-       [innerHTML]="firstMetadataValue('organization.legalName')"></a>
+       [innerHTML]="firstMetadataValue('organization.legalName') || ('orgunit.listelement.no-title' | translate)"></a>
     <span *ngIf="linkType == linkTypes.None"
           class="lead"
-          [innerHTML]="firstMetadataValue('organization.legalName')"></span>
+          [innerHTML]="firstMetadataValue('organization.legalName') || ('orgunit.listelement.no-title' | translate)"></span>
     <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="3">
             <span *ngIf="dso.allMetadata(['dc.description']).length > 0"

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html

@@ -2,10 +2,10 @@
 <ds-truncatable [id]="dso.id">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
        [routerLink]="[itemPageRoute]" class="lead"
-       [innerHTML]="name"></a>
+       [innerHTML]="name || ('person.listelement.no-title' | translate)"></a>
     <span *ngIf="linkType == linkTypes.None"
           class="lead"
-          [innerHTML]="firstMetadataValue('person.familyName') + ', ' + firstMetadataValue('person.givenName')"></span>
+          [innerHTML]="name || ('person.listelement.no-title' | translate)"></span>
     <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="1">
             <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"

src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts

@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { hasValue } from '../../../../../shared/empty.util';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
 @Component({
@@ -15,8 +16,12 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
 export class PersonSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
   get name() {
-    return this.value ?
-      this.value :
-      this.firstMetadataValue('person.familyName') + ', ' + this.firstMetadataValue('person.givenName');
+    if (hasValue(this.value)) {
+      return this.value;
+    }
+    if (hasValue(this.firstMetadataValue('person.familyName')) || hasValue(this.firstMetadataValue('person.givenName'))) {
+      return this.firstMetadataValue('person.familyName') + ', ' + this.firstMetadataValue('person.givenName');
+    }
+    return undefined;
   }
 }

src/assets/i18n/en.json5

@@ -2701,6 +2701,8 @@
 
   "orgunit.listelement.badge": "Organizational Unit",
 
+  "orgunit.listelement.no-title": "Untitled",
+
   "orgunit.page.city": "City",
 
   "orgunit.page.country": "Country",