From 4a608b135861dc075d480a4e54fac7192006c600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Thu, 25 Apr 2024 16:19:21 -0600
Subject: [PATCH 1/4] Fix: author search result without co-author

(cherry picked from commit f055ff6fbd91b804bddc6530dae69e07a63ae099)
---
 ...-search-result-list-element.component.html |  2 +-
 .../search-result-list-element.component.ts   | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index baebf5fe865..9d1b5e9ef11 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -29,7 +29,7 @@
           <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
           </ng-container>
           <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+            <span *ngFor="let author of allMetadataNoExcludingValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                 <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                 <span *ngIf="!last">; </span>
             </span>
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index 986138493b3..4882313ad0a 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -55,6 +55,28 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
+  /**
+   * Gets all matching metadata string values from hitHighlights or dso metadata.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @returns {string[]} the matching string values or an empty array.
+   */
+  allMetadataNoExcludingValues(keyOrKeys: string | string[]): string[] {
+    let dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
+    let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
+    let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
+    for (let i = 0; i < removedHighlights.length; i++) {
+        let index = dsoMetadata.indexOf(removedHighlights[i]);        
+        if (index !== -1) {
+          dsoMetadata[index] = highlights[i];
+        }
+    }
+    console.log(dsoMetadata);
+    console.log(highlights);
+    console.log(removedHighlights);
+    return dsoMetadata;
+  }
+
   /**
    * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
    *

From 55326246b5dd4ae76d5f9ebebb8c8abc88a11ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Fri, 26 Apr 2024 17:38:06 -0600
Subject: [PATCH 2/4] Fix trailing spaces and removed console.log

(cherry picked from commit 2530845b9b17e6acb9de2c784acffc19338a8e29)
---
 .../search-result-list-element.component.ts                  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index 4882313ad0a..e512f535cbb 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -66,14 +66,11 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
     let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
-        let index = dsoMetadata.indexOf(removedHighlights[i]);        
+        let index = dsoMetadata.indexOf(removedHighlights[i]);
         if (index !== -1) {
           dsoMetadata[index] = highlights[i];
         }
     }
-    console.log(dsoMetadata);
-    console.log(highlights);
-    console.log(removedHighlights);
     return dsoMetadata;
   }
 

From 696a0de1ada1f1e598616250fbd30b3ff75a665f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oscar=20Chac=C3=B3n?= <oscar@escire.lat>
Date: Sat, 11 May 2024 17:37:38 -0600
Subject: [PATCH 3/4] Update: replaced logic of allMetadataValues method by
 allMetadataNoExcludingValues logic

(cherry picked from commit 5e594037796df145ce864baa36cb8a9c18dcda8d)
---
 .../item-search-result-list-element.component.html   |  2 +-
 .../search-result-list-element.component.ts          | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index 9d1b5e9ef11..baebf5fe865 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -29,7 +29,7 @@
           <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
           </ng-container>
           <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-            <span *ngFor="let author of allMetadataNoExcludingValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                 <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                 <span *ngIf="!last">; </span>
             </span>
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index e512f535cbb..e3f9a267aa2 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -45,23 +45,13 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     }
   }
 
-  /**
-   * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
-   *
-   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
-   * @returns {string[]} the matching string values or an empty array.
-   */
-  allMetadataValues(keyOrKeys: string | string[]): string[] {
-    return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
-  }
-
   /**
    * Gets all matching metadata string values from hitHighlights or dso metadata.
    *
    * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
    * @returns {string[]} the matching string values or an empty array.
    */
-  allMetadataNoExcludingValues(keyOrKeys: string | string[]): string[] {
+  allMetadataValues(keyOrKeys: string | string[]): string[] {
     let dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
     let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
     let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));

From 517b367605d9d957f76d1afdb14cad89f181aad4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 14 May 2024 11:06:15 -0500
Subject: [PATCH 4/4] lint fixes

---
 .../search-result-list-element.component.ts        | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index e3f9a267aa2..c4251c3597f 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -52,14 +52,14 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
    * @returns {string[]} the matching string values or an empty array.
    */
   allMetadataValues(keyOrKeys: string | string[]): string[] {
-    let dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
-    let highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
-    let removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
+    const dsoMetadata: string[] = Metadata.allValues([this.dso.metadata], keyOrKeys);
+    const highlights: string[] = Metadata.allValues([this.object.hitHighlights], keyOrKeys);
+    const removedHighlights: string[] = highlights.map(str => str.replace(/<\/?em>/g, ''));
     for (let i = 0; i < removedHighlights.length; i++) {
-        let index = dsoMetadata.indexOf(removedHighlights[i]);
-        if (index !== -1) {
-          dsoMetadata[index] = highlights[i];
-        }
+      const index = dsoMetadata.indexOf(removedHighlights[i]);
+      if (index !== -1) {
+        dsoMetadata[index] = highlights[i];
+      }
     }
     return dsoMetadata;
   }