61133: Post-merge refactoring

src/app/+item-page/simple/item-types/journal-issue/journal-issue.component.html

@@ -1,5 +1,5 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(['dc.title'])"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(['dc.title'])"></ds-metadata-values>
 </h2>
 <div class="row">
   <div class="col-xs-12 col-md-4">

src/app/+item-page/simple/item-types/journal-volume/journal-volume.component.html

@@ -1,5 +1,5 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(['dc.title'])"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(['dc.title'])"></ds-metadata-values>
 </h2>
 <div class="row">
   <div class="col-xs-12 col-md-4">

src/app/+item-page/simple/item-types/journal/journal.component.html

@@ -1,5 +1,5 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(['dc.title'])"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(['dc.title'])"></ds-metadata-values>
 </h2>
 <div class="row">
   <div class="col-xs-12 col-md-4">

src/app/+item-page/simple/item-types/orgunit/orgunit.component.html

@@ -1,5 +1,5 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(['orgunit.identifier.name'])"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(['orgunit.identifier.name'])"></ds-metadata-values>
 </h2>
 <div class="row">
   <div class="col-xs-12 col-md-4">

src/app/+item-page/simple/item-types/person/person.component.html

@@ -1,5 +1,5 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(['dc.contributor.author'])"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(['dc.contributor.author'])"></ds-metadata-values>
 </h2>
 <div class="row">
   <div class="col-xs-12 col-md-4">

src/app/+item-page/simple/item-types/project/project.component.html

@@ -1,5 +1,5 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(['project.identifier.name'])"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(['project.identifier.name'])"></ds-metadata-values>
 </h2>
 <div class="row">
   <div class="col-xs-12 col-md-4">

src/app/core/shared/dspace-object.model.ts

