Merge pull request #96 from TAMULib/rdc-sprint4-staging

Rdc sprint4 staging

Author: qtamu

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>

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', () => {
 

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
 }

src/themes/rdc/app/item-page/simple/item-types/untyped-item/untyped-item.component.html

@@ -34,6 +34,22 @@
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
       [label]="'relationships.isAuthorOf' | translate">
     </ds-themed-metadata-representation-list>
+    <!-- TAMU Customization - Principal Investigator  -->
+    <ds-themed-metadata-representation-list class="ds-item-page-mixed-author-field"
+      [parentItem]="object"
+      [itemType]="'Person'"
+      [metadataFields]="['dc.creator.pi']"
+      [label]="'Principal Investigator'">
+    </ds-themed-metadata-representation-list>
+     <!-- END TAMU Customization - Principal Investigator  -->
+    <!-- TAMU Customization - Co Principal Investigator -->
+    <ds-themed-metadata-representation-list class="ds-item-page-mixed-author-field"
+      [parentItem]="object"
+      [itemType]="'Person'"
+      [metadataFields]="['dc.creator.copi']"
+      [label]="'Co-Principal Investigator(s)'">
+    </ds-themed-metadata-representation-list>
+     <!-- END TAMU Customization - Co Principal Investigator -->
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
       [label]="'item.page.journal-title'">

src/themes/rdc/assets/i18n/en.json5

@@ -19,6 +19,12 @@
 
   "dataset-relationships.search.results.head": "Dataset Search Results",
 
+  "researchproject.listelement.badge": "Research Project",
+
+  "researchproject.page.titleprefix": "Research Project:",
+
+  "researchproject.page.edit": "Edit this Research Project",
+
   "submission.sections.describe.relationship-lookup.title.Dataset": "Dataset",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.Dataset": "Dataset",