From 6e54acddc65d4b0e74e11c699e02e2caa2b7d749 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 2 Dec 2022 14:52:21 +0100
Subject: [PATCH] 97065: Check if indexableObject exists

---
 .../dso-selector/dso-selector.component.ts             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index 260f3182d5..c8d11891ba 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -279,7 +279,9 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    * @param listableObject The {@link ListableObject} to evaluate
    */
   onClick(listableObject: ListableObject): void {
-    if (listableObject.getRenderTypes().includes(LISTABLE_NOTIFICATION_OBJECT.value)) {
+    if (hasValue((listableObject as SearchResult<DSpaceObject>).indexableObject)) {
+      this.onSelect.emit((listableObject as SearchResult<DSpaceObject>).indexableObject);
+    } else {
       this.listEntries$.value.pop();
       this.hasNextPage = true;
       this.search(this.input.value ? this.input.value : '', this.currentPage$.value, false).pipe(
@@ -287,13 +289,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
       ).subscribe((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => {
         this.updateList(rd);
       });
-    } else {
-      this.onSelect.emit((listableObject as SearchResult<DSpaceObject>).indexableObject);
     }
   }
 
   getName(listableObject: ListableObject): string {
-    return listableObject.getRenderTypes().includes(LISTABLE_NOTIFICATION_OBJECT.value) ?
-      'error' : this.dsoNameService.getName((listableObject as SearchResult<DSpaceObject>).indexableObject);
+    return hasValue((listableObject as SearchResult<DSpaceObject>).indexableObject) ?
+      this.dsoNameService.getName((listableObject as SearchResult<DSpaceObject>).indexableObject) : null;
   }
 }