Merge pull request DSpace#3307 from alexandrevryghem/w2p-118157_entity-label-fix_contribute-main

Made the labels in edit relationships tab unique

Author: tdonohue

src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html

@@ -36,13 +36,13 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalVolumeOfIssue'"
-      [label]="'relationships.isSingleVolumeOf' | translate">
+      [label]="'item.page.journal-volume' | translate">
     </ds-related-items>
     <ds-related-items
       class="mb-1 mt-1"
       [parentItem]="object"
       [relationType]="'isPublicationOfJournalIssue'"
-      [label]="'relationships.isPublicationOfJournalIssue' | translate">
+      [label]="'item.page.articles' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html

@@ -24,12 +24,12 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalOfVolume'"
-      [label]="'relationships.isSingleJournalOf' | translate">
+      [label]="'item.page.journal' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isIssueOfJournalVolume'"
-      [label]="'relationships.isIssueOf' | translate">
+      [label]="'item.page.journal-issues' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html

@@ -28,7 +28,7 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isVolumeOfJournal'"
-      [label]="'relationships.isVolumeOf' | translate">
+      [label]="'item.page.journal-volumes' | translate">
     </ds-related-items>
     <ds-generic-item-page-field class="item-page-fields" [item]="object"
       [fields]="['dc.description']"

src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html

@@ -49,7 +49,7 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
-      [label]="'relationships.isPublicationOf' | translate">
+      [label]="'item.page.publications' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"

src/app/entity-groups/research-entities/item-pages/person/person.component.html

@@ -28,12 +28,12 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPerson'"
-      [label]="'relationships.isProjectOf' | translate">
+      [label]="'item.page.projects' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isOrgUnitOfPerson'"
-      [label]="'relationships.isOrgUnitOf' | translate">
+      [label]="'item.page.org-units' | translate">
     </ds-related-items>
     <ds-generic-item-page-field [item]="object"
       [fields]="['person.jobTitle']"

src/app/entity-groups/research-entities/item-pages/project/project.component.html

@@ -43,17 +43,17 @@
   <ds-related-items
     [parentItem]="object"
     [relationType]="'isPersonOfProject'"
-    [label]="'relationships.isPersonOf' | translate">
+    [label]="'item.page.authors' | translate">
   </ds-related-items>
   <ds-related-items
     [parentItem]="object"
     [relationType]="'isPublicationOfProject'"
-    [label]="'relationships.isPublicationOf' | translate">
+    [label]="'item.page.publications' | translate">
   </ds-related-items>
   <ds-related-items
     [parentItem]="object"
     [relationType]="'isOrgUnitOfProject'"
-    [label]="'relationships.isOrgUnitOf' | translate">
+    [label]="'item.page.org-units' | translate">
   </ds-related-items>
   <ds-generic-item-page-field [item]="object"
     [fields]="['dc.description']"

src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts

@@ -153,6 +153,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    */
   relationshipMessageKey$: Observable<string>;
 
+  currentEntityType$: Observable<ItemType>;
+
   /**
    * The list ID to save selected entities under
    */
@@ -222,20 +224,12 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    */
   public getRelationshipMessageKey(): Observable<string> {
     return observableCombineLatest([
+      this.currentEntityType$,
       this.getLabel(),
       this.relatedEntityType$,
     ]).pipe(
-      map(([label, relatedEntityType]) => {
-        if (hasValue(label) && label.indexOf('is') > -1 && label.indexOf('Of') > -1) {
-          const relationshipLabel = `${label.substring(2, label.indexOf('Of'))}`;
-          if (relationshipLabel !== relatedEntityType.label) {
-            return `relationships.is${relationshipLabel}Of.${relatedEntityType.label}`;
-          } else {
-            return `relationships.is${relationshipLabel}Of`;
-          }
-        } else {
-          return label;
-        }
+      map(([currentEntityType, label, relatedEntityType]: [ItemType, string, ItemType]) => {
+        return `relationships.${currentEntityType.label}.${label}.${relatedEntityType.label}`;
       }),
     );
   }
@@ -469,6 +463,17 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       hasValueOperator(),
     );
 
+    this.currentEntityType$ = this.relationshipLeftAndRightType$.pipe(
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        if (leftType.uuid === this.itemType.uuid) {
+          return leftType;
+        } else {
+          return rightType;
+        }
+      }),
+      hasValueOperator(),
+    );
+
     this.relatedEntityType$.pipe(
       take(1),
     ).subscribe(

src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts

@@ -50,6 +50,6 @@ export class ItemPageAuthorFieldComponent extends ItemPageFieldComponent {
   /**
    * Label i18n key for the rendered metadata
    */
-  label = 'item.page.author';
+  label = 'item.page.authors';
 
 }

src/app/item-page/simple/item-types/publication/publication.component.html

@@ -35,7 +35,7 @@
       [parentItem]="object"
       [itemType]="'Person'"
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
-      [label]="'relationships.isAuthorOf' | translate">
+      [label]="'item.page.authors' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
@@ -58,17 +58,17 @@
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPublication'"
-      [label]="'relationships.isProjectOf' | translate">
+      [label]="'item.page.projects' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isOrgUnitOfPublication'"
-      [label]="'relationships.isOrgUnitOf' | translate">
+      [label]="'item.page.org-units' | translate">
     </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isJournalIssueOfPublication'"
-      [label]="'relationships.isJournalIssueOf' | translate">
+      [label]="'item.page.journal-issue' | translate">
     </ds-related-items>
     <ds-item-page-abstract-field [item]="object"></ds-item-page-abstract-field>
     <ds-generic-item-page-field [item]="object"

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

@@ -36,7 +36,7 @@
       [parentItem]="object"
       [itemType]="'Person'"
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
-      [label]="'relationships.isAuthorOf' | translate">
+      [label]="'item.page.authors' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"