@@ -119,21 +119,21 @@ export class DSpaceObject implements CacheableObject, ListableObject {
   }
 
   /**
-   * Find metadata on a specific field and order all of them using their "place" property.
+   * Find metadata on a specific field and order all of them using their "order" property.
    * @param key
    */
   findMetadataSortedByPlace(key: string): MetadataValue[] {
     return this.allMetadata([key]).sort((a: MetadataValue, b: MetadataValue) => {
-      if (hasNoValue(a.place) && hasNoValue(b.place)) {
+      if (hasNoValue(a.order) && hasNoValue(b.order)) {
         return 0;
       }
-      if (hasNoValue(a.place)) {
+      if (hasNoValue(a.order)) {
         return -1;
       }
-      if (hasNoValue(b.place)) {
+      if (hasNoValue(b.order)) {
         return 1;
       }
-      return a.place - b.place;
+      return a.order - b.order;
     });
   }
 

src/app/core/shared/metadata.models.ts

@@ -25,21 +25,17 @@ export class MetadataValue {
   value: string;
 
   /**
-   * The place of this Metadatum within his list of metadata
+   * The place of this MetadataValue within his list of metadata
    * This is used to render metadata in a specific custom order
    */
   @autoserialize
-  place: number;
+  order: number;
 
-  /**
+  /** The authority key used for authority-controlled metadata */
-   * The authority key used for authority-controlled metadata
-   */
   @autoserialize
   authority: string;
 
-  /**
+  /** The authority confidence value */
-   * The authority confidence value
-   */
   @autoserialize
   confidence: number;
 
@@ -91,23 +87,16 @@ export class MetadatumViewModel {
   /** The string value. */
   value: string;
 
-  /** The order. */
-  order: number;
-
   /**
-   * The place of this Metadatum within his list of metadata
+   * The place of this MetadataValue within his list of metadata
    * This is used to render metadata in a specific custom order
    */
-  place: number;
+  order: number;
 
-  /**
+  /** The authority key used for authority-controlled metadata */
-   * The authority key used for authority-controlled metadata
-   */
   authority: string;
 
-  /**
+  /** The authority confidence value */
-   * The authority confidence value
-   */
   confidence: number;
 }
 

src/app/shared/object-list/item-list-element/item-types/journal-issue/journal-issue-list-element.component.html

@@ -1,17 +1,17 @@
 <ds-truncatable [id]="item.id">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('dc.title')"></a>
+    [innerHTML]="firstMetadataValue('dc.title')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="1">
-            <span *ngIf="item.filterMetadata(['journalvolume.identifier.volume']).length > 0"
+            <span *ngIf="item.allMetadata(['journalvolume.identifier.volume']).length > 0"
                   class="item-list-journal-issues">
-                    <span *ngFor="let value of getValues(['journalvolume.identifier.volume']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['journalvolume.identifier.volume']); let last=last;">
                         <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                     </span>
-                <span *ngIf="item.filterMetadata(['journalissue.identifier.number']).length > 0"
+                <span *ngIf="item.allMetadata(['journalissue.identifier.number']).length > 0"
                       class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of getValues(['journalissue.identifier.number']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['journalissue.identifier.number']); let last=last;">
                         <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                     </span>
                 </span>

src/app/shared/object-list/item-list-element/item-types/journal-volume/journal-volume-list-element.component.html

@@ -1,18 +1,18 @@
 <ds-truncatable [id]="item.id">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('dc.title')"></a>
+    [innerHTML]="firstMetadataValue('dc.title')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="1">
-            <span *ngIf="item.filterMetadata(['journal.title']).length > 0"
+            <span *ngIf="item.allMetadata(['journal.title']).length > 0"
                   class="item-list-journal-volumes">
-                    <span *ngFor="let value of getValues(['journal.title']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
                         <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                     </span>
             </span>
-            <span *ngIf="item.filterMetadata(['journalvolume.identifier.volume']).length > 0"
+            <span *ngIf="item.allMetadata(['journalvolume.identifier.volume']).length > 0"
                   class="item-list-journal-volume-identifiers">
-                    <span *ngFor="let value of getValues(['journalvolume.identifier.volume']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['journalvolume.identifier.volume']); let last=last;">
                         <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
                     </span>
             </span>

src/app/shared/object-list/item-list-element/item-types/journal/journal-list-element.component.html

@@ -1,7 +1,7 @@
 <ds-truncatable [id]="item.id">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('dc.title')"></a>
+    [innerHTML]="firstMetadataValue('dc.title')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="1">
             <span *ngIf="item.filterMetadata(['journal.identifier.issn']).length > 0"

src/app/shared/object-list/item-list-element/item-types/orgunit/orgunit-list-element.component.html

@@ -1,13 +1,13 @@
 <ds-truncatable [id]="item.id">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('orgunit.identifier.name')"></a>
+    [innerHTML]="firstMetadataValue('orgunit.identifier.name')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="3">
-            <span *ngIf="item.filterMetadata(['orgunit.identifier.description']).length > 0"
+            <span *ngIf="item.allMetadata(['orgunit.identifier.description']).length > 0"
                   class="item-list-orgunit-description">
                 <ds-truncatable-part [id]="item.id" [minLines]="3"><span
-                  [innerHTML]="getFirstValue('orgunit.identifier.description')"></span>
+                  [innerHTML]="firstMetadataValue('orgunit.identifier.description')"></span>
                 </ds-truncatable-part>
             </span>
         </ds-truncatable-part>

src/app/shared/object-list/item-list-element/item-types/person/person-list-element.component.html

@@ -1,12 +1,12 @@
 <ds-truncatable [id]="item.id">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('dc.contributor.author')"></a>
+    [innerHTML]="firstMetadataValue('dc.contributor.author')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="1">
-            <span *ngIf="item.filterMetadata(['person.identifier.jobtitle']).length > 0"
+            <span *ngIf="item.allMetadata(['person.identifier.jobtitle']).length > 0"
                   class="item-list-job-title">
-                    <span *ngFor="let value of getValues(['person.identifier.jobtitle']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['person.identifier.jobtitle']); let last=last;">
                         <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                     </span>
             </span>

src/app/shared/object-list/item-list-element/item-types/person/person-metadata-list-element.component.html

@@ -1,8 +1,8 @@
 <ng-template #descTemplate>
   <span class="text-muted">
-      <span *ngIf="item.filterMetadata(['person.identifier.jobtitle']).length > 0"
+      <span *ngIf="item.allMetadata(['person.identifier.jobtitle']).length > 0"
             class="item-list-job-title">
-              <span *ngFor="let value of getValues(['person.identifier.jobtitle']); let last=last;">
+              <span *ngFor="let value of allMetadataValues(['person.identifier.jobtitle']); let last=last;">
                   <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
               </span>
       </span>
@@ -10,6 +10,6 @@
 </ng-template>
 <ds-truncatable [id]="item.id">
   <a [routerLink]="['/items/' + item.id]"
-     [innerHTML]="getFirstValue('dc.contributor.author')"
+     [innerHTML]="firstMetadataValue('dc.contributor.author')"
      [tooltip]="descTemplate"></a>
 </ds-truncatable>

src/app/shared/object-list/item-list-element/item-types/project/project-list-element.component.html

@@ -1,12 +1,12 @@
 <ds-truncatable [id]="item.id">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('project.identifier.name')"></a>
+    [innerHTML]="firstMetadataValue('project.identifier.name')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="1">
-            <span *ngIf="item.filterMetadata(['project.identifier.status']).length > 0"
+            <span *ngIf="item.allMetadata(['project.identifier.status']).length > 0"
                   class="item-list-status">
-                    <span *ngFor="let value of getValues(['project.identifier.status']); let last=last;">
+                    <span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">
                         <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
                     </span>
             </span>

src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.html

@@ -1,24 +1,24 @@
 <ds-truncatable [id]="item.id" *ngIf="item !== undefined && item !== null">
   <a
     [routerLink]="['/items/' + item.id]" class="lead"
-    [innerHTML]="getFirstValue('dc.title')"></a>
+    [innerHTML]="firstMetadataValue('dc.title')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="item.id" [minLines]="1">
-            <ng-container *ngIf="item.findMetadata('dc.publisher') || item.findMetadata('dc.date.issued')">(<span class="item-list-publisher"
+            <ng-container *ngIf="item.allMetadata('dc.publisher') || item.allMetadata('dc.date.issued')">(<span class="item-list-publisher"
-                   [innerHTML]="getFirstValue('dc.publisher')">, </span><span
+                   [innerHTML]="firstMetadataValue('dc.publisher')">, </span><span
-      *ngIf="item.findMetadata('dc.date.issued')" class="item-list-date"
+      *ngIf="item.allMetadata('dc.date.issued')" class="item-list-date"
-      [innerHTML]="getFirstValue('dc.date.issued')"></span>)</ng-container>
+      [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)</ng-container>
-            <span *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
+            <span *ngIf="item.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
                   class="item-list-authors">
-                    <span *ngFor="let author of getValues(['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>
             </span>
         </ds-truncatable-part>
   </span>
-  <div *ngIf="item.findMetadata('dc.description.abstract')" class="item-list-abstract">
+  <div *ngIf="item.allMetadata('dc.description.abstract')" class="item-list-abstract">
     <ds-truncatable-part [id]="item.id" [minLines]="3"><span
-      [innerHTML]="getFirstValue('dc.description.abstract')"></span>
+      [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
     </ds-truncatable-part>
   </div>
 </ds-truncatable>