From 93450e1dcfb2588dea8c863165467a516681061b Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 4 May 2021 11:08:55 +0200
Subject: [PATCH 001/169] 79219: Remove -e option from
 MetadataImportPageComponent

---
 .../metadata-import-page.component.spec.ts    | 17 +--------
 .../metadata-import-page.component.ts         | 36 +++++--------------
 2 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
index db6bb7db84..d663481b8c 100644
--- a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
+++ b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
@@ -6,10 +6,7 @@ import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { AuthService } from '../../core/auth/auth.service';
 import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
@@ -22,12 +19,9 @@ describe('MetadataImportPageComponent', () => {
   let comp: MetadataImportPageComponent;
   let fixture: ComponentFixture<MetadataImportPageComponent>;
 
-  let user;
-
   let notificationService: NotificationsServiceStub;
   let scriptService: any;
   let router;
-  let authService;
   let locationStub;
 
   function init() {
@@ -37,13 +31,6 @@ describe('MetadataImportPageComponent', () => {
         invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
       }
     );
-    user = Object.assign(new EPerson(), {
-      id: 'userId',
-      email: 'user@test.com'
-    });
-    authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: observableOf(user)
-    });
     router = jasmine.createSpyObj('router', {
       navigateByUrl: jasmine.createSpy('navigateByUrl')
     });
@@ -65,7 +52,6 @@ describe('MetadataImportPageComponent', () => {
         { provide: NotificationsService, useValue: notificationService },
         { provide: ScriptDataService, useValue: scriptService },
         { provide: Router, useValue: router },
-        { provide: AuthService, useValue: authService },
         { provide: Location, useValue: locationStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -107,9 +93,8 @@ describe('MetadataImportPageComponent', () => {
         proceed.click();
         fixture.detectChanges();
       }));
-      it('metadata-import script is invoked with its -e currentUserEmail, -f fileName and the mockFile', () => {
+      it('metadata-import script is invoked with -f fileName and the mockFile', () => {
         const parameterValues: ProcessParameter[] = [
-          Object.assign(new ProcessParameter(), { name: '-e', value: user.email }),
           Object.assign(new ProcessParameter(), { name: '-f', value: 'filename.txt' }),
         ];
         expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
diff --git a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts
index bcef54377b..3bdcca3084 100644
--- a/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts
+++ b/src/app/+admin/admin-import-metadata-page/metadata-import-page.component.ts
@@ -23,20 +23,14 @@ import { getProcessDetailRoute } from '../../process-page/process-page-routing.p
 /**
  * Component that represents a metadata import page for administrators
  */
-export class MetadataImportPageComponent implements OnInit {
+export class MetadataImportPageComponent {
 
   /**
    * The current value of the file
    */
   fileObject: File;
 
-  /**
-   * The authenticated user's email
-   */
-  private currentUserEmail$: Observable<string>;
-
-  public constructor(protected authService: AuthService,
-                     private location: Location,
+  public constructor(private location: Location,
                      protected translate: TranslateService,
                      protected notificationsService: NotificationsService,
                      private scriptDataService: ScriptDataService,
@@ -51,15 +45,6 @@ export class MetadataImportPageComponent implements OnInit {
     this.fileObject = file;
   }
 
-  /**
-   * Method provided by Angular. Invoked after the constructor.
-   */
-  ngOnInit() {
-    this.currentUserEmail$ = this.authService.getAuthenticatedUserFromStore().pipe(
-      map((user: EPerson) => user.email)
-    );
-  }
-
   /**
    * When return button is pressed go to previous location
    */
@@ -68,22 +53,17 @@ export class MetadataImportPageComponent implements OnInit {
   }
 
   /**
-   * Starts import-metadata script with -e currentUserEmail -f fileName (and the selected file)
+   * Starts import-metadata script with -f fileName (and the selected file)
    */
   public importMetadata() {
     if (this.fileObject == null) {
       this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
     } else {
-      this.currentUserEmail$.pipe(
-        switchMap((email: string) => {
-          if (isNotEmpty(email)) {
-            const parameterValues: ProcessParameter[] = [
-              Object.assign(new ProcessParameter(), { name: '-e', value: email }),
-              Object.assign(new ProcessParameter(), { name: '-f', value: this.fileObject.name }),
-            ];
-            return this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject]);
-          }
-        }),
+      const parameterValues: ProcessParameter[] = [
+        Object.assign(new ProcessParameter(), { name: '-f', value: this.fileObject.name }),
+      ];
+
+      this.scriptDataService.invoke(METADATA_IMPORT_SCRIPT_NAME, parameterValues, [this.fileObject]).pipe(
         getFirstCompletedRemoteData(),
       ).subscribe((rd: RemoteData<Process>) => {
         if (rd.hasSucceeded) {

From f49a7746fb0f2531cc936bbddd2fc80784863fa0 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 4 May 2021 11:19:01 +0200
Subject: [PATCH 002/169] 79219: Remove -f from ExportMetadataSelectorComponent
 and pass uuid to -i

---
 .../export-metadata-selector.component.spec.ts         | 10 ++++------
 .../export-metadata-selector.component.ts              |  8 +++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
index 2f0c4e2651..f25a9afc81 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
@@ -157,10 +157,9 @@ describe('ExportMetadataSelectorComponent', () => {
         done();
       });
     });
-    it('metadata-export script is invoked with its -i handle and -f uuid.csv', () => {
+    it('metadata-export script is invoked with its -i handle', () => {
       const parameterValues: ProcessParameter[] = [
-        Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.handle }),
-        Object.assign(new ProcessParameter(), { name: '-f', value: mockCollection.uuid + '.csv' }),
+        Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.uuid }),
       ];
       expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
     });
@@ -182,10 +181,9 @@ describe('ExportMetadataSelectorComponent', () => {
         done();
       });
     });
-    it('metadata-export script is invoked with its -i handle and -f uuid.csv', () => {
+    it('metadata-export script is invoked with its -i handle', () => {
       const parameterValues: ProcessParameter[] = [
-        Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.handle }),
-        Object.assign(new ProcessParameter(), { name: '-f', value: mockCommunity.uuid + '.csv' }),
+        Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.uuid }),
       ];
       expect(scriptService.invoke).toHaveBeenCalledWith(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
     });
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
index 24aa1704c6..1a43e82aef 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -56,7 +56,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
       modalRef.componentInstance.confirmIcon = 'fas fa-file-export';
       const resp$ =  modalRef.componentInstance.response.pipe(switchMap((confirm: boolean) => {
         if (confirm) {
-          const startScriptSucceeded$ = this.startScriptNotifyAndRedirect(dso, dso.handle);
+          const startScriptSucceeded$ = this.startScriptNotifyAndRedirect(dso);
           return startScriptSucceeded$.pipe(
             switchMap((r: boolean) => {
               return observableOf(r);
@@ -78,12 +78,10 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
    * Start export-metadata script of dso & navigate to process if successful
    * Otherwise show error message
    * @param dso    Dso to export
-   * @param handle Dso handle to export
    */
-  private startScriptNotifyAndRedirect(dso: DSpaceObject, handle: string): Observable<boolean> {
+  private startScriptNotifyAndRedirect(dso: DSpaceObject): Observable<boolean> {
     const parameterValues: ProcessParameter[] = [
-      Object.assign(new ProcessParameter(), { name: '-i', value: handle }),
-      Object.assign(new ProcessParameter(), { name: '-f', value: dso.uuid + '.csv' }),
+      Object.assign(new ProcessParameter(), { name: '-i', value: dso.uuid }),
     ];
     return this.scriptDataService.invoke(METADATA_EXPORT_SCRIPT_NAME, parameterValues, [])
       .pipe(

From f0fb8c1005bdde5bef6d1a4f674331fecc216ce1 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 4 May 2021 13:43:51 +0200
Subject: [PATCH 003/169] 79219: Improve tests and wording

---
 .../export-metadata-selector.component.spec.ts             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
index f25a9afc81..074d0316af 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
@@ -51,12 +51,14 @@ describe('ExportMetadataSelectorComponent', () => {
 
   const mockItem = Object.assign(new Item(), {
     id: 'fake-id',
+    uuid: 'fake-id',
     handle: 'fake/handle',
     lastModified: '2018'
   });
 
   const mockCollection: Collection = Object.assign(new Collection(), {
     id: 'test-collection-1-1',
+    uuid: 'test-collection-1-1',
     name: 'test-collection-1',
     metadata: {
       'dc.identifier.uri': [
@@ -70,6 +72,7 @@ describe('ExportMetadataSelectorComponent', () => {
 
   const mockCommunity = Object.assign(new Community(), {
     id: 'test-uuid',
+    uuid: 'test-uuid',
     metadata: {
       'dc.identifier.uri': [
         {
@@ -157,7 +160,7 @@ describe('ExportMetadataSelectorComponent', () => {
         done();
       });
     });
-    it('metadata-export script is invoked with its -i handle', () => {
+    it('should invoke the metadata-export script with option -i uuid', () => {
       const parameterValues: ProcessParameter[] = [
         Object.assign(new ProcessParameter(), { name: '-i', value: mockCollection.uuid }),
       ];
@@ -181,7 +184,7 @@ describe('ExportMetadataSelectorComponent', () => {
         done();
       });
     });
-    it('metadata-export script is invoked with its -i handle', () => {
+    it('should invoke the metadata-export script with option -i uuid', () => {
       const parameterValues: ProcessParameter[] = [
         Object.assign(new ProcessParameter(), { name: '-i', value: mockCommunity.uuid }),
       ];

From a77ca2f126ad353695e1d10b9075bdb1732dfbbe Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 11 May 2021 11:39:46 +0200
Subject: [PATCH 004/169] 79325: Fix pagination in the external metadata lookup

---
 ...elation-external-source-tab.component.html |  2 +-
 ...tion-external-source-tab.component.spec.ts |  5 +++-
 ...-relation-external-source-tab.component.ts | 26 ++++++++++++++++---
 ...okup-relation-search-tab.component.spec.ts |  5 +++-
 ...ic-lookup-relation-search-tab.component.ts |  8 +++---
 ...okup-relation-selection-tab.component.html |  2 +-
 ...p-relation-selection-tab.component.spec.ts |  5 ++++
 ...lookup-relation-selection-tab.component.ts | 24 +++++++++++++++--
 8 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index d55cdbffed..27697b76a0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -14,7 +14,7 @@
         <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !entriesRD?.isLoading && entriesRD?.payload?.page?.length > 0" @fadeIn
                                 [objects]="entriesRD"
                                 [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                [config]="initialPagination"
+                                [config]="(currentPagination$ |async)"
                                 [hideGear]="true"
                                 [context]="context"
                                 [importable]="true"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
index 961a826530..6309b74792 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
@@ -24,6 +24,8 @@ import { Collection } from '../../../../../../core/shared/collection.model';
 import { RelationshipOptions } from '../../../models/relationship-options.model';
 import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { createPaginatedList } from '../../../../../testing/utils.test';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 
 describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   let component: DsDynamicLookupRelationExternalSourceTabComponent;
@@ -103,7 +105,8 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
           }
         },
         { provide: ExternalSourceService, useValue: externalSourceService },
-        { provide: SelectableListService, useValue: selectableListService }
+        { provide: SelectableListService, useValue: selectableListService },
+        { provide: PaginationService, useValue: new PaginationServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index b697dc9280..f0a86fef7c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -3,7 +3,6 @@ import { SEARCH_CONFIG_SERVICE } from '../../../../../../+my-dspace-page/my-dspa
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { Router } from '@angular/router';
 import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
-import { Observable, Subscription } from 'rxjs';
 import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
@@ -21,6 +20,8 @@ import { hasValue } from '../../../../../empty.util';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
 import { Item } from '../../../../../../core/shared/item.model';
 import { Collection } from '../../../../../../core/shared/collection.model';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Observable, Subscription } from 'rxjs';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-external-source-tab',
@@ -81,10 +82,15 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    * The initial pagination options
    */
   initialPagination = Object.assign(new PaginationComponentOptions(), {
-    id: 'submission-external-source-relation-list',
+    id: 'spc',
     pageSize: 5
   });
 
+  /**
+   * The current pagination options
+   */
+  currentPagination$: Observable<PaginationComponentOptions>;
+
   /**
    * The external source we're selecting entries for
    */
@@ -114,17 +120,21 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
               public searchConfigService: SearchConfigurationService,
               private externalSourceService: ExternalSourceService,
               private modalService: NgbModal,
-              private selectableListService: SelectableListService) {
+              private selectableListService: SelectableListService,
+              private paginationService: PaginationService
+  ) {
   }
 
   /**
    * Get the entries for the selected external source
    */
   ngOnInit(): void {
+    this.resetRoute();
     this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
       switchMap((searchOptions: PaginatedSearchOptions) =>
         this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined)))
     );
+    this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
     this.importConfig = {
       buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
     };
@@ -159,4 +169,14 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
       this.importObjectSub.unsubscribe();
     }
   }
+
+  /**
+   * Method to reset the route when the tab is opened to make sure no strange pagination issues appears
+   */
+  resetRoute() {
+    this.paginationService.updateRoute(this.searchConfigService.paginationID, {
+      page: 1,
+      pageSize: 5
+    });
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index 700026ba10..83a8d05217 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -17,6 +17,8 @@ import { ItemSearchResult } from '../../../../../object-collection/shared/item-s
 import { Item } from '../../../../../../core/shared/item.model';
 import { ActivatedRoute } from '@angular/router';
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 
 describe('DsDynamicLookupRelationSearchTabComponent', () => {
   let component: DsDynamicLookupRelationSearchTabComponent;
@@ -88,7 +90,8 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
           }
         },
         { provide: ActivatedRoute, useValue: { snapshot: { queryParams: {} } } },
-        { provide: LookupRelationService, useValue: lookupRelationService }
+        { provide: LookupRelationService, useValue: lookupRelationService },
+        { provide: PaginationService, useValue: new PaginationServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index f4addf646c..e778b524b0 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -19,6 +19,7 @@ import { RouteService } from '../../../../../../core/services/route.service';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { Context } from '../../../../../../core/shared/context.model';
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-search-tab',
@@ -117,7 +118,8 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     private selectableListService: SelectableListService,
     public searchConfigService: SearchConfigurationService,
     private routeService: RouteService,
-    public lookupRelationService: LookupRelationService
+    public lookupRelationService: LookupRelationService,
+    private paginationService: PaginationService
   ) {
   }
 
@@ -137,9 +139,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    * Method to reset the route when the window is opened to make sure no strange pagination issues appears
    */
   resetRoute() {
-    this.router.navigate([], {
-      queryParams: Object.assign({ query: this.query }, this.route.snapshot.queryParams, this.initialPagination),
-    });
+    this.paginationService.updateRoute(this.searchConfigService.paginationID, this.initialPagination);
   }
 
   /**
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
index cd55553f5b..8d0053a1df 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
@@ -12,7 +12,7 @@
             <ds-viewable-collection [objects]="selectionRD$ | async"
                                     [selectable]="true"
                                     [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                    [config]="initialPagination"
+                                    [config]="(currentPagination$ |async)"
                                     [hideGear]="true"
                                     [context]="context"
                                     (deselectObject)="deselectObject.emit($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
index 05dbdeb2d8..dbe46609a6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
@@ -15,6 +15,8 @@ import { RemoteData } from '../../../../../../core/data/remote-data';
 import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 
 describe('DsDynamicLookupRelationSelectionTabComponent', () => {
   let component: DsDynamicLookupRelationSelectionTabComponent;
@@ -54,6 +56,9 @@ describe('DsDynamicLookupRelationSelectionTabComponent', () => {
         },
         {
           provide: Router, useValue: router
+        },
+        {
+          provide: PaginationService, useValue: new PaginationServiceStub()
         }
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index 8fac2ce7d1..2c8bc22bff 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -15,6 +15,7 @@ import { PaginatedSearchOptions } from '../../../../../search/paginated-search-o
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { Context } from '../../../../../../core/shared/context.model';
 import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-selection-tab',
@@ -76,18 +77,26 @@ export class DsDynamicLookupRelationSelectionTabComponent {
    * The initial pagination to use
    */
   initialPagination = Object.assign(new PaginationComponentOptions(), {
-    id: 'submission-relation-list',
+    id: 'spc',
     pageSize: 5
   });
 
+  /**
+   * The current pagination options
+   */
+  currentPagination$: Observable<PaginationComponentOptions>;
+
   constructor(private router: Router,
-              private searchConfigService: SearchConfigurationService) {
+              private searchConfigService: SearchConfigurationService,
+              private paginationService: PaginationService
+  ) {
   }
 
   /**
    * Set up the selection and pagination on load
    */
   ngOnInit() {
+    this.resetRoute();
     this.selectionRD$ = this.searchConfigService.paginatedSearchOptions
       .pipe(
         map((options: PaginatedSearchOptions) => options.pagination),
@@ -110,5 +119,16 @@ export class DsDynamicLookupRelationSelectionTabComponent {
           );
         })
       );
+    this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
+  }
+
+  /**
+   * Method to reset the route when the tab is opened to make sure no strange pagination issues appears
+   */
+  resetRoute() {
+    this.paginationService.updateRoute(this.searchConfigService.paginationID, {
+      page: 1,
+      pageSize: 5
+    });
   }
 }

From 4a8becf662140bd8d19029f15185bc8ce2c3613a Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 12 May 2021 14:47:16 +0200
Subject: [PATCH 005/169] Fix ORCID tab loading

---
 .../dynamic-lookup-relation-external-source-tab.component.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index 27697b76a0..61be99cbf2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -21,7 +21,7 @@
                                 [importConfig]="importConfig"
                                 (importObject)="import($event)">
         </ds-viewable-collection>
-        <ds-loading *ngIf="!entriesRD || !entriesRD?.payload || entriesRD?.isLoading"
+        <ds-loading *ngIf="!entriesRD || entriesRD?.isLoading"
                     message="{{'loading.search-results' | translate}}"></ds-loading>
         <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode != 400)"
                     message="{{'error.search-results' | translate}}"></ds-error>

From 6631980ee65fd236727b8a73ab474bf4cade59ae Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 12 May 2021 16:31:48 +0200
Subject: [PATCH 006/169] 79327: Fix item-level statistics pages

---
 .../abstract-item-update.component.ts         |  2 +-
 src/app/+item-page/item-page.resolver.ts      | 40 +++---------
 src/app/+item-page/item.resolver.ts           | 64 +++++++++++++++++++
 .../breadcrumbs/item-breadcrumb.resolver.ts   |  2 +-
 .../statistics-page-routing.module.ts         |  5 +-
 5 files changed, 78 insertions(+), 35 deletions(-)
 create mode 100644 src/app/+item-page/item.resolver.ts

diff --git a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 17ec0ff133..01d6cc7439 100644
--- a/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -15,9 +15,9 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
 import { environment } from '../../../../environments/environment';
 import { getItemPageRoute } from '../../item-page-routing-paths';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page.resolver';
 import { getAllSucceededRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item.resolver';
 
 @Component({
   selector: 'ds-abstract-item-update',
diff --git a/src/app/+item-page/item-page.resolver.ts b/src/app/+item-page/item-page.resolver.ts
index a131cda7f8..a12f961e57 100644
--- a/src/app/+item-page/item-page.resolver.ts
+++ b/src/app/+item-page/item-page.resolver.ts
@@ -12,31 +12,20 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../shared/empty.util';
 import { getItemPageRoute } from './item-page-routing-paths';
+import { ItemResolver } from './item.resolver';
 
 /**
- * The self links defined in this list are expected to be requested somewhere in the near future
- * Requesting them as embeds will limit the number of requests
- */
-export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
-  followLink('owningCollection', undefined, true, true, true,
-    followLink('parentCommunity', undefined, true, true, true,
-      followLink('parentCommunity'))
-  ),
-  followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams')),
-  followLink('relationships'),
-  followLink('version', undefined, true, true, true, followLink('versionhistory')),
-];
-
-/**
- * This class represents a resolver that requests a specific item before the route is activated
+ * This class represents a resolver that requests a specific item before the route is activated and will redirect to the
+ * entity page
  */
 @Injectable()
-export class ItemPageResolver implements Resolve<RemoteData<Item>> {
+export class ItemPageResolver extends ItemResolver {
   constructor(
-    private itemService: ItemDataService,
-    private store: Store<any>,
-    private router: Router
+    protected itemService: ItemDataService,
+    protected store: Store<any>,
+    protected router: Router
   ) {
+    super(itemService, store, router);
   }
 
   /**
@@ -47,12 +36,7 @@ export class ItemPageResolver implements Resolve<RemoteData<Item>> {
    * or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
-    const itemRD$ = this.itemService.findById(route.params.id,
-      true,
-      false,
-      ...ITEM_PAGE_LINKS_TO_FOLLOW
-    ).pipe(
-      getFirstCompletedRemoteData(),
+    return super.resolve(route, state).pipe(
       map((rd: RemoteData<Item>) => {
         if (rd.hasSucceeded && hasValue(rd.payload)) {
           const itemRoute = getItemPageRoute(rd.payload);
@@ -66,11 +50,5 @@ export class ItemPageResolver implements Resolve<RemoteData<Item>> {
         return rd;
       })
     );
-
-    itemRD$.subscribe((itemRD: RemoteData<Item>) => {
-      this.store.dispatch(new ResolvedAction(state.url, itemRD.payload));
-    });
-
-    return itemRD$;
   }
 }
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
new file mode 100644
index 0000000000..7d020309dc
--- /dev/null
+++ b/src/app/+item-page/item.resolver.ts
@@ -0,0 +1,64 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../core/data/remote-data';
+import { ItemDataService } from '../core/data/item-data.service';
+import { Item } from '../core/shared/item.model';
+import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
+import { FindListOptions } from '../core/data/request.models';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { Store } from '@ngrx/store';
+import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { map } from 'rxjs/operators';
+import { hasValue } from '../shared/empty.util';
+import { getItemPageRoute } from './item-page-routing-paths';
+
+/**
+ * The self links defined in this list are expected to be requested somewhere in the near future
+ * Requesting them as embeds will limit the number of requests
+ */
+export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
+  followLink('owningCollection', undefined, true, true, true,
+    followLink('parentCommunity', undefined, true, true, true,
+      followLink('parentCommunity'))
+  ),
+  followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams')),
+  followLink('relationships'),
+  followLink('version', undefined, true, true, true, followLink('versionhistory')),
+];
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+@Injectable()
+export class ItemResolver implements Resolve<RemoteData<Item>> {
+  constructor(
+    protected itemService: ItemDataService,
+    protected store: Store<any>,
+    protected router: Router
+  ) {
+  }
+
+  /**
+   * Method for resolving an item based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
+    const itemRD$ = this.itemService.findById(route.params.id,
+      true,
+      false,
+      ...ITEM_PAGE_LINKS_TO_FOLLOW
+    ).pipe(
+      getFirstCompletedRemoteData(),
+    );
+
+    itemRD$.subscribe((itemRD: RemoteData<Item>) => {
+      this.store.dispatch(new ResolvedAction(state.url, itemRD.payload));
+    });
+
+    return itemRD$;
+  }
+}
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index 2b9bbd6b3d..529349eb89 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -4,7 +4,7 @@ import { ItemDataService } from '../data/item-data.service';
 import { Item } from '../shared/item.model';
 import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../+item-page/item-page.resolver';
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../+item-page/item.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts
index 6a133fc9ac..0c63e35b34 100644
--- a/src/app/statistics-page/statistics-page-routing.module.ts
+++ b/src/app/statistics-page/statistics-page-routing.module.ts
@@ -10,6 +10,7 @@ import { ThemedCollectionStatisticsPageComponent } from './collection-statistics
 import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component';
 import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component';
 import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component';
+import { ItemResolver } from '../+item-page/item.resolver';
 
 @NgModule({
   imports: [
@@ -34,7 +35,7 @@ import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed
         {
           path: `items/:id`,
           resolve: {
-            scope: ItemPageResolver,
+            scope: ItemResolver,
             breadcrumb: I18nBreadcrumbResolver
           },
           data: {
@@ -75,7 +76,7 @@ import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed
     I18nBreadcrumbsService,
     CollectionPageResolver,
     CommunityPageResolver,
-    ItemPageResolver
+    ItemResolver
   ]
 })
 export class StatisticsPageRoutingModule {

From d3466c3e8215dc0012b1e3f063aafde9ecf67de9 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 12 May 2021 17:59:11 +0200
Subject: [PATCH 007/169] Fix issue where uploaded files disappear

---
 src/app/submission/form/submission-form.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 8df0ab1658..6d4ddb4ca0 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -122,7 +122,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
    * Initialize all instance variables and retrieve form configuration
    */
   ngOnChanges(changes: SimpleChanges) {
-    if (this.collectionId && this.submissionId) {
+    if ((changes.collectionId && this.collectionId) && (changes.submissionId && this.submissionId)) {
       this.isActive = true;
 
       // retrieve submission's section list

From 7e129f282f64458da7958ab529457dd290a5d808 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 19 May 2021 13:05:15 +0200
Subject: [PATCH 008/169] remove extra author field from item pages

---
 .../author/item-page-author-field.component.ts      |  6 +++++-
 .../publication/publication.component.html          | 13 ++++++-------
 .../publication/publication.component.spec.ts       |  9 +++++++--
 .../untyped-item/untyped-item.component.html        | 13 ++++++-------
 .../untyped-item/untyped-item.component.spec.ts     |  9 +++++++--
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts b/src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
index 51941d2cc8..2da0dc154b 100644
--- a/src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
+++ b/src/app/+item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
@@ -8,7 +8,11 @@ import { ItemPageFieldComponent } from '../item-page-field.component';
   templateUrl: '../item-page-field.component.html'
 })
 /**
- * This component is used for displaying the author (dc.contributor.author, dc.creator and dc.contributor) metadata of an item
+ * This component is used for displaying the author (dc.contributor.author, dc.creator and
+ * dc.contributor) metadata of an item.
+ *
+ * Note that it purely deals with metadata. It won't turn related Person authors into links to their
+ * item page. For that use a {@link MetadataRepresentationListComponent} instead.
  */
 export class ItemPageAuthorFieldComponent extends ItemPageFieldComponent {
 
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 73219cbb8f..ba73ed43be 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
@@ -18,7 +18,12 @@
     </ng-container>
     <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
-    <ds-item-page-author-field [item]="object"></ds-item-page-author-field>
+    <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
+      [parentItem]="object"
+      [itemType]="'Person'"
+      [metadataField]="'dc.contributor.author'"
+      [label]="'relationships.isAuthorOf' | translate">
+    </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
       [label]="'publication.page.journal-title'">
@@ -37,12 +42,6 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-xs-12 col-md-6">
-    <ds-metadata-representation-list
-      [parentItem]="object"
-      [itemType]="'Person'"
-      [metadataField]="'dc.contributor.author'"
-      [label]="'relationships.isAuthorOf' | translate">
-    </ds-metadata-representation-list>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isProjectOfPublication'"
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 90de1cd00a..e9a48a1df0 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
@@ -88,9 +88,14 @@ describe('PublicationComponent', () => {
     expect(fields.length).toBeGreaterThanOrEqual(1);
   });
 
-  it('should contain a component to display the author', () => {
+  it('should not contain a metadata only author field', () => {
     const fields = fixture.debugElement.queryAll(By.css('ds-item-page-author-field'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
+    expect(fields.length).toBe(0);
+  });
+
+  it('should contain a mixed metadata and relationship field for authors', () => {
+    const fields = fixture.debugElement.queryAll(By.css('.ds-item-page-mixed-author-field'));
+    expect(fields.length).toBe(1);
   });
 
   it('should contain a component to display the abstract', () => {
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 8d46a2c5a9..969062aea6 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -18,7 +18,12 @@
     </ng-container>
     <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
-    <ds-item-page-author-field [item]="object"></ds-item-page-author-field>
+    <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
+      [parentItem]="object"
+      [itemType]="'Person'"
+      [metadataField]="'dc.contributor.author'"
+      [label]="'relationships.isAuthorOf' | translate">
+    </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
       [label]="'item.page.journal-title'">
@@ -37,12 +42,6 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-xs-12 col-md-6">
-    <ds-metadata-representation-list
-      [parentItem]="object"
-      [itemType]="'Person'"
-      [metadataField]="'dc.contributor.author'"
-      [label]="'relationships.isAuthorOf' | translate">
-    </ds-metadata-representation-list>
     <ds-item-page-abstract-field [item]="object"></ds-item-page-abstract-field>
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.description']"
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
index b7dc69aa78..e70a05a8c8 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.spec.ts
@@ -89,9 +89,14 @@ describe('UntypedItemComponent', () => {
     expect(fields.length).toBeGreaterThanOrEqual(1);
   });
 
-  it('should contain a component to display the author', () => {
+  it('should not contain a metadata only author field', () => {
     const fields = fixture.debugElement.queryAll(By.css('ds-item-page-author-field'));
-    expect(fields.length).toBeGreaterThanOrEqual(1);
+    expect(fields.length).toBe(0);
+  });
+
+  it('should contain a mixed metadata and relationship field for authors', () => {
+    const fields = fixture.debugElement.queryAll(By.css('.ds-item-page-mixed-author-field'));
+    expect(fields.length).toBe(1);
   });
 
   it('should contain a component to display the abstract', () => {

From d06b76af3f850ec81b599798b2076b7b37989d14 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 19 May 2021 15:04:12 +0200
Subject: [PATCH 009/169] Fix issue with patching value with a date

---
 .../json-patch/builder/json-patch-operations-builder.ts  | 4 +++-
 src/app/shared/date.util.ts                              | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/app/core/json-patch/builder/json-patch-operations-builder.ts b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
index ced3750834..d3896c4a6c 100644
--- a/src/app/core/json-patch/builder/json-patch-operations-builder.ts
+++ b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
@@ -9,7 +9,7 @@ import {
 import { JsonPatchOperationPathObject } from './json-patch-operation-path-combiner';
 import { Injectable } from '@angular/core';
 import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { dateToISOFormat } from '../../../shared/date.util';
+import { dateToISOFormat, dateToString, isNgbDateStruct } from '../../../shared/date.util';
 import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary-entry.model';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
@@ -136,6 +136,8 @@ export class JsonPatchOperationsBuilder {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language);
     } else if (value.hasOwnProperty('authority')) {
       operationValue = new FormFieldMetadataValueObject(value.value, value.language, value.authority);
+    } else if (isNgbDateStruct(value)) {
+      operationValue = new FormFieldMetadataValueObject(dateToString(value));
     } else if (value.hasOwnProperty('value')) {
       operationValue = new FormFieldMetadataValueObject(value.value);
     } else {
diff --git a/src/app/shared/date.util.ts b/src/app/shared/date.util.ts
index 063820784c..44afdd10a4 100644
--- a/src/app/shared/date.util.ts
+++ b/src/app/shared/date.util.ts
@@ -3,7 +3,7 @@ import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
 import { isObject } from 'lodash';
 import * as moment from 'moment';
 
-import { isNull } from './empty.util';
+import { isNull, isUndefined } from './empty.util';
 
 /**
  * Returns true if the passed value is a NgbDateStruct.
@@ -27,8 +27,9 @@ export function isNgbDateStruct(value: object): boolean {
  * @return string
  *    the formatted date
  */
-export function dateToISOFormat(date: Date | NgbDateStruct): string {
-  const dateObj: Date = (date instanceof Date) ? date : ngbDateStructToDate(date);
+export function dateToISOFormat(date: Date | NgbDateStruct | string): string {
+  const dateObj: Date = (date instanceof Date) ? date :
+    ((typeof date === 'string') ? ngbDateStructToDate(stringToNgbDateStruct(date)) : ngbDateStructToDate(date));
 
   let year = dateObj.getFullYear().toString();
   let month = (dateObj.getMonth() + 1).toString();
@@ -80,7 +81,7 @@ export function stringToNgbDateStruct(date: string): NgbDateStruct {
  *    the NgbDateStruct object
  */
 export function dateToNgbDateStruct(date?: Date): NgbDateStruct {
-  if (isNull(date)) {
+  if (isNull(date) || isUndefined(date)) {
     date = new Date();
   }
 

From e0edcd64d2dcedd695ae2634f845a58b1f54d7f7 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 19 May 2021 15:35:37 +0200
Subject: [PATCH 010/169] Fix wrong visualization of bitstream access condition
 form within submission form

---
 src/app/shared/mocks/submission.mock.ts       | 154 +++++++++---------
 .../section-upload-file-edit.component.scss   |   6 +
 .../section-upload-file-edit.component.ts     |   8 +-
 .../edit/section-upload-file-edit.model.ts    |  29 ++--
 .../file/section-upload-file.component.ts     |   1 +
 5 files changed, 110 insertions(+), 88 deletions(-)
 create mode 100644 src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.scss

diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index 1ee097af71..eaebb38df8 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -1519,83 +1519,87 @@ export const mockFileFormData = {
   },
   accessConditions: [
     {
-      name: [
-        {
-          value: 'openaccess',
-          language: null,
-          authority: null,
-          display: 'openaccess',
-          confidence: -1,
-          place: 0,
-          otherInformation: null
-        }
-      ],
-    }
-    ,
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'openaccess',
+            language: null,
+            authority: null,
+            display: 'openaccess',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      },
+    },
     {
-      name: [
-        {
-          value: 'lease',
-          language: null,
-          authority: null,
-          display: 'lease',
-          confidence: -1,
-          place: 0,
-          otherInformation: null
-        }
-      ],
-      endDate: [
-        {
-          value: {
-            year: 2019,
-            month: 1,
-            day: 16
-          },
-          language: null,
-          authority: null,
-          display: {
-            year: 2019,
-            month: 1,
-            day: 16
-          },
-          confidence: -1,
-          place: 0,
-          otherInformation: null
-        }
-      ],
-    }
-    ,
+      accessConditionGroup:{
+        name: [
+          {
+            value: 'lease',
+            language: null,
+            authority: null,
+            display: 'lease',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+        endDate: [
+          {
+            value: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            language: null,
+            authority: null,
+            display: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      }
+    },
     {
-      name: [
-        {
-          value: 'embargo',
-          language: null,
-          authority: null,
-          display: 'lease',
-          confidence: -1,
-          place: 0,
-          otherInformation: null
-        }
-      ],
-      startDate: [
-        {
-          value: {
-            year: 2019,
-            month: 1,
-            day: 16
-          },
-          language: null,
-          authority: null,
-          display: {
-            year: 2019,
-            month: 1,
-            day: 16
-          },
-          confidence: -1,
-          place: 0,
-          otherInformation: null
-        }
-      ],
+      accessConditionGroup: {
+        name: [
+          {
+            value: 'embargo',
+            language: null,
+            authority: null,
+            display: 'lease',
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+        startDate: [
+          {
+            value: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            language: null,
+            authority: null,
+            display: {
+              year: 2019,
+              month: 1,
+              day: 16
+            },
+            confidence: -1,
+            place: 0,
+            otherInformation: null
+          }
+        ],
+      }
     }
   ]
 };
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.scss b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.scss
new file mode 100644
index 0000000000..b443db711b
--- /dev/null
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.scss
@@ -0,0 +1,6 @@
+
+::ng-deep .access-condition-group {
+  position: relative;
+  top: -2.3rem;
+  margin-bottom: -2.3rem;
+}
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 512453d84e..cfece7a5fe 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -18,6 +18,8 @@ import {
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
 import {
+  BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG,
+  BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT,
   BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG,
   BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT,
   BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG,
@@ -43,6 +45,7 @@ import { FormComponent } from '../../../../../shared/form/form.component';
  */
 @Component({
   selector: 'ds-submission-section-upload-file-edit',
+  styleUrls: ['./section-upload-file-edit.component.scss'],
   templateUrl: './section-upload-file-edit.component.html',
 })
 export class SubmissionSectionUploadFileEditComponent implements OnChanges {
@@ -209,8 +212,9 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
 
         const startDate = new DynamicDatePickerModel(startDateConfig, BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT);
         const endDate = new DynamicDatePickerModel(endDateConfig, BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT);
-
-        return [type, startDate, endDate];
+        const accessConditionGroupConfig = Object.assign({}, BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG);
+        accessConditionGroupConfig.group = [type, startDate, endDate];
+        return [new DynamicFormGroupModel(accessConditionGroupConfig, BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT)];
       };
 
       // Number of access conditions blocks in form
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 096954659e..300a4b461f 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -15,12 +15,24 @@ export const BITSTREAM_METADATA_FORM_GROUP_CONFIG: DynamicFormGroupModelConfig =
 export const BITSTREAM_METADATA_FORM_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'form-group',
-      label: 'col-form-label'
+    label: 'col-form-label'
   },
   grid: {
     label: 'col-sm-3'
   }
 };
+export const BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
+  id: 'accessConditionGroup',
+  group: []
+};
+
+export const BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
+  element: {
+    host: 'form-group flex-fill access-condition-group',
+    container: 'pl-1 pr-1',
+    control: 'form-row '
+  }
+};
 
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig = {
   id: 'accessConditions',
@@ -28,7 +40,7 @@ export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayMode
 };
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
-    group: 'form-row'
+    group: 'form-row pt-4',
   }
 };
 
@@ -39,11 +51,8 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG: DynamicSelectModelConf
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    container: 'p-0',
-    label: 'col-form-label'
-  },
-  grid: {
-    host: 'col-md-10'
+    host: 'col-12',
+    label: 'col-form-label name-label'
   }
 };
 
@@ -70,11 +79,10 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePicke
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    container: 'p-0',
     label: 'col-form-label'
   },
   grid: {
-    host: 'col-md-4'
+    host: 'col-6'
   }
 };
 
@@ -101,10 +109,9 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerM
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    container: 'p-0',
     label: 'col-form-label'
   },
   grid: {
-    host: 'col-md-4'
+    host: 'col-6'
   }
 };
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index 5a97140a70..d4c901b290 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -255,6 +255,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
           });
         const accessConditionsToSave = [];
         formData.accessConditions
+          .map((accessConditions) => accessConditions.accessConditionGroup)
           .filter((accessCondition) => isNotEmpty(accessCondition))
           .forEach((accessCondition) => {
             let accessConditionOpt;

From e18c66d6888e4c5eeb481e64879902d1dc843b58 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 14 May 2021 19:14:56 +0200
Subject: [PATCH 011/169] Fix issue with patch operations related to repeatable
 fields

---
 .../form/section-form-operations.service.ts   | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index a1bb99e3cd..8aef798cbc 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -6,7 +6,8 @@ import {
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DynamicFormArrayGroupModel,
   DynamicFormControlEvent,
-  DynamicFormControlModel, isDynamicFormControlEvent
+  DynamicFormControlModel,
+  isDynamicFormControlEvent
 } from '@ng-dynamic-forms/core';
 
 import { hasValue, isNotEmpty, isNotNull, isNotUndefined, isNull, isUndefined } from '../../../shared/empty.util';
@@ -299,7 +300,7 @@ export class SectionFormOperationsService {
 
     if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
       // Model is a DynamicRowArrayModel
-      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context);
+      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
       return;
     }
 
@@ -368,7 +369,7 @@ export class SectionFormOperationsService {
 
    if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
       // Model is a DynamicRowArrayModel
-      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context);
+      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
       return;
     }
 
@@ -498,23 +499,37 @@ export class SectionFormOperationsService {
                                           event: DynamicFormControlEvent,
                                           previousValue: FormFieldPreviousValueObject) {
 
-    return this.handleArrayGroupPatch(pathCombiner, event.$event, (event as any).$event.arrayModel);
+    return this.handleArrayGroupPatch(pathCombiner, event.$event, (event as any).$event.arrayModel, previousValue);
   }
 
   /**
    * Specific patch handler for a DynamicRowArrayModel.
    * Configure a Patch ADD with the current array value.
    * @param pathCombiner
+   *    the [[JsonPatchOperationPathCombiner]] object for the specified operation
    * @param event
+   *    the [[DynamicFormControlEvent]] for the specified operation
    * @param model
+   *    the [[DynamicRowArrayModel]] model
+   * @param previousValue
+   *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   private handleArrayGroupPatch(pathCombiner: JsonPatchOperationPathCombiner,
                                 event,
-                                model: DynamicRowArrayModel) {
+                                model: DynamicRowArrayModel,
+                                previousValue: FormFieldPreviousValueObject) {
+
     const arrayValue = this.formBuilder.getValueFromModel([model]);
-    const segmentedPath2 = this.getFieldPathSegmentedFromChangeEvent(event);
-    this.operationsBuilder.add(
-      pathCombiner.getPath(segmentedPath2),
-      arrayValue[segmentedPath2], false);
+    const segmentedPath = this.getFieldPathSegmentedFromChangeEvent(event);
+    if (isNotEmpty(arrayValue)) {
+      this.operationsBuilder.add(
+        pathCombiner.getPath(segmentedPath),
+        arrayValue[segmentedPath],
+        false
+      );
+    } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model))) {
+      this.operationsBuilder.remove(pathCombiner.getPath(segmentedPath));
+    }
+
   }
 }

From d6dbbd1f1fa853e06d387668491462f939b7fad8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 18 May 2021 10:41:15 +0200
Subject: [PATCH 012/169] Add tests for handleArrayGroupPatch method

---
 .../section-form-operations.service.spec.ts   | 92 ++++++++++++++++++-
 1 file changed, 91 insertions(+), 1 deletion(-)

diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index c76a15abcb..9c9b6d971b 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -4,7 +4,8 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
-  DynamicFormControlEvent
+  DynamicFormControlEvent,
+  DynamicInputModel
 } from '@ng-dynamic-forms/core';
 
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
@@ -28,6 +29,7 @@ import {
 } from '../../../shared/mocks/form-models.mock';
 import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 
 describe('SectionFormOperationsService test suite', () => {
   let formBuilderService: any;
@@ -83,6 +85,11 @@ describe('SectionFormOperationsService test suite', () => {
     formBuilderService = TestBed.inject(FormBuilderService);
   });
 
+  afterEach(() => {
+    jsonPatchOpBuilder.add.calls.reset();
+    jsonPatchOpBuilder.remove.calls.reset();
+  });
+
   describe('dispatchOperationsFromEvent', () => {
     it('should call dispatchOperationsFromRemoveEvent on remove event', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
@@ -760,4 +767,87 @@ describe('SectionFormOperationsService test suite', () => {
     });
   });
 
+  describe('handleArrayGroupPatch', () => {
+    let arrayModel;
+    let previousValue;
+    beforeEach(() => {
+      arrayModel = new DynamicRowArrayModel(
+        {
+          id: 'testFormRowArray',
+          initialCount: 5,
+          notRepeatable: false,
+          relationshipConfig: undefined,
+          submissionId: '1234',
+          isDraggable: true,
+          showButtons: false,
+          groupFactory: () => {
+            return [
+              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })
+            ];
+          },
+          required: false,
+          metadataKey: 'dc.contributor.author',
+          metadataFields: ['dc.contributor.author'],
+          hasSelectableMetadata: true
+        }
+      );
+      spyOn(serviceAsAny, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
+      previousValue = new FormFieldPreviousValueObject(['path'], null);
+    });
+
+    it('should not dispatch a json-path operation when a array value is empty', () => {
+      formBuilderService.getValueFromModel.and.returnValue({});
+      spyOn(previousValue, 'isPathEqual').and.returnValue(false);
+
+      serviceAsAny.handleArrayGroupPatch(
+        pathCombiner,
+        dynamicFormControlChangeEvent,
+        arrayModel,
+        previousValue
+      );
+
+      expect(jsonPatchOpBuilder.add).not.toHaveBeenCalled();
+      expect(jsonPatchOpBuilder.remove).not.toHaveBeenCalled();
+    });
+
+    it('should dispatch a json-path add operation when a array value is not empty', () => {
+      const pathValue = [
+        new FormFieldMetadataValueObject('test'),
+        new FormFieldMetadataValueObject('test two')
+      ];
+      formBuilderService.getValueFromModel.and.returnValue({
+        path:pathValue
+      });
+      spyOn(previousValue, 'isPathEqual').and.returnValue(false);
+
+      serviceAsAny.handleArrayGroupPatch(
+        pathCombiner,
+        dynamicFormControlChangeEvent,
+        arrayModel,
+        previousValue
+      );
+
+      expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
+        pathCombiner.getPath('path'),
+        pathValue,
+        false
+      );
+      expect(jsonPatchOpBuilder.remove).not.toHaveBeenCalled();
+    });
+
+    it('should dispatch a json-path remove operation when a array value is empty and has previous value', () => {
+      formBuilderService.getValueFromModel.and.returnValue({});
+      spyOn(previousValue, 'isPathEqual').and.returnValue(true);
+
+      serviceAsAny.handleArrayGroupPatch(
+        pathCombiner,
+        dynamicFormControlChangeEvent,
+        arrayModel,
+        previousValue
+      );
+
+      expect(jsonPatchOpBuilder.add).not.toHaveBeenCalled();
+      expect(jsonPatchOpBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath('path'));
+    });
+  });
 });

From 98dde58f9d0f330945f6faf4665c703709475ad9 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 18 May 2021 11:52:03 +0200
Subject: [PATCH 013/169] [D4CRIS-1080] Fix issue where a replace patch
 operation was dispatched instead of an add one when field's previous value is
 empty

---
 .../section-form-operations.service.spec.ts   | 29 ++++++++++++++++++-
 .../form/section-form-operations.service.ts   |  4 +--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index 9c9b6d971b..ec179b6151 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -574,7 +574,7 @@ describe('SectionFormOperationsService test suite', () => {
     });
 
     it('should dispatch a json-path remove operation when has a stored value', () => {
-      const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
+      let previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
           parent: mockRowGroupModel
@@ -597,6 +597,7 @@ describe('SectionFormOperationsService test suite', () => {
 
       spyIndex.and.returnValue(1);
       spyPath.and.returnValue('path/1');
+      previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       serviceAsAny.dispatchOperationsFromChangeEvent(pathCombiner, event, previousValue, true);
 
       expect(jsonPatchOpBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath('path/1'));
@@ -627,6 +628,32 @@ describe('SectionFormOperationsService test suite', () => {
         new FormFieldMetadataValueObject('test'));
     });
 
+    it('should dispatch a json-path add operation when has a stored value but previous value is empty', () => {
+      const previousValue = new FormFieldPreviousValueObject(['path', 'test'], null);
+      const event = Object.assign({}, dynamicFormControlChangeEvent, {
+        model: {
+          parent: mockRowGroupModel
+        }
+      });
+      spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
+      spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
+      spyOn(service, 'getFieldValueFromChangeEvent').and.returnValue(new FormFieldMetadataValueObject('test'));
+      spyOn(service, 'getArrayIndexFromEvent').and.returnValue(0);
+      spyOn(serviceAsAny, 'getValueMap');
+      spyOn(serviceAsAny, 'dispatchOperationsFromMap');
+      formBuilderService.isQualdropGroup.and.returnValue(false);
+      formBuilderService.isRelationGroup.and.returnValue(false);
+      formBuilderService.hasArrayGroupValue.and.returnValue(false);
+      spyOn(previousValue, 'isPathEqual').and.returnValue(false);
+
+      serviceAsAny.dispatchOperationsFromChangeEvent(pathCombiner, event, previousValue, true);
+
+      expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
+        pathCombiner.getPath('path'),
+        new FormFieldMetadataValueObject('test'),
+        true);
+    });
+
     it('should dispatch a json-path add operation when has a value and field index is zero or undefined', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index 8aef798cbc..7174d5da67 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -389,7 +389,7 @@ export class SectionFormOperationsService {
       this.operationsBuilder.add(
         pathCombiner.getPath(segmentedPath),
         value, true);
-    } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model)) || hasStoredValue) {
+    } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model)) || (hasStoredValue && isNotEmpty(previousValue.value)) ) {
       // Here model has a previous value changed or stored in the server
       if (hasValue(event.$event) && hasValue(event.$event.previousIndex)) {
         if (event.$event.previousIndex < 0) {
@@ -422,7 +422,7 @@ export class SectionFormOperationsService {
       previousValue.delete();
     } else if (value.hasValue()) {
       // Here model has no previous value but a new one
-      if (isUndefined(this.getArrayIndexFromEvent(event))   || this.getArrayIndexFromEvent(event) === 0) {
+      if (isUndefined(this.getArrayIndexFromEvent(event)) || this.getArrayIndexFromEvent(event) === 0) {
         // Model is single field or is part of an array model but is the first item,
         // so dispatch an add operation that initialize the values of a specific metadata
         this.operationsBuilder.add(

From 3c0cb33bc707a641131c57deb8a2b4f17f32d777 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 19 May 2021 18:16:31 +0200
Subject: [PATCH 014/169] fix failed build

---
 .../sections/form/section-form-operations.service.spec.ts        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index ec179b6151..d5798b82c8 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -806,7 +806,6 @@ describe('SectionFormOperationsService test suite', () => {
           relationshipConfig: undefined,
           submissionId: '1234',
           isDraggable: true,
-          showButtons: false,
           groupFactory: () => {
             return [
               new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })

From 926dd466271351e8ec00b19dea601a646c4a2e50 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 20 May 2021 09:45:48 +0200
Subject: [PATCH 015/169] 79327: Fix LGTM issues and add e2e tests

---
 .../item-statistics.e2e-spec.ts               | 31 +++++++++++++++++++
 e2e/src/item-statistics/item-statistics.po.ts | 23 ++++++++++++++
 package.json                                  |  3 +-
 src/app/+item-page/item-page.resolver.ts      |  4 ---
 src/app/+item-page/item.resolver.ts           |  3 --
 .../statistics-page-routing.module.ts         |  1 -
 yarn.lock                                     |  8 ++---
 7 files changed, 60 insertions(+), 13 deletions(-)
 create mode 100644 e2e/src/item-statistics/item-statistics.e2e-spec.ts
 create mode 100644 e2e/src/item-statistics/item-statistics.po.ts

diff --git a/e2e/src/item-statistics/item-statistics.e2e-spec.ts b/e2e/src/item-statistics/item-statistics.e2e-spec.ts
new file mode 100644
index 0000000000..fe629804a3
--- /dev/null
+++ b/e2e/src/item-statistics/item-statistics.e2e-spec.ts
@@ -0,0 +1,31 @@
+import { ProtractorPage } from './item-statistics.po';
+import { browser } from 'protractor';
+
+describe('protractor Item statics', () => {
+  let page: ProtractorPage;
+
+  beforeEach(() => {
+    page = new ProtractorPage();
+  });
+
+  it('should contain element ds-item-page when navigating when navigating to an item page', () => {
+    page.navigateToItemPage();
+    expect<any>(page.elementTagExists('ds-item-page')).toEqual(true);
+    expect<any>(page.elementTagExists('ds-item-statistics-page')).toEqual(false);
+  });
+
+  it('should redirect to the entity page when navigating to an item page', () => {
+    page.navigateToItemPage();
+    expect(browser.getCurrentUrl()).toEqual('http://localhost:4000' + page.ENTITYPAGE);
+  });
+
+  it('should contain element ds-item-statistics-page when navigating when navigating to an item statistics page', () => {
+    page.navigateToItemStatisticsPage();
+    expect<any>(page.elementTagExists('ds-item-statistics-page')).toEqual(true);
+    expect<any>(page.elementTagExists('ds-item-page')).toEqual(false);
+  });
+  it('should contain the item statistics page url when navigating to an item statistics page', () => {
+    page.navigateToItemStatisticsPage();
+    expect(browser.getCurrentUrl()).toEqual('http://localhost:4000' + page.ITEMSTATISTICSPAGE);
+  });
+});
diff --git a/e2e/src/item-statistics/item-statistics.po.ts b/e2e/src/item-statistics/item-statistics.po.ts
new file mode 100644
index 0000000000..618f65dc98
--- /dev/null
+++ b/e2e/src/item-statistics/item-statistics.po.ts
@@ -0,0 +1,23 @@
+import { browser, element, by } from 'protractor';
+
+export class ProtractorPage {
+  ITEMPAGE = '/items/e98b0f27-5c19-49a0-960d-eb6ad5287067';
+  ENTITYPAGE = '/entities/publication/e98b0f27-5c19-49a0-960d-eb6ad5287067';
+  ITEMSTATISTICSPAGE = '/statistics/items/e98b0f27-5c19-49a0-960d-eb6ad5287067';
+
+  navigateToItemPage() {
+    return browser.get(this.ITEMPAGE);
+  }
+  navigateToItemStatisticsPage() {
+    return browser.get(this.ITEMSTATISTICSPAGE);
+  }
+
+  elementTagExists(tag: string) {
+    return element(by.tagName(tag)).isPresent();
+  }
+
+  verifyCurrentUrl(url) {
+      browser.getCurrentUrl().then((currentUrl) => currentUrl === url );
+  }
+
+}
diff --git a/package.json b/package.json
index 80af52e264..652ab409ac 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,8 @@
   },
   "private": true,
   "resolutions": {
-    "minimist": "^1.2.5"
+    "minimist": "^1.2.5",
+    "webdriver-manager": "^12.1.8"
   },
   "dependencies": {
     "@angular/animations": "~10.2.3",
diff --git a/src/app/+item-page/item-page.resolver.ts b/src/app/+item-page/item-page.resolver.ts
index a12f961e57..7edffc5357 100644
--- a/src/app/+item-page/item-page.resolver.ts
+++ b/src/app/+item-page/item-page.resolver.ts
@@ -4,11 +4,7 @@ import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
 import { ItemDataService } from '../core/data/item-data.service';
 import { Item } from '../core/shared/item.model';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { FindListOptions } from '../core/data/request.models';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { Store } from '@ngrx/store';
-import { ResolvedAction } from '../core/resolving/resolver.actions';
 import { map } from 'rxjs/operators';
 import { hasValue } from '../shared/empty.util';
 import { getItemPageRoute } from './item-page-routing-paths';
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 7d020309dc..99b96511fe 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -9,9 +9,6 @@ import { FindListOptions } from '../core/data/request.models';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { Store } from '@ngrx/store';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
-import { map } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
-import { getItemPageRoute } from './item-page-routing-paths';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts
index 0c63e35b34..5b96bcca6e 100644
--- a/src/app/statistics-page/statistics-page-routing.module.ts
+++ b/src/app/statistics-page/statistics-page-routing.module.ts
@@ -3,7 +3,6 @@ import { RouterModule } from '@angular/router';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 import { StatisticsPageModule } from './statistics-page.module';
-import { ItemPageResolver } from '../+item-page/item-page.resolver';
 import { CollectionPageResolver } from '../+collection-page/collection-page.resolver';
 import { CommunityPageResolver } from '../+community-page/community-page.resolver';
 import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component';
diff --git a/yarn.lock b/yarn.lock
index 9b6e2d31d6..d6388ddb53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11933,10 +11933,10 @@ webdriver-js-extender@2.1.0:
     "@types/selenium-webdriver" "^3.0.0"
     selenium-webdriver "^3.0.1"
 
-webdriver-manager@^12.1.7:
-  version "12.1.7"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.7.tgz#ed4eaee8f906b33c146e869b55e850553a1b1162"
-  integrity sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==
+webdriver-manager@^12.1.7, webdriver-manager@^12.1.8:
+  version "12.1.8"
+  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
+  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
   dependencies:
     adm-zip "^0.4.9"
     chalk "^1.1.1"

From 579f98d0276d575155537e4a461dbad30b84db8c Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Thu, 20 May 2021 10:45:14 +0200
Subject: [PATCH 016/169] 79327: Follow up fixes to test

---
 e2e/src/item-statistics/item-statistics.e2e-spec.ts | 9 +++++++--
 e2e/src/item-statistics/item-statistics.po.ts       | 5 -----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/e2e/src/item-statistics/item-statistics.e2e-spec.ts b/e2e/src/item-statistics/item-statistics.e2e-spec.ts
index fe629804a3..58cf569d2a 100644
--- a/e2e/src/item-statistics/item-statistics.e2e-spec.ts
+++ b/e2e/src/item-statistics/item-statistics.e2e-spec.ts
@@ -1,5 +1,6 @@
 import { ProtractorPage } from './item-statistics.po';
 import { browser } from 'protractor';
+import { UIURLCombiner } from '../../../src/app/core/url-combiner/ui-url-combiner';
 
 describe('protractor Item statics', () => {
   let page: ProtractorPage;
@@ -16,7 +17,9 @@ describe('protractor Item statics', () => {
 
   it('should redirect to the entity page when navigating to an item page', () => {
     page.navigateToItemPage();
-    expect(browser.getCurrentUrl()).toEqual('http://localhost:4000' + page.ENTITYPAGE);
+    expect(browser.getCurrentUrl()).toEqual(new UIURLCombiner(page.ENTITYPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ITEMSTATISTICSPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ITEMPAGE).toString());
   });
 
   it('should contain element ds-item-statistics-page when navigating when navigating to an item statistics page', () => {
@@ -26,6 +29,8 @@ describe('protractor Item statics', () => {
   });
   it('should contain the item statistics page url when navigating to an item statistics page', () => {
     page.navigateToItemStatisticsPage();
-    expect(browser.getCurrentUrl()).toEqual('http://localhost:4000' + page.ITEMSTATISTICSPAGE);
+    expect(browser.getCurrentUrl()).toEqual(new UIURLCombiner(page.ITEMSTATISTICSPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ENTITYPAGE).toString());
+    expect(browser.getCurrentUrl()).not.toEqual(new UIURLCombiner(page.ITEMPAGE).toString());
   });
 });
diff --git a/e2e/src/item-statistics/item-statistics.po.ts b/e2e/src/item-statistics/item-statistics.po.ts
index 618f65dc98..ec227b9636 100644
--- a/e2e/src/item-statistics/item-statistics.po.ts
+++ b/e2e/src/item-statistics/item-statistics.po.ts
@@ -15,9 +15,4 @@ export class ProtractorPage {
   elementTagExists(tag: string) {
     return element(by.tagName(tag)).isPresent();
   }
-
-  verifyCurrentUrl(url) {
-      browser.getCurrentUrl().then((currentUrl) => currentUrl === url );
-  }
-
 }

From 55affdebced2046e45988e727254bfd662e94842 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 09:28:02 +0200
Subject: [PATCH 017/169] 79597: Add alt text to ds-thumbnail

---
 src/app/thumbnail/thumbnail.component.html |  2 +-
 src/app/thumbnail/thumbnail.component.scss | 28 ++++++++++++++++++++++
 src/app/thumbnail/thumbnail.component.ts   |  6 ++++-
 src/assets/i18n/en.json5                   |  4 ++++
 4 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index dbf8f6732c..ec11ba6c0f 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,4 @@
 <div class="thumbnail">
-  <img [src]="src | dsSafeUrl" (error)="errorHandler()" class="img-fluid"/>
+  <img [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" class="img-fluid"/>
 </div>
 
diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index e2718bac06..9feac243db 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -1,3 +1,31 @@
 img {
   max-width: 100%;
 }
+
+.outer {  // .outer/.inner generated ~ https://ratiobuddy.com/
+  position: relative;
+  &:before {
+    display: block;
+    content: "";
+    width: 100%;
+    padding-top: (210 / 297) * 100%;  // A4 ratio
+  }
+  > .inner {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+
+    > .thumbnail-placeholder {
+      background: var(--bs-gray-100);
+      border: var(--bs-gray-200) 1px;
+      color: var(--bs-gray-600);
+      font-weight: bold;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      text-align: center;
+    }
+  }
+}
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 7e981d5fe6..8d5e780f27 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -18,7 +18,6 @@ export const THUMBNAIL_PLACEHOLDER = 'data:image/svg+xml;charset=UTF-8,%3Csvg%20
   templateUrl: './thumbnail.component.html'
 })
 export class ThumbnailComponent implements OnInit {
-
   /**
    * The thumbnail Bitstream
    */
@@ -34,6 +33,11 @@ export class ThumbnailComponent implements OnInit {
    */
   src: string;
 
+  /**
+   * i18n key of thumbnail alt text
+   */
+  @Input() alt? = 'thumbnail.default.alt';
+
   /**
    * Initialize the thumbnail.
    * Use a default image if no actual image is available.
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4c3317a0c0..ac37eba016 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3539,6 +3539,10 @@
   "submission.workflow.tasks.pool.show-detail": "Show detail",
 
 
+  "thumbnail.default.alt": "Thumbnail Image",
+
+  "thumbnail.default.placeholder": "No Thumbnail Available",
+
 
   "title": "DSpace",
 

From d80da3bbfe2cd6185e9f90538425897336475651 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 09:28:46 +0200
Subject: [PATCH 018/169] 79597: Add HTML placeholder for missing thumbnails

---
 src/app/thumbnail/thumbnail.component.html |  9 ++++++++-
 src/app/thumbnail/thumbnail.component.scss |  2 +-
 src/app/thumbnail/thumbnail.component.ts   | 23 ++++++++++++----------
 src/assets/i18n/en.json5                   | 14 +++++++++++++
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index ec11ba6c0f..4789917f1c 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,11 @@
 <div class="thumbnail">
-  <img [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" class="img-fluid"/>
+  <img *ngIf="src !== null" [src]="src | dsSafeUrl" [alt]="alt" (error)="errorHandler()" class="img-fluid"/>
+  <div *ngIf="src === null" class="outer">
+    <div class="inner">
+      <div class="thumbnail-placeholder w-100 h-100 p-3">
+        {{ placeholder | translate }}
+      </div>
+    </div>
+  </div>
 </div>
 
diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index 9feac243db..4c8c7d90ad 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -19,7 +19,7 @@ img {
 
     > .thumbnail-placeholder {
       background: var(--bs-gray-100);
-      border: var(--bs-gray-200) 1px;
+      border: 1px solid var(--bs-gray-200);
       color: var(--bs-gray-600);
       font-weight: bold;
       display: flex;
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 8d5e780f27..21a5da3567 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -2,11 +2,6 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasValue } from '../shared/empty.util';
 
-/**
- * A fallback placeholder image as a base64 string
- */
-export const THUMBNAIL_PLACEHOLDER = 'data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2293%22%20height%3D%22120%22%20viewBox%3D%220%200%2093%20120%22%20preserveAspectRatio%3D%22none%22%3E%3C!--%0ASource%20URL%3A%20holder.js%2F93x120%3Ftext%3DNo%20Thumbnail%0ACreated%20with%20Holder.js%202.8.2.%0ALearn%20more%20at%20http%3A%2F%2Fholderjs.com%0A(c)%202012-2015%20Ivan%20Malopinsky%20-%20http%3A%2F%2Fimsky.co%0A--%3E%3Cdefs%3E%3Cstyle%20type%3D%22text%2Fcss%22%3E%3C!%5BCDATA%5B%23holder_1543e460b05%20text%20%7B%20fill%3A%23AAAAAA%3Bfont-weight%3Abold%3Bfont-family%3AArial%2C%20Helvetica%2C%20Open%20Sans%2C%20sans-serif%2C%20monospace%3Bfont-size%3A10pt%20%7D%20%5D%5D%3E%3C%2Fstyle%3E%3C%2Fdefs%3E%3Cg%20id%3D%22holder_1543e460b05%22%3E%3Crect%20width%3D%2293%22%20height%3D%22120%22%20fill%3D%22%23FFFFFF%22%2F%3E%3Cg%3E%3Ctext%20x%3D%2235.6171875%22%20y%3D%2257%22%3ENo%3C%2Ftext%3E%3Ctext%20x%3D%2210.8125%22%20y%3D%2272%22%3EThumbnail%3C%2Ftext%3E%3C%2Fg%3E%3C%2Fg%3E%3C%2Fsvg%3E';
-
 /**
  * This component renders a given Bitstream as a thumbnail.
  * One input parameter of type Bitstream is expected.
@@ -24,9 +19,10 @@ export class ThumbnailComponent implements OnInit {
   @Input() thumbnail: Bitstream;
 
   /**
-   * The default image, used if the thumbnail isn't set or can't be downloaded
+   * The default image, used if the thumbnail isn't set or can't be downloaded.
+   * If defaultImage is null, a HTML placeholder is used instead.
    */
-  @Input() defaultImage? = THUMBNAIL_PLACEHOLDER;
+  @Input() defaultImage? = null;
 
   /**
    * The src attribute used in the template to render the image.
@@ -38,12 +34,19 @@ export class ThumbnailComponent implements OnInit {
    */
   @Input() alt? = 'thumbnail.default.alt';
 
+  /**
+   * i18n key of HTML placeholder text
+   */
+  @Input() placeholder? = 'thumbnail.default.placeholder';
+
   /**
    * Initialize the thumbnail.
    * Use a default image if no actual image is available.
    */
   ngOnInit(): void {
-    if (hasValue(this.thumbnail) && hasValue(this.thumbnail._links) && hasValue(this.thumbnail._links.content) && this.thumbnail._links.content.href) {
+    if (hasValue(this.thumbnail) && hasValue(this.thumbnail._links)
+                                 && hasValue(this.thumbnail._links.content)
+                                 && this.thumbnail._links.content.href) {
       this.src = this.thumbnail._links.content.href;
     } else {
       this.src = this.defaultImage;
@@ -53,13 +56,13 @@ export class ThumbnailComponent implements OnInit {
   /**
    * Handle image download errors.
    * If the image can't be found, use the defaultImage instead.
-   * If that also can't be found, use the base64 placeholder.
+   * If that also can't be found, use null to fall back to the HTML placeholder.
    */
   errorHandler() {
     if (this.src !== this.defaultImage) {
       this.src = this.defaultImage;
     } else {
-      this.src = THUMBNAIL_PLACEHOLDER;
+      this.src = null;
     }
   }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index ac37eba016..2235eda34d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3539,10 +3539,24 @@
   "submission.workflow.tasks.pool.show-detail": "Show detail",
 
 
+
   "thumbnail.default.alt": "Thumbnail Image",
 
   "thumbnail.default.placeholder": "No Thumbnail Available",
 
+  "thumbnail.project.alt": "Project Logo",
+
+  "thumbnail.project.placeholder": "Project Placeholder Image",
+
+  "thumbnail.orgunit.alt": "OrgUnit Logo",
+
+  "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+
+  "thumbnail.person.alt": "Profile Picture",
+
+  "thumbnail.person.placeholder": "No Profile Picture Available",
+
+
 
   "title": "DSpace",
 

From 7a69a23f0c50e28801d04045e905e80f5929ebd1 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 09:46:54 +0200
Subject: [PATCH 019/169] 79597: Improve placeholder contrast

---
 src/app/thumbnail/thumbnail.component.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index 4c8c7d90ad..290b395212 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -19,8 +19,8 @@ img {
 
     > .thumbnail-placeholder {
       background: var(--bs-gray-100);
-      border: 1px solid var(--bs-gray-200);
-      color: var(--bs-gray-600);
+      border: 1px solid var(--bs-gray-300);
+      color: var(--bs-gray-800);
       font-weight: bold;
       display: flex;
       justify-content: center;

From 4b6e02f773b27897fe0ce178a516d2a12a969bed Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 09:55:19 +0200
Subject: [PATCH 020/169] 79597: Specify i18n text for person, project &
 orgunit

---
 .../item-pages/org-unit/org-unit.component.html            | 7 ++++++-
 .../item-pages/person/person.component.html                | 6 +++++-
 .../item-pages/project/project.component.html              | 7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

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 822d4858ce..14d56d4104 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
@@ -9,7 +9,12 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="getThumbnail() | async"
+                    [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+                    [alt]="'thumbnail.orgunit.alt'"
+                    [placeholder]="'thumbnail.orgunit.placeholder'"
+      >
+      </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['organization.foundingDate']"
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 e1c776f366..2a7c9bd023 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
@@ -9,7 +9,11 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/person-placeholder.svg'"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="getThumbnail() | async"
+                    [defaultImage]="'assets/images/person-placeholder.svg'"
+                    [alt]="'thumbnail.person.alt'"
+                    [placeholder]="'thumbnail.person.placeholder'">
+      </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['person.email']"
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 9967b940ac..0590c8bfe4 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
@@ -9,7 +9,12 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/project-placeholder.svg'"></ds-thumbnail>
+      <ds-thumbnail
+        [thumbnail]="getThumbnail() | async"
+        [defaultImage]="'assets/images/project-placeholder.svg'"
+        [alt]="'thumbnail.project.alt'"
+        [placeholder]="'thumbnail.project.placeholder'">
+      </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <!--<ds-generic-item-page-field [item]="object"-->
       <!--[fields]="['project.identifier.status']"-->

From c9ff89a143d178f24728c353ede4cb8e21e12d41 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 10:03:18 +0200
Subject: [PATCH 021/169] 79597: Thumbnail placeholder style ~ CSS variables

---
 src/app/thumbnail/thumbnail.component.scss | 6 +++---
 src/styles/_custom_variables.scss          | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index 290b395212..e2374c96db 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -18,9 +18,9 @@ img {
     left: 0;
 
     > .thumbnail-placeholder {
-      background: var(--bs-gray-100);
-      border: 1px solid var(--bs-gray-300);
-      color: var(--bs-gray-800);
+      background: var(--ds-thumbnail-placeholder-background);
+      border: var(--ds-thumbnail-placeholder-border);
+      color: var(--ds-thumbnail-placeholder-color);
       font-weight: bold;
       display: flex;
       justify-content: center;
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 298be09f67..d0e1564281 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -46,6 +46,9 @@
   --ds-edit-item-language-field-width: 43px;
 
   --ds-thumbnail-max-width: 175px;
+  --ds-thumbnail-placeholder-background: #{$gray-100};
+  --ds-thumbnail-placeholder-border: 1px solid #{$gray-300};
+  --ds-thumbnail-placeholder-color: #{lighten($gray-800, 7%)};
 
   --ds-dso-selector-list-max-height: 475px;
   --ds-dso-selector-current-background-color: #eeeeee;

From 4567f8cc2cfb880e414ead44c7f76326b546517b Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 10:20:46 +0200
Subject: [PATCH 022/169] 79597: Limit thumbnail width & set to portrait

---
 src/app/thumbnail/thumbnail.component.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index e2374c96db..a96147468c 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -1,3 +1,7 @@
+.thumbnail {
+  max-width: var(--ds-thumbnail-max-width);
+}
+
 img {
   max-width: 100%;
 }
@@ -8,7 +12,7 @@ img {
     display: block;
     content: "";
     width: 100%;
-    padding-top: (210 / 297) * 100%;  // A4 ratio
+    padding-top: (297 / 210) * 100%;  // A4 ratio
   }
   > .inner {
     position: absolute;

From 363d1d74dff0d82291cef6893f6989ea20f7cda8 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 11:03:51 +0200
Subject: [PATCH 023/169] 79597: Update unit tests

---
 .../shared/mocks/translate.service.mock.ts    |  1 +
 src/app/thumbnail/thumbnail.component.html    |  6 +--
 src/app/thumbnail/thumbnail.component.spec.ts | 42 ++++++++++++++++---
 3 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/src/app/shared/mocks/translate.service.mock.ts b/src/app/shared/mocks/translate.service.mock.ts
index 0bc172b408..38b088e50f 100644
--- a/src/app/shared/mocks/translate.service.mock.ts
+++ b/src/app/shared/mocks/translate.service.mock.ts
@@ -3,6 +3,7 @@ import { TranslateService } from '@ngx-translate/core';
 export function getMockTranslateService(): TranslateService {
   return jasmine.createSpyObj('translateService', {
     get: jasmine.createSpy('get'),
+    use: jasmine.createSpy('use'),
     instant: jasmine.createSpy('instant'),
     setDefaultLang: jasmine.createSpy('setDefaultLang')
   });
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index 4789917f1c..cef88e0192 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,10 +1,8 @@
 <div class="thumbnail">
-  <img *ngIf="src !== null" [src]="src | dsSafeUrl" [alt]="alt" (error)="errorHandler()" class="img-fluid"/>
+  <img *ngIf="src !== null" [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" class="img-fluid"/>
   <div *ngIf="src === null" class="outer">
     <div class="inner">
-      <div class="thumbnail-placeholder w-100 h-100 p-3">
-        {{ placeholder | translate }}
-      </div>
+      <div class="thumbnail-placeholder w-100 h-100 p-3">{{ placeholder | translate }}</div>
     </div>
   </div>
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 21678c9162..687282a373 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -1,10 +1,18 @@
-import { DebugElement } from '@angular/core';
+import { DebugElement, Pipe, PipeTransform } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
 
-import { THUMBNAIL_PLACEHOLDER, ThumbnailComponent } from './thumbnail.component';
+import { ThumbnailComponent } from './thumbnail.component';
+import { TranslateService } from '@ngx-translate/core';
+
+@Pipe({ name: 'translate' })
+class MockTranslatePipe implements PipeTransform {
+  transform(key: string): string {
+    return 'TRANSLATED ' + key;
+  }
+}
 
 describe('ThumbnailComponent', () => {
   let comp: ThumbnailComponent;
@@ -14,7 +22,7 @@ describe('ThumbnailComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ThumbnailComponent, SafeUrlPipe]
+      declarations: [ThumbnailComponent, SafeUrlPipe, MockTranslatePipe],
     }).compileComponents();
   }));
 
@@ -39,6 +47,19 @@ describe('ThumbnailComponent', () => {
       const image: HTMLElement = de.query(By.css('img')).nativeElement;
       expect(image.getAttribute('src')).toBe(comp.thumbnail._links.content.href);
     });
+    it('should include the alt text', () => {
+      const thumbnail = new Bitstream();
+      thumbnail._links = {
+        self: { href: 'self.url' },
+        bundle: { href: 'bundle.url' },
+        format: { href: 'format.url' },
+        content: { href: 'content.url' },
+      };
+      comp.thumbnail = thumbnail;
+      fixture.detectChanges();
+      const image: HTMLElement = de.query(By.css('img')).nativeElement;
+      expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+    });
   });
   describe(`when the thumbnail doesn't exist`, () => {
     describe('and there is a default image', () => {
@@ -48,13 +69,24 @@ describe('ThumbnailComponent', () => {
         comp.errorHandler();
         expect(comp.src).toBe(comp.defaultImage);
       });
+      it('should include the alt text', () => {
+        comp.src = 'http://bit.stream';
+        comp.defaultImage = 'http://default.img';
+        comp.errorHandler();
+        fixture.detectChanges();
+        const image: HTMLElement = de.query(By.css('img')).nativeElement;
+        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+      });
     });
     describe('and there is no default image', () => {
       it('should display the placeholder', () => {
         comp.src = 'http://default.img';
-        comp.defaultImage = 'http://default.img';
         comp.errorHandler();
-        expect(comp.src).toBe(THUMBNAIL_PLACEHOLDER);
+        expect(comp.src).toBe(null);
+
+        fixture.detectChanges();
+        const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
+        expect(placeholder.innerHTML).toBe('TRANSLATED ' + comp.placeholder);
       });
     });
   });

From ca7d45ff0c0fa2b221bb27587a7ce67e5905cb7d Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 25 May 2021 11:18:08 +0200
Subject: [PATCH 024/169] 79597: Fix tslint issue

---
 src/app/thumbnail/thumbnail.component.spec.ts | 2 +-
 src/app/thumbnail/thumbnail.component.ts      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 687282a373..82eadc04de 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -5,8 +5,8 @@ import { Bitstream } from '../core/shared/bitstream.model';
 import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
 
 import { ThumbnailComponent } from './thumbnail.component';
-import { TranslateService } from '@ngx-translate/core';
 
+// tslint:disable-next-line:pipe-prefix
 @Pipe({ name: 'translate' })
 class MockTranslatePipe implements PipeTransform {
   transform(key: string): string {
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 21a5da3567..11dee37037 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -10,7 +10,7 @@ import { hasValue } from '../shared/empty.util';
 @Component({
   selector: 'ds-thumbnail',
   styleUrls: ['./thumbnail.component.scss'],
-  templateUrl: './thumbnail.component.html'
+  templateUrl: './thumbnail.component.html',
 })
 export class ThumbnailComponent implements OnInit {
   /**

From 21686c86df2b3a316fe087dc5c6cc531468698c2 Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Tue, 25 May 2021 11:51:19 +0200
Subject: [PATCH 025/169] add support for multiple metadata fields to the
 MetadataRepresentationListComponent

---
 .../publication/publication.component.html       |  2 +-
 .../untyped-item/untyped-item.component.html     |  2 +-
 ...etadata-representation-list.component.spec.ts | 16 ++++++++++++----
 .../metadata-representation-list.component.ts    |  4 ++--
 src/app/core/shared/dspace-object.model.ts       |  4 ++--
 .../item-pages/project/project.component.html    |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)

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 ba73ed43be..27f5ff43a1 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
@@ -21,7 +21,7 @@
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
       [parentItem]="object"
       [itemType]="'Person'"
-      [metadataField]="'dc.contributor.author'"
+      [metadataFields]="['dc.contributor.author', 'dc.creator']"
       [label]="'relationships.isAuthorOf' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 969062aea6..89e6e7a490 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -21,7 +21,7 @@
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
       [parentItem]="object"
       [itemType]="'Person'"
-      [metadataField]="'dc.contributor.author'"
+      [metadataFields]="['dc.contributor.author', 'dc.creator']"
       [label]="'relationships.isAuthorOf' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
index 25f54a3fd2..e1c934246c 100644
--- a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
+++ b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
@@ -11,7 +11,7 @@ import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
 
 const itemType = 'Person';
-const metadataField = 'dc.contributor.author';
+const metadataFields = ['dc.contributor.author', 'dc.creator'];
 const parentItem: Item = Object.assign(new Item(), {
   id: 'parent-item',
   metadata: {
@@ -28,6 +28,14 @@ const parentItem: Item = Object.assign(new Item(), {
         place: 1
       }
     ],
+    'dc.creator': [
+      {
+        language: null,
+        value: 'Related Creator with authority',
+        authority: 'virtual::related-creator',
+        place: 3,
+      },
+    ],
     'dc.title': [
       {
         language: null,
@@ -81,13 +89,13 @@ describe('MetadataRepresentationListComponent', () => {
     comp = fixture.componentInstance;
     comp.parentItem = parentItem;
     comp.itemType = itemType;
-    comp.metadataField = metadataField;
+    comp.metadataFields = metadataFields;
     fixture.detectChanges();
   }));
 
-  it('should load 2 ds-metadata-representation-loader components', () => {
+  it('should load 3 ds-metadata-representation-loader components', () => {
     const fields = fixture.debugElement.queryAll(By.css('ds-metadata-representation-loader'));
-    expect(fields.length).toBe(2);
+    expect(fields.length).toBe(3);
   });
 
   it('should contain one page of items', () => {
diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 3db7abfe84..e5301dabc0 100644
--- a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -42,7 +42,7 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
   /**
    * The metadata field to use for fetching metadata from the item
    */
-  @Input() metadataField: string;
+  @Input() metadataFields: string[];
 
   /**
    * An i18n label to use as a title for the list
@@ -70,7 +70,7 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
    * @param page  The page to fetch
    */
   getPage(page: number): Observable<MetadataRepresentation[]> {
-    const metadata = this.parentItem.findMetadataSortedByPlace(this.metadataField);
+    const metadata = this.parentItem.findMetadataSortedByPlace(this.metadataFields);
     this.total = metadata.length;
     return this.resolveMetadataRepresentations(metadata, page);
   }
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 9d1fba4f86..5ea2bced3d 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -163,8 +163,8 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    * Find metadata on a specific field and order all of them using their "place" property.
    * @param key
    */
-  findMetadataSortedByPlace(key: string): MetadataValue[] {
-    return this.allMetadata([key]).sort((a: MetadataValue, b: MetadataValue) => {
+  findMetadataSortedByPlace(keyOrKeys: string | string[]): MetadataValue[] {
+    return this.allMetadata(keyOrKeys).sort((a: MetadataValue, b: MetadataValue) => {
       if (hasNoValue(a.place) && hasNoValue(b.place)) {
         return 0;
       }
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 9967b940ac..c18fed78af 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
@@ -18,7 +18,7 @@
     <ds-metadata-representation-list
       [parentItem]="object"
       [itemType]="'OrgUnit'"
-      [metadataField]="'project.contributor.other'"
+      [metadataFields]="['project.contributor.other']"
       [label]="'project.page.contributor' | translate">
     </ds-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"

From fce77104d468ac82aeca761d32f88250c86ab9e1 Mon Sep 17 00:00:00 2001
From: Andrea Bollini <andrea.bollini@4science.it>
Date: Wed, 26 May 2021 22:39:06 +0200
Subject: [PATCH 026/169] Fix the rel name for the
 submissioncclicenseUrls-search link

---
 .../core/submission/submission-cc-license-url-data.service.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/submission/submission-cc-license-url-data.service.ts b/src/app/core/submission/submission-cc-license-url-data.service.ts
index ba0baca2eb..0ca3853d0e 100644
--- a/src/app/core/submission/submission-cc-license-url-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-url-data.service.ts
@@ -22,7 +22,7 @@ import { isNotEmpty } from '../../shared/empty.util';
 @dataService(SUBMISSION_CC_LICENSE_URL)
 export class SubmissionCcLicenseUrlDataService extends DataService<SubmissionCcLicenceUrl> {
 
-  protected linkPath = 'submissioncclicenseUrl-search';
+  protected linkPath = 'submissioncclicenseUrls-search';
 
   constructor(
     protected comparator: DefaultChangeAnalyzer<SubmissionCcLicenceUrl>,

From 060d0dd556ad9bbee790018fbb48f8815198093e Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 27 May 2021 09:43:29 +0200
Subject: [PATCH 027/169] [CST-4223] Creating a new submission should redirect
 to workspaceitem edit page

---
 .../submit/submission-submit.component.html   | 10 -------
 .../submission-submit.component.spec.ts       | 27 ++++++++-----------
 .../submit/submission-submit.component.ts     |  8 +-----
 3 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/app/submission/submit/submission-submit.component.html b/src/app/submission/submit/submission-submit.component.html
index a7680f07c2..e69de29bb2 100644
--- a/src/app/submission/submit/submission-submit.component.html
+++ b/src/app/submission/submit/submission-submit.component.html
@@ -1,10 +0,0 @@
-<div class="submission-submit-container">
-  <div class="submission-submit-container">
-    <ds-submission-form [collectionId]="collectionId"
-                        [sections]="sections"
-                        [selfUrl]="selfUrl"
-                        [submissionDefinition]="submissionDefinition"
-                        [item]="item"
-                        [submissionId]="submissionId"></ds-submission-form>
-  </div>
-</div>
diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts
index 16e26e3b33..1b76082d1b 100644
--- a/src/app/submission/submit/submission-submit.component.spec.ts
+++ b/src/app/submission/submit/submission-submit.component.spec.ts
@@ -26,7 +26,6 @@ describe('SubmissionSubmitComponent Component', () => {
   let itemDataService: ItemDataService;
   let router: RouterStub;
 
-  const submissionId = '826';
   const submissionObject: any = mockSubmissionObject;
 
   beforeEach(waitForAsync(() => {
@@ -67,27 +66,23 @@ describe('SubmissionSubmitComponent Component', () => {
     router = null;
   });
 
-  it('should init properly when a valid SubmissionObject has been retrieved',() => {
-
-    submissionServiceStub.createSubmission.and.returnValue(observableOf(submissionObject));
-
-    fixture.detectChanges();
-
-    expect(comp.submissionId.toString()).toEqual(submissionId);
-    expect(comp.collectionId).toBe(submissionObject.collection.id);
-    expect(comp.selfUrl).toBe(submissionObject._links.self.href);
-    expect(comp.sections).toBe(submissionObject.sections);
-    expect(comp.submissionDefinition).toBe(submissionObject.submissionDefinition);
-
-  });
-
   it('should redirect to mydspace when an empty SubmissionObject has been retrieved',() => {
 
     submissionServiceStub.createSubmission.and.returnValue(observableOf({}));
 
     fixture.detectChanges();
 
-    expect(router.navigate).toHaveBeenCalled();
+    expect(router.navigate).toHaveBeenCalledWith(['/mydspace']);
+
+  });
+
+  it('should redirect to workspaceitem edit when a not empty SubmissionObject has been retrieved',() => {
+
+    submissionServiceStub.createSubmission.and.returnValue(observableOf({ id: '1234'}));
+
+    fixture.detectChanges();
+
+    expect(router.navigate).toHaveBeenCalledWith(['/workspaceitems', '1234', 'edit'], { replaceUrl: true});
 
   });
 
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index 0c2172368a..af1bf38539 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -122,13 +122,7 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
               this.notificationsService.info(null, this.translate.get('submission.general.cannot_submit'));
               this.router.navigate(['/mydspace']);
             } else {
-              this.collectionId = (submissionObject.collection as Collection).id;
-              this.sections = submissionObject.sections;
-              this.selfUrl = submissionObject._links.self.href;
-              this.submissionDefinition = (submissionObject.submissionDefinition as SubmissionDefinitionsModel);
-              this.submissionId = submissionObject.id;
-              this.itemLink$.next(submissionObject._links.item.href);
-              this.item = submissionObject.item as Item;
+              this.router.navigate(['/workspaceitems', submissionObject.id, 'edit'], { replaceUrl: true});
             }
           }
         }),

From 41c07e74ca5c3ad3a6a69492c40873c8b7fb7089 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 08:59:32 +0200
Subject: [PATCH 028/169] 79597: Add input to toggle thumbnail max-width

---
 src/app/thumbnail/thumbnail.component.html | 9 +++++----
 src/app/thumbnail/thumbnail.component.scss | 2 +-
 src/app/thumbnail/thumbnail.component.ts   | 7 ++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index cef88e0192..645bce9b80 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,8 +1,9 @@
-<div class="thumbnail">
-  <img *ngIf="src !== null" [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" class="img-fluid"/>
-  <div *ngIf="src === null" class="outer">
+<div [ngClass]="{ 'thumbnail': true, 'limit-width': limitWidth }">
+  <img *ngIf="src !== null" class="thumbnail-content img-fluid"
+       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()"/>
+  <div *ngIf="src === null" class="thumbnail-content outer">
     <div class="inner">
-      <div class="thumbnail-placeholder w-100 h-100 p-3">{{ placeholder | translate }}</div>
+      <div class="thumbnail-placeholder w-100 h-100 p-3 lead">{{ placeholder | translate }}</div>
     </div>
   </div>
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index a96147468c..b15238afac 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -1,4 +1,4 @@
-.thumbnail {
+.limit-width {
   max-width: var(--ds-thumbnail-max-width);
 }
 
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 11dee37037..30911644f7 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -5,7 +5,7 @@ import { hasValue } from '../shared/empty.util';
 /**
  * This component renders a given Bitstream as a thumbnail.
  * One input parameter of type Bitstream is expected.
- * If no Bitstream is provided, a holderjs image will be rendered instead.
+ * If no Bitstream is provided, a HTML placeholder will be rendered instead.
  */
 @Component({
   selector: 'ds-thumbnail',
@@ -39,6 +39,11 @@ export class ThumbnailComponent implements OnInit {
    */
   @Input() placeholder? = 'thumbnail.default.placeholder';
 
+  /**
+   * Limit thumbnail width to --ds-thumbnail-max-width
+   */
+  @Input() limitWidth? = true;
+
   /**
    * Initialize the thumbnail.
    * Use a default image if no actual image is available.

From 4f38821bb3ff269d890ebf381beb5f0ff701152a Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 09:10:31 +0200
Subject: [PATCH 029/169] 79597: Replace ds-grid-thumbnail with ds-thumbnail

---
 ...ournal-issue-search-result-grid-element.component.html | 8 ++++----
 ...urnal-volume-search-result-grid-element.component.html | 8 ++++----
 .../journal-search-result-grid-element.component.html     | 8 ++++----
 .../org-unit-search-result-grid-element.component.html    | 8 ++++----
 .../person-search-result-grid-element.component.html      | 8 ++++----
 .../project-search-result-grid-element.component.html     | 8 ++++----
 .../collection-grid-element.component.html                | 8 ++++----
 .../community-grid-element.component.html                 | 8 ++++----
 src/app/shared/object-grid/object-grid.component.scss     | 2 +-
 .../collection-search-result-grid-element.component.html  | 8 ++++----
 .../community-search-result-grid-element.component.html   | 8 ++++----
 .../item/item-search-result-grid-element.component.html   | 8 ++++----
 12 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index df6c9e60c0..feb282d3a7 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -8,14 +8,14 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                </ds-grid-thumbnail>
+                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                </ds-thumbnail>
             </div>
         </span>
     <div class="card-body">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index cdc19b7f14..aa2352b284 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -8,14 +8,14 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
                 <div>
-                    <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                    </ds-grid-thumbnail>
+                    <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                    </ds-thumbnail>
                 </div>
             </span>
     <div class="card-body">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index bacd657663..8fdad59827 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -8,14 +8,14 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                </ds-grid-thumbnail>
+                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                </ds-thumbnail>
             </div>
         </span>
     <div class="card-body">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 2c3087d701..b8be58a603 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -8,14 +8,14 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                </ds-grid-thumbnail>
+                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                </ds-thumbnail>
             </div>
         </span>
     <div class="card-body">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 005fa9cc83..8281eb0e04 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -8,14 +8,14 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async">
+        </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-                </ds-grid-thumbnail>
+                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                </ds-thumbnail>
             </div>
         </span>
     <div class="card-body">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index e84e8c49d0..88498a4d67 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -8,14 +8,14 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
       <div>
-        <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        </ds-thumbnail>
       </div>
     </span>
     <div class="card-body">
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
index 9b9d174704..d47e897edc 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -1,11 +1,11 @@
 <div class="card">
   <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', object.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </a>
   <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </span>
   <div class="card-body">
     <h4 class="card-title">{{object.name}}</h4>
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
index f676ba303b..63097c4f57 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -1,11 +1,11 @@
 <div class="card">
   <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', object.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </a>
   <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(object.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </span>
   <div class="card-body">
     <h4 class="card-title">{{object.name}}</h4>
diff --git a/src/app/shared/object-grid/object-grid.component.scss b/src/app/shared/object-grid/object-grid.component.scss
index 46675615f0..68a7f2f991 100644
--- a/src/app/shared/object-grid/object-grid.component.scss
+++ b/src/app/shared/object-grid/object-grid.component.scss
@@ -1,7 +1,7 @@
 :host ::ng-deep {
   --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
 
-  div.thumbnail > img {
+  div.thumbnail > .thumbnail-content {
     height: var(--ds-card-thumbnail-height);
     width: 100%;
     display: block;
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index f8c75fc0d4..739fa6c7a8 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -1,11 +1,11 @@
 <div class="card">
   <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', dso.id]" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </a>
   <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </span>
   <div class="card-body">
     <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index 8025213b3b..d8c253c8a9 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -1,11 +1,11 @@
 <div class="card">
     <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="card-img-top">
-        <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
-        </ds-grid-thumbnail>
+        <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+        </ds-thumbnail>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-grid-thumbnail [thumbnail]="(dso.logo | async)?.payload">
-    </ds-grid-thumbnail>
+    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+    </ds-thumbnail>
   </span>
     <div class="card-body">
         <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 85aeb63a6b..bc16853721 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -6,14 +6,14 @@
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
          class="card-img-top full-width">
           <div>
-              <ds-grid-thumbnail [thumbnail]="getThumbnail() | async">
-              </ds-grid-thumbnail>
+              <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+              </ds-thumbnail>
           </div>
       </a>
       <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
           <div>
-              <ds-grid-thumbnail [thumbnail]="getThumbnail()  | async">
-              </ds-grid-thumbnail>
+              <ds-thumbnail [thumbnail]="getThumbnail()  | async" [limitWidth]="false">
+              </ds-thumbnail>
           </div>
       </span>
       <div class="card-body">

From 6cbd9dc920c7937e4f5217ee40bd4b2242ecf328 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 09:21:00 +0200
Subject: [PATCH 030/169] 79597: Remove GridThumbnailComponent

---
 .../grid-thumbnail.component.html             |  3 -
 .../grid-thumbnail.component.scss             |  0
 .../grid-thumbnail.component.spec.ts          | 50 -------------
 .../grid-thumbnail.component.ts               | 72 -------------------
 src/app/shared/shared.module.ts               |  5 +-
 5 files changed, 1 insertion(+), 129 deletions(-)
 delete mode 100644 src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
 delete mode 100644 src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.scss
 delete mode 100644 src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
 delete mode 100644 src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts

diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
deleted file mode 100644
index 1df4026f83..0000000000
--- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="thumbnail">
-  <img [src]="src | dsSafeUrl" (error)="errorHandler($event)" />
-</div>
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.scss b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
deleted file mode 100644
index 825a4d5c60..0000000000
--- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { SafeUrlPipe } from '../../utils/safe-url-pipe';
-
-import { GridThumbnailComponent } from './grid-thumbnail.component';
-
-describe('GridThumbnailComponent', () => {
-  let comp: GridThumbnailComponent;
-  let fixture: ComponentFixture<GridThumbnailComponent>;
-  let de: DebugElement;
-  let el: HTMLElement;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [GridThumbnailComponent, SafeUrlPipe]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(GridThumbnailComponent);
-    comp = fixture.componentInstance; // BannerComponent test instance
-    de = fixture.debugElement.query(By.css('div.thumbnail'));
-    el = de.nativeElement;
-  });
-
-  it('should display image', () => {
-    const thumbnail = new Bitstream();
-    thumbnail._links = {
-      self: { href: 'self.url' },
-      bundle: { href: 'bundle.url' },
-      format: { href: 'format.url' },
-      content: { href: 'content.url' },
-    };
-    comp.thumbnail = thumbnail;
-    fixture.detectChanges();
-    const image: HTMLElement = de.query(By.css('img')).nativeElement;
-    expect(image.getAttribute('src')).toBe(comp.thumbnail._links.content.href);
-  });
-
-  it('should display placeholder', () => {
-    const thumbnail = new Bitstream();
-    comp.thumbnail = thumbnail;
-    fixture.detectChanges();
-    const image: HTMLElement = de.query(By.css('img')).nativeElement;
-    expect(image.getAttribute('src')).toBe(comp.defaultImage);
-  });
-
-});
diff --git a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts b/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
deleted file mode 100644
index 92d93686dc..0000000000
--- a/src/app/shared/object-grid/grid-thumbnail/grid-thumbnail.component.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import {
-  Component,
-  Input,
-  OnChanges,
-  OnInit,
-  SimpleChanges,
-} from '@angular/core';
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { hasValue } from '../../empty.util';
-
-/**
- * This component renders a given Bitstream as a thumbnail.
- * One input parameter of type Bitstream is expected.
- * If no Bitstream is provided, a holderjs image will be rendered instead.
- */
-
-@Component({
-  selector: 'ds-grid-thumbnail',
-  styleUrls: ['./grid-thumbnail.component.scss'],
-  templateUrl: './grid-thumbnail.component.html',
-})
-export class GridThumbnailComponent implements OnInit, OnChanges {
-  @Input() thumbnail: Bitstream;
-
-  data: any = {};
-
-  /**
-   * The default 'holder.js' image
-   */
-  @Input() defaultImage? =
-    'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iMjYwIiBoZWlnaHQ9IjE4MCIgdmlld0JveD0iMCAwIDI2MCAxODAiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjwhLS0KU291cmNlIFVSTDogaG9sZGVyLmpzLzEwMCV4MTgwL3RleHQ6Tm8gVGh1bWJuYWlsCkNyZWF0ZWQgd2l0aCBIb2xkZXIuanMgMi42LjAuCkxlYXJuIG1vcmUgYXQgaHR0cDovL2hvbGRlcmpzLmNvbQooYykgMjAxMi0yMDE1IEl2YW4gTWFsb3BpbnNreSAtIGh0dHA6Ly9pbXNreS5jbwotLT48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPjwhW0NEQVRBWyNob2xkZXJfMTVmNzJmMmFlMGIgdGV4dCB7IGZpbGw6I0FBQUFBQTtmb250LXdlaWdodDpib2xkO2ZvbnQtZmFtaWx5OkFyaWFsLCBIZWx2ZXRpY2EsIE9wZW4gU2Fucywgc2Fucy1zZXJpZiwgbW9ub3NwYWNlO2ZvbnQtc2l6ZToxM3B0IH0gXV0+PC9zdHlsZT48L2RlZnM+PGcgaWQ9ImhvbGRlcl8xNWY3MmYyYWUwYiI+PHJlY3Qgd2lkdGg9IjI2MCIgaGVpZ2h0PSIxODAiIGZpbGw9IiNFRUVFRUUiLz48Zz48dGV4dCB4PSI3Mi4yNDIxODc1IiB5PSI5NiI+Tm8gVGh1bWJuYWlsPC90ZXh0PjwvZz48L2c+PC9zdmc+';
-
-  src: string;
-
-  errorHandler(event) {
-    event.currentTarget.src = this.defaultImage;
-  }
-
-  /**
-   * Initialize the src
-   */
-  ngOnInit(): void {
-    this.src = this.defaultImage;
-
-    this.checkThumbnail(this.thumbnail);
-  }
-
-  /**
-   * If the old input is undefined and the new one is a bitsream then set src
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    if (
-      !hasValue(changes.thumbnail.previousValue) &&
-      hasValue(changes.thumbnail.currentValue)
-    ) {
-      this.checkThumbnail(changes.thumbnail.currentValue);
-    }
-  }
-
-  /**
-   * check if the Bitstream has any content than set the src
-   */
-  checkThumbnail(thumbnail: Bitstream) {
-    if (
-      hasValue(thumbnail) &&
-      hasValue(thumbnail._links) &&
-      thumbnail._links.content.href
-    ) {
-      this.src = thumbnail._links.content.href;
-    }
-  }
-}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 4de0f2901e..c5a91bd02c 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -46,7 +46,6 @@ import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
 import { SearchFormComponent } from './search-form/search-form.component';
 import { SearchResultGridElementComponent } from './object-grid/search-result-grid-element/search-result-grid-element.component';
 import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
-import { GridThumbnailComponent } from './object-grid/grid-thumbnail/grid-thumbnail.component';
 import { VarDirective } from './utils/var.directive';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
 import { LogOutComponent } from './log-out/log-out.component';
@@ -54,8 +53,7 @@ import { FormComponent } from './form/form.component';
 import { DsDynamicOneboxComponent } from './form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import {
-  DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn
+  DsDynamicFormControlContainerComponent, dsDynamicFormControlMapFn,
 } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component';
 import { DragClickDirective } from './utils/drag-click.directive';
@@ -340,7 +338,6 @@ const COMPONENTS = [
   SidebarFilterComponent,
   SidebarFilterSelectedOptionComponent,
   ThumbnailComponent,
-  GridThumbnailComponent,
   UploaderComponent,
   FileDropzoneNoUploaderComponent,
   ItemListPreviewComponent,

From 9b95fc5de9b07adc038332f0c67848bf13448129 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 11:18:40 +0200
Subject: [PATCH 031/169] 79597: Add space between rows in
 FullFileSectionComponent

---
 .../file-section/full-file-section.component.html               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
index bc1c63cc32..c5393055df 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
@@ -11,7 +11,7 @@
                            [retainScrollPosition]="true">
 
 
-                <div class="file-section row" *ngFor="let file of originals?.page;">
+                <div class="file-section row mb-3" *ngFor="let file of originals?.page;">
                     <div class="col-3">
                         <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
                     </div>

From 772ac123295403d7a1d04c78cd98ec438f6836c8 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 27 May 2021 11:20:39 +0200
Subject: [PATCH 032/169] create separate startup css to load before the theme
 is chosen

---
 angular.json                     | 1 +
 src/app/root/root.component.html | 2 +-
 src/index.html                   | 1 -
 src/styles/_global-styles.scss   | 4 ----
 src/styles/startup.scss          | 8 ++++++++
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 src/styles/startup.scss

diff --git a/angular.json b/angular.json
index 00799dc33c..d158577e06 100644
--- a/angular.json
+++ b/angular.json
@@ -47,6 +47,7 @@
               "src/robots.txt"
             ],
             "styles": [
+              "src/styles/startup.scss",
               {
                 "input": "src/styles/base-theme.scss",
                 "inject": false,
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index aef07d79f4..4768fb737c 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -24,7 +24,7 @@
   </div>
 </div>
 <ng-template #authLoader>
-  <div class="text-center ds-full-screen-loader d-flex align-items-center flex-column justify-content-center">
+  <div class="ds-full-screen-loader">
     <ds-loading [showMessage]="false"></ds-loading>
   </div>
 </ng-template>
diff --git a/src/index.html b/src/index.html
index cb5d35e4f5..491a2d319c 100644
--- a/src/index.html
+++ b/src/index.html
@@ -7,7 +7,6 @@
   <title>DSpace</title>
   <meta name="viewport" content="width=device-width,minimum-scale=1">
   <link rel="icon" type="image/x-icon" href="assets/images/favicon.ico" />
-  <link class="theme-css" rel="stylesheet" href="/dspace-theme.css">
 </head>
 
 <body>
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index d151bb3ba7..2098fc4f74 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -40,10 +40,6 @@ ds-admin-sidebar {
   z-index: var(--ds-sidebar-z-index);
 }
 
-.ds-full-screen-loader {
-  height: 100vh;
-}
-
 .sticky-top {
   z-index: 0;
 }
diff --git a/src/styles/startup.scss b/src/styles/startup.scss
new file mode 100644
index 0000000000..c6866f6b45
--- /dev/null
+++ b/src/styles/startup.scss
@@ -0,0 +1,8 @@
+.ds-full-screen-loader {
+  height: 100vh;
+  text-align: center;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}

From 899b30213e748422dcd2836535c5baba14809219 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 27 May 2021 13:26:40 +0200
Subject: [PATCH 033/169] show full screen loader when switching themes

---
 src/app/app.component.html            |  4 ++-
 src/app/app.component.ts              | 39 +++++++++++++++++++--------
 src/app/root/root.component.html      |  8 +++---
 src/app/root/root.component.spec.ts   |  2 ++
 src/app/root/root.component.ts        |  8 +++---
 src/app/root/themed-root.component.ts |  6 ++---
 6 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/app/app.component.html b/src/app/app.component.html
index a40e5ea163..fb9983a6ef 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1 +1,3 @@
-<ds-themed-root [isNotAuthBlocking]="isNotAuthBlocking$ | async" [isLoading]="isLoading$ | async"></ds-themed-root>
+<ds-themed-root
+  [shouldShowFullscreenLoader]="(isAuthBlocking$ | async) || (isThemeLoading$ | async)"
+  [shouldShowRouteLoader]="isRouteLoading$ | async"></ds-themed-root>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index a596ba56cd..c9996f275a 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { delay, map, distinctUntilChanged, filter, take } from 'rxjs/operators';
+import { delay, distinctUntilChanged, filter, take } from 'rxjs/operators';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -7,6 +7,7 @@ import {
   Inject,
   OnInit,
   Optional,
+  PLATFORM_ID,
 } from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router';
 
@@ -32,7 +33,7 @@ import { LocaleService } from './core/locale/locale.service';
 import { hasValue, isNotEmpty } from './shared/empty.util';
 import { KlaroService } from './shared/cookies/klaro.service';
 import { GoogleAnalyticsService } from './statistics/google-analytics.service';
-import { DOCUMENT } from '@angular/common';
+import { DOCUMENT, isPlatformBrowser } from '@angular/common';
 import { ThemeService } from './shared/theme-support/theme.service';
 import { BASE_THEME_NAME } from './shared/theme-support/theme.constants';
 import { DEFAULT_THEME_CONFIG } from './shared/theme-support/theme.effects';
@@ -45,7 +46,6 @@ import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppComponent implements OnInit, AfterViewInit {
-  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(true);
   sidebarVisible: Observable<boolean>;
   slideSidebarOver: Observable<boolean>;
   collapsedSidebarWidth: Observable<string>;
@@ -57,11 +57,23 @@ export class AppComponent implements OnInit, AfterViewInit {
   /**
    * Whether or not the authentication is currently blocking the UI
    */
-  isNotAuthBlocking$: Observable<boolean>;
+  isAuthBlocking$: Observable<boolean>;
+
+  /**
+   * Whether or not the app is in the process of rerouting
+   */
+  isRouteLoading$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * Whether or not the theme is in the process of being swapped
+   */
+  isThemeLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
 
   constructor(
     @Inject(NativeWindowService) private _window: NativeWindowRef,
-      @Inject(DOCUMENT) private document: any,
+    @Inject(DOCUMENT) private document: any,
+    @Inject(PLATFORM_ID) private platformId: any,
     private themeService: ThemeService,
     private translate: TranslateService,
     private store: Store<HostWindowState>,
@@ -83,6 +95,10 @@ export class AppComponent implements OnInit, AfterViewInit {
     this.models = models;
 
     this.themeService.getThemeName$().subscribe((themeName: string) => {
+      if (isPlatformBrowser(this.platformId)) {
+        // the theme css will never download server side, so this should only happen on the browser
+        this.isThemeLoading$.next(true);
+      }
       if (hasValue(themeName)) {
         this.setThemeCss(themeName);
       } else if (hasValue(DEFAULT_THEME_CONFIG)) {
@@ -118,13 +134,12 @@ export class AppComponent implements OnInit, AfterViewInit {
   }
 
   ngOnInit() {
-    this.isNotAuthBlocking$ = this.store.pipe(select(isAuthenticationBlocking)).pipe(
-      map((isBlocking: boolean) => isBlocking === false),
+    this.isAuthBlocking$ = this.store.pipe(select(isAuthenticationBlocking)).pipe(
       distinctUntilChanged()
     );
-    this.isNotAuthBlocking$
+    this.isAuthBlocking$
       .pipe(
-        filter((notBlocking: boolean) => notBlocking),
+        filter((isBlocking: boolean) => isBlocking === false),
         take(1)
       ).subscribe(() => this.initializeKlaro());
 
@@ -156,12 +171,12 @@ export class AppComponent implements OnInit, AfterViewInit {
       delay(0)
     ).subscribe((event) => {
       if (event instanceof NavigationStart) {
-        this.isLoading$.next(true);
+        this.isRouteLoading$.next(true);
       } else if (
         event instanceof NavigationEnd ||
         event instanceof NavigationCancel
       ) {
-        this.isLoading$.next(false);
+        this.isRouteLoading$.next(false);
       }
     });
   }
@@ -209,6 +224,8 @@ export class AppComponent implements OnInit, AfterViewInit {
           }
         });
       }
+      // the fact that this callback is used, proves we're on the browser.
+      this.isThemeLoading$.next(false);
     };
     head.appendChild(link);
   }
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 4768fb737c..8b84fabf14 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,4 +1,4 @@
-<div class="outer-wrapper" *ngIf="isNotAuthBlocking; else authLoader">
+<div class="outer-wrapper" *ngIf="!shouldShowFullscreenLoader; else fullScreenLoader">
   <ds-admin-sidebar></ds-admin-sidebar>
   <div class="inner-wrapper"  [@slideSidebarPadding]="{
      value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
@@ -12,10 +12,10 @@
     <main class="main-content">
       <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
 
-      <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="isLoading">
+      <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="shouldShowRouteLoader">
         <ds-loading [showMessage]="false"></ds-loading>
       </div>
-      <div [class.d-none]="isLoading">
+      <div [class.d-none]="shouldShowRouteLoader">
         <router-outlet></router-outlet>
       </div>
     </main>
@@ -23,7 +23,7 @@
     <ds-themed-footer></ds-themed-footer>
   </div>
 </div>
-<ng-template #authLoader>
+<ng-template #fullScreenLoader>
   <div class="ds-full-screen-loader">
     <ds-loading [showMessage]="false"></ds-loading>
   </div>
diff --git a/src/app/root/root.component.spec.ts b/src/app/root/root.component.spec.ts
index c945a35764..81b22592d6 100644
--- a/src/app/root/root.component.spec.ts
+++ b/src/app/root/root.component.spec.ts
@@ -27,6 +27,7 @@ import { provideMockStore } from '@ngrx/store/testing';
 import { RouteService } from '../core/services/route.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('RootComponent', () => {
   let component: RootComponent;
@@ -36,6 +37,7 @@ describe('RootComponent', () => {
     await TestBed.configureTestingModule({
       imports: [
         CommonModule,
+        NoopAnimationsModule,
         StoreModule.forRoot(authReducer, storeModuleConfig),
         TranslateModule.forRoot({
           loader: {
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index f9c475a8fa..576a0152be 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -38,14 +38,14 @@ export class RootComponent implements OnInit {
   models;
 
   /**
-   * Whether or not the authentication is currently blocking the UI
+   * Whether or not to show a full screen loader
    */
-  @Input() isNotAuthBlocking: boolean;
+  @Input() shouldShowFullscreenLoader: boolean;
 
   /**
-   * Whether or not the the application is loading;
+   * Whether or not to show a loader across the router outlet
    */
-  @Input() isLoading: boolean;
+  @Input() shouldShowRouteLoader: boolean;
 
   constructor(
     @Inject(NativeWindowService) private _window: NativeWindowRef,
diff --git a/src/app/root/themed-root.component.ts b/src/app/root/themed-root.component.ts
index 43aacc416f..5dfa1edf31 100644
--- a/src/app/root/themed-root.component.ts
+++ b/src/app/root/themed-root.component.ts
@@ -11,14 +11,14 @@ export class ThemedRootComponent extends ThemedComponent<RootComponent> {
   /**
    * Whether or not the authentication is currently blocking the UI
    */
-  @Input() isNotAuthBlocking: boolean;
+  @Input() shouldShowFullscreenLoader: boolean;
 
   /**
    * Whether or not the the application is loading;
    */
-  @Input() isLoading: boolean;
+  @Input() shouldShowRouteLoader: boolean;
 
-  protected inAndOutputNames: (keyof RootComponent & keyof this)[] = ['isLoading', 'isNotAuthBlocking'];
+  protected inAndOutputNames: (keyof RootComponent & keyof this)[] = ['shouldShowRouteLoader', 'shouldShowFullscreenLoader'];
 
   protected getComponentName(): string {
     return 'RootComponent';

From c717fc5ec815d0b29b244781b1efcf2e5b0ac0b7 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 15:51:54 +0200
Subject: [PATCH 034/169] 79597: Fix thumbnails ~ item page direct request

---
 .../metadata-field-wrapper.component.html     |  2 +-
 .../publication/publication.component.html    |  2 +-
 .../item-types/shared/item.component.ts       | 21 ++++++----
 .../untyped-item/untyped-item.component.html  |  2 +-
 .../journal-issue.component.html              |  2 +-
 .../journal-volume.component.html             |  2 +-
 .../item-pages/journal/journal.component.html |  2 +-
 ...-search-result-grid-element.component.html |  2 +-
 .../org-unit/org-unit.component.html          |  2 +-
 .../item-pages/person/person.component.html   |  2 +-
 .../item-pages/project/project.component.html |  2 +-
 src/app/thumbnail/thumbnail.component.html    | 18 ++++----
 src/app/thumbnail/thumbnail.component.ts      | 41 ++++++++++++++-----
 13 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
index c791cec600..a41aa0d67a 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,4 +1,4 @@
-<div class="simple-view-element" [class.d-none]="content.textContent.trim().length === 0 && hasNoValue(content.querySelector('img'))">
+<div class="simple-view-element" [class.d-none]="content.textContent.trim().length === 0 && hasNoValue(content.querySelector('img,.thumbnail-content'))">
   <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
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 73219cbb8f..0758f7cda4 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
@@ -10,7 +10,7 @@
   <div class="col-xs-12 col-md-4">
     <ng-container *ngIf="!mediaViewer.image">
       <ds-metadata-field-wrapper>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+        <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
     <ng-container *ngIf="mediaViewer.image">
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 120eda930f..8763d8c899 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -4,8 +4,10 @@ import { environment } from '../../../../../environments/environment';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { getFirstSucceededRemoteDataPayload, takeUntilCompletedRemoteData } from '../../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { RemoteData } from '../../../../core/data/remote-data';
 
 @Component({
   selector: 'ds-item',
@@ -17,6 +19,11 @@ import { getItemPageRoute } from '../../../item-page-routing-paths';
 export class ItemComponent implements OnInit {
   @Input() object: Item;
 
+  /**
+   * The Item's thumbnail
+   */
+  thumbnail$: BehaviorSubject<RemoteData<Bitstream>>;
+
   /**
    * Route to the item page
    */
@@ -28,12 +35,12 @@ export class ItemComponent implements OnInit {
 
   ngOnInit(): void {
     this.itemPageRoute = getItemPageRoute(this.object);
-  }
 
-  // TODO refactor to return RemoteData, and thumbnail template to deal with loading
-  getThumbnail(): Observable<Bitstream> {
-    return this.bitstreamDataService.getThumbnailFor(this.object).pipe(
-      getFirstSucceededRemoteDataPayload()
-    );
+    this.thumbnail$ = new BehaviorSubject<RemoteData<Bitstream>>(undefined);
+    this.bitstreamDataService.getThumbnailFor(this.object).pipe(
+      takeUntilCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<Bitstream>) => {
+      this.thumbnail$.next(rd);
+    });
   }
 }
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 8d46a2c5a9..3e20da3094 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -10,7 +10,7 @@
   <div class="col-xs-12 col-md-4">
     <ng-container *ngIf="!mediaViewer.image">
       <ds-metadata-field-wrapper>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+        <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
     <ng-container *ngIf="mediaViewer.image">
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 5749c5797d..af87daa243 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['publicationvolume.volumeNumber']"
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 2c2a4995c2..915967f41b 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['publicationvolume.volumeNumber']"
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 49fdc935c5..8dd961692d 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field class="item-page-fields" [item]="object"
       [fields]="['creativeworkseries.issn']"
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 8281eb0e04..23de8b134f 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -8,7 +8,7 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async">
+        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
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 14d56d4104..67b79163ed 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async"
+      <ds-thumbnail [thumbnail]="thumbnail$ | async"
                     [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                     [alt]="'thumbnail.orgunit.alt'"
                     [placeholder]="'thumbnail.orgunit.placeholder'"
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 2a7c9bd023..21d833e407 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
-      <ds-thumbnail [thumbnail]="getThumbnail() | async"
+      <ds-thumbnail [thumbnail]="thumbnail$ | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
                     [placeholder]="'thumbnail.person.placeholder'">
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 0590c8bfe4..facecb4996 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
@@ -10,7 +10,7 @@
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper>
       <ds-thumbnail
-        [thumbnail]="getThumbnail() | async"
+        [thumbnail]="thumbnail$ | async"
         [defaultImage]="'assets/images/project-placeholder.svg'"
         [alt]="'thumbnail.project.alt'"
         [placeholder]="'thumbnail.project.placeholder'">
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index 645bce9b80..593c1c10b8 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,10 +1,14 @@
 <div [ngClass]="{ 'thumbnail': true, 'limit-width': limitWidth }">
-  <img *ngIf="src !== null" class="thumbnail-content img-fluid"
-       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()"/>
-  <div *ngIf="src === null" class="thumbnail-content outer">
-    <div class="inner">
-      <div class="thumbnail-placeholder w-100 h-100 p-3 lead">{{ placeholder | translate }}</div>
+  <ds-loading *ngIf="isLoading; else showThumbnail" class="thumbnail-content" [showMessage]="false">
+    text-content
+  </ds-loading>
+  <ng-template #showThumbnail>
+    <img *ngIf="src !== null" class="thumbnail-content img-fluid"
+         [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()">
+    <div *ngIf="src === null" class="thumbnail-content outer">
+      <div class="inner">
+        <div class="thumbnail-placeholder w-100 h-100 p-3 lead">{{ placeholder | translate }}</div>
+      </div>
     </div>
-  </div>
+  </ng-template>
 </div>
-
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 30911644f7..ec1e7eb368 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,6 +1,8 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnChanges } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasValue } from '../shared/empty.util';
+import { RemoteData } from '../core/data/remote-data';
+import { BITSTREAM } from '../core/shared/bitstream.resource-type';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
@@ -12,11 +14,11 @@ import { hasValue } from '../shared/empty.util';
   styleUrls: ['./thumbnail.component.scss'],
   templateUrl: './thumbnail.component.html',
 })
-export class ThumbnailComponent implements OnInit {
+export class ThumbnailComponent implements OnChanges {
   /**
    * The thumbnail Bitstream
    */
-  @Input() thumbnail: Bitstream;
+  @Input() thumbnail: Bitstream | RemoteData<Bitstream>;
 
   /**
    * The default image, used if the thumbnail isn't set or can't be downloaded.
@@ -27,7 +29,7 @@ export class ThumbnailComponent implements OnInit {
   /**
    * The src attribute used in the template to render the image.
    */
-  src: string;
+  src: string = null;
 
   /**
    * i18n key of thumbnail alt text
@@ -44,18 +46,37 @@ export class ThumbnailComponent implements OnInit {
    */
   @Input() limitWidth? = true;
 
+  isLoading: boolean;
+
   /**
-   * Initialize the thumbnail.
+   * Resolve the thumbnail.
    * Use a default image if no actual image is available.
    */
-  ngOnInit(): void {
-    if (hasValue(this.thumbnail) && hasValue(this.thumbnail._links)
-                                 && hasValue(this.thumbnail._links.content)
-                                 && this.thumbnail._links.content.href) {
-      this.src = this.thumbnail._links.content.href;
+  ngOnChanges(): void {
+    if (this.thumbnail === undefined || this.thumbnail === null) {
+      return;
+    }
+    if (this.thumbnail instanceof Bitstream) {
+      this.resolveThumbnail(this.thumbnail as Bitstream)
+    } else {
+      const thumbnailRD = this.thumbnail as RemoteData<Bitstream>;
+      if (thumbnailRD.isLoading) {
+        this.isLoading = true;
+      } else {
+        this.resolveThumbnail(thumbnailRD.payload as Bitstream);
+      }
+    }
+  }
+
+  private resolveThumbnail(thumbnail: Bitstream): void {
+    if (hasValue(thumbnail) && hasValue(thumbnail._links)
+                            && hasValue(thumbnail._links.content)
+                            && thumbnail._links.content.href) {
+      this.src = thumbnail._links.content.href;
     } else {
       this.src = this.defaultImage;
     }
+    this.isLoading = false;
   }
 
   /**

From bcfb890e1aa1dae27e87fd57afc1cd6232532f0e Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 16:34:52 +0200
Subject: [PATCH 035/169] 79597: Update unit tests

---
 src/app/thumbnail/thumbnail.component.html    |   2 +-
 src/app/thumbnail/thumbnail.component.spec.ts | 125 +++++++++++++-----
 2 files changed, 96 insertions(+), 31 deletions(-)

diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index 593c1c10b8..a7f4c51510 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,4 @@
-<div [ngClass]="{ 'thumbnail': true, 'limit-width': limitWidth }">
+<div class="thumbnail" [class.limitWidth]="limitWidth">
   <ds-loading *ngIf="isLoading; else showThumbnail" class="thumbnail-content" [showMessage]="false">
     text-content
   </ds-loading>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 82eadc04de..bc9d159750 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -5,6 +5,10 @@ import { Bitstream } from '../core/shared/bitstream.model';
 import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
 
 import { ThumbnailComponent } from './thumbnail.component';
+import { RemoteData } from '../core/data/remote-data';
+import {
+  createFailedRemoteDataObject, createPendingRemoteDataObject, createSuccessfulRemoteDataObject,
+} from '../shared/remote-data.utils';
 
 // tslint:disable-next-line:pipe-prefix
 @Pipe({ name: 'translate' })
@@ -28,40 +32,12 @@ describe('ThumbnailComponent', () => {
 
   beforeEach(() => {
     fixture = TestBed.createComponent(ThumbnailComponent);
-    comp = fixture.componentInstance; // BannerComponent test instance
+    comp = fixture.componentInstance; // ThumbnailComponent test instance
     de = fixture.debugElement.query(By.css('div.thumbnail'));
     el = de.nativeElement;
   });
 
-  describe('when the thumbnail exists', () => {
-    it('should display an image', () => {
-      const thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: 'content.url' },
-      };
-      comp.thumbnail = thumbnail;
-      fixture.detectChanges();
-      const image: HTMLElement = de.query(By.css('img')).nativeElement;
-      expect(image.getAttribute('src')).toBe(comp.thumbnail._links.content.href);
-    });
-    it('should include the alt text', () => {
-      const thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: 'content.url' },
-      };
-      comp.thumbnail = thumbnail;
-      fixture.detectChanges();
-      const image: HTMLElement = de.query(By.css('img')).nativeElement;
-      expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-    });
-  });
-  describe(`when the thumbnail doesn't exist`, () => {
+  const withoutThumbnail = () => {
     describe('and there is a default image', () => {
       it('should display the default image', () => {
         comp.src = 'http://bit.stream';
@@ -73,6 +49,7 @@ describe('ThumbnailComponent', () => {
         comp.src = 'http://bit.stream';
         comp.defaultImage = 'http://default.img';
         comp.errorHandler();
+        comp.ngOnChanges();
         fixture.detectChanges();
         const image: HTMLElement = de.query(By.css('img')).nativeElement;
         expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
@@ -84,10 +61,98 @@ describe('ThumbnailComponent', () => {
         comp.errorHandler();
         expect(comp.src).toBe(null);
 
+        comp.ngOnChanges();
         fixture.detectChanges();
         const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
         expect(placeholder.innerHTML).toBe('TRANSLATED ' + comp.placeholder);
       });
     });
+  };
+
+  describe('with thumbnail as Bitstream', () => {
+    let thumbnail: Bitstream;
+    beforeEach(() => {
+      thumbnail = new Bitstream();
+      thumbnail._links = {
+        self: { href: 'self.url' },
+        bundle: { href: 'bundle.url' },
+        format: { href: 'format.url' },
+        content: { href: 'content.url' },
+      };
+    });
+
+    it('should display an image', () => {
+      comp.thumbnail = thumbnail;
+      comp.ngOnChanges();
+      fixture.detectChanges();
+      const image: HTMLElement = de.query(By.css('img')).nativeElement;
+      expect(image.getAttribute('src')).toBe(comp.thumbnail._links.content.href);
+    });
+
+    it('should include the alt text', () => {
+      comp.thumbnail = thumbnail;
+      comp.ngOnChanges();
+      fixture.detectChanges();
+      const image: HTMLElement = de.query(By.css('img')).nativeElement;
+      expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+    });
+
+    describe('when there is no thumbnail', () => {
+      withoutThumbnail();
+    });
+  });
+
+  describe('with thumbnail as RemoteData<Bitstream>', () => {
+    let thumbnail: RemoteData<Bitstream>;
+
+    describe('while loading', () => {
+      beforeEach(() => {
+        thumbnail = createPendingRemoteDataObject();
+      });
+
+      it('should show a loading animation', () => {
+        comp.thumbnail = thumbnail;
+        comp.ngOnChanges();
+        fixture.detectChanges();
+        expect(de.query(By.css('ds-loading'))).toBeTruthy();
+      });
+    });
+
+    describe('when there is a thumbnail', () => {
+      beforeEach(() => {
+        const bitstream = new Bitstream();
+        bitstream._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: 'content.url' },
+        };
+        thumbnail = createSuccessfulRemoteDataObject(bitstream);
+      });
+
+      it('should display an image', () => {
+        comp.thumbnail = thumbnail;
+        comp.ngOnChanges();
+        fixture.detectChanges();
+        const image: HTMLElement = de.query(By.css('img')).nativeElement;
+        expect(image.getAttribute('src')).toBe(comp.thumbnail.payload._links.content.href);
+      });
+
+      it('should display the alt text', () => {
+        comp.thumbnail = thumbnail;
+        comp.ngOnChanges();
+        fixture.detectChanges();
+        const image: HTMLElement = de.query(By.css('img')).nativeElement;
+        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+      });
+    });
+
+    describe('when there is no thumbnail', () => {
+      beforeEach(() => {
+        thumbnail = createFailedRemoteDataObject();
+      });
+
+      withoutThumbnail();
+    });
   });
 });

From 120ecc6988cec452ab5c897155b712c368ed88df Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 17:09:57 +0200
Subject: [PATCH 036/169] 79597: Fix ds-metadata-field-wrapper for thumbnails

---
 .../metadata-field-wrapper.component.html                  | 2 +-
 .../metadata-field-wrapper.component.ts                    | 7 +------
 .../item-types/publication/publication.component.html      | 2 +-
 .../item-types/untyped-item/untyped-item.component.html    | 2 +-
 .../item-pages/journal-issue/journal-issue.component.html  | 2 +-
 .../journal-volume/journal-volume.component.html           | 2 +-
 .../item-pages/journal/journal.component.html              | 2 +-
 .../item-pages/org-unit/org-unit.component.html            | 2 +-
 .../item-pages/person/person.component.html                | 2 +-
 .../item-pages/project/project.component.html              | 2 +-
 .../item-detail-preview/item-detail-preview.component.html | 2 +-
 src/app/thumbnail/thumbnail.component.html                 | 2 +-
 src/app/thumbnail/thumbnail.component.ts                   | 3 +--
 13 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
index a41aa0d67a..d69f87883b 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,4 +1,4 @@
-<div class="simple-view-element" [class.d-none]="content.textContent.trim().length === 0 && hasNoValue(content.querySelector('img,.thumbnail-content'))">
+<div class="simple-view-element" [class.d-none]="hideIfNoTextContent && content.textContent.trim().length === 0">
   <h5 class="simple-view-element-header" *ngIf="label">{{ label }}</h5>
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
index 8af108cceb..8c4e200423 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -17,10 +17,5 @@ export class MetadataFieldWrapperComponent {
    */
   @Input() label: string;
 
-  /**
-   * Make hasNoValue() available in the template
-   */
-  hasNoValue(o: any): boolean {
-    return hasNoValue(o);
-  }
+  @Input() hideIfNoTextContent = true;
 }
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 0758f7cda4..57b460c814 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ng-container *ngIf="!mediaViewer.image">
-      <ds-metadata-field-wrapper>
+      <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index 3e20da3094..7ae9a1a909 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ng-container *ngIf="!mediaViewer.image">
-      <ds-metadata-field-wrapper>
+      <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
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 af87daa243..8e357140d8 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
@@ -8,7 +8,7 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ds-metadata-field-wrapper>
+    <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
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 915967f41b..7b80739bb8 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
@@ -8,7 +8,7 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ds-metadata-field-wrapper>
+    <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
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 8dd961692d..bcbd1d7c47 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
@@ -8,7 +8,7 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ds-metadata-field-wrapper>
+    <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field class="item-page-fields" [item]="object"
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 67b79163ed..d328e93b15 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
@@ -8,7 +8,7 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ds-metadata-field-wrapper>
+    <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="thumbnail$ | async"
                     [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                     [alt]="'thumbnail.orgunit.alt'"
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 21d833e407..291813ff88 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
@@ -8,7 +8,7 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ds-metadata-field-wrapper>
+    <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="thumbnail$ | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
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 facecb4996..a3324e4736 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
@@ -8,7 +8,7 @@
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ds-metadata-field-wrapper>
+    <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail
         [thumbnail]="thumbnail$ | async"
         [defaultImage]="'assets/images/project-placeholder.svg'"
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index cbc3f9ccfb..e4d2526eb2 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -9,7 +9,7 @@
     </h2>
     <div class="row mb-1">
       <div class="col-xs-12 col-md-4">
-        <ds-metadata-field-wrapper>
+        <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
           <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
         </ds-metadata-field-wrapper>
         <ng-container *ngVar="(getFiles() | async) as bitstreams">
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index a7f4c51510..bf70928392 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,4 +1,4 @@
-<div class="thumbnail" [class.limitWidth]="limitWidth">
+<div class="thumbnail" [class.limit-width]="limitWidth">
   <ds-loading *ngIf="isLoading; else showThumbnail" class="thumbnail-content" [showMessage]="false">
     text-content
   </ds-loading>
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index ec1e7eb368..3e122cde78 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -2,7 +2,6 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { hasValue } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
-import { BITSTREAM } from '../core/shared/bitstream.resource-type';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
@@ -57,7 +56,7 @@ export class ThumbnailComponent implements OnChanges {
       return;
     }
     if (this.thumbnail instanceof Bitstream) {
-      this.resolveThumbnail(this.thumbnail as Bitstream)
+      this.resolveThumbnail(this.thumbnail as Bitstream);
     } else {
       const thumbnailRD = this.thumbnail as RemoteData<Bitstream>;
       if (thumbnailRD.isLoading) {

From 4b238e18423f97583e3454e3a0947395e6fcdc18 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 27 May 2021 18:03:43 +0200
Subject: [PATCH 037/169] 79597: Update ds-metadata-field-wrapper unit tests

---
 .../metadata-field-wrapper.component.spec.ts  | 109 +++++++++++-------
 1 file changed, 65 insertions(+), 44 deletions(-)

diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
index 9c62b80cad..e17e5397b7 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.component';
@@ -6,35 +6,34 @@ import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.componen
 /* tslint:disable:max-classes-per-file */
 @Component({
     selector: 'ds-component-without-content',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
+    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '</ds-metadata-field-wrapper>'
 })
-class NoContentComponent {}
+class NoContentComponent {
+  public hideIfNoTextContent = true;
+}
 
 @Component({
     selector: 'ds-component-with-empty-spans',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
+    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '    <span></span>\n' +
       '    <span></span>\n' +
       '</ds-metadata-field-wrapper>'
 })
-class SpanContentComponent {}
+class SpanContentComponent {
+  @Input() hideIfNoTextContent = true;
+}
 
 @Component({
     selector: 'ds-component-with-text',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
+    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '    <span>The quick brown fox jumps over the lazy dog</span>\n' +
       '</ds-metadata-field-wrapper>'
 })
-class TextContentComponent {}
+class TextContentComponent {
+  @Input() hideIfNoTextContent = true;
+}
 
-@Component({
-    selector: 'ds-component-with-image',
-    template: '<ds-metadata-field-wrapper [label]="\'test label\'">\n' +
-      '    <img src="https://some/image.png" alt="an alt text">\n' +
-      '</ds-metadata-field-wrapper>'
-})
-class ImgContentComponent {}
 /* tslint:enable:max-classes-per-file */
 
 describe('MetadataFieldWrapperComponent', () => {
@@ -43,7 +42,7 @@ describe('MetadataFieldWrapperComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent, ImgContentComponent]
+      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent]
     }).compileComponents();
   }));
 
@@ -58,38 +57,60 @@ describe('MetadataFieldWrapperComponent', () => {
     expect(component).toBeDefined();
   });
 
-  it('should not show the component when there is no content', () => {
-    const parentFixture = TestBed.createComponent(NoContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+  describe('with hideIfNoTextContent=true', () => {
+    it('should not show the component when there is no content', () => {
+      const parentFixture = TestBed.createComponent(NoContentComponent);
+      parentFixture.detectChanges();
+      const parentNative = parentFixture.nativeElement;
+      const nativeWrapper = parentNative.querySelector(wrapperSelector);
+      expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+    });
+
+    it('should not show the component when there is no text content', () => {
+      const parentFixture = TestBed.createComponent(SpanContentComponent);
+      parentFixture.detectChanges();
+      const parentNative = parentFixture.nativeElement;
+      const nativeWrapper = parentNative.querySelector(wrapperSelector);
+      expect(nativeWrapper.classList.contains('d-none')).toBe(true);
+    });
+
+    it('should show the component when there is text content', () => {
+      const parentFixture = TestBed.createComponent(TextContentComponent);
+      parentFixture.detectChanges();
+      const parentNative = parentFixture.nativeElement;
+      const nativeWrapper = parentNative.querySelector(wrapperSelector);
+      parentFixture.detectChanges();
+      expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+    });
   });
 
-  it('should not show the component when there is DOM content but not text or an image', () => {
-    const parentFixture = TestBed.createComponent(SpanContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    expect(nativeWrapper.classList.contains('d-none')).toBe(true);
-  });
+  describe('with hideIfNoTextContent=false', () => {
+    it('should show the component when there is no content', () => {
+      const parentFixture = TestBed.createComponent(NoContentComponent);
+      parentFixture.componentInstance.hideIfNoTextContent = false;
+      parentFixture.detectChanges();
+      const parentNative = parentFixture.nativeElement;
+      const nativeWrapper = parentNative.querySelector(wrapperSelector);
+      expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+    });
 
-  it('should show the component when there is text content', () => {
-    const parentFixture = TestBed.createComponent(TextContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    parentFixture.detectChanges();
-    expect(nativeWrapper.classList.contains('d-none')).toBe(false);
-  });
+    it('should show the component when there is no text content', () => {
+      const parentFixture = TestBed.createComponent(SpanContentComponent);
+      parentFixture.componentInstance.hideIfNoTextContent = false;
+      parentFixture.detectChanges();
+      const parentNative = parentFixture.nativeElement;
+      const nativeWrapper = parentNative.querySelector(wrapperSelector);
+      expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+    });
 
-  it('should show the component when there is img content', () => {
-    const parentFixture = TestBed.createComponent(ImgContentComponent);
-    parentFixture.detectChanges();
-    const parentNative = parentFixture.nativeElement;
-    const nativeWrapper = parentNative.querySelector(wrapperSelector);
-    parentFixture.detectChanges();
-    expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+    it('should show the component when there is text content', () => {
+      const parentFixture = TestBed.createComponent(TextContentComponent);
+      parentFixture.componentInstance.hideIfNoTextContent = false;
+      parentFixture.detectChanges();
+      const parentNative = parentFixture.nativeElement;
+      const nativeWrapper = parentNative.querySelector(wrapperSelector);
+      parentFixture.detectChanges();
+      expect(nativeWrapper.classList.contains('d-none')).toBe(false);
+    });
   });
-
 });

From bcfecc53a150911d6780f4787cc6d3c88134c87b Mon Sep 17 00:00:00 2001
From: Samuel <samuelcambien@gmail.com>
Date: Fri, 28 May 2021 11:41:55 +0200
Subject: [PATCH 038/169] add support for multiple metadata fields to the
 MetadataRepresentationListComponent - fix bug when unauthorized for related
 item

---
 ...data-representation-list.component.spec.ts | 54 +++++++++++++++----
 .../metadata-representation-list.component.ts |  6 ++-
 2 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
index e1c934246c..6023aa7b6d 100644
--- a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
+++ b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
@@ -5,7 +5,7 @@ import { MetadataRepresentationListComponent } from './metadata-representation-l
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { Item } from '../../../core/shared/item.model';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
@@ -35,6 +35,12 @@ const parentItem: Item = Object.assign(new Item(), {
         authority: 'virtual::related-creator',
         place: 3,
       },
+      {
+        language: null,
+        value: 'Related Creator with authority - unauthorized',
+        authority: 'virtual::related-creator-unauthorized',
+        place: 4,
+      },
     ],
     'dc.title': [
       {
@@ -55,21 +61,49 @@ const relatedAuthor: Item = Object.assign(new Item(), {
     ]
   }
 });
-const relation: Relationship = Object.assign(new Relationship(), {
+const relatedCreator: Item = Object.assign(new Item(), {
+  id: 'related-creator',
+  metadata: {
+    'dc.title': [
+      {
+        language: null,
+        value: 'Related Creator'
+      }
+    ],
+    'dspace.entity.type': 'Person',
+  }
+});
+const authorRelation: Relationship = Object.assign(new Relationship(), {
   leftItem: createSuccessfulRemoteDataObject$(parentItem),
   rightItem: createSuccessfulRemoteDataObject$(relatedAuthor)
 });
-let relationshipService: RelationshipService;
+const creatorRelation: Relationship = Object.assign(new Relationship(), {
+  leftItem: createSuccessfulRemoteDataObject$(parentItem),
+  rightItem: createSuccessfulRemoteDataObject$(relatedCreator),
+});
+const creatorRelationUnauthorized: Relationship = Object.assign(new Relationship(), {
+  leftItem: createSuccessfulRemoteDataObject$(parentItem),
+  rightItem: createFailedRemoteDataObject$('Unauthorized', 401),
+});
+let relationshipService;
 
 describe('MetadataRepresentationListComponent', () => {
   let comp: MetadataRepresentationListComponent;
   let fixture: ComponentFixture<MetadataRepresentationListComponent>;
 
-  relationshipService = jasmine.createSpyObj('relationshipService',
-    {
-      findById: createSuccessfulRemoteDataObject$(relation)
-    }
-  );
+  relationshipService = {
+    findById: (id: string) => {
+      if (id === 'related-author') {
+        return createSuccessfulRemoteDataObject$(authorRelation);
+      }
+      if (id === 'related-creator') {
+        return createSuccessfulRemoteDataObject$(creatorRelation);
+      }
+      if (id === 'related-creator-unauthorized') {
+        return createSuccessfulRemoteDataObject$(creatorRelationUnauthorized);
+      }
+    },
+  };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -93,9 +127,9 @@ describe('MetadataRepresentationListComponent', () => {
     fixture.detectChanges();
   }));
 
-  it('should load 3 ds-metadata-representation-loader components', () => {
+  it('should load 4 ds-metadata-representation-loader components', () => {
     const fields = fixture.debugElement.queryAll(By.css('ds-metadata-representation-loader'));
-    expect(fields.length).toBe(3);
+    expect(fields.length).toBe(4);
   });
 
   it('should contain one page of items', () => {
diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index e5301dabc0..620c63ed62 100644
--- a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -91,9 +91,11 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
               getFirstSucceededRemoteData(),
               switchMap((relRD: RemoteData<Relationship>) =>
                 observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
-                  filter(([leftItem, rightItem]) => leftItem.hasSucceeded && rightItem.hasSucceeded),
+                  filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
                   map(([leftItem, rightItem]) => {
-                    if (leftItem.payload.id === this.parentItem.id) {
+                    if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
+                      return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum));
+                    } else if (rightItem.hasSucceeded && leftItem.payload.id === this.parentItem.id) {
                       return rightItem.payload;
                     } else if (rightItem.payload.id === this.parentItem.id) {
                       return leftItem.payload;

From 4ad089ef5407fadd98dc56906d0c092e7202b85e Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Fri, 28 May 2021 15:40:20 +0200
Subject: [PATCH 039/169] 79698: Escape browse by author data requests

---
 src/app/core/browse/browse.service.spec.ts | 5 +++--
 src/app/core/browse/browse.service.ts      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index 89875b3069..a28add2e30 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -127,7 +127,8 @@ describe('BrowseService', () => {
   });
 
   describe('getBrowseEntriesFor and findList', () => {
-    const mockAuthorName = 'Donald Smith';
+    // should contain special characters such that url encoding can be tested as well
+    const mockAuthorName = 'Donald Smith & Sons';
 
     beforeEach(() => {
       requestService = getMockRequestService(getRequestEntry$(true));
@@ -152,7 +153,7 @@ describe('BrowseService', () => {
 
     describe('when findList is called with a valid browse definition id', () => {
       it('should call hrefOnlyDataService.findAllByHref with the expected href', () => {
-        const expected = browseDefinitions[1]._links.items.href + '?filterValue=' + mockAuthorName;
+        const expected = browseDefinitions[1]._links.items.href + '?filterValue=' + encodeURIComponent(mockAuthorName);
 
         scheduler.schedule(() => service.getBrowseItemsFor(mockAuthorName, new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 7e55d381a6..ffc6f313b9 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -130,7 +130,7 @@ export class BrowseService {
           args.push(`startsWith=${options.startsWith}`);
         }
         if (isNotEmpty(filterValue)) {
-          args.push(`filterValue=${filterValue}`);
+          args.push(`filterValue=${encodeURIComponent(filterValue)}`);
         }
         if (isNotEmpty(args)) {
           href = new URLCombiner(href, `?${args.join('&')}`).toString();

From 95b98d3f7960776645eff3da8df00a0349a32a94 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 31 May 2021 10:20:28 +0200
Subject: [PATCH 040/169] 79597: Remove unused imports

---
 .../metadata-field-wrapper/metadata-field-wrapper.component.ts | 1 -
 src/app/+item-page/simple/item-types/shared/item.component.ts  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
index 8c4e200423..5c6b99248f 100644
--- a/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/+item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,5 +1,4 @@
 import { Component, Input } from '@angular/core';
-import { hasNoValue } from '../../../shared/empty.util';
 
 /**
  * This component renders any content inside this wrapper.
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 8763d8c899..130f67edc7 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -1,10 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
 import { environment } from '../../../../../environments/environment';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteDataPayload, takeUntilCompletedRemoteData } from '../../../../core/shared/operators';
+import { takeUntilCompletedRemoteData } from '../../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { RemoteData } from '../../../../core/data/remote-data';

From 2dfed863edcb84d7b58066a97daf48e0457d4252 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 28 May 2021 18:49:47 +0200
Subject: [PATCH 041/169] [DSC-75] Fix issue while deleting multiple qualdrop
 value

---
 src/app/shared/form/form.component.ts                    | 9 ++++++++-
 .../sections/form/section-form-operations.service.ts     | 9 +++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index 42469ddba2..8d75d7f13a 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -309,9 +309,16 @@ export class FormComponent implements OnDestroy, OnInit {
   removeItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
     const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as FormArray;
     const event = this.getEvent($event, arrayContext, index, 'remove');
+    if (this.formBuilderService.isQualdropGroup(event.model as DynamicFormControlModel)) {
+      // In case of qualdrop value remove event must be dispatched before removing the control from array
+      this.removeArrayItem.emit(event);
+    }
     this.formBuilderService.removeFormArrayGroup(index, formArrayControl, arrayContext);
     this.formService.changeForm(this.formId, this.formModel);
-    this.removeArrayItem.emit(event);
+    if (!this.formBuilderService.isQualdropGroup(event.model as DynamicFormControlModel)) {
+      // dispatch remove event for any field type except for qualdrop value
+      this.removeArrayItem.emit(event);
+    }
   }
 
   insertItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
diff --git a/src/app/submission/sections/form/section-form-operations.service.ts b/src/app/submission/sections/form/section-form-operations.service.ts
index 7174d5da67..adba46bf3a 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -298,17 +298,14 @@ export class SectionFormOperationsService {
                                               event: DynamicFormControlEvent,
                                               previousValue: FormFieldPreviousValueObject): void {
 
-    if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
-      // Model is a DynamicRowArrayModel
-      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
-      return;
-    }
-
     const path = this.getFieldPathFromEvent(event);
     const value = this.getFieldValueFromChangeEvent(event);
     console.log(value);
     if (this.formBuilder.isQualdropGroup(event.model as DynamicFormControlModel)) {
       this.dispatchOperationsFromMap(this.getQualdropValueMap(event), pathCombiner, event, previousValue);
+    } else if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
+      // Model is a DynamicRowArrayModel
+      this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
     } else if ((isNotEmpty(value) && typeof value === 'string') || (isNotEmpty(value) && value instanceof FormFieldMetadataValueObject && value.hasValue())) {
       this.operationsBuilder.remove(pathCombiner.getPath(path));
     }

From 3e53b7c7b17f83547f727833f4408a479330f6e0 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 1 Jun 2021 14:09:17 +0200
Subject: [PATCH 042/169] [CST-4248] Add possibility to add additional content
 to form.component

---
 src/app/shared/form/form.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 39ccda360f..de24880b3b 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -48,7 +48,7 @@
       </ng-template>
 
     </ds-dynamic-form>
-
+        <ng-content select="[additional]"></ng-content>
         <ng-content *ngIf="!displaySubmit && !displayCancel"></ng-content>
 
     <div *ngIf="displaySubmit || displayCancel">

From c150fb881eae270591e3b4329b595d4aa6a7d2d2 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 1 Jun 2021 14:12:12 +0200
Subject: [PATCH 043/169] [CST-4248] bitstream authorizations page

---
 .../bitstream-authorizations.component.html   | 10 +++
 ...bitstream-authorizations.component.spec.ts | 84 +++++++++++++++++++
 .../bitstream-authorizations.component.ts     | 40 +++++++++
 .../bitstream-page-routing.module.ts          | 36 ++++++++
 .../+bitstream-page/bitstream-page.module.ts  |  2 +
 src/assets/i18n/en.json5                      |  8 +-
 6 files changed, 178 insertions(+), 2 deletions(-)
 create mode 100644 src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
 create mode 100644 src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
 create mode 100644 src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts

diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html b/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
new file mode 100644
index 0000000000..804bb4f891
--- /dev/null
+++ b/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
@@ -0,0 +1,10 @@
+<div class="container">
+  <ds-resource-policies [resourceType]="'bitstream'" [resourceUUID]="(dsoRD$ | async)?.payload?.id"></ds-resource-policies>
+  <div class="button-row bottom">
+    <div class="text-right">
+      <a [routerLink]="['/bitstreams', (dsoRD$ | async)?.payload?.id, 'edit']" role="button" class="btn btn-outline-secondary mr-1">
+        <i class="fas fa-arrow-left"></i> {{'bitstream.edit.return' | translate}}
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts b/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
new file mode 100644
index 0000000000..c41351f380
--- /dev/null
+++ b/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
@@ -0,0 +1,84 @@
+import { CommonModule } from '@angular/common';
+import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations.component';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+
+describe('BitstreamAuthorizationsComponent', () => {
+  let comp: BitstreamAuthorizationsComponent<DSpaceObject>;
+  let fixture: ComponentFixture<BitstreamAuthorizationsComponent<any>>;
+
+  const bitstream = Object.assign(new Bitstream(), {
+    sizeBytes: 10000,
+    metadata: {
+      'dc.title': [
+        {
+          value: 'file name',
+          language: null
+        }
+      ]
+    },
+    _links: {
+      content: { href: 'file-selflink' }
+    }
+  });
+
+  const bitstreamRD = createSuccessfulRemoteDataObject(bitstream);
+
+  const routeStub = {
+    data: observableOf({
+      bitstream: bitstreamRD
+    })
+  };
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        })
+      ],
+      declarations: [BitstreamAuthorizationsComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        ChangeDetectorRef,
+        BitstreamAuthorizationsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BitstreamAuthorizationsComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    comp = null;
+    fixture.destroy();
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should init dso remote data properly', (done) => {
+    const expected = cold('(a|)', { a: bitstreamRD });
+    expect(comp.dsoRD$).toBeObservable(expected);
+    done();
+  });
+});
diff --git a/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts b/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
new file mode 100644
index 0000000000..adc0638780
--- /dev/null
+++ b/src/app/+bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -0,0 +1,40 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+import { Observable } from 'rxjs';
+import { first, map } from 'rxjs/operators';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+
+@Component({
+  selector: 'ds-collection-authorizations',
+  templateUrl: './bitstream-authorizations.component.html',
+})
+/**
+ * Component that handles the Collection Authorizations
+ */
+export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> implements OnInit {
+
+  /**
+   * The initial DSO object
+   */
+  public dsoRD$: Observable<RemoteData<TDomain>>;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {ActivatedRoute} route
+   */
+  constructor(
+    private route: ActivatedRoute
+  ) {
+  }
+
+  /**
+   * Initialize the component, setting up the collection
+   */
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.data.pipe(first(), map((data) => data.bitstream));
+  }
+}
diff --git a/src/app/+bitstream-page/bitstream-page-routing.module.ts b/src/app/+bitstream-page/bitstream-page-routing.module.ts
index bbbd65f279..284f29f7b4 100644
--- a/src/app/+bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/+bitstream-page/bitstream-page-routing.module.ts
@@ -4,8 +4,14 @@ import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { BitstreamPageResolver } from './bitstream-page.resolver';
 import { BitstreamDownloadPageComponent } from '../shared/bitstream-download-page/bitstream-download-page.component';
+import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
+const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
 
 /**
  * Routing module to help navigate Bitstream pages
@@ -27,6 +33,36 @@ const EDIT_BITSTREAM_PATH = ':id/edit';
           bitstream: BitstreamPageResolver
         },
         canActivate: [AuthenticatedGuard]
+      },
+      {
+        path: EDIT_BITSTREAM_AUTHORIZATIONS_PATH,
+
+        children: [
+          {
+            path: 'create',
+            resolve: {
+              resourcePolicyTarget: ResourcePolicyTargetResolver
+            },
+            component: ResourcePolicyCreateComponent,
+            data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }
+          },
+          {
+            path: 'edit',
+            resolve: {
+              resourcePolicy: ResourcePolicyResolver
+            },
+            component: ResourcePolicyEditComponent,
+            data: { title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
+          },
+          {
+            path: '',
+            resolve: {
+              bitstream: BitstreamPageResolver
+            },
+            component: BitstreamAuthorizationsComponent,
+            data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }
+          }
+        ]
       }
     ])
   ],
diff --git a/src/app/+bitstream-page/bitstream-page.module.ts b/src/app/+bitstream-page/bitstream-page.module.ts
index 24b4cd512f..80e5ad14e3 100644
--- a/src/app/+bitstream-page/bitstream-page.module.ts
+++ b/src/app/+bitstream-page/bitstream-page.module.ts
@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
 import { SharedModule } from '../shared/shared.module';
 import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
 import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
 
 /**
  * This module handles all components that are necessary for Bitstream related pages
@@ -14,6 +15,7 @@ import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
     BitstreamPageRoutingModule
   ],
   declarations: [
+    BitstreamAuthorizationsComponent,
     EditBitstreamPageComponent
   ]
 })
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4c3317a0c0..44725337be 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -530,6 +530,12 @@
 
 
 
+  "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+
+  "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+
+  "bitstream.edit.return": "Back",
+
   "bitstream.edit.bitstream": "Bitstream: ",
 
   "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
@@ -1817,8 +1823,6 @@
 
   "item.page.description": "Description",
 
-  "item.page.edit": "Edit this item",
-
   "item.page.journal-issn": "Journal ISSN",
 
   "item.page.journal-title": "Journal Title",

From eaaad88443694d30d4ff4eed5cbba929c1c389e8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 1 Jun 2021 14:13:19 +0200
Subject: [PATCH 044/169] [CST-4248] Remove embargo form field and add link to
 bitstream authorization page

---
 .../edit-bitstream-page.component.html        |  6 +++-
 .../edit-bitstream-page.component.spec.ts     | 21 ++++----------
 .../edit-bitstream-page.component.ts          | 28 +++----------------
 3 files changed, 15 insertions(+), 40 deletions(-)

diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index fd13e249a0..cbb587cca4 100644
--- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -19,7 +19,11 @@
                   [submitLabel]="'form.save'"
                   (submitForm)="onSubmit()"
                   (cancel)="onCancel()"
-                  (dfChange)="onChange($event)"></ds-form>
+                  (dfChange)="onChange($event)">
+          <div additional class="container py-3">
+            <a [routerLink]="['/bitstreams', bitstreamRD?.payload?.id, 'authorizations']">{{'bitstream.edit.authorizations.link' | translate}}</a>
+          </div>
+        </ds-form>
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index 2e7eb4e1d1..9c2cb3a093 100644
--- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -18,12 +18,8 @@ import { hasValue } from '../../shared/empty.util';
 import { FormControl, FormGroup } from '@angular/forms';
 import { FileSizePipe } from '../../shared/utils/file-size-pipe';
 import { VarDirective } from '../../shared/utils/var.directive';
-import {
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../shared/remote-data.utils';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { getEntityEditRoute, getItemEditRoute } from '../../+item-page/item-page-routing-paths';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { getEntityEditRoute } from '../../+item-page/item-page-routing-paths';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../../core/shared/item.model';
 
@@ -39,7 +35,6 @@ let bitstream: Bitstream;
 let selectedFormat: BitstreamFormat;
 let allFormats: BitstreamFormat[];
 let router: Router;
-let routerStub;
 
 describe('EditBitstreamPageComponent', () => {
   let comp: EditBitstreamPageComponent;
@@ -129,10 +124,6 @@ describe('EditBitstreamPageComponent', () => {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
     });
 
-    const itemPageUrl = `fake-url/some-uuid`;
-    routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}`
-    });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule],
       declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
@@ -142,7 +133,6 @@ describe('EditBitstreamPageComponent', () => {
         { provide: ActivatedRoute, useValue: { data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }), snapshot: { queryParams: {} } } },
         { provide: BitstreamDataService, useValue: bitstreamService },
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
-        { provide: Router, useValue: routerStub },
         ChangeDetectorRef
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -154,7 +144,8 @@ describe('EditBitstreamPageComponent', () => {
     fixture = TestBed.createComponent(EditBitstreamPageComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
-    router = (comp as any).router;
+    router = TestBed.inject(Router);
+    spyOn(router, 'navigate');
   });
 
   describe('on startup', () => {
@@ -241,14 +232,14 @@ describe('EditBitstreamPageComponent', () => {
     it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
       comp.itemId = 'some-uuid1';
       comp.navigateToItemEditBitstreams();
-      expect(routerStub.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
+      expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
     });
   });
   describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
     it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
       comp.itemId = undefined;
       comp.navigateToItemEditBitstreams();
-      expect(routerStub.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
+      expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
     });
   });
 });
diff --git a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 8a4d584647..4ad0aac7ef 100644
--- a/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/+bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -19,10 +19,10 @@ import { cloneDeep } from 'lodash';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import {
   getAllSucceededRemoteDataPayload,
-  getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload,
+  getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload
 } from '../../core/shared/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
@@ -131,15 +131,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     rows: 10
   });
 
-  /**
-   * The Dynamic Input Model for the file's embargo (disabled on this page)
-   */
-  embargoModel = new DynamicInputModel({
-    id: 'embargo',
-    name: 'embargo',
-    disabled: true
-  });
-
   /**
    * The Dynamic Input Model for the selected format
    */
@@ -159,7 +150,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * All input models in a simple array for easier iterations
    */
-  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.embargoModel, this.selectedFormatModel, this.newFormatModel];
+  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.selectedFormatModel, this.newFormatModel];
 
   /**
    * The dynamic form fields used for editing the information of a bitstream
@@ -179,12 +170,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         this.descriptionModel
       ]
     }),
-    new DynamicFormGroupModel({
-      id: 'embargoContainer',
-      group: [
-        this.embargoModel
-      ]
-    }),
     new DynamicFormGroupModel({
       id: 'formatContainer',
       group: [
@@ -243,11 +228,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         host: 'row'
       }
     },
-    embargoContainer: {
-      grid: {
-        host: 'row'
-      }
-    },
     formatContainer: {
       grid: {
         host: 'row'

From bb2892edd896b6fa6ea9bb8261dd77e6d799de5d Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 8 Jun 2021 23:48:24 +0200
Subject: [PATCH 045/169] BUGFIX: Encode special characters when sending
 workflow action

---
 src/app/core/data/request.service.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 4a85df0d34..14499b8214 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -265,11 +265,13 @@ export class RequestService {
     if (isNotEmpty(body) && typeof body === 'object') {
       Object.keys(body)
         .forEach((param) => {
-          const paramValue = `${param}=${body[param]}`;
+          const encodedParam = encodeURIComponent(param);
+          const encodedBody = encodeURIComponent(body[param]);
+          const paramValue = `${encodedParam}=${encodedBody}`;
           queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue);
         });
     }
-    return encodeURI(queryParams);
+    return queryParams;
   }
 
   /**

From a27a7a4083d5fd35cd9e4466e3c7c99062cbcf48 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Thu, 10 Jun 2021 15:00:03 +0200
Subject: [PATCH 046/169] Test requestService.uriEncodeBody

---
 src/app/core/data/request.service.spec.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index e6dde7a032..7a07f6fe10 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -579,4 +579,19 @@ describe('RequestService', () => {
       });
     });
   });
+
+  describe('uriEncodeBody', () => {
+    it('should properly encode the body', () => {
+      const body = {
+        'property1': 'multiple\nlines\nto\nsend',
+        'property2': 'sp&ci@l characters',
+        'sp&ci@l-chars in prop': 'test123',
+      };
+      const queryParams = service.uriEncodeBody(body);
+      expect(queryParams).toEqual(
+        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123'
+      );
+    });
+  });
+
 });

From b1049584730e584b1255d34fb225e03935a7c9d0 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 10 Jun 2021 09:39:10 -0500
Subject: [PATCH 047/169] Add option to pin to a specific version of
 Chrome/ChromeDriver. Pin to v90 until v91 bugs are fixed

---
 .github/workflows/build.yml | 38 ++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d2e8b9fe5e..f04db98e1e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,6 +16,9 @@ jobs:
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: '/server'
       DSPACE_REST_SSL: false
+      # When Chrome version is specified, we pin to a specific version of Chrome & ChromeDriver
+      # Comment this out to use the latest release of both.
+      CHROME_VERSION: "90.0.4430.212-1"
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
@@ -34,10 +37,20 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Install latest Chrome (for e2e tests)
+      # If CHROME_VERSION env variable specified above, then pin to that version.
+      # Otherwise, just install latest version of Chrome.
+      - name: Install Chrome (for e2e tests)
         run: |
-          sudo apt-get update
-          sudo apt-get --only-upgrade install google-chrome-stable -y
+          if [[ -z "${CHROME_VERSION}" ]]
+          then
+             echo "Installing latest stable version"
+             sudo apt-get update
+             sudo apt-get --only-upgrade install google-chrome-stable -y
+          else
+             echo "Installing version ${CHROME_VERSION}"
+             wget -q "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+             sudo dpkg -i "google-chrome-stable_${CHROME_VERSION}_amd64.deb"
+          fi
           google-chrome --version
 
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
@@ -53,8 +66,23 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
 
-      - name: Install the latest chromedriver compatible with the installed chrome version
-        run: yarn global add chromedriver --detect_chromedriver_version
+      # If CHROME_VERSION env variable specified above, determine the corresponding latest ChromeDriver version
+      # and install it manually (we must install manually as it seems to be the only way to downgrade). 
+      # Otherwise use "detect" flag to install based on installed Chrome version.
+      - name: Install ChromeDriver compatible with installed Chrome
+        run: |
+          if [[ -z "${CHROME_VERSION}" ]]
+          then
+              echo "Installing version based on Chrome"
+              yarn global add chromedriver --detect_chromedriver_version
+          else
+              latest_version_string="LATEST_RELEASE_$(echo $CHROME_VERSION | cut -d'.' -f1)"
+              version=$(curl -s "https://chromedriver.storage.googleapis.com/${latest_version_string}")
+              echo "Installing ${latest_version_string} (${version})"
+              wget -qP /tmp/ "https://chromedriver.storage.googleapis.com/${version}/chromedriver_linux64.zip"
+              sudo unzip -o /tmp/chromedriver_linux64.zip -d /usr/bin
+          fi
+          chromedriver -v
 
       - name: Install Yarn dependencies
         run: yarn install --frozen-lockfile

From 326bffae7f09d11904241bc7a94136f865cc618f Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 11 Jun 2021 09:38:04 +0200
Subject: [PATCH 048/169] switch chromedriver to npm

---
 .github/workflows/build.yml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f04db98e1e..02cc590028 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,23 +66,9 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
 
-      # If CHROME_VERSION env variable specified above, determine the corresponding latest ChromeDriver version
-      # and install it manually (we must install manually as it seems to be the only way to downgrade). 
-      # Otherwise use "detect" flag to install based on installed Chrome version.
-      - name: Install ChromeDriver compatible with installed Chrome
-        run: |
-          if [[ -z "${CHROME_VERSION}" ]]
-          then
-              echo "Installing version based on Chrome"
-              yarn global add chromedriver --detect_chromedriver_version
-          else
-              latest_version_string="LATEST_RELEASE_$(echo $CHROME_VERSION | cut -d'.' -f1)"
-              version=$(curl -s "https://chromedriver.storage.googleapis.com/${latest_version_string}")
-              echo "Installing ${latest_version_string} (${version})"
-              wget -qP /tmp/ "https://chromedriver.storage.googleapis.com/${version}/chromedriver_linux64.zip"
-              sudo unzip -o /tmp/chromedriver_linux64.zip -d /usr/bin
-          fi
-          chromedriver -v
+      - name: Install the latest chromedriver compatible with the installed chrome version
+        # needs to be npm, the --detect_chromedriver_version flag doesn't work with yarn global
+        run: npm install -g chromedriver --detect_chromedriver_version
 
       - name: Install Yarn dependencies
         run: yarn install --frozen-lockfile

From e7282bdbd7ace08d212ef47868f6ffa0d10af2d7 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 11 Jun 2021 08:46:17 -0500
Subject: [PATCH 049/169] Minor cleanup, print chromedriver version after
 installation

---
 .github/workflows/build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 02cc590028..c856e8f5fe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -66,9 +66,11 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: ${{ runner.os }}-yarn-
 
-      - name: Install the latest chromedriver compatible with the installed chrome version
+      - name: Install latest ChromeDriver compatible with installed Chrome
         # needs to be npm, the --detect_chromedriver_version flag doesn't work with yarn global
-        run: npm install -g chromedriver --detect_chromedriver_version
+        run: |
+          npm install -g chromedriver --detect_chromedriver_version
+          chromedriver -v
 
       - name: Install Yarn dependencies
         run: yarn install --frozen-lockfile

From c756c68f286e3a244a24fd3e33b3af829da54b24 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Tue, 1 Jun 2021 12:46:23 +0200
Subject: [PATCH 050/169] move header changes to dspace theme

---
 .../+home-page/home-page-routing.module.ts    |  1 +
 src/app/app.module.ts                         |  2 +
 .../header-navbar-wrapper.component.html      |  1 +
 .../header-navbar-wrapper.component.scss      |  4 --
 ...hemed-header-navbar-wrapper.component.scss |  3 +
 .../themed-header-navbar-wrapper.component.ts | 25 +++++++++
 src/app/header/header.component.html          | 41 +++++++-------
 src/app/header/header.component.scss          | 32 ++++++-----
 .../expandable-navbar-section.component.html  |  2 +-
 .../navbar-section.component.html             |  2 +-
 src/app/navbar/navbar.component.html          | 31 ++++------
 src/app/navbar/navbar.component.scss          | 17 +-----
 src/app/navbar/navbar.component.ts            |  3 +-
 src/app/root/root.component.html              |  2 +-
 src/styles/_custom_variables.scss             |  2 +-
 .../header-navbar-wrapper.component.html      |  0
 .../header-navbar-wrapper.component.scss      |  0
 .../header-navbar-wrapper.component.ts        | 15 +++++
 src/themes/custom/theme.module.ts             |  2 +
 .../header-navbar-wrapper.component.html      |  3 +
 .../header-navbar-wrapper.component.scss      |  0
 .../header-navbar-wrapper.component.ts        | 13 +++++
 .../dspace/app/header/header.component.html   | 24 ++++++++
 .../dspace/app/header/header.component.scss   | 19 +++++++
 .../dspace/app/header/header.component.ts     | 13 +++++
 .../dspace/app/navbar/navbar.component.html   | 24 ++++++++
 .../dspace/app/navbar/navbar.component.scss   | 56 ++++++++++++++++++-
 .../dspace/app/navbar/navbar.component.ts     |  2 +-
 src/themes/dspace/styles/_global-styles.scss  | 12 +++-
 .../styles/_theme_css_variable_overrides.scss |  1 +
 src/themes/dspace/theme.module.ts             |  4 ++
 31 files changed, 274 insertions(+), 82 deletions(-)
 create mode 100644 src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.scss
 create mode 100644 src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
 create mode 100644 src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.html
 create mode 100644 src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss
 create mode 100644 src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
 create mode 100644 src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
 create mode 100644 src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
 create mode 100644 src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
 create mode 100644 src/themes/dspace/app/header/header.component.html
 create mode 100644 src/themes/dspace/app/header/header.component.scss
 create mode 100644 src/themes/dspace/app/header/header.component.ts
 create mode 100644 src/themes/dspace/app/navbar/navbar.component.html

diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/+home-page/home-page-routing.module.ts
index ec6a547359..2a41c079da 100644
--- a/src/app/+home-page/home-page-routing.module.ts
+++ b/src/app/+home-page/home-page-routing.module.ts
@@ -20,6 +20,7 @@ import { ThemedHomePageComponent } from './themed-home-page.component';
               id: 'statistics_site',
               active: true,
               visible: true,
+              index: 2,
               model: {
                 type: MenuItemType.LINK,
                 text: 'menu.section.statistics',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 03cd819625..3d45ffbfc2 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -46,6 +46,7 @@ import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component
 import { ThemedHeaderComponent } from './header/themed-header.component';
 import { ThemedFooterComponent } from './footer/themed-footer.component';
 import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
+import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
 
 export function getBase() {
   return environment.ui.nameSpace;
@@ -129,6 +130,7 @@ const DECLARATIONS = [
   HeaderComponent,
   ThemedHeaderComponent,
   HeaderNavbarWrapperComponent,
+  ThemedHeaderNavbarWrapperComponent,
   AdminSidebarComponent,
   AdminSidebarSectionComponent,
   ExpandableAdminSidebarSectionComponent,
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
index c1843318b8..f99070b738 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,3 +1,4 @@
 <div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
     <ds-themed-header></ds-themed-header>
+    <ds-themed-navbar></ds-themed-navbar>
 </div>
diff --git a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
index a2ebd0d41a..b297979fd0 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.scss
@@ -5,7 +5,3 @@
         position: sticky;
     }
 }
-
-:host {
-  z-index: var(--ds-nav-z-index);
-}
diff --git a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.scss b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.scss
new file mode 100644
index 0000000000..db392096aa
--- /dev/null
+++ b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.scss
@@ -0,0 +1,3 @@
+:host {
+  z-index: var(--ds-nav-z-index);
+}
diff --git a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
new file mode 100644
index 0000000000..7f9c181fe2
--- /dev/null
+++ b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../shared/theme-support/themed.component';
+import { HeaderNavbarWrapperComponent } from './header-navbar-wrapper.component';
+
+/**
+ * Themed wrapper for BreadcrumbsComponent
+ */
+@Component({
+  selector: 'ds-themed-header-navbar-wrapper',
+  styleUrls: ['./themed-header-navbar-wrapper.component.scss'],
+  templateUrl: '../shared/theme-support/themed.component.html',
+})
+export class ThemedHeaderNavbarWrapperComponent extends ThemedComponent<HeaderNavbarWrapperComponent> {
+  protected getComponentName(): string {
+    return 'HeaderNavbarWrapperComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../themes/${themeName}/app/header-nav-wrapper/header-navbar-wrapper.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./header-navbar-wrapper.component`);
+  }
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index dc0d066a4e..a1fa051610 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,24 +1,23 @@
-<header class="header">
-  <nav role="navigation" [attr.aria-label]="'nav.user.description' |translate" class="container navbar navbar-expand-md px-0">
-    <div class="d-flex flex-grow-1">
-      <a class="navbar-brand m-2" routerLink="/home">
-        <img src="assets/images/dspace-logo.svg" alt="logo"/>
+<header>
+  <div class="container">
+    <div class="d-flex flex-row justify-content-between">
+      <a class="navbar-brand my-2" routerLink="/home">
+        <img src="assets/images/dspace-logo.svg"/>
       </a>
-    </div>
-    <div class="d-flex flex-grow-1 ml-auto justify-content-end align-items-center">
-      <ds-search-navbar class="navbar-search"></ds-search-navbar>
-      <ds-lang-switch></ds-lang-switch>
-      <ds-auth-nav-menu></ds-auth-nav-menu>
-      <ds-impersonate-navbar></ds-impersonate-navbar>
-      <div class="pl-2">
-        <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
-                aria-controls="collapsingNav"
-                aria-expanded="false" aria-label="Toggle navigation">
-          <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
-        </button>
-      </div>
-    </div>
-  </nav>
-  <ds-themed-navbar></ds-themed-navbar>
 
+      <nav class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
+        <ds-search-navbar></ds-search-navbar>
+        <ds-lang-switch></ds-lang-switch>
+        <ds-auth-nav-menu></ds-auth-nav-menu>
+        <ds-impersonate-navbar></ds-impersonate-navbar>
+        <div class="pl-2">
+          <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
+                  aria-controls="collapsingNav"
+                  aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+          </button>
+        </div>
+      </nav>
+    </div>
+  </div>
 </header>
diff --git a/src/app/header/header.component.scss b/src/app/header/header.component.scss
index c85daf8516..922b2d02e1 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -1,19 +1,23 @@
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  nav.navbar {
-    display: none;
-  }
-  .header {
-    background-color: var(--ds-header-bg);
+.navbar-brand img {
+  max-height: var(--ds-header-logo-height);
+  max-width: 100%;
+  @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+    max-height: var(--ds-header-logo-height-xs);
   }
 }
 
-.navbar-brand img {
-    @media screen and (max-width: map-get($grid-breakpoints, md)) {
-        height: var(--ds-header-logo-height-xs);
-    }
-}
 .navbar-toggler .navbar-toggler-icon {
-    background-image: none !important;
-    line-height: 1.5;
-    color: var(--bs-link-color);
+  background-image: none !important;
+  line-height: 1.5;
 }
+
+.navbar ::ng-deep {
+  a {
+    color: var(--ds-header-icon-color);
+
+    &:hover, &focus {
+      color: var(--ds-header-icon-color-hover);
+    }
+  }
+}
+
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index a1c02bfa31..a7cf7c1856 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,4 +1,4 @@
-<li class="nav-item dropdown h-100 d-flex flex-column justify-content-center"
+<li class="nav-item dropdown"
     (mouseenter)="activateSection($event)"
     (mouseleave)="deactivateSection($event)">
     <a href="#" class="nav-link dropdown-toggle" routerLinkActive="active"
diff --git a/src/app/navbar/navbar-section/navbar-section.component.html b/src/app/navbar/navbar-section/navbar-section.component.html
index db25f58089..00461995bc 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.html
+++ b/src/app/navbar/navbar-section/navbar-section.component.html
@@ -1,4 +1,4 @@
-<li class="nav-item h-100 d-flex flex-column justify-content-center">
+<li class="nav-item">
   <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
 </li>
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 50e526b78b..2356077e43 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,24 +1,17 @@
 <nav [ngClass]="{'open': !(menuCollapsed | async)}"
      [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-     class="navbar navbar-expand-md navbar-light p-0 navbar-container"
-     role="navigation" role="navigation" [attr.aria-label]="'nav.main.description' |translate">
-  <div class="container h-100">
-    <a class="navbar-brand my-2" routerLink="/home">
-      <img src="assets/images/dspace-logo.svg" alt="logo"/>
-    </a>
-
-    <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
-        <ng-container *ngFor="let section of (sections | async)">
-          <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-        </ng-container>
-      </ul>
+     class="navbar navbar-light navbar-expand-md p-md-0 navbar-container">    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
+    <div class="container">
+        <div class="reset-padding-md w-100">
+            <div id="collapsingNav">
+                <ul class="navbar-nav mr-auto shadow-none">
+                    <ng-container *ngFor="let section of (sections | async)">
+                        <ng-container
+                                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+                    </ng-container>
+                </ul>
+            </div>
+        </div>
     </div>
-    <ds-search-navbar class="navbar-collapsed"></ds-search-navbar>
-    <ds-lang-switch class="navbar-collapsed"></ds-lang-switch>
-    <ds-auth-nav-menu class="navbar-collapsed"></ds-auth-nav-menu>
-    <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
-  </div>
 </nav>
 
diff --git a/src/app/navbar/navbar.component.scss b/src/app/navbar/navbar.component.scss
index be6e8ac55e..d131bf95bf 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,14 +1,12 @@
 nav.navbar {
-    border-top: 1px var(--ds-header-navbar-border-top-color) solid;
-    border-bottom: 1px var(--ds-header-navbar-border-bottom-color) solid;
+    border-bottom: 1px var(--bs-gray-400) solid;
     align-items: baseline;
-    color: var(--ds-header-icon-color);
 }
 
 /** Mobile menu styling **/
 @media screen and (max-width: map-get($grid-breakpoints, md)) {
     .navbar {
-        width: 100%;
+        width: 100vw;
         background-color: var(--bs-white);
         position: absolute;
         overflow: hidden;
@@ -31,20 +29,9 @@ nav.navbar {
     @media screen and (max-width: map-get($grid-breakpoints, md)) {
         > .container {
             padding: 0 var(--bs-spacer);
-            a.navbar-brand {
-              display: none;
-            }
-            .navbar-collapsed {
-              display: none;
-            }
         }
         padding: 0;
     }
-    height: 80px;
-}
-
-a.navbar-brand img {
-    max-height: var(--ds-header-logo-height);
 }
 
 .navbar-nav {
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index ae5fb262ae..e741cea285 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -46,6 +46,7 @@ export class NavbarComponent extends MenuComponent {
         id: `browse_global_communities_and_collections`,
         active: false,
         visible: true,
+        index: 0,
         model: {
           type: MenuItemType.LINK,
           text: `menu.section.browse_global_communities_and_collections`,
@@ -57,11 +58,11 @@ export class NavbarComponent extends MenuComponent {
         id: 'browse_global',
         active: false,
         visible: true,
+        index: 1,
         model: {
           type: MenuItemType.TEXT,
           text: 'menu.section.browse_global'
         } as TextMenuItemModel,
-        index: 0
       },
     ];
     // Read the different Browse-By types from config and add them to the browse menu
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index aef07d79f4..67d04f999f 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -4,7 +4,7 @@
      value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
      params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
     }">
-    <ds-header-navbar-wrapper></ds-header-navbar-wrapper>
+    <ds-themed-header-navbar-wrapper></ds-themed-header-navbar-wrapper>
 
     <ds-notifications-board
       [options]="notificationOptions">
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 298be09f67..dc76d772d1 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -20,7 +20,7 @@
   --ds-sidebar-z-index: 20;
 
   --ds-header-bg: #{$white};
-  --ds-header-logo-height: 40px;
+  --ds-header-logo-height: 50px;
   --ds-header-logo-height-xs: 50px;
   --ds-header-icon-color: #{$cyan};
   --ds-header-icon-color-hover: #{darken($white, 15%)};
diff --git a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
new file mode 100644
index 0000000000..875b5f69b8
--- /dev/null
+++ b/src/themes/custom/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
+
+/**
+ * This component represents a wrapper for the horizontal navbar and the header
+ */
+@Component({
+  selector: 'ds-header-navbar-wrapper',
+  // styleUrls: ['header-navbar-wrapper.component.scss'],
+  styleUrls: ['../../../../app/header-nav-wrapper/header-navbar-wrapper.component.scss'],
+  // templateUrl: 'header-navbar-wrapper.component.html',
+  templateUrl: '../../../../app/header-nav-wrapper/header-navbar-wrapper.component.html',
+})
+export class HeaderNavbarWrapperComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 23fcf4c325..49b54cd850 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -78,6 +78,7 @@ import { NavbarComponent } from './app/navbar/navbar.component';
 import { HeaderComponent } from './app/header/header.component';
 import { FooterComponent } from './app/footer/footer.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
+import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
 
 const DECLARATIONS = [
   HomePageComponent,
@@ -117,6 +118,7 @@ const DECLARATIONS = [
   FooterComponent,
   HeaderComponent,
   NavbarComponent,
+  HeaderNavbarWrapperComponent,
   BreadcrumbsComponent
 ];
 
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
new file mode 100644
index 0000000000..091d152258
--- /dev/null
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -0,0 +1,3 @@
+<div [ngClass]="{'open': !(isNavBarCollapsed | async)}">
+  <ds-themed-header></ds-themed-header>
+</div>
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
new file mode 100644
index 0000000000..36e23e174a
--- /dev/null
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
+
+/**
+ * This component represents a wrapper for the horizontal navbar and the header
+ */
+@Component({
+  selector: 'ds-header-navbar-wrapper',
+  styleUrls: ['header-navbar-wrapper.component.scss'],
+  templateUrl: 'header-navbar-wrapper.component.html',
+})
+export class HeaderNavbarWrapperComponent extends BaseComponent {
+}
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
new file mode 100644
index 0000000000..dc0d066a4e
--- /dev/null
+++ b/src/themes/dspace/app/header/header.component.html
@@ -0,0 +1,24 @@
+<header class="header">
+  <nav role="navigation" [attr.aria-label]="'nav.user.description' |translate" class="container navbar navbar-expand-md px-0">
+    <div class="d-flex flex-grow-1">
+      <a class="navbar-brand m-2" routerLink="/home">
+        <img src="assets/images/dspace-logo.svg" alt="logo"/>
+      </a>
+    </div>
+    <div class="d-flex flex-grow-1 ml-auto justify-content-end align-items-center">
+      <ds-search-navbar class="navbar-search"></ds-search-navbar>
+      <ds-lang-switch></ds-lang-switch>
+      <ds-auth-nav-menu></ds-auth-nav-menu>
+      <ds-impersonate-navbar></ds-impersonate-navbar>
+      <div class="pl-2">
+        <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
+                aria-controls="collapsingNav"
+                aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+        </button>
+      </div>
+    </div>
+  </nav>
+  <ds-themed-navbar></ds-themed-navbar>
+
+</header>
diff --git a/src/themes/dspace/app/header/header.component.scss b/src/themes/dspace/app/header/header.component.scss
new file mode 100644
index 0000000000..ab418865f1
--- /dev/null
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -0,0 +1,19 @@
+@media screen and (min-width: map-get($grid-breakpoints, md)) {
+  nav.navbar {
+    display: none;
+  }
+  .header {
+    background-color: var(--ds-header-bg);
+  }
+}
+
+.navbar-brand img {
+  @media screen and (max-width: map-get($grid-breakpoints, md)) {
+    height: var(--ds-header-logo-height-xs);
+  }
+}
+.navbar-toggler .navbar-toggler-icon {
+  background-image: none !important;
+  line-height: 1.5;
+  color: var(--bs-link-color);
+}
diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts
new file mode 100644
index 0000000000..6da89b47d5
--- /dev/null
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
+
+/**
+ * Represents the header with the logo and simple navigation
+ */
+@Component({
+  selector: 'ds-header',
+  styleUrls: ['header.component.scss'],
+  templateUrl: 'header.component.html',
+})
+export class HeaderComponent extends BaseComponent {
+}
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
new file mode 100644
index 0000000000..50e526b78b
--- /dev/null
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -0,0 +1,24 @@
+<nav [ngClass]="{'open': !(menuCollapsed | async)}"
+     [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
+     class="navbar navbar-expand-md navbar-light p-0 navbar-container"
+     role="navigation" role="navigation" [attr.aria-label]="'nav.main.description' |translate">
+  <div class="container h-100">
+    <a class="navbar-brand my-2" routerLink="/home">
+      <img src="assets/images/dspace-logo.svg" alt="logo"/>
+    </a>
+
+    <div id="collapsingNav" class="w-100 h-100">
+      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
+        <ng-container *ngFor="let section of (sections | async)">
+          <ng-container
+            *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+        </ng-container>
+      </ul>
+    </div>
+    <ds-search-navbar class="navbar-collapsed"></ds-search-navbar>
+    <ds-lang-switch class="navbar-collapsed"></ds-lang-switch>
+    <ds-auth-nav-menu class="navbar-collapsed"></ds-auth-nav-menu>
+    <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
+  </div>
+</nav>
+
diff --git a/src/themes/dspace/app/navbar/navbar.component.scss b/src/themes/dspace/app/navbar/navbar.component.scss
index 463a4269ee..210847c1d9 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -1,5 +1,57 @@
-@import 'src/app/navbar/navbar.component.scss';
-
 nav.navbar {
+  border-top: 1px var(--ds-header-navbar-border-top-color) solid;
   border-bottom: 5px var(--bs-green) solid;
+  align-items: baseline;
+  color: var(--ds-header-icon-color);
+}
+
+/** Mobile menu styling **/
+@media screen and (max-width: map-get($grid-breakpoints, md)) {
+  .navbar {
+    width: 100%;
+    background-color: var(--bs-white);
+    position: absolute;
+    overflow: hidden;
+    height: 0;
+    &.open {
+      height: 100vh; //doesn't matter because wrapper is sticky
+    }
+  }
+}
+
+@media screen and (min-width: map-get($grid-breakpoints, md)) {
+  .reset-padding-md {
+    margin-left: calc(var(--bs-spacer) / -2);
+    margin-right: calc(var(--bs-spacer) / -2);
+  }
+}
+
+/* TODO remove when https://github.com/twbs/bootstrap/issues/24726 is fixed */
+.navbar-expand-md.navbar-container {
+  @media screen and (max-width: map-get($grid-breakpoints, md)) {
+    > .container {
+      padding: 0 var(--bs-spacer);
+      a.navbar-brand {
+        display: none;
+      }
+      .navbar-collapsed {
+        display: none;
+      }
+    }
+    padding: 0;
+  }
+  height: 80px;
+}
+
+a.navbar-brand img {
+  max-height: var(--ds-header-logo-height);
+}
+
+.navbar-nav {
+  ::ng-deep a.nav-link {
+    color: var(--ds-navbar-link-color);
+  }
+  ::ng-deep a.nav-link:hover {
+    color: var(--ds-navbar-link-color-hover);
+  }
 }
diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index e375011683..321351a933 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -8,7 +8,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
 @Component({
   selector: 'ds-navbar',
   styleUrls: ['./navbar.component.scss'],
-  templateUrl: '../../../../app/navbar/navbar.component.html',
+  templateUrl: './navbar.component.html',
   animations: [slideMobileNav]
 })
 export class NavbarComponent extends BaseComponent {
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index 1fb60b64a2..72fac11156 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -3,7 +3,7 @@
 // imports the base global style
 @import '../../../styles/_global-styles.scss';
 
-.facet-filter,.setting-option {
+.facet-filter, .setting-option {
   background-color: var(--bs-light);
   border-radius: var(--bs-border-radius);
 
@@ -21,3 +21,13 @@
     font-size: 1.1rem
   }
 }
+
+header {
+  ds-navbar-section > li,
+  ds-expandable-navbar-section > li {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    height: 100%;
+  }
+}
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 2a61babdb7..e4b4b61f45 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -1,6 +1,7 @@
 // Override or add CSS variables for your theme here
 
 :root {
+  --ds-header-logo-height: 40px;
   --ds-banner-text-background: rgba(0, 0, 0, 0.45);
   --ds-banner-background-gradient-width: 300px;
   --ds-home-news-link-color: #{$green};
diff --git a/src/themes/dspace/theme.module.ts b/src/themes/dspace/theme.module.ts
index ed840c2e25..40138aa490 100644
--- a/src/themes/dspace/theme.module.ts
+++ b/src/themes/dspace/theme.module.ts
@@ -41,9 +41,13 @@ import { CollectionPageModule } from '../../app/+collection-page/collection-page
 import { SubmissionModule } from '../../app/submission/submission.module';
 import { MyDSpacePageModule } from '../../app/+my-dspace-page/my-dspace-page.module';
 import { NavbarComponent } from './app/navbar/navbar.component';
+import { HeaderComponent } from './app/header/header.component';
+import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
 
 const DECLARATIONS = [
   HomeNewsComponent,
+  HeaderComponent,
+  HeaderNavbarWrapperComponent,
   NavbarComponent
 ];
 

From 74a17da5b846b7bea48e325d57a6690d31fbe891 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Tue, 1 Jun 2021 13:25:01 +0200
Subject: [PATCH 051/169] fix issue where home page background image would wrap
 around on certain screen widths

---
 .../dspace/app/+home-page/home-news/home-news.component.scss  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/themes/dspace/app/+home-page/home-news/home-news.component.scss b/src/themes/dspace/app/+home-page/home-news/home-news.component.scss
index b5a070e51e..5e89f6b62f 100644
--- a/src/themes/dspace/app/+home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/+home-page/home-news/home-news.component.scss
@@ -6,12 +6,8 @@
     color: white;
     background-color: var(--bs-info);
     position: relative;
-    background-position-y: -200px;
     background-image: url('/assets/dspace/images/banner.jpg');
     background-size: cover;
-    @media screen and (max-width: map-get($grid-breakpoints, lg)) {
-      background-position-y: 0;
-    }
 
     .container {
       position: relative;

From 2ddda1c766eb2062e6f32d476c89cde5e57226ff Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Tue, 1 Jun 2021 16:03:45 +0200
Subject: [PATCH 052/169] enable e2e stacktrace

---
 e2e/protractor.conf.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
index 51180c8044..93bf7f3301 100644
--- a/e2e/protractor.conf.js
+++ b/e2e/protractor.conf.js
@@ -69,7 +69,6 @@ exports.config = {
   plugins: [{
     path: '../node_modules/protractor-istanbul-plugin'
   }],
-
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,
@@ -85,7 +84,7 @@ exports.config = {
   onPrepare: function () {
     jasmine.getEnv().addReporter(new SpecReporter({
       spec: {
-        displayStacktrace: true
+        displayStacktrace: 'pretty'
       }
     }));
   }

From f2a29a642576dd8b116280db4f2c0b5b66ee953d Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 4 Jun 2021 10:35:42 +0200
Subject: [PATCH 053/169] improve structure double footer

---
 src/app/footer/footer.component.html | 109 ++++++++++++++-------------
 src/app/footer/footer.component.scss |  19 +++--
 src/styles/_custom_variables.scss    |  10 +--
 3 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index bc407c2a97..4990290037 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,72 +1,79 @@
-<footer class="top-footer  text-lg-start">
-  <!-- Grid container -->
-  <div *ngIf="showTopFooter" class="container p-4">
-    <!--Grid row-->
-    <div class="row">
+<footer class="text-lg-start">
+  <div *ngIf="showTopFooter" class="top-footer">
+    <!-- Grid container -->
+    <div class=" container p-4">
+      <!--Grid row-->
+      <div class="row">
 
-      <!--Grid column-->
-      <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
-        <h5 class="text-uppercase">Footer Content</h5>
+        <!--Grid column-->
+        <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
+          <h5 class="text-uppercase">Footer Content</h5>
 
-        <ul class="list-unstyled mb-0">
-          <li>
-            <a routerLink="./" class="">Lorem ipsum</a>
-          </li>
-          <li>
-            <a routerLink="./" class="">Ut facilisis</a>
-          </li>
-          <li>
-            <a routerLink="./" class="">Aenean sit</a>
-          </li>
-        </ul>
+          <ul class="list-unstyled mb-0">
+            <li>
+              <a routerLink="./" class="">Lorem ipsum</a>
+            </li>
+            <li>
+              <a routerLink="./" class="">Ut facilisis</a>
+            </li>
+            <li>
+              <a routerLink="./" class="">Aenean sit</a>
+            </li>
+          </ul>
+        </div>
+        <!--Grid column-->
+
+        <!--Grid column-->
+        <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
+          <h5 class="text-uppercase">Footer Content</h5>
+
+          <ul class="list-unstyled mb-0">
+            <li>
+              <a routerLink="./" class="">Suspendisse potenti</a>
+            </li>
+          </ul>
+        </div>
+        <!--Grid column-->
+
+        <!--Grid column-->
+        <div class="col-lg-4 col-md-12 mb-4 mb-md-0">
+          <h5 class="text-uppercase">Footer Content</h5>
+
+          <p>
+            Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
+            molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
+            voluptatem veniam, est atque cumque eum delectus sint!
+          </p>
+        </div>
+        <!--Grid column-->
       </div>
-      <!--Grid column-->
-
-      <!--Grid column-->
-      <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
-        <h5 class="text-uppercase">Footer Content</h5>
-
-        <ul class="list-unstyled mb-0">
-          <li>
-            <a routerLink="./" class="">Suspendisse potenti</a>
-          </li>
-        </ul>
-      </div>
-      <!--Grid column-->
-
-      <!--Grid column-->
-      <div class="col-lg-4 col-md-12 mb-4 mb-md-0">
-        <h5 class="text-uppercase">Footer Content</h5>
-
-        <p>
-          Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
-          molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
-          voluptatem veniam, est atque cumque eum delectus sint!
-        </p>
-      </div>
-      <!--Grid column-->
+      <!--Grid row-->
     </div>
-    <!--Grid row-->
   </div>
   <!-- Grid container -->
 
   <!-- Copyright -->
-  <div class="footer p-1 d-flex justify-content-center align-items-center text-white">
+  <div class="bottom-footer p-1 d-flex justify-content-center align-items-center text-white">
     <div class="content-container">
       <p class="m-0">
-        <a class="text-white" href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
+        <a class="text-white"
+           href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
         {{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
-        <a class="text-white" href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
+        <a class="text-white"
+           href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
       </p>
       <ul class="footer-info list-unstyled small d-flex justify-content-center mb-0">
         <li>
-          <a class="text-white" href="#" (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
+          <a class="text-white" href="#"
+             (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
         </li>
         <li>
-          <a class="text-white" routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
+          <a class="text-white"
+             routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
         </li>
         <li>
-          <a class="text-white" routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
+          <a class="text-white"
+             routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
       </ul>
     </div>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 3f6ccb58e7..350295b870 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -1,11 +1,10 @@
 :host {
-
-  .top-footer {
-    background-color: var(--ds-top-footer-bg);
-    border-top: var(--ds-footer-border);
+  footer {
+    background-color: var(--ds-footer-bg);
     text-align: center;
-    padding: var(--ds-footer-padding);
     z-index: var(--ds-footer-z-index);
+    border-top: var(--ds-footer-border);
+    padding: var(--ds-footer-padding);
 
     p {
       margin: 0;
@@ -15,12 +14,18 @@
       height: var(--ds-footer-logo-height);
     }
 
-    .footer {
-      background-color: var(--ds-footer-bg);
 
+    .top-footer {
+      background-color: var(--ds-top-footer-bg);
+      padding: var(--ds-footer-padding);
+      margin: calc(var(--ds-footer-padding) * -1);
+    }
+
+    .bottom-footer {
       ul {
         li {
           display: inline-flex;
+
           a {
             padding: 0 calc(var(--bs-spacer) / 2);
             color: inherit
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index dc76d772d1..51195b50a1 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -61,12 +61,12 @@
   --ds-sidebar-items-width: #{$sidebar-items-width};
   --ds-total-sidebar-width: #{$total-sidebar-width};
 
-  --ds-top-footer-bg: #{$gray-200} !important;
-  --ds-footer-bg: #{theme-color('primary')} !important;
+  --ds-top-footer-bg: #{$gray-200};
+  --ds-footer-bg: #{theme-color('primary')};
   --ds-footer-border: 1px solid var(--bs-gray-400);
-  --ds-footer-padding: 0 !important;
-  --ds-footer-padding-bottom: 0 !important;
-  --ds-footer-logo-height: 50px !important;
+  --ds-footer-padding: 0;
+  --ds-footer-padding-bottom: 0;
+  --ds-footer-logo-height: 50px;
 
   $home-news-link-color: $cyan;
   --ds-home-news-link-color: #{$home-news-link-color};

From eead9473528ab4d87c394704407579e307e0a305 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Fri, 4 Jun 2021 13:20:27 +0200
Subject: [PATCH 054/169] put more useful example sass variable overrides in
 custom theme

---
 .../_theme_sass_variable_overrides.scss       | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index 1e5d0f0520..9f69b17ebd 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -3,14 +3,31 @@
 // still uses Sass variables internally. So if you want to override bootstrap (or other sass
 // variables) you can do so here. Their CSS counterparts will include the changes you make here
 
-// $blue:    #007bff !default;
-// $indigo:  #6610f2 !default;
-// $purple:  #6f42c1 !default;
-// $pink:    #e83e8c !default;
-// $red:     #dc3545 !default;
-// $orange:  #fd7e14 !default;
-// $yellow:  #ffc107 !default;
-// $green:   #28a745 !default;
-// $teal:    #20c997 !default;
-// $cyan:    #17a2b8 !default;
-
+// $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
+//
+// $gray-base: #000 !default;
+// $gray-900: lighten($gray-base, 13.5%) !default; // #222
+// $gray-800: lighten($gray-base, 26.6%) !default; // #444
+// $gray-700: lighten($gray-base, 46.6%) !default; // #777
+// $gray-600: lighten($gray-base, 73.3%) !default; // #bbb
+// $gray-100: lighten($gray-base, 93.5%) !default; // #eee
+//
+// $blue:   #2B4E72 !default;
+// $green:  #94BA65 !default;
+// $cyan:   #006666 !default;
+// $yellow: #ec9433 !default;
+// $red:    #CF4444 !default;
+// $dark:   darken($blue, 17%) !default;
+//
+// $theme-colors: (
+//   primary: $blue,
+//   secondary: $gray-700,
+//   success: $green,
+//   info: $cyan,
+//   warning: $yellow,
+//   danger: $red,
+//   light: $gray-100,
+//   dark: $dark
+// ) !default;
+//
+// $link-color: map-get($theme-colors, info) !default;

From 015f3b9607b98a3c68f2761be5b4de3292f0a6db Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 11 Jun 2021 11:01:31 -0500
Subject: [PATCH 055/169] Remove references to Testathon & Beta 5

---
 .../app/+home-page/home-news/home-news.component.html      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/themes/dspace/app/+home-page/home-news/home-news.component.html b/src/themes/dspace/app/+home-page/home-news/home-news.component.html
index 94a5975771..92ce1ba020 100644
--- a/src/themes/dspace/app/+home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/+home-page/home-news/home-news.component.html
@@ -3,7 +3,7 @@
     <div class="jumbotron jumbotron-fluid">
       <div class="d-flex flex-wrap">
         <div>
-          <h1 class="display-3">DSpace 7 - Beta 5</h1>
+          <h1 class="display-3">DSpace 7</h1>
           <p class="lead">DSpace is the world leading open source repository platform that enables
             organisations to:</p>
         </div>
@@ -20,10 +20,7 @@
         </li>
       </ul>
       <p>Join an international community of <a href="https://wiki.lyrasis.org/display/DSPACE/DSpace+Positioning" target="_blank">leading institutions using DSpace</a>.</p>
-      <p>Participate in the <a href="https://wiki.lyrasis.org/display/DSPACE/DSpace+Release+7.0+Testathon+Page"
-          target="_blank">official community Testathon</a>
-        from <strong>April 19th through May 7th</strong>. The test user accounts below have their password set to the name of
-        this
+      <p>The test user accounts below have their password set to the name of this
         software in lowercase.</p>
       <ul>
         <li>Demo Site Administrator = dspacedemo+admin@gmail.com</li>

From d253790c7df54a7dc452480347d4bdb2050f296f Mon Sep 17 00:00:00 2001
From: "David Cavrenne [Atmire]"
 <41991272+davidatmire@users.noreply.github.com>
Date: Sat, 12 Jun 2021 08:35:31 +0200
Subject: [PATCH 056/169] Updated version of the FR wordings (#1223)

Completed French message catalog.
---
 src/assets/i18n/fr.json5 | 6311 ++++++++++++++++----------------------
 1 file changed, 2698 insertions(+), 3613 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 982a360c7d..b5c5032260 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -1,6009 +1,5094 @@
 {
-  
+
   // "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "401.help": "You're not authorized to access this page. You can use the button below to get back to the home page.",
-  
+  "401.help": "Vous n'êtes pas autorisé à accéder à cette page. Vous pouvez utiliser le bouton ci-dessous pour revenir sur la page d'accueil.",
+
   // "401.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "401.link.home-page": "Take me to the home page",
-  
+  "401.link.home-page": "Retour sur la page d'accueil",
+
   // "401.unauthorized": "unauthorized",
-  // TODO New key - Add a translation
-  "401.unauthorized": "unauthorized",
-  
-  
-  
+  "401.unauthorized": "Accès non autorisé",
+
+
+
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  // TODO New key - Add a translation
-  "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
-  
+  "403.help": "Vous n'avez pas les permissions requises pour accéder à cette page. Vous pouvez utiliser le bouton ci-dessous pour revenir sur la page d'accueil.",
+
   // "403.link.home-page": "Take me to the home page",
-  // TODO New key - Add a translation
-  "403.link.home-page": "Take me to the home page",
-  
+  "403.link.home-page": "Retour sur la page d'accueil",
+
   // "403.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
-  
-  
-  
+  "403.forbidden": "Accès interdit",
+
+
+
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "La page que vous recherchez n'a pas pu être localisée. Cette page pourrait avoir été déplacée ou supprimée. Vous pouvez utiliser le bouton ci-dessous pour revenir sur la page d'accueil.",
-  
+
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Retour sur la page d'accueil",
-  
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Page introuvable",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
+  "admin.curation-tasks.breadcrumbs": "Tâches de conservation système",
+
   // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
-  
+  "admin.curation-tasks.title": "Tâches de conservation système",
+
   // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
-  
+  "admin.curation-tasks.header": "Tâches de conservation système",
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
+  "admin.registries.bitstream-formats.breadcrumbs": "Registre des formats",
+
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Format Bitstream",
+
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
   "admin.registries.bitstream-formats.create.failure.content": "Une erreur s'est produite lors de l'ajout du nouveau format Bitstream.",
-  
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Erreur",
-  
+
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
   "admin.registries.bitstream-formats.create.head": "Ajouter un format Bistream",
-  
+
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
   "admin.registries.bitstream-formats.create.new": "Ajouter un format Bitstream",
-  
+
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "Le nouveau format Bitstream a été ajouté avec succès.",
-  
+
   // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "Succès",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "La suppression de {{ amount }} format(s) a échoué",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "Échec",
-  
+
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "{{ amount }} format(s) ajouté(s) avec succès",
-  
+
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Succès",
-  
+
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "Cette liste des formats Bitstream contient les informations relatives aux formats connus et leur niveau de support.",
-  
+
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Format Bitstream",
+
   // "admin.registries.bitstream-formats.edit.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
-  
+
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.description.label": "Description",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.hint": "Extensions are file extensions that are used to automatically identify the format of uploaded files. You can enter several extensions for each format.",
   "admin.registries.bitstream-formats.edit.extensions.hint": "Les extensions de fichier sont utilisées pour identifier le format des fichiers téléchargés. Plusieurs extensions peuvent être encodées pour chaque format.",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "Extensions de fichier",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-  // TODO Source message changed - Revise the translation
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Veuillez entrer l'extension de fichier sans point",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.content": "Une erreur s'est produite lors de l'édition du format Bitstream.",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Échec",
-  
+
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
   "admin.registries.bitstream-formats.edit.head": "Format Bitstream: {{ format }}",
-  
+
   // "admin.registries.bitstream-formats.edit.internal.hint": "Formats marked as internal are hidden from the user, and used for administrative purposes.",
-  // TODO Source message changed - Revise the translation
   "admin.registries.bitstream-formats.edit.internal.hint": "Les formats identifiés en tant que formats internes sont cachés pour l'utilisateur et utilisés uniquement à des fins administratives.",
-  
+
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
   "admin.registries.bitstream-formats.edit.internal.label": "Interne",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.hint": "The MIME type associated with this format, does not have to be unique.",
   "admin.registries.bitstream-formats.edit.mimetype.hint": "Le type MIME associé avec ce format ne doit pas nécessairement être unique.",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
   "admin.registries.bitstream-formats.edit.mimetype.label": "Type MIME",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.hint": "A unique name for this format, (e.g. Microsoft Word XP or Microsoft Word 2000)",
   "admin.registries.bitstream-formats.edit.shortDescription.hint": "Nom unique pour ce format (p. ex. Microsoft Word XP or Microsoft Word 2000)",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Nom",
-  
+
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
   "admin.registries.bitstream-formats.edit.success.content": "Le format Bitstream a été édité avec succès.",
-  
+
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Succès",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "Le niveau de support auquel votre institution souscrit pour ce format.",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Niveau de support",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "Registre des formats Bitstream",
-  
+
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Aucun format Bitstream disponible.",
-  
+
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Supprimer les éléments sélectionnés",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "Désélectionner tout",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "interne",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "Type MIME",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nom",
-  
+
   // "admin.registries.bitstream-formats.table.return": "Return",
   "admin.registries.bitstream-formats.table.return": "Retour",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Connu",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supporté",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Inconnu",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Niveau de support",
-  
+
   // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "DSpace Angular :: Registre des formats Bitstream",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  
+  "admin.registries.metadata.breadcrumbs": "Registre de métadonnées",
+
   // "admin.registries.metadata.description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
   "admin.registries.metadata.description": "Le registre de métadonnées présente une liste à jour de tous les champs de métadonnées disponibles dans le dépôt. Ces champs peuvent être répartis entre plusieurs schémas. Le schéma Dublin Core qualifié est toutefois requis dans DSpace.",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "Ajouter un schéma de métadonnées",
-  
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "Éditer un schéma de métadonnées",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "Nom",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "Espace de nommage",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Registre de métadonnées",
-  
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Aucun schéma de métadonnées disponible.",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Supprimer les éléments sélectionnés",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Nom",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Espace de nommage",
-  
+
   // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
   "admin.registries.metadata.title": "DSpace Angular :: Registre de métadonnées",
-  
-  
-  
+
+
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
+  "admin.registries.schema.breadcrumbs": "Schéma de métadonnées",
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Ceci est le schéma de métadonnées correspondant à l'espace de nommage « {{namespace}} ».",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Champs de métadonnées du schéma",
-  
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Aucun champ de métadonnée disponible.",
-  
+
   // "admin.registries.schema.fields.table.delete": "Delete selected",
   "admin.registries.schema.fields.table.delete": "Supprimer les éléments sélectionnés",
-  
+
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Champ",
-  
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Note d'application",
-  
+
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "Ajouter un champ de métadonnées",
-  
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  "admin.registries.schema.form.edit": "Modifier champ de métadonnées",
-  
+  "admin.registries.schema.form.edit": "Éditer champ de métadonnées",
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Élément",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "Qualificatif",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "Note d'application",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Schéma de métadonnées",
-  
+
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "Schéma de métadonnées « {{prefix}} » créé avec succès",
-  
+
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "Erreur lors de la suppression de {{amount}} schéma(s) de métadonnées",
-  
+
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.success": "{{amount}} schéma(s) de métadonnées supprimé(s) avec succès",
-  
+
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Schéma de métadonnées « {{prefix}} » édité avec succès",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Erreur",
-  
+
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.created": "Champ de métadonnée « {{field}} » créé avec succès",
-  
+
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "Erreur lors de la suppression de {{amount}} champ(s) de métadonnées",
-  
+
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "{{amount}} champ(s) de métadonnées supprimé(s) avec succès",
-  
+
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "Champ de métadonnée « {{field}} » édité avec succès",
-  
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Succès",
-  
+
   // "admin.registries.schema.return": "Return",
   "admin.registries.schema.return": "Retour",
-  
+
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
   "admin.registries.schema.title": "DSpace Angular :: Registre des schémas de métadonnées",
-  
-  
-  
+
+
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  
+  "admin.access-control.epeople.actions.delete": "Supprimer EPerson",
+
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
+  "admin.access-control.epeople.actions.impersonate": "Se connecter en tant que cet(te) EPerson",
+
   // "admin.access-control.epeople.actions.reset": "Reset password",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.reset": "Reset password",
-  
+  "admin.access-control.epeople.actions.reset": "Réinitialiser le mot de passe",
+
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  
+  "admin.access-control.epeople.actions.stop-impersonating": "Retour à votre propre EPerson ",
+
   // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.head": "EPeople",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
-  
+  "admin.access-control.epeople.search.head": "Recherche",
+
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.see-all": "Browse All",
-  
+  "admin.access-control.epeople.button.see-all": "Voir tout",
+
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.scope.metadata": "Metadata",
-  
+  "admin.access-control.epeople.search.scope.metadata": "Métadonnées",
+
   // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
-  
+
   // "admin.access-control.epeople.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
-  
+  "admin.access-control.epeople.search.button": "Rechercher",
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.button.add": "Add EPerson",
-  
+  "admin.access-control.epeople.button.add": "Ajouter EPerson",
+
   // "admin.access-control.epeople.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.table.id": "ID",
-  
+
   // "admin.access-control.epeople.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.name": "Name",
-  
+  "admin.access-control.epeople.table.name": "Nom",
+
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
+
   // "admin.access-control.epeople.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit": "Edit",
-  
+  "admin.access-control.epeople.table.edit": "Éditer",
+
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  
+  "admin.access-control.epeople.table.edit.buttons.edit": "Éditer \"{{name}}\"",
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  
+  "admin.access-control.epeople.table.edit.buttons.remove": "Supprimer \"{{name}}\"",
+
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.no-items": "No EPeople to show.",
-  
+  "admin.access-control.epeople.no-items": "Aucune EPerson ne correspond à votre recherche",
+
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
-  
+  "admin.access-control.epeople.form.create": "Créer EPerson",
+
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.edit": "Edit EPerson",
-  
+  "admin.access-control.epeople.form.edit": "Éditer EPerson",
+
   // "admin.access-control.epeople.form.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
-  
+  "admin.access-control.epeople.form.firstName": "Prénom",
+
   // "admin.access-control.epeople.form.lastName": "Last name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.lastName": "Last name",
-  
+  "admin.access-control.epeople.form.lastName": "Nom de famille",
+
   // "admin.access-control.epeople.form.email": "E-mail",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.form.email": "E-mail",
-  
+
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-  
+  "admin.access-control.epeople.form.emailHint": "Il doit s'agir d'une adresse mail valide",
+
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
+  "admin.access-control.epeople.form.canLogIn": "Peut se connecter",
+
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
-  
+  "admin.access-control.epeople.form.requireCertificate": "Doit avoir recours à un certificat",
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.created.success": "EPerson \"{{name}}\" créée avec succès",
+
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.created.failure": "Erreur lors de la création de l'EPerson \"{{name}}\"",
+
   // "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Erreur lors de la création de l'EPerson \"{{name}}\", l'adresse mail \"{{email}}\" est déjà utilisée.",
+
   // "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",
-  
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Erreur lors de la modification de l'EPerson \"{{name}}\", l'adresse mail \"{{email}}\" est déjà utilisée.",
+
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{name}}\" modifiée avec succès",
+
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.edited.failure": "Erreur lors de la modification de l'EPerson \"{{name}}\"",
+
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.deleted.success": "EPerson \"{{name}}\" supprimée avec succès",
+
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.deleted.failure": "Erreur lors de la suppression de l'EPerson \"{{name}}\"",
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-  
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membre des groupes suivants :",
+
   // "admin.access-control.epeople.form.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.epeople.form.table.id": "ID",
-  
+
   // "admin.access-control.epeople.form.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.table.name": "Name",
-  
+  "admin.access-control.epeople.form.table.name": "Nom",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  
+  "admin.access-control.epeople.form.memberOfNoGroups": "Cette EPerson n'est membre d'aucun groupe",
+
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
+  "admin.access-control.epeople.form.goToGroups": "Ajouter groupe(s)",
+
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  
+  "admin.access-control.epeople.notification.deleted.failure": "Erreur lors de la suppression de l'EPerson \"{{name}}\"",
+
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  
-  
-  
+  "admin.access-control.epeople.notification.deleted.success": "EPerson \"{{name}}\" supprimée avec succès",
+
+
+
   // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
+  "admin.access-control.groups.title": "DSpace Angular :: Groupes",
+
   // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  
+  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Éditer Groupe",
+
   // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  
+  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Nouveau Groupe",
+
   // "admin.access-control.groups.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.head": "Groups",
-  
+  "admin.access-control.groups.head": "Groupes",
+
   // "admin.access-control.groups.button.add": "Add group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.add": "Add group",
-  
+  "admin.access-control.groups.button.add": "Ajouter groupe",
+
   // "admin.access-control.groups.search.head": "Search groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.head": "Search groups",
-  
+  "admin.access-control.groups.search.head": "Recherche",
+
   // "admin.access-control.groups.button.see-all": "Browse all",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.button.see-all": "Browse all",
-  
+  "admin.access-control.groups.button.see-all": "Voir tout",
+
   // "admin.access-control.groups.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
-  
+  "admin.access-control.groups.search.button": "Rechercher",
+
   // "admin.access-control.groups.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.table.id": "ID",
-  
+
   // "admin.access-control.groups.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.name": "Name",
-  
+  "admin.access-control.groups.table.name": "Nom",
+
   // "admin.access-control.groups.table.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "Members",
-  
+  "admin.access-control.groups.table.members": "Membres",
+
   // "admin.access-control.groups.table.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit": "Edit",
-  
+  "admin.access-control.groups.table.edit": "Éditer",
+
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
-  
+  "admin.access-control.groups.table.edit.buttons.edit": "Éditer \"{{name}}\"",
+
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  
+  "admin.access-control.groups.table.edit.buttons.remove": "Supprimer \"{{name}}\"",
+
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
-  
+  "admin.access-control.groups.no-items": "Aucun groupe ne correspond à ce nom ou cet identifiant UUID",
+
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  
+  "admin.access-control.groups.notification.deleted.success": "Groupe \"{{name}}\" supprimé avec succès",
+
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  
+  "admin.access-control.groups.notification.deleted.failure.title": "Erreur lors de la suppression du groupe \"{{name}}\"",
+
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  
-  
-  
+  "admin.access-control.groups.notification.deleted.failure.content": "Cause : \"{{cause}}\"",
+
+
+
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
-  
+  "admin.access-control.groups.form.alert.permanent": "Ce groupe est permanent et ne peut, par conséquent, être édité ou supprimé.  Ici, vous pouvez cependant ajouter ou retirer des membres au groupe.",
+
   // "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.alert.workflowGroup": "This group can’t be modified or deleted because it corresponds to a role in the submission and workflow process in the \"{{name}}\" {{comcol}}. You can delete it from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page. You can still add and remove group members using this page.",
-  
+  "admin.access-control.groups.form.alert.workflowGroup": "Ce groupe ne peut être modifié ou supprimé car il correspond à un rôle dans le processus de dépôt et/ou de validation dans \"{{name}}\" {{comcol}}. Vous pouvez le supprimer depuis l'onglet <a href='{{comcolEditRolesRoute}}'>\"Attribuer des rôles\"</a> de la page d'édition {{comcol}}. Ici, vous pouvez cependant ajouter ou retirer des membres au groupe.",
+
   // "admin.access-control.groups.form.head.create": "Create group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.create": "Create group",
-  
+  "admin.access-control.groups.form.head.create": "Créer groupe",
+
   // "admin.access-control.groups.form.head.edit": "Edit group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.edit": "Edit group",
-  
+  "admin.access-control.groups.form.head.edit": "Éditer groupe",
+
   // "admin.access-control.groups.form.groupName": "Group name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupName": "Group name",
-  
+  "admin.access-control.groups.form.groupName": "Nom du groupe",
+
   // "admin.access-control.groups.form.groupDescription": "Description",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.groupDescription": "Description",
-  
+
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  
+  "admin.access-control.groups.form.notification.created.success": "Groupe \"{{name}}\" créé avec succès",
+
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  
+  "admin.access-control.groups.form.notification.created.failure": "Erreur lors de la création du groupe \"{{name}}\"",
+
   // "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
-  
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Erreur lors de la création du groupe \"{{name}}\", veuillez vérifier que ce nom n'est pas déjà utilisé.",
+
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  
+  "admin.access-control.groups.form.notification.edited.failure": "Erreur lors de la modification du groupe \"{{name}}\"",
+
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Le nom \"{{name}}\" est déjà utilisé!",
+
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  
+  "admin.access-control.groups.form.notification.edited.success": "Groupe \"{{name}}\" édité avec succès",
+
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
+  "admin.access-control.groups.form.actions.delete": "Supprimer groupe",
+
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  
+  "admin.access-control.groups.form.delete-group.modal.header": "Supprimer groupe \"{{ dsoName }}\"",
+
   // "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.info": "Are you sure you want to delete Group \"{{ dsoName }}\"",
-  
+  "admin.access-control.groups.form.delete-group.modal.info": "Êtes-vous certain de vouloir supprimer le groupe \"{{ dsoName }}\"",
+
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
-  
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Annuler",
+
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Supprimer",
+
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  
+  "admin.access-control.groups.form.notification.deleted.success": "Groupe \"{{ name }}\" supprimé avec succès",
+
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Erreur lors de la suppression du groupe \"{{ name }}\"",
+
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Cause : \"{{ cause }}\"",
+
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.members-list.head": "EPeople",
-  
+
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  
+  "admin.access-control.groups.form.members-list.search.head": "Ajouter EPeople",
+
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  
+  "admin.access-control.groups.form.members-list.button.see-all": "Voir tout",
+
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.headMembers": "Current Members",
-  
+  "admin.access-control.groups.form.members-list.headMembers": "Membres actuels",
+
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Métadonnées",
+
   // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  
+
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.search.button": "Search",
-  
+  "admin.access-control.groups.form.members-list.search.button": "Rechercher",
+
   // "admin.access-control.groups.form.members-list.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.members-list.table.id": "ID",
-  
+
   // "admin.access-control.groups.form.members-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.name": "Name",
-  
+  "admin.access-control.groups.form.members-list.table.name": "Nom",
+
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-  
+  "admin.access-control.groups.form.members-list.table.edit": "Supprimer / Ajouter",
+
   // "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Supprimer \"{{name}}\"",
+
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Membre \"{{name}}\" ajouté avec succès",
+
   // "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Erreur lors de l'ajout de \"{{name}}\"",
+
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Membre \"{{name}}\" supprimé avec succès",
+
   // "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Erreur lors de la suppression de \"{{name}}\"",
+
   // "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Ajouter \"{{name}}\"",
+
   // "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Pas de groupe actif, veuillez d'abord entrer un nom.",
+
   // "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",
-  
+  "admin.access-control.groups.form.members-list.no-members-yet": "Ce groupe ne contient pas encore de membres, vous pouvez en rechercher et les ajouter.",
+
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  
+  "admin.access-control.groups.form.members-list.no-items": "Aucune EPerson ne correspond à cette recherche",
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Une erreur s'est produite : \"{{cause}}\"",
+
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
+  "admin.access-control.groups.form.subgroups-list.head": "Groupes",
+
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-  
+  "admin.access-control.groups.form.subgroups-list.search.head": "Ajouter un sous-groupe",
+
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Parcourir tout",
+
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-  
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Sous-groupes actuels",
+
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.search.button": "Search",
-  
+  "admin.access-control.groups.form.subgroups-list.search.button": "Rechercher",
+
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  
+  "admin.access-control.groups.form.subgroups-list.table.name": "Nom",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-  
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Supprimer / Ajouter",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Supprimer le sous-groupe \"{{name}}\"",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Ajouter le sous-groupe \"{{name}}\"",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Groupe actuel",
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Sous-groupe \"{{name}}\" ajouté avec succès",
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Erreur lors de la création du sous-groupe \"{{name}}\"",
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Sous-groupe \"{{name}}\" supprimé avec succès",
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Erreur lors de la suppression du sous-groupe \"{{name}}\"",
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Pas de groupe actif, veuillez d'abord entrer un nom.",
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "This is the current group, can't be added.",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Il s'agit du groupe actuel, impossible de l'ajouter comme sous-groupe.",
+
   // "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",
-  
+  "admin.access-control.groups.form.subgroups-list.no-items": "Aucun groupe ne correspond à ce nom ou cet identifiant UUID",
+
   // "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Pas encore de sous-groupes liés à ce groupe.",
+
   // "admin.access-control.groups.form.return": "Return to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
+  "admin.access-control.groups.form.return": "Retour aux groupes",
+
+
+
   // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
-  
+  "admin.search.breadcrumbs": "Recherche Administrateur",
+
   // "admin.search.collection.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.collection.edit": "Edit",
-  
+  "admin.search.collection.edit": "Éditer",
+
   // "admin.search.community.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.community.edit": "Edit",
-  
+  "admin.search.community.edit": "Éditer",
+
   // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
-  
+  "admin.search.item.delete": "Supprimer",
+
   // "admin.search.item.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.item.edit": "Edit",
-  
+  "admin.search.item.edit": "Éditer",
+
   // "admin.search.item.make-private": "Make Private",
-  // TODO New key - Add a translation
-  "admin.search.item.make-private": "Make Private",
-  
+  "admin.search.item.make-private": "Rendre privé",
+
   // "admin.search.item.make-public": "Make Public",
-  // TODO New key - Add a translation
-  "admin.search.item.make-public": "Make Public",
-  
+  "admin.search.item.make-public": "Rendre public",
+
   // "admin.search.item.move": "Move",
-  // TODO New key - Add a translation
-  "admin.search.item.move": "Move",
-  
+  "admin.search.item.move": "Déplacer",
+
   // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
-  
+  "admin.search.item.reinstate": "Restaurer",
+
   // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
-  
+  "admin.search.item.withdraw": "Retirer",
+
   // "admin.search.title": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.title": "Administrative Search",
-  
+  "admin.search.title": "Recherche Administrateur",
+
   // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
+  "administrativeView.search.results.head": "Recherche Administrateur",
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
-  
+  "admin.workflow.breadcrumbs": "Workflow Administrateur",
+
   // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
-  
+  "admin.workflow.title": "Workflow Adminisrateur",
+
   // "admin.workflow.item.workflow": "Workflow",
-  // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
-  
+
   // "admin.workflow.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.workflow.item.delete": "Delete",
-  
+  "admin.workflow.item.delete": "Supprimer",
+
   // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
-  
-  
-  
+  "admin.workflow.item.send-back": "Retourner au déposant",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
+  "admin.metadata-import.breadcrumbs": "Importer Métadonnées",
+
   // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
-  
+  "admin.metadata-import.title": "Importer Métadonnées",
+
   // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
-  
+  "admin.metadata-import.page.header": "Importer Métadonnées",
+
   // "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.help": "You can drop or browse CSV files that contain batch metadata operations on files here",
-  
+  "admin.metadata-import.page.help": "Ici, vous pouvez glisser-déposer ou rechercher des fichiers CSV qui contiennent des opérations sur métadonnées",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  
+  "admin.metadata-import.page.dropMsg": "Déposer un fichier CSV à importer",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  
+  "admin.metadata-import.page.dropMsgReplace": "Déposer un nouveau fichier CSV pour remplacer le fichier à importer",
+
   // "admin.metadata-import.page.button.return": "Return",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.return": "Return",
-  
+  "admin.metadata-import.page.button.return": "Retour",
+
   // "admin.metadata-import.page.button.proceed": "Proceed",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.proceed": "Proceed",
-  
+  "admin.metadata-import.page.button.proceed": "Importer",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
+  "admin.metadata-import.page.error.addFile": "Veuillez d'abord sélectionner un fichier",
+
+
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Adresse e-mail ou mot de passe non valide.",
-  
+
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Votre session a expiré. Veuillez vous reconnecter.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
   "bitstream.edit.bitstream": "Bitstream: ",
-  
+
   // "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.hint": "Optionally, provide a brief description of the file, for example \"<i>Main article</i>\" or \"<i>Experiment data readings</i>\".",
-  
+  "bitstream.edit.form.description.hint": "Il vous est possible d'entrer une description facultative pour le fichier, par exemple \"<i>Article principal</i>\" ou \"<i>Données sous-jacentes</i>\".",
+
   // "bitstream.edit.form.description.label": "Description",
-  // TODO New key - Add a translation
   "bitstream.edit.form.description.label": "Description",
-  
+
   // "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.hint": "The first day from which access is allowed. <b>This date cannot be modified on this form.</b> To set an embargo date for a bitstream, go to the <i>Item Status</i> tab, click <i>Authorizations...</i>, create or edit the bitstream's <i>READ</i> policy, and set the <i>Start Date</i> as desired.",
-  
+  "bitstream.edit.form.embargo.hint": "Le premier jour à partir duquel l'accès est autorisé. <b>Cette date ne peut être modifiée depuis ce formulaire.</b> Pour définir une date d'embargo sur un fichier, aller dans l'onglet <i>Statut Item</i>, cliquer sur <i>Autorisations...</i>, créer ou éditer les politiques <i>READ</i> du fichier et configurer la <i>Date de début</i> souhaitée.",
+
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
+  "bitstream.edit.form.embargo.label": "Embargo jusqu'à une date spécifique",
+
   // "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.hint": "Change the filename for the bitstream. Note that this will change the display bitstream URL, but old links will still resolve as long as the sequence ID does not change.",
-  
+  "bitstream.edit.form.fileName.hint": "Changer le nom du fichier. Ceci modifiera l'URL affichée pour le fichier mais les anciens liens continuerons de fonctionner tant que le numéro de séquence n'est pas modifié.",
+
   // "bitstream.edit.form.fileName.label": "Filename",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.label": "Filename",
-  
+  "bitstream.edit.form.fileName.label": "Nom du fichier",
+
   // "bitstream.edit.form.newFormat.label": "Describe new format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.label": "Describe new format",
-  
+  "bitstream.edit.form.newFormat.label": "Décrire nouveau format",
+
   // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-  
+  "bitstream.edit.form.newFormat.hint": "L'application utilisée pour créer le fichier et le numéro de version (par exemple, \"<i>ACMESoft SuperApp version 1.5</i>\").",
+
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
+  "bitstream.edit.form.primaryBitstream.label": "Bitstream principal",
+
   // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
-  
+  "bitstream.edit.form.selectedFormat.hint": "Si le format souhaité ne se trouve pas dans la liste ci-dessus, <b>sélectionner \"Format non disponible dans la liste\" ci-dessus</b> et le décrire via \"Décrire nouveau format\".",
+
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
+  "bitstream.edit.form.selectedFormat.label": "Format sélectionné",
+
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  
+  "bitstream.edit.form.selectedFormat.unknown": "Format non disponible dans la liste",
+
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  
+  "bitstream.edit.notifications.error.format.title": "Une erreur s'est produite lors de la sauvegarde du format bitstream",
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-  
+  "bitstream.edit.notifications.saved.content": "Vos changements ont bien été sauvegardés.",
+
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
+  "bitstream.edit.notifications.saved.title": "Bitstream sauvegardé",
+
   // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
+  "bitstream.edit.title": "Éditer Bitstream",
+
+
+
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Auteur",
-  
+
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "Date de publication",
-  
+
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Sujet",
-  
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Titre",
-  
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Parcourir par",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "Aucun résultat.",
-  
+
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "Auteur",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "Date de publication",
-  
+
   // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "Sujet",
-  
+
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Titre",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
+  "browse.metadata.author.breadcrumbs": "Parcourir par Auteur",
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
+  "browse.metadata.dateissued.breadcrumbs": "Parcourir par Date",
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
+  "browse.metadata.subject.breadcrumbs": "Parcourir par Sujet",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
+  "browse.metadata.title.breadcrumbs": "Parcourir par Titre",
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Choisir point de départ)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Choisir l'année)",
-  
+
   // "browse.startsWith.jump": "Jump to a point in the index:",
   "browse.startsWith.jump": "Aller directement à une entrée de l'index :",
-  
+
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Avril",
-  
+
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "Août",
-  
+
   // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "Décembre",
-  
+
   // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "Février",
-  
+
   // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "Janvier",
-  
+
   // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "Juillet",
-  
+
   // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "Juin",
-  
+
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "Mars",
-  
+
   // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "Mai",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Choisir le mois)",
-  
+
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "Novembre",
-  
+
   // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "Octobre",
-  
+
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "Septembre",
-  
+
   // "browse.startsWith.submit": "Go",
   "browse.startsWith.submit": "Valider",
-  
+
   // "browse.startsWith.type_date": "Or type in a date (year-month):",
   "browse.startsWith.type_date": "Ou saisir une date (année-mois) :",
-  
+
   // "browse.startsWith.type_text": "Or enter first few letters:",
   "browse.startsWith.type_text": "Ou saisir les premières lettres :",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title": "Parcourir {{ collection }} par {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Supprimer fragment",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Créer une Collection",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
-  
+  "collection.create.notifications.success": "Collection créée avec succès",
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Créer une Collection au sein de la Communauté {{ parent }}",
-  
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
-  
+  "collection.curate.header": "Gestion contenu Collection: {{collection}}",
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Annuler",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Valider",
-  
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Supprimer Collection",
-  
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "La Collection n'a pas pu être supprimée",
-  
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "Collection supprimée avec succès",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Êtes-vous certain de vouloir supprimer la Collection « {{ dso }} »",
-  
-  
-  
+
+
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Supprimer cette Collection",
-  
+
   // "collection.edit.head": "Edit Collection",
   "collection.edit.head": "Éditer Collection",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
+  "collection.edit.breadcrumbs": "Éditer Collection",
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  // TODO New key - Add a translation
   "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  
+
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Annuler",
-  
+
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   "collection.edit.item-mapper.collection": "Collection : « <b>{{name}}</b> »",
-  
+
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Associer les Items sélectionnés",
-  
+
   // "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
   "collection.edit.item-mapper.description": "L'Item Mapper permet aux administrateurs de Collection d'associer des Items provenant d'autres Collections dans cette Collection. Vous pouvez rechercher des Items d'autres Collections et les associer, ou consulter la liste des Items actuellement associés.",
-  
+
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
   "collection.edit.item-mapper.head": "Item Mapper - Associer des Items provenant d'autres Collections",
-  
+
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
   "collection.edit.item-mapper.no-search": "Veuillez entrer un élément à rechercher",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.error.content": "Des erreurs se sont produites lors de l'association de {{amount}} Item(s).",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "Erreurs d'association",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} Item(s) associé(s) avec succès.",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Association terminée",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
   "collection.edit.item-mapper.notifications.unmap.error.content": "Des erreurs se sont produites lors de la suppression de l'association de {{amount}} Item(s).",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Erreurs de suppression d'association",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
   "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} association(s) supprimée(s) avec succès.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Suppression d'association terminée",
-  
+
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Supprimer les associations sélectionnées",
-  
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Parcourir les Items associés",
-  
+
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Associer nouveaux Items",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
-  
+  "collection.edit.logo.label": "Logo de la Collection",
+
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  
+  "collection.edit.logo.notifications.add.error": "Erreur lors du chargement du logo de la Collection. Veuillez vérifier le contenu et réessayer.",
+
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-  
+  "collection.edit.logo.notifications.add.success": "Logo de la Collection chargé avec succès.",
+
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  
+  "collection.edit.logo.notifications.delete.success.title": "Logo supprimé",
+
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-  
+  "collection.edit.logo.notifications.delete.success.content": "Logo de la Collection supprimé avec succès",
+
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+  "collection.edit.logo.notifications.delete.error.title": "Erreur lors de la suppression du logo de la Collection.",
+
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  // TODO New key - Add a translation
-  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  
-  
-  
+  "collection.edit.logo.upload": "Glisser-Déposer un logo à charger pour la Collection",
+
+
+
   // "collection.edit.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
-  
+  "collection.edit.notifications.success": "Collection mise à jour avec succès",
+
   // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
-  
-  
-  
+  "collection.edit.return": "Retour",
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
-  
+  "collection.edit.tabs.curate.head": "Gestion du contenu",
+
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  
+  "collection.edit.tabs.curate.title": "Édition Collection - Gestion du contenu",
+
   // "collection.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+  "collection.edit.tabs.authorizations.head": "Autorisations",
+
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  
+  "collection.edit.tabs.authorizations.title": "Édition Collection - Autorisations",
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.head": "Edit Metadata",
-  
+  "collection.edit.tabs.metadata.head": "Éditer Métadonnées",
+
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  
+  "collection.edit.tabs.metadata.title": "Édition Collection - Métadonnées",
+
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
-  
+  "collection.edit.tabs.roles.head": "Attribuer des rôles",
+
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  
+  "collection.edit.tabs.roles.title": "Édition Collection - Rôles",
+
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-  
+  "collection.edit.tabs.source.external": "Cette Collection moissonne son contenu depuis une source externe",
+
   // "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "You must provide a set id of the target collection.",
-  
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Vous devez fournir l'ID du set OAI correspondant à la Collection cible.",
+
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
+  "collection.edit.tabs.source.form.harvestType": "Contenu en cours de moissonnage",
+
   // "collection.edit.tabs.source.form.head": "Configure an external source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.head": "Configure an external source",
-  
+  "collection.edit.tabs.source.form.head": "Configurer une source externe",
+
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
+  "collection.edit.tabs.source.form.metadataConfigId": "Format de métadonnées",
+
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
-  
+  "collection.edit.tabs.source.form.oaiSetId": "ID spécifique du set OAI",
+
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
+  "collection.edit.tabs.source.form.oaiSource": "Fournisseur OAI",
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Harvest metadata and bitstreams (requires ORE support)",
-  
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Moissonner métadonnées et bitstreams (le protocol ORE doit être supporté)",
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (requires ORE support)",
-  
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Moissonner métadonnées et bitstreams (le protocol ORE doit être supporté)",
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
-  
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Moissonner métadonnées uniquement",
+
   // "collection.edit.tabs.source.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
-  
+  "collection.edit.tabs.source.head": "Source de contenu",
+
   // "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  
+  "collection.edit.tabs.source.notifications.discarded.content": "Vos changements ont été annulés. Pour restaurer vos changements, veuillez cliquer sur le bouton 'Annuler'",
+
   // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
+  "collection.edit.tabs.source.notifications.discarded.title": "Changements annulés",
+
   // "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
-  
+  "collection.edit.tabs.source.notifications.invalid.content": "Vos changements n'ont pas été sauvegardés. Veuillez vérifier que tous les champs sont valides avant de sauvegarder.",
+
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
+  "collection.edit.tabs.source.notifications.invalid.title": "Metadonnée invalide",
+
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
-  
+  "collection.edit.tabs.source.notifications.saved.content": "Les changements relatifs à la source de contenu de cette Collection ont bien été sauvegardés.",
+
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
+  "collection.edit.tabs.source.notifications.saved.title": "Source de contenu sauvegardée",
+
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  
-  
-  
+  "collection.edit.tabs.source.title": "Édition Collection - Source de contenu",
+
+
+
   // "collection.edit.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
-  
+  "collection.edit.template.add-button": "Ajouter",
+
   // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
-  
+  "collection.edit.template.breadcrumbs": "Template Item",
+
   // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
-  
+  "collection.edit.template.cancel": "Annuler",
+
   // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
-  
+  "collection.edit.template.delete-button": "Supprimer",
+
   // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
-  
+  "collection.edit.template.edit-button": "Éditer",
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  // TODO New key - Add a translation
-  "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  
+  "collection.edit.template.head": "Éditer le Template Item (modèle de document) pour la Collection \"{{ collection }}\"",
+
   // "collection.edit.template.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
-  
+  "collection.edit.template.label": "Template Item",
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-  
+  "collection.edit.template.notifications.delete.error": "Erreur lors de la suprresion du Template Item",
+
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  
+  "collection.edit.template.notifications.delete.success": "Item Template supprimé avec succès",
+
   // "collection.edit.template.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
+  "collection.edit.template.title": "Éditer Template Item",
+
+
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Description succincte",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "Texte d'introduction (HTML)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "Veuillez entrer un nom de Collection",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "Licence",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "Provenance",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "Texte de copyright (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Nouvelles (HTML)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "Nom",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
-  // TODO New key - Add a translation
   "collection.listelement.badge": "Collection",
-  
-  
-  
+
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Dépôts récents",
-  
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "Aucun dépôt disponible",
-  
+
   // "collection.page.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "collection.page.edit": "Edit this collection",
-  
+  "collection.page.edit": "Éditer cette Collection",
+
   // "collection.page.handle": "Permanent URI for this collection",
   "collection.page.handle": "URI permanent de cette Collection",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "Licence",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Nouvelles",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmer sélection",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Aucune Collection disponible",
-  
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Titre",
-  
-  
-  
+
+
+
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
-  
+  "collection.source.update.notifications.error.content": "Les paramètres fournis sont invalides. La connection n'a pas pu être établie.",
+
   // "collection.source.update.notifications.error.title": "Server Error",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
+  "collection.source.update.notifications.error.title": "Erreur serveur",
+
+
   // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
-  
+  "communityList.tabTitle": "DSpace - Liste des Communautés",
+
   // "communityList.title": "List of Communities",
-  // TODO New key - Add a translation
-  "communityList.title": "List of Communities",
-  
+  "communityList.title": "Liste des Communautés",
+
   // "communityList.showMore": "Show More",
-  // TODO New key - Add a translation
-  "communityList.showMore": "Show More",
-  
-  
-  
+  "communityList.showMore": "Voir plus",
+
+
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Créer une Communauté",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
-  
+  "community.create.notifications.success": "Communauté créée avec succès",
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Créer une Sous-Communauté pour la Communauté {{ parent }}",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
-  
+  "community.curate.header": "Gestion contenu Communauté : {{community}}",
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Annuler",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Confirmer",
-  
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Supprimer Communauté",
-  
+
   // "community.delete.notification.fail": "Community could not be deleted",
   "community.delete.notification.fail": "La Communauté n'a pas pu être supprimée",
-  
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "La Communauté a été supprimée avec succès",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "Êtes-vous sûr(e) de vouloir supprimer la Communauté « {{ dso }} »",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Supprimer cette Communauté",
-  
+
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Éditer Communauté",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.breadcrumbs": "Edit Community",
-  
-  
+  "community.edit.breadcrumbs": "Éditer Communauté",
+
+
   // "community.edit.logo.label": "Community logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.label": "Community logo",
-  
+  "community.edit.logo.label": "Logo de la Communauté",
+
   // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  
+  "community.edit.logo.notifications.add.error": "Erreur lors du chargement du logo de la Communauté. Veuillez vérifier le contenu et réessayer.",
+
   // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  
+  "community.edit.logo.notifications.add.success": "Logo de la Communauté chargé avec succès.",
+
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  
+  "community.edit.logo.notifications.delete.success.title": "Logo supprimé",
+
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  
+  "community.edit.logo.notifications.delete.success.content": "Logo de la Communauté supprimé avec succès",
+
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+  "community.edit.logo.notifications.delete.error.title": "Erreur lors de la suppression du logo de la Communauté.",
+
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  // TODO New key - Add a translation
-  "community.edit.logo.upload": "Drop a Community Logo to upload",
-  
-  
-  
+  "community.edit.logo.upload": "Glisser-Déposer un logo à charger pour la Communauté",
+
+
+
   // "community.edit.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
-  
+  "community.edit.notifications.success": "Communauté mise à jour avec succès",
+
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  // TODO New key - Add a translation
-  "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-  
+  "community.edit.notifications.unauthorized": "Vous n'avez pas les autorisations requises pour réaliser ce changement",
+
   // "community.edit.notifications.error": "An error occured while editing the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.error": "An error occured while editing the Community",
-  
+  "community.edit.notifications.error": "Une erreur s'est produite lors de l'édition de la Communauté",
+
   // "community.edit.return": "Return",
-  // TODO New key - Add a translation
-  "community.edit.return": "Return",
-  
-  
-  
+  "community.edit.return": "Retour",
+
+
+
   // "community.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
-  
+  "community.edit.tabs.curate.head": "Gestion du contenu",
+
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.title": "Community Edit - Curate",
-  
+  "community.edit.tabs.curate.title": "Édition Communauté - Gestion du contenu",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit Metadata",
-  
+  "community.edit.tabs.metadata.head": "Éditer Métadonnées",
+
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  
+  "community.edit.tabs.metadata.title": "Édition Communauté - Métadonnées",
+
   // "community.edit.tabs.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
-  
+  "community.edit.tabs.roles.head": "Attribuer des rôles",
+
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.title": "Community Edit - Roles",
-  
+  "community.edit.tabs.roles.title": "Édition Communauté - Rôles",
+
   // "community.edit.tabs.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
-  
+  "community.edit.tabs.authorizations.head": "Autorisations",
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
+  "community.edit.tabs.authorizations.title": "Édition Communauté - Autorisations",
+
+
+
   // "community.listelement.badge": "Community",
-  // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
-  
-  
-  
+  "community.listelement.badge": "Communauté",
+
+
+
   // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
-  
+  "comcol-role.edit.no-group": "Aucun",
+
   // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
-  
+  "comcol-role.edit.create": "Créer",
+
   // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
-  
+  "comcol-role.edit.restrict": "Restreindre",
+
   // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
-  
-  
+  "comcol-role.edit.delete": "Supprimer",
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.name": "Administrators",
-  
+  "comcol-role.edit.community-admin.name": "Administrateurs",
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
+  "comcol-role.edit.collection-admin.name": "Administrateurs",
+
+
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  
+  "comcol-role.edit.community-admin.description": "Les administrateurs de Communauté peuvent créer des Sous-Communautés ou Collections et gérer ou assigner la gestion de ces Sous-Communautés ou Collections. De plus, ils peuvent déterminer qui peut déposer des Items dans toutes les Collections de la Communauté, éditer les métadonnées (après dépôt) et ajouter (mapper) les Items existants dans d'autres Collections (en fonction des autorisations appropriées).",
+
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
-  
-  
+  "comcol-role.edit.collection-admin.description": "Les administrateurs de Collection peuvent déterminer qui peut déposer des Items dans la Collection, éditer les métadonnées (après dépôt) et ajouter (mapper) les Items existants dans d'autres collections (en fonction des autorisations appropriées).",
+
+
   // "comcol-role.edit.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.name": "Submitters",
-  
+  "comcol-role.edit.submitters.name": "Déposants",
+
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
-  
-  
+  "comcol-role.edit.submitters.description": "Utilisateurs E-People et Groupes qui ont la permission de dépôt dans cette Collection.",
+
+
   // "comcol-role.edit.item_read.name": "Default item read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.name": "Default item read access",
-  
+  "comcol-role.edit.item_read.name": "Accès en lecture (Item) par défaut",
+
   // "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.description": "E-People and Groups that can read new items submitted to this collection. Changes to this role are not retroactive. Existing items in the system will still be viewable by those who had read access at the time of their addition.",
-  
+  "comcol-role.edit.item_read.description": "Utilisateurs E-People et Groupes qui peuvent voir les nouveaux Items déposés dans cette Collection. Les changements appliqués à ce rôle ne sont pas rétroactifs. Les Items existants dans le système resteront visibles par les utilisateurs/groupes qui disposaient des droits de lecture avant l'application du changement.",
+
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
-  
-  
+  "comcol-role.edit.item_read.anonymous-group": "Les droits de lecture par défaut sur les nouveaux Items sont actuellement octroyés au groupe Anonymous (correspondant aux utilisateurs non connectés).",
+
+
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  
+  "comcol-role.edit.bitstream_read.name": "Droits de lecture Bitstream par défaut",
+
   // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  
+  "comcol-role.edit.bitstream_read.description": "Les administrateurs de Communauté peuvent créer des Sous-Communautés ou Collections et gérer ou assigner la gestion de ces Sous-Communautés ou Collections. De plus, ils peuvent déterminer qui peut déposer des Items dans toutes les Collections de la Communauté, éditer les métadonnées (après dépôt) et ajouter (mapper) les Items existants dans d'autres Collections (en fonction des autorisations appropriées).",
+
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
-  
-  
+  "comcol-role.edit.bitstream_read.anonymous-group": "Les droits de lecture par défaut sur les nouveaux Bitstreams sont actuellement octroyés au groupe Anonymous (correspondant aux utilisateurs non connectés).",
+
+
   // "comcol-role.edit.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.name": "Editors",
-  
+  "comcol-role.edit.editor.name": "Éditeurs",
+
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
-  
-  
+  "comcol-role.edit.editor.description": "Les éditeurs peuvent modifier les métadonnées des dépôts avant de les accepter ou de les refuser.",
+
   // "comcol-role.edit.finaleditor.name": "Final editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.name": "Final editors",
-  
+  "comcol-role.edit.finaleditor.name": "Éditeurs finaux",
+
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
-  
-  
+  "comcol-role.edit.finaleditor.description": "Les éditeurs finaux peuvent modifier les métadonnées des dépôts mais ne sont pas en mesure de les rejeter.",
+
   // "comcol-role.edit.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.name": "Reviewers",
-  
+  "comcol-role.edit.reviewer.name": "Approbateur",
+
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
-  
-  
-  
+  "comcol-role.edit.reviewer.description": "Les approbateurs peuvent accepter ou refuser les dépôts mais ne sont pas en mesure de modifier les métadonnées de ces dépôts.",
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Description succincte",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "Texte d'introduction (HTML)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "Veuillez entrer un nom de Communauté",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "Texte de copyright (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Nouvelles (HTML)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "Nom",
-  
+
   // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "community.page.edit": "Edit this community",
-  
+  "community.page.edit": "Éditer cette Communauté",
+
   // "community.page.handle": "Permanent URI for this community",
   "community.page.handle": "URI permanent de cette Communauté",
-  
+
   // "community.page.license": "License",
   "community.page.license": "Licence",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Nouvelles",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Sous-Communautés et Collections",
-  
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Collections au sein de cette Communauté",
-  
+
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Sous-Communautés au sein de cette Communauté",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
-  
+  "cookies.consent.accept-all": "Accepter tout",
+
   // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-selected": "Accept selected",
-  
+  "cookies.consent.accept-selected": "Accepter les entrées sélectionnées",
+
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
-  
+  "cookies.consent.app.opt-out.description": "Cette application est chargée par défaut (mais vous pouvez choisir de la désactiver)",
+
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-  // TODO New key - Add a translation
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "purpose",
-  
+  "cookies.consent.app.purpose": "usage",
+
   // "cookies.consent.app.required.description": "This application is always required",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.description": "This application is always required",
-  
+  "cookies.consent.app.required.description": "Cette application est toujours nécessaire",
+
   // "cookies.consent.app.required.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
-  
+  "cookies.consent.app.required.title": "(toujours nécessaire)",
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  // TODO New key - Add a translation
-  "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-  
+  "cookies.consent.update": "Il y a eu des changements depuis votre dernière visite, veuillez mettre à jour votre consentement.",
+
   // "cookies.consent.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
-  
+  "cookies.consent.close": "Fermer",
+
   // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
-  
+  "cookies.consent.decline": "Refuser",
+
   // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  
+  "cookies.consent.content-notice.description": "Vos données personnelles sont récupérées et utilisées dans les contextes suivants : <strong>Authentification, Préférences, Consentement et Statistiques</strong>. <br/> Pour plus d'informations, veuillez vous référer à la {privacyPolicy}.",
+
   // "cookies.consent.content-notice.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.learnMore": "Customize",
-  
+  "cookies.consent.content-notice.learnMore": "Personnaliser",
+
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  
+  "cookies.consent.content-modal.description": "Vous pouvez ici voir et personnaliser les informations privées que nous collectons à votre sujet.",
+
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  
+  "cookies.consent.content-modal.privacy-policy.name": "politique de protection de la vie privée",
+
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  
+  "cookies.consent.content-modal.privacy-policy.text": "Pour plus d'informations, veuillez lire notre {privacyPolicy}.",
+
   // "cookies.consent.content-modal.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
+  "cookies.consent.content-modal.title": "Informations collectées",
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "Authentication",
-  
+  "cookies.consent.app.title.authentication": "Authentification",
+
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.authentication": "Required for signing you in",
-  
-  
+  "cookies.consent.app.description.authentication": "Requis pour permettre votre connection",
+
   // "cookies.consent.app.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "Preferences",
-  
+  "cookies.consent.app.title.preferences": "Préférences",
+
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.preferences": "Required for saving your preferences",
-  
-  
-  
+  "cookies.consent.app.description.preferences": "Requis pour sauvegarder vos préférences",
+
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.acknowledgement": "Acknowledgement",
-  
+  "cookies.consent.app.title.acknowledgement": "Consentement",
+
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  
-  
-  
+  "cookies.consent.app.description.acknowledgement": "Requis pour sauvegarder votre consentement",
+
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
-  // TODO New key - Add a translation
   "cookies.consent.app.title.google-analytics": "Google Analytics",
-  
+
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  // TODO New key - Add a translation
-  "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
-  
-  
-  
+  "cookies.consent.app.description.google-analytics": "Permet l'enregistrement de données statistiques",
+
   // "cookies.consent.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
-  
+  "cookies.consent.purpose.functional": "Fonctionnel",
+
   // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
-  
-  
+  "cookies.consent.purpose.statistical": "Statistique",
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
+  "curation-task.task.checklinks.label":  "Vérification des liens dans les métadonnées",
+
   // "curation-task.task.noop.label": "NOOP",
-  // TODO New key - Add a translation
   "curation-task.task.noop.label": "NOOP",
-  
+
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  // TODO New key - Add a translation
-  "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  
+  "curation-task.task.profileformats.label": "Lister les formats Bitstreams",
+
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
+  "curation-task.task.requiredmetadata.label": "Vérificaton des métadonnées obligatoires",
+
   // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
-  
+  "curation-task.task.translate.label": "Traducteur Microsoft",
+
   // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
   "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
-  
+  "curation.form.task-select.label": "Tâche :",
+
   // "curation.form.submit": "Start",
-  // TODO New key - Add a translation
-  "curation.form.submit": "Start",
-  
+  "curation.form.submit": "Démarrer",
+
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.head": "The curation task has been started successfully",
-  
+  "curation.form.submit.success.head": "La tâche de conservation a été lancée avec succès",
+
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  // TODO New key - Add a translation
-  "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
-  
+  "curation.form.submit.success.content": "Vous allez être redirigé vers la page de Processus correspondante.",
+
   // "curation.form.submit.error.head": "Running the curation task failed",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.head": "Running the curation task failed",
-  
+  "curation.form.submit.error.head": "L'exécution de la tâche de conservation a échoué",
+
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  // TODO New key - Add a translation
-  "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
-  
+  "curation.form.submit.error.content": "Une erreur s'est produite au lancement de la tâche de conservation.",
+
   // "curation.form.handle.label": "Handle:",
-  // TODO New key - Add a translation
-  "curation.form.handle.label": "Handle:",
-  
+  "curation.form.handle.label": "Handle :",
+
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-  // TODO New key - Add a translation
-  "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
-  
-  
-  
+  "curation.form.handle.hint": "Aide : Entrer [votre-préfixe-handle]/0 afin de lancer une tâche de conservation sur l'entièreté du site (ceci peut ne pas être supporté pour toutes les tâches)",
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nouvelle Collection",
-  
+
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.sub-level": "Create a new collection in",
-  
+  "dso-selector.create.collection.sub-level": "Créer une nouvelle Collection dans",
+
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nouvelle Communauté",
-  
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Créer une nouvelle Communauté dans",
-  
+
   // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "Créer une nouvelle Communauté de 1er niveau",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Nouvel Item",
-  
+
   // "dso-selector.create.item.sub-level": "Create a new item in",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.sub-level": "Create a new item in",
-  
+  "dso-selector.create.item.sub-level": "Créer un nouvel Item dans",
+
   // "dso-selector.create.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
-  
+  "dso-selector.create.submission.head": "Nouveau dépôt",
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Éditer Collection",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "Éditer Communauté",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Éditer Item",
-  
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  // TODO New key - Add a translation
-  "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  
+  "dso-selector.export-metadata.dspaceobject.head": "Exporter les métadonnées de",
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Aucun {{ type }} trouvé",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Rechercher un(e) {{ type }}",
-  
-  
-  
+
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-  
+  "confirmation-modal.export-metadata.header": "Exporter métadonnées de {{ dsoName }}",
+
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
-  
+  "confirmation-modal.export-metadata.info": "Êtes-vous certain de vouloir exporter les métadonnées de {{ dsoName }}",
+
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
-  
+  "confirmation-modal.export-metadata.cancel": "Annuler",
+
   // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
-  
+  "confirmation-modal.export-metadata.confirm": "Exporter",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  
+  "confirmation-modal.delete-eperson.header": "Supprimer EPerson \"{{ dsoName }}\"",
+
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  
+  "confirmation-modal.delete-eperson.info": "Êtes-vous certain de vouloir supprimer l'EPerson \"{{ dsoName }}\"",
+
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
+  "confirmation-modal.delete-eperson.cancel": "Annuler",
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
+  "confirmation-modal.delete-eperson.confirm": "Supprimer",
+
   // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
-  
+  "error.bitstream": "Erreur lors de la récupération du/des Bitstream(s)",
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Erreur lors de la récupération des Items",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "Erreur lors de la récupération de la Collection",
-  
+
   // "error.collections": "Error fetching collections",
   "error.collections": "Erreur lors de la récupération des Collections",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "Erreur lors de la récupération de la Communauté",
-  
+
   // "error.identifier": "No item found for the identifier",
-  "error.identifier": "Aucun objet correspondant à cet identifiant",
-  
+  "error.identifier": "Aucun Item correspondant à cet identifiant",
+
   // "error.default": "Error",
   "error.default": "Erreur",
-  
+
   // "error.item": "Error fetching item",
   "error.item": "Erreur lors de la récupération de l'Item",
-  
+
   // "error.items": "Error fetching items",
   "error.items": "Erreur lors de la récupération des Items",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "Erreur lors de la récupération des Objets",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "Erreur lors de la récupération des dépôts récents",
-  
+
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Erreur lors de la récupération des résultats de recherche",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Erreur lors de la récupération des Sous-Collections",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   "error.sub-communities": "Erreur lors de la récupération des Sous-Communautés",
-  
+
   // "error.submission.sections.init-form-error": "An error occurred during section initialize, please check your input-form configuration. Details are below : <br> <br>",
   "error.submission.sections.init-form-error": "Une erreur s'est produite dans la section d'initialisation, veuillez vérifier la configuration de votre formulaire de dépôt. Plus de détails disponibles ci-dessous : <br> <br>",
-  
+
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Erreur lors de la récupération des Communautés de 1er niveau",
-  
+
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
   "error.validation.license.notgranted": "Vous devez accepter cette licence pour terminer votre dépôt. Si vous êtes dans l'incapacité d'accepter cette licence actuellement, vous pouvez sauvegarder votre dépôt et y revenir ultérieurement ou le supprimer.",
-  
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Cette entrée est invalide en vertu du pattern : {{ pattern }}.",
-  
+
   // "error.validation.filerequired": "The file upload is mandatory",
-  // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
+  "error.validation.filerequired": "Le téléchargement de fichier est obligatoire",
+
   // "file-section.error.header": "Error obtaining files for this item",
-  // TODO New key - Add a translation
-  "file-section.error.header": "Error obtaining files for this item",
-  
-  
-  
+  "file-section.error.header": "Erreur lors de la récupération des fichiers liés à cet Item",
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  // TODO New key - Add a translation
   "footer.copyright": "copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "DSpace software",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
-  // TODO New key - Add a translation
-  "footer.link.cookies": "Cookie settings",
-  
+  "footer.link.cookies": "Paramètre des cookies",
+
   // "footer.link.privacy-policy": "Privacy policy",
-  // TODO New key - Add a translation
-  "footer.link.privacy-policy": "Privacy policy",
-  
+  "footer.link.privacy-policy": "Politique de protection de la vie privée",
+
   // "footer.link.end-user-agreement":"End User Agreement",
-  // TODO New key - Add a translation
-  "footer.link.end-user-agreement":"End User Agreement",
-  
-  
-  
+  "footer.link.end-user-agreement":"Licence de l'Utilisateur Final",
+
+
   // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-email.form.header": "Forgot Password",
-  
+  "forgot-email.form.header": "Mot de passe oublié",
+
   // "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "forgot-email.form.info": "Enter Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  
+  "forgot-email.form.info": "Créer un compte pour vous abonner à des collections afin de recevoir des mises à jour via mail ainsi que pour déposer de nouveaux Items dans DSpace.",
+
   // "forgot-email.form.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
-  
+  "forgot-email.form.email": "Adresse e-mail *",
+
   // "forgot-email.form.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.required": "Please fill in an email address",
-  
+  "forgot-email.form.email.error.required": "Veuillez remplir une adresse e-mail",
+
   // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  
+  "forgot-email.form.email.error.pattern": "Veuillez remplir une adresse e-mail valide",
+
   // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  
+  "forgot-email.form.email.hint": "Cette adresse sera vérifiée et utilisée en tant qu'identifiant de connection.",
+
   // "forgot-email.form.submit": "Submit",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "Submit",
-  
+  "forgot-email.form.submit": "Envoyer",
+
   // "forgot-email.form.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.head": "Verification email sent",
-  
+  "forgot-email.form.success.head": "E-mail de vérification envoyé",
+
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  
+  "forgot-email.form.success.content": "Un mail a été envoyé à {{ email }} avec une URL d'activation et de plus amples instructions.",
+
   // "forgot-email.form.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.head": "Error when trying to register email",
-  
+  "forgot-email.form.error.head": "Erreur lors de l'enregistrement de l'adresse e-mail",
+
   // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  
-  
-  
+  "forgot-email.form.error.content": "Une erreur s'est produite au niveau de l'adresse e-mail suivante : {{ email }}",
+
   // "forgot-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
-  
+  "forgot-password.title": "Mot de passe oublié",
+
   // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.head": "Forgot Password",
-  
+  "forgot-password.form.head": "Mot de passe oublié",
+
   // "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.info": "Enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  
+  "forgot-password.form.info": "Entrer un nouveau mot de passe dans le zone ci-dessous et confirmer en l'entrant à nouveau dans la seconde zone. Le mot de passe doit au moins faire 6 caractères.",
+
   // "forgot-password.form.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
-  
+  "forgot-password.form.card.security": "Sécurité",
+
   // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
-  
+  "forgot-password.form.identification.header": "Identification",
+
   // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
-  
+  "forgot-password.form.identification.email": "Adresse e-mail : ",
+
   // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "Password",
-  
+  "forgot-password.form.label.password": "Mot de passe",
+
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  
+  "forgot-password.form.label.passwordrepeat": "Entrer à nouveau pour confirmer",
+
   // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  
+  "forgot-password.form.error.empty-password": "Veuillez entrer un mot de passe dans la zone ci-dessous.",
+
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  
+  "forgot-password.form.error.matching-passwords": "Les mots de passe ne correspondent pas.",
+
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  
+  "forgot-password.form.error.password-length": "La longueur minimale du mot de passe est de 6 caractères.",
+
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  
+  "forgot-password.form.notification.error.title": "Erreur lors de l'enregistrement du mot de passe",
+
   // "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.content": "The password reset was successful. You have been logged in as the created user.",
-  
+  "forgot-password.form.notification.success.content": "La réinitialisation du mot de passe a été effectuée avec succès. Vous êtes connecté avec le compte de l'utilisateur ainsi créé.",
+
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
-  
+  "forgot-password.form.notification.success.title": "Réinitialisation du mot de passe terminée",
+
   // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
-  
-  
-  
+  "forgot-password.form.submit": "Confirmer mot de passe",
+
+
+
   // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "Add",
-  
+  "form.add": "Ajouter",
+
   // "form.add-help": "Click here to add the current entry and to add another one",
-  // TODO New key - Add a translation
-  "form.add-help": "Click here to add the current entry and to add another one",
-  
+  "form.add-help": "Cliquer ici pour ajouter l'entrée actuelle et en ajouter une nouvelle",
+
   // "form.cancel": "Cancel",
   "form.cancel": "Annuler",
-  
+
   // "form.clear": "Clear",
   "form.clear": "Effacer",
-  
+
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Cliquer ici pour supprimer la valeur sélectionnée",
-  
+
   // "form.edit": "Edit",
   "form.edit": "Éditer",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "Cliquer ici pour éditer la valeur sélectionnée",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "Prénom",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Réduire",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Cliquer ici pour réduire",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "Développer",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "Cliquer ici pour développer et ajouter davantage d'éléments",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "Nom",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "En cours de chargement...",
-  
+
   // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "Lookup",
-  
+  "form.lookup": "Rechercher",
+
   // "form.lookup-help": "Click here to look up an existing relation",
-  // TODO New key - Add a translation
-  "form.lookup-help": "Click here to look up an existing relation",
-  
+  "form.lookup-help": "Cliquer ici pour rechercher une relation existante",
+
   // "form.no-results": "No results found",
   "form.no-results": "Aucun résultat disponible",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Aucune valeur entrée",
-  
+
   // "form.other-information": {},
   "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "Supprimer",
-  
+
   // "form.save": "Save",
   "form.save": "Sauvegarder",
-  
+
   // "form.save-help": "Save changes",
   "form.save-help": "Sauvegarder changements",
-  
+
   // "form.search": "Search",
   "form.search": "Rechercher",
-  
+
   // "form.search-help": "Click here to look for an existing correspondence",
-  // TODO Source message changed - Revise the translation
   "form.search-help": "Cliquer ici pour rechercher une correspondance existante",
-  
+
   // "form.submit": "Submit",
   "form.submit": "Déposer",
-  
-  
-  
+
+
+
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
-  
+  "home.breadcrumbs": "Accueil",
+
   // "home.title": "DSpace Angular :: Home",
   "home.title": "DSpace Angular :: Home",
-  
+
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Communautés DSpace",
-  
+
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Sélectionner une Communauté pour parcourir les Collections sous-jacentes.",
-  
-  
-  
+
+
+
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  
+  "info.end-user-agreement.accept": "J'ai lu et j'accepte la Licence de l'Utilisateur Final",
+
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  
+  "info.end-user-agreement.accept.error": "Une erreur s'est produite lors de l'acceptation de la Licence de l'Utilisateur Final",
+
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  
+  "info.end-user-agreement.accept.success": "Licence de l'Utilisateur Final mise à jour avec succès",
+
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
+  "info.end-user-agreement.breadcrumbs": "Licence de l'Utilisateur Final",
+
   // "info.end-user-agreement.buttons.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.cancel": "Cancel",
-  
+  "info.end-user-agreement.buttons.cancel": "Annuler",
+
   // "info.end-user-agreement.buttons.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "Save",
-  
+  "info.end-user-agreement.buttons.save": "Sauvegarder",
+
   // "info.end-user-agreement.head": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.head": "End User Agreement",
-  
+  "info.end-user-agreement.head": "Licence de l'Utilisateur Final",
+
   // "info.end-user-agreement.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
-  
+  "info.end-user-agreement.title": "Licence de l'Utilisateur Final",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
-  
+  "info.privacy.breadcrumbs": "Déclaration de confidentialité",
+
   // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
-  
+  "info.privacy.head": "Déclaration de confidentialité",
+
   // "info.privacy.title": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
-  
-  
-  
+  "info.privacy.title": "Déclaration de confidentialité",
+
+
+
   // "item.alerts.private": "This item is private",
-  // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
-  
+  "item.alerts.private": "Cet Item est privé",
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
-  // TODO New key - Add a translation
-  "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
+  "item.alerts.withdrawn": "Cet Item a été retiré",
+
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
-  
+  "item.edit.authorizations.heading": "Depuis cette page, il vous est possible de visualiser et modifier les autorisations d'un Item et de ses composants Bundles et Bitstreams. Un Item peut inclure un ou plusieurs Bundle(s) et chaque Bundle peut inclure un ou plusieurs Bitstream(s). Les Items et Bundles ont habituellement des autorisations de type ADD/REMOVE/READ/WRITE alors que les Bitstreams ont uniquement des autorisations READ/WRITE.",
+
   // "item.edit.authorizations.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
+  "item.edit.authorizations.title": "Éditer les autorisations de l'Item",
+
+
+
   // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
-  
+  "item.badge.private": "Privé",
+
   // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
+  "item.badge.withdrawn": "Retiré",
+
   // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
   "item.bitstreams.upload.bundle": "Bundle",
-  
+
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  
+  "item.bitstreams.upload.bundle.placeholder": "Selectionner un Bundle",
+
   // "item.bitstreams.upload.bundle.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
-  
+  "item.bitstreams.upload.bundle.new": "Créer Bundle",
+
   // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
-  
+  "item.bitstreams.upload.bundles.empty": "Il n'existe pas, au niveau de cet Item, de Bundle dans lequel un Bitstream pourrait être ajouté.",
+
   // "item.bitstreams.upload.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "Cancel",
-  
+  "item.bitstreams.upload.cancel": "Annuler",
+
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.drop-message": "Drop a file to upload",
-  
+  "item.bitstreams.upload.drop-message": "Déposer un fichier pour l'ajouter",
+
   // "item.bitstreams.upload.item": "Item: ",
-  // TODO New key - Add a translation
   "item.bitstreams.upload.item": "Item: ",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-  
+  "item.bitstreams.upload.notifications.bundle.created.content": "Bundle créé avec succès.",
+
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
+  "item.bitstreams.upload.notifications.bundle.created.title": "Bundle créé",
+
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  
+  "item.bitstreams.upload.notifications.upload.failed": "Echec du téléchargement. Veuillez vérifier le contenu avant de réessayer.",
+
   // "item.bitstreams.upload.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
+  "item.bitstreams.upload.title": "Ajouter Bitstream",
+
+
+
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-  
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Ajouter",
+
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  
+  "item.edit.bitstreams.bundle.displaying": "{{ amount }} Bitstreams actuellement visible(s) sur un total de {{ total }}.",
+
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
-  
+  "item.edit.bitstreams.bundle.load.all": "Charger tout ({{ total }})",
+
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "Load more",
-  
+  "item.edit.bitstreams.bundle.load.more": "Charger plus",
+
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  // TODO New key - Add a translation
   "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  
+
   // "item.edit.bitstreams.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
-  
+  "item.edit.bitstreams.discard-button": "Annuler",
+
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.download": "Download",
-  
+  "item.edit.bitstreams.edit.buttons.download": "Télécharger",
+
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  
+  "item.edit.bitstreams.edit.buttons.drag": "Glisser-Déposer",
+
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.edit": "Edit",
-  
+  "item.edit.bitstreams.edit.buttons.edit": "Éditer",
+
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "Remove",
-  
+  "item.edit.bitstreams.edit.buttons.remove": "Supprimer",
+
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  
+  "item.edit.bitstreams.edit.buttons.undo": "Annuler changements",
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  
+  "item.edit.bitstreams.empty": "Aucun Bitstream n'est associé à cet Item. Utiliser le bouton d'ajout pour en créer un.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
-  // TODO New key - Add a translation
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
   "item.edit.bitstreams.headers.description": "Description",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.name": "Name",
-  
+  "item.edit.bitstreams.headers.name": "Nom",
+
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  
+  "item.edit.bitstreams.notifications.discarded.content": "Vos changements ont été annulés. Pour rétablir vos changements, cliquer sur le bouton 'Rétablir'",
+
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
+  "item.edit.bitstreams.notifications.discarded.title": "Changements annulés",
+
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-  
+  "item.edit.bitstreams.notifications.move.failed.title": "Erreur lors du déplacement des Bitstreams",
+
   // "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.content": "Your move changes to this item's bitstreams and bundles have been saved.",
-  
+  "item.edit.bitstreams.notifications.move.saved.content": "Les déplacements Bundles/Bitstreams de cet Item ont été sauvegardés avec succès.",
+
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
+  "item.edit.bitstreams.notifications.move.saved.title": "Déplacements sauvegardés",
+
   // "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
-  
+  "item.edit.bitstreams.notifications.outdated.content": "L'Item sur lequel vous êtes en train de travailler a été édité par un autre utilisateur. Vos changements en cours sont ignorés pour éviter des conflits",
+
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
+  "item.edit.bitstreams.notifications.outdated.title": "Changements obsolètes",
+
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
-  
+  "item.edit.bitstreams.notifications.remove.failed.title": "Erreur lors de la suppression du Bitstream",
+
   // "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.content": "Your removal changes to this item's bitstreams have been saved.",
-  
+  "item.edit.bitstreams.notifications.remove.saved.content": "La suppression du/des Bitstream(s) de cet Item a été sauvegardée avec succès.",
+
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
+  "item.edit.bitstreams.notifications.remove.saved.title": "Suppression(s) sauvegardée(s)",
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
-  
+  "item.edit.bitstreams.reinstate-button": "Rétablir",
+
   // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
-  
+  "item.edit.bitstreams.save-button": "Sauvegarder",
+
   // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
+  "item.edit.bitstreams.upload-button": "Ajouter",
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Annuler",
-  
+
   // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "Supprimer",
-  
+
   // "item.edit.delete.description": "Are you sure this item should be completely deleted? Caution: At present, no tombstone would be left.",
   "item.edit.delete.description": "Êtes-vous certain de vouloir complètement supprimer cet Item ? Attention, il n'y aura pas de retour en arrière possible.",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Une erreur s'est produite lors de la suppression de l'Item",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "Supprimer Item : {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "L'Item a été supprimé",
-  
+
   // "item.edit.head": "Edit Item",
   "item.edit.head": "Éditer Item",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
-  
-  
+  "item.edit.breadcrumbs": "Éditer Item",
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  
+  "item.edit.tabs.item-mapper.title": "Édition Item - Collection Mapper",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Associer Item aux Collections sélectionnées",
-  
+
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "Supprimer l'association d'Item pour les Collections sélectionnées",
-  
+
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Annuler",
-  
+
   // "item.edit.item-mapper.description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
   "item.edit.item-mapper.description": "L'Item Mapper permet aux administrateurs de Collection d'associer des Items avec d'autres Collections. Vous pouvez rechercher des Collections et les associer ou parcourir la liste des Collections auxquelles l'Item est actuellement associé.",
-  
+
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Item Mapper - Associer Item avec Collections",
-  
+
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Item : « <b>{{name}}</b> »",
-  
+
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Veuillez entrer un élément à rechercher",
-  
+
   // "item.edit.item-mapper.notifications.add.error.content": "Errors occurred for mapping of item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.error.content": "Des erreurs se sont produites à l'association de l'Item avec {{amount}} Collections.",
-  
+
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Erreurs d'association",
-  
+
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.success.content": "Item associé avec succès avec {{amount}} Collections.",
-  
+
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Association terminée",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.content": "Errors occurred for the removal of the mapping to {{amount}} collections.",
   "item.edit.item-mapper.notifications.remove.error.content": "Des erreurs se sont produites à la suppression de l'association de {{amount}} Collections.",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "Erreurs à la suppression d'association",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.remove.success.content": "Association de l'item avec {{amount}} Collections supprimée avec succès.",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Suppression d'association terminée",
-  
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Parcourir Collections associées",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Associer nouvelles Collections",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Ajouter",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Annuler",
-  
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Éditer",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Supprimer",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "Annuler changements",
-  
+
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Stopper l'édition",
-  
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  // TODO New key - Add a translation
-  "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  
+  "item.edit.metadata.empty": "Aucune métadonnée n'est associée à cet Item. Cliquer 'Ajouter' pour commencer à ajouter une métadonnée.",
+
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Éditer",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   "item.edit.metadata.headers.field": "Champ",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Langue",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valeur",
-  
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Veuillez choisir un champ de métadonnée valide",
-  
+
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Vos changements ont été annulés. Pour rétablir vos changements, cliquer sur le bouton 'Rétablir'",
-  
+
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
   "item.edit.metadata.notifications.discarded.title": "Changements annulés",
-  
+
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.error.title": "An error occurred",
-  
+  "item.edit.metadata.notifications.error.title": "Une erreur s'est produite",
+
   // "item.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
   "item.edit.metadata.notifications.invalid.content": "Vos changements n'ont pas été sauvegardés. Veuillez vérifier que tous les champs sont valides avant de sauvegarder.",
-  
+
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Métadonnée invalide",
-  
+
   // "item.edit.metadata.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
   "item.edit.metadata.notifications.outdated.content": "L'Item sur lequel vous êtes en train de travailler a été édité par un autre utilisateur. Vos changements en cours sont ignorés pour éviter des conflits",
-  
+
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
   "item.edit.metadata.notifications.outdated.title": "Changements obsolètes",
-  
+
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
   "item.edit.metadata.notifications.saved.content": "Vos modifications de métadonnées n'ont pas été sauvegardées.",
-  
+
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Métadonnée sauvegardée",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Rétablir",
-  
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Sauvegarder",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Champ",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "Langue",
-  
+
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valeur",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   "item.edit.move.cancel": "Annuler",
-  
+
   // "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
   "item.edit.move.description": "Sélectionner la Collection dans laquelle vous souhaitez transférer l'Item. Pour limiter la liste de Collections affichées, vous pouvez utiliser le champ de recherche.",
-  
+
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  // TODO Source message changed - Revise the translation
   "item.edit.move.error": "Une erreur s'est produite lors du transfert de l'Item",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "Transférer item : {{id}}",
-  
+
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Récupérer règles",
-  
+
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Récupérer les règles par défaut de la Collection de destination",
-  
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Transférer",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "En cours de transfert...",
-  
+
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Rechercher Collection",
-  
+
   // "item.edit.move.success": "The item has been moved successfully",
-  // TODO Source message changed - Revise the translation
   "item.edit.move.success": "L'Item a été transféré avec succès",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Transférer item",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Annuler",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   "item.edit.private.confirm": "Définir comme Privé",
-  
+
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
   "item.edit.private.description": "Êtes-vous certain de vouloir définir cet Item comme Privé ?",
-  
+
   // "item.edit.private.error": "An error occurred while making the item private",
   "item.edit.private.error": "Une erreur s'est produite lors de la définition de l'Item en tant qu'Item Privé",
-  
+
   // "item.edit.private.header": "Make item private: {{ id }}",
   "item.edit.private.header": "Définir Item comme Privé : {{ id }}",
-  
+
   // "item.edit.private.success": "The item is now private",
   "item.edit.private.success": "L'Item est désormais Privé",
-  
-  
-  
+
+
+
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Annuler",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   "item.edit.public.confirm": "Définir comme Public",
-  
+
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
   "item.edit.public.description": "Êtes-vous certain de vouloir définir cet Item comme Public ?",
-  
+
   // "item.edit.public.error": "An error occurred while making the item public",
   "item.edit.public.error": "Une erreur s'est produite lors e la définition de l'Item en tant qu'Item Public",
-  
+
   // "item.edit.public.header": "Make item public: {{ id }}",
   "item.edit.public.header": "Définir Item comme Public : {{ id }}",
-  
+
   // "item.edit.public.success": "The item is now public",
   "item.edit.public.success": "L'Item est désormais Public",
-  
-  
-  
+
+
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Annuler",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "Réintégrer",
-  
+
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "Êtes-vous certain de vouloir réintégrer cet Item ?",
-  
+
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Une erreur s'est produite lors de la réintégration de l'Item",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "Réintégrer Item : {{ id }}",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "L'Item a été réintégré avec succès",
-  
-  
-  
+
+
+
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Annuler",
-  
+
   // "item.edit.relationships.edit.buttons.add": "Add",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.add": "Add",
-  
+  "item.edit.relationships.edit.buttons.add": "Ajouter",
+
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Supprimer",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
   "item.edit.relationships.edit.buttons.undo": "Annuler changements",
-  
+
   // "item.edit.relationships.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-relationships": "No relationships",
-  
+  "item.edit.relationships.no-relationships": "Aucune relation",
+
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.relationships.notifications.discarded.content": "Vos changements ont été annulés. Pour rétablir vos changements, cliquer sur le bouton 'Rétablir'",
-  
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Changements annulés",
-  
+
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO Source message changed - Revise the translation
-  "item.edit.relationships.notifications.failed.title": "Erreur lors de la suppression de la Relation",
-  
+  "item.edit.relationships.notifications.failed.title": "Erreur lors de l'édition des relations",
+
   // "item.edit.relationships.notifications.outdated.content": "The item you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
   "item.edit.relationships.notifications.outdated.content": "L'Item sur lequel vous êtes en train de travailler a été édité par un autre utilisateur. Vos changements en cours sont ignorés pour éviter des conflits.",
-  
+
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Changements obsolètes",
-  
+
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
   "item.edit.relationships.notifications.saved.content": "Vos changements aux Relations de l'Item ont été sauvegardés.",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "Relations sauvegardées",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "Rétablir",
-  
+
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Sauvegarder",
-  
+
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  
-  
-  
+  "item.edit.relationships.no-entity-type": "Ajouter la métadonnée 'dspace.entity.type' pour activer les relations pour cet Item",
+
+
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams de l'Item",
-  
+  "item.edit.tabs.bitstreams.head": "Bitstreams",
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Édition Item - Bitstreams",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Gestion de contenu",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Édition Item - Gestion de contenu",
-  
+
   // "item.edit.tabs.metadata.head": "Metadata",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.metadata.head": "Métadonnées de l'Item",
-  
+  "item.edit.tabs.metadata.head": "Métadonnées",
+
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.metadata.title": "Édition Item - Métadonnées",
-  
+
   // "item.edit.tabs.relationships.head": "Relationships",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.relationships.head": "Relations de l'Item",
-  
+
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "Édition Item - Relations",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Accès...",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
   "item.edit.tabs.status.buttons.authorizations.label": "Éditer les règles d'accès de l'Item",
-  
+
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
   "item.edit.tabs.status.buttons.delete.button": "Supprimer définitivement",
-  
+
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Supprimer l'Item définitivement",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.button": "Collections associées",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gérer les Collections associées",
-  
+
   // "item.edit.tabs.status.buttons.move.button": "Move...",
   "item.edit.tabs.status.buttons.move.button": "Transférer...",
-  
+
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Transférer l'Item dans une autre Collection",
-  
+
   // "item.edit.tabs.status.buttons.private.button": "Make it private...",
   "item.edit.tabs.status.buttons.private.button": "Définir comme privé...",
-  
+
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
   "item.edit.tabs.status.buttons.private.label": "Définir l'Item en tant qu'Item Privé",
-  
+
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
   "item.edit.tabs.status.buttons.public.button": "Définir comme public...",
-  
+
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
   "item.edit.tabs.status.buttons.public.label": "Définir l'Item en tant qu'Item public",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Réintégrer...",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Réintégrer l'Item",
-  
+
   // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
   "item.edit.tabs.status.buttons.withdraw.button": "Retirer...",
-  
+
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirer l'Item",
-  
+
   // "item.edit.tabs.status.description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
   "item.edit.tabs.status.description": "Bienvenue sur la page de gestion de l'Item. D'ici, vous pouvez retirer, réintégrer, transférer ou supprimer l'Item. Dans les autres onglets, vous pouvez également mettre à jour, ajouter ou supprimer des métadonnées et/ou bitstreams.",
-  
+
   // "item.edit.tabs.status.head": "Status",
-  // TODO Source message changed - Revise the translation
-  "item.edit.tabs.status.head": "Statut Item",
-  
+  "item.edit.tabs.status.head": "Statut",
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Handle",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Identifiant interne de l'Item",
-  
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Page de l'Item",
-  
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Date de dernière modification",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "Édition Item - Statut",
-  
+
   // "item.edit.tabs.versionhistory.head": "Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.head": "Version History",
-  
+  "item.edit.tabs.versionhistory.head": "Historique des versions",
+
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
+  "item.edit.tabs.versionhistory.title": "Édition Item - Historique des versions",
+
   // "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.under-construction": "Editing or adding new versions is not yet possible in this user interface.",
-  
+  "item.edit.tabs.versionhistory.under-construction": "L'ajout ou l'édition de versions n'est pas encore possible depuis cette interface utilisateur.",
+
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "Voir Item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Édition Item - View",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Annuler",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "Retirer",
-  
+
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "Êtes-vous certain que cet Item doit être retiré du dépôt ?",
-  
+
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Une erreur s'est produite lors du retrait de l'Item",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "Retrait item : {{ id }}",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "L'Item a été retiré avec succès",
-  
-  
-  
+
+
+
   // "item.listelement.badge": "Item",
-  // TODO New key - Add a translation
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
-  // TODO New key - Add a translation
   "item.page.description": "Description",
-  
+
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+  "item.page.edit": "Éditer cet Item",
+
   // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
-  
+  "item.page.journal-issn": "ISSN de la revue",
+
   // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
-  
+  "item.page.journal-title": "Nom de la revue",
+
   // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
-  
+  "item.page.publisher": "Éditeur",
+
   // "item.page.titleprefix": "Item: ",
-  // TODO New key - Add a translation
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "item.page.volume-title": "Volume Title",
-  
+  "item.page.volume-title": "Titre du volume",
+
   // "item.search.results.head": "Item Search Results",
-  // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
-  
+  "item.search.results.head": "Résultats de la recherche",
+
   // "item.search.title": "DSpace Angular :: Item Search",
-  // TODO New key - Add a translation
   "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Résumé",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Auteurs",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "Citation",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Collections",
-  
+
   // "item.page.date": "Date",
   "item.page.date": "Date",
-  
+
   // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+  "item.page.edit": "Éditer cet item",
+
   // "item.page.files": "Files",
   "item.page.files": "Fichiers",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Description :",
-  
+
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Télécharger",
-  
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Format :",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "Nom :",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Taille :",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
-  "item.page.journal.search.title": "Articles dans ce Périodique",
-  
+  "item.page.journal.search.title": "Articles dans cette revue",
+
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "Notice complète",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Notice simple",
-  
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Articles de cet auteur",
-  
+
   // "item.page.related-items.view-more": "Show {{ amount }} more",
-  // TODO Source message changed - Revise the translation
-  "item.page.related-items.view-more": "Plus de résultats",
-  
+  "item.page.related-items.view-more": "Afficher {{ amount }} résultats supplémentaires",
+
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
-  // TODO Source message changed - Revise the translation
-  "item.page.related-items.view-less": "Moins de résultats",
-  
+  "item.page.related-items.view-less": "Masquer les {{ amount }} derniers résultats",
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
   "item.page.relationships.isAuthorOfPublication": "Publications",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
   "item.page.relationships.isJournalOfPublication": "Publications",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
+  "item.page.relationships.isOrgUnitOfPerson": "Auteurs",
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
+  "item.page.relationships.isOrgUnitOfProject": "Projets de recherche",
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "Mots-clés",
-  
+
   // "item.page.uri": "URI",
   "item.page.uri": "URI",
-  
+
   // "item.page.bitstreams.view-more": "Show more",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.view-more": "Show more",
-  
+  "item.page.bitstreams.view-more": "Plus de résultats",
+
   // "item.page.bitstreams.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
-  
+  "item.page.bitstreams.collapse": "Réduire",
+
   // "item.page.filesection.original.bundle" : "Original bundle",
-  // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
-  
+  "item.page.filesection.original.bundle" : "Bundle Original",
+
   // "item.page.filesection.license.bundle" : "License bundle",
-  // TODO New key - Add a translation
-  "item.page.filesection.license.bundle" : "License bundle",
-  
+  "item.page.filesection.license.bundle" : "Bundle Licence",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
-  
+  "item.preview.dc.identifier.uri": "Identifiant :",
+
   // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
-  
+  "item.preview.dc.contributor.author": "Auteurs :",
+
   // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
-  
+  "item.preview.dc.date.issued": "Date de publication :",
+
   // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
-  
+  "item.preview.dc.description.abstract": "Résumé :",
+
   // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
-  
+  "item.preview.dc.identifier.other": "Autre identifiant :",
+
   // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
-  
+  "item.preview.dc.language.iso": "Langue :",
+
   // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
-  
+  "item.preview.dc.subject": "Sujets :",
+
   // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
-  
+  "item.preview.dc.title": "Title :",
+
   // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
-  
+  "item.preview.person.familyName": "Nom de famille :",
+
   // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
-  
+  "item.preview.person.givenName": "Prénom:",
+
   // "item.preview.person.identifier.orcid": "ORCID:",
-  // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmer sélection",
-  
+
   // "item.select.empty": "No items to show",
   "item.select.empty": "Aucun Item à afficher",
-  
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Auteur",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "Collection",
-  
+
   // "item.select.table.title": "Title",
   "item.select.table.title": "Titre",
-  
-  
+
+
   // "item.version.history.empty": "There are no other versions for this item yet.",
-  // TODO New key - Add a translation
-  "item.version.history.empty": "There are no other versions for this item yet.",
-  
+  "item.version.history.empty": "Il n'y a pas encore d'autres versions de cet Item.",
+
   // "item.version.history.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
-  
+  "item.version.history.head": "Historique des versions",
+
   // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
-  
+  "item.version.history.return": "Retour",
+
   // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
-  
+  "item.version.history.selected": "Version sélectionnée",
+
   // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
-  // TODO New key - Add a translation
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
-  // TODO New key - Add a translation
-  "item.version.history.table.editor": "Editor",
-  
+  "item.version.history.table.editor": "Éditeur",
+
   // "item.version.history.table.date": "Date",
-  // TODO New key - Add a translation
   "item.version.history.table.date": "Date",
-  
+
   // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
-  
-  
-  
+  "item.version.history.table.summary": "Résumé",
+
+
+
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
-  // TODO New key - Add a translation
-  "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
-  
-  
-  
+  "item.version.notice": "Ceci n'est pas la version la plus récente de cet Item. La dernière version est accessible <a href='{{destination}}'>ici</a>.",
+
+
+
   // "journal.listelement.badge": "Journal",
-  "journal.listelement.badge": "Périodique",
-  
+  "journal.listelement.badge": "Revue",
+
   // "journal.page.description": "Description",
   "journal.page.description": "Description",
-  
+
   // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
-  
+  "journal.page.edit": "Éditer cet Item",
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Rédacteur en chef",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Éditeur",
-  
+
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Périodique : ",
-  
+  "journal.page.titleprefix": "Revue : ",
+
   // "journal.search.results.head": "Journal Search Results",
-  "journal.search.results.head": "Résultats de recherche Périodique",
-  
+  "journal.search.results.head": "Résultats de recherche Revue",
+
   // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Recherche Périodique",
-  
-  
-  
+  "journal.search.title": "DSpace Angular :: Recherche Revue",
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
-  "journalissue.listelement.badge": "Numéro de Périodique",
-  
+  "journalissue.listelement.badge": "Numéro de revue",
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Description",
-  
+
   // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalissue.page.edit": "Edit this item",
-  
+  "journalissue.page.edit": "Éditer cet Item",
+
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Date de publication",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
-  "journalissue.page.journal-issn": "ISSN du Périodique",
-  
+  "journalissue.page.journal-issn": "ISSN de la revue",
+
   // "journalissue.page.journal-title": "Journal Title",
-  "journalissue.page.journal-title": "Titre du Périodique",
-  
+  "journalissue.page.journal-title": "Titre de la revue",
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "Mots-clés",
-  
+
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Nombre",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Numéro de Périodique : ",
-  
-  
-  
+  "journalissue.page.titleprefix": "Numéro de revue : ",
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge": "Volume de Périodique",
-  
+  "journalvolume.listelement.badge": "Volume de la revue",
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Description",
-  
+
   // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalvolume.page.edit": "Edit this item",
-  
+  "journalvolume.page.edit": "Éditer cet item",
+
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Date de publication",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volume de Périodique : ",
-  
+  "journalvolume.page.titleprefix": "Volume de la revue : ",
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volume",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
-  
+  "loading.bitstream": "Bitstream en cours de chargement...",
+
   // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
-  
+  "loading.bitstreams": "Bitstreams en cours de chargement...",
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Items en cours de chargement...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Page en cours de chargement...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "Collection en cours de chargement...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "Collections en cours de chargement...",
-  
+
   // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
-  
+  "loading.content-source": "Source de contenu en cours de chargement...",
+
   // "loading.community": "Loading community...",
   "loading.community": "Communauté en cours de chargement...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "En cours de chargement...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "Item en cours de chargement...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "Items en cours de chargement...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "Items en cours de chargement...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "En cours de chargement...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "Dépôts récents en cours de chargement...",
-  
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "Résultats de recherche en cours de chargement...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "Sous-Collections en cours de chargement...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   "loading.sub-communities": "Sous-Communautés en cours de chargement...",
-  
+
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Communautés de 1er niveau en cours de chargement...",
-  
-  
-  
+
+
+
   // "login.form.email": "Email address",
   "login.form.email": "Adresse e-mail",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "Mot de passe oublié ?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Se connecter sur DSpace",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Pas encore de compte ? Cliquez ici pour vous enregistrer.",
-  
+
   // "login.form.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
-  
+  "login.form.or-divider": "ou",
+
   // "login.form.password": "Password",
   "login.form.password": "Mot de passe",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
-  
+  "login.form.shibboleth": "Se connecter via Shibboleth",
+
   // "login.form.submit": "Log in",
   "login.form.submit": "Se connecter",
-  
+
   // "login.title": "Login",
   "login.title": "Connection",
-  
+
   // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
-  
-  
-  
+  "login.breadcrumbs": "Connection",
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Se déconnecter de DSpace",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Se déconnecter",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Déconnection",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   "menu.header.admin": "Admin",
-  
+
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Logo du site",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Contrôle d'accès",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorisations",
-  
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Groupes d'utilisateurs",
-  
+
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Utilisateurs",
-  
-  
-  
+
+
+
   // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
-  
-  
-  
+  "menu.section.admin_search": "Recherche Administrateur",
+
+
+
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Cette Communauté",
-  
+
   // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "Auteur",
-  
+
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "Date de publication",
-  
+
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Titre",
-  
+
   // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "Tout DSpace",
-  
+
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "Auteur",
-  
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "Date de publication",
-  
+
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Sujet",
-  
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Titre",
-  
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Communautés & Collections",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Panneau de configuration",
-  
+
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Tâches de Curation",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Éditer",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Collection",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "Communauté",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "menu.section.export": "Export",
   "menu.section.export": "Exporter",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "Collection",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "Communauté",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Métadonnées",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Section du menu relative au contrôle d'accès",
-  
+
   // "menu.section.icon.admin_search": "Admin search menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.admin_search": "Admin search menu section",
-  
+  "menu.section.icon.admin_search": "Section du menu relative à la recherche Administrateur",
+
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Section du menu relative au panneau de configuration",
-  
+
   // "menu.section.icon.curation_task": "Curation Task menu section",
   "menu.section.icon.curation_task": "Section du menu relative aux tâches de Curation",
-  
+
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Section du menu relative à l'édition",
-  
+
   // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "Section du menu relative à l'export",
-  
+
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Section du menu relative à la recherche",
-  
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Section du menu relative à l'import",
-  
+
   // "menu.section.icon.new": "New menu section",
   "menu.section.icon.new": "Section du menu relative à l'ajout d'éléments",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Epingler menu latéral",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
-  
+  "menu.section.icon.processes": "Section du menu relatif aux Processus",
+
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Section du menu relative aux Registres",
-  
+
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "Section du menu relative aux tâches Statistiques",
-  
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Libérer menu latéral",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importer",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch Import (ZIP)",
-  
+  "menu.section.import_batch": "Import par lot (ZIP)",
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Import de métadonnées",
-  
-  
-  
+
+
+
   // "menu.section.new": "New",
   "menu.section.new": "Créer",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Collection",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "Communauté",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   "menu.section.new_item_version": "Version",
-  
+
   // "menu.section.new_process": "Process",
-  // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
-  
-  
-  
+  "menu.section.new_process": "Processus",
+
+
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Epingler menu latéral",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Libérer menu latéral",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
-  
-  
-  
+  "menu.section.processes": "Processus",
+
+
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Registres",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Format",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Métadonnées",
-  
-  
-  
+
+
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Statistiques",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tâche statistiques",
-  
-  
-  
+
+
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Ouvrir/Fermer section Contrôle d'accès",
-  
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Ouvrir/Fermer section Panneau de configuration",
-  
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "Ouvrir/Fermer section Tâche de Curation",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Ouvrir/Fermer section Éditer",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "Ouvrir/Fermer section Exporter",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "Ouvrir/Fermer section Rechercher",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "Ouvrir/Fermer section Importer",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "Ouvrir/Fermer section Créer",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Ouvrir/Fermer section Registres",
-  
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Ouvrir/Fermer section Tâche statistiques",
-  
-  
+
+
   // "menu.section.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
-  
-  
+  "menu.section.workflow": "Workflow Administrateur",
+
+
   // "mydspace.description": "",
   "mydspace.description": "",
-  
+
   // "mydspace.general.text-here": "here",
-  // TODO Source message changed - Revise the translation
-  "mydspace.general.text-here": "ICI",
-  
+  "mydspace.general.text-here": "ici",
+
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Sélectionner cette option pour envoyer un message au déposant.",
-  
+
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Insérer votre message ici...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "Masquer message",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "Marquer comme lu",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "Marquer comme non lu",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Aucun contenu.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Pas encore de messages.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "Envoyer",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "Afficher message",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "Objet...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "Sélectionner cette option pour envoyer un message au vérificateur.",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Messages",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "À",
-  
+
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "Nouveau dépôt",
-  
+
   // "mydspace.new-submission-external": "Import metadata from external source",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external": "Import metadata from external source",
-  
+  "mydspace.new-submission-external": "Importer les métadonnées depuis une source externe",
+
   // "mydspace.new-submission-external-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
-  
+  "mydspace.new-submission-external-short": "Importer métadonnées",
+
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "Vos dépôts",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Aucun résumé",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "Aucun auteur",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   "mydspace.results.no-collections": "Aucune Collection",
-  
+
   // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "Aucune date",
-  
+
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Aucun fichier",
-  
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "Aucun Item à afficher",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Aucun titre",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Aucune URL",
-  
+
   // "mydspace.show.workflow": "All tasks",
   "mydspace.show.workflow": "Tâches de validation",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Vos dépôts",
-  
+
   // "mydspace.status.archived": "Archived",
   "mydspace.status.archived": "Archivés",
-  
+
   // "mydspace.status.validation": "Validation",
   "mydspace.status.validation": "En cours de validation",
-  
+
   // "mydspace.status.waiting-for-controller": "Waiting for controller",
   "mydspace.status.waiting-for-controller": "En attente d'assignation",
-  
+
   // "mydspace.status.workflow": "Workflow",
   "mydspace.status.workflow": "Workflow",
-  
+
   // "mydspace.status.workspace": "Workspace",
   "mydspace.status.workspace": "Workspace",
-  
+
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
-  
+
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Erreur à la création du Workspace. Veuillez vérifier le contenu téléchargé avant de réessayer.",
-  
+
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  
+  "mydspace.upload.upload-failed-manyentries": "Erreur lors du traitement du fichier. Maximum une entrée fichier autorisée.",
+
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  // TODO New key - Add a translation
-  "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
-  
+  "mydspace.upload.upload-failed-moreonefile": "Erreur lors du traitement de la requête. Un seul fichier est autorisé.",
+
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} nouveaux Items créés dans le Workspace.",
-  
+
   // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
   "mydspace.upload.upload-successful": "Nouvel item créé dans le Workspace. Cliquer {{here}} pour l'éditer.",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Afficher",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Tout Dspace",
-  
+
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Par Communauté",
-  
+
   // "nav.language": "Language switch",
   "nav.language": "Sélecteur de langue",
-  
+
   // "nav.login": "Log In",
   "nav.login": "Se connecter",
-  
+
   // "nav.logout": "Log Out",
   "nav.logout": "Se déconnecter",
-  
+
   // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
-  
+  "nav.profile": "Profil",
+
   // "nav.search": "Search",
   "nav.search": "Rechercher",
-  
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Statistiques",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
+  "nav.stop-impersonating": "Retour à votre propre EPerson",
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Structure Organisationnelle",
-  
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Ville",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "Pays",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Date de fondation",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "Description",
-  
+
   // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
-  
+  "orgunit.page.edit": "Éditer cet item",
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Structure Organisationnelle : ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Résultats par page",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} sur {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Voici les éléments ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Options de tri",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Personne",
-  
+
   // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "person.listelement.no-title": "No name found",
-  
+  "person.listelement.no-title": "Aucun nom trouvé",
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Date de naissance",
-  
+
   // "person.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
-  
+  "person.page.edit": "Éditer cet item",
+
   // "person.page.email": "Email Address",
   "person.page.email": "Adresse mail",
-  
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "Prénom",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "Fonction",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Nom de famille",
-  
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Afficher toutes les métadonnées",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "Staff ID",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "Personne : ",
-  
+
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Résultats de recherche Personne",
-  
+
   // "person.search.title": "DSpace Angular :: Person Search",
   "person.search.title": "DSpace Angular :: Recherche Personne",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
-  // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
-  
+  "process.new.select-parameters": "Paramètres",
+
   // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
-  
+  "process.new.cancel": "Annuler",
+
   // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
-  
+  "process.new.submit": "Confirmer",
+
   // "process.new.select-script": "Script",
-  // TODO New key - Add a translation
   "process.new.select-script": "Script",
-  
+
   // "process.new.select-script.placeholder": "Choose a script...",
-  // TODO New key - Add a translation
-  "process.new.select-script.placeholder": "Choose a script...",
-  
+  "process.new.select-script.placeholder": "Sélectionner un script...",
+
   // "process.new.select-script.required": "Script is required",
-  // TODO New key - Add a translation
-  "process.new.select-script.required": "Script is required",
-  
+  "process.new.select-script.required": "Veuillez sélectionner un script",
+
   // "process.new.parameter.file.upload-button": "Select file...",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.upload-button": "Select file...",
-  
+  "process.new.parameter.file.upload-button": "Sélectionner fichier...",
+
   // "process.new.parameter.file.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
-  
+  "process.new.parameter.file.required": "Veuillez sélectionner un fichier",
+
   // "process.new.parameter.string.required": "Parameter value is required",
-  // TODO New key - Add a translation
-  "process.new.parameter.string.required": "Parameter value is required",
-  
+  "process.new.parameter.string.required": "Veuillez spécifier un paramètre",
+
   // "process.new.parameter.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
-  
+  "process.new.parameter.type.value": "valeur",
+
   // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.file": "file",
-  
+  "process.new.parameter.type.file": "fichier",
+
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  // TODO New key - Add a translation
-  "process.new.parameter.required.missing": "The following parameters are required but still missing:",
-  
+  "process.new.parameter.required.missing": "Les paramètres obligatoires suivants n'ont pas été détectés :",
+
   // "process.new.notification.success.title": "Success",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
-  
+  "process.new.notification.success.title": "Succès",
+
   // "process.new.notification.success.content": "The process was successfully created",
-  // TODO New key - Add a translation
-  "process.new.notification.success.content": "The process was successfully created",
-  
+  "process.new.notification.success.content": "Le processus a été créé avec succès",
+
   // "process.new.notification.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
-  
+  "process.new.notification.error.title": "Erreur",
+
   // "process.new.notification.error.content": "An error occurred while creating this process",
-  // TODO New key - Add a translation
-  "process.new.notification.error.content": "An error occurred while creating this process",
-  
+  "process.new.notification.error.content": "Une erreur s'est produite lors de la création du processus",
+
   // "process.new.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
-  
+  "process.new.header": "Créer nouveau processus",
+
   // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
-  
+  "process.new.title": "Créer nouveau processus",
+
   // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
+  "process.new.breadcrumbs": "Créer nouveau processus",
+
+
+
   // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
   "process.detail.arguments" : "Arguments",
-  
+
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  
+  "process.detail.arguments.empty" : "Aucun argument défini pour ce processus",
+
   // "process.detail.back" : "Back",
-  // TODO New key - Add a translation
-  "process.detail.back" : "Back",
-  
+  "process.detail.back" : "Retour",
+
   // "process.detail.output" : "Process Output",
-  // TODO New key - Add a translation
-  "process.detail.output" : "Process Output",
-  
+  "process.detail.output" : "Rapport du processus",
+
   // "process.detail.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
-  
+  "process.detail.logs.button": "Récupérer le rapport du processus",
+
   // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
-  
+  "process.detail.logs.loading": "En cours de récupération",
+
   // "process.detail.logs.none": "This process has no output",
-  // TODO New key - Add a translation
-  "process.detail.logs.none": "This process has no output",
-  
+  "process.detail.logs.none": "Aucun rapport pour ce processus",
+
   // "process.detail.output-files" : "Output Files",
-  // TODO New key - Add a translation
-  "process.detail.output-files" : "Output Files",
-  
+  "process.detail.output-files" : "Fichiers de rapport",
+
   // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  // TODO New key - Add a translation
-  "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  
+  "process.detail.output-files.empty" : "Aucun fichier de rapport pour ce processus",
+
   // "process.detail.script" : "Script",
-  // TODO New key - Add a translation
   "process.detail.script" : "Script",
-  
+
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  // TODO New key - Add a translation
-  "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  
+  "process.detail.title" : "Processus : {{ id }} - {{ name }}",
+
   // "process.detail.start-time" : "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time" : "Start time",
-  
+  "process.detail.start-time" : "Heure de début",
+
   // "process.detail.end-time" : "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
+  "process.detail.end-time" : "Heure de fin",
+
   // "process.detail.status" : "Status",
-  // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
+  "process.detail.status" : "Statut",
+
   // "process.detail.create" : "Create similar process",
-  // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
+  "process.detail.create" : "Créer processus similaire",
+
+
+
   // "process.overview.table.finish" : "Finish time",
-  // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
+  "process.overview.table.finish" : "Heure de fin",
+
   // "process.overview.table.id" : "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
+  "process.overview.table.id" : "ID Processus",
+
   // "process.overview.table.name" : "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name" : "Nom",
+
   // "process.overview.table.start" : "Start time",
-  // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
-  
+  "process.overview.table.start" : "Heure de début",
+
   // "process.overview.table.status" : "Status",
-  // TODO New key - Add a translation
-  "process.overview.table.status" : "Status",
-  
+  "process.overview.table.status" : "Statut",
+
   // "process.overview.table.user" : "User",
-  // TODO New key - Add a translation
-  "process.overview.table.user" : "User",
-  
+  "process.overview.table.user" : "Utilisateur",
+
   // "process.overview.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
-  
+  "process.overview.title": "Sommaire des processus",
+
   // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
-  
+  "process.overview.breadcrumbs": "Sommaire des processus",
+
   // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
-  
-  
+  "process.overview.new": "Nouveau",
+
+
   // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
-  
+  "profile.breadcrumbs": "Mise à jour profil",
+
   // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
-  
+  "profile.card.identify": "Identification",
+
   // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
-  
+  "profile.card.security": "Sécurité",
+
   // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
-  
+  "profile.form.submit": "Confirmer",
+
   // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
-  
+  "profile.groups.head": "Groupes auxquelles vous appartenez",
+
   // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
-  
+  "profile.head": "Mise à jour profil",
+
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.firstname.required": "First Name is required",
-  
+  "profile.metadata.form.error.firstname.required": "Le prénom est obligatoire",
+
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  // TODO New key - Add a translation
-  "profile.metadata.form.error.lastname.required": "Last Name is required",
-  
+  "profile.metadata.form.error.lastname.required": "Le nom de famille est obligatoire",
+
   // "profile.metadata.form.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
-  
+  "profile.metadata.form.label.email": "Adresse E-mail",
+
   // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
-  
+  "profile.metadata.form.label.firstname": "Prénom",
+
   // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "Language",
-  
+  "profile.metadata.form.label.language": "Langue",
+
   // "profile.metadata.form.label.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.lastname": "Last Name",
-  
+  "profile.metadata.form.label.lastname": "Nom de famille",
+
   // "profile.metadata.form.label.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
-  
+  "profile.metadata.form.label.phone": "Numéro de téléphone",
+
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
-  
+  "profile.metadata.form.notifications.success.content": "Les adaptations du profil ont été sauvegardées avec succès.",
+
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
-  
+  "profile.metadata.form.notifications.success.title": "Profil sauvegardé",
+
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
-  
+  "profile.notifications.warning.no-changes.content": "Aucun changement n'a été réalisé au niveau de ce profil.",
+
   // "profile.notifications.warning.no-changes.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
-  
+  "profile.notifications.warning.no-changes.title": "Aucun changement",
+
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  
+  "profile.security.form.error.matching-passwords": "Les mots de passe ne correspondent pas.",
+
   // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  
+  "profile.security.form.error.password-length": "Le mot de passe doit au moins faire 6 caractères..",
+
   // "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.info": "Optionally, you can enter a new password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  
+  "profile.security.form.info": "Un mot de passe facultatif peut être en dans les zone ci-dessous. Il doit faire au moins 6 caractères.",
+
   // "profile.security.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "Password",
-  
+  "profile.security.form.label.password": "Mot de passe",
+
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  // TODO New key - Add a translation
-  "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  
+  "profile.security.form.label.passwordrepeat": "Entrer à nouveau pour confirmer",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  
+  "profile.security.form.notifications.success.content": "Votre nouveau mot de passe a été sauvegardé avec succès.",
+
   // "profile.security.form.notifications.success.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
-  
+  "profile.security.form.notifications.success.title": "Mot de passe sauvegardé",
+
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.title": "Error changing passwords",
-  
+  "profile.security.form.notifications.error.title": "Erreur modification mot de passe",
+
   // "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-long-enough": "The password has to be at least 6 characters long.",
-  
+  "profile.security.form.notifications.error.not-long-enough": "Le mot de passe doit faire au moins 6 caractères.",
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  
+  "profile.security.form.notifications.error.not-same": "Les mots de passe ne correspondent pas.",
+
   // "profile.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
-  
-  
-  
+  "profile.title": "Mise à jour profil",
+
+
+
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Projet de recherche",
-  
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Contributeurs",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "Description",
-  
+
   // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
-  
+  "project.page.edit": "Éditer cet Item",
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Échéance prévue",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "Bailleurs de fonds",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "ID",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Mots-clés",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "Statut",
-  
+
   // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "Projet de recherche : ",
-  
+
   // "project.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
-  
-  
-  
+  "project.search.results.head": "Résultats de recherche Projet",
+
+
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publication",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "Description",
-  
+
   // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "publication.page.edit": "Edit this item",
-  
+  "publication.page.edit": "Éditer cet Item",
+
   // "publication.page.journal-issn": "Journal ISSN",
-  "publication.page.journal-issn": "ISSN du Périodique",
-  
+  "publication.page.journal-issn": "ISSN de la revue",
+
   // "publication.page.journal-title": "Journal Title",
-  "publication.page.journal-title": "Titre du Périodique",
-  
+  "publication.page.journal-title": "Titre de la revue",
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Éditeur",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publication : ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Titre du volume",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Résultats de recherche Publication",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   "publication.search.title": "DSpace Angular :: Recherche Publication",
-  
-  
+
+
   // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
-  
+  "register-email.title": "Inscription nouvel utilisateur",
+
   // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
-  
+  "register-page.create-profile.header": "Créer Profil",
+
   // "register-page.create-profile.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.header": "Identify",
-  
+  "register-page.create-profile.identification.header": "Identification",
+
   // "register-page.create-profile.identification.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
-  
+  "register-page.create-profile.identification.email": "Adresse e-mail",
+
   // "register-page.create-profile.identification.first-name": "First Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name": "First Name *",
-  
+  "register-page.create-profile.identification.first-name": "Prénom *",
+
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  
+  "register-page.create-profile.identification.first-name.error": "Veuillez remplir le prénom",
+
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name": "Last Name *",
-  
+  "register-page.create-profile.identification.last-name": "Nom de famille *",
+
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  
+  "register-page.create-profile.identification.last-name.error": "Veuillez remplir le nom de famille",
+
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
-  
+  "register-page.create-profile.identification.contact": "N° Téléphone",
+
   // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "Language",
-  
+  "register-page.create-profile.identification.language": "Langue",
+
   // "register-page.create-profile.security.header": "Security",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.header": "Security",
-  
+  "register-page.create-profile.security.header": "Sécurité",
+
   // "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.info": "Please enter a password in the box below, and confirm it by typing it again into the second box. It should be at least six characters long.",
-  
+  "register-page.create-profile.security.info": "Veuillez entrer un mot de passe dans la zone ci-dessous et confirmer en l'entrant à nouveau dans la seconde zone. Le mot de passe doit au moins faire 6 caractères.",
+
   // "register-page.create-profile.security.label.password": "Password *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.password": "Password *",
-  
+  "register-page.create-profile.security.label.password": "Mot de passe *",
+
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  
+  "register-page.create-profile.security.label.passwordrepeat": "Entrer à nouveau pour confirmer *",
+
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
-  
+  "register-page.create-profile.security.error.empty-password": "Veuillez entrer un mot de passe dans la zone ci-dessous.",
+
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-  
+  "register-page.create-profile.security.error.matching-passwords": "Les mots de passe ne correspondent pas.",
+
   // "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.error.password-length": "The password should be at least 6 characters long.",
-  
+  "register-page.create-profile.security.error.password-length": "Le mot de passe doit au moins faire 6 caractères.",
+
   // "register-page.create-profile.submit": "Complete Registration",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit": "Complete Registration",
-  
+  "register-page.create-profile.submit": "Confirmer l'inscription",
+
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  
+  "register-page.create-profile.submit.error.content": "Une erreur s'est produite lors de la création de l'utilisateur.",
+
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
-  
+  "register-page.create-profile.submit.error.head": "Echec lors de l'inscription",
+
   // "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.content": "The registration was successful. You have been logged in as the created user.",
-  
+  "register-page.create-profile.submit.success.content": "L'utilisateur a été créé avec succès. Vous êtes connecté avec le compte de l'utilisateur ainsi créé.",
+
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
+  "register-page.create-profile.submit.success.head": "Inscription terminée",
+
+
   // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
-  
+  "register-page.registration.header": "Inscription nouvel utilisateur",
+
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  // TODO New key - Add a translation
-  "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  
+  "register-page.registration.info": "Créer un compte pour pouvoir vous abonner aux collections et recevoir les nouveautés via mail ainsi que déposer de nouveaux Items dans DSpace.",
+
   // "register-page.registration.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
-  
+  "register-page.registration.email": "Adresse e-mail *",
+
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.required": "Please fill in an email address",
-  
+  "register-page.registration.email.error.required": "Veuillez remplir une adresse e-mail",
+
   // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  // TODO New key - Add a translation
-  "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  
+  "register-page.registration.email.error.pattern": "Veuillez remplir une adresse e-mail valide",
+
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  // TODO New key - Add a translation
-  "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  
+  "register-page.registration.email.hint": "Cette adresse va être vérifiée et utilisée en tant qu'identifiant de connection.",
+
   // "register-page.registration.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
-  
+  "register-page.registration.submit": "Enregistrer",
+
   // "register-page.registration.success.head": "Verification email sent",
-  // TODO New key - Add a translation
-  "register-page.registration.success.head": "Verification email sent",
-  
+  "register-page.registration.success.head": "Mail de vérification",
+
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  // TODO New key - Add a translation
-  "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  
+  "register-page.registration.success.content": "Un mail de vérification a été envoyé à l'adresse et contient une URL de validation ainsi que de plus amples instructions.",
+
   // "register-page.registration.error.head": "Error when trying to register email",
-  // TODO New key - Add a translation
-  "register-page.registration.error.head": "Error when trying to register email",
-  
+  "register-page.registration.error.head": "Erreur lors de l'inscription",
+
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  // TODO New key - Add a translation
-  "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-  
-  
-  
+  "register-page.registration.error.content": "Une erreur s'est produite lors de l'inscription de l'adresse e-mail : {{ email }}",
+
+
+
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  // TODO New key - Add a translation
-  "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
-  
+  "relationships.add.error.relationship-type.content": "Aucune correspondante adéquate détectée pour la relation de type {{ type }} entre ces 2 Items",
+
   // "relationships.add.error.server.content": "The server returned an error",
-  // TODO New key - Add a translation
-  "relationships.add.error.server.content": "The server returned an error",
-  
+  "relationships.add.error.server.content": "Le serveur a retourné une erreur",
+
   // "relationships.add.error.title": "Unable to add relationship",
-  // TODO New key - Add a translation
-  "relationships.add.error.title": "Unable to add relationship",
-  
+  "relationships.add.error.title": "Impossible d'ajouter la relation",
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Auteurs",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
-  
+  "relationships.isAuthorOf.Person": "Auteurs (personnes)",
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
+  "relationships.isAuthorOf.OrgUnit": "Auteurs (structures)",
+
   // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "Numéros de Périodique",
-  
+  "relationships.isIssueOf": "Numéros de revue",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
-  "relationships.isJournalIssueOf": "Numéro de Périodique",
-  
+  "relationships.isJournalIssueOf": "Numéro de revue",
+
   // "relationships.isJournalOf": "Journals",
-  "relationships.isJournalOf": "Périodiques",
-  
+  "relationships.isJournalOf": "Revues",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Structure organisationnelle",
-  
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "Auteurs",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   "relationships.isProjectOf": "Projets de recherche",
-  
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Publications",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "Articles",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf": "Périodique",
-  
+  "relationships.isSingleJournalOf": "Revue",
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  "relationships.isSingleVolumeOf": "Volume de Périodique",
-  
+  "relationships.isSingleVolumeOf": "Volume revue",
+
   // "relationships.isVolumeOf": "Journal Volumes",
-  "relationships.isVolumeOf": "Volumes de Périodique",
-  
+  "relationships.isVolumeOf": "Volumes revue",
+
   // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
-  
-  
-  
+  "relationships.isContributorOf": "Contributeurs",
+
+
+
   // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
-  
+  "resource-policies.add.button": "Ajouter",
+
   // "resource-policies.add.for.": "Add a new policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.": "Add a new policy",
-  
+  "resource-policies.add.for.": "Ajouter nouvelle règle",
+
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-  
+  "resource-policies.add.for.bitstream": "Ajouter une nouvelle règle Bitstream",
+
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.bundle": "Add a new Bundle policy",
-  
+  "resource-policies.add.for.bundle": "Ajouter une nouvelle règle Bundle",
+
   // "resource-policies.add.for.item": "Add a new Item policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.item": "Add a new Item policy",
-  
+  "resource-policies.add.for.item": "Ajouter une nouvelle règle Item",
+
   // "resource-policies.add.for.community": "Add a new Community policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.community": "Add a new Community policy",
-  
+  "resource-policies.add.for.community": "Ajouter une nouvelle règle Communauté",
+
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
-  
+  "resource-policies.add.for.collection": "Ajouter une nouvelle règle Collection",
+
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.heading": "Create new resource policy for ",
-  
+  "resource-policies.create.page.heading": "Ajouter une nouvelle règle d'accès pour ",
+
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-  
+  "resource-policies.create.page.failure.content": "Une erreur s'est produite lors de la création de la règle d'accès.",
+
   // "resource-policies.create.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
-  
+  "resource-policies.create.page.success.content": "Règle créée avec succès",
+
   // "resource-policies.create.page.title": "Create new resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.title": "Create new resource policy",
-  
+  "resource-policies.create.page.title": "Créer nouvelle règle d'autorisation",
+
   // "resource-policies.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
-  
+  "resource-policies.delete.btn": "Supprimer sélection",
+
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn.title": "Delete selected resource policies",
-  
+  "resource-policies.delete.btn.title": "Supprimer les règles d'autorisation sélectionnées",
+
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  // TODO New key - Add a translation
-  "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-  
+  "resource-policies.delete.failure.content": "Une erreur s'est produite lors de la suppression des règles d'autorisation.",
+
   // "resource-policies.delete.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
-  
+  "resource-policies.delete.success.content": "Règle supprimée avec succès",
+
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.heading": "Edit resource policy ",
-  
+  "resource-policies.edit.page.heading": "Éditer règle d'autorisation",
+
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  
+  "resource-policies.edit.page.failure.content": "Une erreur s'est produite lors de la modification de la règle d'autorisation.",
+
   // "resource-policies.edit.page.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
-  
+  "resource-policies.edit.page.success.content": "Règle mise à jour avec succès",
+
   // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
-  
+  "resource-policies.edit.page.title": "Éditer règle d'autorisation",
+
   // "resource-policies.form.action-type.label": "Select the action type",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.label": "Select the action type",
-  
+  "resource-policies.form.action-type.label": "Sélectionner le type d'action",
+
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  // TODO New key - Add a translation
-  "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  
+  "resource-policies.form.action-type.required": "Vous devez sélectioner l'action couverte par cette règle d'autorisation.",
+
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  
+  "resource-policies.form.eperson-group-list.label": "La permission sera octroyée à l'utilisateur Eperson ou le groupe",
+
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
+  "resource-policies.form.eperson-group-list.select.btn": "Sélectionner",
+
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  
+  "resource-policies.form.eperson-group-list.tab.eperson": "Rechercher ePerson",
+
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-  
+  "resource-policies.form.eperson-group-list.tab.group": "Rechercher groupe",
+
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  
+  "resource-policies.form.eperson-group-list.table.headers.name": "Nom",
+
   // "resource-policies.form.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
-  
+  "resource-policies.form.date.end.label": "Date de fin",
+
   // "resource-policies.form.date.start.label": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.start.label": "Start Date",
-  
+  "resource-policies.form.date.start.label": "Date de début",
+
   // "resource-policies.form.description.label": "Description",
-  // TODO New key - Add a translation
   "resource-policies.form.description.label": "Description",
-  
+
   // "resource-policies.form.name.label": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
-  
+  "resource-policies.form.name.label": "Nom",
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.label": "Select the policy type",
-  
+  "resource-policies.form.policy-type.label": "Sélectionner le type de règle",
+
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  // TODO New key - Add a translation
-  "resource-policies.form.policy-type.required": "You must select the resource policy type.",
-  
+  "resource-policies.form.policy-type.required": "Vous devez sélectionner le type de règle d'autorisation.",
+
   // "resource-policies.table.headers.action": "Action",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.action": "Action",
-  
+
   // "resource-policies.table.headers.date.end": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.end": "End Date",
-  
+  "resource-policies.table.headers.date.end": "Date de fin",
+
   // "resource-policies.table.headers.date.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
-  
+  "resource-policies.table.headers.date.start": "Date de début",
+
   // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "Edit",
-  
+  "resource-policies.table.headers.edit": "Éditer",
+
   // "resource-policies.table.headers.edit.group": "Edit group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.group": "Edit group",
-  
+  "resource-policies.table.headers.edit.group": "Éditer groupe",
+
   // "resource-policies.table.headers.edit.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
-  
+  "resource-policies.table.headers.edit.policy": "Éditer règle",
+
   // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
-  
+  "resource-policies.table.headers.group": "Groupe",
+
   // "resource-policies.table.headers.id": "ID",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.id": "ID",
-  
+
   // "resource-policies.table.headers.name": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.name": "Name",
-  
+  "resource-policies.table.headers.name": "Nom",
+
   // "resource-policies.table.headers.policyType": "type",
-  // TODO New key - Add a translation
   "resource-policies.table.headers.policyType": "type",
-  
+
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  
+  "resource-policies.table.headers.title.for.bitstream": "Règles Bitstream",
+
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  
+  "resource-policies.table.headers.title.for.bundle": "Règles Bundle",
+
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.item": "Policies for Item",
-  
+  "resource-policies.table.headers.title.for.item": "Règles Item",
+
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.community": "Policies for Community",
-  
+  "resource-policies.table.headers.title.for.community": "Règles Communauté",
+
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
+  "resource-policies.table.headers.title.for.collection": "Règles Collection",
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Afficher",
-  
+
   // "search.title": "DSpace Angular :: Search",
   "search.title": "DSpace Angular :: Recherche",
-  
+
   // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
-  
-  
+  "search.breadcrumbs": "Recherche",
+
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Auteur",
-  
+
   // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "Jusque",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Depuis",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Date de dépôt",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
-  
+  "search.filters.applied.f.discoverable": "Privé",
+
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "Type d'Item",
-  
+
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Fichier(s) présent(s)",
-  
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Type",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "Statut",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Sujet",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "Déposant",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.jobTitle": "Job Title",
-  
+  "search.filters.applied.f.jobTitle": "Fonction",
+
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.max": "End birth date",
-  
+  "search.filters.applied.f.birthDate.max": "Date de naissance max",
+
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
-  
+  "search.filters.applied.f.birthDate.min": "Date de naissance min",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
+  "search.filters.applied.f.withdrawn": "Retiré",
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Auteur",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Nom de l'auteur",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Date de naissance",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Date de naissance",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Date de publication",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "Date de publication",
-  
+
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Rédacteur en chef",
-  
+
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Rédacteur en chef",
-  
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Sujet",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Sujet",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Éditeur",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Éditeur",
-  
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Date",
-  
+
   // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
   "search.filters.filter.dateIssued.max.placeholder": "Depuis",
-  
+
   // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.min.placeholder": "Jusque",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Date de dépôt",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Date de dépôt",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
-  
+  "search.filters.filter.discoverable.head": "Privé",
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.filter.withdrawn.head": "Withdrawn",
-  
+  "search.filters.filter.withdrawn.head": "Retiré",
+
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Type d'Item",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Type d'Item",
-  
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Fichier(s) présent(s)",
-  
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Type",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Type",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Fonction",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Fonction",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Langue(s)",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Langue(s)",
-  
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Statut",
-  
+
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Statut",
-  
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Personne",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Personne",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Pays",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Pays",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Ville",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Ville",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Date de fondation",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Date de fondation",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Scope",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Scope",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Moins",
-  
+
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "Plus",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Sujet",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Sujet",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Déposant",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Déposant",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
-  
+  "search.filters.entityType.JournalIssue": "Numéro de revue",
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
-  
+  "search.filters.entityType.JournalVolume": "Volume de la revue",
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
-  // TODO New key - Add a translation
-  "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
+  "search.filters.entityType.OrgUnit": "Structure",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.true": "Yes",
-  
+  "search.filters.has_content_in_original_bundle.true": "Oui",
+
   // "search.filters.has_content_in_original_bundle.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.false": "No",
-  
+  "search.filters.has_content_in_original_bundle.false": "Non",
+
   // "search.filters.discoverable.true": "No",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.true": "No",
-  
+  "search.filters.discoverable.true": "Non",
+
   // "search.filters.discoverable.false": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.false": "Yes",
-  
+  "search.filters.discoverable.false": "Oui",
+
   // "search.filters.withdrawn.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.true": "Yes",
-  
+  "search.filters.withdrawn.true": "Oui",
+
   // "search.filters.withdrawn.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.false": "No",
-  
-  
+  "search.filters.withdrawn.false": "Non",
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtres",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Réinitialiser filtres",
-  
-  
-  
+
+
+
   // "search.form.search": "Search",
   "search.form.search": "Recherche",
-  
+
   // "search.form.search_dspace": "Search DSpace",
   "search.form.search_dspace": "Recherche dans DSpace",
-  
+
   // "search.form.search_mydspace": "Search MyDSpace",
   "search.form.search_mydspace": "Recherche dans MyDSpace",
-  
-  
-  
+
+
+
   // "search.results.head": "Search Results",
   "search.results.head": "Résultats de recherche",
-  
+
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "Votre recherche n'a retourné aucun résultat. Vous n'arrivez pas à trouver ce que vous recherchez ? Essayez de mettre",
-  
+
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "des guillemets avant et après les termes recherchés",
-  
+
   // "search.results.empty": "Your search returned no results.",
-  // TODO New key - Add a translation
-  "search.results.empty": "Your search returned no results.",
-  
-  
-  
+  "search.results.empty": "Votre recherche n'a retourné aucun résultat.",
+
+
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Retour aux résultats",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Filtres",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Outils de recherche",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "Résultats",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Résultats par page",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Trier par",
-  
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Paramètres",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Afficher détail",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "Affichage Grille",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Affichage Liste",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
-  
+  "sorting.ASC": "Croissant",
+
   // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
-  
+  "sorting.DESC": "Décroissant",
+
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Titre croissant",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Titre décroissant",
-  
+
   // "sorting.score.DESC": "Relevance",
   "sorting.score.DESC": "Pertinence",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
-  
+  "statistics.title": "Statistiques",
+
   // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
-  
+  "statistics.header": "Statistiques pour {{ scope }}",
+
   // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
-  
+  "statistics.breadcrumbs": "Statistiques",
+
   // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
-  
+  "statistics.page.no-data": "Aucune donnée disponible",
+
   // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
-  
+  "statistics.table.no-data": "Aucune donnée disponible",
+
   // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
-  
+  "statistics.table.title.TotalVisits": "Total visites",
+
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  
+  "statistics.table.title.TotalVisitsPerMonth": "Total visites par mois",
+
   // "statistics.table.title.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
-  
+  "statistics.table.title.TotalDownloads": "Téléchargements",
+
   // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
-  
+  "statistics.table.title.TopCountries": "Vues par pays",
+
   // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
-  
+  "statistics.table.title.TopCities": "Vues par villes",
+
   // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
-  
-  
-  
+  "statistics.table.header.views": "Vues",
+
+
+
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Éditer dépôt",
-  
+
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "Vous n'avez pas les droits requis pour réaliser un nouveau dépôt.",
-  
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Déposer",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Annuler",
-  
+
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "L'annulation est irréversible, les données du dépôt en cours seront perdues. Êtes-vous sûr(e) ?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Oui, certain(e)",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   "submission.general.discard.confirm.title": "Annuler dépôt",
-  
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Annuler",
-  
+
   // "submission.general.save": "Save",
   "submission.general.save": "Sauvegarder",
-  
+
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Sauvegarder pour plus tard",
-  
-  
+
+
   // "submission.import-external.page.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.page.title": "Import metadata from an external source",
-  
+  "submission.import-external.page.title": "Importer les métadonnées depuis une source externe",
+
   // "submission.import-external.title": "Import metadata from an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.title": "Import metadata from an external source",
-  
+  "submission.import-external.title": "Importer les métadonnées depuis une source externe",
+
   // "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  // TODO New key - Add a translation
-  "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
-  
+  "submission.import-external.page.hint": "Entrer votre recherche ci-dessus pour rechercher les publications à importer.",
+
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  // TODO New key - Add a translation
-  "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  
+  "submission.import-external.back-to-my-dspace": "De retour vers MyDSpace",
+
   // "submission.import-external.search.placeholder": "Search the external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.placeholder": "Search the external source",
-  
+  "submission.import-external.search.placeholder": "Recherche source externe",
+
   // "submission.import-external.search.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
-  
+  "submission.import-external.search.button": "Rechercher",
+
   // "submission.import-external.search.button.hint": "Write some words to search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button.hint": "Write some words to search",
-  
+  "submission.import-external.search.button.hint": "Votre recherche",
+
   // "submission.import-external.search.source.hint": "Pick an external source",
-  // TODO New key - Add a translation
-  "submission.import-external.search.source.hint": "Pick an external source",
-  
+  "submission.import-external.search.source.hint": "Choisir source externe",
+
   // "submission.import-external.source.arxiv": "arXiv",
-  // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
-  // TODO New key - Add a translation
-  "submission.import-external.source.loading": "Loading ...",
-  
+  "submission.import-external.source.loading": "En cours de chargement ...",
+
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  
+  "submission.import-external.source.sherpaJournal": "Sherpa Journals",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
-  // TODO New key - Add a translation
   "submission.import-external.source.orcid": "ORCID",
-  
+
   // "submission.import-external.source.pubmed": "Pubmed",
-  // TODO New key - Add a translation
   "submission.import-external.source.pubmed": "Pubmed",
-  
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
-  // TODO New key - Add a translation
   "submission.import-external.source.lcname": "Library of Congress Names",
-  
+
   // "submission.import-external.preview.title": "Item Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
-  
+  "submission.import-external.preview.title": "Prévisualisation Item",
+
   // "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.subtitle": "The metadata below was imported from an external source. It will be pre-filled when you start the submission.",
-  
+  "submission.import-external.preview.subtitle": "Les métadonnées ci-dessous ont été importées depuis une source externe. Le formulaire de dépôt sera pré-rempli avec ces métadonnées lorsque vous initierez le dépôt.",
+
   // "submission.import-external.preview.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
-  
+  "submission.import-external.preview.button.import": "Démarrer dépôt",
+
   // "submission.import-external.preview.error.import.title": "Submission error",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.title": "Submission error",
-  
+  "submission.import-external.preview.error.import.title": "Erreur dépôt",
+
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
-  
+  "submission.import-external.preview.error.import.body": "Une erreur s'est produite lors de l'import depuis la source externe.",
+
   // "submission.sections.describe.relationship-lookup.close": "Close",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.close": "Close",
-  
+  "submission.sections.describe.relationship-lookup.close": "Fermer",
+
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.added": "Entrée locale ajoutée avec succès à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Import remote author",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importer auteur externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Import remote journal",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importer revue externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Import remote journal issue",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importer numéro de revue externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Import remote journal volume",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importer volume de revue externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importer auteur externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Successfully added local author to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Auteur local ajouté avec succès à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Successfully imported and added external author to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Auteur externe importé et ajouté à la sélection avec succès",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autorité",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Import as a new local authority entry",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importer en tant que nouvelle autorité locale",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Annuler",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Select a collection to import new entries to",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Sélectionner une collection dans laquelle importer les nouvelles entrées",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entités",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Import as a new local entity",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importer en tant que nouvelle entité locale",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importing from LC Name",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Import depuis LC Name en cours",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Import depuis ORCID en cours",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Import depuis Sherpa Journal en cours",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Import depuis Sherpa Publisher en cours",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Import depuis PubMed en cours",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Import depuis arXiv en cours",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importer revue externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Successfully added local journal to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Revue correctement ajoutée à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Successfully imported and added external journal to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revue externe importée avec succès et ajoutée à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Import Remote Journal Issue",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importer numéro de revue externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Successfully added local journal issue to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Numéro de revue correctement ajouté à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Successfully imported and added external journal issue to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Numéro de revue importé avec succès et ajouté à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Import Remote Journal Volume",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importer volume de revue externe",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Successfully added local journal volume to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Volume de revue correctement ajouté à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Successfully imported and added external journal volume to the selection",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Volume de revue importé avec succès et ajouté à la sélection",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Sélectionner une correspondance locale :",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Désélectionner tout",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Désélectionner page",
+
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "En cours de chargement...",
+
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Votre recherche",
+
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Rechercher",
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Sélectionner tout",
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Sélectionner page",
+
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
+  "submission.sections.describe.relationship-lookup.selected": "{{ size }} Items sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Auteurs locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revues locales ({{ count }})",
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projects locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publications locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Auteurs locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Structures locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Paquets de données locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Fichiers de données locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revues locales ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Numéros de revue locaux ({{ count }})",
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Numéros de revue locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volumes de revues locaux ({{ count }})",
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volumes de revues locaux ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revues Sherpa ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Éditeurs Sherpa ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Recherche Agence de financement",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Recherche Financement",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Recherche Structures",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Sélection actuelle ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Numéros de revue",
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Numéros de revue",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de revue",
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de revue",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-  
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revues",
+
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Auteurs",
+
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agence de financement",
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
+  "submission.sections.describe.relationship-lookup.title.Project": "Projets",
+
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
+  "submission.sections.describe.relationship-lookup.title.Person": "Auteurs",
+
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Structures",
+
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Paquets de données",
+
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Fichiers de données",
+
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agence de financement",
+
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financement",
+
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Structure parent",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Dérouler menu",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Paramètres",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Votre sélection actuelle est vide.",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Auteurs sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revues sélectionnées",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumes de revue sélectionnés",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projets sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publications sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Auteurs sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Structures sélectionnées",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Paquets de données sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Fichiers de données sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revues sélectionnées",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Numéros sélectionnés",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volumes de revue sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agences de financement sélectionnées",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financements sélectionnés",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Numéro sélectionné",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Structure sélectionnée",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Résultats de recherche",
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Would you like to save \"{{ value }}\" as a name variant for this person so you and others can reuse it for future submissions? If you don\'t you can still use it for this submission.",
-  
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Souhaitez vous sauvegarder \"{{ value }}\" en tant que nom alternatif pour cette personne afin que vous ou un autre utilisauteur puisse l'utiliser pour de futurs dépôts? Si vous ne le souhaitez pas, vous pouvez tout de même l'utiliser pour ce dépôt.",
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
-  
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Sauvegarder nom alternatif",
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Utiliser uniquement pour ce dépôt",
+
   // "submission.sections.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License Type",
-  
+  "submission.sections.ccLicense.type": "Type de licence",
+
   // "submission.sections.ccLicense.select": "Select a license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.select": "Select a license type…",
-  
+  "submission.sections.ccLicense.select": "Sélectionner un type de licence...",
+
   // "submission.sections.ccLicense.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
-  
+  "submission.sections.ccLicense.change": "Changer type de licence...",
+
   // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
-  
+  "submission.sections.ccLicense.none": "Pas de licence disponible",
+
   // "submission.sections.ccLicense.option.select": "Select an option…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.option.select": "Select an option…",
-  
+  "submission.sections.ccLicense.option.select": "Sélectionner une option...",
+
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.link": "You’ve selected the following license:",
-  
+  "submission.sections.ccLicense.link": "Vous avez sélectionné la licence suivante :",
+
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
+  "submission.sections.ccLicense.confirmation": "Je confirme la licence ci-dessus",
+
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Ajouter section(s)",
-  
+
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Collection",
-  
+
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
   "submission.sections.general.deposit_error_notice": "Une erreur s'est produite lors du dépôt de l'Item, veuillez réessayer plus tard.",
-  
+
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
   "submission.sections.general.deposit_success_notice": "Dépôt réalisé avec succès.",
-  
+
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
   "submission.sections.general.discard_error_notice": "Une erreur s'est produite lors de la suppression du brouillon, veuillez réessayer plus tard.",
-  
+
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Brouillon supprimé avec succès.",
-  
+
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
   "submission.sections.general.metadata-extracted": "De nouvelles métadonnées ont été extraites et ajoutées à la section <strong>{{sectionId}}</strong>.",
-  
+
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
   "submission.sections.general.metadata-extracted-new-section": "Nouvelle section <strong>{{sectionId}}</strong> ajoutée au dépôt.",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Aucune Collection disponible",
-  
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Aucune option disponible",
-  
+
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
   "submission.sections.general.save_error_notice": "Une erreur s'est produite à la sauvegarde du dépôt, veuillez réessayer plus tard.",
-  
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "Dépôt sauvegardé avec succès.",
-  
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "Rechercher une Collection",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Section(s) incomplète(s).",
-  
-  
-  
+
+
+
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
+  "submission.sections.submit.progressbar.CClicense": "Licence Creative Commons",
+
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Recycler",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Décrire",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Décrire",
-  
+
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Décrire",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Doublon(s) potentiel(s)",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licence de dépôt",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Uploader",
-  
-  
-  
+
+
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Annuler",
-  
+
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.sections.upload.delete.confirm.info": "Cette opération est irréversible. Êtes-vous sûr(e) ?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Oui, certain(e)",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "Supprimer Bitstream",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Supprimer",
-  
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Déposer des fichiers pour les lier à l'Item",
-  
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Niveau d'accès",
-  
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Date obligatoire.",
-  
+
   // "submission.sections.upload.form.from-label": "Grant access from",
-  // TODO Source message changed - Revise the translation
   "submission.sections.upload.form.from-label": "Accès accordé depuis",
-  
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Depuis",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Groupe",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "Groupe requis.",
-  
+
   // "submission.sections.upload.form.until-label": "Grant access until",
-  // TODO Source message changed - Revise the translation
   "submission.sections.upload.form.until-label": "Accès accordé jusque",
-  
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Jusque",
-  
+
   // "submission.sections.upload.header.policy.default.nolist": "Uploaded files in the {{collectionName}} collection will be accessible according to the following group(s):",
   "submission.sections.upload.header.policy.default.nolist": "Les fichiers uploadés dans la Collection {{collectionName}} seront accessibles au(x) groupe(s) suivant(s) :",
-  
+
   // "submission.sections.upload.header.policy.default.withlist": "Please note that uploaded files in the {{collectionName}} collection will be accessible, in addition to what is explicitly decided for the single file, with the following group(s):",
   "submission.sections.upload.header.policy.default.withlist": "Veuillez noter que, en complément des accès spécifiquement accordés pour le fichier, les fichiers uploadés dans la Collection {{collectionName}} seront accessibles par défaut au(x) groupe(s) suivant(s) :",
-  
+
   // "submission.sections.upload.info": "Here you will find all the files currently in the item. You can update the file metadata and access conditions or <strong>upload additional files just dragging & dropping them everywhere in the page</strong>",
-  // TODO Source message changed - Revise the translation
   "submission.sections.upload.info": "Vous trouverez ici tous les fichiers actuellement associés à l'Item. Vous pouvez éditer les métadonnés et les niveaux d'accès de ce(s) fichier(s) ou <strong>uploader des fichiers complémentaires simplement en les glissant n'importe où sur cette page</strong>",
-  
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Non",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "Aucun fichier uploadé.",
-  
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "Sauvegarder métadonnées",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Annuler",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "Échec de l'upload",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Upload réussi",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   "submission.submit.title": "Dépôt",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Supprimer",
-  
+
   // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
   "submission.workflow.generic.delete-help": "Si vous souhaitez supprimer cet Item, cliquez sur « Supprimer ». Une confirmation vous sera alors demandée.",
-  
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Éditer",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
   "submission.workflow.generic.edit-help": "Sélectionner cette option pour modifier les métadonnées de l'Item.",
-  
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "Afficher",
-  
+
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Sélectionner cette option pour afficher les métadonnées de l'Item.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Approuver",
-  
+
   // "submission.workflow.tasks.claimed.approve_help": "If you have reviewed the item and it is suitable for inclusion in the collection, select \"Approve\".",
   "submission.workflow.tasks.claimed.approve_help": "Si vous avez contrôlé cet Item et qu'il peut être ajouté à la Collection, sélectionner l'option « Approuver ».",
-  
+
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Éditer",
-  
+
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Sélectionner cette option pour modifier les métadonnées de l'Item.",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Veuillez spécifier la raison pour laquelle ce dépôt est rejeté dans le champ ci-dessous, en indicant si le déposant peut résoudre un problème et redéposer ensuite.",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Décrire la raison du rejet",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
   "submission.workflow.tasks.claimed.reject.reason.submit": "Rejeter Item",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "Raison",
-  
+
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
   "submission.workflow.tasks.claimed.reject.submit": "Rejeter",
-  
+
   // "submission.workflow.tasks.claimed.reject_help": "If you have reviewed the item and found it is <strong>not</strong> suitable for inclusion in the collection, select \"Reject\".  You will then be asked to enter a message indicating why the item is unsuitable, and whether the submitter should change something and resubmit.",
   "submission.workflow.tasks.claimed.reject_help": "Si vous avez contrôle cet Item et qu'il ne peut <strong>PAS</strong> être ajouté à la Collection, sélectionner l'option « Rejeter ».  Il vous sera alors demandé d'indiquer la raison de ce rejet et si le déposant peut apporter une correction avant de redéposer.",
-  
+
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Se désassigner",
-  
+
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
   "submission.workflow.tasks.claimed.return_help": "Renvoyer la tâche dans le pool de validation pour qu'un autre utilisateur puisse en prendre soin.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Une erreur s'est produite au cours de l'opération...",
-  
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "En cours de traitement...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   "submission.workflow.tasks.generic.submitter": "Déposant",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Opération exécutée avec succès",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Prendre en charge",
-  
+
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Assigner cette tâche à votre propre utilisateur.",
-  
+
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
   "submission.workflow.tasks.pool.hide-detail": "Masquer détails",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Afficher détails",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
-  
+  "vocabulary-treeview.header": "Arborescence hiérarchique",
+
   // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
-  
+  "vocabulary-treeview.load-more": "Charger plus",
+
   // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
-  
+  "vocabulary-treeview.search.form.reset": "Réinitialiser",
+
   // "vocabulary-treeview.search.form.search": "Search",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
-  
+  "vocabulary-treeview.search.form.search": "Rechercher",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.no-result": "There were no items to show",
-  
+  "vocabulary-treeview.search.no-result": "Aucun résultat correspondant",
+
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  
+  "vocabulary-treeview.tree.description.nsi": "Norwegian Science Index",
+
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  // TODO New key - Add a translation
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   "uploader.browse": "parcourir",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Glisser & Déposer vos fichiers ici",
-  
+
   // "uploader.or": ", or ",
-  // TODO Source message changed - Revise the translation
-  "uploader.or": ", ou",
-  
+  "uploader.or": ", ou ",
+
   // "uploader.processing": "Processing",
   "uploader.processing": "En cours de traitement",
-  
+
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Longueur de la file d'attente",
-  
-  // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
-  
-  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
-  
-  // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  // TODO New key - Add a translation
-  "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
-  
-  
-  
-  // "workflowAdmin.search.results.head": "Administer Workflow",
-  // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer Workflow",
-  
-  
-  
-  // "workflow-item.delete.notification.success.title": "Deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.title": "Deleted",
-  
-  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  
-  // "workflow-item.delete.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.title": "Something went wrong",
-  
-  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  // TODO New key - Add a translation
-  "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  
-  // "workflow-item.delete.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
-  
-  // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
-  
-  // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
-  
-  // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
-  
-  
-  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-  
-  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
-  
-  // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.title": "Something went wrong",
-  
-  // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
-  
-  // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.title": "Send workflow item back to submitter",
-  
-  // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.header": "Send workflow item back to submitter",
-  
-  // "workflow-item.send-back.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
-  
-  // "workflow-item.send-back.button.confirm": "Send back"
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.confirm": "Send back"
-  
 
-}
\ No newline at end of file
+  // "virtual-metadata.delete-item.info": "Select the types for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-item.info": "Sélectionner les types pour lesquels vous souhaitez sauvegarder les métadonnées virtuelles en tant que métadonnées réelles",
+
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "Métadonnées virtuelles issues de cette relation",
+
+  // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
+  "virtual-metadata.delete-relationship.modal-head": "Sélectionner les Items pour lesquels vous souhaitez sauvegarder les métadonnées virtuelles en tant que métadonnées réelles",
+
+
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Workflow Administrateur",
+
+
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Supprimé",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Cet Item a été supprimé avec succès",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Une erreur s'est produite",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "L'item n'a pas pu être supprimé",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Supprimer Item du Workflow",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Supprimer Item du Workflow",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Annuler",
+
+  // "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm": "Supprimer",
+
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Item renvoyé au déposant",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Cet Item a été renvoyé au déposant avec succès",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Une erreur s'est produite",
+
+  // "workflow-item.send-back.notification.error.content": "The workflow item could not be sent back to the submitter",
+  "workflow-item.send-back.notification.error.content": "Cet Item n'a pas pu être renvoyé au déposant",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Renvoyer Item au déposant",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Renvoyer Item au déposant",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Annuler",
+
+  // "workflow-item.send-back.button.confirm": "Send back"
+  "workflow-item.send-back.button.confirm": "Renvoyer"
+
+
+}

From 4683df431cd88494b423a5c4a58397f01eeb6827 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 31 May 2021 14:37:29 +0200
Subject: [PATCH 057/169] 79730: Exclude search facet link from tablist

---
 .../search-facet-option/search-facet-option.component.html       | 1 +
 .../search-facet-selected-option.component.html                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index cf4876e34f..055a2d2500 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -1,4 +1,5 @@
 <a *ngIf="isVisible | async" class="d-flex flex-row"
+   [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
   <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index 4bcfc02966..411dc766d0 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -1,4 +1,5 @@
 <a class="d-flex flex-row"
+   [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>

From ffb320373debd251ef146e2450a9fa7a2cd3f9d8 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 31 May 2021 14:41:36 +0200
Subject: [PATCH 058/169] 79730: Add labels around facet checkbox inputs

---
 .../search-facet-option.component.html                    | 8 +++++---
 .../search-facet-selected-option.component.html           | 2 ++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index 055a2d2500..e2e57e7370 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -2,10 +2,12 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
-  <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
-  <span class="filter-value px-1">
+  <label class="mb-0">
+    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
+    <span class="filter-value px-1">
       {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
-  </span>
+    </span>
+  </label>
   <span class="float-right filter-value-count ml-auto">
                         <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
                     </span>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index 411dc766d0..d6cb7a3d79 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -2,8 +2,10 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
+  <label class="mb-0">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
     <span class="filter-value pl-1 text-capitalize">
         {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
+  </label>
 </a>

From 5b490203b2453477a52d90132a71ea61576dd7ac Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 09:29:01 +0200
Subject: [PATCH 059/169] 79730: Add labels around
 FilterInputSuggestionsComponent inputs

---
 .../org-unit-input-suggestions.component.html |  2 +-
 .../filter-input-suggestions.component.html   | 25 ++++++++----
 .../input-suggestions.component.ts            |  9 ++++-
 .../search-authority-filter.component.html    |  3 +-
 .../search-hierarchy-filter.component.html    |  3 +-
 .../search-text-filter.component.html         |  3 +-
 src/assets/i18n/en.json5                      | 40 +++++++++++++++++++
 7 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index e177b2b561..87a422e7db 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -21,4 +21,4 @@
             </div>
         </div>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 7a9481f2f1..f1b0ba9023 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -3,13 +3,22 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="close();">
-  <input #inputField type="text" [(ngModel)]="value" [name]="name"
-         class="form-control suggestion_input"
-         [ngClass]="{'is-invalid': !valid}"
-         [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-         [placeholder]="placeholder"
-         [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-  <input type="submit" class="d-none"/>
+  <label *ngIf="label; else searchInput" class="mb-0">
+    <ng-container *ngTemplateOutlet="searchInput"></ng-container>
+    <span class="d-none">{{label}}</span>
+  </label>
+  <ng-template #searchInput>
+    <input #inputField type="text" [(ngModel)]="value" [name]="name"
+           class="form-control suggestion_input"
+           [ngClass]="{'is-invalid': !valid}"
+           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+           [placeholder]="placeholder"
+           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  </ng-template>
+  <label class="d-none">
+    <input type="submit" class="d-none"/>
+    <span>{{'search.filters.search.submit' | translate}}</span>
+  </label>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
@@ -19,4 +28,4 @@
       </div>
     </div>
   </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index c48dcfb831..7e05dbcc8c 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -53,6 +53,11 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
    */
   @Input() valid = true;
 
+  /**
+   * Label for the input field. Used for screen readers.
+   */
+  @Input() label? = '';
+
   /**
    * Output for when the form is submitted
    */
@@ -106,10 +111,10 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
   @Input() disabled = false;
   propagateChange = (_: any) => {
     /* Empty implementation */
-  }
+  };
   propagateTouch = (_: any) => {
     /* Empty implementation */
-  }
+  };
 
   /**
    * When any of the inputs change, check if we should still show the suggestions
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index 5e6bcfaf8b..4a7f769f21 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -16,7 +16,8 @@
         </div>
     </div>
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder'| translate"
+                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
                           [action]="currentUrl"
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index 06b60b5ecd..2154ae2e24 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -16,7 +16,8 @@
         </div>
     </div>
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder'| translate"
+                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
                           [action]="currentUrl"
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index 43134014e1..30d8718b56 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -16,7 +16,8 @@
         </div>
     </div>
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder'| translate"
+                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
                           [action]="currentUrl"
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4c3317a0c0..e9f22fd52c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2878,28 +2878,40 @@
 
   "search.filters.filter.author.placeholder": "Author name",
 
+  "search.filters.filter.author.label": "Search author name",
+
   "search.filters.filter.birthDate.head": "Birth Date",
 
   "search.filters.filter.birthDate.placeholder": "Birth Date",
 
+  "search.filters.filter.birthDate.label": "Search birth date",
+
   "search.filters.filter.collapse": "Collapse filter",
 
   "search.filters.filter.creativeDatePublished.head": "Date Published",
 
   "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
 
+  "search.filters.filter.creativeDatePublished.label": "Search date published",
+
   "search.filters.filter.creativeWorkEditor.head": "Editor",
 
   "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
 
+  "search.filters.filter.creativeWorkEditor.label": "Search editor",
+
   "search.filters.filter.creativeWorkKeywords.head": "Subject",
 
   "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
 
+  "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+
   "search.filters.filter.creativeWorkPublisher.head": "Publisher",
 
   "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
 
+  "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+
   "search.filters.filter.dateIssued.head": "Date",
 
   "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
@@ -2910,6 +2922,8 @@
 
   "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
 
+  "search.filters.filter.dateSubmitted.label": "Search date submitted",
+
   "search.filters.filter.discoverable.head": "Private",
 
   "search.filters.filter.withdrawn.head": "Withdrawn",
@@ -2918,6 +2932,8 @@
 
   "search.filters.filter.entityType.placeholder": "Item Type",
 
+  "search.filters.filter.entityType.label": "Search item type",
+
   "search.filters.filter.expand": "Expand filter",
 
   "search.filters.filter.has_content_in_original_bundle.head": "Has files",
@@ -2926,38 +2942,56 @@
 
   "search.filters.filter.itemtype.placeholder": "Type",
 
+  "search.filters.filter.itemtype.label": "Search type",
+
   "search.filters.filter.jobTitle.head": "Job Title",
 
   "search.filters.filter.jobTitle.placeholder": "Job Title",
 
+  "search.filters.filter.jobTitle.label": "Search job title",
+
   "search.filters.filter.knowsLanguage.head": "Known language",
 
   "search.filters.filter.knowsLanguage.placeholder": "Known language",
 
+  "search.filters.filter.knowsLanguage.label": "Search known language",
+
   "search.filters.filter.namedresourcetype.head": "Status",
 
   "search.filters.filter.namedresourcetype.placeholder": "Status",
 
+  "search.filters.filter.namedresourcetype.label": "Search status",
+
   "search.filters.filter.objectpeople.head": "People",
 
   "search.filters.filter.objectpeople.placeholder": "People",
 
+  "search.filters.filter.objectpeople.label": "Search people",
+
   "search.filters.filter.organizationAddressCountry.head": "Country",
 
   "search.filters.filter.organizationAddressCountry.placeholder": "Country",
 
+  "search.filters.filter.organizationAddressCountry.label": "Search country",
+
   "search.filters.filter.organizationAddressLocality.head": "City",
 
   "search.filters.filter.organizationAddressLocality.placeholder": "City",
 
+  "search.filters.filter.organizationAddressLocality.label": "Search city",
+
   "search.filters.filter.organizationFoundingDate.head": "Date Founded",
 
   "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
 
+  "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+
   "search.filters.filter.scope.head": "Scope",
 
   "search.filters.filter.scope.placeholder": "Scope filter",
 
+  "search.filters.filter.scope.label": "Search scope filter",
+
   "search.filters.filter.show-less": "Collapse",
 
   "search.filters.filter.show-more": "Show more",
@@ -2966,10 +3000,14 @@
 
   "search.filters.filter.subject.placeholder": "Subject",
 
+  "search.filters.filter.subject.label": "Search subject",
+
   "search.filters.filter.submitter.head": "Submitter",
 
   "search.filters.filter.submitter.placeholder": "Submitter",
 
+  "search.filters.filter.submitter.label": "Search submitter",
+
 
 
   "search.filters.entityType.JournalIssue": "Journal Issue",
@@ -2995,6 +3033,8 @@
 
   "search.filters.reset": "Reset filters",
 
+  "search.filters.search.submit": "Submit",
+
 
 
   "search.form.search": "Search",

From 3e86efc66a6eb9e0c1f5892450b11a85b22321dc Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 09:45:17 +0200
Subject: [PATCH 060/169] 79730: Add labels around date range inputs

---
 .../search-range-filter.component.html        | 31 +++++++++++++------
 src/assets/i18n/en.json5                      |  8 +++--
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 8c4fe2b174..e4e8152e97 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -3,18 +3,31 @@
         <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
               [action]="currentUrl">
             <div class="col-6">
-                <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                       class="form-control" (blur)="onSubmit()"
-                       aria-label="Mininum value"
-                       [placeholder]="'search.filters.filter.' + filterConfig.name + '.min.placeholder'| translate"/>
+                <label class="mb-0">
+                  <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
+                         class="form-control" (blur)="onSubmit()"
+                         aria-label="Mininum value"
+                         [placeholder]="'search.filters.filter.' + filterConfig.name + '.min.placeholder' | translate"/>
+                  <span class="d-none">
+                    {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
+                  </span>
+                </label>
             </div>
             <div class="col-6">
-                <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                       class="form-control" (blur)="onSubmit()"
-                       aria-label="Maximum value"
-                       [placeholder]="'search.filters.filter.' + filterConfig.name + '.max.placeholder'| translate"/>
+                <label class="mb-0">
+                    <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
+                           class="form-control" (blur)="onSubmit()"
+                           aria-label="Maximum value"
+                           [placeholder]="'search.filters.filter.' + filterConfig.name + '.max.placeholder' | translate"/>
+                    <span class="d-none">
+                      {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
+                    </span>
+                </label>
             </div>
-            <input type="submit" class="d-none"/>
+            <label class="d-none">
+                <input type="submit" class="d-none"/>
+                <span>{{'search.filters.search.submit' | translate}}</span>
+            </label>
         </form>
 
         <ng-container *ngIf="shouldShowSlider()">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index e9f22fd52c..90aac07a54 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2914,9 +2914,13 @@
 
   "search.filters.filter.dateIssued.head": "Date",
 
-  "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
 
-  "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.label": "End",
+
+  "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+
+  "search.filters.filter.dateIssued.min.label": "Start",
 
   "search.filters.filter.dateSubmitted.head": "Date submitted",
 

From abe26ce9f828daf5a63e18cb79b2270dfe430cbe Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 12:42:40 +0200
Subject: [PATCH 061/169] 79730: Keyboard navigation for expandable filter
 facets

---
 .../search-filter.component.html              | 12 +++---
 .../search-filter.component.scss              | 38 ++++++++++++++++---
 .../search-filter/search-filter.component.ts  | 24 ++++++++++++
 3 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index eb2105f4e7..b71111de6a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -1,17 +1,19 @@
-<div class="facet-filter d-block mb-3 p-3" *ngIf="active$ | async">
-  <div (click)="toggle()" class="filter-name">
+<div class="facet-filter d-block mb-3 p-3" *ngIf="active$ | async"
+     [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
+  <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
+          class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId" [attr.aria-expanded]="false">
     <h5 class="d-inline-block mb-0">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
     </h5>
-    <span class="filter-toggle fas float-right"
+    <span class="filter-toggle flex-grow-1 fas p-auto"
           [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
           [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate"
           [attr.aria-label]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
     </span>
-  </div>
+  </button>
   <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
        (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
-       class="search-filter-wrapper" [ngClass]="{'closed' : closed}">
+       class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
     <ds-search-facet-filter-wrapper
       [filterConfig]="filter"
       [inPlaceSearch]="inPlaceSearch">
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
index 518e7c9d5f..7e2631b55f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
@@ -1,10 +1,36 @@
 :host .facet-filter {
-    border: 1px solid var(--bs-light);
-    cursor: pointer;
-    .search-filter-wrapper.closed {
-        overflow: hidden;
+  border: 1px solid var(--bs-light);
+  cursor: pointer;
+  line-height: 0;
+
+  .search-filter-wrapper {
+    line-height: var(--bs-line-height-base);
+    &.closed {
+      overflow: hidden;
     }
-    .filter-toggle {
-        line-height: var(--bs-line-height-base);
+    &.notab {
+      visibility: hidden;
     }
+  }
+
+  .filter-toggle {
+    line-height: var(--bs-line-height-base);
+    text-align: right;
+    position: relative;
+    top: -0.125rem;           // Fix weird outline shape in Chrome
+  }
+
+  > button {
+    appearance: none;
+    border: 0;
+    padding: 0;
+    background: transparent;
+    width: 100%;
+    outline: none !important;
+  }
+
+  &.focus {
+    outline: none;
+    box-shadow: var(--bs-input-btn-focus-box-shadow);
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 31ace10a7d..23cd92a601 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -37,6 +37,16 @@ export class SearchFilterComponent implements OnInit {
    */
   closed: boolean;
 
+  /**
+   * True when the filter controls should be hidden & removed from the tablist
+   */
+  notab: boolean;
+
+  /**
+   * True when the filter toggle button is focused
+   */
+  focusBox: boolean = false;
+
   /**
    * Emits true when the filter is currently collapsed in the store
    */
@@ -112,6 +122,9 @@ export class SearchFilterComponent implements OnInit {
     if (event.fromState === 'collapsed') {
       this.closed = false;
     }
+    if (event.toState === 'collapsed') {
+      this.notab = true;
+    }
   }
 
   /**
@@ -122,6 +135,17 @@ export class SearchFilterComponent implements OnInit {
     if (event.toState === 'collapsed') {
       this.closed = true;
     }
+    if (event.fromState === 'collapsed') {
+      this.notab = false;
+    }
+  }
+
+  get regionId(): string {
+    return `search-filter-region-${this.constructor['ɵcmp'].id}`;
+  }
+
+  get toggleId(): string {
+    return `search-filter-toggle-${this.constructor['ɵcmp'].id}`;
   }
 
   /**

From cb3f5ad259a5088b2bf70659a00559d67ec8ff58 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 13:04:49 +0200
Subject: [PATCH 062/169] 79730: Add null href to more/collapse toggle links

---
 .../search-authority-filter.component.html             | 10 ++++++----
 .../search-boolean-filter.component.html               | 10 ++++++----
 .../search-hierarchy-filter.component.html             | 10 ++++++----
 .../search-text-filter.component.html                  | 10 ++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index 4a7f769f21..44aed494e3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -8,11 +8,13 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()">{{"search.filters.filter.show-more"
-                | translate}}</a>
+               (click)="showMore()" href="javascript:void(0);">
+              {{"search.filters.filter.show-more" | translate}}
+            </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()">{{"search.filters.filter.show-less"
-                | translate}}</a>
+               (click)="showFirstPageOnly()" href="javascript:void(0);">
+              {{"search.filters.filter.show-less" | translate}}
+            </a>
         </div>
     </div>
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults | async)"
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index cc39b80db8..7d0ad89914 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -8,11 +8,13 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()">{{"search.filters.filter.show-more"
-                | translate}}</a>
+               (click)="showMore()" href="javascript:void(0);">
+              {{"search.filters.filter.show-more" | translate}}
+            </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()">{{"search.filters.filter.show-less"
-                | translate}}</a>
+               (click)="showFirstPageOnly()" href="javascript:void(0);">
+              {{"search.filters.filter.show-less" | translate}}
+            </a>
         </div>
     </div>
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index 2154ae2e24..49ca6fe3fd 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -8,11 +8,13 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()">{{"search.filters.filter.show-more"
-                | translate}}</a>
+               (click)="showMore()" href="javascript:void(0);">
+              {{"search.filters.filter.show-more" | translate}}
+            </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()">{{"search.filters.filter.show-less"
-                | translate}}</a>
+               (click)="showFirstPageOnly()" href="javascript:void(0);">
+              {{"search.filters.filter.show-less" | translate}}
+            </a>
         </div>
     </div>
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults | async)"
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index 30d8718b56..fdf154bc04 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -8,11 +8,13 @@
         </ng-container>
         <div class="clearfix toggle-more-filters">
             <a class="float-left" *ngIf="!(isLastPage$ | async)"
-               (click)="showMore()">{{"search.filters.filter.show-more"
-                | translate}}</a>
+               (click)="showMore()" href="javascript:void(0);">
+              {{"search.filters.filter.show-more" | translate}}
+            </a>
             <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()">{{"search.filters.filter.show-less"
-                | translate}}</a>
+               (click)="showFirstPageOnly()" href="javascript:void(0);">
+              {{"search.filters.filter.show-less" | translate}}
+            </a>
         </div>
     </div>
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults | async)"

From 6e95990431628ef95727eff970827798fc0ec3c9 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 14:01:48 +0200
Subject: [PATCH 063/169] 79730: Improve slider handles keyboard control

---
 .../search-range-filter/search-range-filter.component.html   | 5 +++--
 .../search-range-filter/search-range-filter.component.scss   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index e4e8152e97..3a6a6565c0 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -32,8 +32,9 @@
 
         <ng-container *ngIf="shouldShowSlider()">
             <nouislider [connect]="true" [min]="min" [max]="max" [step]="1"
-                        [(ngModel)]="range" (change)="onSubmit()" ngDefaultControl></nouislider>
-
+                        [dsDebounce]="500" (onDebounce)="onSubmit()"
+                        [(ngModel)]="range" ngDefaultControl>
+            </nouislider>
         </ng-container>
       <ng-container *ngFor="let page of (filterValues$ | async)?.payload">
         <div [@facetLoad]="animationState">
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
index 2c98280e7f..f26806abfb 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -21,6 +21,7 @@
         }
         &:focus {
             outline: none;
+            box-shadow: var(--bs-input-btn-focus-box-shadow);
         }
     }
 

From c60fa2c441257ebe46f3d3ab5a85334b3b33dc9e Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 15:20:33 +0200
Subject: [PATCH 064/169] 79730: Don't submit date slider changes until keyup

---
 .../search-range-filter.component.html         |  3 ++-
 .../search-range-filter.component.ts           | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 3a6a6565c0..0ebd5f74a2 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -32,7 +32,8 @@
 
         <ng-container *ngIf="shouldShowSlider()">
             <nouislider [connect]="true" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="500" (onDebounce)="onSubmit()"
+                        [dsDebounce]="250" (onDebounce)="onSubmit()"
+                        (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
             </nouislider>
         </ng-container>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 62b1cb98a6..b23a2d8224 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -68,6 +68,12 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   sub: Subscription;
 
+  /**
+   * Whether the sider is being controlled by the keyboard.
+   * Supresses any changes until the key is released.
+   */
+  keyboardControl: boolean;
+
   constructor(protected searchService: SearchService,
               protected filterService: SearchFilterService,
               protected router: Router,
@@ -104,6 +110,10 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    * Submits new custom range values to the range filter from the widget
    */
   onSubmit() {
+    if (this.keyboardControl) {
+      return;  // don't submit if a key is being held down
+    }
+
     const newMin = this.range[0] !== this.min ? [this.range[0]] : null;
     const newMax = this.range[1] !== this.max ? [this.range[1]] : null;
     this.router.navigate(this.getSearchLinkParts(), {
@@ -117,6 +127,14 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
     this.filter = '';
   }
 
+  startKeyboardControl(): void {
+    this.keyboardControl = true;
+  }
+
+  stopKeyboardControl(): void {
+    this.keyboardControl = false;
+  }
+
   /**
    * TODO when upgrading nouislider, verify that this check is still needed.
    * Prevents AoT bug

From 08878941aba73fd5e849b0e4f7c6dede293d7701 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 1 Jun 2021 15:31:30 +0200
Subject: [PATCH 065/169] 79730: Fix tslint issues

---
 .../shared/input-suggestions/input-suggestions.component.ts   | 4 ++--
 .../search-filters/search-filter/search-filter.component.ts   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 7e05dbcc8c..7b5c9f34f2 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -111,10 +111,10 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
   @Input() disabled = false;
   propagateChange = (_: any) => {
     /* Empty implementation */
-  };
+  }
   propagateTouch = (_: any) => {
     /* Empty implementation */
-  };
+  }
 
   /**
    * When any of the inputs change, check if we should still show the suggestions
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 23cd92a601..57c4f991db 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -45,7 +45,7 @@ export class SearchFilterComponent implements OnInit {
   /**
    * True when the filter toggle button is focused
    */
-  focusBox: boolean = false;
+  focusBox = false;
 
   /**
    * Emits true when the filter is currently collapsed in the store
@@ -141,10 +141,12 @@ export class SearchFilterComponent implements OnInit {
   }
 
   get regionId(): string {
+    // tslint:disable-next-line:no-string-literal
     return `search-filter-region-${this.constructor['ɵcmp'].id}`;
   }
 
   get toggleId(): string {
+    // tslint:disable-next-line:no-string-literal
     return `search-filter-toggle-${this.constructor['ɵcmp'].id}`;
   }
 

From d37d043531ab41ab4ed3b99835472788ed12a636 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 3 Jun 2021 15:10:20 +0200
Subject: [PATCH 066/169] 79730: Show input labels when available

---
 .../filter-input-suggestions.component.html   | 17 ++++++++-----
 .../search-range-filter.component.html        | 24 ++++++++++---------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index f1b0ba9023..d239c8db8d 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -3,20 +3,25 @@
       (keydown.arrowdown)="shiftFocusDown($event)"
       (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
       (dsClickOutside)="close();">
-  <label *ngIf="label; else searchInput" class="mb-0">
-    <ng-container *ngTemplateOutlet="searchInput"></ng-container>
-    <span class="d-none">{{label}}</span>
-  </label>
+  <div class="form-group mb-0">
+    <label *ngIf="label; else searchInput">
+      <span class="font-weight-bold d-block mb-2">
+        {{label}}
+      </span>
+      <ng-container *ngTemplateOutlet="searchInput"></ng-container>
+    </label>
+  </div>
   <ng-template #searchInput>
     <input #inputField type="text" [(ngModel)]="value" [name]="name"
            class="form-control suggestion_input"
            [ngClass]="{'is-invalid': !valid}"
            [dsDebounce]="debounceTime" (onDebounce)="find($event)"
            [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+           [ngModelOptions]="{standalone: true}" autocomplete="off"
+    />
   </ng-template>
   <label class="d-none">
-    <input type="submit" class="d-none"/>
+    <input type="submit"/>
     <span>{{'search.filters.search.submit' | translate}}</span>
   </label>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 0ebd5f74a2..0d3858d375 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -2,26 +2,28 @@
     <div class="filters py-2">
         <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
               [action]="currentUrl">
-            <div class="col-6">
-                <label class="mb-0">
+            <div class="col-6 form-group mb-0">
+                <label>
+                  <span class="font-weight-bold d-block mb-2">
+                    {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
+                  </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
                          class="form-control" (blur)="onSubmit()"
                          aria-label="Mininum value"
-                         [placeholder]="'search.filters.filter.' + filterConfig.name + '.min.placeholder' | translate"/>
-                  <span class="d-none">
-                    {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
-                  </span>
+                         [placeholder]="'search.filters.filter.' + filterConfig.name + '.min.placeholder' | translate"
+                  />
                 </label>
             </div>
             <div class="col-6">
-                <label class="mb-0">
+                <label>
+                    <span class="font-weight-bold d-block mb-2">
+                      {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
+                    </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
                            class="form-control" (blur)="onSubmit()"
                            aria-label="Maximum value"
-                           [placeholder]="'search.filters.filter.' + filterConfig.name + '.max.placeholder' | translate"/>
-                    <span class="d-none">
-                      {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
-                    </span>
+                           [placeholder]="'search.filters.filter.' + filterConfig.name + '.max.placeholder' | translate"
+                    />
                 </label>
             </div>
             <label class="d-none">

From 737728f6039abac2679e6c9d543e9810d143e204 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 3 Jun 2021 15:23:42 +0200
Subject: [PATCH 067/169] 79730: Remove label margins

---
 .../filter-input-suggestions.component.html                   | 2 +-
 .../search-range-filter/search-range-filter.component.html    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index d239c8db8d..886c8f31c0 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -5,7 +5,7 @@
       (dsClickOutside)="close();">
   <div class="form-group mb-0">
     <label *ngIf="label; else searchInput">
-      <span class="font-weight-bold d-block mb-2">
+      <span class="font-weight-bold">
         {{label}}
       </span>
       <ng-container *ngTemplateOutlet="searchInput"></ng-container>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 0d3858d375..7834c4c557 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -4,7 +4,7 @@
               [action]="currentUrl">
             <div class="col-6 form-group mb-0">
                 <label>
-                  <span class="font-weight-bold d-block mb-2">
+                  <span class="font-weight-bold">
                     {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
                   </span>
                   <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
@@ -16,7 +16,7 @@
             </div>
             <div class="col-6">
                 <label>
-                    <span class="font-weight-bold d-block mb-2">
+                    <span class="font-weight-bold">
                       {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
                     </span>
                     <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"

From dde57b93871c544a903721e526d3d3e430cb2cb7 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Mon, 31 May 2021 16:19:44 +0200
Subject: [PATCH 068/169] update citation_pdf_url logic

---
 src/app/core/metadata/metadata.service.ts | 133 ++++++++++++++++++----
 1 file changed, 111 insertions(+), 22 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 807f7a42ab..268d361567 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -5,10 +5,10 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
 import { TranslateService } from '@ngx-translate/core';
 
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { catchError, distinctUntilKeyChanged, filter, first, map, take } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, Observable, of as observableOf, EMPTY } from 'rxjs';
+import { distinctUntilKeyChanged, filter, map, take, switchMap, expand } from 'rxjs/operators';
 
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { hasValue, hasNoValue } from '../../shared/empty.util';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { BitstreamDataService } from '../data/bitstream-data.service';
@@ -21,11 +21,15 @@ import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
 import {
   getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteListPayload
+  getFirstCompletedRemoteData
 } from '../shared/operators';
 import { environment } from '../../../environments/environment';
 import { RootDataService } from '../data/root-data.service';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
+import { BundleDataService } from '../data/bundle-data.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { Bundle } from '../shared/bundle.model';
+import { PaginatedList } from '../data/paginated-list.model';
 
 @Injectable()
 export class MetadataService {
@@ -42,6 +46,7 @@ export class MetadataService {
     private meta: Meta,
     private title: Title,
     private dsoNameService: DSONameService,
+    private bundleDataService: BundleDataService,
     private bitstreamDataService: BitstreamDataService,
     private bitstreamFormatDataService: BitstreamFormatDataService,
     private rootService: RootDataService
@@ -275,26 +280,110 @@ export class MetadataService {
   private setCitationPdfUrlTag(): void {
     if (this.currentObject.value instanceof Item) {
       const item = this.currentObject.value as Item;
-      this.bitstreamDataService.findAllByItemAndBundleName(item, 'ORIGINAL')
-        .pipe(
-          getFirstSucceededRemoteListPayload(),
-          first((files) => isNotEmpty(files)),
-          catchError((error) => {
-            console.debug(error.message);
-            return [];
-          }))
-        .subscribe((bitstreams: Bitstream[]) => {
-          for (const bitstream of bitstreams) {
-            this.bitstreamFormatDataService.findByBitstream(bitstream).pipe(
-              getFirstSucceededRemoteDataPayload()
-            ).subscribe((format: BitstreamFormat) => {
-              if (format.mimetype === 'application/pdf') {
-                const bitstreamLink =  getBitstreamDownloadRoute(bitstream);
-                this.addMetaTag('citation_pdf_url', bitstreamLink);
+
+      // Retrieve the ORIGINAL bundle for the item
+      this.bundleDataService.findByItemAndName(
+        item,
+        'ORIGINAL',
+        true,
+        true,
+        followLink('primaryBitstream'),
+        followLink('bitstreams',
+          undefined,
+          true,
+          true,
+          true,
+          followLink('format')
+        )
+      ).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        switchMap((bundle: Bundle) =>
+
+          // First try the primary bitstream
+          bundle.primaryBitstream.pipe(
+            getFirstCompletedRemoteData(),
+            map((rd: RemoteData<Bitstream>) => {
+              if (hasValue(rd.payload)) {
+                return rd.payload;
+              } else {
+                return null;
               }
-            });
+            }),
+            // return the bundle as well so we can use it again if there's no primary bitstream
+            map((bitstream: Bitstream) => [bundle, bitstream])
+          )
+        ),
+        switchMap(([bundle, primaryBitstream]: [Bundle, Bitstream]) => {
+          if (hasValue(primaryBitstream)) {
+            // If there was a primary bitstream, emit its link
+            return [getBitstreamDownloadRoute(primaryBitstream)];
+          } else {
+            // Otherwise consider the regular bitstreams in the bundle
+            return bundle.bitstreams.pipe(
+              getFirstCompletedRemoteData(),
+              switchMap((bitstreamRd: RemoteData<PaginatedList<Bitstream>>) => {
+                if (hasValue(bitstreamRd.payload) && bitstreamRd.payload.totalElements === 1) {
+                  // If there's only one bitstream in the bundle, emit its link
+                  return [getBitstreamDownloadRoute(bitstreamRd.payload.page[0])];
+                } else {
+                  // Otherwise check all bitstreams to see if one matches the format whitelist
+                  return observableOf(bitstreamRd.payload).pipe(
+                    // Because there can be more than one page of bitstreams, this expand operator
+                    // will retrieve them in turn due to the take(1) at the bottom, it will only
+                    // retrieve pages until a match is found
+                    expand((paginatedList: PaginatedList<Bitstream>) => {
+                      if (hasNoValue(paginatedList.next)) {
+                        // If there's no next page, stop.
+                        return EMPTY;
+                      } else {
+                        // Otherwise retrieve the next page
+                        return this.bitstreamDataService.findAllByHref(
+                          paginatedList.next,
+                          undefined,
+                          true,
+                          true,
+                          followLink('format')
+                        ).pipe(
+                          getFirstCompletedRemoteData(),
+                          map((next: RemoteData<PaginatedList<Bitstream>>) => {
+                            if (hasValue(next.payload)) {
+                              return next.payload;
+                            } else {
+                              return EMPTY;
+                            }
+                          })
+                        );
+                      }
+                    }),
+                    // Return the array of bitstreams inside each paginated list
+                    map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
+                    // Emit the bitstreams in the list one at a time
+                    switchMap((bitstreams: Bitstream[]) => bitstreams),
+                    // Retrieve the format for each bitstream
+                    switchMap((bitstream: Bitstream) => bitstream.format.pipe(
+                      getFirstSucceededRemoteDataPayload(),
+                      // Keep the original bitstream, because it, not the format, is what we'll need
+                      // for the link at the end
+                      map((format: BitstreamFormat) => [bitstream, format])
+                    )),
+                    // Filter out only pairs with whitelisted formats
+                    filter(([, format]: [Bitstream, BitstreamFormat]) =>
+                      hasValue(format) && format.mimetype === 'application/pdf'), // TODO change to check map of mimetypes
+                    // We only need 1
+                    take(1),
+                    // Emit the link of the match
+                    map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
+                  );
+                }
+              })
+            );
           }
-        });
+        }),
+        take(1)
+      ).subscribe((link: string) => {
+        // Use the found link to set the <meta> tag
+        this.addMetaTag('citation_pdf_url', link);
+      });
     }
   }
 

From 9fe5a91bc2894b7c6fb04e28190323c4efc34d19 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 3 Jun 2021 16:30:57 +0200
Subject: [PATCH 069/169] 79768: Extract download route method for Bundles with
 multiple Bitstreams

---
 src/app/core/metadata/metadata.service.ts | 98 ++++++++++++-----------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 268d361567..fa4e81a5d7 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -327,53 +327,7 @@ export class MetadataService {
                   return [getBitstreamDownloadRoute(bitstreamRd.payload.page[0])];
                 } else {
                   // Otherwise check all bitstreams to see if one matches the format whitelist
-                  return observableOf(bitstreamRd.payload).pipe(
-                    // Because there can be more than one page of bitstreams, this expand operator
-                    // will retrieve them in turn due to the take(1) at the bottom, it will only
-                    // retrieve pages until a match is found
-                    expand((paginatedList: PaginatedList<Bitstream>) => {
-                      if (hasNoValue(paginatedList.next)) {
-                        // If there's no next page, stop.
-                        return EMPTY;
-                      } else {
-                        // Otherwise retrieve the next page
-                        return this.bitstreamDataService.findAllByHref(
-                          paginatedList.next,
-                          undefined,
-                          true,
-                          true,
-                          followLink('format')
-                        ).pipe(
-                          getFirstCompletedRemoteData(),
-                          map((next: RemoteData<PaginatedList<Bitstream>>) => {
-                            if (hasValue(next.payload)) {
-                              return next.payload;
-                            } else {
-                              return EMPTY;
-                            }
-                          })
-                        );
-                      }
-                    }),
-                    // Return the array of bitstreams inside each paginated list
-                    map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
-                    // Emit the bitstreams in the list one at a time
-                    switchMap((bitstreams: Bitstream[]) => bitstreams),
-                    // Retrieve the format for each bitstream
-                    switchMap((bitstream: Bitstream) => bitstream.format.pipe(
-                      getFirstSucceededRemoteDataPayload(),
-                      // Keep the original bitstream, because it, not the format, is what we'll need
-                      // for the link at the end
-                      map((format: BitstreamFormat) => [bitstream, format])
-                    )),
-                    // Filter out only pairs with whitelisted formats
-                    filter(([, format]: [Bitstream, BitstreamFormat]) =>
-                      hasValue(format) && format.mimetype === 'application/pdf'), // TODO change to check map of mimetypes
-                    // We only need 1
-                    take(1),
-                    // Emit the link of the match
-                    map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
-                  );
+                  return this.getBitstreamDownloadRoute(bitstreamRd);
                 }
               })
             );
@@ -387,6 +341,56 @@ export class MetadataService {
     }
   }
 
+  private getBitstreamDownloadRoute(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
+    return observableOf(bitstreamRd.payload).pipe(
+      // Because there can be more than one page of bitstreams, this expand operator
+      // will retrieve them in turn due to the take(1) at the bottom, it will only
+      // retrieve pages until a match is found
+      expand((paginatedList: PaginatedList<Bitstream>) => {
+        if (hasNoValue(paginatedList.next)) {
+          // If there's no next page, stop.
+          return EMPTY;
+        } else {
+          // Otherwise retrieve the next page
+          return this.bitstreamDataService.findAllByHref(
+            paginatedList.next,
+            undefined,
+            true,
+            true,
+            followLink('format')
+          ).pipe(
+            getFirstCompletedRemoteData(),
+            map((next: RemoteData<PaginatedList<Bitstream>>) => {
+              if (hasValue(next.payload)) {
+                return next.payload;
+              } else {
+                return EMPTY;
+              }
+            })
+          );
+        }
+      }),
+      // Return the array of bitstreams inside each paginated list
+      map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
+      // Emit the bitstreams in the list one at a time
+      switchMap((bitstreams: Bitstream[]) => bitstreams),
+      // Retrieve the format for each bitstream
+      switchMap((bitstream: Bitstream) => bitstream.format.pipe(
+        getFirstSucceededRemoteDataPayload(),
+        // Keep the original bitstream, because it, not the format, is what we'll need
+        // for the link at the end
+        map((format: BitstreamFormat) => [bitstream, format])
+      )),
+      // Filter out only pairs with whitelisted formats
+      filter(([, format]: [Bitstream, BitstreamFormat]) =>
+        hasValue(format) && format.mimetype === 'application/pdf'), // TODO change to check map of mimetypes
+      // We only need 1
+      take(1),
+      // Emit the link of the match
+      map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
+    );
+  }
+
   /**
    * Add <meta name="Generator" ... >  to the <head> containing the current DSpace version
    */

From 1caba78b4df6b9fcec8a99c8d10010c0596da0d8 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 3 Jun 2021 16:33:58 +0200
Subject: [PATCH 070/169] 79768: Check against list of allowed mimetypes

---
 src/app/core/metadata/metadata.service.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index fa4e81a5d7..0b63e13976 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -40,6 +40,15 @@ export class MetadataService {
 
   private currentObject: BehaviorSubject<DSpaceObject>;
 
+  private readonly ALLOWED_MIMETYPES = [
+    'application/pdf',                                                          // .pdf
+    'application/postscript',                                                   // .ps
+    'application/msword',                                                       // .doc
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document ', // .docx
+    'application/rtf',                                                          // .rtf
+    'application/epub+zip',                                                     // .epub
+  ];
+
   constructor(
     private router: Router,
     private translate: TranslateService,
@@ -383,7 +392,7 @@ export class MetadataService {
       )),
       // Filter out only pairs with whitelisted formats
       filter(([, format]: [Bitstream, BitstreamFormat]) =>
-        hasValue(format) && format.mimetype === 'application/pdf'), // TODO change to check map of mimetypes
+        hasValue(format) && this.ALLOWED_MIMETYPES.includes(format.mimetype)),
       // We only need 1
       take(1),
       // Emit the link of the match

From cb4446b79d17e7acc20b82f4855ef94e39307592 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 4 Jun 2021 13:57:30 +0200
Subject: [PATCH 071/169] 79768: Update & add unit tests

---
 .../core/metadata/metadata.service.spec.ts    |  83 +++++++++++--
 src/app/core/metadata/metadata.service.ts     |   2 +-
 src/app/shared/mocks/item.mock.ts             | 117 ++++++++++++------
 3 files changed, 154 insertions(+), 48 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 18421dd489..0a4377e1b7 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -15,11 +15,9 @@ import { RemoteData } from '../data/remote-data';
 import { Item } from '../shared/item.model';
 
 import {
-  ItemMock,
-  MockBitstream1,
-  MockBitstream2,
-  MockBitstreamFormat1,
-  MockBitstreamFormat2
+  ItemMock, MockBitstream1, MockBitstream2, MockBitstream3, MockBitstreamFormat1, MockBitstreamFormat2,
+  MockBitstreamFormat3,
+  MockOriginalBundle,
 } from '../../shared/mocks/item.mock';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -51,10 +49,11 @@ import { UUIDService } from '../shared/uuid.service';
 import { MetadataService } from './metadata.service';
 import { environment } from '../../../environments/environment';
 import { storeModuleConfig } from '../../app.reducer';
-import { HardRedirectService } from '../services/hard-redirect.service';
-import { URLCombiner } from '../url-combiner/url-combiner';
 import { RootDataService } from '../data/root-data.service';
 import { Root } from '../data/root.model';
+import { Bundle } from '../shared/bundle.model';
+import { BundleDataService } from '../data/bundle-data.service';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 
 /* tslint:disable:max-classes-per-file */
 @Component({
@@ -92,6 +91,8 @@ describe('MetadataService', () => {
   let uuidService: UUIDService;
   let remoteDataBuildService: RemoteDataBuildService;
   let itemDataService: ItemDataService;
+  let bundleDataService;
+  let bitstreamDataService;
   let authService: AuthService;
   let rootService: RootDataService;
   let translateService: TranslateService;
@@ -111,7 +112,7 @@ describe('MetadataService', () => {
     uuidService = new UUIDService();
     requestService = new RequestService(objectCacheService, uuidService, store, undefined);
     remoteDataBuildService = new RemoteDataBuildService(objectCacheService, undefined, requestService);
-    const mockBitstreamDataService = {
+    bitstreamDataService = {
       findAllByItemAndBundleName(item: Item, bundleName: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bitstream>[]): Observable<RemoteData<PaginatedList<Bitstream>>> {
         if (item.equals(ItemMock)) {
           return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [MockBitstream1, MockBitstream2]));
@@ -119,6 +120,7 @@ describe('MetadataService', () => {
           return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
         }
       },
+      findAllByHref: jasmine.createSpy(),
     };
     const mockBitstreamFormatDataService = {
       findByBitstream(bitstream: Bitstream): Observable<RemoteData<BitstreamFormat>> {
@@ -129,11 +131,17 @@ describe('MetadataService', () => {
           case MockBitstream2:
             return createSuccessfulRemoteDataObject$(MockBitstreamFormat2);
             break;
+          case MockBitstream3:
+            return createSuccessfulRemoteDataObject$(MockBitstreamFormat3);
+            break;
           default:
             return createSuccessfulRemoteDataObject$(new BitstreamFormat());
         }
       }
     };
+    bundleDataService = jasmine.createSpyObj('bundleDataService', {
+      findByItemAndName: createSuccessfulRemoteDataObject$(MockOriginalBundle),
+    });
     rootService = jasmine.createSpyObj('rootService', {
       findRoot: createSuccessfulRemoteDataObject$(Object.assign(new Root(), {
         dspaceVersion: 'mock-dspace-version'
@@ -176,7 +184,8 @@ describe('MetadataService', () => {
         { provide: CommunityDataService, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: mockBitstreamFormatDataService },
-        { provide: BitstreamDataService, useValue: mockBitstreamDataService },
+        { provide: BitstreamDataService, useValue: bitstreamDataService },
+        { provide: BundleDataService, useValue: bundleDataService },
         { provide: RootDataService, useValue: rootService },
         Meta,
         Title,
@@ -264,8 +273,42 @@ describe('MetadataService', () => {
 
   });
 
+  describe('citation_pdf_url', () => {
+    it('should link to primary Bitstream URL regardless of format', fakeAsync(() => {
+      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
+      bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([], MockBitstream3));
+      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      tick();
+      expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
+    }));
+
+    describe('no primary Bitstream', () => {
+      it('should link to first and only Bitstream regardless of format', fakeAsync(() => {
+        spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
+        bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([MockBitstream3]));
+        router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+        tick();
+        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
+      }));
+
+      it('should link to first Bitstream with allowed format', fakeAsync(() => {
+        spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
+
+        const bitstreams = [MockBitstream3, MockBitstream3, MockBitstream1];
+        bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$(bitstreams));
+        bitstreamDataService.findAllByHref.and.returnValues(
+          ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
+        );
+
+        router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+        tick();
+        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download');
+      }));
+    });
+  });
+
   const mockRemoteData = (mockItem: Item): Observable<RemoteData<Item>> => {
-    return createSuccessfulRemoteDataObject$(ItemMock);
+    return createSuccessfulRemoteDataObject$(mockItem);
   };
 
   const mockType = (mockItem: Item, type: string): Item => {
@@ -285,4 +328,24 @@ describe('MetadataService', () => {
     return publishedMockItem;
   };
 
+  const mockBundleRD$ = (bitstreams: Bitstream[], primary?: Bitstream): Observable<RemoteData<Bundle>> => {
+    return createSuccessfulRemoteDataObject$(
+      Object.assign(new Bundle(), {
+        name: 'ORIGINAL',
+        bitstreams: createSuccessfulRemoteDataObject$(mockBitstreamPages$(bitstreams)[0]),
+        primaryBitstream: createSuccessfulRemoteDataObject$(primary),
+      })
+    );
+  };
+
+  const mockBitstreamPages$ = (bitstreams: Bitstream[]): PaginatedList<Bitstream>[] => {
+    return bitstreams.map((bitstream, index) => Object.assign(createPaginatedList([bitstream]), {
+      pageInfo: {
+        totalElements: bitstreams.length,       // announce multiple elements/pages
+      },
+      _links: index < bitstreams.length - 1
+        ? { next: { href: 'not empty' }}        // fake link to the next bitstream page
+        : { next: { href: undefined }},         // last page has no link
+    }));
+  };
 });
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 0b63e13976..848b48b8c5 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -44,7 +44,7 @@ export class MetadataService {
     'application/pdf',                                                          // .pdf
     'application/postscript',                                                   // .ps
     'application/msword',                                                       // .doc
-    'application/vnd.openxmlformats-officedocument.wordprocessingml.document ', // .docx
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',  // .docx
     'application/rtf',                                                          // .rtf
     'application/epub+zip',                                                     // .epub
   ];
diff --git a/src/app/shared/mocks/item.mock.ts b/src/app/shared/mocks/item.mock.ts
index 945b0f7816..10eab2da00 100644
--- a/src/app/shared/mocks/item.mock.ts
+++ b/src/app/shared/mocks/item.mock.ts
@@ -5,6 +5,7 @@ import { Bitstream } from '../../core/shared/bitstream.model';
 import { Item } from '../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
+import { Bundle } from '../../core/shared/bundle.model';
 
 export const MockBitstreamFormat1: BitstreamFormat = Object.assign(new BitstreamFormat(), {
   shortDescription: 'Microsoft Word XML',
@@ -34,11 +35,25 @@ export const MockBitstreamFormat2: BitstreamFormat = Object.assign(new Bitstream
     }
 });
 
+export const MockBitstreamFormat3: BitstreamFormat = Object.assign(new BitstreamFormat(), {
+  shortDescription: 'Binary',
+  description: 'Some scary unknown binary file',
+  mimetype: 'application/octet-stream',
+  supportLevel: 0,
+  internal: false,
+  extensions: null,
+  _links:{
+    self: {
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17'
+    }
+  }
+});
+
 export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
   {
     sizeBytes: 10201,
     content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
-    format: observableOf(MockBitstreamFormat1),
+    format: createSuccessfulRemoteDataObject$(MockBitstreamFormat1),
     bundleName: 'ORIGINAL',
     _links:{
       self: {
@@ -61,7 +76,7 @@ export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
 export const MockBitstream2: Bitstream = Object.assign(new Bitstream(), {
   sizeBytes: 31302,
   content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content',
-  format: observableOf(MockBitstreamFormat2),
+  format: createSuccessfulRemoteDataObject$(MockBitstreamFormat2),
   bundleName: 'ORIGINAL',
   id: '99b00f3c-1cc6-4689-8158-91965bee6b28',
   uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28',
@@ -82,6 +97,68 @@ export const MockBitstream2: Bitstream = Object.assign(new Bitstream(), {
   }
 });
 
+export const MockBitstream3: Bitstream = Object.assign(new Bitstream(), {
+  sizeBytes: 4975123,
+  content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/content',
+  format: createSuccessfulRemoteDataObject$(MockBitstreamFormat3),
+  bundleName: 'ORIGINAL',
+  id: '4db100c1-e1f5-4055-9404-9bc3e2d15f29',
+  uuid: '4db100c1-e1f5-4055-9404-9bc3e2d15f29',
+  type: 'bitstream',
+  _links: {
+    self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29' },
+    content: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/content' },
+    format: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17' },
+    bundle: { href: '' }
+  },
+  metadata: {
+    'dc.title': [
+      {
+        language: null,
+        value: 'scary'
+      }
+    ]
+  }
+});
+
+export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
+  name: 'ORIGINAL',
+  primaryBitstream: createSuccessfulRemoteDataObject$(MockBitstream2),
+  bitstreams: observableOf(Object.assign({
+    _links: {
+      self: {
+        href: 'dspace-angular://aggregated/object/1507836003548',
+      }
+    },
+    requestPending: false,
+    responsePending: false,
+    isSuccessful: true,
+    errorMessage: '',
+    state: '',
+    error: undefined,
+    isRequestPending: false,
+    isResponsePending: false,
+    isLoading: false,
+    hasFailed: false,
+    hasSucceeded: true,
+    statusCode: '202',
+    pageInfo: {},
+    payload: {
+      pageInfo: {
+        elementsPerPage: 20,
+        totalElements: 3,
+        totalPages: 1,
+        currentPage: 2
+      },
+      page: [
+        MockBitstream1,
+        MockBitstream2
+      ]
+    }
+  }))
+});
+
+
 /* tslint:disable:no-shadowed-variable */
 export const ItemMock: Item = Object.assign(new Item(), {
   handle: '10673/6',
@@ -90,41 +167,7 @@ export const ItemMock: Item = Object.assign(new Item(), {
   isDiscoverable: true,
   isWithdrawn: false,
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([
-    {
-      name: 'ORIGINAL',
-      bitstreams: observableOf(Object.assign({
-        _links: {
-          self: {
-            href: 'dspace-angular://aggregated/object/1507836003548',
-          }
-        },
-        requestPending: false,
-        responsePending: false,
-        isSuccessful: true,
-        errorMessage: '',
-        state: '',
-        error: undefined,
-        isRequestPending: false,
-        isResponsePending: false,
-        isLoading: false,
-        hasFailed: false,
-        hasSucceeded: true,
-        statusCode: '202',
-        pageInfo: {},
-        payload: {
-          pageInfo: {
-            elementsPerPage: 20,
-            totalElements: 3,
-            totalPages: 1,
-            currentPage: 2
-          },
-          page: [
-            MockBitstream1,
-            MockBitstream2
-          ]
-        }
-      }))
-    }
+    MockOriginalBundle,
   ])),
   _links:{
     self: {

From 6f7b76ec39efa00676065bb50ef23c66804d96ca Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 4 Jun 2021 14:02:44 +0200
Subject: [PATCH 072/169] 79768: Remove og:title & og:description

---
 src/app/core/metadata/metadata.service.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 848b48b8c5..7caa7fe6cf 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -62,10 +62,6 @@ export class MetadataService {
   ) {
     // TODO: determine what open graph meta tags are needed and whether
     // the differ per route. potentially add image based on DSpaceObject
-    this.meta.addTags([
-      { property: 'og:title', content: 'DSpace Angular Universal' },
-      { property: 'og:description', content: 'The modern front-end for DSpace 7.' }
-    ]);
     this.initialized = false;
     this.tagStore = new Map<string, MetaDefinition[]>();
   }

From 67f8ce7849ad222acb8bf171056e2a27cd66f7b8 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 4 Jun 2021 14:02:19 +0200
Subject: [PATCH 073/169] 79768: Rename citation_date to
 citation_publication_date

---
 src/app/core/metadata/metadata.service.spec.ts | 2 +-
 src/app/core/metadata/metadata.service.ts      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 0a4377e1b7..749074d0a7 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -218,7 +218,7 @@ describe('MetadataService', () => {
     expect(title.getTitle()).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_title')[0].content).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_author')[0].content).toEqual('Doe, Jane');
-    expect(tagStore.get('citation_date')[0].content).toEqual('1650-06-26');
+    expect(tagStore.get('citation_publication_date')[0].content).toEqual('1650-06-26');
     expect(tagStore.get('citation_issn')[0].content).toEqual('123456789');
     expect(tagStore.get('citation_language')[0].content).toEqual('en');
     expect(tagStore.get('citation_keywords')[0].content).toEqual('keyword1; keyword2; keyword3');
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 7caa7fe6cf..3ccc9e5f09 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -135,7 +135,7 @@ export class MetadataService {
 
     this.setCitationTitleTag();
     this.setCitationAuthorTags();
-    this.setCitationDateTag();
+    this.setCitationPublicationDateTag();
     this.setCitationISSNTag();
     this.setCitationISBNTag();
 
@@ -208,9 +208,9 @@ export class MetadataService {
   /**
    * Add <meta name="citation_date" ... >  to the <head>
    */
-  private setCitationDateTag(): void {
+  private setCitationPublicationDateTag(): void {
     const value = this.getFirstMetaTagValue(['dc.date.copyright', 'dc.date.issued', 'dc.date.available', 'dc.date.accessioned']);
-    this.addMetaTag('citation_date', value);
+    this.addMetaTag('citation_publication_date', value);
   }
 
   /**

From 304d8f73862fd577d687813bdaad07d6f7d32b3d Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 4 Jun 2021 14:08:20 +0200
Subject: [PATCH 074/169] 79768: Fix tag: citation_abstract_html_url

---
 .../core/metadata/metadata.service.spec.ts    | 23 ++++++++++++++++++-
 src/app/core/metadata/metadata.service.ts     |  7 ++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 749074d0a7..30ee7f99ea 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -230,7 +230,6 @@ describe('MetadataService', () => {
     tick();
     expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher');
-    expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual([environment.ui.baseUrl, router.url].join(''));
     expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
   }));
 
@@ -273,6 +272,22 @@ describe('MetadataService', () => {
 
   });
 
+  describe('citation_abstract_html_url', () => {
+    it('should use dc.identifier.uri if available', fakeAsync(() => {
+      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock, 'https://ddg.gg')));
+      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      tick();
+      expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('https://ddg.gg');
+    }));
+
+    it('should use current route as fallback', fakeAsync(() => {
+      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock)));
+      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      tick();
+      expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
+    }));
+  });
+
   describe('citation_pdf_url', () => {
     it('should link to primary Bitstream URL regardless of format', fakeAsync(() => {
       spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
@@ -328,6 +343,12 @@ describe('MetadataService', () => {
     return publishedMockItem;
   };
 
+  const mockUri = (mockItem: Item, uri?: string): Item => {
+    const publishedMockItem = Object.assign(new Item(), mockItem) as Item;
+    publishedMockItem.metadata['dc.identifier.uri'] = [{ value: uri }] as MetadataValue[];
+    return publishedMockItem;
+  };
+
   const mockBundleRD$ = (bitstreams: Bitstream[], primary?: Bitstream): Observable<RemoteData<Bundle>> => {
     return createSuccessfulRemoteDataObject$(
       Object.assign(new Bundle(), {
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 3ccc9e5f09..bc26f36fd1 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -274,8 +274,11 @@ export class MetadataService {
    */
   private setCitationAbstractUrlTag(): void {
     if (this.currentObject.value instanceof Item) {
-      const value = [environment.ui.baseUrl, this.router.url].join('');
-      this.addMetaTag('citation_abstract_html_url', value);
+      let url = this.getMetaTagValue('dc.identifier.uri');
+      if (hasNoValue(url)) {
+        url = this.router.url;  // Google should handle relative URL
+      }
+      this.addMetaTag('citation_abstract_html_url', url);
     }
   }
 

From 81b76dd32774d68bcf2ce87a5ab9e4deeddd71d7 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 4 Jun 2021 14:42:16 +0200
Subject: [PATCH 075/169] 79768: Fix tag: citation_publisher /
 citation_*_institution

---
 .../core/metadata/metadata.service.spec.ts    | 32 +++++++++++++++++--
 src/app/core/metadata/metadata.service.ts     | 26 ++++++---------
 2 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 30ee7f99ea..d2656d6c70 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -229,7 +229,6 @@ describe('MetadataService', () => {
     router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
     tick();
     expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
-    expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher');
     expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
   }));
 
@@ -284,7 +283,36 @@ describe('MetadataService', () => {
       spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock)));
       router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
       tick();
-      expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
+       expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
+    }));
+  });
+
+  describe('citation_*_institution / citation_publisher', () => {
+    it('should use citation_dissertation_institution tag for dissertations', fakeAsync(() => {
+      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Thesis'))));
+      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      tick();
+      expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher');
+      expect(tagStore.get('citation_technical_report_institution')).toBeFalsy();
+      expect(tagStore.get('citation_publisher')).toBeFalsy();
+    }));
+
+    it('should use citation_tech_report_institution tag for tech reports', fakeAsync(() => {
+      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Technical Report'))));
+      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      tick();
+      expect(tagStore.get('citation_dissertation_institution')).toBeFalsy();
+      expect(tagStore.get('citation_technical_report_institution')[0].content).toEqual('Mock Publisher');
+      expect(tagStore.get('citation_publisher')).toBeFalsy();
+    }));
+
+    it('should use citation_publisher for other item types', fakeAsync(() => {
+      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Some Other Type'))));
+      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      tick();
+      expect(tagStore.get('citation_dissertation_institution')).toBeFalsy();
+      expect(tagStore.get('citation_technical_report_institution')).toBeFalsy();
+      expect(tagStore.get('citation_publisher')[0].content).toEqual('Mock Publisher');
     }));
   });
 
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index bc26f36fd1..f4b7b7ca10 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -144,14 +144,10 @@ export class MetadataService {
 
     this.setCitationAbstractUrlTag();
     this.setCitationPdfUrlTag();
+    this.setCitationPublisherTag();
 
     if (this.isDissertation()) {
       this.setCitationDissertationNameTag();
-      this.setCitationDissertationInstitutionTag();
-    }
-
-    if (this.isTechReport()) {
-      this.setCitationTechReportInstitutionTag();
     }
 
     // this.setCitationJournalTitleTag();
@@ -246,19 +242,17 @@ export class MetadataService {
   }
 
   /**
-   * Add <meta name="citation_dissertation_institution" ... >  to the <head>
+   * Add dc.publisher to the <head>. The tag name depends on the item type.
    */
-  private setCitationDissertationInstitutionTag(): void {
+  private setCitationPublisherTag(): void {
     const value = this.getMetaTagValue('dc.publisher');
-    this.addMetaTag('citation_dissertation_institution', value);
-  }
-
-  /**
-   * Add <meta name="citation_technical_report_institution" ... >  to the <head>
-   */
-  private setCitationTechReportInstitutionTag(): void {
-    const value = this.getMetaTagValue('dc.publisher');
-    this.addMetaTag('citation_technical_report_institution', value);
+    if (this.isDissertation()) {
+      this.addMetaTag('citation_dissertation_institution', value);
+    } else if (this.isTechReport()) {
+      this.addMetaTag('citation_technical_report_institution', value);
+    } else {
+      this.addMetaTag('citation_publisher', value);
+    }
   }
 
   /**

From 6a4e56322f70768b52301adaaf5f903fa5572937 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 4 Jun 2021 15:14:57 +0200
Subject: [PATCH 076/169] 79768: Rename method

---
 src/app/core/metadata/metadata.service.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index f4b7b7ca10..7b886d9067 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -329,7 +329,7 @@ export class MetadataService {
                   return [getBitstreamDownloadRoute(bitstreamRd.payload.page[0])];
                 } else {
                   // Otherwise check all bitstreams to see if one matches the format whitelist
-                  return this.getBitstreamDownloadRoute(bitstreamRd);
+                  return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
                 }
               })
             );
@@ -343,7 +343,7 @@ export class MetadataService {
     }
   }
 
-  private getBitstreamDownloadRoute(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
+  private getFirstAllowedFormatBitstreamLink(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
     return observableOf(bitstreamRd.payload).pipe(
       // Because there can be more than one page of bitstreams, this expand operator
       // will retrieve them in turn due to the take(1) at the bottom, it will only

From 2ed16aa66ecf81ad05c85d2fb21f65774d554fa9 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 14 Jun 2021 09:34:23 +0200
Subject: [PATCH 077/169] 79768: Update typedocs

---
 src/app/core/metadata/metadata.service.ts | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 7b886d9067..fa1022e4f6 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -40,7 +40,13 @@ export class MetadataService {
 
   private currentObject: BehaviorSubject<DSpaceObject>;
 
-  private readonly ALLOWED_MIMETYPES = [
+  /**
+   * When generating the citation_pdf_url meta tag for Items with more than one Bitstream (and no primary Bitstream),
+   * the first Bitstream to match one of the following MIME types is selected.
+   * See {@linkcode getFirstAllowedFormatBitstreamLink}
+   * @private
+   */
+  private readonly CITATION_PDF_URL_MIMETYPES = [
     'application/pdf',                                                          // .pdf
     'application/postscript',                                                   // .ps
     'application/msword',                                                       // .doc
@@ -202,7 +208,7 @@ export class MetadataService {
   }
 
   /**
-   * Add <meta name="citation_date" ... >  to the <head>
+   * Add <meta name="citation_publication_date" ... >  to the <head>
    */
   private setCitationPublicationDateTag(): void {
     const value = this.getFirstMetaTagValue(['dc.date.copyright', 'dc.date.issued', 'dc.date.available', 'dc.date.accessioned']);
@@ -343,6 +349,12 @@ export class MetadataService {
     }
   }
 
+  /**
+   * For Items with more than one Bitstream (and no primary Bitstream), link to the first Bitstream with a MIME type
+   * included in {@linkcode CITATION_PDF_URL_MIMETYPES}
+   * @param bitstreamRd
+   * @private
+   */
   private getFirstAllowedFormatBitstreamLink(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
     return observableOf(bitstreamRd.payload).pipe(
       // Because there can be more than one page of bitstreams, this expand operator
@@ -385,7 +397,7 @@ export class MetadataService {
       )),
       // Filter out only pairs with whitelisted formats
       filter(([, format]: [Bitstream, BitstreamFormat]) =>
-        hasValue(format) && this.ALLOWED_MIMETYPES.includes(format.mimetype)),
+        hasValue(format) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
       // We only need 1
       take(1),
       // Emit the link of the match

From 64049fdcf770b43cff44cb7228b003bc879c2a5b Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 14 Jun 2021 09:48:33 +0200
Subject: [PATCH 078/169] 79768: Make relative URLs absolute

---
 src/app/core/metadata/metadata.service.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index fa1022e4f6..cef3a67054 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -30,6 +30,8 @@ import { BundleDataService } from '../data/bundle-data.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { Bundle } from '../shared/bundle.model';
 import { PaginatedList } from '../data/paginated-list.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { HardRedirectService } from '../services/hard-redirect.service';
 
 @Injectable()
 export class MetadataService {
@@ -64,7 +66,8 @@ export class MetadataService {
     private bundleDataService: BundleDataService,
     private bitstreamDataService: BitstreamDataService,
     private bitstreamFormatDataService: BitstreamFormatDataService,
-    private rootService: RootDataService
+    private rootService: RootDataService,
+    private hardRedirectService: HardRedirectService,
   ) {
     // TODO: determine what open graph meta tags are needed and whether
     // the differ per route. potentially add image based on DSpaceObject
@@ -276,7 +279,7 @@ export class MetadataService {
     if (this.currentObject.value instanceof Item) {
       let url = this.getMetaTagValue('dc.identifier.uri');
       if (hasNoValue(url)) {
-        url = this.router.url;  // Google should handle relative URL
+        url = new URLCombiner(this.hardRedirectService.getRequestOrigin(), this.router.url).toString();
       }
       this.addMetaTag('citation_abstract_html_url', url);
     }
@@ -344,7 +347,10 @@ export class MetadataService {
         take(1)
       ).subscribe((link: string) => {
         // Use the found link to set the <meta> tag
-        this.addMetaTag('citation_pdf_url', link);
+        this.addMetaTag(
+          'citation_pdf_url',
+          new URLCombiner(this.hardRedirectService.getRequestOrigin(), link).toString()
+        );
       });
     }
   }

From 04b4f1cf58dc2f606f4eb120d66f072e2587bf8b Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Mon, 14 Jun 2021 10:30:17 +0200
Subject: [PATCH 079/169] Fix comment punctuation

---
 src/app/core/metadata/metadata.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index cef3a67054..4e3da11bf2 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -364,7 +364,7 @@ export class MetadataService {
   private getFirstAllowedFormatBitstreamLink(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
     return observableOf(bitstreamRd.payload).pipe(
       // Because there can be more than one page of bitstreams, this expand operator
-      // will retrieve them in turn due to the take(1) at the bottom, it will only
+      // will retrieve them in turn. Due to the take(1) at the bottom, it will only
       // retrieve pages until a match is found
       expand((paginatedList: PaginatedList<Bitstream>) => {
         if (hasNoValue(paginatedList.next)) {

From 34b117efe3a4918a81c4d3ee904808f29885fe4d Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 14 Jun 2021 10:50:59 +0200
Subject: [PATCH 080/169] 80084: Fix unit test & LGTM issues

---
 src/app/core/metadata/metadata.service.spec.ts | 17 +++++++++++------
 src/app/core/metadata/metadata.service.ts      |  1 -
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index d2656d6c70..a2f2272219 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -47,13 +47,13 @@ import { PageInfo } from '../shared/page-info.model';
 import { UUIDService } from '../shared/uuid.service';
 
 import { MetadataService } from './metadata.service';
-import { environment } from '../../../environments/environment';
 import { storeModuleConfig } from '../../app.reducer';
 import { RootDataService } from '../data/root-data.service';
 import { Root } from '../data/root.model';
 import { Bundle } from '../shared/bundle.model';
 import { BundleDataService } from '../data/bundle-data.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { HardRedirectService } from '../services/hard-redirect.service';
 
 /* tslint:disable:max-classes-per-file */
 @Component({
@@ -96,6 +96,7 @@ describe('MetadataService', () => {
   let authService: AuthService;
   let rootService: RootDataService;
   let translateService: TranslateService;
+  let hardRedirectService: HardRedirectService;
 
   let location: Location;
   let router: Router;
@@ -147,6 +148,9 @@ describe('MetadataService', () => {
         dspaceVersion: 'mock-dspace-version'
       }))
     });
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      getRequestOrigin: 'https://request.org',
+    });
 
     TestBed.configureTestingModule({
       imports: [
@@ -187,6 +191,7 @@ describe('MetadataService', () => {
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: BundleDataService, useValue: bundleDataService },
         { provide: RootDataService, useValue: rootService },
+        { provide: HardRedirectService, useValue: hardRedirectService },
         Meta,
         Title,
         // tslint:disable-next-line:no-empty
@@ -229,7 +234,7 @@ describe('MetadataService', () => {
     router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
     tick();
     expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
-    expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
+    expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
   }));
 
   it('items page should set meta tags as published Technical Report', fakeAsync(() => {
@@ -283,7 +288,7 @@ describe('MetadataService', () => {
       spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock)));
       router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
       tick();
-       expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
+       expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
     }));
   });
 
@@ -322,7 +327,7 @@ describe('MetadataService', () => {
       bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([], MockBitstream3));
       router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
       tick();
-      expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
+      expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
     }));
 
     describe('no primary Bitstream', () => {
@@ -331,7 +336,7 @@ describe('MetadataService', () => {
         bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([MockBitstream3]));
         router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
         tick();
-        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
+        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
       }));
 
       it('should link to first Bitstream with allowed format', fakeAsync(() => {
@@ -345,7 +350,7 @@ describe('MetadataService', () => {
 
         router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
         tick();
-        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download');
+        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download');
       }));
     });
   });
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 4e3da11bf2..d6518b6164 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -23,7 +23,6 @@ import {
   getFirstSucceededRemoteDataPayload,
   getFirstCompletedRemoteData
 } from '../shared/operators';
-import { environment } from '../../../environments/environment';
 import { RootDataService } from '../data/root-data.service';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
 import { BundleDataService } from '../data/bundle-data.service';

From 15e45c3decd73d16c96b630dc11d6e1a2b3c4fc2 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Mon, 14 Jun 2021 16:14:39 +0200
Subject: [PATCH 081/169] 80103: Fix admin sidebar link a11y issues

---
 .../admin-sidebar-section.component.html                  | 5 ++---
 src/app/+admin/admin-sidebar/admin-sidebar.component.html | 8 ++++----
 .../expandable-admin-sidebar-section.component.html       | 4 ++--
 .../shared/menu/menu-item/link-menu-item.component.html   | 2 +-
 .../menu/menu-item/onclick-menu-item.component.html       | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
index 4c13c7c570..f6bff2dc8f 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
+++ b/src/app/+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.html
@@ -1,11 +1,10 @@
 <li class="sidebar-section">
-    <a class="nav-item nav-link shortcut-icon" attr.aria-labelledby="sidebarName-{{section.id}}" [title]="('menu.section.icon.' + section.id) | translate" [routerLink]="itemModel.link">
+    <a href="javascript:void(0);" class="nav-item nav-link shortcut-icon" attr.aria-labelledby="sidebarName-{{section.id}}" [title]="('menu.section.icon.' + section.id) | translate" [routerLink]="itemModel.link">
         <i class="fas fa-{{section.icon}} fa-fw"></i>
     </a>
     <div class="sidebar-collapsible">
         <span id="sidebarName-{{section.id}}" class="section-header-text">
-          <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+        <a class="nav-item nav-link"  tabindex="-1" [routerLink]="itemModel.link">{{itemModel.text | translate}}</a>
         </span>
     </div>
 </li>
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.html b/src/app/+admin/admin-sidebar/admin-sidebar.component.html
index 4dddc89920..d3d8031994 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.html
@@ -10,14 +10,14 @@
     <div class="sidebar-top-level-items">
         <ul class="navbar-nav">
             <li class="admin-menu-header sidebar-section">
-                <a class="shortcut-icon navbar-brand mr-0" href="#">
+                <a class="shortcut-icon navbar-brand mr-0" href="javascript:void(0);">
                 <span class="logo-wrapper">
                     <img class="admin-logo" src="assets/images/dspace-logo-mini.svg"
                          [alt]="('menu.header.image.logo') | translate">
                 </span>
                 </a>
                 <div class="sidebar-collapsible">
-                    <a class="navbar-brand mr-0" href="#">
+                    <a class="navbar-brand mr-0" href="javascript:void(0);">
                         <h4 class="section-header-text mb-0">{{'menu.header.admin' |
                             translate}}</h4>
                     </a>
@@ -33,7 +33,7 @@
     <div class="navbar-nav">
         <div class="sidebar-section" id="sidebar-collapse-toggle">
             <a class="nav-item nav-link shortcut-icon"
-               href="#"
+               href="javascript:void(0);"
                (click)="toggle($event)">
                 <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
                    [title]="'menu.section.icon.pin' | translate"></i>
@@ -42,7 +42,7 @@
             </a>
             <div class="sidebar-collapsible">
                 <a class="nav-item nav-link sidebar-section"
-                   href="#"
+                   href="javascript:void(0);"
                    (click)="toggle($event)">
                     <span *ngIf="menuCollapsed | async" class="section-header-text">{{'menu.section.pin' | translate }}</span>
                     <span *ngIf="!(menuCollapsed | async)" class="section-header-text">{{'menu.section.unpin' | translate }}</span>
diff --git a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index 8854dea216..af014f3e1b 100644
--- a/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -3,12 +3,12 @@
      value: ((expanded | async) ? 'endBackground' : 'startBackground'),
      params: {endColor: (sidebarActiveBg | async)}}">
     <div class="icon-wrapper">
-        <a class="nav-item nav-link shortcut-icon" attr.aria.labelledby="sidebarName-{{section.id}}" [title]="('menu.section.icon.' + section.id) | translate" (click)="toggleSection($event)" href="#">
+        <a class="nav-item nav-link shortcut-icon" attr.aria.labelledby="sidebarName-{{section.id}}" [title]="('menu.section.icon.' + section.id) | translate" (click)="toggleSection($event)" href="javascript:void(0);">
             <i class="fas fa-{{section.icon}} fa-fw"></i>
         </a>
     </div>
     <div class="sidebar-collapsible">
-        <a class="nav-item nav-link" href="#"
+        <a class="nav-item nav-link" href="javascript:void(0);" tabindex="-1"
            (click)="toggleSection($event)">
             <span id="sidebarName-{{section.id}}" class="section-header-text">
                 <ng-container
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.html b/src/app/shared/menu/menu-item/link-menu-item.component.html
index 74e918c07b..e4b92284d2 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.html
@@ -1 +1 @@
-<a class="nav-item nav-link"  [ngClass]="{'disabled': !hasLink}" [routerLink]="getRouterLink()">{{item.text | translate}}</a>
\ No newline at end of file
+<a href="javascript:void(0);" class="nav-item nav-link"  [ngClass]="{'disabled': !hasLink}" [routerLink]="getRouterLink()">{{item.text | translate}}</a>
\ No newline at end of file
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index 96c9049ab3..950b80f10f 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1 +1 @@
-<a class="nav-item nav-link" role="button" (click)="item.function()">{{item.text | translate}}</a>
\ No newline at end of file
+<a href="javascript:void(0);" class="nav-item nav-link" role="button" (click)="item.function()">{{item.text | translate}}</a>
\ No newline at end of file

From a69a4e96962e18456bf51adb789096d64584553d Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 15 Jun 2021 15:40:35 +0200
Subject: [PATCH 082/169] 80113: Set ableToEdit on GroupDTOModel

---
 .../groups-registry.component.ts              | 60 ++++++++++++-------
 .../data/feature-authorization/feature-id.ts  |  1 +
 .../core/eperson/models/group-dto.model.ts    |  5 ++
 3 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index b28ac043d9..9215399170 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -141,29 +141,35 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         if (groups.page.length === 0) {
           return observableOf(buildPaginatedList(groups.pageInfo, []));
         }
-        return observableCombineLatest(groups.page.map((group: Group) => {
-          if (!this.deletedGroupsIds.includes(group.id)) {
-            return observableCombineLatest([
-              this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(group) ? group.self : undefined),
-              this.hasLinkedDSO(group),
-              this.getSubgroups(group),
-              this.getMembers(group)
-            ]).pipe(
-              map(([isAuthorized, hasLinkedDSO, subgroups, members]:
-                     [boolean, boolean, RemoteData<PaginatedList<Group>>, RemoteData<PaginatedList<EPerson>>]) => {
-                  const groupDtoModel: GroupDtoModel = new GroupDtoModel();
-                  groupDtoModel.ableToDelete = isAuthorized && !hasLinkedDSO;
-                  groupDtoModel.group = group;
-                  groupDtoModel.subgroups = subgroups.payload;
-                  groupDtoModel.epersons = members.payload;
-                  return groupDtoModel;
-                }
-              )
-            );
-          }
-        })).pipe(map((dtos: GroupDtoModel[]) => {
-          return buildPaginatedList(groups.pageInfo, dtos);
-        }));
+        return this.authorizationService.isAuthorized(FeatureID.AdministratorOf).pipe(
+          switchMap((isSiteAdmin: boolean) => {
+            return observableCombineLatest(groups.page.map((group: Group) => {
+              if (hasValue(group) && !this.deletedGroupsIds.includes(group.id)) {
+                return observableCombineLatest([
+                  this.authorizationService.isAuthorized(FeatureID.CanDelete, group.self),
+                  this.canManageGroup$(isSiteAdmin, group),
+                  this.hasLinkedDSO(group),
+                  this.getSubgroups(group),
+                  this.getMembers(group)
+                ]).pipe(
+                  map(([canDelete, canManageGroup, hasLinkedDSO, subgroups, members]:
+                         [boolean, boolean, boolean, RemoteData<PaginatedList<Group>>, RemoteData<PaginatedList<EPerson>>]) => {
+                      const groupDtoModel: GroupDtoModel = new GroupDtoModel();
+                      groupDtoModel.ableToDelete = canDelete && !hasLinkedDSO;
+                      groupDtoModel.ableToEdit = canManageGroup;
+                      groupDtoModel.group = group;
+                      groupDtoModel.subgroups = subgroups.payload;
+                      groupDtoModel.epersons = members.payload;
+                      return groupDtoModel;
+                    }
+                  )
+                );
+              }
+            })).pipe(map((dtos: GroupDtoModel[]) => {
+              return buildPaginatedList(groups.pageInfo, dtos);
+            }));
+          })
+        );
       })
     ).subscribe((value: PaginatedList<GroupDtoModel>) => {
       this.groupsDto$.next(value);
@@ -174,6 +180,14 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
     this.subs.push(this.searchSub);
       }
 
+  canManageGroup$(isSiteAdmin: boolean, group: Group): Observable<boolean> {
+    if (isSiteAdmin) {
+      return observableOf(true);
+    } else {
+      return this.authorizationService.isAuthorized(FeatureID.CanManageGroup, group.self);
+    }
+  }
+
   /**
    * Delete Group
    */
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
index 6d070fcd4c..ac045b93b0 100644
--- a/src/app/core/data/feature-authorization/feature-id.ts
+++ b/src/app/core/data/feature-authorization/feature-id.ts
@@ -10,6 +10,7 @@ export enum FeatureID {
   ReinstateItem = 'reinstateItem',
   EPersonRegistration = 'epersonRegistration',
   CanManageGroups = 'canManageGroups',
+  CanManageGroup = 'canManageGroup',
   IsCollectionAdmin = 'isCollectionAdmin',
   IsCommunityAdmin = 'isCommunityAdmin',
   CanDownload = 'canDownload',
diff --git a/src/app/core/eperson/models/group-dto.model.ts b/src/app/core/eperson/models/group-dto.model.ts
index 47a70cf326..ef65c498fd 100644
--- a/src/app/core/eperson/models/group-dto.model.ts
+++ b/src/app/core/eperson/models/group-dto.model.ts
@@ -17,6 +17,11 @@ export class GroupDtoModel {
    */
   public ableToDelete: boolean;
 
+  /**
+   * Whether or not the current user is able to edit the linked group
+   */
+  public ableToEdit: boolean;
+
   /**
    * List of subgroups of this group
    */

From 3bc031ff00b1c5fa8fe8c8c5e979fd50a53f1ee9 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 15 Jun 2021 17:17:44 +0200
Subject: [PATCH 083/169] 80113: Create Group Page guard

---
 .../access-control-routing.module.ts          |  4 ++-
 .../group-registry/group-page.guard.spec.ts   | 16 +++++++++
 .../group-registry/group-page.guard.ts        | 35 +++++++++++++++++++
 .../groups-registry.component.html            | 22 +++++++++---
 src/assets/i18n/en.json5                      |  2 ++
 5 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 src/app/access-control/group-registry/group-page.guard.spec.ts
 create mode 100644 src/app/access-control/group-registry/group-page.guard.ts

diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index cac49938a9..cf20309369 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -5,6 +5,7 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
 import { GROUP_EDIT_PATH } from './access-control-routing-paths';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { GroupPageGuard } from './group-registry/group-page.guard';
 
 @NgModule({
   imports: [
@@ -39,7 +40,8 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' }
+        data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
+        canActivate: [GroupPageGuard]
       }
     ])
   ]
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
new file mode 100644
index 0000000000..e6de64baea
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { GroupPageGuard } from './group-page.guard';
+
+describe('GroupPageGuard', () => {
+  let guard: GroupPageGuard;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    guard = TestBed.inject(GroupPageGuard);
+  });
+
+  it('should be created', () => {
+    expect(guard).toBeTruthy();
+  });
+});
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
new file mode 100644
index 0000000000..057f67ddeb
--- /dev/null
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import { Observable, of as observableOf } from 'rxjs';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { AuthService } from '../../core/auth/auth.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
+
+  protected groupsEndpoint = 'groups';
+
+  constructor(protected halEndpointService: HALEndpointService,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
+
+  getFeatureIDs(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID[]> {
+    return observableOf([FeatureID.CanManageGroup]);
+  }
+
+  getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
+    return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
+      map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+    );
+  }
+
+}
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index e5e25ae944..59ffbf20be 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -59,11 +59,23 @@
               <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
               <td>
                 <div class="btn-group edit-field">
-                  <button [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
-                          class="btn btn-outline-primary btn-sm"
-                          title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
+                  <ng-container [ngSwitch]="groupDto.ableToEdit">
+                    <button *ngSwitchCase="true"
+                      [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
+                      class="btn btn-outline-primary btn-sm"
+                      title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}"
+                    >
+                      <i class="fas fa-edit fa-fw"></i>
+                    </button>
+                    <button *ngSwitchCase="false"
+                      [disabled]="true"
+                      class="btn btn-outline-primary btn-sm"
+                      placement="left"
+                      [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
+                    >
+                      <i class="fas fa-edit fa-fw"></i>
+                    </button>
+                  </ng-container>
                   <button *ngIf="!groupDto.group?.permanent && groupDto.ableToDelete"
                           (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm"
                           title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: groupDto.group.name} }}">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4c3317a0c0..648c0f12e3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -238,6 +238,8 @@
 
   "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
 
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "You are not authorized to edit this group",
+
   "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
 
   "admin.access-control.epeople.no-items": "No EPeople to show.",

From 3b07738d4dc982fee8a3aba31dcb02addaef3db7 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 15 Jun 2021 18:43:50 +0200
Subject: [PATCH 084/169] 80113: Write tests for GroupPageGuard

---
 .../group-registry/group-page.guard.spec.ts   | 75 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 4 deletions(-)

diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
index e6de64baea..48fa124c07 100644
--- a/src/app/access-control/group-registry/group-page.guard.spec.ts
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -1,16 +1,83 @@
-import { TestBed } from '@angular/core/testing';
-
 import { GroupPageGuard } from './group-page.guard';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+import { AuthService } from '../../core/auth/auth.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 describe('GroupPageGuard', () => {
+  const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
+  const groupUuid = '0d6f89df-f95a-4829-943c-f21f434fb892';
+  const groupEndpointUrl = `${groupsEndpointUrl}/${groupUuid}`;
+  const routeSnapshotWithGroupId = {
+    params: {
+      groupId: groupUuid,
+    }
+  } as unknown as ActivatedRouteSnapshot;
+
   let guard: GroupPageGuard;
+  let halEndpointService: HALEndpointService;
+  let authorizationService: AuthorizationDataService;
+  let router: Router;
+  let authService: AuthService;
 
   beforeEach(() => {
-    TestBed.configureTestingModule({});
-    guard = TestBed.inject(GroupPageGuard);
+    halEndpointService = jasmine.createSpyObj(['getEndpoint']);
+    (halEndpointService as any).getEndpoint.and.returnValue(observableOf(groupsEndpointUrl));
+
+    authorizationService = jasmine.createSpyObj(['isAuthorized']);
+    // NOTE: value is set in beforeEach
+
+    router = jasmine.createSpyObj(['parseUrl']);
+    (router as any).parseUrl.and.returnValue = {};
+
+    authService = jasmine.createSpyObj(['isAuthenticated']);
+    (authService as any).isAuthenticated.and.returnValue(observableOf(true));
+
+    guard = new GroupPageGuard(halEndpointService, authorizationService, router, authService);
   });
 
   it('should be created', () => {
     expect(guard).toBeTruthy();
   });
+
+  describe('canActivate', () => {
+    describe('when the current user can manage the group', () => {
+      beforeEach(() => {
+        (authorizationService as any).isAuthorized.and.returnValue(observableOf(true));
+      });
+
+      it('should return true', (done) => {
+        guard.canActivate(
+          routeSnapshotWithGroupId, { url: 'current-url'} as any
+        ).subscribe((result) => {
+          expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+          );
+          expect(result).toBeTrue();
+          done();
+        });
+      });
+    });
+
+    describe('when the current user can not manage the group', () => {
+      beforeEach(() => {
+        (authorizationService as any).isAuthorized.and.returnValue(observableOf(false));
+      });
+
+      it('should not return true', (done) => {
+        guard.canActivate(
+          routeSnapshotWithGroupId, { url: 'current-url'} as any
+        ).subscribe((result) => {
+          expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+          );
+          expect(result).not.toBeTrue();
+          done();
+        });
+      });
+    });
+  });
+
 });

From 3fc44f6fc1a6b0a9bb9bbbbe123c5ea57e363484 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 15 Jun 2021 19:38:33 +0200
Subject: [PATCH 085/169] 80113: Write tests for GroupsRegistryComponent

---
 .../groups-registry.component.html            |   4 +-
 .../groups-registry.component.spec.ts         | 101 +++++++++++++++++-
 2 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 59ffbf20be..7fced71e6f 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -62,14 +62,14 @@
                   <ng-container [ngSwitch]="groupDto.ableToEdit">
                     <button *ngSwitchCase="true"
                       [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
-                      class="btn btn-outline-primary btn-sm"
+                      class="btn btn-outline-primary btn-sm btn-edit"
                       title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}"
                     >
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
                     <button *ngSwitchCase="false"
                       [disabled]="true"
-                      class="btn btn-outline-primary btn-sm"
+                      class="btn btn-outline-primary btn-sm btn-edit"
                       placement="left"
                       [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
                     >
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 10064800e1..245044f5c9 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -30,6 +30,7 @@ import { routeServiceStub } from '../../shared/testing/route-service.stub';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 describe('GroupRegistryComponent', () => {
   let component: GroupsRegistryComponent;
@@ -43,6 +44,26 @@ describe('GroupRegistryComponent', () => {
   let mockEPeople;
   let paginationService;
 
+  /**
+   * Set authorizationService.isAuthorized to return the following values.
+   * @param isAdmin whether or not the current user is an admin.
+   * @param canManageGroup whether or not the current user can manage all groups.
+   */
+  const setIsAuthorized = (isAdmin: boolean, canManageGroup: boolean) => {
+    (authorizationService as any).isAuthorized.and.callFake((featureId?: FeatureID) => {
+      switch (featureId) {
+        case FeatureID.AdministratorOf:
+          return observableOf(isAdmin);
+        case FeatureID.CanManageGroup:
+          return observableOf(canManageGroup);
+        case FeatureID.CanDelete:
+          return observableOf(true);
+        default:
+          throw new Error(`setIsAuthorized: this fake implementation does not support ${featureId}.`);
+      }
+    });
+  };
+
   beforeEach(waitForAsync(() => {
     mockGroups = [GroupMock, GroupMock2];
     mockEPeople = [EPersonMock, EPersonMock2];
@@ -131,9 +152,8 @@ describe('GroupRegistryComponent', () => {
         return createSuccessfulRemoteDataObject$(undefined);
       }
     };
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
-    });
+    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+    setIsAuthorized(true, true);
     paginationService = new PaginationServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
@@ -180,6 +200,81 @@ describe('GroupRegistryComponent', () => {
     });
   });
 
+  describe('edit buttons', () => {
+    describe('when the user is a general admin', () => {
+      beforeEach(fakeAsync(() => {
+        // NOTE: setting canManageGroup to false should not matter, since isAdmin takes priority
+        setIsAuthorized(true, false);
+
+        // force rerender after setup changes
+        component.search({ query: '' });
+        tick();
+        fixture.detectChanges();
+      }));
+
+      it('should be active', () => {
+        const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(4) button.btn-edit'));
+        expect(editButtonsFound.length).toEqual(2);
+        editButtonsFound.forEach((editButtonFound) => {
+          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+        });
+      });
+
+      it('should not check the canManageGroup permissions', () => {
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[0].self
+        );
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[0].self, undefined // treated differently
+        );
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[1].self
+        );
+        expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
+          FeatureID.CanManageGroup, mockGroups[1].self, undefined // treated differently
+        );
+      });
+    });
+
+    describe('when the user can edit the groups', () => {
+      beforeEach(fakeAsync(() => {
+        setIsAuthorized(false, true);
+
+        // force rerender after setup changes
+        component.search({ query: '' });
+        tick();
+        fixture.detectChanges();
+      }));
+
+      it('should be active', () => {
+        const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(4) button.btn-edit'));
+        expect(editButtonsFound.length).toEqual(2);
+        editButtonsFound.forEach((editButtonFound) => {
+          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+        });
+      });
+    });
+
+    describe('when the user can not edit the groups', () => {
+      beforeEach(fakeAsync(() => {
+        setIsAuthorized(false, false);
+
+        // force rerender after setup changes
+        component.search({ query: '' });
+        tick();
+        fixture.detectChanges();
+      }));
+
+      it('should not be active', () => {
+        const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(4) button.btn-edit'));
+        expect(editButtonsFound.length).toEqual(2);
+        editButtonsFound.forEach((editButtonFound) => {
+          expect(editButtonFound.nativeElement.disabled).toBeTrue();
+        });
+      });
+    });
+  });
+
   describe('search', () => {
     describe('when searching with query', () => {
       let groupIdsFound;

From 98598a53d9eb56971b9e511d0dd2b971d4466e56 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 15 Jun 2021 14:30:18 -0500
Subject: [PATCH 086/169] Fix incorrect i18n tags

---
 .../delete-collection-page.component.html                 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
index 737c40264b..81ba60e51b 100644
--- a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
@@ -2,15 +2,15 @@
     <div class="row">
         <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
             <div class="col-12 pb-4">
-                <h2 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h2>
-                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dso.name } }}</p>
+                <h2 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h2>
+                <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dso.name } }}</p>
                 <div class="form-group row">
                   <div class="col text-right">
                     <button class="btn btn-outline-secondary" (click)="onCancel(dso)">
-                      <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
+                      <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
                     <button class="btn btn-danger mr-2" (click)="onConfirm(dso)">
-                      <i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}
+                      <i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}
                     </button>
                   </div>
                 </div>

From b5562342071974915786b4f1653a9bbab59921d4 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 16 Jun 2021 13:05:03 +0200
Subject: [PATCH 087/169] add aria and alt attributes to base header as well

---
 src/app/header/header.component.html               | 6 +++---
 src/app/navbar/navbar.component.html               | 3 ++-
 src/assets/i18n/en.json5                           | 2 ++
 src/themes/dspace/app/header/header.component.html | 6 +++---
 src/themes/dspace/app/navbar/navbar.component.html | 4 ++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index a1fa051610..c7b979d266 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -2,10 +2,10 @@
   <div class="container">
     <div class="d-flex flex-row justify-content-between">
       <a class="navbar-brand my-2" routerLink="/home">
-        <img src="assets/images/dspace-logo.svg"/>
+        <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
 
-      <nav class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
+      <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="navbar navbar-light navbar-expand-md flex-shrink-0 px-0">
         <ds-search-navbar></ds-search-navbar>
         <ds-lang-switch></ds-lang-switch>
         <ds-auth-nav-menu></ds-auth-nav-menu>
@@ -13,7 +13,7 @@
         <div class="pl-2">
           <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
                   aria-controls="collapsingNav"
-                  aria-expanded="false" aria-label="Toggle navigation">
+                  aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
             <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
           </button>
         </div>
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 2356077e43..3fa7598e74 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,6 +1,7 @@
 <nav [ngClass]="{'open': !(menuCollapsed | async)}"
      [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-     class="navbar navbar-light navbar-expand-md p-md-0 navbar-container">    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
+     class="navbar navbar-light navbar-expand-md p-md-0 navbar-container"
+     role="navigation" [attr.aria-label]="'nav.main.description' | translate">    <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
     <div class="container">
         <div class="reset-padding-md w-100">
             <div id="collapsingNav">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4c3317a0c0..5bd08dfbc8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -2353,6 +2353,8 @@
 
   "nav.stop-impersonating": "Stop impersonating EPerson",
 
+  "nav.toggle" : "Toggle navigation",
+
   "nav.user.description" : "User profile bar",
 
 
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index dc0d066a4e..cf691ea6c4 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -1,8 +1,8 @@
 <header class="header">
-  <nav role="navigation" [attr.aria-label]="'nav.user.description' |translate" class="container navbar navbar-expand-md px-0">
+  <nav role="navigation" [attr.aria-label]="'nav.user.description' | translate" class="container navbar navbar-expand-md px-0">
     <div class="d-flex flex-grow-1">
       <a class="navbar-brand m-2" routerLink="/home">
-        <img src="assets/images/dspace-logo.svg" alt="logo"/>
+        <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
     </div>
     <div class="d-flex flex-grow-1 ml-auto justify-content-end align-items-center">
@@ -13,7 +13,7 @@
       <div class="pl-2">
         <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
                 aria-controls="collapsingNav"
-                aria-expanded="false" aria-label="Toggle navigation">
+                aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
           <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
         </button>
       </div>
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 50e526b78b..5af30db632 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,10 +1,10 @@
 <nav [ngClass]="{'open': !(menuCollapsed | async)}"
      [@slideMobileNav]="!(windowService.isXsOrSm() | async) ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
      class="navbar navbar-expand-md navbar-light p-0 navbar-container"
-     role="navigation" role="navigation" [attr.aria-label]="'nav.main.description' |translate">
+     role="navigation" [attr.aria-label]="'nav.main.description' | translate">
   <div class="container h-100">
     <a class="navbar-brand my-2" routerLink="/home">
-      <img src="assets/images/dspace-logo.svg" alt="logo"/>
+      <img src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
     </a>
 
     <div id="collapsingNav" class="w-100 h-100">

From cf515fe6f0ea328683888c1ec13583a8c9d3ce19 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Wed, 16 Jun 2021 16:49:57 +0200
Subject: [PATCH 088/169] 80113: Prevent anyone but site admin from accessing
 /access-control/epeople

---
 .../+admin/admin-sidebar/admin-sidebar.component.ts   | 11 +++++++----
 .../access-control/access-control-routing-paths.ts    |  4 ++++
 .../access-control/access-control-routing.module.ts   | 11 ++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
index e172f9717b..53a9ecb2ab 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
@@ -531,14 +531,17 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    * Create menu sections dependent on whether or not the current user can manage access control groups
    */
   createAccessControlMenuSections() {
-    this.authorizationService.isAuthorized(FeatureID.CanManageGroups).subscribe((authorized) => {
+    observableCombineLatest(
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      this.authorizationService.isAuthorized(FeatureID.CanManageGroups)
+    ).subscribe(([isSiteAdmin, canManageGroups]) => {
       const menuList = [
         /* Access Control */
         {
           id: 'access_control_people',
           parentID: 'access_control',
           active: false,
-          visible: authorized,
+          visible: isSiteAdmin,
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_people',
@@ -549,7 +552,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
           id: 'access_control_groups',
           parentID: 'access_control',
           active: false,
-          visible: authorized,
+          visible: canManageGroups,
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_groups',
@@ -571,7 +574,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         {
           id: 'access_control',
           active: false,
-          visible: authorized,
+          visible: canManageGroups || isSiteAdmin,
           model: {
             type: MenuItemType.TEXT,
             text: 'menu.section.access_control'
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index d229d12bd2..259aa311e7 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -3,6 +3,10 @@ import { getAccessControlModuleRoute } from '../app-routing-paths';
 
 export const GROUP_EDIT_PATH = 'groups';
 
+export function getGroupsRoute() {
+  return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH).toString();
+}
+
 export function getGroupEditRoute(id: string) {
   return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
 }
diff --git a/src/app/access-control/access-control-routing.module.ts b/src/app/access-control/access-control-routing.module.ts
index cf20309369..e64b0d170a 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -6,6 +6,8 @@ import { GroupsRegistryComponent } from './group-registry/groups-registry.compon
 import { GROUP_EDIT_PATH } from './access-control-routing-paths';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 
 @NgModule({
   imports: [
@@ -16,7 +18,8 @@ import { GroupPageGuard } from './group-registry/group-page.guard';
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' }
+        data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
+        canActivate: [SiteAdministratorGuard]
       },
       {
         path: GROUP_EDIT_PATH,
@@ -24,7 +27,8 @@ import { GroupPageGuard } from './group-registry/group-page.guard';
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' }
+        data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
+        canActivate: [GroupAdministratorGuard]
       },
       {
         path: `${GROUP_EDIT_PATH}/newGroup`,
@@ -32,7 +36,8 @@ import { GroupPageGuard } from './group-registry/group-page.guard';
         resolve: {
           breadcrumb: I18nBreadcrumbResolver
         },
-        data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' }
+        data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+        canActivate: [GroupAdministratorGuard]
       },
       {
         path: `${GROUP_EDIT_PATH}/:groupId`,

From 700afc2709c73be3f2b214f0386795d50761dbf1 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 16 Jun 2021 12:03:30 -0500
Subject: [PATCH 089/169] Create a SECURITY.md to document security policies

---
 SECURITY.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..fca18c64ee
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,15 @@
+# Security Policy
+
+## Supported Versions
+
+For information regarding which versions of DSpace are currently under support, please see our DSpace Software Support Policy:
+
+https://wiki.lyrasis.org/display/DSPACE/DSpace+Software+Support+Policy
+
+## Reporting a Vulnerability
+
+If you believe you have found a security vulnerability in a supported version of DSpace, we encourage you to let us know right away.
+We will investigate all legitimate reports and do our best to quickly fix the problem. Please see our DSpace Software Support Policy
+for information on privately reporting vulnerabilities:
+
+https://wiki.lyrasis.org/display/DSPACE/DSpace+Software+Support+Policy

From f20b139841deb46ee50a6257b492c427bd0c6a98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:56:35 +0000
Subject: [PATCH 090/169] Bump dns-packet from 1.3.1 to 1.3.4

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d6388ddb53..29fac01d15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4208,9 +4208,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"

From aa5a395d9137559bce99cd3b1fa7cd5c6df33176 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Jun 2021 20:57:10 +0000
Subject: [PATCH 091/169] Bump browserslist from 4.16.0 to 4.16.6

Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.0 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.16.0...4.16.6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d6388ddb53..7df4579760 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2663,15 +2663,15 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.15.0, browserslist@^4.6.4, browserslist@^4.9.1:
-  version "4.16.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.0.tgz#410277627500be3cb28a1bfe037586fbedf9488b"
-  integrity sha512-/j6k8R0p3nxOC6kx5JGAxsnhc9ixaWJfYc+TNTzxg6+ARaESAvQGV7h0uNOB4t+pLQJZWzcrMxXOxjgsCj3dqQ==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001165"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.621"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.67"
+    node-releases "^1.1.71"
 
 browserstack@^1.5.1:
   version "1.6.0"
@@ -2905,10 +2905,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165:
-  version "1.0.30001165"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001165.tgz#32955490d2f60290bb186bb754f2981917fa744f"
-  integrity sha512-8cEsSMwXfx7lWSUMA2s08z9dIgsnR5NAqjXP23stdsU3AUWkCr/rr4s4OFtHXn5XXr6+7kam3QFVoYyXNPdJPA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001219:
+  version "1.0.30001237"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz#4b7783661515b8e7151fc6376cfd97f0e427b9e5"
+  integrity sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3220,10 +3220,10 @@ color@^3.0.0:
     color-convert "^1.9.1"
     color-string "^1.5.4"
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+colorette@^1.2.1, colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
 colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
@@ -4364,10 +4364,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.621:
-  version "1.3.622"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.622.tgz#9726bd2e67a5462154750ce9701ca6af07d07877"
-  integrity sha512-AJT0Fm1W0uZlMVVkkJrcCVvczDuF8tPm3bwzQf5WO8AaASB2hwTRP7B8pU5rqjireH+ib6am8+hH5/QkXzzYKw==
+electron-to-chromium@^1.3.723:
+  version "1.3.752"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09"
+  integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -7710,10 +7710,10 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^1.1.67:
-  version "1.1.67"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
-  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
+node-releases@^1.1.71:
+  version "1.1.73"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
+  integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
 
 nodemon@^2.0.2:
   version "2.0.6"

From 8085885da4af345fb84075dc1b14268689c2d4d7 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 17 Jun 2021 14:05:57 +0200
Subject: [PATCH 092/169] 79730: Move aria-label from span to button

---
 .../search-filter/search-filter.component.html            | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index b71111de6a..230f072772 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -1,14 +1,16 @@
 <div class="facet-filter d-block mb-3 p-3" *ngIf="active$ | async"
      [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
   <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
-          class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId" [attr.aria-expanded]="false">
+          class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
+          [attr.aria-expanded]="false"
+          [attr.aria-label]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate"
+  >
     <h5 class="d-inline-block mb-0">
       {{'search.filters.filter.' + filter.name + '.head'| translate}}
     </h5>
     <span class="filter-toggle flex-grow-1 fas p-auto"
           [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
-          [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate"
-          [attr.aria-label]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+          [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
     </span>
   </button>
   <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"

From f3faa0df2ca0166d7e3cd7933b36cda1c038f37d Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 17 Jun 2021 16:57:48 +0200
Subject: [PATCH 093/169] 80154: Revert to default Bootstrap grays

---
 src/styles/_bootstrap_variables.scss                  | 10 ++--------
 .../custom/styles/_theme_sass_variable_overrides.scss | 11 ++---------
 .../dspace/styles/_theme_sass_variable_overrides.scss | 10 +++-------
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 58f599c516..db4387dc30 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,12 +12,6 @@ $image-path: "../assets/images" !default;
 
 /** Bootstrap Variables **/
 /* Colors */
-$gray-base: #000 !default;
-$gray-900: lighten($gray-base, 13.5%) !default; // #222
-$gray-800: lighten($gray-base, 26.6%) !default; // #444
-$gray-700: lighten($gray-base, 46.6%) !default; // #777
-$gray-600: lighten($gray-base, 73.3%) !default; // #bbb
-$gray-100: lighten($gray-base, 93.5%) !default; // #eee
 
 /* Reassign color vars to semantic color scheme */
 $blue:   #2B4E72 !default;
@@ -29,12 +23,12 @@ $dark:   darken($blue, 17%) !default;
 
 $theme-colors: (
         primary: $blue,
-        secondary: $gray-700,
+        secondary: #495057,   // Bootstrap $gray-700
         success: $green,
         info: $cyan,
         warning: $yellow,
         danger: $red,
-        light: $gray-100,
+        light: #f8f9fa,       // Bootstrap $gray-100
         dark: $dark
 ) !default;
 /* Fonts */
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index 9f69b17ebd..30d806ecda 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -5,13 +5,6 @@
 
 // $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 //
-// $gray-base: #000 !default;
-// $gray-900: lighten($gray-base, 13.5%) !default; // #222
-// $gray-800: lighten($gray-base, 26.6%) !default; // #444
-// $gray-700: lighten($gray-base, 46.6%) !default; // #777
-// $gray-600: lighten($gray-base, 73.3%) !default; // #bbb
-// $gray-100: lighten($gray-base, 93.5%) !default; // #eee
-//
 // $blue:   #2B4E72 !default;
 // $green:  #94BA65 !default;
 // $cyan:   #006666 !default;
@@ -21,12 +14,12 @@
 //
 // $theme-colors: (
 //   primary: $blue,
-//   secondary: $gray-700,
+//   secondary: #495057,   // Bootstrap $gray-700
 //   success: $green,
 //   info: $cyan,
 //   warning: $yellow,
 //   danger: $red,
-//   light: $gray-100,
+//   light: #f8f9fa,       // Bootstrap $gray-100
 //   dark: $dark
 // ) !default;
 //
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 70aa0b1850..64daf347b4 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -6,10 +6,6 @@
 @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;1,200;1,300;1,400;1,600;1,700;1,800&display=swap');
 
 $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-$gray-100: #e8ebf3 !default;
-$gray-400: #ced4da !default;
-$gray-600: #959595 !default;
-$gray-800: #444444 !default;
 
 $navbar-dark-color: #FFFFFF;
 
@@ -21,10 +17,10 @@ $yellow: #ec9433 !default;
 $red: #CF4444 !default;
 $dark: #43515f !default;
 
-$body-color: $gray-800 !default;
+$body-color: #343a40 !default;                    // Bootstrap $gray-800
 
-$table-accent-bg:             $gray-100 !default;
-$table-hover-bg:              $gray-400 !default;
+$table-accent-bg:             #f8f9fa !default;   // Bootstrap $gray-100
+$table-hover-bg:              #ced4da !default;   // Bootstrap $gray-400
 
 $yiq-contrasted-threshold:  170 !default;
 

From 3a8e658d54a8b7bdae4d73037e999a9aadfbec82 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 15:24:16 +0200
Subject: [PATCH 094/169] 80154: Keep using Bootstrap variables

---
 src/styles/_bootstrap_variables.scss                  |  6 ++++--
 .../custom/styles/_theme_sass_variable_overrides.scss |  7 +++++--
 .../dspace/styles/_theme_sass_variable_overrides.scss | 11 +++++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index db4387dc30..41a304af39 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,6 +12,8 @@ $image-path: "../assets/images" !default;
 
 /** Bootstrap Variables **/
 /* Colors */
+$gray-700: #495057; !default  // Bootstrap $gray-700
+$gray-100: #f8f9fa; !default  //           $gray-100
 
 /* Reassign color vars to semantic color scheme */
 $blue:   #2B4E72 !default;
@@ -23,12 +25,12 @@ $dark:   darken($blue, 17%) !default;
 
 $theme-colors: (
         primary: $blue,
-        secondary: #495057,   // Bootstrap $gray-700
+        secondary: $gray-700,
         success: $green,
         info: $cyan,
         warning: $yellow,
         danger: $red,
-        light: #f8f9fa,       // Bootstrap $gray-100
+        light: $gray-100,
         dark: $dark
 ) !default;
 /* Fonts */
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index 30d806ecda..0711268582 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -5,6 +5,9 @@
 
 // $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 //
+// $gray-700: #495057; !default  // Bootstrap $gray-700
+// $gray-100: #f8f9fa; !default  //           $gray-100
+//
 // $blue:   #2B4E72 !default;
 // $green:  #94BA65 !default;
 // $cyan:   #006666 !default;
@@ -14,12 +17,12 @@
 //
 // $theme-colors: (
 //   primary: $blue,
-//   secondary: #495057,   // Bootstrap $gray-700
+//   secondary: $gray-700,
 //   success: $green,
 //   info: $cyan,
 //   warning: $yellow,
 //   danger: $red,
-//   light: #f8f9fa,       // Bootstrap $gray-100
+//   light: $gray-100,
 //   dark: $dark
 // ) !default;
 //
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 64daf347b4..b6fddce24a 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -17,10 +17,13 @@ $yellow: #ec9433 !default;
 $red: #CF4444 !default;
 $dark: #43515f !default;
 
-$body-color: #343a40 !default;                    // Bootstrap $gray-800
+$gray-800: #343a40; !default
+$gray-400: #ced4da; !default
+$gray-100: #f8f9fa; !default
 
-$table-accent-bg:             #f8f9fa !default;   // Bootstrap $gray-100
-$table-hover-bg:              #ced4da !default;   // Bootstrap $gray-400
+$body-color: $gray-800 !default;                    // Bootstrap $gray-800
+
+$table-accent-bg: $gray-100 !default;   // Bootstrap $gray-100
+$table-hover-bg: $gray-400 !default;   // Bootstrap $gray-400
 
 $yiq-contrasted-threshold:  170 !default;
-

From 7c609820b19a98229353a004e1bd71fad1f93ebc Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 15:31:30 +0200
Subject: [PATCH 095/169] 80154: Fix semicolon placement

---
 src/styles/_bootstrap_variables.scss                        | 4 ++--
 .../custom/styles/_theme_sass_variable_overrides.scss       | 4 ++--
 .../dspace/styles/_theme_sass_variable_overrides.scss       | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 41a304af39..4c631a294a 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -12,8 +12,8 @@ $image-path: "../assets/images" !default;
 
 /** Bootstrap Variables **/
 /* Colors */
-$gray-700: #495057; !default  // Bootstrap $gray-700
-$gray-100: #f8f9fa; !default  //           $gray-100
+$gray-700: #495057 !default;  // Bootstrap $gray-700
+$gray-100: #f8f9fa !default;  //           $gray-100
 
 /* Reassign color vars to semantic color scheme */
 $blue:   #2B4E72 !default;
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index 0711268582..f1387aa619 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -5,8 +5,8 @@
 
 // $font-family-sans-serif:      -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 //
-// $gray-700: #495057; !default  // Bootstrap $gray-700
-// $gray-100: #f8f9fa; !default  //           $gray-100
+// $gray-700: #495057 !default;  // Bootstrap $gray-700
+// $gray-100: #f8f9fa !default;  //           $gray-100
 //
 // $blue:   #2B4E72 !default;
 // $green:  #94BA65 !default;
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index b6fddce24a..9257bc46dd 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -17,9 +17,9 @@ $yellow: #ec9433 !default;
 $red: #CF4444 !default;
 $dark: #43515f !default;
 
-$gray-800: #343a40; !default
-$gray-400: #ced4da; !default
-$gray-100: #f8f9fa; !default
+$gray-800: #343a40 !default;
+$gray-400: #ced4da !default;
+$gray-100: #f8f9fa !default;
 
 $body-color: $gray-800 !default;                    // Bootstrap $gray-800
 

From d9a8b8f3fd6059fffde23d70d528fe4a94e41f8a Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Mon, 21 Jun 2021 16:18:12 +0200
Subject: [PATCH 096/169] add pagination to edit relationships tab

---
 .../edit-relationship-list.component.html     |  29 ++-
 .../edit-relationship-list.component.ts       | 233 +++++++++++++-----
 .../item-relationships.component.ts           |   1 -
 3 files changed, 192 insertions(+), 71 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 5583de5fd5..2185108c8f 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -6,21 +6,30 @@
     </button>
 </h5>
 <ng-container *ngVar="updates$ | async as updates">
-    <ng-container *ngIf="updates">
+    <ng-container *ngIf="updates && !(loading$ | async)">
         <ng-container *ngVar="updates | dsObjectValues as updateValues">
-            <ds-edit-relationship *ngFor="let updateValue of updateValues; trackBy: trackUpdate"
-                                  class="relationship-row d-block alert"
-                                  [fieldUpdate]="updateValue || {}"
-                                  [url]="url"
-                                  [editItem]="item"
-                                  [ngClass]="{
+          <ds-pagination
+            [paginationOptions]="paginationConfig"
+            [pageInfoState]="(relationshipsRd$ | async)?.payload?.pageInfo"
+            [collectionSize]="(relationshipsRd$ | async)?.payload?.totalElements + (this.nbAddedFields$ | async)"
+            [hideGear]="true"
+            [hidePagerWhenSinglePage]="true">
+            <div class="my-2">
+              <ds-edit-relationship *ngFor="let updateValue of updateValues; trackBy: trackUpdate"
+                                    class="relationship-row d-block alert"
+                                    [fieldUpdate]="updateValue || {}"
+                                    [url]="url"
+                                    [editItem]="item"
+                                    [ngClass]="{
                                         'alert-success': updateValue.changeType === 1,
                                         'alert-warning': updateValue.changeType === 0,
                                         'alert-danger': updateValue.changeType === 2
                                   }">
-            </ds-edit-relationship>
-            <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
+              </ds-edit-relationship>
+            </div>
+          </ds-pagination>
+          <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
         </ng-container>
     </ng-container>
-    <ds-loading *ngIf="!updates"></ds-loading>
+    <ds-loading *ngIf="loading$ | async"></ds-loading>
 </ng-container>
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 3f9637cdc9..53dc3082f5 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,9 +1,14 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy } from '@angular/core';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { FieldChangeType } from '../../../../core/data/object-updates/object-updates.actions';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  from as observableFrom
+} from 'rxjs';
 import {
   FieldUpdate,
   FieldUpdates,
@@ -11,14 +16,24 @@ import {
 } from '../../../../core/data/object-updates/object-updates.reducer';
 import { RelationshipService } from '../../../../core/data/relationship.service';
 import { Item } from '../../../../core/shared/item.model';
-import { defaultIfEmpty, map, mergeMap, switchMap, take, startWith } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
+import {
+  defaultIfEmpty,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  startWith,
+  toArray,
+  tap
+} from 'rxjs/operators';
+import { hasValue, hasValueOperator, hasNoValue } from '../../../../shared/empty.util';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import {
-  getAllSucceededRemoteData,
   getRemoteDataPayload,
-  getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getAllSucceededRemoteData,
 } from '../../../../core/shared/operators';
 import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
 import { DsDynamicLookupRelationModalComponent } from '../../../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
@@ -30,6 +45,10 @@ import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-edit-relationship-list',
@@ -40,7 +59,7 @@ import { Collection } from '../../../../core/shared/collection.model';
  * A component creating a list of editable relationships of a certain type
  * The relationships are rendered as a list of related items
  */
-export class EditRelationshipListComponent implements OnInit {
+export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
   /**
    * The item to display related items for
@@ -70,7 +89,38 @@ export class EditRelationshipListComponent implements OnInit {
   /**
    * The FieldUpdates for the relationships in question
    */
-  updates$: Observable<FieldUpdates>;
+  updates$: BehaviorSubject<FieldUpdates> = new BehaviorSubject(undefined);
+
+  /**
+   * The RemoteData for the relationships
+   */
+  relationshipsRd$: BehaviorSubject<RemoteData<PaginatedList<Relationship>>> = new BehaviorSubject(undefined);
+
+  /**
+   * Whether the current page is the last page
+   */
+  isLastPage$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * Whether we're loading
+   */
+  loading$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * The number of added fields that haven't been saved yet
+   */
+  nbAddedFields$: BehaviorSubject<number> = new BehaviorSubject(0);
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * The pagination config
+   */
+  paginationConfig: PaginationComponentOptions;
 
   /**
    * A reference to the lookup window
@@ -82,6 +132,7 @@ export class EditRelationshipListComponent implements OnInit {
     protected linkService: LinkService,
     protected relationshipService: RelationshipService,
     protected modalService: NgbModal,
+    protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
   ) {
   }
@@ -172,6 +223,10 @@ export class EditRelationshipListComponent implements OnInit {
                   this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
                 });
             }
+
+            this.loading$.next(true);
+            // emit the last page again to trigger a fieldupdates refresh
+            this.relationshipsRd$.next(this.relationshipsRd$.getValue());
           });
       });
     };
@@ -186,6 +241,10 @@ export class EditRelationshipListComponent implements OnInit {
             )
           );
       });
+
+      this.loading$.next(true);
+      // emit the last page again to trigger a fieldupdates refresh
+      this.relationshipsRd$.next(this.relationshipsRd$.getValue());
     };
     this.relatedEntityType$
       .pipe(take(1))
@@ -212,10 +271,10 @@ export class EditRelationshipListComponent implements OnInit {
                 if (field.relationship) {
                   return this.getRelatedItem(field.relationship);
                 } else {
-                  return of(field.relatedItem);
+                  return observableOf(field.relatedItem);
                 }
               })
-          ) : of([])
+          ) : observableOf([])
       ),
       take(1),
       map((items) => items.map((item) => {
@@ -286,65 +345,119 @@ export class EditRelationshipListComponent implements OnInit {
       (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
     );
 
-    this.updates$ = this.getItemRelationships().pipe(
-      switchMap((relationships) =>
-        observableCombineLatest(
-          relationships.map((relationship) => this.relationshipService.isLeftItem(relationship, this.item))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((isLeftItemArray) => isLeftItemArray.map((isLeftItem, index) => {
-            const relationship = relationships[index];
-            const nameVariant = isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
+    // initialize the pagination options
+    this.paginationConfig = new PaginationComponentOptions();
+    this.paginationConfig.id = `er${this.relationshipType.id}`;
+    this.paginationConfig.pageSize = 5;
+    this.paginationConfig.currentPage = 1;
+
+    this.subs.push(
+      // get the pagination params from the route
+      this.paginationService.getCurrentPagination(
+        this.paginationConfig.id,
+        this.paginationConfig
+      ).pipe(
+        tap(() => {
+          this.loading$.next(true);
+        }),
+        switchMap((currentPagination: PaginationComponentOptions) =>
+          // get the relationships for the current item, relationshiptype and page
+          this.relationshipService.getItemRelationshipsByLabel(
+            this.item,
+            this.relationshipType.rightwardType,
+            {
+              elementsPerPage: currentPagination.pageSize,
+              currentPage: currentPagination.currentPage
+            },
+            false,
+            true,
+            followLink('leftItem'),
+            followLink('rightItem')
+          ))
+      ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
+        this.relationshipsRd$.next(rd);
+      }));
+
+    // keep isLastPage$ up to date based on relationshipsRd$
+    this.subs.push(this.relationshipsRd$.pipe(
+      getAllSucceededRemoteData()
+    ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
+      this.isLastPage$.next(hasNoValue(rd.payload._links.next));
+    }));
+
+    this.subs.push(this.relationshipsRd$.pipe(
+      getAllSucceededRemoteData(),
+      switchMap((rd: RemoteData<PaginatedList<Relationship>>) =>
+        // emit each relationship in the page separately
+        observableFrom(rd.payload.page).pipe(
+          mergeMap((relationship: Relationship) =>
+            // check for each relationship whether it's the left item
+            this.relationshipService.isLeftItem(relationship, this.item).pipe(
+              // emit an array containing both the relationship and whether it's the left item,
+              // as we'll need both
+              map((isLeftItem: boolean) => [relationship, isLeftItem])
+            )
+          ),
+          map(([relationship, isLeftItem]: [Relationship, boolean]) => {
+            // turn it into a RelationshipIdentifiable, an
+            const nameVariant =
+              isLeftItem ? relationship.rightwardValue : relationship.leftwardValue;
             return {
               uuid: relationship.id,
               type: this.relationshipType,
               relationship,
               nameVariant,
             } as RelationshipIdentifiable;
-          })),
-        )),
-      switchMap((initialFields) => this.objectUpdatesService.getFieldUpdates(this.url, initialFields).pipe(
-        map((fieldUpdates) => {
-          const fieldUpdatesFiltered: FieldUpdates = {};
-          Object.keys(fieldUpdates).forEach((uuid) => {
-            if (hasValue(fieldUpdates[uuid])) {
-              const field = fieldUpdates[uuid].field;
-              if ((field as RelationshipIdentifiable).type.id === this.relationshipType.id) {
-                fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
-              }
-            }
-          });
-          return fieldUpdatesFiltered;
-        }),
+          }),
+          // wait until all relationships have been processed, and emit them all as a single array
+          toArray(),
+          // if the pipe above completes without emitting anything, emit an empty array instead
+          defaultIfEmpty([])
       )),
+      switchMap((nextFields: RelationshipIdentifiable[]) => {
+        // Get a list that contains the unsaved changes for the page, as well as the page of
+        // RelationshipIdentifiables, as a single list of FieldUpdates
+        return this.objectUpdatesService.getFieldUpdates(this.url, nextFields).pipe(
+          map((fieldUpdates: FieldUpdates) => {
+            const fieldUpdatesFiltered: FieldUpdates = {};
+            this.nbAddedFields$.next(0);
+            // iterate over the fieldupdates and filter out the ones that pertain to this
+            // relationshiptype
+            Object.keys(fieldUpdates).forEach((uuid) => {
+              if (hasValue(fieldUpdates[uuid])) {
+                const field = fieldUpdates[uuid].field as RelationshipIdentifiable;
+                // only include fieldupdates regarding this RelationshipType
+                if (field.type.id === this.relationshipType.id) {
+                  // if it's a newly added relationship
+                  if (fieldUpdates[uuid].changeType === FieldChangeType.ADD) {
+                    // increase the counter that tracks new relationships
+                    this.nbAddedFields$.next(this.nbAddedFields$.getValue() + 1);
+                    if (this.isLastPage$.getValue() === true) {
+                      // only include newly added relationships to the output if we're on the last
+                      // page
+                      fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
+                    }
+                  } else {
+                    // include all others
+                    fieldUpdatesFiltered[uuid] = fieldUpdates[uuid];
+                  }
+                }
+              }
+            });
+            return fieldUpdatesFiltered;
+          }),
+        );
+      }),
       startWith({}),
-    );
+    ).subscribe((updates: FieldUpdates) => {
+      this.loading$.next(false);
+      this.updates$.next(updates);
+    }));
   }
 
-  private getItemRelationships() {
-    this.linkService.resolveLink(this.item,
-      followLink('relationships', undefined, true, true, true,
-        followLink('relationshipType'),
-        followLink('leftItem'),
-        followLink('rightItem'),
-      ));
-    return this.item.relationships.pipe(
-      getAllSucceededRemoteData(),
-      map((relationships: RemoteData<PaginatedList<Relationship>>) => relationships.payload.page.filter((relationship: Relationship) => hasValue(relationship))),
-      switchMap((itemRelationships: Relationship[]) =>
-        observableCombineLatest(
-          itemRelationships
-            .map((relationship) => relationship.relationshipType.pipe(
-              getFirstSucceededRemoteData(),
-              getRemoteDataPayload(),
-            ))
-        ).pipe(
-          defaultIfEmpty([]),
-          map((relationshipTypes) => itemRelationships.filter(
-            (relationship, index) => relationshipTypes[index].id === this.relationshipType.id)
-          ),
-        )
-      ),
-    );
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
   }
 }
diff --git a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 1c5ed3c02b..e22ad8ddcb 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -227,7 +227,6 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
    * Sends all initial values of this item to the object updates service
    */
   public initializeOriginalFields() {
-    console.log('init');
     return this.relationshipService.getRelatedItems(this.item).pipe(
       take(1),
     ).subscribe((items: Item[]) => {

From a617e04290bc13a9aafad75bd580e7251bdfdc91 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 22 Jun 2021 09:03:53 +0200
Subject: [PATCH 097/169] 80154: Change badge-light to badge-info

---
 .../mydspace-item-submitter/item-submitter.component.html       | 2 +-
 src/app/shared/object-list/type-badge/type-badge.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
index 47674025ca..1e8524e5ec 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
@@ -1,3 +1,3 @@
 <div class="mt-2 mb-2">
-  <span class="text-muted">{{'submission.workflow.tasks.generic.submitter' | translate}} : <span class="badge badge-light">{{(submitter$ | async)?.name}}</span></span>
+  <span class="text-muted">{{'submission.workflow.tasks.generic.submitter' | translate}} : <span class="badge badge-info">{{(submitter$ | async)?.name}}</span></span>
 </div>
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.html b/src/app/shared/object-list/type-badge/type-badge.component.html
index 18aeeb4bca..0c2bd7544e 100644
--- a/src/app/shared/object-list/type-badge/type-badge.component.html
+++ b/src/app/shared/object-list/type-badge/type-badge.component.html
@@ -1,3 +1,3 @@
 <div *ngIf="typeMessage">
-  <span class="badge badge-light">{{ typeMessage | translate }}</span>
+  <span class="badge badge-info">{{ typeMessage | translate }}</span>
 </div>

From 45ad6b6f0b0cb452310858cf19f033d7d8cdc4be Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 22 Jun 2021 16:06:49 +0200
Subject: [PATCH 098/169] 80233: Use correct relationship direction

---
 .../edit-relationship-list.component.ts       | 84 +++++++++++++------
 1 file changed, 59 insertions(+), 25 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 53dc3082f5..8d7ffddd53 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -79,6 +79,17 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
    */
   @Input() relationshipType: RelationshipType;
 
+  /**
+   * Observable that emits the left and right item type of {@link relationshipType} simultaneously.
+   */
+  private relationshipLeftAndRightType$: Observable<[ItemType, ItemType]>;
+
+  /**
+   * Observable that emits true if {@link itemType} is on the left-hand side of {@link relationshipType},
+   * false if it is on the right-hand side and undefined in the rare case that it is on neither side.
+   */
+  private currentItemIsLeftItem$: Observable<boolean>;
+
   private relatedEntityType$: Observable<ItemType>;
 
   /**
@@ -326,18 +337,19 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
+    // store the left and right type of the relationship in a single observable
+    this.relationshipLeftAndRightType$ = observableCombineLatest([
+      this.relationshipType.leftType,
+      this.relationshipType.rightType,
+    ].map((type) => type.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ))) as Observable<[ItemType, ItemType]>;
 
-    this.relatedEntityType$ =
-      observableCombineLatest([
-        this.relationshipType.leftType,
-        this.relationshipType.rightType,
-      ].map((type) => type.pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-      ))).pipe(
-        map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
-        hasValueOperator()
-      );
+    this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe(
+      map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
+      hasValueOperator()
+    );
 
     this.relatedEntityType$.pipe(
       take(1)
@@ -345,47 +357,69 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
     );
 
+    this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe(
+      map(([leftType, rightType]: [ItemType, ItemType]) => {
+        if (leftType.id === this.itemType.id) {
+          return true;
+        }
+
+        if (rightType.id === this.itemType.id) {
+          return false;
+        }
+
+        // should never happen...
+        return undefined;
+      })
+    );
+
     // initialize the pagination options
     this.paginationConfig = new PaginationComponentOptions();
     this.paginationConfig.id = `er${this.relationshipType.id}`;
     this.paginationConfig.pageSize = 5;
     this.paginationConfig.currentPage = 1;
 
+    // get the pagination params from the route
+    const currentPagination$ = this.paginationService.getCurrentPagination(
+      this.paginationConfig.id,
+      this.paginationConfig
+    ).pipe(
+      tap(() => this.loading$.next(true))
+    );
+
     this.subs.push(
-      // get the pagination params from the route
-      this.paginationService.getCurrentPagination(
-        this.paginationConfig.id,
-        this.paginationConfig
-      ).pipe(
-        tap(() => {
-          this.loading$.next(true);
-        }),
-        switchMap((currentPagination: PaginationComponentOptions) =>
+      observableCombineLatest([
+        currentPagination$,
+        this.currentItemIsLeftItem$,
+      ]).pipe(
+        switchMap(([currentPagination, currentItemIsLeftItem]: [PaginationComponentOptions, boolean]) =>
           // get the relationships for the current item, relationshiptype and page
           this.relationshipService.getItemRelationshipsByLabel(
             this.item,
-            this.relationshipType.rightwardType,
+            currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
-              currentPage: currentPagination.currentPage
+              currentPage: currentPagination.currentPage,
             },
             false,
             true,
             followLink('leftItem'),
-            followLink('rightItem')
-          ))
+            followLink('rightItem'),
+          )),
       ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
         this.relationshipsRd$.next(rd);
-      }));
+      })
+    );
 
     // keep isLastPage$ up to date based on relationshipsRd$
     this.subs.push(this.relationshipsRd$.pipe(
+      hasValueOperator(),
       getAllSucceededRemoteData()
     ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
       this.isLastPage$.next(hasNoValue(rd.payload._links.next));
     }));
 
     this.subs.push(this.relationshipsRd$.pipe(
+      hasValueOperator(),
       getAllSucceededRemoteData(),
       switchMap((rd: RemoteData<PaginatedList<Relationship>>) =>
         // emit each relationship in the page separately

From c5689df73d4b688d435dccb6106049d90cb8b579 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 22 Jun 2021 16:08:02 +0200
Subject: [PATCH 099/169] 80233: Add required providers to test

---
 .../edit-relationship-list.component.spec.ts         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index 90fad00a45..c7aef464b2 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -16,6 +16,10 @@ import { SharedModule } from '../../../../shared/shared.module';
 import { EditRelationshipListComponent } from './edit-relationship-list.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { HostWindowService } from '../../../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
@@ -25,6 +29,8 @@ let linkService;
 let objectUpdatesService;
 let relationshipService;
 let selectableListService;
+let paginationService;
+let hostWindowService;
 
 const url = 'http://test-url.com/test-url';
 
@@ -141,6 +147,10 @@ describe('EditRelationshipListComponent', () => {
       resolveLinks: () => null,
     };
 
+    paginationService = new PaginationServiceStub();
+
+    hostWindowService = new HostWindowServiceStub(1200);
+
     TestBed.configureTestingModule({
       imports: [SharedModule, TranslateModule.forRoot()],
       declarations: [EditRelationshipListComponent],
@@ -149,6 +159,8 @@ describe('EditRelationshipListComponent', () => {
         { provide: RelationshipService, useValue: relationshipService },
         { provide: SelectableListService, useValue: selectableListService },
         { provide: LinkService, useValue: linkService },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: HostWindowService, useValue: hostWindowService },
       ], schemas: [
         NO_ERRORS_SCHEMA
       ]

From 627b271d3b2977f437471be0cbbd7add2fd44742 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Tue, 22 Jun 2021 18:53:28 +0200
Subject: [PATCH 100/169] 80233: Write tests for pagination

---
 .../edit-relationship-list.component.spec.ts  | 113 ++++++++++++++++--
 1 file changed, 101 insertions(+), 12 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index c7aef464b2..6742234058 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -20,6 +20,8 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
 import { HostWindowService } from '../../../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
@@ -43,9 +45,21 @@ let fieldUpdate1;
 let fieldUpdate2;
 let relationships;
 let relationshipType;
+let paginationOptions;
 
 describe('EditRelationshipListComponent', () => {
 
+  const resetComponent = () => {
+    fixture = TestBed.createComponent(EditRelationshipListComponent);
+    comp = fixture.componentInstance;
+    de = fixture.debugElement;
+    comp.item = item;
+    comp.itemType = entityType;
+    comp.url = url;
+    comp.relationshipType = relationshipType;
+    fixture.detectChanges();
+  };
+
   beforeEach(waitForAsync(() => {
 
     entityType = Object.assign(new ItemType(), {
@@ -69,6 +83,12 @@ describe('EditRelationshipListComponent', () => {
       rightwardType: 'isPublicationOfAuthor',
     });
 
+    paginationOptions = Object.assign(new PaginationComponentOptions(), {
+      id: `er${relationshipType.id}`,
+      pageSize: 5,
+      currentPage: 1,
+    });
+
     author1 = Object.assign(new Item(), {
       id: 'author1',
       uuid: 'author1'
@@ -147,7 +167,7 @@ describe('EditRelationshipListComponent', () => {
       resolveLinks: () => null,
     };
 
-    paginationService = new PaginationServiceStub();
+    paginationService = new PaginationServiceStub(paginationOptions);
 
     hostWindowService = new HostWindowServiceStub(1200);
 
@@ -165,18 +185,9 @@ describe('EditRelationshipListComponent', () => {
         NO_ERRORS_SCHEMA
       ]
     }).compileComponents();
-  }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditRelationshipListComponent);
-    comp = fixture.componentInstance;
-    de = fixture.debugElement;
-    comp.item = item;
-    comp.itemType = entityType;
-    comp.url = url;
-    comp.relationshipType = relationshipType;
-    fixture.detectChanges();
-  });
+    resetComponent();
+  }));
 
   describe('changeType is REMOVE', () => {
     beforeEach(() => {
@@ -188,4 +199,82 @@ describe('EditRelationshipListComponent', () => {
       expect(element.classList).toContain('alert-danger');
     });
   });
+
+  describe('pagination component', () => {
+    let paginationComp: PaginationComponent;
+
+    beforeEach(() => {
+      paginationComp = de.query(By.css('ds-pagination')).componentInstance;
+    });
+
+    it('should receive the correct pagination config', () => {
+      expect(paginationComp.paginationOptions).toEqual(paginationOptions);
+    });
+
+    it('should receive correct collection size', () => {
+      expect(paginationComp.collectionSize).toEqual(relationships.length);
+    });
+
+  });
+
+  describe('relationshipService.getItemRelationshipsByLabel', () => {
+    it('should receive the correct pagination info', () => {
+      expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+      const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+      const findListOptions = callArgs[2];
+
+      expect(findListOptions.elementsPerPage).toEqual(paginationOptions.pageSize);
+      expect(findListOptions.currentPage).toEqual(paginationOptions.currentPage);
+    });
+
+    describe('when the publication is on the left side of the relationship', () => {
+      beforeEach(() => {
+        relationshipType = Object.assign(new RelationshipType(), {
+          id: '1',
+          uuid: '1',
+          leftType: createSuccessfulRemoteDataObject$(entityType), // publication
+          rightType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
+          leftwardType: 'isAuthorOfPublication',
+          rightwardType: 'isPublicationOfAuthor',
+        });
+        relationshipService.getItemRelationshipsByLabel.calls.reset();
+        resetComponent();
+      });
+
+      it('should fetch isAuthorOfPublication', () => {
+        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+        const label = callArgs[1];
+
+        expect(label).toEqual('isAuthorOfPublication');
+      });
+    });
+
+    describe('when the publication is on the right side of the relationship', () => {
+      beforeEach(() => {
+        relationshipType = Object.assign(new RelationshipType(), {
+          id: '1',
+          uuid: '1',
+          leftType: createSuccessfulRemoteDataObject$(relatedEntityType), // author
+          rightType: createSuccessfulRemoteDataObject$(entityType), // publication
+          leftwardType: 'isPublicationOfAuthor',
+          rightwardType: 'isAuthorOfPublication',
+        });
+        relationshipService.getItemRelationshipsByLabel.calls.reset();
+        resetComponent();
+      });
+
+      it('should fetch isAuthorOfPublication', () => {
+        expect(relationshipService.getItemRelationshipsByLabel).toHaveBeenCalledTimes(1);
+
+        const callArgs = relationshipService.getItemRelationshipsByLabel.calls.mostRecent().args;
+        const label = callArgs[1];
+
+        expect(label).toEqual('isAuthorOfPublication');
+      });
+    });
+  });
+
 });

From 720126647c613bd4542ceaa5d5ae4fb75a39e9d8 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 22 Jun 2021 14:42:57 -0500
Subject: [PATCH 101/169] Add missing i18n key

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5bd08dfbc8..e398bbe3fc 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3136,6 +3136,8 @@
   "submission.import-external.source.loading": "Loading ...",
 
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
 
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
 

From 73a9fe16c5504a0a8b59aef46d80a3164c9aabdf Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 6 Oct 2020 17:09:04 +0200
Subject: [PATCH 102/169] [CSTPER-144] Fixed issue with authorization request
 encountered while logging-in with external idp

---
 src/app/core/auth/auth.actions.ts           |  25 +++--
 src/app/core/auth/auth.effects.spec.ts      | 109 ++++++++++++++++----
 src/app/core/auth/auth.effects.ts           |   8 +-
 src/app/core/auth/auth.reducer.spec.ts      |  53 +++++++++-
 src/app/core/auth/auth.reducer.ts           |   7 +-
 src/app/core/auth/auth.service.ts           |  10 ++
 src/app/core/auth/server-auth.service.ts    |  10 ++
 src/app/shared/testing/auth-service.stub.ts |   9 ++
 8 files changed, 195 insertions(+), 36 deletions(-)

diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index f80be89034..e2cef3562f 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -292,10 +292,13 @@ export class ResetAuthenticationMessagesAction implements Action {
 export class RetrieveAuthMethodsAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_AUTH_METHODS;
 
-  payload: AuthStatus;
+  payload: {
+    status: AuthStatus;
+    blocking: boolean;
+  };
 
-  constructor(authStatus: AuthStatus) {
-    this.payload = authStatus;
+  constructor(status: AuthStatus, blocking: boolean) {
+    this.payload = { status, blocking };
   }
 }
 
@@ -306,10 +309,14 @@ export class RetrieveAuthMethodsAction implements Action {
  */
 export class RetrieveAuthMethodsSuccessAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_AUTH_METHODS_SUCCESS;
-  payload: AuthMethod[];
 
-  constructor(authMethods: AuthMethod[] ) {
-    this.payload = authMethods;
+  payload: {
+    authMethods: AuthMethod[];
+    blocking: boolean;
+  };
+
+  constructor(authMethods: AuthMethod[], blocking: boolean ) {
+    this.payload = { authMethods, blocking };
   }
 }
 
@@ -320,6 +327,12 @@ export class RetrieveAuthMethodsSuccessAction implements Action {
  */
 export class RetrieveAuthMethodsErrorAction implements Action {
   public type: string = AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR;
+
+  payload: boolean;
+
+  constructor(blocking: boolean) {
+    this.payload = blocking;
+  }
 }
 
 /**
diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index 5d530f39a9..cd4f456b44 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -43,10 +43,12 @@ describe('AuthEffects', () => {
   let initialState;
   let token;
   let store: MockStore<AppState>;
+  let authStatus;
 
   function init() {
     authServiceStub = new AuthServiceStub();
     token = authServiceStub.getToken();
+    authStatus = Object.assign(new AuthStatus(), {});
     initialState = {
       core: {
         auth: {
@@ -217,16 +219,38 @@ describe('AuthEffects', () => {
         expect(authEffects.checkTokenCookie$).toBeObservable(expected);
       });
 
-      it('should return a RETRIEVE_AUTH_METHODS action in response to a CHECK_AUTHENTICATION_TOKEN_COOKIE action when authenticated is false', () => {
-        spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
-          observableOf(
-            { authenticated: false })
-        );
-        actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
+      describe('on CSR', () => {
+        it('should return a RETRIEVE_AUTH_METHODS action in response to a CHECK_AUTHENTICATION_TOKEN_COOKIE action when authenticated is false', () => {
+          spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
+            observableOf(
+              { authenticated: false })
+          );
+          spyOn((authEffects as any).authService, 'getRetrieveAuthMethodsAction').and.returnValue(
+            new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, false)
+          );
+          actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
 
-        const expected = cold('--b-', { b: new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus) });
+          const expected = cold('--b-', { b: new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, false) });
 
-        expect(authEffects.checkTokenCookie$).toBeObservable(expected);
+          expect(authEffects.checkTokenCookie$).toBeObservable(expected);
+        });
+      });
+
+      describe('on SSR', () => {
+        it('should return a RETRIEVE_AUTH_METHODS action in response to a CHECK_AUTHENTICATION_TOKEN_COOKIE action when authenticated is false', () => {
+          spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
+            observableOf(
+              { authenticated: false })
+          );
+          spyOn((authEffects as any).authService, 'getRetrieveAuthMethodsAction').and.returnValue(
+            new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, true)
+          );
+          actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
+
+          const expected = cold('--b-', { b: new RetrieveAuthMethodsAction({ authenticated: false } as AuthStatus, true) });
+
+          expect(authEffects.checkTokenCookie$).toBeObservable(expected);
+        });
       });
     });
 
@@ -359,27 +383,74 @@ describe('AuthEffects', () => {
 
   describe('retrieveMethods$', () => {
 
-    describe('when retrieve authentication methods succeeded', () => {
-      it('should return a RETRIEVE_AUTH_METHODS_SUCCESS action in response to a RETRIEVE_AUTH_METHODS action', () => {
-        actions = hot('--a-', { a: { type: AuthActionTypes.RETRIEVE_AUTH_METHODS } });
+    describe('on CSR', () => {
+      describe('when retrieve authentication methods succeeded', () => {
+        it('should return a RETRIEVE_AUTH_METHODS_SUCCESS action in response to a RETRIEVE_AUTH_METHODS action', () => {
+          actions = hot('--a-', { a:
+            {
+              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
+              payload: { status: authStatus, blocking: false}
+            }
+          });
 
-        const expected = cold('--b-', { b: new RetrieveAuthMethodsSuccessAction(authMethodsMock) });
+          const expected = cold('--b-', { b: new RetrieveAuthMethodsSuccessAction(authMethodsMock, false) });
 
-        expect(authEffects.retrieveMethods$).toBeObservable(expected);
+          expect(authEffects.retrieveMethods$).toBeObservable(expected);
+        });
+      });
+
+      describe('when retrieve authentication methods failed', () => {
+        it('should return a RETRIEVE_AUTH_METHODS_ERROR action in response to a RETRIEVE_AUTH_METHODS action', () => {
+          spyOn((authEffects as any).authService, 'retrieveAuthMethodsFromAuthStatus').and.returnValue(observableThrow(''));
+
+          actions = hot('--a-', { a:
+            {
+              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
+              payload: { status: authStatus, blocking: false}
+            }
+          });
+
+          const expected = cold('--b-', { b: new RetrieveAuthMethodsErrorAction(false) });
+
+          expect(authEffects.retrieveMethods$).toBeObservable(expected);
+        });
       });
     });
 
-    describe('when retrieve authentication methods failed', () => {
-      it('should return a RETRIEVE_AUTH_METHODS_ERROR action in response to a RETRIEVE_AUTH_METHODS action', () => {
-        spyOn((authEffects as any).authService, 'retrieveAuthMethodsFromAuthStatus').and.returnValue(observableThrow(''));
+    describe('on SSR', () => {
+      describe('when retrieve authentication methods succeeded', () => {
+        it('should return a RETRIEVE_AUTH_METHODS_SUCCESS action in response to a RETRIEVE_AUTH_METHODS action', () => {
+          actions = hot('--a-', { a:
+            {
+              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
+              payload: { status: authStatus, blocking: true}
+            }
+          });
 
-        actions = hot('--a-', { a: { type: AuthActionTypes.RETRIEVE_AUTH_METHODS } });
+          const expected = cold('--b-', { b: new RetrieveAuthMethodsSuccessAction(authMethodsMock, true) });
 
-        const expected = cold('--b-', { b: new RetrieveAuthMethodsErrorAction() });
+          expect(authEffects.retrieveMethods$).toBeObservable(expected);
+        });
+      });
 
-        expect(authEffects.retrieveMethods$).toBeObservable(expected);
+      describe('when retrieve authentication methods failed', () => {
+        it('should return a RETRIEVE_AUTH_METHODS_ERROR action in response to a RETRIEVE_AUTH_METHODS action', () => {
+          spyOn((authEffects as any).authService, 'retrieveAuthMethodsFromAuthStatus').and.returnValue(observableThrow(''));
+
+          actions = hot('--a-', { a:
+            {
+              type: AuthActionTypes.RETRIEVE_AUTH_METHODS,
+              payload: { status: authStatus, blocking: true}
+            }
+          });
+
+          const expected = cold('--b-', { b: new RetrieveAuthMethodsErrorAction(true) });
+
+          expect(authEffects.retrieveMethods$).toBeObservable(expected);
+        });
       });
     });
+
   });
 
   describe('clearInvalidTokenOnRehydrate$', () => {
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 9452af1fb8..2ef90dd76c 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -145,7 +145,7 @@ export class AuthEffects {
           if (response.authenticated) {
             return new RetrieveTokenAction();
           } else {
-            return new RetrieveAuthMethodsAction(response);
+            return this.authService.getRetrieveAuthMethodsAction(response);
           }
         }),
         catchError((error) => observableOf(new AuthenticatedErrorAction(error)))
@@ -234,10 +234,10 @@ export class AuthEffects {
     .pipe(
       ofType(AuthActionTypes.RETRIEVE_AUTH_METHODS),
       switchMap((action: RetrieveAuthMethodsAction) => {
-        return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload)
+        return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload.status)
           .pipe(
-            map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)),
-            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
+            map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels, action.payload.blocking)),
+            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction(action.payload.blocking)))
           );
       })
     );
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index 4c6f1e2a25..914a1a152d 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -512,7 +512,7 @@ describe('authReducer', () => {
       loading: false,
       authMethods: []
     };
-    const action = new RetrieveAuthMethodsAction(new AuthStatus());
+    const action = new RetrieveAuthMethodsAction(new AuthStatus(), true);
     const newState = authReducer(initialState, action);
     state = {
       authenticated: false,
@@ -536,7 +536,7 @@ describe('authReducer', () => {
       new AuthMethod(AuthMethodType.Password),
       new AuthMethod(AuthMethodType.Shibboleth, 'location')
     ];
-    const action = new RetrieveAuthMethodsSuccessAction(authMethods);
+    const action = new RetrieveAuthMethodsSuccessAction(authMethods, false);
     const newState = authReducer(initialState, action);
     state = {
       authenticated: false,
@@ -548,7 +548,31 @@ describe('authReducer', () => {
     expect(newState).toEqual(state);
   });
 
-  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_ERROR action', () => {
+  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_SUCCESS action with blocking as true', () => {
+    initialState = {
+      authenticated: false,
+      loaded: false,
+      blocking: true,
+      loading: true,
+      authMethods: []
+    };
+    const authMethods = [
+      new AuthMethod(AuthMethodType.Password),
+      new AuthMethod(AuthMethodType.Shibboleth, 'location')
+    ];
+    const action = new RetrieveAuthMethodsSuccessAction(authMethods, true);
+    const newState = authReducer(initialState, action);
+    state = {
+      authenticated: false,
+      loaded: false,
+      blocking: true,
+      loading: false,
+      authMethods: authMethods
+    };
+    expect(newState).toEqual(state);
+  });
+
+  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_ERROR action ', () => {
     initialState = {
       authenticated: false,
       loaded: false,
@@ -557,7 +581,7 @@ describe('authReducer', () => {
       authMethods: []
     };
 
-    const action = new RetrieveAuthMethodsErrorAction();
+    const action = new RetrieveAuthMethodsErrorAction(false);
     const newState = authReducer(initialState, action);
     state = {
       authenticated: false,
@@ -568,4 +592,25 @@ describe('authReducer', () => {
     };
     expect(newState).toEqual(state);
   });
+
+  it('should properly set the state, in response to a RETRIEVE_AUTH_METHODS_ERROR action with blocking as true', () => {
+    initialState = {
+      authenticated: false,
+      loaded: false,
+      blocking: true,
+      loading: true,
+      authMethods: []
+    };
+
+    const action = new RetrieveAuthMethodsErrorAction(true);
+    const newState = authReducer(initialState, action);
+    state = {
+      authenticated: false,
+      loaded: false,
+      blocking: true,
+      loading: false,
+      authMethods: [new AuthMethod(AuthMethodType.Password)]
+    };
+    expect(newState).toEqual(state);
+  });
 });
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index 6d5635f263..dfe29a3ef2 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -10,6 +10,7 @@ import {
   RedirectWhenTokenExpiredAction,
   RefreshTokenSuccessAction,
   RetrieveAuthenticatedEpersonSuccessAction,
+  RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
   SetRedirectUrlAction
 } from './auth.actions';
@@ -211,14 +212,14 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_SUCCESS:
       return Object.assign({}, state, {
         loading: false,
-        blocking: false,
-        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload
+        blocking: (action as RetrieveAuthMethodsSuccessAction).payload.blocking,
+        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload.authMethods
       });
 
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR:
       return Object.assign({}, state, {
         loading: false,
-        blocking: false,
+        blocking: (action as RetrieveAuthMethodsErrorAction).payload,
         authMethods: [new AuthMethod(AuthMethodType.Password)]
       });
 
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index fa29f1bc36..ed4fca615c 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -35,6 +35,7 @@ import { AppState } from '../../app.reducer';
 import {
   CheckAuthenticationTokenAction,
   ResetAuthenticationMessagesAction,
+  RetrieveAuthMethodsAction,
   SetRedirectUrlAction
 } from './auth.actions';
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
@@ -518,4 +519,13 @@ export class AuthService {
     );
   }
 
+  /**
+   * Return a new instance of RetrieveAuthMethodsAction
+   *
+   * @param authStatus The auth status
+   */
+  getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction {
+    return new RetrieveAuthMethodsAction(authStatus, false);
+  }
+
 }
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index 9840b22267..cccc1490f8 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -10,6 +10,7 @@ import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { RemoteData } from '../data/remote-data';
+import { RetrieveAuthMethodsAction } from './auth.actions';
 
 /**
  * The auth service.
@@ -60,4 +61,13 @@ export class ServerAuthService extends AuthService {
       map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
     );
   }
+
+  /**
+   * Return a new instance of RetrieveAuthMethodsAction
+   *
+   * @param authStatus The auth status
+   */
+  getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction {
+    return new RetrieveAuthMethodsAction(authStatus, true);
+  }
 }
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index 3fa09b2b7e..9a7622b7b8 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -6,6 +6,7 @@ import { EPerson } from '../../core/eperson/models/eperson.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { AuthMethod } from '../../core/auth/models/auth.method';
 import { hasValue } from '../empty.util';
+import { RetrieveAuthMethodsAction } from '../../core/auth/auth.actions';
 
 export const authMethodsMock = [
   new AuthMethod('password'),
@@ -166,4 +167,12 @@ export class AuthServiceStub {
   clearRedirectUrl() {
     return;
   }
+
+  public replaceToken(token: AuthTokenInfo) {
+    return token;
+  }
+
+  getRetrieveAuthMethodsAction(authStatus: AuthStatus): RetrieveAuthMethodsAction {
+    return;
+  }
 }

From b2c002057e720aef2f37026a13e3a5768779f2ec Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 11:05:14 +0200
Subject: [PATCH 103/169] 80195: Replace input suggestions with collection
 selector

---
 .../item-move/item-move.component.html        | 23 ++++++++-----------
 .../item-move/item-move.component.ts          | 20 +++-------------
 2 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.html b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
index 74ca9aae4e..f2a420204f 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
@@ -5,19 +5,16 @@
             <p>{{'item.edit.move.description' | translate}}</p>
             <div class="row">
                 <div class="col-12">
-                    <ds-dso-input-suggestions #f id="search-form"
-                                          [suggestions]="(collectionSearchResults | async)"
-                                          [placeholder]="'item.edit.move.search.placeholder'| translate"
-                                          [action]="getCurrentUrl()"
-                                          [name]="'item-move'"
-                                          [(ngModel)]="selectedCollectionName"
-                                          (clickSuggestion)="onClick($event)"
-                                          (typeSuggestion)="resetCollection($event)"
-                                          (findSuggestions)="findSuggestions($event)"
-                                          (click)="f.open()"
-                                          ngDefaultControl>
-                    </ds-dso-input-suggestions>
-
+                  <div class="card mb-3">
+                    <div class="card-header">{{'dso-selector.placeholder' | translate: { type: 'collection' } }}</div>
+                    <div class="card-body">
+                      <ds-authorized-collection-selector [types]="COLLECTIONS"
+                                                         [currentDSOId]="selectedCollection?.id"
+                                                         (onSelect)="selectDso($event)">
+                      </ds-authorized-collection-selector>
+                    </div>
+                    <div></div>
+                  </div>
                 </div>
             </div>
             <div class="row">
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index b1ed121b40..2e2d94b80d 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -53,6 +53,8 @@ export class ItemMoveComponent implements OnInit {
    */
   itemPageRoute$: Observable<string>;
 
+  COLLECTIONS = [DSpaceObjectType.COLLECTION];
+
   constructor(private route: ActivatedRoute,
               private router: Router,
               private notificationsService: NotificationsService,
@@ -75,14 +77,6 @@ export class ItemMoveComponent implements OnInit {
     this.loadSuggestions('');
   }
 
-  /**
-   * Find suggestions based on entered query
-   * @param query - Search query
-   */
-  findSuggestions(query): void {
-    this.loadSuggestions(query);
-  }
-
   /**
    * Load all available collections to move the item to.
    *  TODO: When the API support it, only fetch collections where user has ADD rights to.
@@ -107,7 +101,7 @@ export class ItemMoveComponent implements OnInit {
    * Set the collection name and id based on the selected value
    * @param data - obtained from the ds-input-suggestions component
    */
-  onClick(data: any): void {
+  selectDso(data: any): void {
     this.selectedCollection = data;
     this.selectedCollectionName = data.name;
     this.canSubmit = true;
@@ -137,12 +131,4 @@ export class ItemMoveComponent implements OnInit {
       }
     );
   }
-
-  /**
-   * Resets the can submit when the user changes the content of the input field
-   * @param data
-   */
-  resetCollection(data: any) {
-    this.canSubmit = false;
-  }
 }

From 1407ea85d72f7adab191c66c38b30b81ebe574fc Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 11:29:11 +0200
Subject: [PATCH 104/169] 80195: Fix move request handling

---
 .../item-move/item-move.component.ts          | 40 +++----------------
 src/app/core/data/item-data.service.ts        | 26 +++++++-----
 2 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index 2e2d94b80d..c80b0f7477 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,24 +1,18 @@
 import { Component, OnInit } from '@angular/core';
-import { first, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { RemoteData } from '../../../core/data/remote-data';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData, getAllSucceededRemoteDataPayload
+  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData,
 } from '../../../core/shared/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Observable, of as observableOf } from 'rxjs';
 import { Collection } from '../../../core/shared/collection.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
-import { SearchResult } from '../../../shared/search/search-result.model';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
@@ -46,8 +40,6 @@ export class ItemMoveComponent implements OnInit {
   item: Item;
   processing = false;
 
-  pagination = new PaginationComponentOptions();
-
   /**
    * Route to the item's page
    */
@@ -73,28 +65,6 @@ export class ItemMoveComponent implements OnInit {
         this.item = rd.payload;
       }
     );
-    this.pagination.pageSize = 5;
-    this.loadSuggestions('');
-  }
-
-  /**
-   * Load all available collections to move the item to.
-   *  TODO: When the API support it, only fetch collections where user has ADD rights to.
-   */
-  loadSuggestions(query): void {
-    this.collectionSearchResults = this.searchService.search(new PaginatedSearchOptions({
-      pagination: this.pagination,
-      dsoTypes: [DSpaceObjectType.COLLECTION],
-      query: query
-    })).pipe(
-      first(),
-      map((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => {
-        return rd.payload.page.map((searchResult) => {
-          return searchResult.indexableObject;
-        });
-      }) ,
-    );
-
   }
 
   /**
@@ -119,8 +89,10 @@ export class ItemMoveComponent implements OnInit {
    */
   moveCollection() {
     this.processing = true;
-    this.itemDataService.moveToCollection(this.item.id, this.selectedCollection).pipe(getFirstCompletedRemoteData()).subscribe(
-      (response: RemoteData<Collection>) => {
+    this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
+                        .pipe(getFirstCompletedRemoteData())
+                        .subscribe(
+      (response: RemoteData<any>) => {
         this.router.navigate([getItemEditRoute(this.item)]);
         if (response.hasSucceeded) {
           this.notificationsService.success(this.translateService.get('item.edit.move.success'));
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index e56f9f2b0c..7a0116fe86 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -23,14 +23,7 @@ import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import {
-  DeleteRequest,
-  FindListOptions,
-  GetRequest,
-  PostRequest,
-  PutRequest,
-  RestRequest
-} from './request.models';
+import { DeleteRequest, FindListOptions, GetRequest, PostRequest, PutRequest, RestRequest } from './request.models';
 import { RequestService } from './request.service';
 import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 import { Bundle } from '../shared/bundle.model';
@@ -38,6 +31,9 @@ import { MetadataMap } from '../shared/metadata.models';
 import { BundleDataService } from './bundle-data.service';
 import { Operation } from 'fast-json-patch';
 import { NoContent } from '../shared/NoContent.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { ResponseParsingService } from './parsing.service';
+import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
 
 @Injectable()
 @dataService(ITEM)
@@ -229,7 +225,7 @@ export class ItemDataService extends DataService<Item> {
    * @param itemId
    * @param collection
    */
-  public moveToCollection(itemId: string, collection: Collection): Observable<RemoteData<Collection>> {
+  public moveToCollection(itemId: string, collection: Collection): Observable<RemoteData<any>> {
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
@@ -242,9 +238,17 @@ export class ItemDataService extends DataService<Item> {
       find((href: string) => hasValue(href)),
       map((href: string) => {
         const request = new PutRequest(requestId, href, collection._links.self.href, options);
-        this.requestService.send(request);
+        Object.assign(request, {
+          // TODO: for now, the move Item endpoint returns a malformed collection -- only look at the status code
+          getResponseParser(): GenericConstructor<ResponseParsingService> {
+            return StatusCodeOnlyResponseParsingService;
+          }
+        });
+        return request;
       })
-    ).subscribe();
+    ).subscribe((request) => {
+      this.requestService.send(request);
+    });
 
     return this.rdbService.buildFromRequestUUID(requestId);
   }

From 0ac9d581948c808d0408f6fd0083ec5327412075 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 11:33:25 +0200
Subject: [PATCH 105/169] 80195: Update ItemMoveComponent unit tests

---
 .../item-move/item-move.component.spec.ts          | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index dd91c65e1e..b3178793e3 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -98,24 +98,14 @@ describe('ItemMoveComponent', () => {
       comp = fixture.componentInstance;
       fixture.detectChanges();
     });
-    it('should load suggestions', () => {
-      const expected = [
-        collection1,
-        collection2
-      ];
 
-      comp.collectionSearchResults.subscribe((value) => {
-          expect(value).toEqual(expected);
-        }
-      );
-    });
     it('should get current url ', () => {
       expect(comp.getCurrentUrl()).toEqual('fake-url/fake-id/edit');
     });
-    it('should on click select the correct collection name and id', () => {
+    it('should select the correct collection name and id on click', () => {
       const data = collection1;
 
-      comp.onClick(data);
+      comp.selectDso(data);
 
       expect(comp.selectedCollectionName).toEqual('Test collection 1');
       expect(comp.selectedCollection).toEqual(collection1);

From 421c37f01056d3b902ab6264ee23d4cbbf7f6be0 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 23 Jun 2021 11:46:32 +0200
Subject: [PATCH 106/169] Disable community/collection delete button while the
 delete operation is being processed

---
 .../delete-collection-page.component.html                | 7 ++++---
 .../delete-community-page.component.html                 | 7 ++++---
 .../delete-comcol-page/delete-comcol-page.component.ts   | 9 ++++++++-
 src/assets/i18n/en.json5                                 | 4 ++++
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
index 81ba60e51b..4abb149498 100644
--- a/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/+collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,11 +6,12 @@
                 <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dso.name } }}</p>
                 <div class="form-group row">
                   <div class="col text-right">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)">
+                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
                       <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
                     </button>
-                    <button class="btn btn-danger mr-2" (click)="onConfirm(dso)">
-                      <i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}
+                    <button class="btn btn-danger mr-2" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                      <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
+                      <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
                   </div>
                 </div>
diff --git a/src/app/+community-page/delete-community-page/delete-community-page.component.html b/src/app/+community-page/delete-community-page/delete-community-page.component.html
index 85aa8b1bce..658f3da436 100644
--- a/src/app/+community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/+community-page/delete-community-page/delete-community-page.component.html
@@ -6,11 +6,12 @@
                 <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dso.name } }}</p>
                 <div class="form-group row">
                     <div class="col text-right">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)">
+                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
                             <i class="fas fa-times"></i> {{'community.delete.cancel' | translate}}
                         </button>
-                        <button class="btn btn-danger mr-2" (click)="onConfirm(dso)">
-                            <i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}
+                        <button class="btn btn-danger mr-2" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
+                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'community.delete.processing' | translate}}</span>
+                            <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
index ad3cf9f9fa..8579becc83 100644
--- a/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../core/data/remote-data';
 import { first, map } from 'rxjs/operators';
@@ -29,6 +29,12 @@ export class DeleteComColPageComponent<TDomain extends Community | Collection> i
    */
   public dsoRD$: Observable<RemoteData<TDomain>>;
 
+  /**
+   * A boolean representing if a delete operation is pending
+   * @type {BehaviorSubject<boolean>}
+   */
+  public processing$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   public constructor(
     protected dsoDataService: ComColDataService<TDomain>,
     protected router: Router,
@@ -48,6 +54,7 @@ export class DeleteComColPageComponent<TDomain extends Community | Collection> i
    * Deletes an existing DSO and redirects to the home page afterwards, showing a notification that states whether or not the deletion was successful
    */
   onConfirm(dso: TDomain) {
+    this.processing$.next(true);
     this.dsoDataService.delete(dso.id)
       .pipe(getFirstCompletedRemoteData())
       .subscribe((response: RemoteData<NoContent>) => {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5bd08dfbc8..1e284449ec 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -661,6 +661,8 @@
 
   "collection.delete.confirm": "Confirm",
 
+  "collection.delete.processing": "Deleting",
+
   "collection.delete.head": "Delete Collection",
 
   "collection.delete.notification.fail": "Collection could not be deleted",
@@ -899,6 +901,8 @@
 
   "community.delete.confirm": "Confirm",
 
+  "community.delete.processing": "Deleting...",
+
   "community.delete.head": "Delete Community",
 
   "community.delete.notification.fail": "Community could not be deleted",

From 2c19d80a16ffb25bad4b07d10b3dcbbe1ff34b8b Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 11:57:16 +0200
Subject: [PATCH 107/169] 80195: Refresh moved Item's owningCollection before
 redirecting

---
 .../edit-item-page/item-move/item-move.component.spec.ts | 6 ++++--
 .../edit-item-page/item-move/item-move.component.ts      | 9 +++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index b3178793e3..2a51dcc06d 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -48,11 +48,13 @@ describe('ItemMoveComponent', () => {
   });
 
   const mockItemDataService = jasmine.createSpyObj({
-    moveToCollection: createSuccessfulRemoteDataObject$(collection1)
+    moveToCollection: createSuccessfulRemoteDataObject$(collection1),
+    findById: createSuccessfulRemoteDataObject$(mockItem),
   });
 
   const mockItemDataServiceFail = jasmine.createSpyObj({
-    moveToCollection: createFailedRemoteDataObject$('Internal server error', 500)
+    moveToCollection: createFailedRemoteDataObject$('Internal server error', 500),
+    findById: createSuccessfulRemoteDataObject$(mockItem),
   });
 
   const routeStub = {
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index c80b0f7477..9c6670ef26 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -14,6 +14,7 @@ import { Observable, of as observableOf } from 'rxjs';
 import { Collection } from '../../../core/shared/collection.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 
 @Component({
   selector: 'ds-item-move',
@@ -93,13 +94,17 @@ export class ItemMoveComponent implements OnInit {
                         .pipe(getFirstCompletedRemoteData())
                         .subscribe(
       (response: RemoteData<any>) => {
-        this.router.navigate([getItemEditRoute(this.item)]);
+        this.itemDataService.findById(
+          this.item.id, false, true, followLink('owningCollection', undefined, true, false)
+        ).subscribe(() => {
+          this.processing = false;
+          this.router.navigate([getItemEditRoute(this.item)]);
+        });
         if (response.hasSucceeded) {
           this.notificationsService.success(this.translateService.get('item.edit.move.success'));
         } else {
           this.notificationsService.error(this.translateService.get('item.edit.move.error'));
         }
-        this.processing = false;
       }
     );
   }

From fba5504dd93413102f48c872fd68c6fc99d75eaf Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 23 Jun 2021 12:42:32 +0200
Subject: [PATCH 108/169] fix issue while editing bitstream with an existing
 access condition

---
 .../upload/file/edit/section-upload-file-edit.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index cfece7a5fe..3275787984 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -237,7 +237,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
   public initModelData(formModel: DynamicFormControlModel[]) {
     this.fileData.accessConditions.forEach((accessCondition, index) => {
       Array.of('name', 'startDate', 'endDate')
-        .filter((key) => accessCondition.hasOwnProperty(key))
+        .filter((key) => accessCondition.hasOwnProperty(key) && isNotEmpty(accessCondition[key]))
         .forEach((key) => {
           const metadataModel: any = this.formBuilderService.findById(key, formModel, index);
           if (metadataModel) {

From f683d1219e4a3415f18b2eb8e19112d2ccd14728 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 23 Jun 2021 13:43:10 +0200
Subject: [PATCH 109/169] make truncatable css global to ensure it adapts to
 the theme

---
 .../truncatable-part.component.scss           | 79 -------------------
 src/styles/_truncatable-part.component.scss   | 78 ++++++++++++++++++
 src/styles/base-theme.scss                    |  1 +
 src/themes/custom/styles/theme.scss           |  1 +
 src/themes/dspace/styles/theme.scss           |  1 +
 5 files changed, 81 insertions(+), 79 deletions(-)
 create mode 100644 src/styles/_truncatable-part.component.scss

diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
index 186bb9be48..e69de29bb2 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.scss
@@ -1,79 +0,0 @@
-//TODO switch to css variables
-@mixin clamp($lines, $bg, $size-factor: 1, $line-height: $line-height-base) {
-    $height: $line-height * $font-size-base * $size-factor;
-    &.fixedHeight {
-        height: $lines * $height;
-    }
-    .content {
-        max-height: $lines * $height;
-        position: relative;
-        overflow: hidden;
-        line-height: $line-height;
-        overflow-wrap: break-word;
-        &:after {
-            content: "";
-            position: absolute;
-            padding-right: 15px;
-            top: ($lines - 1) * $height;
-            right: 0;
-            width: 30%;
-            min-width: 75px;
-            max-width: 150px;
-            height: $height;
-            background: linear-gradient(to right, rgba(255, 255, 255, 0), $bg 70%);
-            pointer-events: none;
-        }
-    }
-
-}
-
-@mixin min($lines, $size-factor: 1, $line-height: $line-height-base) {
-    $height: $line-height * $font-size-base * $size-factor;
-    min-height: $lines * $height;
-}
-
-$h4-factor: strip-unit($h4-font-size);
-
-@mixin clamp-with-titles($i, $bg) {
-  transition: height 1s;
-  @include clamp($i, $bg);
-  &.title {
-    @include clamp($i, $bg, 1.25);
-  }
-  &.h4 {
-    @include clamp($i, $bg, $h4-factor, $headings-line-height);
-  }
-}
-
-@for $i from 1 through 15 {
-    .clamp-default-#{$i} {
-        @include clamp-with-titles($i, $body-bg);
-    }
-    :host-context(.ds-hover) .clamp-default-#{$i} {
-        @include clamp-with-titles($i, $list-group-hover-bg);
-    }
-
-    .clamp-primary-#{$i} {
-      @include clamp-with-titles($i, $primary);
-    }
-
-    :host-context(.ds-hover) .clamp-primary-#{$i} {
-      @include clamp-with-titles($i, darken($primary, 10%));
-    }
-}
-
-.clamp-none {
-    overflow: hidden;
-    @for $i from 1 through 15 {
-        &.fixedHeight.min-#{$i} {
-            transition: height 1s;
-            @include min($i);
-            &.title {
-                @include min($i, 1.25);
-            }
-            &.h4 {
-                @include min($i, $h4-factor, $headings-line-height);
-            }
-        }
-    }
-}
diff --git a/src/styles/_truncatable-part.component.scss b/src/styles/_truncatable-part.component.scss
new file mode 100644
index 0000000000..5c04700aa6
--- /dev/null
+++ b/src/styles/_truncatable-part.component.scss
@@ -0,0 +1,78 @@
+@mixin clamp($lines, $bg, $size-factor: 1, $line-height: $line-height-base) {
+  $height: $line-height * $font-size-base * $size-factor;
+  &.fixedHeight {
+    height: $lines * $height;
+  }
+  .content {
+    max-height: $lines * $height;
+    position: relative;
+    overflow: hidden;
+    line-height: $line-height;
+    overflow-wrap: break-word;
+    &:after {
+      content: "";
+      position: absolute;
+      padding-right: 15px;
+      top: ($lines - 1) * $height;
+      right: 0;
+      width: 30%;
+      min-width: 75px;
+      max-width: 150px;
+      height: $height;
+      background: linear-gradient(to right, rgba(255, 255, 255, 0), $bg 70%);
+      pointer-events: none;
+    }
+  }
+
+}
+
+@mixin min($lines, $size-factor: 1, $line-height: $line-height-base) {
+  $height: $line-height * $font-size-base * $size-factor;
+  min-height: $lines * $height;
+}
+
+$h4-factor: strip-unit($h4-font-size);
+
+@mixin clamp-with-titles($i, $bg) {
+  transition: height 1s;
+  @include clamp($i, $bg);
+  &.title {
+    @include clamp($i, $bg, 1.25);
+  }
+  &.h4 {
+    @include clamp($i, $bg, $h4-factor, $headings-line-height);
+  }
+}
+
+@for $i from 1 through 15 {
+  .clamp-default-#{$i} {
+    @include clamp-with-titles($i, $body-bg);
+  }
+  .ds-hover .clamp-default-#{$i} {
+    @include clamp-with-titles($i, $list-group-hover-bg);
+  }
+
+  .clamp-primary-#{$i} {
+    @include clamp-with-titles($i, $primary);
+  }
+
+  .ds-hover .clamp-primary-#{$i} {
+    @include clamp-with-titles($i, darken($primary, 10%));
+  }
+}
+
+.clamp-none {
+  overflow: hidden;
+  @for $i from 1 through 15 {
+    &.fixedHeight.min-#{$i} {
+      transition: height 1s;
+      @include min($i);
+      &.title {
+        @include min($i, 1.25);
+      }
+      &.h4 {
+        @include min($i, $h4-factor, $headings-line-height);
+      }
+    }
+  }
+}
diff --git a/src/styles/base-theme.scss b/src/styles/base-theme.scss
index 068c2ece26..bde50bcfd7 100644
--- a/src/styles/base-theme.scss
+++ b/src/styles/base-theme.scss
@@ -3,4 +3,5 @@
 @import '../../node_modules/nouislider/distribute/nouislider.min';
 @import './_custom_variables.scss';
 @import './bootstrap_variables_mapping.scss';
+@import './_truncatable-part.component.scss';
 @import './_global-styles.scss';
diff --git a/src/themes/custom/styles/theme.scss b/src/themes/custom/styles/theme.scss
index e4cc9e45ed..35810b15a6 100644
--- a/src/themes/custom/styles/theme.scss
+++ b/src/themes/custom/styles/theme.scss
@@ -9,4 +9,5 @@
 @import '../../../styles/_custom_variables.scss';
 @import './_theme_css_variable_overrides.scss';
 @import '../../../styles/bootstrap_variables_mapping.scss';
+@import '../../../styles/_truncatable-part.component.scss';
 @import './_global-styles.scss';
diff --git a/src/themes/dspace/styles/theme.scss b/src/themes/dspace/styles/theme.scss
index e4cc9e45ed..35810b15a6 100644
--- a/src/themes/dspace/styles/theme.scss
+++ b/src/themes/dspace/styles/theme.scss
@@ -9,4 +9,5 @@
 @import '../../../styles/_custom_variables.scss';
 @import './_theme_css_variable_overrides.scss';
 @import '../../../styles/bootstrap_variables_mapping.scss';
+@import '../../../styles/_truncatable-part.component.scss';
 @import './_global-styles.scss';

From 86cd7ba03f89e7d0a35582ce9abf40e7c75d3783 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 15:29:24 +0200
Subject: [PATCH 110/169] 80195: Select original owningCollection on load

---
 .../item-move/item-move.component.html        |  4 ++--
 .../item-move/item-move.component.ts          | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.html b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
index f2a420204f..9c9d6e6ceb 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
@@ -9,7 +9,7 @@
                     <div class="card-header">{{'dso-selector.placeholder' | translate: { type: 'collection' } }}</div>
                     <div class="card-body">
                       <ds-authorized-collection-selector [types]="COLLECTIONS"
-                                                         [currentDSOId]="selectedCollection?.id"
+                                                         [currentDSOId]="selectedCollection ? selectedCollection.id : originalCollection.id"
                                                          (onSelect)="selectDso($event)">
                       </ds-authorized-collection-selector>
                     </div>
@@ -30,7 +30,7 @@
                 </div>
             </div>
 
-            <button (click)="moveCollection()" class="btn btn-primary" [disabled]=!canSubmit>
+            <button (click)="moveCollection()" class="btn btn-primary" [disabled]=!canMove>
                 <span *ngIf="!processing"> {{'item.edit.move.move' | translate}}</span>
                 <span *ngIf="processing"><i class='fas fa-circle-notch fa-spin'></i>
                     {{'item.edit.move.processing' | translate}}
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index 9c6670ef26..918f9e9a2c 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
@@ -7,7 +7,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData,
+  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Observable, of as observableOf } from 'rxjs';
@@ -33,7 +33,8 @@ export class ItemMoveComponent implements OnInit {
 
   inheritPolicies = false;
   itemRD$: Observable<RemoteData<Item>>;
-  collectionSearchResults: Observable<any[]> = observableOf([]);
+  originalCollection: Collection;
+
   selectedCollectionName: string;
   selectedCollection: Collection;
   canSubmit = false;
@@ -57,7 +58,9 @@ export class ItemMoveComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.itemRD$ = this.route.data.pipe(map((data) => data.dso), getFirstSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.itemRD$ = this.route.data.pipe(
+      map((data) => data.dso), getFirstSucceededRemoteData()
+    ) as Observable<RemoteData<Item>>;
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
       map((item) => getItemPageRoute(item))
@@ -66,6 +69,15 @@ export class ItemMoveComponent implements OnInit {
         this.item = rd.payload;
       }
     );
+    this.itemRD$.pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((item) => item.owningCollection),
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ).subscribe((collection) => {
+      this.originalCollection = collection;
+    });
   }
 
   /**
@@ -108,4 +120,8 @@ export class ItemMoveComponent implements OnInit {
       }
     );
   }
+
+  get canMove(): boolean {
+    return this.canSubmit && this.selectedCollection?.id !== this.originalCollection.id;
+  }
 }

From c825f911f527d2f5101cbd941fad1b98fa259e53 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 15:31:13 +0200
Subject: [PATCH 111/169] 80195: Mimic back/save/discard buttons of other edit
 pages

---
 .../item-move/item-move.component.html        | 28 ++++++++++++-------
 .../item-move/item-move.component.ts          |  5 ++++
 src/assets/i18n/en.json5                      |  6 +++-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.html b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
index 9c9d6e6ceb..fd5b5cf93a 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
@@ -30,16 +30,24 @@
                 </div>
             </div>
 
-            <button (click)="moveCollection()" class="btn btn-primary" [disabled]=!canMove>
-                <span *ngIf="!processing"> {{'item.edit.move.move' | translate}}</span>
-                <span *ngIf="processing"><i class='fas fa-circle-notch fa-spin'></i>
-                    {{'item.edit.move.processing' | translate}}
-                </span>
-            </button>
-            <button [routerLink]="[(itemPageRoute$ | async), 'edit']"
-                    class="btn btn-outline-secondary">
-                {{'item.edit.move.cancel' | translate}}
-            </button>
+          <div class="button-row bottom">
+            <div class="float-right">
+              <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
+                <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
+              </button>
+              <button class="btn btn-primary mr-0" [disabled]="!canMove" (click)="moveCollection()">
+              <span *ngIf="!processing">
+                <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
+              </span>
+                <span *ngIf="processing">
+                <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
+              </span>
+              </button>
+              <button class="btn btn-danger" [disabled]="!canSubmit" (click)="discard()">
+                <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
+              </button>
+            </div>
+          </div>
         </div>
     </div>
 </div>
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index 918f9e9a2c..d7e44411a2 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -121,6 +121,11 @@ export class ItemMoveComponent implements OnInit {
     );
   }
 
+  discard(): void {
+    this.selectedCollection = null;
+    this.canSubmit = false;
+  }
+
   get canMove(): boolean {
     return this.canSubmit && this.selectedCollection?.id !== this.originalCollection.id;
   }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5bd08dfbc8..2d3c970638 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1623,7 +1623,11 @@
 
 
 
-  "item.edit.move.cancel": "Cancel",
+  "item.edit.move.cancel": "Back",
+
+  "item.edit.move.save-button": "Save",
+
+  "item.edit.move.discard-button": "Discard",
 
   "item.edit.move.description": "Select the collection you wish to move this item to. To narrow down the list of displayed collections, you can enter a search query in the box.",
 

From 4c1a72fdb2f891c4ca8533489f04da5834a402b9 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Wed, 23 Jun 2021 15:39:53 +0200
Subject: [PATCH 112/169] 80233: Apply Art's feedback

---
 .../edit-relationship-list.component.ts                       | 1 +
 src/app/core/shared/item.model.ts                             | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 8d7ffddd53..9f417ab799 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -368,6 +368,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         }
 
         // should never happen...
+        console.warn(`The item ${this.item.uuid} is not on the right or the left side of relationship type ${this.relationshipType.uuid}`);
         return undefined;
       })
     );
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 53eb5e3ce2..c302ebd06a 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -1,4 +1,4 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import { autoserialize, autoserializeAs, deserialize, deserializeAs, inheritSerialization } from 'cerialize';
 import { Observable } from 'rxjs';
 import { isEmpty } from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
@@ -37,7 +37,7 @@ export class Item extends DSpaceObject implements ChildHALResource {
   /**
    * The Date of the last modification of this Item
    */
-  @deserialize
+  @deserializeAs(Date)
   lastModified: Date;
 
   /**

From b586a264ca06de1ccbedb68fefa35323bf25d383 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 23 Jun 2021 17:27:01 +0200
Subject: [PATCH 113/169] ensure dynamic components are updated when their
 inputs change

---
 ...table-object-component-loader.component.ts | 77 ++++++++++++++-----
 1 file changed, 58 insertions(+), 19 deletions(-)

diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
index 30ad91c1e2..4c6206cb43 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
@@ -3,10 +3,14 @@ import {
   ComponentFactoryResolver,
   ElementRef,
   Input,
- OnDestroy, OnInit,
- Output, ViewChild
-,
-  EventEmitter
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+  EventEmitter,
+  SimpleChanges,
+  OnChanges,
+  ComponentRef
 } from '@angular/core';
 import { ListableObject } from '../listable-object.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
@@ -15,7 +19,7 @@ import { getListableObjectComponent } from './listable-object.decorator';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { ListableObjectDirective } from './listable-object.directive';
 import { CollectionElementLinkType } from '../../collection-element-link.type';
-import { hasValue } from '../../../empty.util';
+import { hasValue, isNotEmpty } from '../../../empty.util';
 import { Subscription } from 'rxjs/internal/Subscription';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { take } from 'rxjs/operators';
@@ -29,7 +33,7 @@ import { ThemeService } from '../../../theme-support/theme.service';
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type)
  */
-export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy {
+export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges, OnDestroy {
   /**
    * The item or metadata to determine the component for
    */
@@ -107,6 +111,25 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy
    */
   protected subs: Subscription[] = [];
 
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
+  /**
+   * The list of input and output names for the dynamic component
+   */
+  protected inAndOutputNames: string[] = [
+      'object',
+      'index',
+      'linkType',
+      'listID',
+      'showLabel',
+      'context',
+      'viewMode',
+      'value',
+    ];
+
   constructor(
     private componentFactoryResolver: ComponentFactoryResolver,
     private themeService: ThemeService
@@ -120,6 +143,15 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy
     this.instantiateComponent(this.object);
   }
 
+  /**
+   * Whenever the inputs change, update the inputs of the dynamic component
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
+      this.connectInputsAndOutputs();
+    }
+  }
+
   ngOnDestroy() {
     this.subs
       .filter((subscription) => hasValue(subscription))
@@ -137,28 +169,22 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy
     const viewContainerRef = this.listableObjectDirective.viewContainerRef;
     viewContainerRef.clear();
 
-    const componentRef = viewContainerRef.createComponent(
+    this.compRef = viewContainerRef.createComponent(
       componentFactory,
       0,
       undefined,
       [
         [this.badges.nativeElement],
       ]);
-    (componentRef.instance as any).object = object;
-    (componentRef.instance as any).index = this.index;
-    (componentRef.instance as any).linkType = this.linkType;
-    (componentRef.instance as any).listID = this.listID;
-    (componentRef.instance as any).showLabel = this.showLabel;
-    (componentRef.instance as any).context = this.context;
-    (componentRef.instance as any).viewMode = this.viewMode;
-    (componentRef.instance as any).value = this.value;
 
-    if ((componentRef.instance as any).reloadedObject) {
-      (componentRef.instance as any).reloadedObject.pipe(take(1)).subscribe((reloadedObject: DSpaceObject) => {
+    this.connectInputsAndOutputs();
+
+    if ((this.compRef.instance as any).reloadedObject) {
+      (this.compRef.instance as any).reloadedObject.pipe(take(1)).subscribe((reloadedObject: DSpaceObject) => {
         if (reloadedObject) {
-          componentRef.destroy();
+          this.compRef.destroy();
           this.object = reloadedObject;
-          this.instantiateComponent(reloadedObject);
+          this.connectInputsAndOutputs();
           this.contentChange.emit(reloadedObject);
         }
       });
@@ -187,4 +213,17 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnDestroy
                context: Context): GenericConstructor<Component> {
     return getListableObjectComponent(renderTypes, viewMode, context, this.themeService.getThemeName());
   }
+
+  /**
+   * Connect the in and outputs of this component to the dynamic component,
+   * to ensure they're in sync
+   */
+  protected connectInputsAndOutputs(): void {
+    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.inAndOutputNames.forEach((name: any) => {
+        this.compRef.instance[name] = this[name];
+      });
+    }
+  }
+
 }

From 2599068ccd1eb511b51c4afc4639e7e388c89c4d Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 23 Jun 2021 17:27:23 +0200
Subject: [PATCH 114/169] add a focus style for truncatable parts

---
 src/styles/_truncatable-part.component.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/styles/_truncatable-part.component.scss b/src/styles/_truncatable-part.component.scss
index 5c04700aa6..b938f3a199 100644
--- a/src/styles/_truncatable-part.component.scss
+++ b/src/styles/_truncatable-part.component.scss
@@ -48,6 +48,7 @@ $h4-factor: strip-unit($h4-font-size);
   .clamp-default-#{$i} {
     @include clamp-with-titles($i, $body-bg);
   }
+  :focus .clamp-default-#{$i},
   .ds-hover .clamp-default-#{$i} {
     @include clamp-with-titles($i, $list-group-hover-bg);
   }
@@ -56,6 +57,7 @@ $h4-factor: strip-unit($h4-font-size);
     @include clamp-with-titles($i, $primary);
   }
 
+  :focus .clamp-primary-#{$i},
   .ds-hover .clamp-primary-#{$i} {
     @include clamp-with-titles($i, darken($primary, 10%));
   }

From 04f4a2587035f1d1892e946a663071b2f8b6ca13 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 23 Jun 2021 17:28:36 +0200
Subject: [PATCH 115/169] fix an issue where the results of a dso-selector
 wouldn't update until you clicked anywhere on the page

---
 .../dso-selector/dso-selector.component.html      |  6 +++---
 .../dso-selector/dso-selector.component.ts        | 15 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 122f37b031..ab2ea6cd8b 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -14,12 +14,12 @@
     [infiniteScrollContainer]="'.scrollable-menu'"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
-    <ng-container *ngIf="listEntries">
+    <ng-container *ngIf="listEntries$ | async">
       <button class="list-group-item list-group-item-action border-0 disabled"
-              *ngIf="listEntries.length == 0">
+              *ngIf="(listEntries$ | async).length == 0">
         {{'dso-selector.no-results' | translate: { type: typesString } }}
       </button>
-      <button *ngFor="let listEntry of listEntries"
+      <button *ngFor="let listEntry of (listEntries$ | async)"
               class="list-group-item list-group-item-action border-0 list-entry"
               [ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}"
               title="{{ listEntry.indexableObject.name }}"
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index c62e0df763..ebd9f24b61 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -81,7 +81,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * List with search results of DSpace objects for the current query
    */
-  listEntries: SearchResult<DSpaceObject>[] = null;
+  listEntries$: BehaviorSubject<SearchResult<DSpaceObject>[]> = new BehaviorSubject(null);
 
   /**
    * The current page to load
@@ -160,7 +160,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
         this.loading = true;
         if (page === 1) {
           // The first page is loading, this means we should reset the list instead of adding to it
-          this.listEntries = null;
+          this.listEntries$.next(null);
         }
         return this.search(query, page).pipe(
           map((rd) => {
@@ -181,15 +181,16 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
     ).subscribe((rd) => {
       this.loading = false;
       if (rd.hasSucceeded) {
-        if (hasNoValue(this.listEntries)) {
-          this.listEntries = rd.payload.page;
+        const currentEntries = this.listEntries$.getValue();
+        if (hasNoValue(currentEntries)) {
+          this.listEntries$.next(rd.payload.page);
         } else {
-          this.listEntries.push(...rd.payload.page);
+          this.listEntries$.next([...currentEntries, ...rd.payload.page]);
         }
         // Check if there are more pages available after the current one
-        this.hasNextPage = rd.payload.totalElements > this.listEntries.length;
+        this.hasNextPage = rd.payload.totalElements > this.listEntries$.getValue().length;
       } else {
-        this.listEntries = null;
+        this.listEntries$.next(null);
         this.hasNextPage = false;
       }
     }));

From c1ddf7f66797a95a9b1119f311d60557af7a8843 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Wed, 23 Jun 2021 10:55:22 -0500
Subject: [PATCH 116/169] Add production warning

---
 docker/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/README.md b/docker/README.md
index 809a150d86..747db22143 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,5 +1,9 @@
 # Docker Compose files
 
+***
+:warning: **NOT PRODUCTION READY**  The below Docker Compose resources are not guaranteed "production ready" at this time. They have been built for development/testing only. Therefore, DSpace Docker images may not be fully secured or up-to-date. While you are welcome to base your own images on these DSpace images/resources, these should not be used "as is" in any production scenario.
+***
+
 ## docker directory
 - docker-compose.yml
   - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.

From 84274c39119d7f732eece6225d71e4577b6ce707 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 18:08:25 +0200
Subject: [PATCH 117/169] 80195: Fix ItemMoveComponent#moveToCollection

---
 .../item-move/item-move.component.html        |  2 +-
 .../item-move/item-move.component.spec.ts     |  6 ++--
 .../item-move/item-move.component.ts          | 35 ++++++++++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.html b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
index fd5b5cf93a..f68cfb0685 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.html
@@ -35,7 +35,7 @@
               <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
                 <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
               </button>
-              <button class="btn btn-primary mr-0" [disabled]="!canMove" (click)="moveCollection()">
+              <button class="btn btn-primary mr-0" [disabled]="!canMove" (click)="moveToCollection()">
               <span *ngIf="!processing">
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
               </span>
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index 2a51dcc06d..3ff76a1466 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -120,12 +120,12 @@ describe('ItemMoveComponent', () => {
         });
         comp.selectedCollectionName = 'selected-collection-id';
         comp.selectedCollection = collection1;
-        comp.moveCollection();
+        comp.moveToCollection();
 
         expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
       });
       it('should call notificationsService success message on success', () => {
-        comp.moveCollection();
+        comp.moveToCollection();
 
         expect(notificationsServiceStub.success).toHaveBeenCalled();
       });
@@ -153,7 +153,7 @@ describe('ItemMoveComponent', () => {
     });
 
     it('should call notificationsService error message on fail', () => {
-      comp.moveCollection();
+      comp.moveToCollection();
 
       expect(notificationsServiceStub.error).toHaveBeenCalled();
     });
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index d7e44411a2..c22f5f3ff8 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -100,25 +100,26 @@ export class ItemMoveComponent implements OnInit {
   /**
    * Moves the item to a new collection based on the selected collection
    */
-  moveCollection() {
+  moveToCollection() {
     this.processing = true;
-    this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
-                        .pipe(getFirstCompletedRemoteData())
-                        .subscribe(
-      (response: RemoteData<any>) => {
-        this.itemDataService.findById(
-          this.item.id, false, true, followLink('owningCollection', undefined, true, false)
-        ).subscribe(() => {
-          this.processing = false;
-          this.router.navigate([getItemEditRoute(this.item)]);
-        });
-        if (response.hasSucceeded) {
-          this.notificationsService.success(this.translateService.get('item.edit.move.success'));
-        } else {
-          this.notificationsService.error(this.translateService.get('item.edit.move.error'));
-        }
+    const move$ = this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
+                                      .pipe(getFirstCompletedRemoteData());
+
+    move$.subscribe((response: RemoteData<any>) => {
+      if (response.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get('item.edit.move.success'));
+      } else {
+        this.notificationsService.error(this.translateService.get('item.edit.move.error'));
       }
-    );
+    });
+
+    move$.pipe(
+      switchMap(() => this.itemDataService.findById(
+        this.item.id, false, true, followLink('owningCollection', undefined, true, false)))
+    ).subscribe(() => {
+      this.processing = false;
+      this.router.navigate([getItemEditRoute(this.item)]);
+    });
   }
 
   discard(): void {

From 290abf7c43ee28a81ab7346e9233bebaa8fc4f60 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 23 Jun 2021 18:13:21 +0200
Subject: [PATCH 118/169] 80195: Fix unit tests

---
 .../item-move/item-move.component.spec.ts     |  5 +++-
 .../dso-selector.component.spec.ts            | 21 +++++++++----
 ...-object-component-loader.component.spec.ts | 30 ++++++++++++++-----
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index 3ff76a1466..b51d83c0ae 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -60,7 +60,10 @@ describe('ItemMoveComponent', () => {
   const routeStub = {
     data: observableOf({
       dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
-        id: 'item1'
+        id: 'item1',
+        owningCollection: createSuccessfulRemoteDataObject$(Object.assign(new Collection(), {
+          id: 'originalOwningCollection',
+        }))
       }))
     })
   };
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
index 9e68c0564b..2565b36f7d 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
@@ -92,12 +92,18 @@ describe('DSOSelectorComponent', () => {
   });
 
   describe('populating listEntries', () => {
-    it('should not be empty', () => {
-      expect(component.listEntries.length).toBeGreaterThan(0);
+    it('should not be empty', (done) => {
+      component.listEntries$.subscribe((listEntries) => {
+        expect(listEntries.length).toBeGreaterThan(0);
+        done();
+      });
     });
 
-    it('should contain a combination of the current DSO and first page results', () => {
-      expect(component.listEntries).toEqual([searchResult, ...firstPageResults]);
+    it('should contain a combination of the current DSO and first page results', (done) => {
+      component.listEntries$.subscribe((listEntries) => {
+        expect(listEntries).toEqual([searchResult, ...firstPageResults]);
+        done();
+      });
     });
 
     describe('when current page increases', () => {
@@ -105,8 +111,11 @@ describe('DSOSelectorComponent', () => {
         component.currentPage$.next(2);
       });
 
-      it('should contain a combination of the current DSO, as well as first and second page results', () => {
-        expect(component.listEntries).toEqual([searchResult, ...firstPageResults, ...nextPageResults]);
+      it('should contain a combination of the current DSO, as well as first and second page results', (done) => {
+        component.listEntries$.subscribe((listEntries) => {
+          expect(listEntries).toEqual([searchResult, ...firstPageResults, ...nextPageResults]);
+          done();
+        });
       });
     });
   });
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
index 3442b044a2..458272c606 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.spec.ts
@@ -1,5 +1,5 @@
-import { waitForAsync, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { ChangeDetectionStrategy, ComponentFactoryResolver, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
 import { ListableObject } from '../listable-object.model';
 import { GenericConstructor } from '../../../../core/shared/generic-constructor';
@@ -117,17 +117,33 @@ describe('ListableObjectComponentLoaderComponent', () => {
   });
 
   describe('When a reloadedObject is emitted', () => {
+    let listableComponent;
+    let reloadedObject: any;
 
-    it('should re-instantiate the listable component ', fakeAsync(() => {
+    beforeEach(() => {
+      spyOn((comp as any), 'connectInputsAndOutputs').and.returnValue(null);
+      spyOn((comp as any).contentChange, 'emit').and.returnValue(null);
 
-      spyOn((comp as any), 'instantiateComponent').and.returnValue(null);
+      listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance;
+      reloadedObject = 'object';
+    });
+
+    it('should pass it on connectInputsAndOutputs', fakeAsync(() => {
+      expect((comp as any).connectInputsAndOutputs).not.toHaveBeenCalled();
 
-      const listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance;
-      const reloadedObject: any = 'object';
       (listableComponent as any).reloadedObject.emit(reloadedObject);
       tick();
 
-      expect((comp as any).instantiateComponent).toHaveBeenCalledWith(reloadedObject);
+      expect((comp as any).connectInputsAndOutputs).toHaveBeenCalled();
+    }));
+
+    it('should re-emit it as a contentChange', fakeAsync(() => {
+      expect((comp as any).contentChange.emit).not.toHaveBeenCalled();
+
+      (listableComponent as any).reloadedObject.emit(reloadedObject);
+      tick();
+
+      expect((comp as any).contentChange.emit).toHaveBeenCalledWith(reloadedObject);
     }));
 
   });

From 7dc4609a838608044801daf684d8e85971df3db9 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 24 Jun 2021 11:16:38 +0200
Subject: [PATCH 119/169] add getFirstCompletedRemoteData, remove force
 redownload of owningcollection

---
 .../item-move/item-move.component.ts            | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index c22f5f3ff8..0f6ce23793 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -7,7 +7,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { Observable, of as observableOf } from 'rxjs';
@@ -103,7 +106,7 @@ export class ItemMoveComponent implements OnInit {
   moveToCollection() {
     this.processing = true;
     const move$ = this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
-                                      .pipe(getFirstCompletedRemoteData());
+      .pipe(getFirstCompletedRemoteData());
 
     move$.subscribe((response: RemoteData<any>) => {
       if (response.hasSucceeded) {
@@ -114,8 +117,14 @@ export class ItemMoveComponent implements OnInit {
     });
 
     move$.pipe(
-      switchMap(() => this.itemDataService.findById(
-        this.item.id, false, true, followLink('owningCollection', undefined, true, false)))
+      switchMap(() =>
+        this.itemDataService.findById(
+          this.item.id,
+          false,
+          true,
+          followLink('owningCollection')
+      )),
+      getFirstCompletedRemoteData()
     ).subscribe(() => {
       this.processing = false;
       this.router.navigate([getItemEditRoute(this.item)]);

From a48e77810d20ce3eda310b69df353acd6a33f6bc Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 24 Jun 2021 12:01:05 +0200
Subject: [PATCH 120/169] 80195: Fix unused import

---
 .../edit-item-page/item-move/item-move.component.ts        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index 0f6ce23793..2107597f8a 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -7,13 +7,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import {
-  getAllSucceededRemoteDataPayload,
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
-  getRemoteDataPayload,
+  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { Observable } from 'rxjs';
 import { Collection } from '../../../core/shared/collection.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';

From a572b0acea461050f913445b6dffa28a050ff1eb Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 24 Jun 2021 15:28:26 +0200
Subject: [PATCH 121/169] [CST-4320] No way to view an Item when in simple
 "Approve/Reject" workflow stage

---
 .../themed-workflow-item-view.component.ts    |  26 ++++
 .../workflow-item-view.component.html         |   9 ++
 .../workflow-item-view.component.spec.ts      | 114 ++++++++++++++++++
 .../workflow-item-view.component.ts           |  40 ++++++
 .../workflowitems-edit-page-routing-paths.ts  |   4 +
 .../workflowitems-edit-page-routing.module.ts |  13 +-
 .../workflowitems-edit-page.module.ts         |  15 ++-
 .../claimed-task-actions.component.html       |   9 ++
 .../claimed-task-actions.component.spec.ts    |  27 ++++-
 .../claimed-task-actions.component.ts         |  17 +++
 src/assets/i18n/en.json5                      |   2 +
 .../workflow-item-view.component.html         |   0
 .../workflow-item-view.component.scss         |   0
 .../workflow-item-view.component.ts           |  14 +++
 src/themes/custom/theme.module.ts             |   2 +
 15 files changed, 288 insertions(+), 4 deletions(-)
 create mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts
 create mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
 create mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts
 create mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
 create mode 100644 src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
 create mode 100644 src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.scss
 create mode 100644 src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts

diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts b/src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts
new file mode 100644
index 0000000000..f0630fa561
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts
@@ -0,0 +1,26 @@
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { WorkflowItemViewComponent } from './workflow-item-view.component';
+
+/**
+ * Themed wrapper for WorkflowItemViewComponent
+ */
+
+@Component({
+  selector: 'ds-themed-workflow-item-view',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html'
+})
+export class ThemedWorkflowItemViewComponent extends ThemedComponent<WorkflowItemViewComponent> {
+  protected getComponentName(): string {
+    return 'WorkflowItemViewComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./workflow-item-view.component`);
+  }
+}
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
new file mode 100644
index 0000000000..00401f34ce
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
@@ -0,0 +1,9 @@
+<div class="container" *ngVar="(itemRD$ | async) as itemRD">
+    <div class="item-page" *ngIf="itemRD?.hasSucceeded">
+        <div *ngIf="itemRD?.payload as item">
+            <ds-untyped-item [object]="item"></ds-untyped-item>
+        </div>
+    </div>
+    <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
+    <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+</div>
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts
new file mode 100644
index 0000000000..6804c7a816
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts
@@ -0,0 +1,114 @@
+import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RouteService } from '../../core/services/route.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { of as observableOf } from 'rxjs';
+import { RequestService } from '../../core/data/request.service';
+import {
+  createFailedRemoteDataObject$,
+  createPendingRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$
+} from '../../shared/remote-data.utils';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { Item } from '../../core/shared/item.model';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { createRelationshipsObservable } from '../../+item-page/simple/item-types/shared/item.component.spec';
+import { WorkflowItemViewComponent } from './workflow-item-view.component';
+import { By } from '@angular/platform-browser';
+
+describe('WorkflowItemViewComponent', () => {
+
+  const mockItem: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    metadata: [],
+    relationships: createRelationshipsObservable()
+  });
+
+  const mockWfi = new WorkflowItem();
+  mockWfi.item = createSuccessfulRemoteDataObject$(mockItem);
+
+  const mockRoute = Object.assign(new ActivatedRouteStub(), {
+    data: observableOf({ wfi: createSuccessfulRemoteDataObject(mockWfi) })
+  });
+
+  let comp: WorkflowItemViewComponent;
+  let fixture: ComponentFixture<WorkflowItemViewComponent>;
+  let wfi;
+  let itemRD$;
+  let id;
+
+  function init() {
+    itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
+    wfi = new WorkflowItem();
+    wfi.item = itemRD$;
+    id = 'de11b5e5-064a-4e98-a7ac-a1a6a65ddf80';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot({
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock
+        }
+      })],
+      declarations: [WorkflowItemViewComponent, VarDirective],
+      providers: [
+        { provide: ActivatedRoute, useValue: mockRoute },
+        { provide: Router, useClass: RouterStub },
+        { provide: RouteService, useValue: {} },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: RequestService, useValue: getMockRequestService() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(WorkflowItemViewComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  describe('when the item is loading', () => {
+    beforeEach(() => {
+      comp.itemRD$ = createPendingRemoteDataObject$();
+      // comp.itemRD$ = observableOf(new RemoteData(true, true, true, null, undefined));
+      fixture.detectChanges();
+    });
+
+    it('should display a loading component', () => {
+      const loading = fixture.debugElement.query(By.css('ds-loading'));
+      expect(loading.nativeElement).toBeDefined();
+    });
+  });
+
+  describe('when the item failed loading', () => {
+    beforeEach(() => {
+      comp.itemRD$ = createFailedRemoteDataObject$('server error', 500);
+      fixture.detectChanges();
+    });
+
+    it('should display an error component', () => {
+      const error = fixture.debugElement.query(By.css('ds-error'));
+      expect(error.nativeElement).toBeDefined();
+    });
+  });
+
+});
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
new file mode 100644
index 0000000000..e9a51074fc
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
@@ -0,0 +1,40 @@
+import { Component, OnInit } from '@angular/core';
+import { Observable } from 'rxjs';
+import { ActivatedRoute, Data } from '@angular/router';
+import { map, switchMap } from 'rxjs/operators';import { RemoteData } from '../../core/data/remote-data';
+
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload
+} from '../../core/shared/operators';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { Item } from '../../core/shared/item.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+
+@Component({
+  selector: 'ds-workflow-item-view',
+  templateUrl: './workflow-item-view.component.html'
+})
+/**
+ * Component representing a page to delete a workflow item
+ */
+export class WorkflowItemViewComponent implements OnInit {
+
+  public wfi$: Observable<WorkflowItem>;
+  public itemRD$: Observable<RemoteData<Item>>;
+
+  /**
+   * The view-mode we're currently on
+   */
+  viewMode = ViewMode.StandalonePage;
+
+
+  constructor(protected route: ActivatedRoute) {
+  }
+
+  ngOnInit() {
+    this.wfi$ = this.route.data.pipe(map((data: Data) => data.wfi as RemoteData<WorkflowItem>), getRemoteDataPayload());
+    this.itemRD$ = this.wfi$.pipe(switchMap((wfi: WorkflowItem) => (wfi.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData())));
+  }
+
+}
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
index a8802e7a2f..e2d969a872 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
@@ -8,6 +8,9 @@ export function getWorkflowItemPageRoute(wfiId: string) {
 export function getWorkflowItemEditRoute(wfiId: string) {
   return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_EDIT_PATH).toString();
 }
+export function getWorkflowItemViewRoute(wfiId: string) {
+  return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_VIEW_PATH).toString();
+}
 
 export function getWorkflowItemDeleteRoute(wfiId: string) {
   return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_DELETE_PATH).toString();
@@ -19,4 +22,5 @@ export function getWorkflowItemSendBackRoute(wfiId: string) {
 
 export const WORKFLOW_ITEM_EDIT_PATH = 'edit';
 export const WORKFLOW_ITEM_DELETE_PATH = 'delete';
+export const WORKFLOW_ITEM_VIEW_PATH = 'view';
 export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback';
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
index 733eebecc2..eee235e12f 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
@@ -6,12 +6,14 @@ import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
 import {
   WORKFLOW_ITEM_DELETE_PATH,
   WORKFLOW_ITEM_EDIT_PATH,
-  WORKFLOW_ITEM_SEND_BACK_PATH
+  WORKFLOW_ITEM_SEND_BACK_PATH,
+  WORKFLOW_ITEM_VIEW_PATH
 } from './workflowitems-edit-page-routing-paths';
 import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
 import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
 import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedWorkflowItemViewComponent } from './workflow-item-view/themed-workflow-item-view.component';
 
 @NgModule({
   imports: [
@@ -29,6 +31,15 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
             },
             data: { title: 'workflow-item.edit.title', breadcrumbKey: 'workflow-item.edit' }
           },
+          {
+            canActivate: [AuthenticatedGuard],
+            path: WORKFLOW_ITEM_VIEW_PATH,
+            component: ThemedWorkflowItemViewComponent,
+            resolve: {
+              breadcrumb: I18nBreadcrumbResolver
+            },
+            data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' }
+          },
           {
             canActivate: [AuthenticatedGuard],
             path: WORKFLOW_ITEM_DELETE_PATH,
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
index 6e4b3212e8..221c0328a0 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
@@ -7,6 +7,10 @@ import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-ite
 import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
 import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
 import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
+import { WorkflowItemViewComponent } from './workflow-item-view/workflow-item-view.component';
+import { ThemedWorkflowItemViewComponent } from './workflow-item-view/themed-workflow-item-view.component';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { ItemPageModule } from '../+item-page/item-page.module';
 
 @NgModule({
   imports: [
@@ -14,8 +18,17 @@ import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/t
     CommonModule,
     SharedModule,
     SubmissionModule,
+    StatisticsModule,
+    ItemPageModule
   ],
-  declarations: [WorkflowItemDeleteComponent, ThemedWorkflowItemDeleteComponent, WorkflowItemSendBackComponent, ThemedWorkflowItemSendBackComponent]
+  declarations: [
+    WorkflowItemDeleteComponent,
+    ThemedWorkflowItemDeleteComponent,
+    WorkflowItemSendBackComponent,
+    ThemedWorkflowItemSendBackComponent,
+    WorkflowItemViewComponent,
+    ThemedWorkflowItemViewComponent
+  ]
 })
 /**
  * This module handles all modules that need to access the workflowitems edit page.
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 6a39fd44ca..7454a80873 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -5,6 +5,15 @@
                                     [object]="object"
                                     (processCompleted)="this.processCompleted.emit($event)">
     </ds-claimed-task-actions-loader>
+
+    <ng-container *ngIf="hasViewAction(workflowAction)">
+      <button class="btn btn-primary workflow-view"
+              ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
+              [routerLink]="[getWorkflowItemViewRoute((workflowitem$ | async))]">
+        <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
+      </button>
+    </ng-container>
+
     <ds-claimed-task-actions-loader [option]="returnToPoolOption"
                                     [object]="object"
                                     (processCompleted)="this.processCompleted.emit($event)">
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index 8319a9a1db..fa896c7dfd 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -23,6 +23,7 @@ import { WorkflowActionDataService } from '../../../core/data/workflow-action-da
 import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
 import { VarDirective } from '../../utils/var.directive';
 import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { By } from '@angular/platform-browser';
 
 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -81,7 +82,7 @@ function init() {
     }
   });
   rdItem = createSuccessfulRemoteDataObject(item);
-  workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
+  workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem), id: '333' });
   rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
   mockObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem), id: '1234' });
   workflowAction = Object.assign(new WorkflowAction(), { id: 'action-1', options: ['option-1', 'option-2'] });
@@ -91,7 +92,7 @@ function init() {
   });
 }
 
-describe('ClaimedTaskActionsComponent', () => {
+fdescribe('ClaimedTaskActionsComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
@@ -159,4 +160,26 @@ describe('ClaimedTaskActionsComponent', () => {
       expect(notificationsServiceStub.error).toHaveBeenCalled();
     });
   }));
+
+  describe('when edit options is not available', () => {
+    it('should display a view button', waitForAsync(() => {
+      component.object = null;
+      component.initObjects(mockObject);
+      fixture.detectChanges();
+
+      fixture.whenStable().then(() => {
+        const debugElement = fixture.debugElement.query(By.css('.workflow-view'));
+        expect(debugElement).toBeTruthy();
+        expect(debugElement.nativeElement.innerText).toBe('submission.workflow.generic.view');
+      });
+
+    }));
+
+    it('getWorkflowItemViewRoute should return the combined uri to show a workspaceitem', waitForAsync(() => {
+      const href = component.getWorkflowItemViewRoute(workflowitem);
+      expect(href).toEqual('/workflowitems/333/view');
+    }));
+  });
+
+
 });
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index b610232279..5b142a64ec 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -17,6 +17,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
 import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
 import { WORKFLOW_TASK_OPTION_RETURN_TO_POOL } from './return-to-pool/claimed-task-actions-return-to-pool.component';
+import { getWorkflowItemViewRoute } from '../../../+workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 /**
  * This component represents actions related to ClaimedTask object.
@@ -85,6 +86,7 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
    */
   initObjects(object: ClaimedTask) {
     this.object = object;
+
     this.workflowitem$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
       filter((rd: RemoteData<WorkflowItem>) => ((!rd.isRequestPending) && isNotUndefined(rd.payload))),
       map((rd: RemoteData<WorkflowItem>) => rd.payload),
@@ -100,4 +102,19 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
     this.actionRD$ = object.action;
   }
 
+  /**
+   * Check if claimed task actions should display a view item button.
+   * @param workflowAction
+   */
+  hasViewAction(workflowAction: WorkflowAction) {
+    return !workflowAction?.options.includes('submit_edit_metadata');
+  }
+
+  /**
+   * Get the workflowitem view route.
+   */
+  getWorkflowItemViewRoute(workflowitem: WorkflowItem): string {
+    return getWorkflowItemViewRoute(workflowitem?.id);
+  }
+
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5bd08dfbc8..0a289b31a8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3588,6 +3588,8 @@
 
   "workflow-item.edit.title": "Edit workflowitem",
 
+  "workflow-item.edit.title": "View workflowitem",
+
   "workflow-item.delete.notification.success.title": "Deleted",
 
   "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.scss b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
new file mode 100644
index 0000000000..07305e81e3
--- /dev/null
+++ b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+import { WorkflowItemViewComponent as BaseComponent } from '../../../../../app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component';
+
+@Component({
+  selector: 'ds-workflow-item-view',
+  // styleUrls: ['workflow-item-view.component.scss'],
+  // templateUrl: './workflow-item-view.component.html'
+  templateUrl: '../../../../../app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html'
+})
+/**
+ * Component representing a page to view a workflow item
+ */
+export class WorkflowItemViewComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 49b54cd850..0e8e3a437d 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -79,6 +79,7 @@ import { HeaderComponent } from './app/header/header.component';
 import { FooterComponent } from './app/footer/footer.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
+import { WorkflowItemViewComponent } from './app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component';
 
 const DECLARATIONS = [
   HomePageComponent,
@@ -115,6 +116,7 @@ const DECLARATIONS = [
   SubmissionSubmitComponent,
   WorkflowItemDeleteComponent,
   WorkflowItemSendBackComponent,
+  WorkflowItemViewComponent,
   FooterComponent,
   HeaderComponent,
   NavbarComponent,

From 67ce3e6741e3459dda649ea359e38b2bf6f988d4 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 24 Jun 2021 15:34:11 +0200
Subject: [PATCH 122/169] [CST-4320] No way to view an Item when in simple
 "Approve/Reject" workflow stage

---
 .../claimed-task/claimed-task-actions.component.spec.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index fa896c7dfd..fcaa2f455a 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -92,7 +92,7 @@ function init() {
   });
 }
 
-fdescribe('ClaimedTaskActionsComponent', () => {
+describe('ClaimedTaskActionsComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({

From 4b11a2f1c1be3a0ab790312c3283ba2c2c41ea41 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 24 Jun 2021 16:38:59 +0200
Subject: [PATCH 123/169] [CST-4320] Added missing translations

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0a289b31a8..fdb69bd905 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3621,5 +3621,8 @@
 
   "workflow-item.send-back.button.cancel": "Cancel",
 
-  "workflow-item.send-back.button.confirm": "Send back"
+  "workflow-item.send-back.button.confirm": "Send back",
+
+  "workflow-item.view.breadcrumbs": "Workflow View"
+
 }

From da4be7b57f29e399de566fb59ec4a37ea9c199ed Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Fri, 28 May 2021 13:19:59 +0200
Subject: [PATCH 124/169] [DSC-76] Delete pending json patch operations

---
 .../json-patch-operations.actions.ts          | 11 +++++++++-
 .../json-patch-operations.reducer.spec.ts     | 17 ++++++++++++++-
 .../json-patch-operations.reducer.ts          | 21 ++++++++++++++++++-
 .../json-patch-operations.service.spec.ts     | 16 ++++++++++++++
 .../json-patch-operations.service.ts          |  9 +++++++-
 ...sion-json-patch-operations-service.stub.ts |  1 +
 .../edit/submission-edit.component.spec.ts    | 17 +++++++++++++++
 .../edit/submission-edit.component.ts         |  6 +++++-
 8 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/src/app/core/json-patch/json-patch-operations.actions.ts b/src/app/core/json-patch/json-patch-operations.actions.ts
index 4c26703472..91fc6cb0da 100644
--- a/src/app/core/json-patch/json-patch-operations.actions.ts
+++ b/src/app/core/json-patch/json-patch-operations.actions.ts
@@ -20,6 +20,7 @@ export const JsonPatchOperationsActionTypes = {
   ROLLBACK_JSON_PATCH_OPERATIONS: type('dspace/core/patch/ROLLBACK_JSON_PATCH_OPERATIONS'),
   FLUSH_JSON_PATCH_OPERATIONS: type('dspace/core/patch/FLUSH_JSON_PATCH_OPERATIONS'),
   START_TRANSACTION_JSON_PATCH_OPERATIONS: type('dspace/core/patch/START_TRANSACTION_JSON_PATCH_OPERATIONS'),
+  DELETE_PENDING_JSON_PATCH_OPERATIONS: type('dspace/core/patch/DELETE_PENDING_JSON_PATCH_OPERATIONS'),
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -261,6 +262,13 @@ export class NewPatchReplaceOperationAction implements Action {
   }
 }
 
+/**
+ * An ngrx action to delete all pending JSON Patch Operations.
+ */
+export class DeletePendingJsonPatchOperationsAction implements Action {
+  type = JsonPatchOperationsActionTypes.DELETE_PENDING_JSON_PATCH_OPERATIONS;
+}
+
 /* tslint:enable:max-classes-per-file */
 
 /**
@@ -276,4 +284,5 @@ export type PatchOperationsActions
   | NewPatchRemoveOperationAction
   | NewPatchReplaceOperationAction
   | RollbacktPatchOperationsAction
-  | StartTransactionPatchOperationsAction;
+  | StartTransactionPatchOperationsAction
+  | DeletePendingJsonPatchOperationsAction;
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index 34378b819b..1f98cf0920 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -1,7 +1,7 @@
 import * as deepFreeze from 'deep-freeze';
 
 import {
-  CommitPatchOperationsAction,
+  CommitPatchOperationsAction, DeletePendingJsonPatchOperationsAction,
   FlushPatchOperationsAction,
   NewPatchAddOperationAction,
   NewPatchRemoveOperationAction,
@@ -323,4 +323,19 @@ describe('jsonPatchOperationsReducer test suite', () => {
 
   });
 
+  describe('When DeletePendingJsonPatchOperationsAction has been dispatched', () => {
+    it('should set set the JsonPatchOperationsState to null ', () => {
+      const action = new DeletePendingJsonPatchOperationsAction();
+      initState = Object.assign({}, testState, {
+        [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
+          transactionStartTime: startTimestamp,
+          commitPending: true
+        })
+      });
+      const newState = jsonPatchOperationsReducer(initState, action);
+
+      expect(newState).toBeNull();
+    });
+  });
+
 });
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.ts b/src/app/core/json-patch/json-patch-operations.reducer.ts
index 8d630dbfa1..5e00027edb 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -11,7 +11,8 @@ import {
   NewPatchReplaceOperationAction,
   CommitPatchOperationsAction,
   StartTransactionPatchOperationsAction,
-  RollbacktPatchOperationsAction
+  RollbacktPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction
 } from './json-patch-operations.actions';
 import { JsonPatchOperationModel, JsonPatchOperationType } from './json-patch.model';
 
@@ -101,6 +102,10 @@ export function jsonPatchOperationsReducer(state = initialState, action: PatchOp
       return startTransactionPatchOperations(state, action as StartTransactionPatchOperationsAction);
     }
 
+    case JsonPatchOperationsActionTypes.DELETE_PENDING_JSON_PATCH_OPERATIONS: {
+      return deletePendingOperations(state, action as DeletePendingJsonPatchOperationsAction);
+    }
+
     default: {
       return state;
     }
@@ -178,6 +183,20 @@ function rollbackOperations(state: JsonPatchOperationsState, action: RollbacktPa
   }
 }
 
+/**
+ * Set the JsonPatchOperationsState to its initial value.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an DeletePendingJsonPatchOperationsAction
+ * @return JsonPatchOperationsState
+ *    the new state.
+ */
+function deletePendingOperations(state: JsonPatchOperationsState, action: DeletePendingJsonPatchOperationsAction): JsonPatchOperationsState {
+  return null;
+}
+
 /**
  * Add new JSON patch operation list.
  *
diff --git a/src/app/core/json-patch/json-patch-operations.service.spec.ts b/src/app/core/json-patch/json-patch-operations.service.spec.ts
index 97aba52e56..d1b2948777 100644
--- a/src/app/core/json-patch/json-patch-operations.service.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.spec.ts
@@ -17,6 +17,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { JsonPatchOperationsEntry, JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
 import {
   CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
   RollbacktPatchOperationsAction,
   StartTransactionPatchOperationsAction
 } from './json-patch-operations.actions';
@@ -288,4 +289,19 @@ describe('JsonPatchOperationsService test suite', () => {
     });
   });
 
+  describe('deletePendingJsonPatchOperations', () => {
+    beforeEach(() => {
+      store.dispatch.and.callFake(() => { /* */ });
+    });
+
+    it('should dispatch a new DeletePendingJsonPatchOperationsAction', () => {
+
+      const expectedAction = new DeletePendingJsonPatchOperationsAction();
+      scheduler.schedule(() => service.deletePendingJsonPatchOperations());
+      scheduler.flush();
+
+      expect(store.dispatch).toHaveBeenCalledWith(expectedAction);
+    });
+  });
+
 });
diff --git a/src/app/core/json-patch/json-patch-operations.service.ts b/src/app/core/json-patch/json-patch-operations.service.ts
index 84d946daba..c3363f4db4 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -10,7 +10,7 @@ import { CoreState } from '../core.reducers';
 import { jsonPatchOperationsByResourceType } from './selectors';
 import { JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
 import {
-  CommitPatchOperationsAction,
+  CommitPatchOperationsAction, DeletePendingJsonPatchOperationsAction,
   RollbacktPatchOperationsAction,
   StartTransactionPatchOperationsAction
 } from './json-patch-operations.actions';
@@ -105,6 +105,13 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
     );
   }
 
+  /**
+   * Dispatch an action to delete all pending JSON patch Operations.
+   */
+  public deletePendingJsonPatchOperations() {
+    this.store.dispatch(new DeletePendingJsonPatchOperationsAction());
+  }
+
   /**
    * Return an instance for RestRequest class
    *
diff --git a/src/app/shared/testing/submission-json-patch-operations-service.stub.ts b/src/app/shared/testing/submission-json-patch-operations-service.stub.ts
index 858ded6328..593cf92155 100644
--- a/src/app/shared/testing/submission-json-patch-operations-service.stub.ts
+++ b/src/app/shared/testing/submission-json-patch-operations-service.stub.ts
@@ -6,5 +6,6 @@ export class SubmissionJsonPatchOperationsServiceStub {
 
   jsonPatchByResourceType = jasmine.createSpy('jsonPatchByResourceType');
   jsonPatchByResourceID = jasmine.createSpy('jsonPatchByResourceID');
+  deletePendingJsonPatchOperations = jasmine.createSpy('deletePendingJsonPatchOperations');
 
 }
diff --git a/src/app/submission/edit/submission-edit.component.spec.ts b/src/app/submission/edit/submission-edit.component.spec.ts
index 7b730b7a73..8013162d85 100644
--- a/src/app/submission/edit/submission-edit.component.spec.ts
+++ b/src/app/submission/edit/submission-edit.component.spec.ts
@@ -18,6 +18,8 @@ import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { ItemDataService } from '../../core/data/item-data.service';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
 
 describe('SubmissionEditComponent Component', () => {
 
@@ -25,6 +27,7 @@ describe('SubmissionEditComponent Component', () => {
   let fixture: ComponentFixture<SubmissionEditComponent>;
   let submissionServiceStub: SubmissionServiceStub;
   let itemDataService: ItemDataService;
+  let submissionJsonPatchOperationsServiceStub: SubmissionJsonPatchOperationsServiceStub;
   let router: RouterStub;
 
   const submissionId = '826';
@@ -46,6 +49,7 @@ describe('SubmissionEditComponent Component', () => {
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
+        { provide: SubmissionJsonPatchOperationsService, useClass: SubmissionJsonPatchOperationsServiceStub },
         { provide: ItemDataService, useValue: itemDataService },
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Router, useValue: new RouterStub() },
@@ -60,6 +64,7 @@ describe('SubmissionEditComponent Component', () => {
     fixture = TestBed.createComponent(SubmissionEditComponent);
     comp = fixture.componentInstance;
     submissionServiceStub = TestBed.inject(SubmissionService as any);
+    submissionJsonPatchOperationsServiceStub = TestBed.inject(SubmissionJsonPatchOperationsService as any);
     router = TestBed.inject(Router as any);
   });
 
@@ -112,4 +117,16 @@ describe('SubmissionEditComponent Component', () => {
     expect(comp.submissionDefinition).toBeUndefined();
   });
 
+  describe('ngOnDestroy', () => {
+    it('should call delete pending json patch operations', fakeAsync(() => {
+
+      submissionJsonPatchOperationsServiceStub.deletePendingJsonPatchOperations.and.callFake(() => { /* */ });
+      comp.ngOnDestroy();
+
+      expect(submissionJsonPatchOperationsServiceStub.deletePendingJsonPatchOperations).toHaveBeenCalled();
+    }));
+
+  });
+
+
 });
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index 34fdcba104..154e73a765 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -17,6 +17,7 @@ import { Item } from '../../core/shared/item.model';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
 
 /**
  * This component allows to edit an existing workspaceitem/workflowitem.
@@ -92,7 +93,8 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
               private router: Router,
               private itemDataService: ItemDataService,
               private submissionService: SubmissionService,
-              private translate: TranslateService) {
+              private translate: TranslateService,
+              private submissionJsonPatchOperationsService: SubmissionJsonPatchOperationsService) {
   }
 
   /**
@@ -149,5 +151,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
     this.subs
       .filter((sub) => hasValue(sub))
       .forEach((sub) => sub.unsubscribe());
+
+    this.submissionJsonPatchOperationsService.deletePendingJsonPatchOperations();
   }
 }

From 434ef5628fbc9274a738bf882648a4012e6650e8 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 8 Jun 2021 17:40:17 +0200
Subject: [PATCH 125/169] [DSC-130] Fix issue when switching submission's
 collection between those with different submission definition

---
 .../submission-form-collection.component.spec.ts  |  3 ++-
 .../submission-form-collection.component.ts       | 15 +++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index b4ff31aaf6..14dfcef864 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -261,9 +261,10 @@ describe('SubmissionFormCollectionComponent Component', () => {
         expect(comp.toggled).toHaveBeenCalled();
       });
 
-      it('should ', () => {
+      it('should change collection properly', () => {
         spyOn(comp.collectionChange, 'emit').and.callThrough();
         jsonPatchOpServiceStub.jsonPatchByResourceID.and.returnValue(of(submissionRestResponse));
+        submissionServiceStub.retrieveSubmission.and.returnValue(createSuccessfulRemoteDataObject$(submissionRestResponse[0]));
         comp.ngOnInit();
         comp.onSelect(mockCollectionList[1]);
         fixture.detectChanges();
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 854a2f1db0..ba7eb88c6f 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -13,7 +13,7 @@ import {
 import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
 import {
   find,
-  map
+  map, mergeMap
 } from 'rxjs/operators';
 
 import { Collection } from '../../../core/shared/collection.model';
@@ -27,6 +27,7 @@ import { SubmissionJsonPatchOperationsService } from '../../../core/submission/s
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { SectionsService } from '../../sections/sections.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 
 /**
  * This component allows to show the current collection the submission belonging to and to change it.
@@ -164,11 +165,17 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
       this.submissionService.getSubmissionObjectLinkName(),
       this.submissionId,
       'sections',
-      'collection')
-      .subscribe((submissionObject: SubmissionObject[]) => {
+      'collection').pipe(
+        mergeMap((submissionObject: SubmissionObject[]) => {
+          // retrieve the full submission object with embeds
+          return this.submissionService.retrieveSubmission(submissionObject[0].id).pipe(
+            getFirstSucceededRemoteDataPayload()
+          );
+        })
+      ).subscribe((submissionObject: SubmissionObject) => {
         this.selectedCollectionId = event.collection.id;
         this.selectedCollectionName$ = observableOf(event.collection.name);
-        this.collectionChange.emit(submissionObject[0]);
+        this.collectionChange.emit(submissionObject);
         this.submissionService.changeSubmissionCollection(this.submissionId, event.collection.id);
         this.processingChange$.next(false);
         this.cdr.detectChanges();

From fc398c15f44cb42eabc42513d20f3861c7d21569 Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Thu, 24 Jun 2021 19:44:06 +0200
Subject: [PATCH 126/169] 80113: Rename searching$ into loading$

---
 .../group-registry/groups-registry.component.html           | 4 ++--
 .../group-registry/groups-registry.component.ts             | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 7fced71e6f..4135f4cc95 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,9 +33,9 @@
         </div>
       </form>
 
-      <ds-loading *ngIf="searching$ | async"></ds-loading>
+      <ds-loading *ngIf="loading$ | async"></ds-loading>
       <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
         [paginationOptions]="config"
         [pageInfoState]="pageInfoState$"
         [collectionSize]="(pageInfoState$ | async)?.totalElements"
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index 9215399170..f9b8f9f987 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -75,7 +75,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
   /**
    * A boolean representing if a search is pending
    */
-  searching$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   // Current search in groups registry
   currentSearchQuery: string;
@@ -118,7 +118,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
    * @param data  Contains query param
    */
   search(data: any) {
-    this.searching$.next(true);
+    this.loading$.next(true);
     if (hasValue(this.searchSub)) {
       this.searchSub.unsubscribe();
       this.subs = this.subs.filter((sub: Subscription) => sub !== this.searchSub);
@@ -174,7 +174,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
     ).subscribe((value: PaginatedList<GroupDtoModel>) => {
       this.groupsDto$.next(value);
       this.pageInfoState$.next(value.pageInfo);
-      this.searching$.next(false);
+      this.loading$.next(false);
     });
 
     this.subs.push(this.searchSub);

From 511a2e18aba19bf734bfdf8fab5c3d18ee1570ba Mon Sep 17 00:00:00 2001
From: Bruno Roemers <bruno.roemers@atmire.com>
Date: Thu, 24 Jun 2021 19:50:39 +0200
Subject: [PATCH 127/169] 80113: Display loading indicator after using
 pagination nav

---
 .../group-registry/groups-registry.component.ts               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index f9b8f9f987..ce1b7dedd9 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -9,7 +9,7 @@ import {
   of as observableOf,
   Subscription
 } from 'rxjs';
-import { catchError, map, switchMap, take } from 'rxjs/operators';
+import { catchError, map, switchMap, take, tap } from 'rxjs/operators';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
@@ -118,12 +118,12 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
    * @param data  Contains query param
    */
   search(data: any) {
-    this.loading$.next(true);
     if (hasValue(this.searchSub)) {
       this.searchSub.unsubscribe();
       this.subs = this.subs.filter((sub: Subscription) => sub !== this.searchSub);
     }
     this.searchSub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
+      tap(() => this.loading$.next(true)),
       switchMap((paginationOptions) => {
         const query: string = data.query;
         if (query != null && this.currentSearchQuery !== query) {

From 24ffa6c63ac3dde14acacc11571e772a0c29f50e Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 25 Jun 2021 09:32:45 +0200
Subject: [PATCH 128/169] 79730: Replace component ID with unique number

---
 src/app/core/core.module.ts                   |  4 +++-
 src/app/core/shared/sequence.service.ts       | 24 +++++++++++++++++++
 .../search-filter.component.spec.ts           |  4 +++-
 .../search-filter/search-filter.component.ts  | 14 +++++++----
 4 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 src/app/core/shared/sequence.service.ts

diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 615c2b3977..3c34e5ec35 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -162,6 +162,7 @@ import { UsageReport } from './statistics/models/usage-report.model';
 import { RootDataService } from './data/root-data.service';
 import { Root } from './data/root.model';
 import { SearchConfig } from './shared/search/search-filters/search-config.model';
+import { SequenceService } from './shared/sequence.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -282,7 +283,8 @@ const PROVIDERS = [
   FilteredDiscoveryPageResponseParsingService,
   { provide: NativeWindowService, useFactory: NativeWindowFactory },
   VocabularyService,
-  VocabularyTreeviewService
+  VocabularyTreeviewService,
+  SequenceService,
 ];
 
 /**
diff --git a/src/app/core/shared/sequence.service.ts b/src/app/core/shared/sequence.service.ts
new file mode 100644
index 0000000000..2340ffb259
--- /dev/null
+++ b/src/app/core/shared/sequence.service.ts
@@ -0,0 +1,24 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { Injectable } from '@angular/core';
+
+@Injectable()
+/**
+ * Provides unique sequential numbers
+ */
+export class SequenceService {
+  private value: number;
+
+  constructor() {
+    this.value = 0;
+  }
+
+  public next(): number {
+    return ++this.value;
+  }
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 228eef9a20..a686b00b77 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -12,6 +12,7 @@ import { SearchFilterConfig } from '../../search-filter-config.model';
 import { FilterType } from '../../filter-type.model';
 import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+import { SequenceService } from '../../../../core/shared/sequence.service';
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
@@ -65,7 +66,8 @@ describe('SearchFilterComponent', () => {
           provide: SearchFilterService,
           useValue: mockFilterService
         },
-        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() }
+        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
+        { provide: SequenceService, useValue: new SequenceService() },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchFilterComponent, {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index 57c4f991db..0f7f763b45 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -10,6 +10,7 @@ import { isNotEmpty } from '../../../empty.util';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+import { SequenceService } from '../../../../core/shared/sequence.service';
 
 @Component({
   selector: 'ds-search-filter',
@@ -62,10 +63,15 @@ export class SearchFilterComponent implements OnInit {
    */
   active$: Observable<boolean>;
 
+  private readonly sequenceId: number;
+
   constructor(
     private filterService: SearchFilterService,
     private searchService: SearchService,
-    @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
+    @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService,
+    private sequenceService: SequenceService,
+  ) {
+    this.sequenceId = this.sequenceService.next();
   }
 
   /**
@@ -141,13 +147,11 @@ export class SearchFilterComponent implements OnInit {
   }
 
   get regionId(): string {
-    // tslint:disable-next-line:no-string-literal
-    return `search-filter-region-${this.constructor['ɵcmp'].id}`;
+    return `search-filter-region-${this.sequenceId}`;
   }
 
   get toggleId(): string {
-    // tslint:disable-next-line:no-string-literal
-    return `search-filter-toggle-${this.constructor['ɵcmp'].id}`;
+    return `search-filter-toggle-${this.sequenceId}`;
   }
 
   /**

From 98b2c75a3cf3e2968b51296e2e73710260917cdc Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 25 Jun 2021 10:00:06 +0200
Subject: [PATCH 129/169] 79730: Add unit tests for sequence service &
 ds-search-filter IDs

---
 src/app/core/shared/sequence.service.spec.ts  | 22 +++++++++++++++++++
 .../search-filter.component.spec.ts           | 11 +++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/app/core/shared/sequence.service.spec.ts

diff --git a/src/app/core/shared/sequence.service.spec.ts b/src/app/core/shared/sequence.service.spec.ts
new file mode 100644
index 0000000000..e48ad3efcc
--- /dev/null
+++ b/src/app/core/shared/sequence.service.spec.ts
@@ -0,0 +1,22 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { SequenceService } from './sequence.service';
+
+let service: SequenceService;
+
+describe('SequenceService', () => {
+  beforeEach(() => {
+    service = new SequenceService();
+  });
+
+  it('should return sequential numbers on next(), starting with 1', () => {
+    const NUMBERS = [1,2,3,4,5];
+    const sequence = NUMBERS.map(() => service.next());
+    expect(sequence).toEqual(NUMBERS);
+  });
+});
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index a686b00b77..5e0077e11d 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -51,12 +51,15 @@ describe('SearchFilterComponent', () => {
 
   };
   let filterService;
+  let sequenceService;
   const mockResults = observableOf(['test', 'data']);
   const searchServiceStub = {
     getFacetValuesFor: (filter) => mockResults
   };
 
   beforeEach(waitForAsync(() => {
+    sequenceService = jasmine.createSpyObj('sequenceService', { next: 17 });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule],
       declarations: [SearchFilterComponent],
@@ -67,7 +70,7 @@ describe('SearchFilterComponent', () => {
           useValue: mockFilterService
         },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
-        { provide: SequenceService, useValue: new SequenceService() },
+        { provide: SequenceService, useValue: sequenceService },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(SearchFilterComponent, {
@@ -83,6 +86,12 @@ describe('SearchFilterComponent', () => {
     filterService = (comp as any).filterService;
   });
 
+  it('should generate unique IDs', () => {
+    expect(sequenceService.next).toHaveBeenCalled();
+    expect(comp.toggleId).toContain('17');
+    expect(comp.regionId).toContain('17');
+  });
+
   describe('when the toggle method is triggered', () => {
     beforeEach(() => {
       spyOn(filterService, 'toggle');

From a089e662fb9ba17ee8a546f554b48bc221e4ed71 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 25 Jun 2021 14:08:21 +0200
Subject: [PATCH 130/169] fix issue with date picker that didn't save the date
 entered manually

---
 .../date-picker-inline/dynamic-date-picker-inline.component.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 103e3aac23..9e4e75c7d8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -19,6 +19,7 @@
            [startDate]="model.focusedDate"
            (blur)="onBlur($event)"
            (dateSelect)="onChange($event)"
+           (change)="onChange($event)"
            (focus)="onFocus($event)">
 
     <div class="input-group-append">

From 0d5fc8a1c0035e59b9ed44cbfccc4c6fc66c823f Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Mon, 28 Jun 2021 12:28:59 +0200
Subject: [PATCH 131/169] refactor followlinks to use a single object for all
 params and add an isOptional param. Also add support for embedding links to
 search service

---
 .../bitstream-page.resolver.ts                |  2 +-
 .../collection-page.resolver.ts               |  2 +-
 .../item-authorizations.component.ts          |  2 +-
 .../edit-relationship-list.component.ts       |  2 +-
 src/app/+item-page/item.resolver.ts           |  8 +--
 src/app/+search-page/search.component.ts      |  4 +-
 .../community-list-service.ts                 |  8 +--
 .../core/cache/builders/link.service.spec.ts  | 10 +--
 src/app/core/cache/builders/link.service.ts   |  9 +--
 .../remote-data-build.service.spec.ts         |  2 +-
 .../builders/remote-data-build.service.ts     |  2 +-
 src/app/core/data/data.service.spec.ts        | 26 +++++--
 .../data/dso-redirect-data.service.spec.ts    | 22 +++++-
 src/app/core/shared/search/search.service.ts  | 72 +++++++++++++++++--
 .../vocabularies/vocabulary.service.ts        |  6 +-
 ...-search-result-detail-element.component.ts |  4 +-
 ...-search-result-detail-element.component.ts |  4 +-
 ...ed-search-result-list-element.component.ts |  5 +-
 ...ed-search-result-list-element.component.ts |  5 +-
 ...ed-search-result-list-element.component.ts |  2 +-
 ...ol-search-result-list-element.component.ts |  2 +-
 .../shared/utils/follow-link-config.model.ts  | 35 ++++++---
 22 files changed, 170 insertions(+), 64 deletions(-)

diff --git a/src/app/+bitstream-page/bitstream-page.resolver.ts b/src/app/+bitstream-page/bitstream-page.resolver.ts
index a876b22d5e..fd9d5b351b 100644
--- a/src/app/+bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/+bitstream-page/bitstream-page.resolver.ts
@@ -35,7 +35,7 @@ export class BitstreamPageResolver implements Resolve<RemoteData<Bitstream>> {
      */
     get followLinks(): FollowLinkConfig<Bitstream>[] {
         return [
-            followLink('bundle', undefined, true, true, true, followLink('item')),
+            followLink('bundle', {}, followLink('item')),
             followLink('format')
         ];
     }
diff --git a/src/app/+collection-page/collection-page.resolver.ts b/src/app/+collection-page/collection-page.resolver.ts
index f6f87f117c..d476a180d3 100644
--- a/src/app/+collection-page/collection-page.resolver.ts
+++ b/src/app/+collection-page/collection-page.resolver.ts
@@ -14,7 +14,7 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
  * Requesting them as embeds will limit the number of requests
  */
 export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
-  followLink('parentCommunity', undefined, true, true, true,
+  followLink('parentCommunity', {},
     followLink('parentCommunity')
   ),
   followLink('logo')
diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index fb193b24d4..e4899abe3a 100644
--- a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -79,7 +79,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
       getFirstSucceededRemoteDataWithNotEmptyPayload(),
       map((item: Item) => this.linkService.resolveLink(
         item,
-        followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams'))
+        followLink('bundles', {}, followLink('bitstreams'))
       ))
     ) as Observable<Item>;
 
diff --git a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 3f9637cdc9..3f1d046a87 100644
--- a/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -323,7 +323,7 @@ export class EditRelationshipListComponent implements OnInit {
 
   private getItemRelationships() {
     this.linkService.resolveLink(this.item,
-      followLink('relationships', undefined, true, true, true,
+      followLink('relationships', {},
         followLink('relationshipType'),
         followLink('leftItem'),
         followLink('rightItem'),
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 99b96511fe..217529d271 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -15,13 +15,13 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
  * Requesting them as embeds will limit the number of requests
  */
 export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
-  followLink('owningCollection', undefined, true, true, true,
-    followLink('parentCommunity', undefined, true, true, true,
+  followLink('owningCollection', {},
+    followLink('parentCommunity', {},
       followLink('parentCommunity'))
   ),
-  followLink('bundles', new FindListOptions(), true, true, true, followLink('bitstreams')),
+  followLink('bundles', {}, followLink('bitstreams')),
   followLink('relationships'),
-  followLink('version', undefined, true, true, true, followLink('versionhistory')),
+  followLink('version', {}, followLink('versionhistory')),
 ];
 
 /**
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index b817c82a57..f6e9664911 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -16,9 +16,11 @@ import { SearchResult } from '../shared/search/search-result.model';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { SearchService } from '../core/shared/search/search.service';
 import { currentPath } from '../shared/utils/route.utils';
-import { Router} from '@angular/router';
+import { Router } from '@angular/router';
 import { Context } from '../core/shared/context.model';
 import { SortOptions } from '../core/cache/models/sort-options.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Item } from '../core/shared/item.model';
 
 @Component({
   selector: 'ds-search',
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index cbf70ca39a..e882ae5902 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -174,8 +174,8 @@ export class CommunityListService {
           direction: options.sort.direction
         }
       },
-      followLink('subcommunities', this.configOnePage, true, true),
-      followLink('collections', this.configOnePage, true, true))
+      followLink('subcommunities', { findListOptions: this.configOnePage }),
+      followLink('collections', { findListOptions: this.configOnePage }))
       .pipe(
         getFirstSucceededRemoteData(),
         map((results) => results.payload),
@@ -242,8 +242,8 @@ export class CommunityListService {
             elementsPerPage: MAX_COMCOLS_PER_PAGE,
             currentPage: i
           },
-          followLink('subcommunities', this.configOnePage, true, true),
-          followLink('collections', this.configOnePage, true, true))
+          followLink('subcommunities', { findListOptions: this.configOnePage }),
+          followLink('collections', { findListOptions: this.configOnePage }))
           .pipe(
             getFirstCompletedRemoteData(),
             switchMap((rd: RemoteData<PaginatedList<Community>>) => {
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index a6d9c59492..f567c39314 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -102,7 +102,7 @@ describe('LinkService', () => {
   describe('resolveLink', () => {
     describe(`when the linkdefinition concerns a single object`, () => {
       beforeEach(() => {
-        service.resolveLink(testModel, followLink('predecessor', {}, true, true, true, followLink('successor')));
+        service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
       });
       it('should call dataservice.findByHref with the correct href and nested links', () => {
         expect(testDataService.findByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, true, true, followLink('successor'));
@@ -116,7 +116,7 @@ describe('LinkService', () => {
           propertyName: 'predecessor',
           isList: true
         });
-        service.resolveLink(testModel, followLink('predecessor', { some: 'options ' } as any, true, true, true, followLink('successor')));
+        service.resolveLink(testModel, followLink('predecessor', { findListOptions: { some: 'options ' } as any }, followLink('successor')));
       });
       it('should call dataservice.findAllByHref with the correct href, findListOptions,  and nested links', () => {
         expect(testDataService.findAllByHref).toHaveBeenCalledWith(testModel._links.predecessor.href, { some: 'options ' } as any, true, true, followLink('successor'));
@@ -124,7 +124,7 @@ describe('LinkService', () => {
     });
     describe('either way', () => {
       beforeEach(() => {
-        result = service.resolveLink(testModel, followLink('predecessor', {}, true, true, true, followLink('successor')));
+        result = service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
       });
 
       it('should call getLinkDefinition with the correct model and link', () => {
@@ -149,7 +149,7 @@ describe('LinkService', () => {
       });
       it('should throw an error', () => {
         expect(() => {
-          service.resolveLink(testModel, followLink('predecessor', {}, true, true, true, followLink('successor')));
+          service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
         }).toThrow();
       });
     });
@@ -160,7 +160,7 @@ describe('LinkService', () => {
       });
       it('should throw an error', () => {
         expect(() => {
-          service.resolveLink(testModel, followLink('predecessor', {}, true, true, true, followLink('successor')));
+          service.resolveLink(testModel, followLink('predecessor', {}, followLink('successor')));
         }).toThrow();
       });
     });
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index 29f8633da5..66f91dbbd6 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -39,7 +39,7 @@ export class LinkService {
    */
   public resolveLinks<T extends HALResource>(model: T, ...linksToFollow: FollowLinkConfig<T>[]): T {
     linksToFollow.forEach((linkToFollow: FollowLinkConfig<T>) => {
-        this.resolveLink(model, linkToFollow);
+      this.resolveLink(model, linkToFollow);
     });
     return model;
   }
@@ -55,9 +55,7 @@ export class LinkService {
   public resolveLinkWithoutAttaching<T extends HALResource, U extends HALResource>(model, linkToFollow: FollowLinkConfig<T>): Observable<RemoteData<U>> {
     const matchingLinkDef = this.getLinkDefinition(model.constructor, linkToFollow.name);
 
-    if (hasNoValue(matchingLinkDef)) {
-      throw new Error(`followLink('${linkToFollow.name}') was used for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`);
-    } else {
+    if (hasValue(matchingLinkDef)) {
       const provider = this.getDataServiceFor(matchingLinkDef.resourceType);
 
       if (hasNoValue(provider)) {
@@ -84,7 +82,10 @@ export class LinkService {
           throw e;
         }
       }
+    } else if (!linkToFollow.isOptional) {
+      throw new Error(`followLink('${linkToFollow.name}') was used as a required link for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`);
     }
+
     return EMPTY;
   }
 
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index cb193724a7..0cb45733a6 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -523,7 +523,7 @@ describe('RemoteDataBuildService', () => {
       let paginatedLinksToFollow;
       beforeEach(() => {
         paginatedLinksToFollow = [
-          followLink('page', undefined, true, true, true, ...linksToFollow),
+          followLink('page', {}, ...linksToFollow),
           ...linksToFollow
         ];
       });
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 11815c133b..6b67549f2d 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -271,7 +271,7 @@ export class RemoteDataBuildService {
    * @param linksToFollow     List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
   buildList<T extends HALResource>(href$: string | Observable<string>, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
-    return this.buildFromHref<PaginatedList<T>>(href$, followLink('page', undefined, false, true, true, ...linksToFollow));
+    return this.buildFromHref<PaginatedList<T>>(href$, followLink('page', { shouldEmbed: false }, ...linksToFollow));
   }
 
   /**
diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index 88b15754af..5bc7423824 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -233,7 +233,7 @@ describe('DataService', () => {
       const config: FindListOptions = Object.assign(new FindListOptions(), {
         elementsPerPage: 5
       });
-      (service as any).getFindAllHref({}, null, followLink('bundles', config,  true, true, true)).subscribe((value) => {
+      (service as any).getFindAllHref({}, null, followLink('bundles', { findListOptions: config })).subscribe((value) => {
         expect(value).toBe(expected);
       });
     });
@@ -253,7 +253,7 @@ describe('DataService', () => {
         elementsPerPage: 2
       });
 
-      (service as any).getFindAllHref({}, null, followLink('bundles'), followLink('owningCollection', config, true, true, true), followLink('templateItemOf')).subscribe((value) => {
+      (service as any).getFindAllHref({}, null, followLink('bundles'), followLink('owningCollection', { findListOptions: config }), followLink('templateItemOf')).subscribe((value) => {
         expect(value).toBe(expected);
       });
     });
@@ -261,7 +261,13 @@ describe('DataService', () => {
     it('should not include linksToFollow with shouldEmbed = false', () => {
       const expected = `${endpoint}?embed=templateItemOf`;
 
-      (service as any).getFindAllHref({}, null, followLink('bundles', undefined, false), followLink('owningCollection', undefined, false), followLink('templateItemOf')).subscribe((value) => {
+      (service as any).getFindAllHref(
+        {},
+        null,
+        followLink('bundles', { shouldEmbed: false }),
+        followLink('owningCollection', { shouldEmbed: false }),
+        followLink('templateItemOf')
+      ).subscribe((value) => {
         expect(value).toBe(expected);
       });
     });
@@ -269,7 +275,7 @@ describe('DataService', () => {
     it('should include nested linksToFollow 3lvl', () => {
       const expected = `${endpoint}?embed=owningCollection/itemtemplate/relationships`;
 
-      (service as any).getFindAllHref({}, null, followLink('owningCollection', undefined, true, true, true, followLink('itemtemplate', undefined, true, true, true, followLink('relationships')))).subscribe((value) => {
+      (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships')))).subscribe((value) => {
         expect(value).toBe(expected);
       });
     });
@@ -279,7 +285,7 @@ describe('DataService', () => {
       const config: FindListOptions = Object.assign(new FindListOptions(), {
         elementsPerPage: 4
       });
-      (service as any).getFindAllHref({}, null, followLink('owningCollection', undefined, true, true, true, followLink('itemtemplate', config, true, true, true))).subscribe((value) => {
+      (service as any).getFindAllHref({}, null, followLink('owningCollection', {}, followLink('itemtemplate', { findListOptions: config }))).subscribe((value) => {
         expect(value).toBe(expected);
       });
     });
@@ -308,13 +314,19 @@ describe('DataService', () => {
 
     it('should not include linksToFollow with shouldEmbed = false', () => {
       const expected = `${endpointMock}/${resourceIdMock}?embed=templateItemOf`;
-      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('bundles', undefined, false), followLink('owningCollection', undefined, false), followLink('templateItemOf'));
+      const result = (service as any).getIDHref(
+        endpointMock,
+        resourceIdMock,
+        followLink('bundles', { shouldEmbed: false }),
+        followLink('owningCollection', { shouldEmbed: false }),
+        followLink('templateItemOf')
+      );
       expect(result).toEqual(expected);
     });
 
     it('should include nested linksToFollow 3lvl', () => {
       const expected = `${endpointMock}/${resourceIdMock}?embed=owningCollection/itemtemplate/relationships`;
-      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('owningCollection', undefined, true,  true, true,followLink('itemtemplate', undefined, true, true, true, followLink('relationships'))));
+      const result = (service as any).getIDHref(endpointMock, resourceIdMock, followLink('owningCollection', {}, followLink('itemtemplate', {}, followLink('relationships'))));
       expect(result).toEqual(expected);
     });
   });
diff --git a/src/app/core/data/dso-redirect-data.service.spec.ts b/src/app/core/data/dso-redirect-data.service.spec.ts
index d64f37ad78..bcd25487c2 100644
--- a/src/app/core/data/dso-redirect-data.service.spec.ts
+++ b/src/app/core/data/dso-redirect-data.service.spec.ts
@@ -119,7 +119,7 @@ describe('DsoRedirectDataService', () => {
     });
     it('should navigate to entities route with the corresponding entity type', () => {
       remoteData.payload.type = 'item';
-      remoteData.payload.metadata =  {
+      remoteData.payload.metadata = {
         'dspace.entity.type': [
           {
             language: 'en_US',
@@ -174,13 +174,29 @@ describe('DsoRedirectDataService', () => {
 
     it('should not include linksToFollow with shouldEmbed = false', () => {
       const expected = `${requestUUIDURL}&embed=templateItemOf`;
-      const result = (service as any).getIDHref(pidLink, dsoUUID, followLink('bundles', undefined, false), followLink('owningCollection', undefined, false), followLink('templateItemOf'));
+      const result = (service as any).getIDHref(
+        pidLink,
+        dsoUUID,
+        followLink('bundles', { shouldEmbed: false }),
+        followLink('owningCollection', { shouldEmbed: false }),
+        followLink('templateItemOf')
+      );
       expect(result).toEqual(expected);
     });
 
     it('should include nested linksToFollow 3lvl', () => {
       const expected = `${requestUUIDURL}&embed=owningCollection/itemtemplate/relationships`;
-      const result = (service as any).getIDHref(pidLink, dsoUUID, followLink('owningCollection', undefined, true, true, true, followLink('itemtemplate', undefined, true, true, true, followLink('relationships'))));
+      const result = (service as any).getIDHref(
+        pidLink,
+        dsoUUID,
+        followLink('owningCollection',
+          {},
+          followLink('itemtemplate',
+            {},
+            followLink('relationships')
+          )
+        )
+      );
       expect(result).toEqual(expected);
     });
   });
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index 9cb284db32..75723366bc 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -41,6 +41,43 @@ import { SearchConfig } from './search-filters/search-config.model';
 import { PaginationService } from '../../pagination/pagination.service';
 import { SearchConfigurationService } from './search-configuration.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { DataService } from '../../data/data.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../../core.reducers';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DSOChangeAnalyzer } from '../../data/dso-change-analyzer.service';
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * A class that lets us delegate some methods to DataService
+ */
+class DataServiceImpl extends DataService<any> {
+  protected linkPath = 'discover';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<any>) {
+    super();
+  }
+
+  /**
+   * Adds the embed options to the link for the request
+   * @param href            The href the params are to be added to
+   * @param args            params for the query string
+   * @param linksToFollow   links we want to embed in query string if shouldEmbed is true
+   */
+  public addEmbedParams(href: string, args: string[], ...linksToFollow: FollowLinkConfig<any>[]) {
+    return super.addEmbedParams(href, args, ...linksToFollow);
+  }
+}
 
 /**
  * Service that performs all general actions that have to do with the search page
@@ -78,6 +115,11 @@ export class SearchService implements OnDestroy {
    */
   private sub;
 
+  /**
+   * Instance of DataServiceImpl that lets us delegate some methods to DataService
+   */
+  private searchDataService: DataServiceImpl;
+
   constructor(private router: Router,
               private routeService: RouteService,
               protected requestService: RequestService,
@@ -89,6 +131,16 @@ export class SearchService implements OnDestroy {
               private paginationService: PaginationService,
               private searchConfigurationService: SearchConfigurationService
   ) {
+    this.searchDataService = new DataServiceImpl(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined
+    );
   }
 
   /**
@@ -131,7 +183,17 @@ export class SearchService implements OnDestroy {
   search<T extends DSpaceObject>(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<SearchObjects<T>>> {
     const href$ = this.getEndpoint(searchOptions);
 
-    href$.pipe(take(1)).subscribe((url: string) => {
+    href$.pipe(
+      take(1),
+      map((href: string) => {
+        const args = this.searchDataService.addEmbedParams(href, [], ...linksToFollow);
+        if (isNotEmpty(args)) {
+          return new URLCombiner(href, `?${args.join('&')}`).toString();
+        } else {
+          return href;
+        }
+      })
+    ).subscribe((url: string) => {
       const request = new this.request(this.requestService.generateRequestId(), url);
 
       const getResponseParserFn: () => GenericConstructor<ResponseParsingService> = () => {
@@ -152,7 +214,7 @@ export class SearchService implements OnDestroy {
     );
 
     return this.directlyAttachIndexableObjects(sqr$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
- }
+  }
 
   /**
    * Method to retrieve request entries for search results from the server
@@ -399,9 +461,9 @@ export class SearchService implements OnDestroy {
         let pageParams = { page: 1 };
         const queryParams = { view: viewMode };
         if (viewMode === ViewMode.DetailedListElement) {
-          pageParams = Object.assign(pageParams, {pageSize: 1});
+          pageParams = Object.assign(pageParams, { pageSize: 1 });
         } else if (config.pageSize === 1) {
-          pageParams = Object.assign(pageParams, {pageSize: 10});
+          pageParams = Object.assign(pageParams, { pageSize: 10 });
         }
         this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, hasValue(searchLinkParts) ? searchLinkParts : [this.getSearchLink()], pageParams, queryParams);
       });
@@ -413,7 +475,7 @@ export class SearchService implements OnDestroy {
    * @param {string} configurationName the name of the configuration
    * @returns {Observable<RemoteData<SearchConfig[]>>} The found configuration
    */
-  getSearchConfigurationFor(scope?: string, configurationName?: string ): Observable<RemoteData<SearchConfig>> {
+  getSearchConfigurationFor(scope?: string, configurationName?: string): Observable<RemoteData<SearchConfig>> {
     const href$ = this.halService.getEndpoint(this.configurationLinkPath).pipe(
       map((url: string) => this.getConfigUrl(url, scope, configurationName)),
     );
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index d82ef01087..da58512441 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -173,7 +173,7 @@ export class VocabularyService {
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
-    return this.findVocabularyById(vocabularyOptions.name, true, true, followLink('entries', options,  false)).pipe(
+    return this.findVocabularyById(vocabularyOptions.name, true, true, followLink('entries', { findListOptions: options, shouldEmbed: false })).pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((vocabulary: Vocabulary) => vocabulary.entries),
     );
@@ -200,7 +200,7 @@ export class VocabularyService {
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
-    return this.findVocabularyById(vocabularyOptions.name, true, true, followLink('entries', options, false)).pipe(
+    return this.findVocabularyById(vocabularyOptions.name, true, true, followLink('entries', { findListOptions: options, shouldEmbed: false })).pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((vocabulary: Vocabulary) => vocabulary.entries),
     );
@@ -249,7 +249,7 @@ export class VocabularyService {
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
-    return this.findVocabularyById(vocabularyOptions.name, true, true, followLink('entries', options, false)).pipe(
+    return this.findVocabularyById(vocabularyOptions.name, true, true, followLink('entries', { findListOptions: options, shouldEmbed: false })).pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((vocabulary: Vocabulary) => vocabulary.entries),
       getFirstSucceededRemoteListPayload(),
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
index b729307443..74411d2341 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
@@ -49,8 +49,8 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
    */
   ngOnInit() {
     super.ngOnInit();
-    this.linkService.resolveLinks(this.dso, followLink('workflowitem', null, true, true, true,
-      followLink('item', null, true, true, true, followLink('bundles')),
+    this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
+      followLink('item', {}, followLink('bundles')),
       followLink('submitter')
     ), followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
index a8b2514ffb..df27abd42e 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
@@ -48,8 +48,8 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
    */
   ngOnInit() {
     super.ngOnInit();
-    this.linkService.resolveLinks(this.dso, followLink('workflowitem', null, true, true, true,
-      followLink('item', null, true, true, true, followLink('bundles')),
+    this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
+      followLink('item', {}, followLink('bundles')),
       followLink('submitter')
     ), followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index 5571782ce2..eaf407d787 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -55,10 +55,7 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso,
       followLink('workflowitem',
-        null,
-        true,
-        false,
-        true,
+        { useCachedVersionIfAvailable: false },
         followLink('item'),
         followLink('submitter')
       ),
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index 630aa699a7..0b9a925dbf 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -56,10 +56,7 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso,
       followLink('workflowitem',
-        null,
-        true,
-        false,
-        true,
+        { useCachedVersionIfAvailable: false },
         followLink('item'),
         followLink('submitter')
       ),
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index dae3272889..2cf8f9a231 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -50,7 +50,7 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
    */
   ngOnInit() {
     super.ngOnInit();
-    this.linkService.resolveLinks(this.dso, followLink('workflowitem', null, true, true, true,
+    this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item'), followLink('submitter')
     ), followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index fe4fa715ee..e9d64db572 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -60,7 +60,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
    */
   ngOnInit() {
     super.ngOnInit();
-    this.linkService.resolveLinks(this.dso, followLink('workflowitem', null, true, true, true,
+    this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item'), followLink('submitter')
     ), followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/utils/follow-link-config.model.ts b/src/app/shared/utils/follow-link-config.model.ts
index c823d53296..08153e1217 100644
--- a/src/app/shared/utils/follow-link-config.model.ts
+++ b/src/app/shared/utils/follow-link-config.model.ts
@@ -1,5 +1,6 @@
 import { FindListOptions } from '../../core/data/request.models';
 import { HALResource } from '../../core/shared/hal-resource.model';
+import { hasValue } from '../empty.util';
 
 /**
  * A class to send the retrieval of a {@link HALLink}
@@ -40,6 +41,12 @@ export class FollowLinkConfig<R extends HALResource> {
    * Defaults to true
    */
   reRequestOnStale? = true;
+
+  /**
+   * If this is false an error will be thrown if the link doesn't exist on the model it is used on
+   * Defaults to false
+   */
+  isOptional? = false;
 }
 
 /**
@@ -57,23 +64,35 @@ export class FollowLinkConfig<R extends HALResource> {
  * no valid cached version. Defaults
  * @param reRequestOnStale: Whether or not the link should automatically be re-requested after the
  * response becomes stale
+ * @param isOptional: Whether or not to fail if the link doesn't exist
  * @param linksToFollow: a list of {@link FollowLinkConfig}s to
  * use on the retrieved object.
  */
 export const followLink = <R extends HALResource>(
   linkName: keyof R['_links'],
-  findListOptions?: FindListOptions,
-  shouldEmbed = true,
-  useCachedVersionIfAvailable = true,
-  reRequestOnStale = true,
-  ...linksToFollow: FollowLinkConfig<any>[]
-): FollowLinkConfig<R> => {
-  return {
-    name: linkName,
+  {
     findListOptions,
     shouldEmbed,
     useCachedVersionIfAvailable,
     reRequestOnStale,
+    isOptional
+  }: {
+    findListOptions?: FindListOptions,
+    shouldEmbed?: boolean,
+    useCachedVersionIfAvailable?: boolean,
+    reRequestOnStale?: boolean,
+    isOptional?: boolean,
+  } = {},
+  ...linksToFollow: FollowLinkConfig<any>[]
+): FollowLinkConfig<R> => {
+  const followLinkConfig = {
+    name: linkName,
+    findListOptions: hasValue(findListOptions) ? findListOptions : new FindListOptions(),
+    shouldEmbed: hasValue(shouldEmbed) ? shouldEmbed : true,
+    useCachedVersionIfAvailable: hasValue(useCachedVersionIfAvailable) ? useCachedVersionIfAvailable : true,
+    reRequestOnStale: hasValue(reRequestOnStale) ? reRequestOnStale : true,
+    isOptional: hasValue(isOptional) ? isOptional : false,
     linksToFollow
   };
+  return followLinkConfig;
 };

From acff2186b47c52445107893fbdfde6707e86878a Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 25 Jun 2021 17:17:56 +0200
Subject: [PATCH 132/169] 80369: Add thumbnail link to Item & Bitstream models

---
 src/app/core/shared/bitstream.model.ts        |  5 +++--
 src/app/core/shared/item.model.ts             | 10 ++++++++++
 src/app/thumbnail/thumbnail.component.spec.ts |  2 ++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts
index 314818b482..baf2f82635 100644
--- a/src/app/core/shared/bitstream.model.ts
+++ b/src/app/core/shared/bitstream.model.ts
@@ -43,13 +43,14 @@ export class Bitstream extends DSpaceObject implements HALResource {
     bundle: HALLink;
     format: HALLink;
     content: HALLink;
+    thumbnail: HALLink;
   };
 
   /**
    * The thumbnail for this Bitstream
-   * Needs to be resolved first, but isn't available as a {@link HALLink} yet
-   * Use BitstreamDataService.getThumbnailFor(…) for now.
+   * Will be undefined unless the thumbnail {@link HALLink} has been resolved.
    */
+  @link(BITSTREAM, false, 'thumbnail')
   thumbnail?: Observable<RemoteData<Bitstream>>;
 
   /**
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 53eb5e3ce2..65265e76ad 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -19,6 +19,8 @@ import { ITEM } from './item.resource-type';
 import { ChildHALResource } from './child-hal-resource.model';
 import { Version } from './version.model';
 import { VERSION } from './version.resource-type';
+import { BITSTREAM } from './bitstream.resource-type';
+import { Bitstream } from './bitstream.model';
 
 /**
  * Class representing a DSpace Item
@@ -69,6 +71,7 @@ export class Item extends DSpaceObject implements ChildHALResource {
     owningCollection: HALLink;
     templateItemOf: HALLink;
     version: HALLink;
+    thumbnail: HALLink;
     self: HALLink;
   };
 
@@ -100,6 +103,13 @@ export class Item extends DSpaceObject implements ChildHALResource {
   @link(RELATIONSHIP, true)
   relationships?: Observable<RemoteData<PaginatedList<Relationship>>>;
 
+  /**
+   * The thumbnail for this Item
+   * Will be undefined unless the thumbnail {@link HALLink} has been resolved.
+   */
+  @link(BITSTREAM, false, 'thumbnail')
+  thumbnail?: Observable<RemoteData<Bitstream>>;
+
   /**
    * Method that returns as which type of object this object should be rendered
    */
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index bc9d159750..eea585f9f8 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -78,6 +78,7 @@ describe('ThumbnailComponent', () => {
         bundle: { href: 'bundle.url' },
         format: { href: 'format.url' },
         content: { href: 'content.url' },
+        thumbnail: undefined,
       };
     });
 
@@ -126,6 +127,7 @@ describe('ThumbnailComponent', () => {
           bundle: { href: 'bundle.url' },
           format: { href: 'format.url' },
           content: { href: 'content.url' },
+          thumbnail: undefined,
         };
         thumbnail = createSuccessfulRemoteDataObject(bitstream);
       });

From d21d0eae5568eebf3df0f7d8affa37922de7be85 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 25 Jun 2021 17:18:01 +0200
Subject: [PATCH 133/169] 80369: Add followLinks for thumbnail

---
 .../file-section/full-file-section.component.ts             | 6 ++++--
 src/app/+item-page/item.resolver.ts                         | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
index 214484120e..e21c1a32eb 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
@@ -68,7 +68,8 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
         {elementsPerPage: options.pageSize, currentPage: options.currentPage},
         true,
         true,
-        followLink('format')
+        followLink('format'),
+        followLink('thumbnail'),
       )),
       tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
           if (hasValue(rd.errorMessage)) {
@@ -85,7 +86,8 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
         {elementsPerPage: options.pageSize, currentPage: options.currentPage},
         true,
         true,
-        followLink('format')
+        followLink('format'),
+        followLink('thumbnail'),
       )),
       tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
           if (hasValue(rd.errorMessage)) {
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 217529d271..62b778e95c 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -22,6 +22,7 @@ export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
   followLink('bundles', {}, followLink('bitstreams')),
   followLink('relationships'),
   followLink('version', {}, followLink('versionhistory')),
+  followLink('thumbnail')
 ];
 
 /**

From c1b1cb2a272039c8afc38727f02702b2b841edc5 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 25 Jun 2021 17:29:18 +0200
Subject: [PATCH 134/169] 80369: Remove deprecated front-end thumbnail methods

---
 .../publication/publication.component.html    |  2 +-
 .../item-types/shared/item.component.ts       | 17 +---
 .../untyped-item/untyped-item.component.html  |  2 +-
 src/app/core/data/bitstream-data.service.ts   | 86 -------------------
 ...-search-result-grid-element.component.html |  4 +-
 ...-search-result-grid-element.component.html |  4 +-
 ...-search-result-grid-element.component.html |  4 +-
 .../journal-issue.component.html              |  2 +-
 .../journal-volume.component.html             |  2 +-
 .../item-pages/journal/journal.component.html |  2 +-
 ...-search-result-grid-element.component.html |  4 +-
 ...-search-result-grid-element.component.html |  4 +-
 ...-search-result-grid-element.component.html |  4 +-
 .../org-unit/org-unit.component.html          |  2 +-
 .../item-pages/person/person.component.html   |  2 +-
 .../item-pages/project/project.component.html |  2 +-
 ...ult-list-submission-element.component.html |  2 +-
 ...esult-list-submission-element.component.ts | 10 ---
 ...esult-list-submission-element.component.ts | 10 ---
 .../item-detail-preview.component.html        |  2 +-
 .../item-detail-preview.component.spec.ts     |  7 --
 .../item-detail-preview.component.ts          | 17 +---
 ...-search-result-grid-element.component.html |  5 +-
 .../search-result-grid-element.component.ts   |  9 --
 24 files changed, 27 insertions(+), 178 deletions(-)

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 a5282bfa7f..9e61f00e48 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
@@ -10,7 +10,7 @@
   <div class="col-xs-12 col-md-4">
     <ng-container *ngIf="!mediaViewer.image">
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-        <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
+        <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
     <ng-container *ngIf="mediaViewer.image">
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 130f67edc7..7f437acfbb 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -7,6 +7,7 @@ import { takeUntilCompletedRemoteData } from '../../../../core/shared/operators'
 import { getItemPageRoute } from '../../../item-page-routing-paths';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { Observable } from 'rxjs/internal/Observable';
 
 @Component({
   selector: 'ds-item',
@@ -18,28 +19,14 @@ import { RemoteData } from '../../../../core/data/remote-data';
 export class ItemComponent implements OnInit {
   @Input() object: Item;
 
-  /**
-   * The Item's thumbnail
-   */
-  thumbnail$: BehaviorSubject<RemoteData<Bitstream>>;
-
   /**
    * Route to the item page
    */
   itemPageRoute: string;
-  mediaViewer = environment.mediaViewer;
 
-  constructor(protected bitstreamDataService: BitstreamDataService) {
-  }
+  mediaViewer = environment.mediaViewer;
 
   ngOnInit(): void {
     this.itemPageRoute = getItemPageRoute(this.object);
-
-    this.thumbnail$ = new BehaviorSubject<RemoteData<Bitstream>>(undefined);
-    this.bitstreamDataService.getThumbnailFor(this.object).pipe(
-      takeUntilCompletedRemoteData(),
-    ).subscribe((rd: RemoteData<Bitstream>) => {
-      this.thumbnail$.next(rd);
-    });
   }
 }
diff --git a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
index bacffbf526..b0157dcfee 100644
--- a/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/+item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -10,7 +10,7 @@
   <div class="col-xs-12 col-md-4">
     <ng-container *ngIf="!mediaViewer.image">
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-        <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
+        <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
     <ng-container *ngIf="mediaViewer.image">
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 1a16abc47f..a29854d9b3 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -75,92 +75,6 @@ export class BitstreamDataService extends DataService<Bitstream> {
     return this.findAllByHref(bundle._links.bitstreams.href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
-  /**
-   * Retrieves the thumbnail for the given item
-   * @returns {Observable<RemoteData<{@link Bitstream}>>} the first bitstream in the THUMBNAIL bundle
-   */
-  // TODO should be implemented rest side. {@link Item} should get a thumbnail link
-  public getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
-    return this.bundleService.findByItemAndName(item, 'THUMBNAIL').pipe(
-      switchMap((bundleRD: RemoteData<Bundle>) => {
-        if (isNotEmpty(bundleRD.payload)) {
-          return this.findAllByBundle(bundleRD.payload, { elementsPerPage: 1 }).pipe(
-            map((bitstreamRD: RemoteData<PaginatedList<Bitstream>>) => {
-              if (hasValue(bitstreamRD.payload) && hasValue(bitstreamRD.payload.page)) {
-                return new RemoteData(
-                  bitstreamRD.timeCompleted,
-                  bitstreamRD.msToLive,
-                  bitstreamRD.lastUpdated,
-                  bitstreamRD.state,
-                  bitstreamRD.errorMessage,
-                  bitstreamRD.payload.page[0],
-                  bitstreamRD.statusCode
-                );
-              } else {
-                return bitstreamRD as any;
-              }
-            })
-          );
-        } else {
-          return [bundleRD as any];
-        }
-      })
-    );
-  }
-
-  /**
-   * Retrieve the matching thumbnail for a {@link Bitstream}.
-   *
-   * The {@link Item} is technically redundant, but is available
-   * in all current use cases, and having it simplifies this method
-   *
-   * @param item The {@link Item} the {@link Bitstream} and its thumbnail are a part of
-   * @param bitstreamInOriginal The original {@link Bitstream} to find the thumbnail for
-   */
-  // TODO should be implemented rest side
-  public getMatchingThumbnail(item: Item, bitstreamInOriginal: Bitstream): Observable<RemoteData<Bitstream>> {
-    return this.bundleService.findByItemAndName(item, 'THUMBNAIL').pipe(
-      switchMap((bundleRD: RemoteData<Bundle>) => {
-        if (isNotEmpty(bundleRD.payload)) {
-          return this.findAllByBundle(bundleRD.payload, { elementsPerPage: 9999 }).pipe(
-            map((bitstreamRD: RemoteData<PaginatedList<Bitstream>>) => {
-              if (hasValue(bitstreamRD.payload) && hasValue(bitstreamRD.payload.page)) {
-                const matchingThumbnail = bitstreamRD.payload.page.find((thumbnail: Bitstream) =>
-                  thumbnail.name.startsWith(bitstreamInOriginal.name)
-                );
-                if (hasValue(matchingThumbnail)) {
-                  return new RemoteData(
-                    bitstreamRD.timeCompleted,
-                    bitstreamRD.msToLive,
-                    bitstreamRD.lastUpdated,
-                    bitstreamRD.state,
-                    bitstreamRD.errorMessage,
-                    matchingThumbnail,
-                    bitstreamRD.statusCode
-                  );
-                } else {
-                  return new RemoteData(
-                    bitstreamRD.timeCompleted,
-                    bitstreamRD.msToLive,
-                    bitstreamRD.lastUpdated,
-                    RequestEntryState.Error,
-                    'No matching thumbnail found',
-                    undefined,
-                    404
-                  );
-                }
-              } else {
-                return bitstreamRD as any;
-              }
-            })
-          );
-        } else {
-          return [bundleRD as any];
-        }
-      })
-    );
-  }
-
   /**
    * Retrieve all {@link Bitstream}s in a certain {@link Bundle}.
    *
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index feb282d3a7..028876b3d0 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -8,13 +8,13 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-thumbnail>
             </div>
         </span>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index aa2352b284..65ff75a731 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -8,13 +8,13 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
                 <div>
-                    <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                     </ds-thumbnail>
                 </div>
             </span>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 8fdad59827..0c5824c6d6 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -8,13 +8,13 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-thumbnail>
             </div>
         </span>
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 8e357140d8..5847be7dd2 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['publicationvolume.volumeNumber']"
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 7b80739bb8..a0a25766ef 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['publicationvolume.volumeNumber']"
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 bcbd1d7c47..af3ac85959 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="thumbnail$ | async"></ds-thumbnail>
+      <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field class="item-page-fields" [item]="object"
       [fields]="['creativeworkseries.issn']"
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index b8be58a603..edb9e9b46a 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -8,13 +8,13 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-thumbnail>
             </div>
         </span>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 23de8b134f..680a9909bc 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -8,13 +8,13 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
                 </ds-thumbnail>
             </div>
         </span>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 88498a4d67..204f8fc8cb 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -8,13 +8,13 @@
        rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
        class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </a>
     <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
         </ds-thumbnail>
       </div>
     </span>
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 d328e93b15..c9ea8fb549 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="thumbnail$ | async"
+      <ds-thumbnail [thumbnail]="object?.thumbnail | async"
                     [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                     [alt]="'thumbnail.orgunit.alt'"
                     [placeholder]="'thumbnail.orgunit.placeholder'"
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 291813ff88..5c2fd227fd 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
@@ -9,7 +9,7 @@
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="thumbnail$ | async"
+      <ds-thumbnail [thumbnail]="object?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
                     [placeholder]="'thumbnail.person.placeholder'">
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 181a8dc44e..8f2ff6adcd 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
@@ -10,7 +10,7 @@
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail
-        [thumbnail]="thumbnail$ | async"
+        [thumbnail]="object?.thumbnail | async"
         [defaultImage]="'assets/images/project-placeholder.svg'"
         [alt]="'thumbnail.project.alt'"
         [placeholder]="'thumbnail.project.placeholder'">
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index 063e1393cc..13787bb925 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
 <!--    <div class="person-thumbnail pr-2">-->
-<!--        <ds-thumbnail [thumbnail]="getThumbnail() | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>-->
+<!--        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>-->
 <!--    </div>-->
     <div class="flex-grow-1">
         <ds-org-unit-input-suggestions *ngIf="useNameVariants" [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index e3cc8fccd3..17c764d480 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -1,8 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
@@ -113,11 +110,4 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
     modalComp.value = value;
     return modalRef.result;
   }
-
-  // TODO refactor to return RemoteData, and thumbnail template to deal with loading
-  getThumbnail(): Observable<Bitstream> {
-    return this.bitstreamDataService.getThumbnailFor(this.dso).pipe(
-      getFirstSucceededRemoteDataPayload()
-    );
-  }
 }
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 64cf73cfb9..13de40e015 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,8 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
@@ -108,11 +105,4 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
     modalComp.value = value;
     return modalRef.result;
   }
-
-  // TODO refactor to return RemoteData, and thumbnail template to deal with loading
-  getThumbnail(): Observable<Bitstream> {
-    return this.bitstreamDataService.getThumbnailFor(this.dso).pipe(
-      getFirstSucceededRemoteDataPayload()
-    );
-  }
 }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index e4d2526eb2..61e2955deb 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -10,7 +10,7 @@
     <div class="row mb-1">
       <div class="col-xs-12 col-md-4">
         <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-          <ds-thumbnail [thumbnail]="getThumbnail() | async"></ds-thumbnail>
+          <ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
         </ds-metadata-field-wrapper>
         <ng-container *ngVar="(getFiles() | async) as bitstreams">
           <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
index 2b38b58598..07acf3ea75 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.spec.ts
@@ -126,13 +126,6 @@ describe('ItemDetailPreviewComponent', () => {
 
   }));
 
-  it('should get item thumbnail', (done) => {
-    component.getThumbnail().subscribe((thumbnail) => {
-      expect(thumbnail).toBeDefined();
-      done();
-    });
-  });
-
   it('should get item bitstreams', (done) => {
     component.getFiles().subscribe((bitstreams) => {
       expect(bitstreams).toBeDefined();
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index a4dc0a1d3d..92c1afcb59 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -5,10 +5,7 @@ import { first } from 'rxjs/operators';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 
 import { Item } from '../../../../core/shared/item.model';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteListPayload
-} from '../../../../core/shared/operators';
+import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { fadeInOut } from '../../../animations/fade';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -57,11 +54,6 @@ export class ItemDetailPreviewComponent {
    */
   public separator = ', ';
 
-  /**
-   * The item's thumbnail
-   */
-  public thumbnail$: Observable<Bitstream>;
-
   /**
    * Initialize instance variables
    *
@@ -86,13 +78,6 @@ export class ItemDetailPreviewComponent {
       });
   }
 
-  // TODO refactor this method to return RemoteData, and the template to deal with loading and errors
-  public getThumbnail(): Observable<Bitstream> {
-    return this.bitstreamDataService.getThumbnailFor(this.item).pipe(
-      getFirstSucceededRemoteDataPayload()
-    );
-  }
-
   // TODO refactor this method to return RemoteData, and the template to deal with loading and errors
   public getFiles(): Observable<Bitstream[]> {
     return this.bitstreamDataService
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index bc16853721..d2454b28e6 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -6,13 +6,13 @@
       <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
          class="card-img-top full-width">
           <div>
-              <ds-thumbnail [thumbnail]="getThumbnail() | async" [limitWidth]="false">
+              <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
               </ds-thumbnail>
           </div>
       </a>
       <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
           <div>
-              <ds-thumbnail [thumbnail]="getThumbnail()  | async" [limitWidth]="false">
+              <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
               </ds-thumbnail>
           </div>
       </span>
@@ -43,4 +43,3 @@
     </ds-truncatable>
     <ng-content></ng-content>
   </div>
-
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index 7436d2922e..da1f0ea11b 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -3,13 +3,11 @@ import { Observable } from 'rxjs';
 
 import { SearchResult } from '../../search/search-result.model';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../core/shared/bitstream.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { TruncatableService } from '../../truncatable/truncatable.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 
 @Component({
   selector: 'ds-search-result-grid-element',
@@ -66,11 +64,4 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
   private isCollapsed(): Observable<boolean> {
     return this.truncatableService.isCollapsed(this.dso.id);
   }
-
-  // TODO refactor to return RemoteData, and thumbnail template to deal with loading
-  getThumbnail(): Observable<Bitstream> {
-    return this.bitstreamDataService.getThumbnailFor(this.dso as any).pipe(
-      getFirstSucceededRemoteDataPayload()
-    );
-  }
 }

From eb0b3ae5f45abf6f1472ede711cf1967c668e0d1 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 28 Jun 2021 12:51:57 +0200
Subject: [PATCH 135/169] 80369: Add optional thumbnail followLink in
 SearchComponent

---
 src/app/+search-page/search.component.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
index f6e9664911..c1caf27b9a 100644
--- a/src/app/+search-page/search.component.ts
+++ b/src/app/+search-page/search.component.ts
@@ -130,8 +130,11 @@ export class SearchComponent implements OnInit {
     this.searchLink = this.getSearchLink();
     this.searchOptions$ = this.getSearchOptions();
     this.sub = this.searchOptions$.pipe(
-      switchMap((options) => this.service.search(options).pipe(getFirstSucceededRemoteData(), startWith(undefined))))
-      .subscribe((results) => {
+      switchMap((options) => this.service.search(
+          options, undefined, true, true, followLink<Item>('thumbnail', { isOptional: true })
+        ).pipe(getFirstSucceededRemoteData(), startWith(undefined))
+      )
+    ).subscribe((results) => {
         this.resultsRD$.next(results);
       });
     this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(

From 72a67542456d01e941624bb0056864dc48f80a45 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 29 Jun 2021 08:41:47 +0200
Subject: [PATCH 136/169] 80195: Fix breadcrumbs not updating

---
 .../edit-item-page/item-move/item-move.component.spec.ts   | 3 +++
 .../edit-item-page/item-move/item-move.component.ts        | 7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index b51d83c0ae..1680e7f464 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -21,6 +21,8 @@ import {
   createSuccessfulRemoteDataObject$
 } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RequestService } from '../../../core/data/request.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 
 describe('ItemMoveComponent', () => {
   let comp: ItemMoveComponent;
@@ -95,6 +97,7 @@ describe('ItemMoveComponent', () => {
           { provide: ItemDataService, useValue: mockItemDataService },
           { provide: NotificationsService, useValue: notificationsServiceStub },
           { provide: SearchService, useValue: mockSearchService },
+          { provide: RequestService, useValue: getMockRequestService() },
         ], schemas: [
           CUSTOM_ELEMENTS_SCHEMA
         ]
diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
index 2107597f8a..b7ab761fe5 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.ts
@@ -15,6 +15,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { RequestService } from '../../../core/data/request.service';
 
 @Component({
   selector: 'ds-item-move',
@@ -54,8 +55,9 @@ export class ItemMoveComponent implements OnInit {
               private notificationsService: NotificationsService,
               private itemDataService: ItemDataService,
               private searchService: SearchService,
-              private translateService: TranslateService) {
-  }
+              private translateService: TranslateService,
+              private requestService: RequestService,
+  ) {}
 
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
@@ -114,6 +116,7 @@ export class ItemMoveComponent implements OnInit {
     });
 
     move$.pipe(
+      switchMap(() => this.requestService.setStaleByHrefSubstring(this.item.id)),
       switchMap(() =>
         this.itemDataService.findById(
           this.item.id,

From b0599fa27c304fe3006ae4bd7c86de543191aa02 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 29 Jun 2021 09:56:29 +0200
Subject: [PATCH 137/169] 80195: Fix ItemMoveComponent unit tests

---
 .../item-move/item-move.component.spec.ts     | 63 +++++++++----------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
index 1680e7f464..d200891629 100644
--- a/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -49,7 +49,9 @@ describe('ItemMoveComponent', () => {
     name: 'Test collection 2'
   });
 
-  const mockItemDataService = jasmine.createSpyObj({
+  let itemDataService;
+
+  const mockItemDataServiceSuccess = jasmine.createSpyObj({
     moveToCollection: createSuccessfulRemoteDataObject$(collection1),
     findById: createSuccessfulRemoteDataObject$(mockItem),
   });
@@ -86,25 +88,31 @@ describe('ItemMoveComponent', () => {
 
   const notificationsServiceStub = new NotificationsServiceStub();
 
+  const init = (mockItemDataService) => {
+    itemDataService = mockItemDataService;
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+      declarations: [ItemMoveComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: Router, useValue: routerStub },
+        { provide: ItemDataService, useValue: mockItemDataService },
+        { provide: NotificationsService, useValue: notificationsServiceStub },
+        { provide: SearchService, useValue: mockSearchService },
+        { provide: RequestService, useValue: getMockRequestService() },
+      ], schemas: [
+        CUSTOM_ELEMENTS_SCHEMA
+      ]
+    }).compileComponents();
+    fixture = TestBed.createComponent(ItemMoveComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  };
+
   describe('ItemMoveComponent success', () => {
     beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-        declarations: [ItemMoveComponent],
-        providers: [
-          { provide: ActivatedRoute, useValue: routeStub },
-          { provide: Router, useValue: routerStub },
-          { provide: ItemDataService, useValue: mockItemDataService },
-          { provide: NotificationsService, useValue: notificationsServiceStub },
-          { provide: SearchService, useValue: mockSearchService },
-          { provide: RequestService, useValue: getMockRequestService() },
-        ], schemas: [
-          CUSTOM_ELEMENTS_SCHEMA
-        ]
-      }).compileComponents();
-      fixture = TestBed.createComponent(ItemMoveComponent);
-      comp = fixture.componentInstance;
-      fixture.detectChanges();
+      init(mockItemDataServiceSuccess);
     });
 
     it('should get current url ', () => {
@@ -128,7 +136,7 @@ describe('ItemMoveComponent', () => {
         comp.selectedCollection = collection1;
         comp.moveToCollection();
 
-        expect(mockItemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
+        expect(itemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
       });
       it('should call notificationsService success message on success', () => {
         comp.moveToCollection();
@@ -140,22 +148,7 @@ describe('ItemMoveComponent', () => {
 
   describe('ItemMoveComponent fail', () => {
     beforeEach(() => {
-      TestBed.configureTestingModule({
-        imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-        declarations: [ItemMoveComponent],
-        providers: [
-          { provide: ActivatedRoute, useValue: routeStub },
-          { provide: Router, useValue: routerStub },
-          { provide: ItemDataService, useValue: mockItemDataServiceFail },
-          { provide: NotificationsService, useValue: notificationsServiceStub },
-          { provide: SearchService, useValue: mockSearchService },
-        ], schemas: [
-          CUSTOM_ELEMENTS_SCHEMA
-        ]
-      }).compileComponents();
-      fixture = TestBed.createComponent(ItemMoveComponent);
-      comp = fixture.componentInstance;
-      fixture.detectChanges();
+      init(mockItemDataServiceFail);
     });
 
     it('should call notificationsService error message on fail', () => {

From abf6d26641993b619c26972e7b4401239667c2ee Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 29 Jun 2021 17:34:00 +0200
Subject: [PATCH 138/169] 80369: Remove unneeded bundles followLink

---
 src/app/+item-page/item.resolver.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index 62b778e95c..b34bb78f39 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -19,7 +19,6 @@ export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
     followLink('parentCommunity', {},
       followLink('parentCommunity'))
   ),
-  followLink('bundles', {}, followLink('bitstreams')),
   followLink('relationships'),
   followLink('version', {}, followLink('versionhistory')),
   followLink('thumbnail')

From fedf6aa847565fda63be7c7fe8161c908b700713 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 29 Jun 2021 21:18:06 +0200
Subject: [PATCH 139/169] 80369: Fix unused imports

---
 .../item-authorizations/item-authorizations.component.ts    | 6 ++----
 src/app/+item-page/item.resolver.ts                         | 1 -
 .../+item-page/simple/item-types/shared/item.component.ts   | 6 ------
 src/app/core/data/bitstream-data.service.ts                 | 5 ++---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index e4899abe3a..76597a135b 100644
--- a/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/+item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -4,10 +4,9 @@ import { ActivatedRoute } from '@angular/router';
 import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
 import { catchError, filter, first, map, mergeMap, take } from 'rxjs/operators';
 
-import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteDataWithNotEmptyPayload
+  getFirstSucceededRemoteDataPayload, getFirstSucceededRemoteDataWithNotEmptyPayload,
 } from '../../../core/shared/operators';
 import { Item } from '../../../core/shared/item.model';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -15,7 +14,6 @@ import { LinkService } from '../../../core/cache/builders/link.service';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { Bitstream } from '../../../core/shared/bitstream.model';
-import { FindListOptions } from '../../../core/data/request.models';
 
 /**
  * Interface for a bundle's bitstream map entry
diff --git a/src/app/+item-page/item.resolver.ts b/src/app/+item-page/item.resolver.ts
index b34bb78f39..ca6a6c5958 100644
--- a/src/app/+item-page/item.resolver.ts
+++ b/src/app/+item-page/item.resolver.ts
@@ -5,7 +5,6 @@ import { RemoteData } from '../core/data/remote-data';
 import { ItemDataService } from '../core/data/item-data.service';
 import { Item } from '../core/shared/item.model';
 import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { FindListOptions } from '../core/data/request.models';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { Store } from '@ngrx/store';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
diff --git a/src/app/+item-page/simple/item-types/shared/item.component.ts b/src/app/+item-page/simple/item-types/shared/item.component.ts
index 7f437acfbb..793af180c9 100644
--- a/src/app/+item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/+item-page/simple/item-types/shared/item.component.ts
@@ -1,13 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { environment } from '../../../../../environments/environment';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { takeUntilCompletedRemoteData } from '../../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
-import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Observable } from 'rxjs/internal/Observable';
 
 @Component({
   selector: 'ds-item',
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index a29854d9b3..3890f4e663 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { map, switchMap, take } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../cache/builders/build-decorators';
@@ -18,7 +18,7 @@ import { Item } from '../shared/item.model';
 import { BundleDataService } from './bundle-data.service';
 import { DataService } from './data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList, buildPaginatedList } from './paginated-list.model';
+import { buildPaginatedList, PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { FindListOptions, PutRequest } from './request.models';
 import { RequestService } from './request.service';
@@ -28,7 +28,6 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { sendRequest } from '../shared/operators';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { PageInfo } from '../shared/page-info.model';
-import { RequestEntryState } from './request.reducer';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API

From 03e2e30510a4ab151f17d158ca8010e99ed09da6 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Wed, 30 Jun 2021 14:09:18 +0200
Subject: [PATCH 140/169] fix issue where meta tags wouldn't be updated
 properly based on the route

---
 .../collection-page.component.ts              |  14 +-
 .../full/full-item-page.component.ts          |  10 +-
 .../+item-page/simple/item-page.component.ts  |   4 -
 .../core/metadata/metadata.service.spec.ts    | 503 +++++++++---------
 src/app/core/metadata/metadata.service.ts     |  47 +-
 5 files changed, 261 insertions(+), 317 deletions(-)

diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 9eba2e4ab2..366e1da7b1 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -1,6 +1,11 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subject
+} from 'rxjs';
 import { filter, map, mergeMap, startWith, switchMap, take } from 'rxjs/operators';
 import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { SearchService } from '../core/shared/search/search.service';
@@ -8,8 +13,6 @@ import { SortDirection, SortOptions } from '../core/cache/models/sort-options.mo
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { PaginatedList } from '../core/data/paginated-list.model';
 import { RemoteData } from '../core/data/remote-data';
-
-import { MetadataService } from '../core/metadata/metadata.service';
 import { Bitstream } from '../core/shared/bitstream.model';
 
 import { Collection } from '../core/shared/collection.model';
@@ -65,7 +68,6 @@ export class CollectionPageComponent implements OnInit {
   constructor(
     private collectionDataService: CollectionDataService,
     private searchService: SearchService,
-    private metadata: MetadataService,
     private route: ActivatedRoute,
     private router: Router,
     private authService: AuthService,
@@ -122,10 +124,6 @@ export class CollectionPageComponent implements OnInit {
       getAllSucceededRemoteDataPayload(),
       map((collection) => getCollectionPageRoute(collection.id))
     );
-
-    this.route.queryParams.pipe(take(1)).subscribe((params) => {
-      this.metadata.processRemoteData(this.collectionRD$);
-    });
   }
 
   isNotEmpty(object: any) {
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index aea350e58e..da16e134cb 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -1,8 +1,8 @@
-import {filter, map} from 'rxjs/operators';
+import { filter, map } from 'rxjs/operators';
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 
-import { Observable ,  BehaviorSubject } from 'rxjs';
+import { Observable, BehaviorSubject } from 'rxjs';
 
 import { ItemPageComponent } from '../simple/item-page.component';
 import { MetadataMap } from '../../core/shared/metadata.models';
@@ -11,8 +11,6 @@ import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
 
-import { MetadataService } from '../../core/metadata/metadata.service';
-
 import { fadeInOut } from '../../shared/animations/fade';
 import { hasValue } from '../../shared/empty.util';
 import { AuthService } from '../../core/auth/auth.service';
@@ -35,8 +33,8 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit {
 
   metadata$: Observable<MetadataMap>;
 
-  constructor(route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService, authService: AuthService) {
-    super(route, router, items, metadataService, authService);
+  constructor(route: ActivatedRoute, router: Router, items: ItemDataService, authService: AuthService) {
+    super(route, router, items, authService);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index 67e278c2fb..d2c238b5e6 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -8,8 +8,6 @@ import { RemoteData } from '../../core/data/remote-data';
 
 import { Item } from '../../core/shared/item.model';
 
-import { MetadataService } from '../../core/metadata/metadata.service';
-
 import { fadeInOut } from '../../shared/animations/fade';
 import { getAllSucceededRemoteDataPayload, redirectOn4xx } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
@@ -54,7 +52,6 @@ export class ItemPageComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private items: ItemDataService,
-    private metadataService: MetadataService,
     private authService: AuthService,
   ) { }
 
@@ -66,7 +63,6 @@ export class ItemPageComponent implements OnInit {
       map((data) => data.dso as RemoteData<Item>),
       redirectOn4xx(this.router, this.authService)
     );
-    this.metadataService.processRemoteData(this.itemRD$);
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
       map((item) => getItemPageRoute(item))
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index a2f2272219..d18897cc55 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -1,82 +1,30 @@
-import { CommonModule, Location } from '@angular/common';
-import { HttpClient } from '@angular/common/http';
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { Meta, MetaDefinition, Title } from '@angular/platform-browser';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { Meta, Title } from '@angular/platform-browser';
+import { Router, NavigationEnd } from '@angular/router';
 
-import { Store, StoreModule } from '@ngrx/store';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { EmptyError, Observable, of } from 'rxjs';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable, of } from 'rxjs';
 
 import { RemoteData } from '../data/remote-data';
 import { Item } from '../shared/item.model';
 
+import { ItemMock, MockBitstream1, MockBitstream3, } from '../../shared/mocks/item.mock';
 import {
-  ItemMock, MockBitstream1, MockBitstream2, MockBitstream3, MockBitstreamFormat1, MockBitstreamFormat2,
-  MockBitstreamFormat3,
-  MockOriginalBundle,
-} from '../../shared/mocks/item.mock';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { AuthService } from '../auth/auth.service';
-import { BrowseService } from '../browse/browse.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-
-import { CoreState } from '../core.reducers';
-import { BitstreamDataService } from '../data/bitstream-data.service';
-import { BitstreamFormatDataService } from '../data/bitstream-format-data.service';
-import { CommunityDataService } from '../data/community-data.service';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
-
-import { ItemDataService } from '../data/item-data.service';
-import { buildPaginatedList, PaginatedList } from '../data/paginated-list.model';
-import { FindListOptions } from '../data/request.models';
-import { RequestService } from '../data/request.service';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
+  createSuccessfulRemoteDataObject$,
+  createSuccessfulRemoteDataObject
+} from '../../shared/remote-data.utils';
+import { PaginatedList } from '../data/paginated-list.model';
 import { Bitstream } from '../shared/bitstream.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { MetadataValue } from '../shared/metadata.models';
-import { PageInfo } from '../shared/page-info.model';
-import { UUIDService } from '../shared/uuid.service';
 
 import { MetadataService } from './metadata.service';
-import { storeModuleConfig } from '../../app.reducer';
 import { RootDataService } from '../data/root-data.service';
-import { Root } from '../data/root.model';
 import { Bundle } from '../shared/bundle.model';
-import { BundleDataService } from '../data/bundle-data.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
 
-/* tslint:disable:max-classes-per-file */
-@Component({
-  template: `
-    <router-outlet></router-outlet>`
-})
-class TestComponent {
-  constructor(private metadata: MetadataService) {
-    metadata.listenForRouteChange();
-  }
-}
-
-@Component({ template: '' })
-class DummyItemComponent {
-  constructor(private route: ActivatedRoute, private items: ItemDataService, private metadata: MetadataService) {
-    this.route.params.subscribe((params) => {
-      this.metadata.processRemoteData(this.items.findById(params.id));
-    });
-  }
-}
-
-/* tslint:enable:max-classes-per-file */
-
 describe('MetadataService', () => {
   let metadataService: MetadataService;
 
@@ -84,281 +32,306 @@ describe('MetadataService', () => {
 
   let title: Title;
 
-  let store: Store<CoreState>;
+  let dsoNameService: DSONameService;
 
-  let objectCacheService: ObjectCacheService;
-  let requestService: RequestService;
-  let uuidService: UUIDService;
-  let remoteDataBuildService: RemoteDataBuildService;
-  let itemDataService: ItemDataService;
   let bundleDataService;
   let bitstreamDataService;
-  let authService: AuthService;
   let rootService: RootDataService;
   let translateService: TranslateService;
   let hardRedirectService: HardRedirectService;
 
-  let location: Location;
   let router: Router;
-  let fixture: ComponentFixture<TestComponent>;
-
-  let tagStore: Map<string, MetaDefinition[]>;
 
   beforeEach(() => {
-
-    store = new Store<CoreState>(undefined, undefined, undefined);
-    spyOn(store, 'dispatch');
-
-    objectCacheService = new ObjectCacheService(store, undefined);
-    uuidService = new UUIDService();
-    requestService = new RequestService(objectCacheService, uuidService, store, undefined);
-    remoteDataBuildService = new RemoteDataBuildService(objectCacheService, undefined, requestService);
-    bitstreamDataService = {
-      findAllByItemAndBundleName(item: Item, bundleName: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bitstream>[]): Observable<RemoteData<PaginatedList<Bitstream>>> {
-        if (item.equals(ItemMock)) {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [MockBitstream1, MockBitstream2]));
-        } else {
-          return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
-        }
-      },
-      findAllByHref: jasmine.createSpy(),
-    };
-    const mockBitstreamFormatDataService = {
-      findByBitstream(bitstream: Bitstream): Observable<RemoteData<BitstreamFormat>> {
-        switch (bitstream) {
-          case MockBitstream1:
-            return createSuccessfulRemoteDataObject$(MockBitstreamFormat1);
-            break;
-          case MockBitstream2:
-            return createSuccessfulRemoteDataObject$(MockBitstreamFormat2);
-            break;
-          case MockBitstream3:
-            return createSuccessfulRemoteDataObject$(MockBitstreamFormat3);
-            break;
-          default:
-            return createSuccessfulRemoteDataObject$(new BitstreamFormat());
-        }
+    rootService = jasmine.createSpyObj({
+      findRoot: createSuccessfulRemoteDataObject$({ dspaceVersion: 'mock-dspace-version' })
+    });
+    bitstreamDataService = jasmine.createSpyObj({
+      findAllByHref: createSuccessfulRemoteDataObject$(createPaginatedList([MockBitstream3]))
+    });
+    bundleDataService = jasmine.createSpyObj({
+      findByItemAndName: mockBundleRD$([MockBitstream3])
+    });
+    translateService = getMockTranslateService();
+    meta = jasmine.createSpyObj({
+      addTag: {},
+      removeTag: {}
+    });
+    title = jasmine.createSpyObj({
+      setTitle: {}
+    });
+    dsoNameService = jasmine.createSpyObj({
+      getName: ItemMock.firstMetadataValue('dc.title')
+    });
+    router = {
+      url: '/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      events: of(new NavigationEnd(1, '', '')),
+      routerState: {
+        root: {}
       }
-    };
-    bundleDataService = jasmine.createSpyObj('bundleDataService', {
-      findByItemAndName: createSuccessfulRemoteDataObject$(MockOriginalBundle),
-    });
-    rootService = jasmine.createSpyObj('rootService', {
-      findRoot: createSuccessfulRemoteDataObject$(Object.assign(new Root(), {
-        dspaceVersion: 'mock-dspace-version'
-      }))
-    });
-    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+    } as any as Router;
+    hardRedirectService = jasmine.createSpyObj( {
       getRequestOrigin: 'https://request.org',
     });
-
-    TestBed.configureTestingModule({
-      imports: [
-        CommonModule,
-        StoreModule.forRoot({}, storeModuleConfig),
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
-        RouterTestingModule.withRoutes([
-          { path: 'items/:id', component: DummyItemComponent, pathMatch: 'full' },
-          {
-            path: 'other',
-            component: DummyItemComponent,
-            pathMatch: 'full',
-            data: { title: 'Dummy Title', description: 'This is a dummy item component for testing!' }
-          }
-        ])
-      ],
-      declarations: [
-        TestComponent,
-        DummyItemComponent
-      ],
-      providers: [
-        { provide: ObjectCacheService, useValue: objectCacheService },
-        { provide: RequestService, useValue: requestService },
-        { provide: RemoteDataBuildService, useValue: remoteDataBuildService },
-        { provide: HALEndpointService, useValue: {} },
-        { provide: AuthService, useValue: {} },
-        { provide: NotificationsService, useValue: {} },
-        { provide: HttpClient, useValue: {} },
-        { provide: DSOChangeAnalyzer, useValue: {} },
-        { provide: CommunityDataService, useValue: {} },
-        { provide: DefaultChangeAnalyzer, useValue: {} },
-        { provide: BitstreamFormatDataService, useValue: mockBitstreamFormatDataService },
-        { provide: BitstreamDataService, useValue: bitstreamDataService },
-        { provide: BundleDataService, useValue: bundleDataService },
-        { provide: RootDataService, useValue: rootService },
-        { provide: HardRedirectService, useValue: hardRedirectService },
-        Meta,
-        Title,
-        // tslint:disable-next-line:no-empty
-        { provide: ItemDataService, useValue: { findById: () => {} } },
-        BrowseService,
-        MetadataService
-      ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
-    });
-    meta = TestBed.inject(Meta);
-    title = TestBed.inject(Title);
-    itemDataService = TestBed.inject(ItemDataService);
-    metadataService = TestBed.inject(MetadataService);
-    authService = TestBed.inject(AuthService);
-    translateService = TestBed.inject(TranslateService);
-
-    router = TestBed.inject(Router);
-    location = TestBed.inject(Location);
-
-    fixture = TestBed.createComponent(TestComponent);
-
-    tagStore = metadataService.getTagStore();
+    metadataService = new MetadataService(
+      router,
+      translateService,
+      meta,
+      title,
+      dsoNameService,
+      bundleDataService,
+      bitstreamDataService,
+      undefined,
+      rootService,
+      hardRedirectService
+    );
   });
 
   it('items page should set meta tags', fakeAsync(() => {
-    spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-    router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+    (metadataService as any).processRouteChange({
+      data: {
+        value: {
+          dso: createSuccessfulRemoteDataObject(ItemMock),
+        }
+      }
+    });
     tick();
-    expect(title.getTitle()).toEqual('Test PowerPoint Document');
-    expect(tagStore.get('citation_title')[0].content).toEqual('Test PowerPoint Document');
-    expect(tagStore.get('citation_author')[0].content).toEqual('Doe, Jane');
-    expect(tagStore.get('citation_publication_date')[0].content).toEqual('1650-06-26');
-    expect(tagStore.get('citation_issn')[0].content).toEqual('123456789');
-    expect(tagStore.get('citation_language')[0].content).toEqual('en');
-    expect(tagStore.get('citation_keywords')[0].content).toEqual('keyword1; keyword2; keyword3');
+    expect(title.setTitle).toHaveBeenCalledWith('Test PowerPoint Document');
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'citation_title',
+      content: 'Test PowerPoint Document'
+    });
+    expect(meta.addTag).toHaveBeenCalledWith({ property: 'citation_author', content: 'Doe, Jane' });
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'citation_publication_date',
+      content: '1650-06-26'
+    });
+    expect(meta.addTag).toHaveBeenCalledWith({ property: 'citation_issn', content: '123456789' });
+    expect(meta.addTag).toHaveBeenCalledWith({ property: 'citation_language', content: 'en' });
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'citation_keywords',
+      content: 'keyword1; keyword2; keyword3'
+    });
   }));
 
   it('items page should set meta tags as published Thesis', fakeAsync(() => {
-    spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Thesis'))));
-    router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+    (metadataService as any).processRouteChange({
+      data: {
+        value: {
+          dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Thesis'))),
+        }
+      }
+    });
     tick();
-    expect(tagStore.get('citation_dissertation_name')[0].content).toEqual('Test PowerPoint Document');
-    expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download');
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'citation_dissertation_name',
+      content: 'Test PowerPoint Document'
+    });
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'citation_pdf_url',
+      content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+    });
   }));
 
   it('items page should set meta tags as published Technical Report', fakeAsync(() => {
-    spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Technical Report'))));
-    router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
-    tick();
-    expect(tagStore.get('citation_technical_report_institution')[0].content).toEqual('Mock Publisher');
-  }));
-
-  it('other navigation should add title, description and Generator', fakeAsync(() => {
-    spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-    spyOn(translateService, 'get').and.returnValues(of('DSpace :: '), of('Dummy Title'), of('This is a dummy item component for testing!'));
-    router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
-    tick();
-    expect(tagStore.size).toBeGreaterThan(0);
-    router.navigate(['/other']);
-    tick();
-    expect(tagStore.size).toEqual(3);
-    expect(title.getTitle()).toEqual('DSpace :: Dummy Title');
-    expect(tagStore.get('title')[0].content).toEqual('DSpace :: Dummy Title');
-    expect(tagStore.get('description')[0].content).toEqual('This is a dummy item component for testing!');
-    expect(tagStore.get('Generator')[0].content).toEqual('mock-dspace-version');
-  }));
-
-  describe('when the item has no bitstreams', () => {
-
-    beforeEach(() => {
-      // this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL')
-      // spyOn(MockItem, 'getFiles').and.returnValue(observableOf([]));
+    (metadataService as any).processRouteChange({
+      data: {
+        value: {
+          dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Technical Report'))),
+        }
+      }
     });
+    tick();
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'citation_technical_report_institution',
+      content: 'Mock Publisher'
+    });
+  }));
 
-    it('processRemoteData should not produce an EmptyError', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-      spyOn(metadataService, 'processRemoteData').and.callThrough();
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+  it('other navigation should add title and description', fakeAsync(() => {
+    (translateService.get as jasmine.Spy).and.returnValues(of('DSpace :: '), of('Dummy Title'), of('This is a dummy item component for testing!'));
+    (metadataService as any).processRouteChange({
+      data: {
+        value: {
+          title: 'Dummy Title',
+          description: 'This is a dummy item component for testing!'
+        }
+      }
+    });
+    tick();
+    expect(title.setTitle).toHaveBeenCalledWith('DSpace :: Dummy Title');
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'title',
+      content: 'DSpace :: Dummy Title'
+    });
+    expect(meta.addTag).toHaveBeenCalledWith({
+      property: 'description',
+      content: 'This is a dummy item component for testing!'
+    });
+  }));
+
+  describe(`listenForRouteChange`, () => {
+    it(`should call processRouteChange`, fakeAsync(() => {
+      spyOn(metadataService as any, 'processRouteChange').and.callFake(() => undefined);
+      metadataService.listenForRouteChange();
       tick();
-      expect(metadataService.processRemoteData).not.toThrow(new EmptyError());
+      expect((metadataService as any).processRouteChange).toHaveBeenCalled();
+    }));
+    it(`should add Generator`, fakeAsync(() => {
+      spyOn(metadataService as any, 'processRouteChange').and.callFake(() => undefined);
+      metadataService.listenForRouteChange();
+      tick();
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'Generator',
+        content: 'mock-dspace-version'
+      });
     }));
-
   });
 
   describe('citation_abstract_html_url', () => {
     it('should use dc.identifier.uri if available', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock, 'https://ddg.gg')));
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(mockUri(ItemMock, 'https://ddg.gg')),
+          }
+        }
+      });
       tick();
-      expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('https://ddg.gg');
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'citation_abstract_html_url',
+        content: 'https://ddg.gg'
+      });
     }));
 
     it('should use current route as fallback', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockUri(ItemMock)));
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(mockUri(ItemMock)),
+          }
+        }
+      });
       tick();
-       expect(tagStore.get('citation_abstract_html_url')[0].content).toEqual('https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357');
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'citation_abstract_html_url',
+        content: 'https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'
+      });
     }));
   });
 
   describe('citation_*_institution / citation_publisher', () => {
     it('should use citation_dissertation_institution tag for dissertations', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Thesis'))));
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Thesis'))),
+          }
+        }
+      });
       tick();
-      expect(tagStore.get('citation_dissertation_institution')[0].content).toEqual('Mock Publisher');
-      expect(tagStore.get('citation_technical_report_institution')).toBeFalsy();
-      expect(tagStore.get('citation_publisher')).toBeFalsy();
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'citation_dissertation_institution',
+        content: 'Mock Publisher'
+      });
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_technical_report_institution' }));
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_publisher' }));
     }));
 
     it('should use citation_tech_report_institution tag for tech reports', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Technical Report'))));
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Technical Report'))),
+          }
+        }
+      });
       tick();
-      expect(tagStore.get('citation_dissertation_institution')).toBeFalsy();
-      expect(tagStore.get('citation_technical_report_institution')[0].content).toEqual('Mock Publisher');
-      expect(tagStore.get('citation_publisher')).toBeFalsy();
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_dissertation_institution' }));
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'citation_technical_report_institution',
+        content: 'Mock Publisher'
+      });
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_publisher' }));
     }));
 
     it('should use citation_publisher for other item types', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(mockPublisher(mockType(ItemMock, 'Some Other Type'))));
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Some Other Type'))),
+          }
+        }
+      });
       tick();
-      expect(tagStore.get('citation_dissertation_institution')).toBeFalsy();
-      expect(tagStore.get('citation_technical_report_institution')).toBeFalsy();
-      expect(tagStore.get('citation_publisher')[0].content).toEqual('Mock Publisher');
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_dissertation_institution' }));
+      expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ property: 'citation_technical_report_institution' }));
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'citation_publisher',
+        content: 'Mock Publisher'
+      });
     }));
   });
 
   describe('citation_pdf_url', () => {
     it('should link to primary Bitstream URL regardless of format', fakeAsync(() => {
-      spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-      bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([], MockBitstream3));
-      router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+      (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$([], MockBitstream3));
+
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(ItemMock),
+          }
+        }
+      });
       tick();
-      expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
+      expect(meta.addTag).toHaveBeenCalledWith({
+        property: 'citation_pdf_url',
+        content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+      });
     }));
 
     describe('no primary Bitstream', () => {
       it('should link to first and only Bitstream regardless of format', fakeAsync(() => {
-        spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-        bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$([MockBitstream3]));
-        router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+        (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$([MockBitstream3]));
+
+        (metadataService as any).processRouteChange({
+          data: {
+            value: {
+              dso: createSuccessfulRemoteDataObject(ItemMock),
+            }
+          }
+        });
         tick();
-        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download');
+        expect(meta.addTag).toHaveBeenCalledWith({
+          property: 'citation_pdf_url',
+          content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+        });
       }));
 
       it('should link to first Bitstream with allowed format', fakeAsync(() => {
-        spyOn(itemDataService, 'findById').and.returnValue(mockRemoteData(ItemMock));
-
         const bitstreams = [MockBitstream3, MockBitstream3, MockBitstream1];
-        bundleDataService.findByItemAndName.and.returnValue(mockBundleRD$(bitstreams));
-        bitstreamDataService.findAllByHref.and.returnValues(
+        (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
+        (bitstreamDataService.findAllByHref as jasmine.Spy).and.returnValues(
           ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
         );
 
-        router.navigate(['/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357']);
+        (metadataService as any).processRouteChange({
+          data: {
+            value: {
+              dso: createSuccessfulRemoteDataObject(ItemMock),
+            }
+          }
+        });
         tick();
-        expect(tagStore.get('citation_pdf_url')[0].content).toEqual('https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download');
+        expect(meta.addTag).toHaveBeenCalledWith({
+          property: 'citation_pdf_url',
+          content: 'https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download'
+        });
       }));
     });
   });
 
-  const mockRemoteData = (mockItem: Item): Observable<RemoteData<Item>> => {
-    return createSuccessfulRemoteDataObject$(mockItem);
-  };
-
   const mockType = (mockItem: Item, type: string): Item => {
     const typedMockItem = Object.assign(new Item(), mockItem) as Item;
     typedMockItem.metadata['dc.type'] = [{ value: type }] as MetadataValue[];
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index d6518b6164..ed17fad2d8 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -6,11 +6,10 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
 import { BehaviorSubject, combineLatest, Observable, of as observableOf, EMPTY } from 'rxjs';
-import { distinctUntilKeyChanged, filter, map, take, switchMap, expand } from 'rxjs/operators';
+import { filter, map, take, switchMap, expand } from 'rxjs/operators';
 
 import { hasValue, hasNoValue } from '../../shared/empty.util';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
-import { CacheableObject } from '../cache/object-cache.reducer';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../data/bitstream-format-data.service';
 
@@ -35,11 +34,9 @@ import { HardRedirectService } from '../services/hard-redirect.service';
 @Injectable()
 export class MetadataService {
 
-  private initialized: boolean;
-
   private tagStore: Map<string, MetaDefinition[]>;
 
-  private currentObject: BehaviorSubject<DSpaceObject>;
+  private currentObject: BehaviorSubject<DSpaceObject> = new BehaviorSubject<DSpaceObject>(undefined);
 
   /**
    * When generating the citation_pdf_url meta tag for Items with more than one Bitstream (and no primary Bitstream),
@@ -70,11 +67,13 @@ export class MetadataService {
   ) {
     // TODO: determine what open graph meta tags are needed and whether
     // the differ per route. potentially add image based on DSpaceObject
-    this.initialized = false;
     this.tagStore = new Map<string, MetaDefinition[]>();
   }
 
   public listenForRouteChange(): void {
+    // This never changes, set it only once
+    this.setGenerator();
+
     this.router.events.pipe(
       filter((event) => event instanceof NavigationEnd),
       map(() => this.router.routerState.root),
@@ -86,22 +85,9 @@ export class MetadataService {
     });
   }
 
-  public processRemoteData(remoteData: Observable<RemoteData<CacheableObject>>): void {
-    remoteData.pipe(map((rd: RemoteData<CacheableObject>) => rd.payload),
-      filter((co: CacheableObject) => hasValue(co)),
-      take(1))
-      .subscribe((dspaceObject: DSpaceObject) => {
-        if (!this.initialized) {
-          this.initialize(dspaceObject);
-        }
-        this.currentObject.next(dspaceObject);
-      });
-  }
-
   private processRouteChange(routeInfo: any): void {
-    if (routeInfo.params.value.id === undefined) {
-      this.clearMetaTags();
-    }
+    this.clearMetaTags();
+
     if (routeInfo.data.value.title) {
       const titlePrefix = this.translate.get('repository.title.prefix');
       const title = this.translate.get(routeInfo.data.value.title, routeInfo.data.value);
@@ -116,15 +102,10 @@ export class MetadataService {
       });
     }
 
-    this.setGenerator();
-  }
-
-  private initialize(dspaceObject: DSpaceObject): void {
-    this.currentObject = new BehaviorSubject<DSpaceObject>(dspaceObject);
-    this.currentObject.asObservable().pipe(distinctUntilKeyChanged('uuid')).subscribe(() => {
-      this.setMetaTags();
-    });
-    this.initialized = true;
+    if (hasValue(routeInfo.data.value.dso) && hasValue(routeInfo.data.value.dso.payload)) {
+      this.currentObject.next(routeInfo.data.value.dso.payload);
+      this.setDSOMetaTags();
+    }
   }
 
   private getCurrentRoute(route: ActivatedRoute): ActivatedRoute {
@@ -134,9 +115,7 @@ export class MetadataService {
     return route;
   }
 
-  private setMetaTags(): void {
-
-    this.clearMetaTags();
+  private setDSOMetaTags(): void {
 
     this.setTitleTag();
     this.setDescriptionTag();
@@ -415,7 +394,7 @@ export class MetadataService {
    */
   private setGenerator(): void {
     this.rootService.findRoot().pipe(getFirstSucceededRemoteDataPayload()).subscribe((root) => {
-      this.addMetaTag('Generator', root.dspaceVersion);
+      this.meta.addTag({ property: 'Generator', content: root.dspaceVersion });
     });
   }
 

From c86f163cb7e8c6de6da273b3c4c198699339c7cc Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Thu, 1 Jul 2021 11:36:12 +0200
Subject: [PATCH 141/169] move tagstore to ngrx

---
 src/app/core/core.reducers.ts             |  3 ++
 src/app/core/metadata/meta-tag.actions.ts | 24 +++++++++
 src/app/core/metadata/meta-tag.reducer.ts | 38 ++++++++++++++
 src/app/core/metadata/metadata.service.ts | 63 +++++++++++++----------
 4 files changed, 100 insertions(+), 28 deletions(-)
 create mode 100644 src/app/core/metadata/meta-tag.actions.ts
 create mode 100644 src/app/core/metadata/meta-tag.reducer.ts

diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts
index 077aa3dc95..448c1b8641 100644
--- a/src/app/core/core.reducers.ts
+++ b/src/app/core/core.reducers.ts
@@ -13,6 +13,7 @@ import {
   BitstreamFormatRegistryState
 } from '../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { historyReducer, HistoryState } from './history/history.reducer';
+import { metaTagReducer, MetaTagState } from './metadata/meta-tag.reducer';
 
 export interface CoreState {
   'bitstreamFormats': BitstreamFormatRegistryState;
@@ -24,6 +25,7 @@ export interface CoreState {
   'index': MetaIndexState;
   'auth': AuthState;
   'json/patch': JsonPatchOperationsState;
+  'metaTag': MetaTagState;
   'route': RouteState;
 }
 
@@ -37,5 +39,6 @@ export const coreReducers: ActionReducerMap<CoreState> = {
   'index': indexReducer,
   'auth': authReducer,
   'json/patch': jsonPatchOperationsReducer,
+  'metaTag': metaTagReducer,
   'route': routeReducer
 };
diff --git a/src/app/core/metadata/meta-tag.actions.ts b/src/app/core/metadata/meta-tag.actions.ts
new file mode 100644
index 0000000000..6451e58da2
--- /dev/null
+++ b/src/app/core/metadata/meta-tag.actions.ts
@@ -0,0 +1,24 @@
+import { type } from '../../shared/ngrx/type';
+import { Action } from '@ngrx/store';
+import { MetaDefinition } from '@angular/platform-browser';
+
+// tslint:disable:max-classes-per-file
+export const MetaTagTypes = {
+  ADD: type('dspace/meta-tag/ADD'),
+  CLEAR: type('dspace/meta-tag/CLEAR')
+};
+
+export class AddMetaTagAction implements Action {
+  type = MetaTagTypes.ADD;
+  payload: string;
+
+  constructor(property: string) {
+    this.payload = property;
+  }
+}
+
+export class ClearMetaTagAction implements Action {
+  type = MetaTagTypes.CLEAR;
+}
+
+export type MetaTagAction = AddMetaTagAction | ClearMetaTagAction;
diff --git a/src/app/core/metadata/meta-tag.reducer.ts b/src/app/core/metadata/meta-tag.reducer.ts
new file mode 100644
index 0000000000..0af6fb0aab
--- /dev/null
+++ b/src/app/core/metadata/meta-tag.reducer.ts
@@ -0,0 +1,38 @@
+import {
+  MetaTagAction,
+  MetaTagTypes,
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
+
+export interface MetaTagState {
+  tagsInUse: string[];
+}
+
+const initialstate: MetaTagState = {
+  tagsInUse: []
+};
+
+export const metaTagReducer = (state: MetaTagState = initialstate, action: MetaTagAction): MetaTagState => {
+  switch (action.type) {
+    case MetaTagTypes.ADD: {
+      return addMetaTag(state, action as AddMetaTagAction);
+    }
+    case MetaTagTypes.CLEAR: {
+      return clearMetaTags(state, action as ClearMetaTagAction);
+    }
+    default: {
+      return state;
+    }
+  }
+};
+
+const addMetaTag = (state: MetaTagState, action: AddMetaTagAction): MetaTagState => {
+  return {
+    tagsInUse: [...state.tagsInUse, action.payload]
+  };
+};
+
+const clearMetaTags = (state: MetaTagState, action: ClearMetaTagAction): MetaTagState => {
+  return Object.assign({}, initialstate);
+};
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index ed17fad2d8..8c1e1027dd 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -30,12 +30,33 @@ import { Bundle } from '../shared/bundle.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { HardRedirectService } from '../services/hard-redirect.service';
+import { MetaTagState } from './meta-tag.reducer';
+import { Store, createSelector, select, MemoizedSelector } from '@ngrx/store';
+import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheEntry, ObjectCacheState } from '../cache/object-cache.reducer';
+
+/**
+ * The base selector function to select the metaTag section in the store
+ */
+const metaTagSelector = createSelector(
+  coreSelector,
+  (state: CoreState) => state.metaTag
+);
+
+/**
+ * Selector function to select the tags in use from the MetaTagState
+ */
+const tagsInUseSelector =
+  createSelector(
+    metaTagSelector,
+    (state: MetaTagState) => state.tagsInUse,
+  );
 
 @Injectable()
 export class MetadataService {
 
-  private tagStore: Map<string, MetaDefinition[]>;
-
   private currentObject: BehaviorSubject<DSpaceObject> = new BehaviorSubject<DSpaceObject>(undefined);
 
   /**
@@ -63,11 +84,9 @@ export class MetadataService {
     private bitstreamDataService: BitstreamDataService,
     private bitstreamFormatDataService: BitstreamFormatDataService,
     private rootService: RootDataService,
+    private store: Store<MetaTagState>,
     private hardRedirectService: HardRedirectService,
   ) {
-    // TODO: determine what open graph meta tags are needed and whether
-    // the differ per route. potentially add image based on DSpaceObject
-    this.tagStore = new Map<string, MetaDefinition[]>();
   }
 
   public listenForRouteChange(): void {
@@ -442,7 +461,7 @@ export class MetadataService {
     if (content) {
       const tag = { property, content } as MetaDefinition;
       this.meta.addTag(tag);
-      this.storeTag(property, tag);
+      this.storeTag(property);
     }
   }
 
@@ -452,33 +471,21 @@ export class MetadataService {
     }
   }
 
-  private storeTag(key: string, tag: MetaDefinition): void {
-    const tags: MetaDefinition[] = this.getTags(key);
-    tags.push(tag);
-    this.setTags(key, tags);
-  }
-
-  private getTags(key: string): MetaDefinition[] {
-    let tags: MetaDefinition[] = this.tagStore.get(key);
-    if (tags === undefined) {
-      tags = [];
-    }
-    return tags;
-  }
-
-  private setTags(key: string, tags: MetaDefinition[]): void {
-    this.tagStore.set(key, tags);
+  private storeTag(key: string): void {
+    this.store.dispatch(new AddMetaTagAction(key));
   }
 
   public clearMetaTags() {
-    this.tagStore.forEach((tags: MetaDefinition[], property: string) => {
-      this.meta.removeTag('property=\'' + property + '\'');
+    this.store.pipe(
+      select(tagsInUseSelector),
+      take(1)
+    ).subscribe((tagsInUse: string[]) => {
+      for (const property of tagsInUse) {
+        this.meta.removeTag('property=\'' + property + '\'');
+      }
+      this.store.dispatch(new ClearMetaTagAction());
     });
-    this.tagStore.clear();
   }
 
-  public getTagStore(): Map<string, MetaDefinition[]> {
-    return this.tagStore;
-  }
 
 }

From b23522d39fd80666976a71462c5ba751b2c4a253 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 28 May 2021 10:33:51 +0200
Subject: [PATCH 142/169] 79700: Auto-refreshing the token & Needed config

---
 src/app/app.component.ts               |  2 +-
 src/app/core/auth/auth.interceptor.ts  | 17 +-------
 src/app/core/auth/auth.service.ts      | 54 ++++++++++++++++++++++++--
 src/assets/i18n/en.json5               |  2 +
 src/config/auth-config.interfaces.ts   | 15 ++++++-
 src/environments/environment.common.ts | 24 ++++++++++--
 6 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index c9996f275a..2c01bf637b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -130,7 +130,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       console.info(environment);
     }
     this.storeCSSVariables();
-
+    this.authService.trackTokenExpiration();
   }
 
   ngOnInit() {
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 7b9a08de92..d16f46a849 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -28,7 +28,7 @@ import { AuthMethodType } from './models/auth.method-type';
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
 
-  // Intercetor is called twice per request,
+  // Interceptor is called twice per request,
   // so to prevent RefreshTokenAction is dispatched twice
   // we're creating a refresh token request list
   protected refreshTokenRequestUrls = [];
@@ -216,23 +216,8 @@ export class AuthInterceptor implements HttpInterceptor {
     let authorization: string;
 
     if (authService.isTokenExpired()) {
-      authService.setRedirectUrl(this.router.url);
-      // The access token is expired
-      // Redirect to the login route
-      this.store.dispatch(new RedirectWhenTokenExpiredAction('auth.messages.expired'));
       return observableOf(null);
     } else if ((!this.isAuthRequest(req) || this.isLogoutResponse(req)) && isNotEmpty(token)) {
-      // Intercept a request that is not to the authentication endpoint
-      authService.isTokenExpiring().pipe(
-        filter((isExpiring) => isExpiring))
-        .subscribe(() => {
-          // If the current request url is already in the refresh token request list, skip it
-          if (isUndefined(find(this.refreshTokenRequestUrls, req.url))) {
-            // When a token is about to expire, refresh it
-            this.store.dispatch(new RefreshTokenAction(token));
-            this.refreshTokenRequestUrls.push(req.url);
-          }
-        });
       // Get the auth header from the service.
       authorization = authService.buildAuthHeader(token);
       let newHeaders = req.headers.set('authorization', authorization);
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index ed4fca615c..4903c30f15 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -33,7 +33,7 @@ import {
 } from './selectors';
 import { AppState } from '../../app.reducer';
 import {
-  CheckAuthenticationTokenAction,
+  CheckAuthenticationTokenAction, RefreshTokenAction,
   ResetAuthenticationMessagesAction,
   RetrieveAuthMethodsAction,
   SetRedirectUrlAction
@@ -46,6 +46,9 @@ import { getAllSucceededRemoteDataPayload } from '../shared/operators';
 import { AuthMethod } from './models/auth.method';
 import { HardRedirectService } from '../services/hard-redirect.service';
 import { RemoteData } from '../data/remote-data';
+import { environment } from '../../../environments/environment';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 export const LOGIN_ROUTE = '/login';
 export const LOGOUT_ROUTE = '/logout';
@@ -64,6 +67,11 @@ export class AuthService {
    */
   protected _authenticated: boolean;
 
+  /**
+   * Timer to track time until token refresh
+   */
+  private tokenRefreshTimer;
+
   constructor(@Inject(REQUEST) protected req: any,
               @Inject(NativeWindowService) protected _window: NativeWindowRef,
               @Optional() @Inject(RESPONSE) private response: any,
@@ -73,7 +81,9 @@ export class AuthService {
               protected routeService: RouteService,
               protected storage: CookieService,
               protected store: Store<AppState>,
-              protected hardRedirectService: HardRedirectService
+              protected hardRedirectService: HardRedirectService,
+              private notificationService: NotificationsService,
+              private translateService: TranslateService
   ) {
     this.store.pipe(
       select(isAuthenticated),
@@ -298,7 +308,7 @@ export class AuthService {
    */
   public getToken(): AuthTokenInfo {
     let token: AuthTokenInfo;
-    this.store.pipe(select(getAuthenticationToken))
+    this.store.pipe(take(1), select(getAuthenticationToken))
       .subscribe((authTokenInfo: AuthTokenInfo) => {
         // Retrieve authentication token info and check if is valid
         token = authTokenInfo || null;
@@ -306,6 +316,44 @@ export class AuthService {
     return token;
   }
 
+  /**
+   * Method that checks when the session token from store expires and refreshes it when needed
+   */
+  public trackTokenExpiration(): void {
+    let token: AuthTokenInfo;
+    let currentlyRefreshingToken = false;
+    this.store.pipe(select(getAuthenticationToken)).subscribe((authTokenInfo: AuthTokenInfo) => {
+      // If new token is undefined an it wasn't previously => Refresh failed
+      if (currentlyRefreshingToken && token != undefined && authTokenInfo == undefined) {
+        // Token refresh failed => Error notification => 10 second wait => Page reloads & user logged out
+        this.notificationService.error(this.translateService.get('auth.messages.token-refresh-failed'));
+        setTimeout(() => this.navigateToRedirectUrl(this.hardRedirectService.getCurrentRoute()), 10000);
+        currentlyRefreshingToken = false;
+      }
+      // If new token.expires is different => Refresh succeeded
+      if (currentlyRefreshingToken && authTokenInfo != undefined && token.expires != authTokenInfo.expires) {
+        currentlyRefreshingToken = false;
+      }
+      // Check if/when token needs to be refreshed
+      if (!currentlyRefreshingToken) {
+        token = authTokenInfo || null;
+        if (token != undefined && token != null) {
+          let timeLeftBeforeRefresh = token.expires - new Date().getTime() - environment.auth.rest.timeLeftBeforeTokenRefresh;
+          if (timeLeftBeforeRefresh < 0) {
+            timeLeftBeforeRefresh = 0;
+          }
+          if (hasValue(this.tokenRefreshTimer)) {
+            clearTimeout(this.tokenRefreshTimer);
+          }
+          this.tokenRefreshTimer = setTimeout(() => {
+            this.store.dispatch(new RefreshTokenAction(token));
+            currentlyRefreshingToken = true;
+          }, timeLeftBeforeRefresh);
+        }
+      }
+    });
+  }
+
   /**
    * Check if a token is next to be expired
    * @returns {boolean}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 3e2cc67ecb..cf19be3730 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -526,6 +526,8 @@
 
   "auth.messages.expired": "Your session has expired. Please log in again.",
 
+  "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+
 
 
   "bitstream.download.page": "Now downloading {{bitstream}}..." ,
diff --git a/src/config/auth-config.interfaces.ts b/src/config/auth-config.interfaces.ts
index cc3d97c6b8..59ebda12da 100644
--- a/src/config/auth-config.interfaces.ts
+++ b/src/config/auth-config.interfaces.ts
@@ -6,5 +6,18 @@ export interface AuthTarget {
 }
 
 export interface AuthConfig extends Config {
-  target: AuthTarget;
+  target?: AuthTarget;
+
+  ui: {
+    // The amount of time before the idle warning is shown
+    timeUntilIdle: number;
+    // The amount of time the user has to react after the idle warning is shown before they are logged out.
+    idleGracePeriod: number;
+  };
+
+  rest: {
+    // If the rest token expires in less than this amount of time, it will be refreshed automatically.
+    // This is independent from the idle warning.
+    timeLeftBeforeTokenRefresh: number;
+  };
 }
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 4e246f7243..a7d4ec8a00 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -2,7 +2,6 @@ import { GlobalConfig } from '../config/global-config.interface';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
 import { BrowseByType } from '../app/+browse-by/+browse-by-switcher/browse-by-decorator';
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
-import { BASE_THEME_NAME } from '../app/shared/theme-support/theme.constants';
 
 export const environment: GlobalConfig = {
   production: true,
@@ -43,6 +42,25 @@ export const environment: GlobalConfig = {
       timePerMethod: {[RestRequestMethod.PATCH]: 3} as any // time in seconds
     }
   },
+  // Authority settings
+  auth: {
+    // Authority UI settings
+    ui: {
+      // the amount of time before the idle warning is shown
+      // timeUntilIdle: 15 * 60 * 1000, // 15 minutes
+      timeUntilIdle: 1 * 60 * 1000, // 1 minutes
+      // the amount of time the user has to react after the idle warning is shown before they are logged out.
+      // idleGracePeriod: 5 * 60 * 1000, // 5 minutes
+      idleGracePeriod: 1 * 60 * 1000, // 1 minutes
+    },
+    // Authority REST settings
+    rest: {
+      // If the rest token expires in less than this amount of time, it will be refreshed automatically.
+      // This is independent from the idle warning.
+      // timeLeftBeforeTokenRefresh: 2 * 60 * 1000, // 2 minutes
+      timeLeftBeforeTokenRefresh: 0.25 * 60 * 1000, // 25 seconds
+    },
+  },
   // Form settings
   form: {
     // NOTE: Map server-side validators to comparative Angular form validators
@@ -267,8 +285,8 @@ export const environment: GlobalConfig = {
   ],
   // Whether the UI should rewrite file download URLs to match its domain. Only necessary to enable when running UI and REST API on separate domains
   rewriteDownloadUrls: false,
-  // Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").  
-  // For images, this enables a gallery viewer where you can zoom or page through images. 
+  // Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").
+  // For images, this enables a gallery viewer where you can zoom or page through images.
   // For videos, this enables embedded video streaming
   mediaViewer: {
     image: false,

From 38387d1a0f07ef1d1fea0b0dbdb104a91d0ba368 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 28 May 2021 17:22:26 +0200
Subject: [PATCH 143/169] 79700: Tracking idleness & idle modal

---
 .../browse-by-metadata-page.component.ts      |   1 -
 src/app/app.module.ts                         |   2 +
 src/app/core/auth/auth.actions.ts             |  27 ++-
 src/app/core/auth/auth.effects.ts             |  33 +++-
 src/app/core/auth/auth.reducer.spec.ts        | 164 +++++++++++++-----
 src/app/core/auth/auth.reducer.ts             |  22 ++-
 src/app/core/auth/auth.service.spec.ts        |  18 +-
 src/app/core/auth/auth.service.ts             |  39 ++++-
 src/app/core/auth/selectors.ts                |  17 ++
 src/app/root/root.component.ts                |  26 ++-
 .../auth-nav-menu.component.spec.ts           |   6 +-
 .../user-menu/user-menu.component.spec.ts     |   6 +-
 .../idle-modal/idle-modal.component.html      |  18 ++
 .../shared/idle-modal/idle-modal.component.ts |  85 +++++++++
 src/app/shared/mocks/auth.service.mock.ts     |   7 +
 src/assets/i18n/en.json5                      |  12 +-
 src/environments/mock-environment.ts          |  16 ++
 17 files changed, 433 insertions(+), 66 deletions(-)
 create mode 100644 src/app/shared/idle-modal/idle-modal.component.html
 create mode 100644 src/app/shared/idle-modal/idle-modal.component.ts

diff --git a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
index f5adefc779..5b84daab6e 100644
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.ts
@@ -167,7 +167,6 @@ export class BrowseByMetadataPageComponent implements OnInit {
    * @param value          The value of the browse-entry to display items for
    */
   updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string) {
-    console.log('updatePAge', searchOptions);
     this.items$ = this.browseService.getBrowseItemsFor(value, searchOptions);
   }
 
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3d45ffbfc2..18b97c8e9e 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -47,6 +47,7 @@ import { ThemedHeaderComponent } from './header/themed-header.component';
 import { ThemedFooterComponent } from './footer/themed-footer.component';
 import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
 import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
+import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
 
 export function getBase() {
   return environment.ui.nameSpace;
@@ -144,6 +145,7 @@ const DECLARATIONS = [
   ThemedBreadcrumbsComponent,
   ForbiddenComponent,
   ThemedForbiddenComponent,
+  IdleModalComponent
 ];
 
 const EXPORTS = [
diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index e2cef3562f..ad3f9a9711 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -34,7 +34,9 @@ export const AuthActionTypes = {
   RETRIEVE_AUTHENTICATED_EPERSON: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON'),
   RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'),
   RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'),
-  REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS')
+  REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS'),
+  SET_USER_AS_IDLE: type('dspace/auth/SET_USER_AS_IDLE'),
+  UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -404,6 +406,24 @@ export class RetrieveAuthenticatedEpersonErrorAction implements Action {
     this.payload = payload ;
   }
 }
+
+/**
+ * Set the current user as being idle.
+ * @class SetUserAsIdleAction
+ * @implements {Action}
+ */
+export class SetUserAsIdleAction implements Action {
+  public type: string = AuthActionTypes.SET_USER_AS_IDLE;
+}
+
+/**
+ * Unset the current user as being idle.
+ * @class UnsetUserAsIdleAction
+ * @implements {Action}
+ */
+export class UnsetUserAsIdleAction implements Action {
+  public type: string = AuthActionTypes.UNSET_USER_AS_IDLE;
+}
 /* tslint:enable:max-classes-per-file */
 
 /**
@@ -434,4 +454,7 @@ export type AuthActions
   | RetrieveAuthenticatedEpersonErrorAction
   | RetrieveAuthenticatedEpersonSuccessAction
   | SetRedirectUrlAction
-  | RedirectAfterLoginSuccessAction;
+  | RedirectAfterLoginSuccessAction
+  | SetUserAsIdleAction
+  | UnsetUserAsIdleAction;
+
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 2ef90dd76c..c133310471 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, timer } from 'rxjs';
 import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
 // import @ngrx
 import { Actions, Effect, ofType } from '@ngrx/effects';
@@ -37,9 +37,19 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
-  RetrieveTokenAction
+  RetrieveTokenAction, SetUserAsIdleAction
 } from './auth.actions';
 import { hasValue } from '../../shared/empty.util';
+import { environment } from '../../../environments/environment';
+import { RequestActionTypes } from '../data/request.actions';
+import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
+import { ObjectCacheActionTypes } from '../cache/object-cache.actions';
+import { NO_OP_ACTION_TYPE } from '../../shared/ngrx/no-op.action';
+
+// Action Types that do not break/prevent the user from an idle state
+const IDLE_TIMER_IGNORE_TYPES: string[]
+  = [...Object.values(AuthActionTypes).filter((t: string) => t !== AuthActionTypes.UNSET_USER_AS_IDLE),
+  ...Object.values(RequestActionTypes), ...Object.values(NotificationsActionTypes)];
 
 @Injectable()
 export class AuthEffects {
@@ -242,6 +252,25 @@ export class AuthEffects {
       })
     );
 
+  /**
+   * For any action that is not in {@link IDLE_TIMER_IGNORE_TYPES} that comes in => Start the idleness timer
+   * If the idleness timer runs out (so no un-ignored action come through for that amount of time)
+   * => Return the action to set the user as idle ({@link SetUserAsIdleAction})
+   * @method trackIdleness
+   */
+  @Effect()
+  public trackIdleness$: Observable<Action> = this.actions$.pipe(
+    filter((action: Action) => !IDLE_TIMER_IGNORE_TYPES.includes(action.type)),
+    // Using switchMap the timer will be interrupted and restarted if a new action comes in, so idleness timer restarts
+    switchMap(() => {
+      this.authService.isAuthenticated();
+      return timer(environment.auth.ui.timeUntilIdle);
+    }),
+    map(() => {
+      return new SetUserAsIdleAction();
+    })
+  );
+
   /**
    * @constructor
    * @param {Actions} actions$
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index 914a1a152d..f721c8c208 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -23,7 +23,7 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
-  SetRedirectUrlAction
+  SetRedirectUrlAction, SetUserAsIdleAction, UnsetUserAsIdleAction
 } from './auth.actions';
 import { AuthTokenInfo } from './models/auth-token-info.model';
 import { EPersonMock } from '../../shared/testing/eperson.mock';
@@ -44,6 +44,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
+      idle: false
     };
     const action = new AuthenticateAction('user', 'password');
     const newState = authReducer(initialState, action);
@@ -53,7 +54,8 @@ describe('authReducer', () => {
       blocking: true,
       error: undefined,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
 
     expect(newState).toEqual(state);
@@ -66,7 +68,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new AuthenticationSuccessAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
@@ -81,7 +84,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new AuthenticationErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -92,7 +96,8 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       authToken: undefined,
-      error: 'Test error message'
+      error: 'Test error message',
+      idle: false
     };
 
     expect(newState).toEqual(state);
@@ -105,7 +110,8 @@ describe('authReducer', () => {
       loaded: false,
       error: undefined,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new AuthenticatedAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
@@ -115,7 +121,8 @@ describe('authReducer', () => {
       loaded: false,
       error: undefined,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -127,7 +134,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new AuthenticatedSuccessAction(true, mockTokenInfo, EPersonMock._links.self.href);
     const newState = authReducer(initialState, action);
@@ -138,7 +146,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -150,7 +159,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new AuthenticatedErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -161,7 +171,8 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -172,6 +183,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
+      idle: false
     };
     const action = new CheckAuthenticationTokenAction();
     const newState = authReducer(initialState, action);
@@ -180,6 +192,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -190,6 +203,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
+      idle: false
     };
     const action = new CheckAuthenticationTokenCookieAction();
     const newState = authReducer(initialState, action);
@@ -198,6 +212,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -211,7 +226,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
 
     const action = new LogOutAction();
@@ -229,7 +245,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
 
     const action = new LogOutSuccessAction();
@@ -243,7 +260,8 @@ describe('authReducer', () => {
       loading: true,
       info: undefined,
       refreshing: false,
-      userId: undefined
+      userId: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -257,7 +275,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
 
     const action = new LogOutErrorAction(mockError);
@@ -270,7 +289,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -283,7 +303,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new RetrieveAuthenticatedEpersonSuccessAction(EPersonMock.id);
     const newState = authReducer(initialState, action);
@@ -295,7 +316,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -307,7 +329,8 @@ describe('authReducer', () => {
       error: undefined,
       blocking: true,
       loading: true,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     const action = new RetrieveAuthenticatedEpersonErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -318,7 +341,8 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -332,7 +356,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
     const newTokenInfo = new AuthTokenInfo('Refreshed token');
     const action = new RefreshTokenAction(newTokenInfo);
@@ -346,7 +371,8 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      refreshing: true
+      refreshing: true,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -361,7 +387,8 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      refreshing: true
+      refreshing: true,
+      idle: false
     };
     const newTokenInfo = new AuthTokenInfo('Refreshed token');
     const action = new RefreshTokenSuccessAction(newTokenInfo);
@@ -375,7 +402,8 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      refreshing: false
+      refreshing: false,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -390,7 +418,8 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      refreshing: true
+      refreshing: true,
+      idle: false
     };
     const action = new RefreshTokenErrorAction();
     const newState = authReducer(initialState, action);
@@ -403,7 +432,8 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       refreshing: false,
-      userId: undefined
+      userId: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -417,7 +447,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
 
     state = {
@@ -428,7 +459,8 @@ describe('authReducer', () => {
       loading: false,
       error: undefined,
       info: 'Message',
-      userId: undefined
+      userId: undefined,
+      idle: false
     };
   });
 
@@ -450,6 +482,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
+      idle: false
     };
     const action = new AddAuthenticationMessageAction('Message');
     const newState = authReducer(initialState, action);
@@ -458,7 +491,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      info: 'Message'
+      info: 'Message',
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -470,7 +504,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       error: 'Error',
-      info: 'Message'
+      info: 'Message',
+      idle: false
     };
     const action = new ResetAuthenticationMessagesAction();
     const newState = authReducer(initialState, action);
@@ -480,7 +515,8 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       error: undefined,
-      info: undefined
+      info: undefined,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -490,7 +526,8 @@ describe('authReducer', () => {
       authenticated: false,
       loaded: false,
       blocking: false,
-      loading: false
+      loading: false,
+      idle: false
     };
     const action = new SetRedirectUrlAction('redirect.url');
     const newState = authReducer(initialState, action);
@@ -499,7 +536,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      redirectUrl: 'redirect.url'
+      redirectUrl: 'redirect.url',
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -510,7 +548,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
     const action = new RetrieveAuthMethodsAction(new AuthStatus(), true);
     const newState = authReducer(initialState, action);
@@ -519,7 +558,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -530,7 +570,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
     const authMethods = [
       new AuthMethod(AuthMethodType.Password),
@@ -543,7 +584,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      authMethods: authMethods
+      authMethods: authMethods,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -554,7 +596,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
     const authMethods = [
       new AuthMethod(AuthMethodType.Password),
@@ -588,7 +631,50 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)]
+      authMethods: [new AuthMethod(AuthMethodType.Password)],
+      idle: false
+    };
+    expect(newState).toEqual(state);
+  });
+
+  it('should properly set the state, in response to a SET_USER_AS_IDLE action', () => {
+    initialState = {
+      authenticated: true,
+      loaded: true,
+      blocking: false,
+      loading: false,
+      idle: false
+    };
+
+    const action = new SetUserAsIdleAction();
+    const newState = authReducer(initialState, action);
+    state = {
+      authenticated: true,
+      loaded: true,
+      blocking: false,
+      loading: false,
+      idle: true
+    };
+    expect(newState).toEqual(state);
+  });
+
+  it('should properly set the state, in response to a UNSET_USER_AS_IDLE action', () => {
+    initialState = {
+      authenticated: true,
+      loaded: true,
+      blocking: false,
+      loading: false,
+      idle: true
+    };
+
+    const action = new UnsetUserAsIdleAction();
+    const newState = authReducer(initialState, action);
+    state = {
+      authenticated: true,
+      loaded: true,
+      blocking: false,
+      loading: false,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index dfe29a3ef2..0424a58898 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -59,6 +59,9 @@ export interface AuthState {
   // all authentication Methods enabled at the backend
   authMethods?: AuthMethod[];
 
+  // true when the current user is idle
+  idle: boolean;
+
 }
 
 /**
@@ -69,7 +72,8 @@ const initialState: AuthState = {
   loaded: false,
   blocking: true,
   loading: false,
-  authMethods: []
+  authMethods: [],
+  idle: false
 };
 
 /**
@@ -234,6 +238,22 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         blocking: true,
       });
 
+    case AuthActionTypes.SET_USER_AS_IDLE:
+      if (state.authenticated) {
+        return Object.assign({}, state, {
+          idle: true,
+        });
+      } else {
+        return Object.assign({}, state, {
+          idle: false,
+        });
+      }
+
+    case AuthActionTypes.UNSET_USER_AS_IDLE:
+      return Object.assign({}, state, {
+        idle: false,
+      });
+
     default:
       return state;
   }
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index 505f925e8e..d54ffdae16 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -27,6 +27,10 @@ import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.util
 import { authMethodsMock } from '../../shared/testing/auth-service.stub';
 import { AuthMethod } from './models/auth.method';
 import { HardRedirectService } from '../services/hard-redirect.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 
 describe('AuthService test', () => {
 
@@ -107,6 +111,8 @@ describe('AuthService test', () => {
           { provide: Store, useValue: mockStore },
           { provide: EPersonDataService, useValue: mockEpersonDataService },
           { provide: HardRedirectService, useValue: hardRedirectService },
+          { provide: NotificationsService, useValue: NotificationsServiceStub },
+          { provide: TranslateService, useValue: getMockTranslateService() },
           CookieService,
           AuthService
         ],
@@ -207,13 +213,13 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService) => {
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       store
         .subscribe((state) => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService);
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
     }));
 
     it('should return true when user is logged in', () => {
@@ -277,7 +283,7 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService) => {
+    beforeEach(inject([ClientCookieService, AuthRequestService, Store, Router, RouteService], (cookieService: ClientCookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       const expiredToken: AuthTokenInfo = new AuthTokenInfo('test_token');
       expiredToken.expires = Date.now() - (1000 * 60 * 60);
       authenticatedState = {
@@ -292,7 +298,7 @@ describe('AuthService test', () => {
           (state as any).core = Object.create({});
           (state as any).core.auth = authenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService);
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
       storage = (authService as any).storage;
       routeServiceMock = TestBed.inject(RouteService);
       routerStub = TestBed.inject(Router);
@@ -493,13 +499,13 @@ describe('AuthService test', () => {
       }).compileComponents();
     }));
 
-    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService) => {
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
       store
         .subscribe((state) => {
           (state as any).core = Object.create({});
           (state as any).core.auth = unAuthenticatedState;
         });
-      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService);
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
     }));
 
     it('should return null for the shortlived token', () => {
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 4903c30f15..7b7c61f741 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -29,6 +29,7 @@ import {
   getRedirectUrl,
   isAuthenticated,
   isAuthenticatedLoaded,
+  isIdle,
   isTokenRefreshing
 } from './selectors';
 import { AppState } from '../../app.reducer';
@@ -36,7 +37,9 @@ import {
   CheckAuthenticationTokenAction, RefreshTokenAction,
   ResetAuthenticationMessagesAction,
   RetrieveAuthMethodsAction,
-  SetRedirectUrlAction
+  SetRedirectUrlAction,
+  SetUserAsIdleAction,
+  UnsetUserAsIdleAction
 } from './auth.actions';
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 import { Base64EncodeUrl } from '../../shared/utils/encode-decode.util';
@@ -197,7 +200,7 @@ export class AuthService {
     return this.store.pipe(
       select(getAuthenticatedUserId),
       hasValueOperator(),
-      switchMap((id: string) => this.epersonService.findById(id) ),
+      switchMap((id: string) => this.epersonService.findById(id)),
       getAllSucceededRemoteDataPayload()
     );
   }
@@ -279,7 +282,7 @@ export class AuthService {
     // Send a request that sign end the session
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
-    const options: HttpOptions = Object.create({ headers, responseType: 'text' });
+    const options: HttpOptions = Object.create({headers, responseType: 'text'});
     return this.authRequestService.postToEndpoint('logout', options).pipe(
       map((rd: RemoteData<AuthStatus>) => {
         const status = rd.payload;
@@ -324,20 +327,20 @@ export class AuthService {
     let currentlyRefreshingToken = false;
     this.store.pipe(select(getAuthenticationToken)).subscribe((authTokenInfo: AuthTokenInfo) => {
       // If new token is undefined an it wasn't previously => Refresh failed
-      if (currentlyRefreshingToken && token != undefined && authTokenInfo == undefined) {
+      if (currentlyRefreshingToken && token !== undefined && authTokenInfo === undefined) {
         // Token refresh failed => Error notification => 10 second wait => Page reloads & user logged out
         this.notificationService.error(this.translateService.get('auth.messages.token-refresh-failed'));
         setTimeout(() => this.navigateToRedirectUrl(this.hardRedirectService.getCurrentRoute()), 10000);
         currentlyRefreshingToken = false;
       }
       // If new token.expires is different => Refresh succeeded
-      if (currentlyRefreshingToken && authTokenInfo != undefined && token.expires != authTokenInfo.expires) {
+      if (currentlyRefreshingToken && authTokenInfo !== undefined && token.expires !== authTokenInfo.expires) {
         currentlyRefreshingToken = false;
       }
       // Check if/when token needs to be refreshed
       if (!currentlyRefreshingToken) {
         token = authTokenInfo || null;
-        if (token != undefined && token != null) {
+        if (token !== undefined && token !== null) {
           let timeLeftBeforeRefresh = token.expires - new Date().getTime() - environment.auth.rest.timeLeftBeforeTokenRefresh;
           if (timeLeftBeforeRefresh < 0) {
             timeLeftBeforeRefresh = 0;
@@ -394,7 +397,7 @@ export class AuthService {
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = { expires: expires };
+    const options: CookieAttributes = {expires: expires};
 
     // Save cookie with the token
     return this.storage.set(TOKENITEM, token, options);
@@ -483,7 +486,7 @@ export class AuthService {
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = { expires: expires };
+    const options: CookieAttributes = {expires: expires};
     this.storage.set(REDIRECT_COOKIE, url, options);
     this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
   }
@@ -576,4 +579,24 @@ export class AuthService {
     return new RetrieveAuthMethodsAction(authStatus, false);
   }
 
+  /**
+   * Determines if current user is idle
+   * @returns {Observable<boolean>}
+   */
+  public isUserIdle(): Observable<boolean> {
+    return this.store.pipe(select(isIdle));
+  }
+
+  /**
+   * Set idle of auth state
+   * @returns {Observable<boolean>}
+   */
+  public setIdle(idle: boolean): void {
+    if (idle) {
+      this.store.dispatch(new SetUserAsIdleAction());
+    } else {
+      this.store.dispatch(new UnsetUserAsIdleAction());
+    }
+  }
+
 }
diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts
index c4e95a0fb3..9ee9f7eb2e 100644
--- a/src/app/core/auth/selectors.ts
+++ b/src/app/core/auth/selectors.ts
@@ -115,6 +115,14 @@ const _getRedirectUrl = (state: AuthState) => state.redirectUrl;
 
 const _getAuthenticationMethods = (state: AuthState) => state.authMethods;
 
+/**
+ * Returns true if the user is idle.
+ * @function _isIdle
+ * @param {State} state
+ * @returns {boolean}
+ */
+const _isIdle = (state: AuthState) => state.idle;
+
 /**
  * Returns the authentication methods enabled at the backend
  * @function getAuthenticationMethods
@@ -231,3 +239,12 @@ export const getRegistrationError = createSelector(getAuthState, _getRegistratio
  * @return {string}
  */
 export const getRedirectUrl = createSelector(getAuthState, _getRedirectUrl);
+
+/**
+ * Returns true if the user is idle
+ * @function isIdle
+ * @param {AuthState} state
+ * @param {any} props
+ * @return {boolean}
+ */
+export const isIdle = createSelector(getAuthState, _isIdle);
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 576a0152be..c2d3c96951 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,4 +1,4 @@
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { Component, Inject, OnInit, Optional, Input } from '@angular/core';
 import { Router } from '@angular/router';
 
@@ -21,6 +21,8 @@ import { environment } from '../../environments/environment';
 import { LocaleService } from '../core/locale/locale.service';
 import { KlaroService } from '../shared/cookies/klaro.service';
 import { slideSidebarPadding } from '../shared/animations/slide';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { IdleModalComponent } from '../shared/idle-modal/idle-modal.component';
 
 @Component({
   selector: 'ds-root',
@@ -47,6 +49,11 @@ export class RootComponent implements OnInit {
    */
   @Input() shouldShowRouteLoader: boolean;
 
+  /**
+   * Whether or not the idle modal is is currently open
+   */
+  idleModalOpen: boolean;
+
   constructor(
     @Inject(NativeWindowService) private _window: NativeWindowRef,
     private translate: TranslateService,
@@ -60,7 +67,8 @@ export class RootComponent implements OnInit {
     private menuService: MenuService,
     private windowService: HostWindowService,
     private localeService: LocaleService,
-    @Optional() private cookiesService: KlaroService
+    @Optional() private cookiesService: KlaroService,
+    private modalService: NgbModal
   ) {
   }
 
@@ -75,5 +83,19 @@ export class RootComponent implements OnInit {
       .pipe(
         map(([collapsed, mobile]) => collapsed || mobile)
       );
+
+    this.authService.isUserIdle().subscribe((userIdle: boolean) => {
+      if (userIdle) {
+        if (!this.idleModalOpen) {
+          const modalRef = this.modalService.open(IdleModalComponent);
+          this.idleModalOpen = true;
+          modalRef.componentInstance.response.pipe(take(1)).subscribe((closed: boolean) => {
+            if (closed) {
+              this.idleModalOpen = false;
+            }
+          });
+        }
+      }
+    });
   }
 }
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
index 185cf3e92a..6aad3dd636 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.spec.ts
@@ -44,7 +44,8 @@ describe('AuthNavMenuComponent', () => {
       authenticated: false,
       loaded: false,
       blocking: false,
-      loading: false
+      loading: false,
+      idle: false
     };
     authState = {
       authenticated: true,
@@ -52,7 +53,8 @@ describe('AuthNavMenuComponent', () => {
       blocking: false,
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
   }
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index c0f5f13e8f..983fe68274 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -37,7 +37,8 @@ describe('UserMenuComponent', () => {
       blocking: false,
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
     authStateLoading = {
       authenticated: true,
@@ -45,7 +46,8 @@ describe('UserMenuComponent', () => {
       blocking: false,
       loading: true,
       authToken: null,
-      userId: EPersonMock.id
+      userId: EPersonMock.id,
+      idle: false
     };
   }
 
diff --git a/src/app/shared/idle-modal/idle-modal.component.html b/src/app/shared/idle-modal/idle-modal.component.html
new file mode 100644
index 0000000000..665ebb9672
--- /dev/null
+++ b/src/app/shared/idle-modal/idle-modal.component.html
@@ -0,0 +1,18 @@
+<div>
+  <div class="modal-header">{{ "idle-modal.header" | translate }}
+    <button type="button" class="close" (click)="closePressed()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <p>{{ "idle-modal.info" | translate:{timeToExpire: timeToExpire} }}</p>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="cancel btn btn-danger" (click)="logOutPressed()" aria-label="Log out">
+      <i class="fas fa-times"></i> {{ "idle-modal.log-out" | translate }}
+    </button>
+    <button type="button" class="confirm btn btn-outline-secondary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus>
+      {{ "idle-modal.extend-session" | translate }}
+    </button>
+  </div>
+</div>
diff --git a/src/app/shared/idle-modal/idle-modal.component.ts b/src/app/shared/idle-modal/idle-modal.component.ts
new file mode 100644
index 0000000000..750657c2e4
--- /dev/null
+++ b/src/app/shared/idle-modal/idle-modal.component.ts
@@ -0,0 +1,85 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { environment } from '../../../environments/environment';
+import { AuthService } from '../../core/auth/auth.service';
+import { Subject } from 'rxjs';
+import { hasValue } from '../empty.util';
+
+@Component({
+  selector: 'ds-idle-modal',
+  templateUrl: 'idle-modal.component.html',
+})
+export class IdleModalComponent implements OnInit {
+
+  /**
+   * Total time of idleness before session expires (in minutes)
+   * (environment.auth.ui.timeUntilIdle + environment.auth.ui.idleGracePeriod / 1000 / 60)
+   */
+  timeToExpire: number;
+
+  /**
+   * Timer to track time grace period
+   */
+  private graceTimer;
+
+  /**
+   * An event fired when the modal is closed
+   */
+  @Output()
+  response: Subject<boolean> = new Subject();
+
+  constructor(private activeModal: NgbActiveModal,
+              private authService: AuthService) {
+    this.timeToExpire = (environment.auth.ui.timeUntilIdle + environment.auth.ui.idleGracePeriod) / 1000 / 60; // ms => min
+  }
+
+  ngOnInit() {
+    if (hasValue(this.graceTimer)) {
+      clearTimeout(this.graceTimer);
+    }
+    this.graceTimer = setTimeout(() => {
+      this.logOutPressed();
+    }, environment.auth.ui.idleGracePeriod);
+  }
+
+  /**
+   * When extend session is pressed
+   */
+  extendSessionPressed() {
+    this.extendSessionAndCloseModal();
+  }
+
+  /**
+   * Close modal and logout
+   */
+  logOutPressed() {
+    this.authService.logout();
+    this.closeModal();
+  }
+
+  /**
+   * When close is pressed
+   */
+  closePressed() {
+    this.extendSessionAndCloseModal();
+  }
+
+  /**
+   * Close the modal and extend session
+   */
+  extendSessionAndCloseModal() {
+    if (hasValue(this.graceTimer)) {
+      clearTimeout(this.graceTimer);
+    }
+    this.authService.setIdle(false);
+    this.closeModal();
+  }
+
+  /**
+   * Close the modal and set the response to true so RootComponent knows the modal was closed
+   */
+  closeModal() {
+    this.activeModal.close();
+    this.response.next(true);
+  }
+}
diff --git a/src/app/shared/mocks/auth.service.mock.ts b/src/app/shared/mocks/auth.service.mock.ts
index 98878bd6c1..bb39d08284 100644
--- a/src/app/shared/mocks/auth.service.mock.ts
+++ b/src/app/shared/mocks/auth.service.mock.ts
@@ -19,4 +19,11 @@ export class AuthServiceMock {
 
   public setRedirectUrl(url: string) {
   }
+
+  public trackTokenExpiration(): void {
+  }
+
+  public isUserIdle(): Observable<boolean> {
+    return observableOf(false);
+  }
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index cf19be3730..6105c79cd9 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3691,5 +3691,15 @@
 
   "workflow-item.send-back.button.cancel": "Cancel",
 
-  "workflow-item.send-back.button.confirm": "Send back"
+  "workflow-item.send-back.button.confirm": "Send back",
+
+
+
+  "idle-modal.header": "Session will expire soon",
+
+  "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?”",
+
+  "idle-modal.log-out": "Log out",
+
+  "idle-modal.extend-session": "Extend session"
 }
diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts
index 8de5b187ad..050f99ea29 100644
--- a/src/environments/mock-environment.ts
+++ b/src/environments/mock-environment.ts
@@ -35,6 +35,22 @@ export const environment: Partial<GlobalConfig> = {
       timePerMethod: {[RestRequestMethod.PATCH]: 3} as any // time in seconds
     }
   },
+  // Authority settings
+  auth: {
+    // Authority UI settings
+    ui: {
+      // the amount of time before the idle warning is shown
+      timeUntilIdle: 20000, // 20 sec
+      // the amount of time the user has to react after the idle warning is shown before they are logged out.
+      idleGracePeriod: 20000, // 20 sec
+    },
+    // Authority REST settings
+    rest: {
+      // If the rest token expires in less than this amount of time, it will be refreshed automatically.
+      // This is independent from the idle warning.
+      timeLeftBeforeTokenRefresh: 20000, // 20 sec
+    },
+  },
   // Form settings
   form: {
     // NOTE: Map server-side validators to comparative Angular form validators

From e88baa1995d86f34d70b0fde13e078ce3c67ea37 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 3 Jun 2021 14:29:50 +0200
Subject: [PATCH 144/169] 79700: specs for modal, auth check for idleness
 tracking & stop blocking at token success

---
 src/app/core/auth/auth.effects.ts             |   1 -
 src/app/core/auth/auth.reducer.ts             |   1 +
 src/app/root/root.component.ts                |  30 ++--
 .../idle-modal/idle-modal.component.spec.ts   | 128 ++++++++++++++++++
 src/assets/i18n/en.json5                      |   2 +-
 src/environments/environment.common.ts        |   7 +-
 6 files changed, 151 insertions(+), 18 deletions(-)
 create mode 100644 src/app/shared/idle-modal/idle-modal.component.spec.ts

diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index c133310471..f7b81dc4ef 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -263,7 +263,6 @@ export class AuthEffects {
     filter((action: Action) => !IDLE_TIMER_IGNORE_TYPES.includes(action.type)),
     // Using switchMap the timer will be interrupted and restarted if a new action comes in, so idleness timer restarts
     switchMap(() => {
-      this.authService.isAuthenticated();
       return timer(environment.auth.ui.timeUntilIdle);
     }),
     map(() => {
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index 0424a58898..f26ddb0182 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -193,6 +193,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         authToken: (action as RefreshTokenSuccessAction).payload,
         refreshing: false,
+        blocking: false
       });
 
     case AuthActionTypes.ADD_MESSAGE:
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index c2d3c96951..81ae1a745c 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -2,7 +2,12 @@ import { map, take } from 'rxjs/operators';
 import { Component, Inject, OnInit, Optional, Input } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  combineLatest as combineLatestObservable,
+  Observable,
+  of
+} from 'rxjs';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
@@ -84,18 +89,19 @@ export class RootComponent implements OnInit {
         map(([collapsed, mobile]) => collapsed || mobile)
       );
 
-    this.authService.isUserIdle().subscribe((userIdle: boolean) => {
-      if (userIdle) {
-        if (!this.idleModalOpen) {
-          const modalRef = this.modalService.open(IdleModalComponent);
-          this.idleModalOpen = true;
-          modalRef.componentInstance.response.pipe(take(1)).subscribe((closed: boolean) => {
-            if (closed) {
-              this.idleModalOpen = false;
-            }
-          });
+    observableCombineLatest([this.authService.isUserIdle(), this.authService.isAuthenticated()])
+      .subscribe(([userIdle, authenticated]) => {
+        if (userIdle && authenticated) {
+          if (!this.idleModalOpen) {
+            const modalRef = this.modalService.open(IdleModalComponent);
+            this.idleModalOpen = true;
+            modalRef.componentInstance.response.pipe(take(1)).subscribe((closed: boolean) => {
+              if (closed) {
+                this.idleModalOpen = false;
+              }
+            });
+          }
         }
-      }
     });
   }
 }
diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
new file mode 100644
index 0000000000..639cbd6ad1
--- /dev/null
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -0,0 +1,128 @@
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { IdleModalComponent } from './idle-modal.component';
+import { AuthService } from '../../core/auth/auth.service';
+import { By } from '@angular/platform-browser';
+
+describe('IdleModalComponent', () => {
+  let component: IdleModalComponent;
+  let fixture: ComponentFixture<IdleModalComponent>;
+  let debugElement: DebugElement;
+
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+  const authServiceStub = jasmine.createSpyObj('authService', ['setIdle', 'logout']);
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [IdleModalComponent],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub },
+        { provide: AuthService, useValue: authServiceStub }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(IdleModalComponent);
+    component = fixture.componentInstance;
+    debugElement = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('extendSessionPressed', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component.response, 'next');
+      component.extendSessionPressed();
+    }));
+    it('should set idle to false', () => {
+      expect(authServiceStub.setIdle).toHaveBeenCalledWith(false);
+    });
+    it('should close the modal', () => {
+      expect(modalStub.close).toHaveBeenCalled();
+    });
+    it('response \'closed\' should have true as next', () => {
+      expect(component.response.next).toHaveBeenCalledWith(true);
+    });
+  });
+
+  describe('logOutPressed', () => {
+    beforeEach(() => {
+      component.logOutPressed();
+    });
+    it('should logout', () => {
+      expect(authServiceStub.logout).toHaveBeenCalled();
+    });
+    it('should close the modal', () => {
+      expect(modalStub.close).toHaveBeenCalled();
+    });
+  });
+
+  describe('closePressed', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component.response, 'next');
+      component.closePressed();
+    }));
+    it('should set idle to false', () => {
+      expect(authServiceStub.setIdle).toHaveBeenCalledWith(false);
+    });
+    it('should close the modal', () => {
+      expect(modalStub.close).toHaveBeenCalled();
+    });
+    it('response \'closed\' should have true as next', () => {
+      expect(component.response.next).toHaveBeenCalledWith(true);
+    });
+  });
+
+  describe('when the click method emits on extend session button', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'extendSessionPressed');
+      debugElement.query(By.css('button.confirm')).triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should call the extendSessionPressed method on the component', () => {
+      expect(component.extendSessionPressed).toHaveBeenCalled();
+    });
+  });
+
+  describe('when the click method emits on log out button', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'logOutPressed');
+      debugElement.query(By.css('button.cancel')).triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should call the logOutPressed method on the component', () => {
+      expect(component.logOutPressed).toHaveBeenCalled();
+    });
+  });
+
+  describe('when the click method emits on close button', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'closePressed');
+      debugElement.query(By.css('.close')).triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('should call the closePressed method on the component', () => {
+      expect(component.closePressed).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 6105c79cd9..5501b92aa7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3697,7 +3697,7 @@
 
   "idle-modal.header": "Session will expire soon",
 
-  "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?”",
+  "idle-modal.info": "For security reasons, user sessions expire after {{ timeToExpire }} minutes of inactivity. Your session will expire soon. Would you like to extend it or log out?",
 
   "idle-modal.log-out": "Log out",
 
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index a7d4ec8a00..24496386e9 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -48,17 +48,16 @@ export const environment: GlobalConfig = {
     ui: {
       // the amount of time before the idle warning is shown
       // timeUntilIdle: 15 * 60 * 1000, // 15 minutes
-      timeUntilIdle: 1 * 60 * 1000, // 1 minutes
+      timeUntilIdle: 30 * 1000, // 30 seconds
       // the amount of time the user has to react after the idle warning is shown before they are logged out.
       // idleGracePeriod: 5 * 60 * 1000, // 5 minutes
-      idleGracePeriod: 1 * 60 * 1000, // 1 minutes
+      idleGracePeriod: 1 * 60 * 1000, // 1 minute
     },
     // Authority REST settings
     rest: {
       // If the rest token expires in less than this amount of time, it will be refreshed automatically.
       // This is independent from the idle warning.
-      // timeLeftBeforeTokenRefresh: 2 * 60 * 1000, // 2 minutes
-      timeLeftBeforeTokenRefresh: 0.25 * 60 * 1000, // 25 seconds
+      timeLeftBeforeTokenRefresh: 2 * 60 * 1000, // 2 minutes
     },
   },
   // Form settings

From 91b4c81986e6b5b00f8a12b6c6054822bd7b4f48 Mon Sep 17 00:00:00 2001
From: Art Lowel <art@atmire.com>
Date: Tue, 15 Jun 2021 15:48:10 +0200
Subject: [PATCH 145/169] run idle timer outside of angular zone

---
 src/app/core/auth/auth.effects.ts             | 34 ++++++++++++-------
 .../core/utilities/enter-zone.scheduler.ts    | 19 +++++++++++
 .../core/utilities/leave-zone.scheduler.ts    | 19 +++++++++++
 3 files changed, 60 insertions(+), 12 deletions(-)
 create mode 100644 src/app/core/utilities/enter-zone.scheduler.ts
 create mode 100644 src/app/core/utilities/leave-zone.scheduler.ts

diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index f7b81dc4ef..8ce10c0c6b 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,7 +1,13 @@
-import { Injectable } from '@angular/core';
+import { Injectable, NgZone } from '@angular/core';
 
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, timer } from 'rxjs';
-import { catchError, filter, map, switchMap, take, tap } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  timer,
+  asyncScheduler, queueScheduler
+} from 'rxjs';
+import { catchError, filter, map, switchMap, take, tap, observeOn } from 'rxjs/operators';
 // import @ngrx
 import { Actions, Effect, ofType } from '@ngrx/effects';
 import { Action, select, Store } from '@ngrx/store';
@@ -43,8 +49,8 @@ import { hasValue } from '../../shared/empty.util';
 import { environment } from '../../../environments/environment';
 import { RequestActionTypes } from '../data/request.actions';
 import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
-import { ObjectCacheActionTypes } from '../cache/object-cache.actions';
-import { NO_OP_ACTION_TYPE } from '../../shared/ngrx/no-op.action';
+import { LeaveZoneScheduler } from '../utilities/leave-zone.scheduler';
+import { EnterZoneScheduler } from '../utilities/enter-zone.scheduler';
 
 // Action Types that do not break/prevent the user from an idle state
 const IDLE_TIMER_IGNORE_TYPES: string[]
@@ -261,22 +267,26 @@ export class AuthEffects {
   @Effect()
   public trackIdleness$: Observable<Action> = this.actions$.pipe(
     filter((action: Action) => !IDLE_TIMER_IGNORE_TYPES.includes(action.type)),
-    // Using switchMap the timer will be interrupted and restarted if a new action comes in, so idleness timer restarts
-    switchMap(() => {
-      return timer(environment.auth.ui.timeUntilIdle);
-    }),
-    map(() => {
-      return new SetUserAsIdleAction();
-    })
+    // Using switchMap the effect will stop subscribing to the previous timer if a new action comes
+    // in, and start a new timer
+    switchMap(() =>
+      // Start a timer outside of Angular's zone
+      timer(environment.auth.ui.timeUntilIdle, new LeaveZoneScheduler(this.zone, asyncScheduler))
+    ),
+    // Re-enter the zone to dispatch the action
+    observeOn(new EnterZoneScheduler(this.zone, queueScheduler)),
+    map(() => new SetUserAsIdleAction()),
   );
 
   /**
    * @constructor
    * @param {Actions} actions$
+   * @param {NgZone} zone
    * @param {AuthService} authService
    * @param {Store} store
    */
   constructor(private actions$: Actions,
+              private zone: NgZone,
               private authService: AuthService,
               private store: Store<AppState>) {
   }
diff --git a/src/app/core/utilities/enter-zone.scheduler.ts b/src/app/core/utilities/enter-zone.scheduler.ts
new file mode 100644
index 0000000000..96aee7d9a5
--- /dev/null
+++ b/src/app/core/utilities/enter-zone.scheduler.ts
@@ -0,0 +1,19 @@
+import { SchedulerLike, Subscription } from 'rxjs';
+import { NgZone } from '@angular/core';
+
+/**
+ *  An RXJS scheduler that will re-enter the Angular zone to run what's scheduled
+ */
+export class EnterZoneScheduler implements SchedulerLike {
+  constructor(private zone: NgZone, private scheduler: SchedulerLike) { }
+
+  schedule(...args: any[]): Subscription {
+    return this.zone.run(() =>
+      this.scheduler.schedule.apply(this.scheduler, args)
+    );
+  }
+
+  now (): number {
+    return this.scheduler.now();
+  }
+}
diff --git a/src/app/core/utilities/leave-zone.scheduler.ts b/src/app/core/utilities/leave-zone.scheduler.ts
new file mode 100644
index 0000000000..2587563661
--- /dev/null
+++ b/src/app/core/utilities/leave-zone.scheduler.ts
@@ -0,0 +1,19 @@
+import { SchedulerLike, Subscription } from 'rxjs';
+import { NgZone } from '@angular/core';
+
+/**
+ * An RXJS scheduler that will run what's scheduled outside of the Angular zone
+ */
+export class LeaveZoneScheduler implements SchedulerLike {
+  constructor(private zone: NgZone, private scheduler: SchedulerLike) { }
+
+  schedule(...args: any[]): Subscription {
+    return this.zone.runOutsideAngular(() =>
+      this.scheduler.schedule.apply(this.scheduler, args)
+    );
+  }
+
+  now (): number {
+    return this.scheduler.now();
+  }
+}

From 4b1f0864696fb06a8a10457184b90dbe0dc15d75 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 18 Jun 2021 13:18:17 +0200
Subject: [PATCH 146/169] 79700: Feedback 2021-06-15 applied

---
 src/app/app.component.ts                      | 37 +++++++++++++++--
 src/app/core/auth/auth.reducer.ts             | 12 ++----
 src/app/core/auth/auth.service.ts             | 13 +++---
 src/app/root/root.component.ts                | 40 ++-----------------
 .../idle-modal/idle-modal.component.spec.ts   | 12 +++++-
 .../shared/idle-modal/idle-modal.component.ts |  7 +++-
 6 files changed, 64 insertions(+), 57 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2c01bf637b..48e1e6f3d1 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,4 +1,4 @@
-import { delay, distinctUntilChanged, filter, take } from 'rxjs/operators';
+import { delay, distinctUntilChanged, filter, take, withLatestFrom } from 'rxjs/operators';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -11,7 +11,7 @@ import {
 } from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router';
 
-import { BehaviorSubject, Observable, of } from 'rxjs';
+import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
 import { select, Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
@@ -38,6 +38,8 @@ import { ThemeService } from './shared/theme-support/theme.service';
 import { BASE_THEME_NAME } from './shared/theme-support/theme.constants';
 import { DEFAULT_THEME_CONFIG } from './shared/theme-support/theme.effects';
 import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'ds-app',
@@ -70,6 +72,11 @@ export class AppComponent implements OnInit, AfterViewInit {
   isThemeLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
 
+  /**
+   * Whether or not the idle modal is is currently open
+   */
+  idleModalOpen: boolean;
+
   constructor(
     @Inject(NativeWindowService) private _window: NativeWindowRef,
     @Inject(DOCUMENT) private document: any,
@@ -87,6 +94,7 @@ export class AppComponent implements OnInit, AfterViewInit {
     private windowService: HostWindowService,
     private localeService: LocaleService,
     private breadcrumbsService: BreadcrumbsService,
+    private modalService: NgbModal,
     @Optional() private cookiesService: KlaroService,
     @Optional() private googleAnalyticsService: GoogleAnalyticsService,
   ) {
@@ -108,6 +116,11 @@ export class AppComponent implements OnInit, AfterViewInit {
       }
     });
 
+    if (isPlatformBrowser(this.platformId)) {
+      this.authService.trackTokenExpiration();
+      this.trackIdleModal();
+    }
+
     // Load all the languages that are defined as active from the config file
     translate.addLangs(environment.languages.filter((LangConfig) => LangConfig.active === true).map((a) => a.code));
 
@@ -130,7 +143,6 @@ export class AppComponent implements OnInit, AfterViewInit {
       console.info(environment);
     }
     this.storeCSSVariables();
-    this.authService.trackTokenExpiration();
   }
 
   ngOnInit() {
@@ -229,4 +241,23 @@ export class AppComponent implements OnInit, AfterViewInit {
     };
     head.appendChild(link);
   }
+
+  private trackIdleModal() {
+    const isIdle$ = this.authService.isUserIdle();
+    const isAuthenticated$ = this.authService.isAuthenticated();
+    isIdle$.pipe(withLatestFrom(isAuthenticated$))
+      .subscribe(([userIdle, authenticated]) => {
+        if (userIdle && authenticated) {
+          if (!this.idleModalOpen) {
+            const modalRef = this.modalService.open(IdleModalComponent);
+            this.idleModalOpen = true;
+            modalRef.componentInstance.response.pipe(take(1)).subscribe((closed: boolean) => {
+              if (closed) {
+                this.idleModalOpen = false;
+              }
+            });
+          }
+        }
+      });
+  }
 }
diff --git a/src/app/core/auth/auth.reducer.ts b/src/app/core/auth/auth.reducer.ts
index f26ddb0182..ef803503c8 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -240,15 +240,9 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       });
 
     case AuthActionTypes.SET_USER_AS_IDLE:
-      if (state.authenticated) {
-        return Object.assign({}, state, {
-          idle: true,
-        });
-      } else {
-        return Object.assign({}, state, {
-          idle: false,
-        });
-      }
+      return Object.assign({}, state, {
+        idle: true,
+      });
 
     case AuthActionTypes.UNSET_USER_AS_IDLE:
       return Object.assign({}, state, {
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 7b7c61f741..a5b5d70704 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -282,7 +282,7 @@ export class AuthService {
     // Send a request that sign end the session
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'application/x-www-form-urlencoded');
-    const options: HttpOptions = Object.create({headers, responseType: 'text'});
+    const options: HttpOptions = Object.create({ headers, responseType: 'text' });
     return this.authRequestService.postToEndpoint('logout', options).pipe(
       map((rd: RemoteData<AuthStatus>) => {
         const status = rd.payload;
@@ -447,11 +447,14 @@ export class AuthService {
    * @param redirectUrl
    */
   public navigateToRedirectUrl(redirectUrl: string) {
-    let url = `/reload/${new Date().getTime()}`;
-    if (isNotEmpty(redirectUrl) && !redirectUrl.startsWith(LOGIN_ROUTE)) {
-      url += `?redirect=${encodeURIComponent(redirectUrl)}`;
+    // Don't do redirect if already on reload url
+    if (!hasValue(redirectUrl) || !redirectUrl.includes('/reload/')) {
+      let url = `/reload/${new Date().getTime()}`;
+      if (isNotEmpty(redirectUrl) && !redirectUrl.startsWith(LOGIN_ROUTE)) {
+        url += `?redirect=${encodeURIComponent(redirectUrl)}`;
+      }
+      this.hardRedirectService.redirect(url);
     }
-    this.hardRedirectService.redirect(url);
   }
 
   /**
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 81ae1a745c..209f17b520 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,13 +1,8 @@
-import { map, take } from 'rxjs/operators';
-import { Component, Inject, OnInit, Optional, Input } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { Component, Inject, OnInit, Input } from '@angular/core';
 import { Router } from '@angular/router';
 
-import {
-  combineLatest as observableCombineLatest,
-  combineLatest as combineLatestObservable,
-  Observable,
-  of
-} from 'rxjs';
+import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
@@ -23,11 +18,7 @@ import { HostWindowService } from '../shared/host-window.service';
 import { ThemeConfig } from '../../config/theme.model';
 import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
 import { environment } from '../../environments/environment';
-import { LocaleService } from '../core/locale/locale.service';
-import { KlaroService } from '../shared/cookies/klaro.service';
 import { slideSidebarPadding } from '../shared/animations/slide';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { IdleModalComponent } from '../shared/idle-modal/idle-modal.component';
 
 @Component({
   selector: 'ds-root',
@@ -54,11 +45,6 @@ export class RootComponent implements OnInit {
    */
   @Input() shouldShowRouteLoader: boolean;
 
-  /**
-   * Whether or not the idle modal is is currently open
-   */
-  idleModalOpen: boolean;
-
   constructor(
     @Inject(NativeWindowService) private _window: NativeWindowRef,
     private translate: TranslateService,
@@ -70,10 +56,7 @@ export class RootComponent implements OnInit {
     private router: Router,
     private cssService: CSSVariableService,
     private menuService: MenuService,
-    private windowService: HostWindowService,
-    private localeService: LocaleService,
-    @Optional() private cookiesService: KlaroService,
-    private modalService: NgbModal
+    private windowService: HostWindowService
   ) {
   }
 
@@ -88,20 +71,5 @@ export class RootComponent implements OnInit {
       .pipe(
         map(([collapsed, mobile]) => collapsed || mobile)
       );
-
-    observableCombineLatest([this.authService.isUserIdle(), this.authService.isAuthenticated()])
-      .subscribe(([userIdle, authenticated]) => {
-        if (userIdle && authenticated) {
-          if (!this.idleModalOpen) {
-            const modalRef = this.modalService.open(IdleModalComponent);
-            this.idleModalOpen = true;
-            modalRef.componentInstance.response.pipe(take(1)).subscribe((closed: boolean) => {
-              if (closed) {
-                this.idleModalOpen = false;
-              }
-            });
-          }
-        }
-    });
   }
 }
diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
index 639cbd6ad1..552315d1a4 100644
--- a/src/app/shared/idle-modal/idle-modal.component.spec.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -5,6 +5,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { IdleModalComponent } from './idle-modal.component';
 import { AuthService } from '../../core/auth/auth.service';
 import { By } from '@angular/platform-browser';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
 
 describe('IdleModalComponent', () => {
   let component: IdleModalComponent;
@@ -12,15 +13,18 @@ describe('IdleModalComponent', () => {
   let debugElement: DebugElement;
 
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
-  const authServiceStub = jasmine.createSpyObj('authService', ['setIdle', 'logout']);
+  const authServiceStub = jasmine.createSpyObj('authService', ['setIdle', 'logout', 'navigateToRedirectUrl']);
+  let hardRedirectService;
 
   beforeEach(waitForAsync(() => {
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', ['getCurrentRoute']);
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [IdleModalComponent],
       providers: [
         { provide: NgbActiveModal, useValue: modalStub },
-        { provide: AuthService, useValue: authServiceStub }
+        { provide: AuthService, useValue: authServiceStub },
+        { provide: HardRedirectService, useValue: hardRedirectService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -63,6 +67,10 @@ describe('IdleModalComponent', () => {
     it('should close the modal', () => {
       expect(modalStub.close).toHaveBeenCalled();
     });
+    it('should reload', () => {
+      expect(hardRedirectService.getCurrentRoute).toHaveBeenCalled();
+      expect(authServiceStub.navigateToRedirectUrl).toHaveBeenCalled();
+    });
   });
 
   describe('closePressed', () => {
diff --git a/src/app/shared/idle-modal/idle-modal.component.ts b/src/app/shared/idle-modal/idle-modal.component.ts
index 750657c2e4..d812d3ffc1 100644
--- a/src/app/shared/idle-modal/idle-modal.component.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.ts
@@ -4,6 +4,7 @@ import { environment } from '../../../environments/environment';
 import { AuthService } from '../../core/auth/auth.service';
 import { Subject } from 'rxjs';
 import { hasValue } from '../empty.util';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
 
 @Component({
   selector: 'ds-idle-modal',
@@ -29,7 +30,8 @@ export class IdleModalComponent implements OnInit {
   response: Subject<boolean> = new Subject();
 
   constructor(private activeModal: NgbActiveModal,
-              private authService: AuthService) {
+              private authService: AuthService,
+              protected hardRedirectService: HardRedirectService) {
     this.timeToExpire = (environment.auth.ui.timeUntilIdle + environment.auth.ui.idleGracePeriod) / 1000 / 60; // ms => min
   }
 
@@ -53,8 +55,9 @@ export class IdleModalComponent implements OnInit {
    * Close modal and logout
    */
   logOutPressed() {
-    this.authService.logout();
     this.closeModal();
+    this.authService.logout();
+    this.authService.navigateToRedirectUrl(this.hardRedirectService.getCurrentRoute());
   }
 
   /**

From c696b783931ccd0cbf35fc019a2a33338c9ad6f7 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 18 Jun 2021 13:24:34 +0200
Subject: [PATCH 147/169] 79700: idle time and grace period testing times
 removed

---
 src/environments/environment.common.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 24496386e9..87be9b4260 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -47,11 +47,9 @@ export const environment: GlobalConfig = {
     // Authority UI settings
     ui: {
       // the amount of time before the idle warning is shown
-      // timeUntilIdle: 15 * 60 * 1000, // 15 minutes
-      timeUntilIdle: 30 * 1000, // 30 seconds
+      timeUntilIdle: 15 * 60 * 1000, // 15 minutes
       // the amount of time the user has to react after the idle warning is shown before they are logged out.
-      // idleGracePeriod: 5 * 60 * 1000, // 5 minutes
-      idleGracePeriod: 1 * 60 * 1000, // 1 minute
+      idleGracePeriod: 5 * 60 * 1000, // 5 minutes
     },
     // Authority REST settings
     rest: {

From ddcb27da3f9f7144b2f5e8af2d9480da455cdb15 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 18 Jun 2021 16:01:53 +0200
Subject: [PATCH 148/169] 79700: logout via store, automatic redirect

---
 .../idle-modal/idle-modal.component.spec.ts   | 23 +++++++++----------
 .../shared/idle-modal/idle-modal.component.ts |  9 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
index 552315d1a4..847bf6ac4f 100644
--- a/src/app/shared/idle-modal/idle-modal.component.spec.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -5,26 +5,29 @@ import { TranslateModule } from '@ngx-translate/core';
 import { IdleModalComponent } from './idle-modal.component';
 import { AuthService } from '../../core/auth/auth.service';
 import { By } from '@angular/platform-browser';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { Store } from '@ngrx/store';
+import { LogOutAction } from '../../core/auth/auth.actions';
 
 describe('IdleModalComponent', () => {
   let component: IdleModalComponent;
   let fixture: ComponentFixture<IdleModalComponent>;
   let debugElement: DebugElement;
 
-  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
-  const authServiceStub = jasmine.createSpyObj('authService', ['setIdle', 'logout', 'navigateToRedirectUrl']);
-  let hardRedirectService;
+  let modalStub;
+  let authServiceStub;
+  let storeStub;
 
   beforeEach(waitForAsync(() => {
-    hardRedirectService = jasmine.createSpyObj('hardRedirectService', ['getCurrentRoute']);
+    modalStub = jasmine.createSpyObj('modalStub', ['close']);
+    authServiceStub = jasmine.createSpyObj('authService', ['setIdle']);
+    storeStub = jasmine.createSpyObj('store', ['dispatch']);
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [IdleModalComponent],
       providers: [
         { provide: NgbActiveModal, useValue: modalStub },
         { provide: AuthService, useValue: authServiceStub },
-        { provide: HardRedirectService, useValue: hardRedirectService }
+        { provide: Store, useValue: storeStub }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -61,15 +64,11 @@ describe('IdleModalComponent', () => {
     beforeEach(() => {
       component.logOutPressed();
     });
-    it('should logout', () => {
-      expect(authServiceStub.logout).toHaveBeenCalled();
-    });
     it('should close the modal', () => {
       expect(modalStub.close).toHaveBeenCalled();
     });
-    it('should reload', () => {
-      expect(hardRedirectService.getCurrentRoute).toHaveBeenCalled();
-      expect(authServiceStub.navigateToRedirectUrl).toHaveBeenCalled();
+    it('should send logout action', () => {
+      expect(storeStub.dispatch).toHaveBeenCalledWith(new LogOutAction());
     });
   });
 
diff --git a/src/app/shared/idle-modal/idle-modal.component.ts b/src/app/shared/idle-modal/idle-modal.component.ts
index d812d3ffc1..35fafcf5cf 100644
--- a/src/app/shared/idle-modal/idle-modal.component.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.ts
@@ -4,7 +4,9 @@ import { environment } from '../../../environments/environment';
 import { AuthService } from '../../core/auth/auth.service';
 import { Subject } from 'rxjs';
 import { hasValue } from '../empty.util';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../app.reducer';
+import { LogOutAction } from '../../core/auth/auth.actions';
 
 @Component({
   selector: 'ds-idle-modal',
@@ -31,7 +33,7 @@ export class IdleModalComponent implements OnInit {
 
   constructor(private activeModal: NgbActiveModal,
               private authService: AuthService,
-              protected hardRedirectService: HardRedirectService) {
+              private store: Store<AppState>) {
     this.timeToExpire = (environment.auth.ui.timeUntilIdle + environment.auth.ui.idleGracePeriod) / 1000 / 60; // ms => min
   }
 
@@ -56,8 +58,7 @@ export class IdleModalComponent implements OnInit {
    */
   logOutPressed() {
     this.closeModal();
-    this.authService.logout();
-    this.authService.navigateToRedirectUrl(this.hardRedirectService.getCurrentRoute());
+    this.store.dispatch(new LogOutAction());
   }
 
   /**

From 829ce12710d7d1c13f93f00e0895614fb4bdebb5 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Fri, 18 Jun 2021 17:53:34 +0200
Subject: [PATCH 149/169] lgtm alerts

---
 src/app/app.component.ts              | 2 +-
 src/app/core/auth/auth.interceptor.ts | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 48e1e6f3d1..4feee0e585 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -11,7 +11,7 @@ import {
 } from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
+import { BehaviorSubject, Observable, of } from 'rxjs';
 import { select, Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index d16f46a849..a49030110b 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -1,6 +1,6 @@
 import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
 
-import { catchError, filter, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
 import { Injectable, Injector } from '@angular/core';
 import {
   HttpErrorResponse,
@@ -12,14 +12,13 @@ import {
   HttpResponse,
   HttpResponseBase
 } from '@angular/common/http';
-import { find } from 'lodash';
 
 import { AppState } from '../../app.reducer';
 import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
-import { hasValue, isNotEmpty, isNotNull, isUndefined } from '../../shared/empty.util';
-import { RedirectWhenTokenExpiredAction, RefreshTokenAction } from './auth.actions';
+import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
+import { RedirectWhenTokenExpiredAction } from './auth.actions';
 import { Store } from '@ngrx/store';
 import { Router } from '@angular/router';
 import { AuthMethod } from './models/auth.method';

From 6c219e72d53ece28293c60c22dea5b7ec1012d99 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 1 Jul 2021 15:50:21 +0200
Subject: [PATCH 150/169] 79700: Doc fixes, Spec tests authService &
 ariaLabelledBy for idle-modal

---
 src/app/app.component.ts                      |  2 +-
 src/app/core/auth/auth.service.spec.ts        | 82 ++++++++++++++++++-
 .../idle-modal/idle-modal.component.html      |  2 +-
 src/environments/environment.common.ts        |  6 +-
 src/environments/mock-environment.ts          |  6 +-
 5 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 4feee0e585..356025da9e 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -249,7 +249,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       .subscribe(([userIdle, authenticated]) => {
         if (userIdle && authenticated) {
           if (!this.idleModalOpen) {
-            const modalRef = this.modalService.open(IdleModalComponent);
+            const modalRef = this.modalService.open(IdleModalComponent, { ariaLabelledBy: 'idle-modal.header' });
             this.idleModalOpen = true;
             modalRef.componentInstance.response.pipe(take(1)).subscribe((closed: boolean) => {
               if (closed) {
diff --git a/src/app/core/auth/auth.service.spec.ts b/src/app/core/auth/auth.service.spec.ts
index d54ffdae16..ced8bb94c8 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -31,6 +31,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { TranslateService } from '@ngx-translate/core';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { SetUserAsIdleAction, UnsetUserAsIdleAction } from './auth.actions';
 
 describe('AuthService test', () => {
 
@@ -51,6 +52,7 @@ describe('AuthService test', () => {
   let token: AuthTokenInfo;
   let authenticatedState;
   let unAuthenticatedState;
+  let idleState;
   let linkService;
   let hardRedirectService;
 
@@ -68,14 +70,24 @@ describe('AuthService test', () => {
       loaded: true,
       loading: false,
       authToken: token,
-      user: EPersonMock
+      user: EPersonMock,
+      idle: false
     };
     unAuthenticatedState = {
       authenticated: false,
       loaded: true,
       loading: false,
       authToken: undefined,
-      user: undefined
+      user: undefined,
+      idle: false
+    };
+    idleState = {
+      authenticated: true,
+      loaded: true,
+      loading: false,
+      authToken: token,
+      user: EPersonMock,
+      idle: true
     };
     authRequest = new AuthRequestServiceStub();
     routeStub = new ActivatedRouteStub();
@@ -186,6 +198,26 @@ describe('AuthService test', () => {
         expect(authMethods.length).toBe(2);
       });
     });
+
+    describe('setIdle true', () => {
+      beforeEach(() => {
+        authService.setIdle(true);
+      });
+
+      it('store should dispatch SetUserAsIdleAction', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new SetUserAsIdleAction());
+      });
+    });
+
+    describe('setIdle false', () => {
+      beforeEach(() => {
+        authService.setIdle(false);
+      });
+
+      it('store should dispatch UnsetUserAsIdleAction', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new UnsetUserAsIdleAction());
+      });
+    });
   });
 
   describe('', () => {
@@ -256,6 +288,12 @@ describe('AuthService test', () => {
       });
     });
 
+    it('isUserIdle should return false when user is not yet idle', () => {
+      authService.isUserIdle().subscribe((status: boolean) => {
+        expect(status).toBe(false);
+      });
+    });
+
   });
 
   describe('', () => {
@@ -514,4 +552,44 @@ describe('AuthService test', () => {
       });
     });
   });
+
+  describe('when user is idle', () => {
+    beforeEach(waitForAsync(() => {
+      init();
+      TestBed.configureTestingModule({
+        imports: [
+          StoreModule.forRoot({ authReducer }, {
+            runtimeChecks: {
+              strictStateImmutability: false,
+              strictActionImmutability: false
+            }
+          })
+        ],
+        providers: [
+          { provide: AuthRequestService, useValue: authRequest },
+          { provide: REQUEST, useValue: {} },
+          { provide: Router, useValue: routerStub },
+          { provide: RouteService, useValue: routeServiceStub },
+          { provide: RemoteDataBuildService, useValue: linkService },
+          CookieService,
+          AuthService
+        ]
+      }).compileComponents();
+    }));
+
+    beforeEach(inject([CookieService, AuthRequestService, Store, Router, RouteService], (cookieService: CookieService, authReqService: AuthRequestService, store: Store<AppState>, router: Router, routeService: RouteService, notificationsService: NotificationsService, translateService: TranslateService) => {
+      store
+        .subscribe((state) => {
+          (state as any).core = Object.create({});
+          (state as any).core.auth = idleState;
+        });
+      authService = new AuthService({}, window, undefined, authReqService, mockEpersonDataService, router, routeService, cookieService, store, hardRedirectService, notificationsService, translateService);
+    }));
+
+    it('isUserIdle should return true when user is not idle', () => {
+      authService.isUserIdle().subscribe((status: boolean) => {
+        expect(status).toBe(true);
+      });
+    });
+  });
 });
diff --git a/src/app/shared/idle-modal/idle-modal.component.html b/src/app/shared/idle-modal/idle-modal.component.html
index 665ebb9672..beea91fe7b 100644
--- a/src/app/shared/idle-modal/idle-modal.component.html
+++ b/src/app/shared/idle-modal/idle-modal.component.html
@@ -1,5 +1,5 @@
 <div>
-  <div class="modal-header">{{ "idle-modal.header" | translate }}
+  <div class="modal-header" id="idle-modal.header">{{ "idle-modal.header" | translate }}
     <button type="button" class="close" (click)="closePressed()" aria-label="Close">
       <span aria-hidden="true">×</span>
     </button>
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 87be9b4260..747364d16d 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -42,16 +42,16 @@ export const environment: GlobalConfig = {
       timePerMethod: {[RestRequestMethod.PATCH]: 3} as any // time in seconds
     }
   },
-  // Authority settings
+  // Authentication settings
   auth: {
-    // Authority UI settings
+    // Authentication UI settings
     ui: {
       // the amount of time before the idle warning is shown
       timeUntilIdle: 15 * 60 * 1000, // 15 minutes
       // the amount of time the user has to react after the idle warning is shown before they are logged out.
       idleGracePeriod: 5 * 60 * 1000, // 5 minutes
     },
-    // Authority REST settings
+    // Authentication REST settings
     rest: {
       // If the rest token expires in less than this amount of time, it will be refreshed automatically.
       // This is independent from the idle warning.
diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts
index 050f99ea29..3f1ca374e9 100644
--- a/src/environments/mock-environment.ts
+++ b/src/environments/mock-environment.ts
@@ -35,16 +35,16 @@ export const environment: Partial<GlobalConfig> = {
       timePerMethod: {[RestRequestMethod.PATCH]: 3} as any // time in seconds
     }
   },
-  // Authority settings
+  // Authentication settings
   auth: {
-    // Authority UI settings
+    // Authentication UI settings
     ui: {
       // the amount of time before the idle warning is shown
       timeUntilIdle: 20000, // 20 sec
       // the amount of time the user has to react after the idle warning is shown before they are logged out.
       idleGracePeriod: 20000, // 20 sec
     },
-    // Authority REST settings
+    // Authentication REST settings
     rest: {
       // If the rest token expires in less than this amount of time, it will be refreshed automatically.
       // This is independent from the idle warning.

From 1721ba5ddf4a62e09a5eadfcdce2f28e3bf19ff6 Mon Sep 17 00:00:00 2001
From: Marie Verdonck <maria.verdonck@atmire.com>
Date: Thu, 1 Jul 2021 16:19:31 +0200
Subject: [PATCH 151/169] Icon changes & fix after rebase

---
 src/app/core/auth/auth.reducer.spec.ts              | 12 ++++++++----
 src/app/shared/idle-modal/idle-modal.component.html |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index f721c8c208..ba271fafb5 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -610,7 +610,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
-      authMethods: authMethods
+      authMethods: authMethods,
+      idle: false
     };
     expect(newState).toEqual(state);
   });
@@ -621,7 +622,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
 
     const action = new RetrieveAuthMethodsErrorAction(false);
@@ -685,7 +687,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: true,
-      authMethods: []
+      authMethods: [],
+      idle: false
     };
 
     const action = new RetrieveAuthMethodsErrorAction(true);
@@ -695,7 +698,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)]
+      authMethods: [new AuthMethod(AuthMethodType.Password)],
+      idle: false
     };
     expect(newState).toEqual(state);
   });
diff --git a/src/app/shared/idle-modal/idle-modal.component.html b/src/app/shared/idle-modal/idle-modal.component.html
index beea91fe7b..a69c4d7e76 100644
--- a/src/app/shared/idle-modal/idle-modal.component.html
+++ b/src/app/shared/idle-modal/idle-modal.component.html
@@ -9,10 +9,10 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="cancel btn btn-danger" (click)="logOutPressed()" aria-label="Log out">
-      <i class="fas fa-times"></i> {{ "idle-modal.log-out" | translate }}
+      <i class="fas fa-sign-out-alt"></i> {{ "idle-modal.log-out" | translate }}
     </button>
-    <button type="button" class="confirm btn btn-outline-secondary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus>
-      {{ "idle-modal.extend-session" | translate }}
+    <button type="button" class="confirm btn btn-primary" (click)="extendSessionPressed()" aria-label="Extend session" ngbAutofocus>
+      <i class="fas fa-redo-alt"></i> {{ "idle-modal.extend-session" | translate }}
     </button>
   </div>
 </div>

From 50400895de6aca9ebe85068a12092d788e7d71ba Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 1 Jul 2021 22:36:02 +0200
Subject: [PATCH 152/169] 79768: Add unit tests for metaTagReducer

---
 src/app/core/metadata/meta-tag.actions.ts     |  1 -
 .../core/metadata/meta-tag.reducer.spec.ts    | 50 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/app/core/metadata/meta-tag.reducer.spec.ts

diff --git a/src/app/core/metadata/meta-tag.actions.ts b/src/app/core/metadata/meta-tag.actions.ts
index 6451e58da2..cd048d3be2 100644
--- a/src/app/core/metadata/meta-tag.actions.ts
+++ b/src/app/core/metadata/meta-tag.actions.ts
@@ -1,6 +1,5 @@
 import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
-import { MetaDefinition } from '@angular/platform-browser';
 
 // tslint:disable:max-classes-per-file
 export const MetaTagTypes = {
diff --git a/src/app/core/metadata/meta-tag.reducer.spec.ts b/src/app/core/metadata/meta-tag.reducer.spec.ts
new file mode 100644
index 0000000000..1fcd7d83e3
--- /dev/null
+++ b/src/app/core/metadata/meta-tag.reducer.spec.ts
@@ -0,0 +1,50 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+import { metaTagReducer } from './meta-tag.reducer';
+import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
+
+const nullAction = { type: null };
+
+describe('metaTagReducer', () => {
+  it('should start with an empty array', () => {
+    const state0 = metaTagReducer(undefined, nullAction);
+    expect(state0.tagsInUse).toEqual([]);
+  });
+
+  it('should return the current state on invalid action', () => {
+    const state0 = {
+      tagsInUse: ['foo', 'bar'],
+    };
+
+    const state1 = metaTagReducer(state0, nullAction);
+    expect(state1).toEqual(state0);
+  });
+
+  it('should add tags on AddMetaTagAction', () => {
+    const state0 = {
+      tagsInUse: ['foo'],
+    };
+
+    const state1 = metaTagReducer(state0, new AddMetaTagAction('bar'));
+    const state2 = metaTagReducer(state1, new AddMetaTagAction('baz'));
+
+    expect(state1.tagsInUse).toEqual(['foo', 'bar']);
+    expect(state2.tagsInUse).toEqual(['foo', 'bar', 'baz']);
+  });
+
+  it('should clear tags on ClearMetaTagAction', () => {
+    const state0 = {
+      tagsInUse: ['foo', 'bar'],
+    };
+
+    const state1 = metaTagReducer(state0, new ClearMetaTagAction());
+
+    expect(state1.tagsInUse).toEqual([]);
+  });
+});

From fb8f28f17d1047986e3ace7331e3f32111b7c46a Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 1 Jul 2021 22:37:07 +0200
Subject: [PATCH 153/169] 79768: Update & add MetadataService unit tests

---
 .../core/metadata/metadata.service.spec.ts    | 50 ++++++++++++++++---
 src/app/core/metadata/metadata.service.ts     | 16 +++---
 2 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index d18897cc55..f946120cd2 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -1,6 +1,6 @@
 import { fakeAsync, tick } from '@angular/core/testing';
 import { Meta, Title } from '@angular/platform-browser';
-import { Router, NavigationEnd } from '@angular/router';
+import { NavigationEnd, Router } from '@angular/router';
 
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, of } from 'rxjs';
@@ -8,11 +8,8 @@ import { Observable, of } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { Item } from '../shared/item.model';
 
-import { ItemMock, MockBitstream1, MockBitstream3, } from '../../shared/mocks/item.mock';
-import {
-  createSuccessfulRemoteDataObject$,
-  createSuccessfulRemoteDataObject
-} from '../../shared/remote-data.utils';
+import { ItemMock, MockBitstream1, MockBitstream3 } from '../../shared/mocks/item.mock';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { PaginatedList } from '../data/paginated-list.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { MetadataValue } from '../shared/metadata.models';
@@ -24,6 +21,11 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
+import { getMockStore, MockStore } from '@ngrx/store/testing';
+import { CoreState } from '../core.reducers';
+import { MetaTagState } from './meta-tag.reducer';
+import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
+import { Community } from '../shared/community.model';
 
 describe('MetadataService', () => {
   let metadataService: MetadataService;
@@ -41,6 +43,10 @@ describe('MetadataService', () => {
   let hardRedirectService: HardRedirectService;
 
   let router: Router;
+  let store;
+
+  const initialState = { 'core': { metaTag: { tagsInUse: ['title', 'description'] }}};
+
 
   beforeEach(() => {
     rootService = jasmine.createSpyObj({
@@ -53,7 +59,7 @@ describe('MetadataService', () => {
       findByItemAndName: mockBundleRD$([MockBitstream3])
     });
     translateService = getMockTranslateService();
-    meta = jasmine.createSpyObj({
+    meta = jasmine.createSpyObj('meta', {
       addTag: {},
       removeTag: {}
     });
@@ -73,6 +79,11 @@ describe('MetadataService', () => {
     hardRedirectService = jasmine.createSpyObj( {
       getRequestOrigin: 'https://request.org',
     });
+
+    //@ts-ignore
+    store = getMockStore({ initialState });
+    spyOn(store, 'dispatch');
+
     metadataService = new MetadataService(
       router,
       translateService,
@@ -83,6 +94,7 @@ describe('MetadataService', () => {
       bitstreamDataService,
       undefined,
       rootService,
+      store,
       hardRedirectService
     );
   });
@@ -332,6 +344,30 @@ describe('MetadataService', () => {
     });
   });
 
+  describe('tagstore', () => {
+    beforeEach(fakeAsync(() => {
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(ItemMock),
+          }
+        }
+      });
+      tick();
+    }));
+
+    it('should remove previous tags on route change', fakeAsync(() => {
+      expect(meta.removeTag).toHaveBeenCalledWith('property=\'title\'');
+      expect(meta.removeTag).toHaveBeenCalledWith('property=\'description\'');
+    }));
+
+    it('should clear all tags and add new ones on route change', () => {
+      expect(store.dispatch.calls.argsFor(0)).toEqual([new ClearMetaTagAction()]);
+      expect(store.dispatch.calls.argsFor(1)).toEqual([new AddMetaTagAction('title')]);
+      expect(store.dispatch.calls.argsFor(2)).toEqual([new AddMetaTagAction('description')]);
+    });
+  });
+
   const mockType = (mockItem: Item, type: string): Item => {
     const typedMockItem = Object.assign(new Item(), mockItem) as Item;
     typedMockItem.metadata['dc.type'] = [{ value: type }] as MetadataValue[];
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 8c1e1027dd..f42747fbc5 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -5,10 +5,10 @@ import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 
 import { TranslateService } from '@ngx-translate/core';
 
-import { BehaviorSubject, combineLatest, Observable, of as observableOf, EMPTY } from 'rxjs';
-import { filter, map, take, switchMap, expand } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, EMPTY, Observable, of as observableOf } from 'rxjs';
+import { expand, filter, map, switchMap, take } from 'rxjs/operators';
 
-import { hasValue, hasNoValue } from '../../shared/empty.util';
+import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../data/bitstream-format-data.service';
@@ -18,10 +18,7 @@ import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { Bitstream } from '../shared/bitstream.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstCompletedRemoteData
-} from '../shared/operators';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
 import { RootDataService } from '../data/root-data.service';
 import { getBitstreamDownloadRoute } from '../../app-routing-paths';
 import { BundleDataService } from '../data/bundle-data.service';
@@ -31,11 +28,10 @@ import { PaginatedList } from '../data/paginated-list.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { HardRedirectService } from '../services/hard-redirect.service';
 import { MetaTagState } from './meta-tag.reducer';
-import { Store, createSelector, select, MemoizedSelector } from '@ngrx/store';
+import { createSelector, select, Store } from '@ngrx/store';
 import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
 import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core.reducers';
-import { ObjectCacheEntry, ObjectCacheState } from '../cache/object-cache.reducer';
 
 /**
  * The base selector function to select the metaTag section in the store
@@ -84,7 +80,7 @@ export class MetadataService {
     private bitstreamDataService: BitstreamDataService,
     private bitstreamFormatDataService: BitstreamFormatDataService,
     private rootService: RootDataService,
-    private store: Store<MetaTagState>,
+    private store: Store<CoreState>,
     private hardRedirectService: HardRedirectService,
   ) {
   }

From 8caa9163165df0b669eb8ad9dd4f5d23b9540529 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 1 Jul 2021 22:37:55 +0200
Subject: [PATCH 154/169] 79768: Fix typo

---
 src/app/core/metadata/metadata.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index f42747fbc5..bd0ad66c7b 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -184,7 +184,7 @@ export class MetadataService {
   private setDescriptionTag(): void {
     // TODO: truncate abstract
     const value = this.getMetaTagValue('dc.description.abstract');
-    this.addMetaTag('desciption', value);
+    this.addMetaTag('description', value);
   }
 
   /**

From 5ed41b3f9bc8a611fe034697efc49c1127580e37 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 1 Jul 2021 22:47:26 +0200
Subject: [PATCH 155/169] 79768: Fix unused imports & lint issue

---
 src/app/core/metadata/metadata.service.spec.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index f946120cd2..b3404e84d5 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -21,11 +21,8 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
-import { getMockStore, MockStore } from '@ngrx/store/testing';
-import { CoreState } from '../core.reducers';
-import { MetaTagState } from './meta-tag.reducer';
+import { getMockStore } from '@ngrx/store/testing';
 import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
-import { Community } from '../shared/community.model';
 
 describe('MetadataService', () => {
   let metadataService: MetadataService;
@@ -80,7 +77,7 @@ describe('MetadataService', () => {
       getRequestOrigin: 'https://request.org',
     });
 
-    //@ts-ignore
+    // @ts-ignore
     store = getMockStore({ initialState });
     spyOn(store, 'dispatch');
 

From a91f16ed62ab4bf050a21c900de9f5d6b8108c91 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 1 Jul 2021 23:11:57 +0200
Subject: [PATCH 156/169] 79768: Fix followLink syntax

---
 src/app/core/metadata/metadata.service.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index bd0ad66c7b..10e37b4282 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -292,13 +292,7 @@ export class MetadataService {
         true,
         true,
         followLink('primaryBitstream'),
-        followLink('bitstreams',
-          undefined,
-          true,
-          true,
-          true,
-          followLink('format')
-        )
+        followLink('bitstreams', {}, followLink('format')),
       ).pipe(
         getFirstSucceededRemoteDataPayload(),
         switchMap((bundle: Bundle) =>

From badf901361aefb8bed5def41a35d288e6233addd Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 2 Jul 2021 13:46:17 +0200
Subject: [PATCH 157/169] Use ds-file-download-link component to allow
 bitstream download during submission

---
 .../file-download-link.component.html         |  5 ++--
 .../file-download-link.component.ts           | 11 ++++++++
 .../file/section-upload-file.component.html   |  5 ++--
 .../section-upload-file.component.spec.ts     | 26 -------------------
 .../file/section-upload-file.component.ts     | 21 +++++++--------
 5 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index f1843da5c6..497502d586 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,5 +1,6 @@
-<a [href]="bitstreamPath"><ng-container *ngTemplateOutlet="content"></ng-container></a>
-
+<a [href]="bitstreamPath" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
+  <ng-container *ngTemplateOutlet="content"></ng-container>
+</a>
 
 <ng-template #content>
   <ng-content></ng-content>
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index 4423b6f5b7..e2f7633275 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -18,6 +18,17 @@ export class FileDownloadLinkComponent implements OnInit {
    * Optional bitstream instead of href and file name
    */
   @Input() bitstream: Bitstream;
+
+  /**
+   * Additional css classes to apply to link
+   */
+  @Input() cssClasses = '';
+
+  /**
+   * Optional bitstream link, show in same tab or a new tab.
+   */
+  @Input() isBlank = false;
+
   bitstreamPath: string;
 
   ngOnInit() {
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 64df1155bf..221d396a39 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -10,8 +10,9 @@
       </div>
       <div class="float-right w-15" [class.sticky-buttons]="!readMode">
         <ng-container *ngIf="readMode">
-          <button class="btn btn-link" (click)="downloadBitstreamFile(); $event.stopPropagation()"><i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i></button>
-          <!--<a href="{{fileData.url}}"  title="Download file" target="_blank"><i class="fa fa-download text-normal mr-3" aria-hidden="true"></i></a>-->
+          <ds-file-download-link [cssClasses]="'btn btn-link'" [isBlank]="true" [bitstream]="getBitstream()">
+            <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
+          </ds-file-download-link>
           <button class="btn btn-link" (click)="$event.preventDefault();switchMode();"><i class="fa fa-edit fa-2x text-normal"></i></button>
           <button class="btn btn-link"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index ac91e5eb3c..a1e35c33f4 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -6,7 +6,6 @@ import { CommonModule } from '@angular/common';
 import { of as observableOf } from 'rxjs';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { FileService } from '../../../../core/shared/file.service';
 import { FormService } from '../../../../shared/form/form.service';
 import { getMockFormService } from '../../../../shared/mocks/form-service.mock';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
@@ -19,7 +18,6 @@ import { SubmissionSectionUploadFileComponent } from './section-upload-file.comp
 import { SubmissionServiceStub } from '../../../../shared/testing/submission-service.stub';
 import {
   mockFileFormData,
-  mockGroup,
   mockSubmissionCollectionId,
   mockSubmissionId,
   mockSubmissionObject,
@@ -35,17 +33,9 @@ import { POLICY_DEFAULT_WITH_LIST } from '../section-upload.component';
 import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { getMockSectionUploadService } from '../../../../shared/mocks/section-upload.service.mock';
 import { FormFieldMetadataValueObject } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
-import { Group } from '../../../../core/eperson/models/group.model';
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 
-function getMockFileService(): FileService {
-  return jasmine.createSpyObj('FileService', {
-    retrieveFileDownloadLink: jasmine.createSpy('retrieveFileDownloadLink'),
-    getFileNameFromResponseContentDisposition: jasmine.createSpy('getFileNameFromResponseContentDisposition')
-  });
-}
-
 describe('SubmissionSectionUploadFileComponent test suite', () => {
 
   let comp: SubmissionSectionUploadFileComponent;
@@ -53,7 +43,6 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   let fixture: ComponentFixture<SubmissionSectionUploadFileComponent>;
   let submissionServiceStub: SubmissionServiceStub;
   let uploadService: any;
-  let fileService: any;
   let formService: any;
   let halService: any;
   let operationsBuilder: any;
@@ -64,10 +53,6 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   const sectionId = 'upload';
   const collectionId = mockSubmissionCollectionId;
   const availableAccessConditionOptions = mockUploadConfigResponse.accessConditionOptions;
-  const availableGroupsMap: Map<string, Group[]> = new Map([
-    [mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]],
-    [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
-  ]);
   const collectionPolicyType = POLICY_DEFAULT_WITH_LIST;
   const fileIndex = '0';
   const fileName = '123456-test-upload.jpg';
@@ -95,7 +80,6 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         TestComponent
       ],
       providers: [
-        { provide: FileService, useValue: getMockFileService() },
         { provide: FormService, useValue: getMockFormService() },
         { provide: HALEndpointService, useValue: new HALEndpointServiceStub('workspaceitems') },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
@@ -152,7 +136,6 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
       compAsAny = comp;
       submissionServiceStub = TestBed.inject(SubmissionService as any);
       uploadService = TestBed.inject(SectionUploadService);
-      fileService = TestBed.inject(FileService);
       formService = TestBed.inject(FormService);
       halService = TestBed.inject(HALEndpointService);
       operationsBuilder = TestBed.inject(JsonPatchOperationsBuilder);
@@ -226,15 +209,6 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         pathCombiner.subRootElement);
     });
 
-    it('should download Bitstream File properly', fakeAsync(() => {
-      comp.fileData = fileData;
-      comp.downloadBitstreamFile();
-
-      tick();
-
-      expect(fileService.retrieveFileDownloadLink).toHaveBeenCalled();
-    }));
-
     it('should save Bitstream File data properly when form is valid', fakeAsync(() => {
       compAsAny.fileEditComp = TestBed.inject(SubmissionSectionUploadFileEditComponent);
       compAsAny.fileEditComp.formRef = {formGroup: null};
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index d4c901b290..3d79a7a55d 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
 
 import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter, first, mergeMap, take } from 'rxjs/operators';
+import { filter, mergeMap, take } from 'rxjs/operators';
 import { DynamicFormControlModel, } from '@ng-dynamic-forms/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
@@ -14,12 +14,12 @@ import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submissio
 import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
 import { dateToISOFormat } from '../../../../shared/date.util';
 import { SubmissionService } from '../../../submission.service';
-import { FileService } from '../../../../core/shared/file.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
 import { SubmissionObject } from '../../../../core/submission/models/submission-object.model';
 import { WorkspaceitemSectionUploadObject } from '../../../../core/submission/models/workspaceitem-section-upload.model';
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
 
 /**
  * This component represents a single bitstream contained in the submission
@@ -139,7 +139,6 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    * Initialize instance variables
    *
    * @param {ChangeDetectorRef} cdr
-   * @param {FileService} fileService
    * @param {FormService} formService
    * @param {HALEndpointService} halService
    * @param {NgbModal} modalService
@@ -149,7 +148,6 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    * @param {SectionUploadService} uploadService
    */
   constructor(private cdr: ChangeDetectorRef,
-              private fileService: FileService,
               private formService: FormService,
               private halService: HALEndpointService,
               private modalService: NgbModal,
@@ -217,15 +215,14 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
   }
 
   /**
-   * Perform bitstream download
+   * Build a Bitstream object by the current file uuid
+   *
+   * @return Bitstream object
    */
-  public downloadBitstreamFile() {
-    this.halService.getEndpoint('bitstreams').pipe(
-      first())
-      .subscribe((url) => {
-        const fileUrl = `${url}/${this.fileData.uuid}/content`;
-        this.fileService.retrieveFileDownloadLink(fileUrl);
-      });
+  public getBitstream(): Bitstream {
+    return Object.assign(new Bitstream(), {
+      uuid: this.fileData.uuid
+    });
   }
 
   /**

From c190cdc9bdec33847c55198c411ee986f0560ee9 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Fri, 2 Jul 2021 13:53:11 +0200
Subject: [PATCH 158/169] fix comment

---
 .../shared/file-download-link/file-download-link.component.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index e2f7633275..b415e1e701 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -25,7 +25,7 @@ export class FileDownloadLinkComponent implements OnInit {
   @Input() cssClasses = '';
 
   /**
-   * Optional bitstream link, show in same tab or a new tab.
+   * A boolean representing if link is shown in same tab or in a new one.
    */
   @Input() isBlank = false;
 

From 32003a72fdb785722942c9bc958802e1954ea3dc Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 11:57:36 +0200
Subject: [PATCH 159/169] Fix hardcoded submission section IDs

---
 .../submission-form-collection.component.ts   |  3 ++-
 .../form/submission-form.component.html       |  1 -
 .../submission-upload-files.component.ts      | 25 ++++++++-----------
 .../submission/sections/sections.service.ts   | 16 ++++++++++++
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index ba7eb88c6f..f90814f185 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -28,6 +28,7 @@ import { CollectionDataService } from '../../../core/data/collection-data.servic
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { SectionsService } from '../../sections/sections.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { SectionsType } from '../../sections/sections-type';
 
 /**
  * This component allows to show the current collection the submission belonging to and to change it.
@@ -142,7 +143,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   ngOnInit() {
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', 'collection');
-    this.available$ = this.sectionsService.isSectionAvailable(this.submissionId, 'collection');
+    this.available$ = this.sectionsService.isSectionTypeAvailable(this.submissionId, SectionsType.collection);
   }
 
   /**
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 33b5d4be12..c86d4e0195 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -3,7 +3,6 @@
         <div *ngIf="(uploadEnabled$ | async)" class="w-100">
             <ds-submission-upload-files [submissionId]="submissionId"
                                         [collectionId]="collectionId"
-                                        [sectionId]="'upload'"
                                         [uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>
             <div class="clearfix"></div>
         </div>
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 2c348d2c87..e49127e80f 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -13,6 +13,7 @@ import { UploaderOptions } from '../../../shared/uploader/uploader-options.model
 import parseSectionErrors from '../../utils/parseSectionErrors';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { SectionsType } from '../../sections/sections-type';
 
 /**
  * This component represents the drop zone that provides to add files to the submission.
@@ -35,12 +36,6 @@ export class SubmissionUploadFilesComponent implements OnChanges {
    */
   @Input() submissionId: string;
 
-  /**
-   * The upload section id
-   * @type {string}
-   */
-  @Input() sectionId: string;
-
   /**
    * The uploader configuration options
    * @type {UploaderOptions}
@@ -110,7 +105,7 @@ export class SubmissionUploadFilesComponent implements OnChanges {
    * Check if upload functionality is enabled
    */
   ngOnChanges() {
-    this.uploadEnabled = this.sectionService.isSectionAvailable(this.submissionId, this.sectionId);
+    this.uploadEnabled = this.sectionService.isSectionTypeAvailable(this.submissionId, SectionsType.Upload);
   }
 
   /**
@@ -136,14 +131,16 @@ export class SubmissionUploadFilesComponent implements OnChanges {
                 .forEach((sectionId) => {
                   const sectionData = normalizeSectionData(sections[sectionId]);
                   const sectionErrors = errorsList[sectionId];
-                  if (sectionId === 'upload') {
-                    // Look for errors on upload
-                    if ((isEmpty(sectionErrors))) {
-                      this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
-                    } else {
-                      this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
+                  this.sectionService.isSectionType(this.submissionId, sectionId, SectionsType.Upload).subscribe((isUpload) => {
+                    if (isUpload) {
+                      // Look for errors on upload
+                      if ((isEmpty(sectionErrors))) {
+                        this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
+                      } else {
+                        this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
+                      }
                     }
-                  }
+                  });
                   this.sectionService.updateSectionData(this.submissionId, sectionId, sectionData, sectionErrors);
                 });
             }
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index d8d1491cb7..afe5dde570 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -328,6 +328,22 @@ export class SectionsService {
       distinctUntilChanged());
   }
 
+  /**
+   * Check if given section id is of a given section type
+   * @param submissionId
+   * @param sectionId
+   * @param sectionType
+   */
+  public isSectionType(submissionId: string, sectionId: string, sectionType: SectionsType): Observable<boolean> {
+    return this.store.select(submissionObjectFromIdSelector(submissionId)).pipe(
+      filter((submissionState: SubmissionObjectEntry) => isNotUndefined(submissionState)),
+      map((submissionState: SubmissionObjectEntry) => {
+        return isNotUndefined(submissionState.sections) && isNotUndefined(submissionState.sections[sectionId]
+          && submissionState.sections[sectionId].sectionType === sectionType );
+      }),
+      distinctUntilChanged());
+  }
+
   /**
    * Dispatch a new [EnableSectionAction] to add a new section and move page target to it
    *

From 72e97ca6b44ec19dc49e9b422169999f0d1d06d5 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 12:33:01 +0200
Subject: [PATCH 160/169] Update unit tests

---
 .../shared/testing/sections-service.stub.ts   |  2 +
 ...bmission-form-collection.component.spec.ts |  2 +-
 .../submission-upload-files.component.spec.ts | 83 ++++++++++---------
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/src/app/shared/testing/sections-service.stub.ts b/src/app/shared/testing/sections-service.stub.ts
index 3b311c5e19..c372cceadd 100644
--- a/src/app/shared/testing/sections-service.stub.ts
+++ b/src/app/shared/testing/sections-service.stub.ts
@@ -10,6 +10,8 @@ export class SectionsServiceStub {
   isSectionEnabled = jasmine.createSpy('isSectionEnabled');
   isSectionReadOnly = jasmine.createSpy('isSectionReadOnly');
   isSectionAvailable = jasmine.createSpy('isSectionAvailable');
+  isSectionTypeAvailable = jasmine.createSpy('isSectionTypeAvailable');
+  isSectionType = jasmine.createSpy('isSectionType');
   addSection = jasmine.createSpy('addSection');
   removeSection = jasmine.createSpy('removeSection');
   updateSectionData = jasmine.createSpy('updateSectionData');
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 14dfcef864..5b9946e1a4 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -120,7 +120,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
   });
 
   const sectionsService: any = jasmine.createSpyObj('sectionsService', {
-    isSectionAvailable: of(true)
+    isSectionTypeAvailable: of(true)
   });
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
index 4a943276e5..cc7d0e8484 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
@@ -83,7 +83,6 @@ describe('SubmissionUploadFilesComponent Component', () => {
       const html = `
         <ds-submission-upload-files [submissionId]="submissionId"
                                     [collectionId]="collectionId"
-                                    [sectionId]="'upload'"
                                     [uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
@@ -108,11 +107,11 @@ describe('SubmissionUploadFilesComponent Component', () => {
       compAsAny = comp;
       submissionServiceStub = TestBed.inject(SubmissionService as any);
       sectionsServiceStub = TestBed.inject(SectionsService as any);
+      sectionsServiceStub.isSectionTypeAvailable.and.returnValue(observableOf(true));
       notificationsServiceStub = TestBed.inject(NotificationsService as any);
       translateService = TestBed.inject(TranslateService);
       comp.submissionId = submissionId;
       comp.collectionId = collectionId;
-      comp.sectionId = 'upload';
       comp.uploadFilesOptions = Object.assign(new UploaderOptions(),{
         url: '',
         authToken: null,
@@ -133,7 +132,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
     });
 
     it('should init uploadEnabled properly', () => {
-      sectionsServiceStub.isSectionAvailable.and.returnValue(hot('-a-b', {
+      sectionsServiceStub.isSectionTypeAvailable.and.returnValue(hot('-a-b', {
         a: false,
         b: true
       }));
@@ -149,53 +148,56 @@ describe('SubmissionUploadFilesComponent Component', () => {
       expect(compAsAny.uploadEnabled).toBeObservable(expected);
     });
 
-    it('should show a success notification and call updateSectionData on upload complete', () => {
-
-      const expectedErrors: any = mockUploadResponse1ParsedErrors;
-      compAsAny.uploadEnabled = observableOf(true);
-      fixture.detectChanges();
-
-      comp.onCompleteItem(Object.assign({}, uploadRestResponse, { sections: mockSectionsData }));
-
-      Object.keys(mockSectionsData).forEach((sectionId) => {
-        expect(sectionsServiceStub.updateSectionData).toHaveBeenCalledWith(
-          submissionId,
-          sectionId,
-          mockSectionsData[sectionId],
-          expectedErrors[sectionId]
-        );
+    describe('on upload complete', () => {
+      beforeEach(() => {
+        sectionsServiceStub.isSectionType.and.callFake((submissionId, sectionId, sectionType) => {
+          return observableOf(sectionId === 'upload')
+        });
+        compAsAny.uploadEnabled = observableOf(true);
       });
 
-      expect(notificationsServiceStub.success).toHaveBeenCalled();
+      it('should show a success notification and call updateSectionData if successful', () => {
+        const expectedErrors: any = mockUploadResponse1ParsedErrors;
+        fixture.detectChanges();
 
-    });
+        comp.onCompleteItem(Object.assign({}, uploadRestResponse, { sections: mockSectionsData }));
 
-    it('should show an error notification and call updateSectionData on upload complete', () => {
+        Object.keys(mockSectionsData).forEach((sectionId) => {
+          expect(sectionsServiceStub.updateSectionData).toHaveBeenCalledWith(
+            submissionId,
+            sectionId,
+            mockSectionsData[sectionId],
+            expectedErrors[sectionId]
+          );
+        });
 
-      const responseErrors = mockUploadResponse2Errors;
+        expect(notificationsServiceStub.success).toHaveBeenCalled();
 
-      const expectedErrors: any = mockUploadResponse2ParsedErrors;
-      compAsAny.uploadEnabled = observableOf(true);
-      fixture.detectChanges();
-
-      comp.onCompleteItem(Object.assign({}, uploadRestResponse, {
-        sections: mockSectionsData,
-        errors: responseErrors.errors
-      }));
-
-      Object.keys(mockSectionsData).forEach((sectionId) => {
-        expect(sectionsServiceStub.updateSectionData).toHaveBeenCalledWith(
-          submissionId,
-          sectionId,
-          mockSectionsData[sectionId],
-          expectedErrors[sectionId]
-        );
       });
 
-      expect(notificationsServiceStub.success).not.toHaveBeenCalled();
+      it('should show an error notification and call updateSectionData if unsuccessful', () => {
+        const responseErrors = mockUploadResponse2Errors;
+        const expectedErrors: any = mockUploadResponse2ParsedErrors;
+        fixture.detectChanges();
 
+        comp.onCompleteItem(Object.assign({}, uploadRestResponse, {
+          sections: mockSectionsData,
+          errors: responseErrors.errors
+        }));
+
+        Object.keys(mockSectionsData).forEach((sectionId) => {
+          expect(sectionsServiceStub.updateSectionData).toHaveBeenCalledWith(
+            submissionId,
+            sectionId,
+            mockSectionsData[sectionId],
+            expectedErrors[sectionId]
+          );
+        });
+
+        expect(notificationsServiceStub.success).not.toHaveBeenCalled();
+
+      });
     });
-
   });
 });
 
@@ -208,7 +210,6 @@ class TestComponent {
 
   submissionId = mockSubmissionId;
   collectionId = mockSubmissionCollectionId;
-  sectionId = 'upload';
   uploadFilesOptions = Object.assign(new UploaderOptions(), {
     url: '',
     authToken: null,

From a3ba4e59b3954393e1ac77c3453a5a1d602480c6 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 13:01:07 +0200
Subject: [PATCH 161/169] Fix lint issues

---
 .../submission-upload-files.component.spec.ts                 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
index cc7d0e8484..823cbb5d82 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
@@ -150,9 +150,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
 
     describe('on upload complete', () => {
       beforeEach(() => {
-        sectionsServiceStub.isSectionType.and.callFake((submissionId, sectionId, sectionType) => {
-          return observableOf(sectionId === 'upload')
-        });
+        sectionsServiceStub.isSectionType.and.callFake((_, sectionId, __) => observableOf(sectionId === 'upload'));
         compAsAny.uploadEnabled = observableOf(true);
       });
 

From 7670ba8a43abf474aeb1b531b32336a4c87b0f04 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 18 Jun 2021 13:59:39 +0200
Subject: [PATCH 162/169] Fix duplicate notifications

---
 .../submission-upload-files.component.ts      | 24 ++++++++++---------
 .../submission/sections/sections.service.ts   |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index e49127e80f..b1b5051458 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnChanges } from '@angular/core';
 
 import { TranslateService } from '@ngx-translate/core';
 import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { first, take } from 'rxjs/operators';
 
 import { SectionsService } from '../../sections/sections.service';
 import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
@@ -131,16 +131,18 @@ export class SubmissionUploadFilesComponent implements OnChanges {
                 .forEach((sectionId) => {
                   const sectionData = normalizeSectionData(sections[sectionId]);
                   const sectionErrors = errorsList[sectionId];
-                  this.sectionService.isSectionType(this.submissionId, sectionId, SectionsType.Upload).subscribe((isUpload) => {
-                    if (isUpload) {
-                      // Look for errors on upload
-                      if ((isEmpty(sectionErrors))) {
-                        this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
-                      } else {
-                        this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
-                      }
-                    }
-                  });
+                  this.sectionService.isSectionType(this.submissionId, sectionId, SectionsType.Upload)
+                      .pipe(take(1))
+                      .subscribe((isUpload) => {
+                        if (isUpload) {
+                          // Look for errors on upload
+                          if ((isEmpty(sectionErrors))) {
+                            this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
+                          } else {
+                            this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
+                          }
+                        }
+                      });
                   this.sectionService.updateSectionData(this.submissionId, sectionId, sectionData, sectionErrors);
                 });
             }
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index afe5dde570..05e9a96267 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -338,8 +338,8 @@ export class SectionsService {
     return this.store.select(submissionObjectFromIdSelector(submissionId)).pipe(
       filter((submissionState: SubmissionObjectEntry) => isNotUndefined(submissionState)),
       map((submissionState: SubmissionObjectEntry) => {
-        return isNotUndefined(submissionState.sections) && isNotUndefined(submissionState.sections[sectionId]
-          && submissionState.sections[sectionId].sectionType === sectionType );
+        return isNotUndefined(submissionState.sections) && isNotUndefined(submissionState.sections[sectionId])
+          && submissionState.sections[sectionId].sectionType === sectionType;
       }),
       distinctUntilChanged());
   }

From 8736c0b572064f6b19c1229b672506d9d2d2cbab Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Fri, 2 Jul 2021 18:12:18 +0200
Subject: [PATCH 163/169] Add unit tests for SectionsService#isSectionType

---
 .../sections/sections.service.spec.ts         | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index 0d63beeaea..d199f1beae 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -334,6 +334,38 @@ describe('SectionsService test suite', () => {
     });
   });
 
+  describe('isSectionType', () => {
+    it('should return true if the section matches the provided type', () => {
+      store.select.and.returnValue(observableOf(submissionState));
+
+      const expected = cold('(b|)', {
+        b: true
+      });
+
+      expect(service.isSectionType(submissionId, 'upload', SectionsType.Upload)).toBeObservable(expected);
+    });
+
+    it('should return false if the section doesn\'t match the provided type', () => {
+      store.select.and.returnValue(observableOf(submissionState));
+
+      const expected = cold('(b|)', {
+        b: false
+      });
+
+      expect(service.isSectionType(submissionId, sectionId, SectionsType.Upload)).toBeObservable(expected);
+    });
+
+    it('should return false if the provided sectionId doesn\'t exist', () => {
+      store.select.and.returnValue(observableOf(submissionState));
+
+      const expected = cold('(b|)', {
+        b: false
+      });
+
+      expect(service.isSectionType(submissionId, 'no-such-id', SectionsType.Upload)).toBeObservable(expected);
+    });
+  });
+
   describe('addSection', () => {
     it('should dispatch a new EnableSectionAction a move target to new section', () => {
 

From 111170e7d4b71ef89048f73fe569b0d00d2175aa Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Mon, 5 Jul 2021 15:47:58 +0200
Subject: [PATCH 164/169] [CST-4320] workflow item view resolved as full item
 page

---
 .../full/full-item-page.component.html        |   5 +-
 .../full/full-item-page.component.spec.ts     |  35 +++++-
 .../full/full-item-page.component.ts          |  34 +++++-
 .../+item-page/simple/item-page.component.ts  |   2 +-
 .../item-from-workflow.resolver.spec.ts       |  36 ++++++
 .../item-from-workflow.resolver.ts            |  43 +++++++
 .../themed-workflow-item-view.component.ts    |  26 ----
 .../workflow-item-view.component.html         |   9 --
 .../workflow-item-view.component.spec.ts      | 114 ------------------
 .../workflow-item-view.component.ts           |  40 ------
 .../workflowitems-edit-page-routing.module.ts |   8 +-
 .../workflowitems-edit-page.module.ts         |   6 +-
 .../workflow-item-view.component.html         |   0
 .../workflow-item-view.component.scss         |   0
 .../workflow-item-view.component.ts           |  14 ---
 src/themes/custom/theme.module.ts             |   2 -
 16 files changed, 151 insertions(+), 223 deletions(-)
 create mode 100644 src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts
 create mode 100644 src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts
 delete mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts
 delete mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
 delete mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts
 delete mode 100644 src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
 delete mode 100644 src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
 delete mode 100644 src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.scss
 delete mode 100644 src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts

diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 349dd1c928..0eeb12467a 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -10,7 +10,7 @@
           <ds-dso-page-edit-button [pageRoute]="itemPageRoute$ | async" [dso]="item" [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
         </div>
       </div>
-      <div class="simple-view-link my-3">
+      <div class="simple-view-link my-3" *ngIf="!fromWfi">
         <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
           {{"item.page.link.simple" | translate}}
         </a>
@@ -29,6 +29,9 @@
       <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
       <ds-item-page-collections [item]="item"></ds-item-page-collections>
       <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
+      <div *ngIf="fromWfi">
+        <a class="btn btn-light mt-3" (click)="back()">{{'process.detail.back' | translate}}</a>
+      </div>
     </div>
   </div>
   <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
diff --git a/src/app/+item-page/full/full-item-page.component.spec.ts b/src/app/+item-page/full/full-item-page.component.spec.ts
index b4b9e77ed5..b4ab926667 100644
--- a/src/app/+item-page/full/full-item-page.component.spec.ts
+++ b/src/app/+item-page/full/full-item-page.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
@@ -29,9 +29,7 @@ const mockItem: Item = Object.assign(new Item(), {
     ]
   }
 });
-const routeStub = Object.assign(new ActivatedRouteStub(), {
-  data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
-});
+
 const metadataServiceStub = {
   /* tslint:disable:no-empty */
   processRemoteData: () => {
@@ -44,6 +42,10 @@ describe('FullItemPageComponent', () => {
   let fixture: ComponentFixture<FullItemPageComponent>;
 
   let authService: AuthService;
+  let routeStub: ActivatedRouteStub;
+  let routeData;
+
+
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
@@ -51,6 +53,14 @@ describe('FullItemPageComponent', () => {
       setRedirectUrl: {}
     });
 
+    routeData = {
+      dso: createSuccessfulRemoteDataObject(mockItem),
+    };
+
+    routeStub = Object.assign(new ActivatedRouteStub(), {
+      data: observableOf(routeData)
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
@@ -84,4 +94,21 @@ describe('FullItemPageComponent', () => {
       expect(table.nativeElement.innerHTML).toContain(metadatum.value);
     }
   });
+
+  it('should show simple view button when not originated from workflow item', () => {
+    expect(comp.fromWfi).toBe(false);
+    const simpleViewBtn = fixture.debugElement.query(By.css('.simple-view-link'));
+    expect(simpleViewBtn).toBeTruthy();
+  });
+
+  it('should not show simple view button when originated from workflow', fakeAsync(() => {
+    routeData.wfi = createSuccessfulRemoteDataObject$({ id: 'wfiId'});
+    comp.ngOnInit();
+    fixture.detectChanges();
+    fixture.whenStable().then(() => {
+      expect(comp.fromWfi).toBe(true);
+      const simpleViewBtn = fixture.debugElement.query(By.css('.simple-view-link'));
+      expect(simpleViewBtn).toBeFalsy();
+    });
+  }));
 });
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index aea350e58e..cb6a1ccf60 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -1,6 +1,6 @@
 import {filter, map} from 'rxjs/operators';
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute, Data, Router } from '@angular/router';
 
 import { Observable ,  BehaviorSubject } from 'rxjs';
 
@@ -16,6 +16,8 @@ import { MetadataService } from '../../core/metadata/metadata.service';
 import { fadeInOut } from '../../shared/animations/fade';
 import { hasValue } from '../../shared/empty.util';
 import { AuthService } from '../../core/auth/auth.service';
+import { Location } from '@angular/common';
+
 
 /**
  * This component renders a full item page.
@@ -29,13 +31,21 @@ import { AuthService } from '../../core/auth/auth.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut]
 })
-export class FullItemPageComponent extends ItemPageComponent implements OnInit {
+export class FullItemPageComponent extends ItemPageComponent implements OnInit, OnDestroy {
 
   itemRD$: BehaviorSubject<RemoteData<Item>>;
 
   metadata$: Observable<MetadataMap>;
 
-  constructor(route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService, authService: AuthService) {
+  /**
+   * True when the itemRD has been originated from its workflowitem, false otherwise.
+   */
+  fromWfi = false;
+
+  subs = [];
+
+  constructor(protected route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService, authService: AuthService,
+              private _location: Location) {
     super(route, router, items, metadataService, authService);
   }
 
@@ -46,5 +56,21 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit {
       map((rd: RemoteData<Item>) => rd.payload),
       filter((item: Item) => hasValue(item)),
       map((item: Item) => item.metadata),);
+
+    this.subs.push(this.route.data.subscribe((data: Data) => {
+        this.fromWfi = hasValue(data.wfi);
+      })
+    );
+  }
+
+  /**
+   * Navigate back in browser history.
+   */
+  back() {
+    this._location.back();
+  }
+
+  ngOnDestroy() {
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 }
diff --git a/src/app/+item-page/simple/item-page.component.ts b/src/app/+item-page/simple/item-page.component.ts
index 67e278c2fb..c647647339 100644
--- a/src/app/+item-page/simple/item-page.component.ts
+++ b/src/app/+item-page/simple/item-page.component.ts
@@ -51,7 +51,7 @@ export class ItemPageComponent implements OnInit {
   itemPageRoute$: Observable<string>;
 
   constructor(
-    private route: ActivatedRoute,
+    protected route: ActivatedRoute,
     private router: Router,
     private items: ItemDataService,
     private metadataService: MetadataService,
diff --git a/src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts b/src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts
new file mode 100644
index 0000000000..1ef87ad10f
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/item-from-workflow.resolver.spec.ts
@@ -0,0 +1,36 @@
+import { first } from 'rxjs/operators';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
+
+describe('ItemFromWorkflowResolver', () => {
+  describe('resolve', () => {
+    let resolver: ItemFromWorkflowResolver;
+    let wfiService: WorkflowItemDataService;
+    const uuid = '1234-65487-12354-1235';
+    const itemUuid = '8888-8888-8888-8888';
+    const wfi = {
+      id: uuid,
+      item: createSuccessfulRemoteDataObject$({ id: itemUuid })
+    };
+
+
+    beforeEach(() => {
+      wfiService = {
+        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
+      } as any;
+      resolver = new ItemFromWorkflowResolver(wfiService, null);
+    });
+
+    it('should resolve a an item from from the workflow item with the correct id', (done) => {
+      resolver.resolve({ params: { id: uuid } } as any, undefined)
+        .pipe(first())
+        .subscribe(
+          (resolved) => {
+            expect(resolved.payload.id).toEqual(itemUuid);
+            done();
+          }
+        );
+    });
+  });
+});
diff --git a/src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts b/src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts
new file mode 100644
index 0000000000..2aaa762b2a
--- /dev/null
+++ b/src/app/+workflowitems-edit-page/item-from-workflow.resolver.ts
@@ -0,0 +1,43 @@
+import { Injectable } from '@angular/core';
+import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../core/data/remote-data';
+import { Item } from '../core/shared/item.model';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { Store } from '@ngrx/store';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { switchMap } from 'rxjs/operators';
+
+/**
+ * This class represents a resolver that requests a specific item before the route is activated
+ */
+@Injectable()
+export class ItemFromWorkflowResolver implements Resolve<RemoteData<Item>> {
+  constructor(
+    private workflowItemService: WorkflowItemDataService,
+    protected store: Store<any>
+  ) {
+  }
+
+  /**
+   * Method for resolving an item based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Item>> Emits the found item based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Item>> {
+    const itemRD$ = this.workflowItemService.findById(route.params.id,
+      true,
+      false,
+      followLink('item'),
+    ).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((wfiRD: RemoteData<WorkflowItem>) => wfiRD.payload.item as Observable<RemoteData<Item>>),
+      getFirstCompletedRemoteData()
+    );
+    return itemRD$;
+  }
+}
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts b/src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts
deleted file mode 100644
index f0630fa561..0000000000
--- a/src/app/+workflowitems-edit-page/workflow-item-view/themed-workflow-item-view.component.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { Component } from '@angular/core';
-import { WorkflowItemViewComponent } from './workflow-item-view.component';
-
-/**
- * Themed wrapper for WorkflowItemViewComponent
- */
-
-@Component({
-  selector: 'ds-themed-workflow-item-view',
-  styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
-})
-export class ThemedWorkflowItemViewComponent extends ThemedComponent<WorkflowItemViewComponent> {
-  protected getComponentName(): string {
-    return 'WorkflowItemViewComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./workflow-item-view.component`);
-  }
-}
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
deleted file mode 100644
index 00401f34ce..0000000000
--- a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="container" *ngVar="(itemRD$ | async) as itemRD">
-    <div class="item-page" *ngIf="itemRD?.hasSucceeded">
-        <div *ngIf="itemRD?.payload as item">
-            <ds-untyped-item [object]="item"></ds-untyped-item>
-        </div>
-    </div>
-    <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-    <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
-</div>
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts
deleted file mode 100644
index 6804c7a816..0000000000
--- a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.spec.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { of as observableOf } from 'rxjs';
-import { RequestService } from '../../core/data/request.service';
-import {
-  createFailedRemoteDataObject$,
-  createPendingRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { Item } from '../../core/shared/item.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { createRelationshipsObservable } from '../../+item-page/simple/item-types/shared/item.component.spec';
-import { WorkflowItemViewComponent } from './workflow-item-view.component';
-import { By } from '@angular/platform-browser';
-
-describe('WorkflowItemViewComponent', () => {
-
-  const mockItem: Item = Object.assign(new Item(), {
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    metadata: [],
-    relationships: createRelationshipsObservable()
-  });
-
-  const mockWfi = new WorkflowItem();
-  mockWfi.item = createSuccessfulRemoteDataObject$(mockItem);
-
-  const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({ wfi: createSuccessfulRemoteDataObject(mockWfi) })
-  });
-
-  let comp: WorkflowItemViewComponent;
-  let fixture: ComponentFixture<WorkflowItemViewComponent>;
-  let wfi;
-  let itemRD$;
-  let id;
-
-  function init() {
-    itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
-    wfi = new WorkflowItem();
-    wfi.item = itemRD$;
-    id = 'de11b5e5-064a-4e98-a7ac-a1a6a65ddf80';
-  }
-
-  beforeEach(waitForAsync(() => {
-    init();
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot({
-        loader: {
-          provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
-      })],
-      declarations: [WorkflowItemViewComponent, VarDirective],
-      providers: [
-        { provide: ActivatedRoute, useValue: mockRoute },
-        { provide: Router, useClass: RouterStub },
-        { provide: RouteService, useValue: {} },
-        { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: RequestService, useValue: getMockRequestService() },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(waitForAsync(() => {
-    fixture = TestBed.createComponent(WorkflowItemViewComponent);
-    comp = fixture.componentInstance;
-    fixture.detectChanges();
-  }));
-
-  it('should create', () => {
-    expect(comp).toBeTruthy();
-  });
-
-  describe('when the item is loading', () => {
-    beforeEach(() => {
-      comp.itemRD$ = createPendingRemoteDataObject$();
-      // comp.itemRD$ = observableOf(new RemoteData(true, true, true, null, undefined));
-      fixture.detectChanges();
-    });
-
-    it('should display a loading component', () => {
-      const loading = fixture.debugElement.query(By.css('ds-loading'));
-      expect(loading.nativeElement).toBeDefined();
-    });
-  });
-
-  describe('when the item failed loading', () => {
-    beforeEach(() => {
-      comp.itemRD$ = createFailedRemoteDataObject$('server error', 500);
-      fixture.detectChanges();
-    });
-
-    it('should display an error component', () => {
-      const error = fixture.debugElement.query(By.css('ds-error'));
-      expect(error.nativeElement).toBeDefined();
-    });
-  });
-
-});
diff --git a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts b/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
deleted file mode 100644
index e9a51074fc..0000000000
--- a/src/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { ActivatedRoute, Data } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';import { RemoteData } from '../../core/data/remote-data';
-
-import {
-  getAllSucceededRemoteData,
-  getRemoteDataPayload
-} from '../../core/shared/operators';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
-import { Item } from '../../core/shared/item.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
-
-@Component({
-  selector: 'ds-workflow-item-view',
-  templateUrl: './workflow-item-view.component.html'
-})
-/**
- * Component representing a page to delete a workflow item
- */
-export class WorkflowItemViewComponent implements OnInit {
-
-  public wfi$: Observable<WorkflowItem>;
-  public itemRD$: Observable<RemoteData<Item>>;
-
-  /**
-   * The view-mode we're currently on
-   */
-  viewMode = ViewMode.StandalonePage;
-
-
-  constructor(protected route: ActivatedRoute) {
-  }
-
-  ngOnInit() {
-    this.wfi$ = this.route.data.pipe(map((data: Data) => data.wfi as RemoteData<WorkflowItem>), getRemoteDataPayload());
-    this.itemRD$ = this.wfi$.pipe(switchMap((wfi: WorkflowItem) => (wfi.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData())));
-  }
-
-}
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
index eee235e12f..7daee0a472 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
@@ -13,7 +13,8 @@ import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submiss
 import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
 import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ThemedWorkflowItemViewComponent } from './workflow-item-view/themed-workflow-item-view.component';
+import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
+import { ThemedFullItemPageComponent } from '../+item-page/full/themed-full-item-page.component';
 
 @NgModule({
   imports: [
@@ -34,8 +35,9 @@ import { ThemedWorkflowItemViewComponent } from './workflow-item-view/themed-wor
           {
             canActivate: [AuthenticatedGuard],
             path: WORKFLOW_ITEM_VIEW_PATH,
-            component: ThemedWorkflowItemViewComponent,
+            component: ThemedFullItemPageComponent,
             resolve: {
+              dso: ItemFromWorkflowResolver,
               breadcrumb: I18nBreadcrumbResolver
             },
             data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' }
@@ -62,7 +64,7 @@ import { ThemedWorkflowItemViewComponent } from './workflow-item-view/themed-wor
       }]
     )
   ],
-  providers: [WorkflowItemPageResolver]
+  providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver]
 })
 /**
  * This module defines the default component to load when navigating to the workflowitems edit page path.
diff --git a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
index 221c0328a0..463e76e54d 100644
--- a/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
+++ b/src/app/+workflowitems-edit-page/workflowitems-edit-page.module.ts
@@ -7,8 +7,6 @@ import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-ite
 import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
 import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
 import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
-import { WorkflowItemViewComponent } from './workflow-item-view/workflow-item-view.component';
-import { ThemedWorkflowItemViewComponent } from './workflow-item-view/themed-workflow-item-view.component';
 import { StatisticsModule } from '../statistics/statistics.module';
 import { ItemPageModule } from '../+item-page/item-page.module';
 
@@ -25,9 +23,7 @@ import { ItemPageModule } from '../+item-page/item-page.module';
     WorkflowItemDeleteComponent,
     ThemedWorkflowItemDeleteComponent,
     WorkflowItemSendBackComponent,
-    ThemedWorkflowItemSendBackComponent,
-    WorkflowItemViewComponent,
-    ThemedWorkflowItemViewComponent
+    ThemedWorkflowItemSendBackComponent
   ]
 })
 /**
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.scss b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.scss
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts b/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
deleted file mode 100644
index 07305e81e3..0000000000
--- a/src/themes/custom/app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Component } from '@angular/core';
-import { WorkflowItemViewComponent as BaseComponent } from '../../../../../app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component';
-
-@Component({
-  selector: 'ds-workflow-item-view',
-  // styleUrls: ['workflow-item-view.component.scss'],
-  // templateUrl: './workflow-item-view.component.html'
-  templateUrl: '../../../../../app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component.html'
-})
-/**
- * Component representing a page to view a workflow item
- */
-export class WorkflowItemViewComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 0e8e3a437d..49b54cd850 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -79,7 +79,6 @@ import { HeaderComponent } from './app/header/header.component';
 import { FooterComponent } from './app/footer/footer.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { WorkflowItemViewComponent } from './app/+workflowitems-edit-page/workflow-item-view/workflow-item-view.component';
 
 const DECLARATIONS = [
   HomePageComponent,
@@ -116,7 +115,6 @@ const DECLARATIONS = [
   SubmissionSubmitComponent,
   WorkflowItemDeleteComponent,
   WorkflowItemSendBackComponent,
-  WorkflowItemViewComponent,
   FooterComponent,
   HeaderComponent,
   NavbarComponent,

From f5cd878096830d4b03b8c1f585607b65f47158b8 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Mon, 5 Jul 2021 16:01:32 +0200
Subject: [PATCH 165/169] [CST-4320] resolved merge conflicts

---
 src/app/+item-page/full/full-item-page.component.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index 5e1bec7656..7f1b6de614 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -42,9 +42,12 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
 
   subs = [];
 
-  constructor(protected route: ActivatedRoute, router: Router, items: ItemDataService, metadataService: MetadataService, authService: AuthService,
+  constructor(protected route: ActivatedRoute,
+              router: Router,
+              items: ItemDataService,
+              authService: AuthService,
               private _location: Location) {
-    super(route, router, items, metadataService, authService);
+    super(route, router, items, authService);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/

From 3d6cacadfff330d53f55f551b776e292700c3ed3 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Wed, 7 Jul 2021 16:09:19 +0200
Subject: [PATCH 166/169] [CST-4320] fixed item version component
 initialization

---
 .../item-versions/item-versions.component.ts  | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

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 752cd55b5b..97d80390ea 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/shared/item/item-versions/item-versions.component.ts
@@ -16,7 +16,7 @@ import { VersionHistoryDataService } from '../../../core/data/version-history-da
 import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { AlertType } from '../../alert/aletr-type';
 import { followLink } from '../../utils/follow-link-config.model';
-import { hasValueOperator } from '../../empty.util';
+import { hasValue, hasValueOperator } from '../../empty.util';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { getItemPageRoute } from '../../../+item-page/item-page-routing-paths';
 
@@ -110,41 +110,43 @@ export class ItemVersionsComponent implements OnInit {
    * Initialize all observables
    */
   ngOnInit(): void {
-    this.versionRD$ = this.item.version;
-    this.versionHistoryRD$ = this.versionRD$.pipe(
-      getAllSucceededRemoteData(),
-      getRemoteDataPayload(),
-      hasValueOperator(),
-      switchMap((version: Version) => version.versionhistory)
-    );
-    const versionHistory$ = this.versionHistoryRD$.pipe(
-      getAllSucceededRemoteData(),
-      getRemoteDataPayload(),
-      hasValueOperator(),
-    );
-    const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options);
-    this.versionsRD$ = observableCombineLatest(versionHistory$, currentPagination).pipe(
-      switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) =>
-        this.versionHistoryService.getVersions(versionHistory.id,
-          new PaginatedSearchOptions({pagination: Object.assign({}, options, { currentPage: options.currentPage })}),
-          true, true, followLink('item'), followLink('eperson')))
-    );
-    this.hasEpersons$ = this.versionsRD$.pipe(
-      getAllSucceededRemoteData(),
-      getRemoteDataPayload(),
-      hasValueOperator(),
-      map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
-      startWith(false)
-    );
-    this.itemPageRoutes$ = this.versionsRD$.pipe(
-      getAllSucceededRemoteDataPayload(),
-      switchMap((versions) => observableCombineLatest(...versions.page.map((version) => version.item.pipe(getAllSucceededRemoteDataPayload())))),
-      map((versions) => {
-        const itemPageRoutes = {};
-        versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
-        return itemPageRoutes;
-      })
-    );
+    if (hasValue(this.item.version)) {
+      this.versionRD$ = this.item.version;
+      this.versionHistoryRD$ = this.versionRD$.pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+        hasValueOperator(),
+        switchMap((version: Version) => version.versionhistory)
+      );
+      const versionHistory$ = this.versionHistoryRD$.pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+        hasValueOperator(),
+      );
+      const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options);
+      this.versionsRD$ = observableCombineLatest(versionHistory$, currentPagination).pipe(
+        switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) =>
+          this.versionHistoryService.getVersions(versionHistory.id,
+            new PaginatedSearchOptions({pagination: Object.assign({}, options, { currentPage: options.currentPage })}),
+            true, true, followLink('item'), followLink('eperson')))
+      );
+      this.hasEpersons$ = this.versionsRD$.pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload(),
+        hasValueOperator(),
+        map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
+        startWith(false)
+      );
+      this.itemPageRoutes$ = this.versionsRD$.pipe(
+        getAllSucceededRemoteDataPayload(),
+        switchMap((versions) => observableCombineLatest(...versions.page.map((version) => version.item.pipe(getAllSucceededRemoteDataPayload())))),
+        map((versions) => {
+          const itemPageRoutes = {};
+          versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
+          return itemPageRoutes;
+        })
+      );
+    }
   }
 
   ngOnDestroy(): void {

From dbb4d08ca0673c6e21d0cd0831e2d61e4d450c50 Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Wed, 7 Jul 2021 16:10:11 +0200
Subject: [PATCH 167/169] [CST-4320] back button standardized style

---
 src/app/+item-page/full/full-item-page.component.html | 6 ++++--
 src/assets/i18n/en.json5                              | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 0eeb12467a..29c9f7786c 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -29,8 +29,10 @@
       <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
       <ds-item-page-collections [item]="item"></ds-item-page-collections>
       <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
-      <div *ngIf="fromWfi">
-        <a class="btn btn-light mt-3" (click)="back()">{{'process.detail.back' | translate}}</a>
+      <div class="button-row bottom" *ngIf="fromWfi">
+        <div class="text-right">
+          <a class="btn btn-outline-secondary mr-1" (click)="back()"><i class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</a>
+        </div>
       </div>
     </div>
   </div>
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index a637b94465..152a678af3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1905,6 +1905,8 @@
 
   "item.page.filesection.license.bundle" : "License bundle",
 
+  "item.page.return": "Back",
+
   "item.preview.dc.identifier.uri": "Identifier:",
 
   "item.preview.dc.contributor.author": "Authors:",

From bfcff12499b687417e58a6dc81c7d6c3842cbc83 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Wed, 7 Jul 2021 11:35:12 +0200
Subject: [PATCH 168/169] Fix hardcoded reference to 'upload' section

---
 .../upload/file/section-upload-file.component.ts    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index d4c901b290..c18796d7f3 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -291,14 +291,13 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
           this.pathCombiner.subRootElement);
       })
     ).subscribe((result: SubmissionObject[]) => {
-      if (result[0].sections.upload) {
-        Object.keys((result[0].sections.upload as WorkspaceitemSectionUploadObject).files)
-          .filter((key) => (result[0].sections.upload as WorkspaceitemSectionUploadObject).files[key].uuid === this.fileId)
+      if (result[0].sections[this.sectionId]) {
+        const uploadSection = (result[0].sections[this.sectionId] as WorkspaceitemSectionUploadObject);
+        Object.keys(uploadSection.files)
+          .filter((key) => uploadSection.files[key].uuid === this.fileId)
           .forEach((key) => this.uploadService.updateFileData(
-            this.submissionId,
-            this.sectionId,
-            this.fileId,
-            (result[0].sections.upload as WorkspaceitemSectionUploadObject).files[key]));
+            this.submissionId, this.sectionId, this.fileId, uploadSection.files[key])
+          );
       }
       this.switchMode();
     }));

From de2ba413a1d431c178ce6b8845e5f014dde38fde Mon Sep 17 00:00:00 2001
From: Alessandro Martelli <alessandro.martelli@4science.it>
Date: Thu, 8 Jul 2021 17:16:13 +0200
Subject: [PATCH 169/169] [CSTPER-4320] fixed back button for accessibility

---
 src/app/+item-page/full/full-item-page.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 29c9f7786c..d2655c4ad0 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -31,7 +31,7 @@
       <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
       <div class="button-row bottom" *ngIf="fromWfi">
         <div class="text-right">
-          <a class="btn btn-outline-secondary mr-1" (click)="back()"><i class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</a>
+          <button class="btn btn-outline-secondary mr-1" (click)="back()"><i class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</button>
         </div>
       </div>
     </div>