From 4841a8a58187b815f4d374eb92596c1812ddcefd Mon Sep 17 00:00:00 2001
From: qtamu <qsean@tamu.edu>
Date: Thu, 5 Sep 2024 14:07:23 -0500
Subject: [PATCH 1/2] updated untyped component to nav to new tab when
 researcher link is clicked.

---
 .../simple/item-types/untyped-item/untyped-item.component.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index c97db888fc4..10acec4d0c0 100644
--- a/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -71,7 +71,8 @@
       [fields]="['dc.identifier.uri']"
       [label]="'item.page.uri'">
     </ds-item-page-uri-field>
-    <ds-item-page-uri-field [item]="object"
+    <ds-item-page-uri-field target="_blank" 
+      [item]="object"
       [fields]="['dc.relation.profileurl']"
       [label]="'item.author.uri'">
     </ds-item-page-uri-field>

From fc7636cf23afbfa96e0622289e3ee9e42799c431 Mon Sep 17 00:00:00 2001
From: qtamu <qsean@tamu.edu>
Date: Thu, 5 Sep 2024 14:44:43 -0500
Subject: [PATCH 2/2] Researcher profile link opens to new tab

---
 .../metadata-uri-values.component.html                    | 3 ++-
 .../metadata-uri-values.component.spec.ts                 | 8 ++++++++
 .../metadata-uri-values/metadata-uri-values.component.ts  | 8 ++++++++
 .../item-types/untyped-item/untyped-item.component.html   | 3 +--
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 9091beb6c7d..73356397cf5 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,6 @@
+<!-- From upstream DSpace 7 https://github.com/DSpace/dspace-angular/pull/2866/files -->
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value">
+    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value" [target]="linkTarget">
        {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
     </a>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
index f869ab8aaf8..09160d773ba 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.spec.ts
@@ -72,6 +72,14 @@ describe('MetadataUriValuesComponent', () => {
     const separators = fixture.debugElement.queryAll(By.css('a span'));
     expect(separators.length).toBe(mockMetadata.length - 1);
   });
+  // From upstream DSpace 7 https://github.com/DSpace/dspace-angular/pull/2866/files
+  it('should contain the correct target attribute for metadata links', () => {
+    const links = fixture.debugElement.queryAll(By.css('a'));
+    for (const link of links) {
+      expect(link.nativeElement.getAttribute('target')).toBe('_blank');
+    }
+  });
+  // END of upstream addition
 
   describe('when linktext is defined', () => {
 
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index e070eccf2d5..cdc2e281787 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -37,4 +37,12 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent {
    * The label for this iteration of metadata values
    */
   @Input() label: string;
+
+  // From upstream DSpace 7 https://github.com/DSpace/dspace-angular/pull/2866/files
+  /**
+   * The target attribute for the metadata links.
+   * Defaults to '_blank' to open links in a new window/tab.
+   */
+  @Input() linkTarget = '_blank';
+  // END of upstream additions
 }
diff --git a/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 10acec4d0c0..c97db888fc4 100644
--- a/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -71,8 +71,7 @@
       [fields]="['dc.identifier.uri']"
       [label]="'item.page.uri'">
     </ds-item-page-uri-field>
-    <ds-item-page-uri-field target="_blank" 
-      [item]="object"
+    <ds-item-page-uri-field [item]="object"
       [fields]="['dc.relation.profileurl']"
       [label]="'item.author.uri'">
     </ds-item-page-uri-field>