From 1697d1396e2643a201edfd7a0470393e02a0c156 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Mon, 21 Mar 2022 10:23:44 +0100
Subject: [PATCH 1/6] 88599: Support versioning of entities

---
 .../item-pages/journal-issue/journal-issue.component.html     | 3 +++
 .../item-pages/journal-issue/journal-issue.component.ts       | 4 ++--
 .../item-pages/journal-volume/journal-volume.component.html   | 3 +++
 .../item-pages/journal-volume/journal-volume.component.ts     | 4 ++--
 .../item-pages/journal/journal.component.html                 | 3 +++
 .../journal-entities/item-pages/journal/journal.component.ts  | 4 ++--
 .../item-pages/org-unit/org-unit.component.html               | 3 +++
 .../item-pages/org-unit/org-unit.component.ts                 | 4 ++--
 .../research-entities/item-pages/person/person.component.html | 3 +++
 .../research-entities/item-pages/person/person.component.ts   | 4 ++--
 .../item-pages/project/project.component.html                 | 3 +++
 .../research-entities/item-pages/project/project.component.ts | 4 ++--
 .../simple/item-types/publication/publication.component.html  | 3 +++
 .../simple/item-types/publication/publication.component.ts    | 4 ++--
 14 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index 5847be7dd2..9b96d2a1b2 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -3,6 +3,9 @@
     {{'journalissue.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalissue.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index f96379dafd..f5e9dc9b2b 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
  */
-export class JournalIssueComponent extends ItemComponent {
+export class JournalIssueComponent extends VersionedItemComponent {
 }
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index a0a25766ef..07ecb33ced 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -3,6 +3,9 @@
     {{'journalvolume.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalvolume.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index eeb93e7070..cc09be7959 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
  */
-export class JournalVolumeComponent extends ItemComponent {
+export class JournalVolumeComponent extends VersionedItemComponent {
 }
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index af3ac85959..b1b35db724 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -3,6 +3,9 @@
     {{'journal.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journal.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 3fe0903145..acfd31d8f6 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
 /**
  * The component for displaying metadata and relations of an item of the type Journal
  */
-export class JournalComponent extends ItemComponent {
+export class JournalComponent extends VersionedItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index c9ea8fb549..7c8ce67b88 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -3,6 +3,9 @@
     {{'orgunit.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['organization.legalName'])"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'orgunit.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index ab756db562..cbf8497f35 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit
  */
-export class OrgUnitComponent extends ItemComponent {
+export class OrgUnitComponent extends VersionedItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 5c2fd227fd..6e71f775d6 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -3,6 +3,9 @@
     {{'person.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="[object?.firstMetadata('person.familyName'), object?.firstMetadata('person.givenName')]" [separator]="', '"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'person.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index 8b104cc9b1..ad2863034a 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('Person', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
 /**
  * The component for displaying metadata and relations of an item of the type Person
  */
-export class PersonComponent extends ItemComponent {
+export class PersonComponent extends VersionedItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 8f2ff6adcd..243dae8b43 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -3,6 +3,9 @@
     {{'project.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'project.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index e53d8afd69..066427fc0d 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('Project', ViewMode.StandalonePage)
 @Component({
@@ -12,5 +12,5 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
 /**
  * The component for displaying metadata and relations of an item of the type Project
  */
-export class ProjectComponent extends ItemComponent {
+export class ProjectComponent extends VersionedItemComponent {
 }
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index bace9fcd0a..667dee96f5 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -12,6 +12,9 @@
     {{'publication.page.titleprefix' | translate}}<ds-metadata-values [mdValues]="object?.allMetadata(['dc.title'])"></ds-metadata-values>
   </h2>
   <div class="pl-2">
+    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
+                                [tooltipMsgCreate]="'item.page.version.create'"
+                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
     <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'publication.page.edit'"></ds-dso-page-edit-button>
   </div>
 </div>
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts
index 5ace8d0473..ba5037a104 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ItemComponent } from '../shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { VersionedItemComponent } from '../versioned-item/versioned-item.component';
 
 /**
  * Component that represents a publication Item page
@@ -14,6 +14,6 @@ import { listableObjectComponent } from '../../../../shared/object-collection/sh
   templateUrl: './publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PublicationComponent extends ItemComponent {
+export class PublicationComponent extends VersionedItemComponent {
 
 }

From bcbd8dbd9353967bc600e1c77d4079452170191c Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Thu, 28 Apr 2022 12:28:44 +0200
Subject: [PATCH 2/6] 91070: Fix tests (add missing dependencies to testbed)

---
 .../journal/journal.component.spec.ts         | 24 ++++++++++++++-----
 .../publication/publication.component.spec.ts | 24 ++++++++++++++-----
 .../item-types/shared/item.component.spec.ts  | 24 ++++++++++++++-----
 3 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
index 0e756b7dc9..3ed73e7891 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.spec.ts
@@ -29,6 +29,11 @@ import { TruncatableService } from '../../../../shared/truncatable/truncatable.s
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { JournalComponent } from './journal.component';
 import { RouteService } from '../../../../core/services/route.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -65,12 +70,15 @@ describe('JournalComponent', () => {
   };
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
-      })],
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+        RouterTestingModule,
+      ],
       declarations: [JournalComponent, GenericItemPageFieldComponent, TruncatePipe],
       providers: [
         { provide: ItemDataService, useValue: {} },
@@ -86,7 +94,11 @@ describe('JournalComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: NotificationsService, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
+        { provide: VersionHistoryDataService, useValue: {} },
+        { provide: VersionDataService, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+        { provide: WorkspaceitemDataService, useValue: {} },
+        { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: {} }
       ],
 
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
index 761849f232..404890e36d 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.spec.ts
@@ -33,6 +33,11 @@ import {
 import { PublicationComponent } from './publication.component';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { RouteService } from '../../../../core/services/route.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 
 const iiifEnabledMap: MetadataMap = {
   'dspace.iiif.enabled': [iiifEnabled],
@@ -64,12 +69,15 @@ describe('PublicationComponent', () => {
       }
     };
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
-      })],
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+        RouterTestingModule,
+      ],
       declarations: [PublicationComponent, GenericItemPageFieldComponent, TruncatePipe],
       providers: [
         { provide: ItemDataService, useValue: {} },
@@ -85,7 +93,11 @@ describe('PublicationComponent', () => {
         { provide: HttpClient, useValue: {} },
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
+        { provide: VersionHistoryDataService, useValue: {} },
+        { provide: VersionDataService, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+        { provide: WorkspaceitemDataService, useValue: {} },
+        { provide: SearchService, useValue: {} },
         { provide: RouteService, useValue: mockRouteService }
       ],
 
diff --git a/src/app/item-page/simple/item-types/shared/item.component.spec.ts b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
index fc07f60b28..01e3115db1 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.spec.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.spec.ts
@@ -32,6 +32,11 @@ import { ItemComponent } from './item.component';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { RouteService } from '../../../../core/services/route.service';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouterTestingModule } from '@angular/router/testing';
 
 export const iiifEnabled = Object.assign(new MetadataValue(),{
   'value': 'true',
@@ -70,12 +75,15 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
         }
       };
       TestBed.configureTestingModule({
-        imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })],
+        imports: [
+            TranslateModule.forRoot({
+              loader: {
+                provide: TranslateLoader,
+                useClass: TranslateLoaderMock
+              }
+            }),
+            RouterTestingModule,
+        ],
         declarations: [component, GenericItemPageFieldComponent, TruncatePipe],
         providers: [
           { provide: ItemDataService, useValue: {} },
@@ -89,9 +97,13 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: HALEndpointService, useValue: {} },
           { provide: HttpClient, useValue: {} },
           { provide: DSOChangeAnalyzer, useValue: {} },
+          { provide: VersionHistoryDataService, useValue: {} },
+          { provide: VersionDataService, useValue: {} },
           { provide: NotificationsService, useValue: {} },
           { provide: DefaultChangeAnalyzer, useValue: {} },
           { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+          { provide: WorkspaceitemDataService, useValue: {} },
+          { provide: SearchService, useValue: {} },
           { provide: RouteService, useValue: {} }
         ],
 

From 0ce709ee68c6de3aef8ac6c79f8cdd3cb7943f68 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Mon, 9 May 2022 18:19:53 +0200
Subject: [PATCH 3/6] 90945: Use *-relationships discovery configs on
 single-item pages

---
 .../item-pages/journal/journal.component.html                 | 3 ++-
 .../item-pages/org-unit/org-unit.component.html               | 4 ++--
 .../research-entities/item-pages/person/person.component.html | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index b1b35db724..79c66cccc1 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -47,7 +47,8 @@
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isJournalOfPublication',
-                                          filter: 'isJournalOfPublication'
+                                          filter: 'isJournalOfPublication',
+                                          configuration: 'default-relationships'
                                         }]">
     </ds-tabbed-related-entities-search>
   </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 7c8ce67b88..6703634b6b 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -57,12 +57,12 @@
                                         [relationTypes]="[{
                                           label: 'isOrgUnitOfPerson',
                                           filter: 'isOrgUnitOfPerson',
-                                          configuration: 'person'
+                                          configuration: 'person-relationships'
                                         },
                                         {
                                           label: 'isOrgUnitOfProject',
                                           filter: 'isOrgUnitOfProject',
-                                          configuration: 'project'
+                                          configuration: 'project-relationships'
                                         }]">
     </ds-tabbed-related-entities-search>
   </div>
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index 6e71f775d6..4b7b3bed32 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -68,7 +68,8 @@
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isAuthorOfPublication',
-                                          filter: 'isAuthorOfPublication'
+                                          filter: 'isAuthorOfPublication',
+                                          configuration: 'default-relationships'
                                         }]">
     </ds-tabbed-related-entities-search>
   </div>

From 3abf83a5e9479148d7aea72c0c177f7469deb02c Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Wed, 11 May 2022 17:54:41 +0200
Subject: [PATCH 4/6] 90945: Add missing translations for new discovery configs

---
 src/assets/i18n/en.json5 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f742273edb..13e5171f62 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2278,6 +2278,8 @@
 
   "journal.search.results.head": "Journal Search Results",
 
+  "journal-relationships.search.results.head": "Journal Search Results",
+
   "journal.search.title": "Journal Search",
 
 
@@ -2755,6 +2757,8 @@
 
   "person.search.results.head": "Person Search Results",
 
+  "person-relationships.search.results.head": "Person Search Results",
+
   "person.search.title": "Person Search",
 
 
@@ -2930,6 +2934,8 @@
 
   "project.search.results.head": "Project Search Results",
 
+  "project-relationships.search.results.head": "Project Search Results",
+
 
 
   "publication.listelement.badge": "Publication",
@@ -2950,6 +2956,8 @@
 
   "publication.search.results.head": "Publication Search Results",
 
+  "publication-relationships.search.results.head": "Publication Search Results",
+
   "publication.search.title": "Publication Search",
 
 
@@ -3410,6 +3418,8 @@
 
   "default.search.results.head": "Search Results",
 
+  "default-relationships.search.results.head": "Search Results",
+
 
   "search.sidebar.close": "Back to results",
 

From 35708ae3a812ab1dea08d597a1e9393379024aa9 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Mon, 13 Jun 2022 18:45:32 +0200
Subject: [PATCH 5/6] 92187: Keep version creation modal opened till POST
 request finishes

---
 src/app/app.component.ts                      | 14 ++++++++++-
 .../versioned-item.component.ts               |  2 ++
 .../modal-before-dismiss.interface.ts         | 25 +++++++++++++++++++
 ...item-versions-summary-modal.component.html | 12 ++++++++-
 .../item-versions-summary-modal.component.ts  | 20 ++++++++++++---
 .../item-versions/item-versions.component.ts  |  3 +++
 src/assets/i18n/en.json5                      |  4 +++
 7 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 src/app/shared/interfaces/modal-before-dismiss.interface.ts

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 669411d9aa..d3024a3357 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -21,7 +21,7 @@ import {
 import { isEqual } from 'lodash';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { select, Store } from '@ngrx/store';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbModal, NgbModalConfig } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 
@@ -48,6 +48,7 @@ import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
 import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
 import { getDefaultThemeConfig } from '../config/config.util';
 import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
+import { ModalBeforeDismiss } from './shared/interfaces/modal-before-dismiss.interface';
 
 @Component({
   selector: 'ds-app',
@@ -105,6 +106,7 @@ export class AppComponent implements OnInit, AfterViewInit {
     private localeService: LocaleService,
     private breadcrumbsService: BreadcrumbsService,
     private modalService: NgbModal,
+    private modalConfig: NgbModalConfig,
     @Optional() private cookiesService: KlaroService,
     @Optional() private googleAnalyticsService: GoogleAnalyticsService,
   ) {
@@ -165,6 +167,16 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit() {
+    /** Implement behavior for interface {@link ModalBeforeDismiss} */
+    this.modalConfig.beforeDismiss = async function () {
+      if (typeof this?.componentInstance?.beforeDismiss === 'function') {
+        return this.componentInstance.beforeDismiss()
+      }
+
+      // fall back to default behavior
+      return true;
+    }
+
     this.isAuthBlocking$ = this.store.pipe(select(isAuthenticationBlocking)).pipe(
       distinctUntilChanged()
     );
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
index cd2eb3a19b..7f61cee10b 100644
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
@@ -62,6 +62,8 @@ export class VersionedItemComponent extends ItemComponent {
     activeModal.componentInstance.createVersionEvent.pipe(
       switchMap((summary: string) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
       getFirstCompletedRemoteData(),
+      // close model (should be displaying loading/waiting indicator) when version creation failed/succeeded
+      tap(() => activeModal.close()),
       // show success/failure notification
       tap((res: RemoteData<Version>) => { this.itemVersionShared.notifyCreateNewVersion(res); }),
       // get workspace item
diff --git a/src/app/shared/interfaces/modal-before-dismiss.interface.ts b/src/app/shared/interfaces/modal-before-dismiss.interface.ts
new file mode 100644
index 0000000000..c07f8d329f
--- /dev/null
+++ b/src/app/shared/interfaces/modal-before-dismiss.interface.ts
@@ -0,0 +1,25 @@
+import { NgbModalConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+
+/**
+ * If a component implementing this interface is used to create a modal (i.e. it is passed to {@link NgbModal#open}),
+ * and that modal is dismissed, then {@link #beforeDismiss} will be called.
+ *
+ * This behavior is implemented for the whole app, by setting a default value for {@link NgbModalConfig#beforeDismiss}
+ * in {@link AppComponent}.
+ *
+ * Docs: https://ng-bootstrap.github.io/#/components/modal/api
+ */
+export interface ModalBeforeDismiss {
+
+  /**
+   * Callback right before the modal will be dismissed.
+   * If this function returns:
+   * - false
+   * - a promise resolved with false
+   * - a promise that is rejected
+   * then the modal won't be dismissed.
+   * Docs: https://ng-bootstrap.github.io/#/components/modal/api#NgbModalOptions
+   */
+  beforeDismiss(): boolean | Promise<boolean>
+
+}
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html
index e49e257339..5f6873a629 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html
+++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html
@@ -1,4 +1,4 @@
-<div>
+<div *ngIf="!(this.submitted$ | async); else waiting">
   <div class="modal-header">{{'item.version.create.modal.header' | translate}}
     <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
       <span aria-hidden="true">×</span>
@@ -34,3 +34,13 @@
     </button>
   </div>
 </div>
+
+<ng-template #waiting>
+  <div class="modal-header">{{'item.version.create.modal.submitted.header' | translate}}</div>
+  <div class="modal-body">
+    <p>{{'item.version.create.modal.submitted.text' | translate}}</p>
+    <div class="d-flex justify-content-center">
+      <ds-loading [showMessage]="false"></ds-loading>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index 31bb3078c0..e20737ee57 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -1,16 +1,19 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, OnInit, Output } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { BehaviorSubject } from 'rxjs';
+import { ModalBeforeDismiss } from '../../../interfaces/modal-before-dismiss.interface';
 
 @Component({
   selector: 'ds-item-versions-summary-modal',
   templateUrl: './item-versions-summary-modal.component.html',
   styleUrls: ['./item-versions-summary-modal.component.scss']
 })
-export class ItemVersionsSummaryModalComponent {
+export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDismiss {
 
   versionNumber: number;
   newVersionSummary: string;
   firstVersion = true;
+  submitted$: BehaviorSubject<boolean>
 
   @Output() createVersionEvent: EventEmitter<string> = new EventEmitter<string>();
 
@@ -19,13 +22,24 @@ export class ItemVersionsSummaryModalComponent {
   ) {
   }
 
+  ngOnInit() {
+    this.submitted$ = new BehaviorSubject<boolean>(false);
+  }
+
   onModalClose() {
     this.activeModal.dismiss();
   }
 
+  beforeDismiss(): boolean | Promise<boolean> {
+    // prevent the modal from being dismissed after version creation is initiated
+    return !this.submitted$.getValue()
+  }
+
   onModalSubmit() {
     this.createVersionEvent.emit(this.newVersionSummary);
-    this.activeModal.close();
+    this.submitted$.next(true);
+    // NOTE: the caller of this modal is responsible for closing it,
+    //       e.g. after the version creation POST request completed.
   }
 
 }
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/shared/item/item-versions/item-versions.component.ts
index 2457cf76c4..ef28109870 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.ts
@@ -342,6 +342,9 @@ export class ItemVersionsComponent implements OnInit {
         version.item.pipe(getFirstSucceededRemoteDataPayload())
       ])),
       mergeMap(([summary, item]: [string, Item]) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
+      getFirstCompletedRemoteData(),
+      // close model (should be displaying loading/waiting indicator) when version creation failed/succeeded
+      tap(() => activeModal.close()),
       // show success/failure notification
       tap((newVersionRD: RemoteData<Version>) => {
         this.itemVersionShared.notifyCreateNewVersion(newVersionRD);
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index f742273edb..d729f98ffa 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2232,6 +2232,10 @@
 
   "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
 
+  "item.version.create.modal.submitted.header": "Creating new version...",
+
+  "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
+
   "item.version.create.notification.success" : "New version has been created with version number {{version}}",
 
   "item.version.create.notification.failure" : "New version has not been created",

From 2750931e92b54e45b6b53851b018ad2c3b3f6257 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 14 Jun 2022 10:22:29 +0200
Subject: [PATCH 6/6] 92187: Fix linting errors

---
 src/app/app.component.ts                                      | 4 ++--
 src/app/shared/interfaces/modal-before-dismiss.interface.ts   | 2 +-
 .../item-versions-summary-modal.component.ts                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index d3024a3357..03e8452c8d 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -170,12 +170,12 @@ export class AppComponent implements OnInit, AfterViewInit {
     /** Implement behavior for interface {@link ModalBeforeDismiss} */
     this.modalConfig.beforeDismiss = async function () {
       if (typeof this?.componentInstance?.beforeDismiss === 'function') {
-        return this.componentInstance.beforeDismiss()
+        return this.componentInstance.beforeDismiss();
       }
 
       // fall back to default behavior
       return true;
-    }
+    };
 
     this.isAuthBlocking$ = this.store.pipe(select(isAuthenticationBlocking)).pipe(
       distinctUntilChanged()
diff --git a/src/app/shared/interfaces/modal-before-dismiss.interface.ts b/src/app/shared/interfaces/modal-before-dismiss.interface.ts
index c07f8d329f..fca28e1cff 100644
--- a/src/app/shared/interfaces/modal-before-dismiss.interface.ts
+++ b/src/app/shared/interfaces/modal-before-dismiss.interface.ts
@@ -20,6 +20,6 @@ export interface ModalBeforeDismiss {
    * then the modal won't be dismissed.
    * Docs: https://ng-bootstrap.github.io/#/components/modal/api#NgbModalOptions
    */
-  beforeDismiss(): boolean | Promise<boolean>
+  beforeDismiss(): boolean | Promise<boolean>;
 
 }
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index e20737ee57..23ee62e628 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -13,7 +13,7 @@ export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDis
   versionNumber: number;
   newVersionSummary: string;
   firstVersion = true;
-  submitted$: BehaviorSubject<boolean>
+  submitted$: BehaviorSubject<boolean>;
 
   @Output() createVersionEvent: EventEmitter<string> = new EventEmitter<string>();
 
@@ -32,7 +32,7 @@ export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDis
 
   beforeDismiss(): boolean | Promise<boolean> {
     // prevent the modal from being dismissed after version creation is initiated
-    return !this.submitted$.getValue()
+    return !this.submitted$.getValue();
   }
 
   onModalSubmit() {