Made the labels in edit relationships tab unique

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

@@ -34,13 +34,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

@@ -22,12 +22,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

@@ -26,7 +26,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

@@ -47,7 +47,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

@@ -26,12 +26,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

@@ -41,17 +41,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

@@ -155,6 +155,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    */
   relationshipMessageKey$: Observable<string>;
 
+  currentEntityType$: Observable<ItemType>;
+
   /**
    * The list ID to save selected entities under
    */
@@ -224,20 +226,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}`;
       }),
     );
   }
@@ -471,6 +465,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

@@ -29,7 +29,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']"
@@ -52,17 +52,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

@@ -30,7 +30,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']"

src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html

@@ -30,7 +30,7 @@
                                       [placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
         <ds-item-detail-preview-field [item]="item"
                                       [object]="object"
-                                      [label]="('item.page.author' | translate)"
+                                      [label]="('item.page.authors' | translate)"
                                       [metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
                                       [separator]="separator"
                                       [placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>

src/assets/i18n/ar.json5

@@ -4046,6 +4046,33 @@
   // "item.page.description": "Description",
   "item.page.description": "الوصف",
 
+  // "item.page.org-units": "Organizational Units",
+  "item.page.org-units": "وحدات مؤسسية",
+
+  // "item.page.projects": "Research Projects",
+  "item.page.projects": "مشاريع البحث",
+
+  // "item.page.publications": "Publications",
+  "item.page.publications": "منشورات",
+
+  // "item.page.articles": "Articles",
+  "item.page.articles": "مقالات",
+
+  // "item.page.journal": "Journal",
+  "item.page.journal": "الدوري",
+
+  // "item.page.journal-issue": "Journal Issue",
+  "item.page.journal-issue": "عدد الدوري",
+
+  // "item.page.journal-issues": "Journal Issues",
+  "item.page.journal-issues": "سجل الدوري",
+
+  // "item.page.journal-volume": "Journal Volume",
+  "item.page.journal-volume": "سلسلة الدورية",
+
+  // "item.page.journal-volumes": "Journal Volumes",
+  "item.page.journal-volumes": "سلسلة الدوريات",
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ردمد الدورية",
 
@@ -4152,8 +4179,8 @@
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "خلاصة",
 
-  // "item.page.author": "Authors",
-  "item.page.author": "المؤلفين",
+  // "item.page.authors": "Authors",
+  "item.page.authors": "المؤلفين",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "اقتباس",
@@ -6361,68 +6388,67 @@
   // "relationships.add.error.title": "Unable to add relationship",
   "relationships.add.error.title": "غير قادر على إضافة العلاقة",
 
-  // "relationships.isAuthorOf": "Authors",
-  "relationships.isAuthorOf": "المؤلفين",
+  // "relationships.Publication.isAuthorOfPublication.Person": "Authors (persons)",
+  "relationships.Publication.isAuthorOfPublication.Person": "المؤلفين (أشخاص)",
 
-  // "relationships.isAuthorOf.Person": "Authors (persons)",
-  "relationships.isAuthorOf.Person": "المؤلفين (أشخاص)",
+  // "relationships.Publication.isProjectOfPublication.Project": "Research Projects",
+  "relationships.Publication.isProjectOfPublication.Project": "مشروعات البحث",
 
-  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  "relationships.isAuthorOf.OrgUnit": "المؤلفين (وحدات مؤسسية)",
+  // "relationships.Publication.isOrgUnitOfPublication.OrgUnit": "Organizational Units",
+  "relationships.Publication.isOrgUnitOfPublication.OrgUnit": "وحدات مؤسسية",
 
-  // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "أعداد الدورية",
+  // "relationships.Publication.isAuthorOfPublication.OrgUnit": "Authors (organizational units)",
+  "relationships.Publication.isAuthorOfPublication.OrgUnit": "المؤلفين (وحدات مؤسسية)",
 
-  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
-  "relationships.isIssueOf.JournalIssue": "عدد الدورية",
+  // "relationships.Publication.isJournalIssueOfPublication.JournalIssue": "Journal Issue",
+  "relationships.Publication.isJournalIssueOfPublication.JournalIssue": "عدد الدورية",
 
-  // "relationships.isJournalIssueOf": "Journal Issue",
-  "relationships.isJournalIssueOf": "عدد الدورية",
+  // "relationships.Person.isPublicationOfAuthor.Publication": "Publications",
+  "relationships.Person.isPublicationOfAuthor.Publication": "منشورات",
 
-  // "relationships.isJournalOf": "Journals",
-  "relationships.isJournalOf": "الدوريات",
+  // "relationships.Person.isProjectOfPerson.Project": "Research Projects",
+  "relationships.Person.isProjectOfPerson.Project": "مشروعات البحث",
 
-  // "relationships.isJournalVolumeOf": "Journal Volume",
-  "relationships.isJournalVolumeOf": "مجلد الدورية",
+  // "relationships.Person.isOrgUnitOfPerson.OrgUnit": "Organizational Units",
+  "relationships.Person.isOrgUnitOfPerson.OrgUnit": "وحدات مؤسسية",
 
-  // "relationships.isOrgUnitOf": "Organizational Units",
-  "relationships.isOrgUnitOf": "وحدات مؤسسية",
+  // "relationships.Project.isPublicationOfProject.Publication": "Publications",
+  "relationships.Project.isPublicationOfProject.Publication": "منشورات",
 
-  // "relationships.isPersonOf": "Authors",
-  "relationships.isPersonOf": "المؤلفين",
+  // "relationships.Project.isPersonOfProject.Person": "Authors",
+  "relationships.Project.isPersonOfProject.Person": "المؤلفين",
 
-  // "relationships.isProjectOf": "Research Projects",
-  "relationships.isProjectOf": "مشروعات البحث",
+  // "relationships.Project.isOrgUnitOfProject.OrgUnit": "Organizational Units",
+  "relationships.Project.isOrgUnitOfProject.OrgUnit": "وحدات مؤسسية",
 
-  // "relationships.isPublicationOf": "Publications",
-  "relationships.isPublicationOf": "منشورات",
-
-  // "relationships.isPublicationOfJournalIssue": "Articles",
-  "relationships.isPublicationOfJournalIssue": "مقالات",
+  // "relationships.OrgUnit.isPublicationOfOrgUnit.Publication": "Organisation Publications",
+  // TODO New key - Add a translation
+  "relationships.OrgUnit.isPublicationOfOrgUnit.Publication": "Organisation Publications",
 
-  // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf": "الدورية",
+  // "relationships.OrgUnit.isPersonOfOrgUnit.Person": "Authors",
+  "relationships.OrgUnit.isPersonOfOrgUnit.Person": "المؤلفين",
 
-  // "relationships.isSingleVolumeOf": "Journal Volume",
-  "relationships.isSingleVolumeOf": "مجلد الدورية",
+  // "relationships.OrgUnit.isProjectOfOrgUnit.Project": "Research Projects",
+  "relationships.OrgUnit.isProjectOfOrgUnit.Project": "مشروعات البحث",
 
-  // "relationships.isVolumeOf": "Journal Volumes",
-  "relationships.isVolumeOf": "مجلدات الدورية",
+  // "relationships.OrgUnit.isPublicationOfAuthor.Publication": "Authored Publications",
+  // TODO New key - Add a translation
+  "relationships.OrgUnit.isPublicationOfAuthor.Publication": "Authored Publications",
 
-  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
-  "relationships.isVolumeOf.JournalVolume": "مجلد الدورية",
+  // "relationships.JournalIssue.isJournalVolumeOfIssue.JournalVolume": "Journal Volume",
+  "relationships.JournalIssue.isJournalVolumeOfIssue.JournalVolume": "مجلد الدورية",
 
-  // "relationships.isContributorOf": "Contributors",
-  "relationships.isContributorOf": "المساهمين",
+  // "relationships.JournalIssue.isPublicationOfJournalIssue.Publication": "Publications",
+  "relationships.JournalIssue.isPublicationOfJournalIssue.Publication": "منشورات",
 
-  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
-  "relationships.isContributorOf.OrgUnit": "المساهم (وحدة مؤسسية)",
+  // "relationships.JournalVolume.isJournalOfVolume.Journal": "Journals",
+  "relationships.JournalVolume.isJournalOfVolume.Journal": "الدوريات",
 
-  // "relationships.isContributorOf.Person": "Contributor",
-  "relationships.isContributorOf.Person": "المساهم",
+  // "relationships.JournalVolume.isIssueOfJournalVolume.JournalIssue": "Journal Issue",
+  "relationships.JournalVolume.isIssueOfJournalVolume.JournalIssue": "عدد الدورية",
 
-  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
-  "relationships.isFundingAgencyOf.OrgUnit": "الممول",
+  // "relationships.Journal.isVolumeOfJournal.JournalVolume": "Journal Volume",
+  "relationships.Journal.isVolumeOfJournal.JournalVolume": "مجلد الدورية",
 
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "شعار المستودع",