From 2b17bb8f1e5ebdb1c1bcb49beffcab7ff265133f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 7 Apr 2022 11:29:22 +0200
Subject: [PATCH 001/103] 89676: Themeable browse-by-page decorator &
 search-results component

---
 .../browse-by-switcher/browse-by-decorator.ts | 27 ++++++--
 .../browse-by-switcher.component.ts           |  6 +-
 .../themed-search-results.component.ts        | 64 +++++++++++++++++++
 src/app/shared/search/search.component.html   |  4 +-
 src/app/shared/search/search.module.ts        |  4 +-
 5 files changed, 93 insertions(+), 12 deletions(-)
 create mode 100644 src/app/shared/search/search-results/themed-search-results.component.ts

diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
index 1ebaa7face..ceb4c6a6c6 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
@@ -1,6 +1,10 @@
 import { hasNoValue } from '../../shared/empty.util';
 import { InjectionToken } from '@angular/core';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  DEFAULT_THEME,
+  resolveTheme
+} from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 export enum BrowseByDataType {
   Title = 'title',
@@ -10,7 +14,7 @@ export enum BrowseByDataType {
 
 export const DEFAULT_BROWSE_BY_TYPE = BrowseByDataType.Metadata;
 
-export const BROWSE_BY_COMPONENT_FACTORY = new InjectionToken<(browseByType) => GenericConstructor<any>>('getComponentByBrowseByType', {
+export const BROWSE_BY_COMPONENT_FACTORY = new InjectionToken<(browseByType, theme) => GenericConstructor<any>>('getComponentByBrowseByType', {
   providedIn: 'root',
   factory: () => getComponentByBrowseByType
 });
@@ -20,13 +24,17 @@ const map = new Map();
 /**
  * Decorator used for rendering Browse-By pages by type
  * @param browseByType  The type of page
+ * @param theme The optional theme for the component
  */
-export function rendersBrowseBy(browseByType: BrowseByDataType) {
+export function rendersBrowseBy(browseByType: BrowseByDataType, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
     if (hasNoValue(map.get(browseByType))) {
-      map.set(browseByType, component);
+      map.set(browseByType, new Map());
+    }
+    if (hasNoValue(map.get(browseByType).get(theme))) {
+      map.get(browseByType).set(theme, component);
     } else {
-      throw new Error(`There can't be more than one component to render Browse-By of type "${browseByType}"`);
+      throw new Error(`There can't be more than one component to render Browse-By of type "${browseByType}" and theme "${theme}"`);
     }
   };
 }
@@ -34,11 +42,16 @@ export function rendersBrowseBy(browseByType: BrowseByDataType) {
 /**
  * Get the component used for rendering a Browse-By page by type
  * @param browseByType  The type of page
+ * @param theme the theme to match
  */
-export function getComponentByBrowseByType(browseByType) {
-  const comp = map.get(browseByType);
+export function getComponentByBrowseByType(browseByType, theme) {
+  let themeMap = map.get(browseByType);
+  if (hasNoValue(themeMap)) {
+    themeMap = map.get(DEFAULT_BROWSE_BY_TYPE);
+  }
+  const comp = resolveTheme(themeMap, theme);
   if (hasNoValue(comp)) {
-    map.get(DEFAULT_BROWSE_BY_TYPE);
+    return themeMap.get(DEFAULT_THEME);
   }
   return comp;
 }
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index cf4c1d9856..0d3a35bebf 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -5,6 +5,7 @@ import { map } from 'rxjs/operators';
 import { BROWSE_BY_COMPONENT_FACTORY } from './browse-by-decorator';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
 import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { ThemeService } from '../../shared/theme-support/theme.service';
 
 @Component({
   selector: 'ds-browse-by-switcher',
@@ -21,7 +22,8 @@ export class BrowseBySwitcherComponent implements OnInit {
   browseByComponent: Observable<any>;
 
   public constructor(protected route: ActivatedRoute,
-                     @Inject(BROWSE_BY_COMPONENT_FACTORY) private getComponentByBrowseByType: (browseByType) => GenericConstructor<any>) {
+                     protected themeService: ThemeService,
+                     @Inject(BROWSE_BY_COMPONENT_FACTORY) private getComponentByBrowseByType: (browseByType, theme) => GenericConstructor<any>) {
   }
 
   /**
@@ -29,7 +31,7 @@ export class BrowseBySwitcherComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByComponent = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => this.getComponentByBrowseByType(data.browseDefinition.dataType))
+      map((data: { browseDefinition: BrowseDefinition }) => this.getComponentByBrowseByType(data.browseDefinition.dataType, this.themeService.getThemeName()))
     );
   }
 
diff --git a/src/app/shared/search/search-results/themed-search-results.component.ts b/src/app/shared/search/search-results/themed-search-results.component.ts
new file mode 100644
index 0000000000..19a8fc55e8
--- /dev/null
+++ b/src/app/shared/search/search-results/themed-search-results.component.ts
@@ -0,0 +1,64 @@
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { SearchResultsComponent, SelectionConfig } from './search-results.component';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { SearchResult } from '../models/search-result.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { Context } from '../../../core/shared/context.model';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+
+/**
+ * Themed wrapper for SearchResultsComponent
+ */
+@Component({
+  selector: 'ds-themed-search-results',
+  styleUrls: [],
+  templateUrl: '../../theme-support/themed.component.html',
+})
+export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsComponent> {
+  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'deselectObject', 'selectObject'];
+
+  @Input() linkType: CollectionElementLinkType;
+
+  @Input() searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>;
+
+  @Input() searchConfig: PaginatedSearchOptions;
+
+  @Input() sortConfig: SortOptions;
+
+  @Input() viewMode: ViewMode;
+
+  @Input() configuration: string;
+
+  @Input() disableHeader = false;
+
+  @Input() selectable = false;
+
+  @Input() context: Context;
+
+  @Input() hidePaginationDetail = false;
+
+  @Input() selectionConfig: SelectionConfig = null;
+
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  protected getComponentName(): string {
+    return 'SearchResultsComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/shared/search/search-results/search-results.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./search-results.component');
+  }
+
+}
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index 5ca3e925a5..aac77b3570 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -29,7 +29,7 @@
                         | translate}}
                 </button>
             </div>
-            <ds-search-results [searchResults]="resultsRD$ | async"
+            <ds-themed-search-results [searchResults]="resultsRD$ | async"
                                [searchConfig]="searchOptions$ | async"
                                [configuration]="(currentConfiguration$ | async)"
                                [disableHeader]="!searchEnabled"
@@ -38,7 +38,7 @@
                                [selectable]="selectable"
                                [selectionConfig]="selectionConfig"
                                (deselectObject)="deselectObject.emit($event)"
-                               (selectObject)="selectObject.emit($event)"></ds-search-results>
+                               (selectObject)="selectObject.emit($event)"></ds-themed-search-results>
         </div>
     </div>
 </ng-template>
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 668d260c23..991fad409b 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -28,6 +28,7 @@ import { MissingTranslationHelper } from '../translate/missing-translation.helpe
 import { SharedModule } from '../shared.module';
 import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchComponent } from './search.component';
+import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -50,7 +51,8 @@ const COMPONENTS = [
   SearchAuthorityFilterComponent,
   SearchSwitchConfigurationComponent,
   ConfigurationSearchPageComponent,
-  ThemedConfigurationSearchPageComponent
+  ThemedConfigurationSearchPageComponent,
+  ThemedSearchResultsComponent,
 ];
 
 const ENTRY_COMPONENTS = [

From 0ed7f2e0aa0d1b43f9ed82f5cadf8cc74c5b7cb6 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 8 Apr 2022 11:12:26 +0200
Subject: [PATCH 002/103] 89676: Test fixes

---
 .../browse-by-switcher.component.spec.ts           | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
index cb82ddb7c4..c2e1c9cb68 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -4,7 +4,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { BROWSE_BY_COMPONENT_FACTORY, BrowseByDataType } from './browse-by-decorator';
 import { BrowseDefinition } from '../../core/shared/browse-definition.model';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import { BehaviorSubject } from 'rxjs';
+import { ThemeService } from '../../shared/theme-support/theme.service';
 
 describe('BrowseBySwitcherComponent', () => {
   let comp: BrowseBySwitcherComponent;
@@ -44,11 +45,20 @@ describe('BrowseBySwitcherComponent', () => {
     data
   };
 
+  let themeService: ThemeService;
+  let themeName: string;
+
   beforeEach(waitForAsync(() => {
+    themeName = 'dspace';
+    themeService = jasmine.createSpyObj('themeService', {
+      getThemeName: themeName,
+    });
+
     TestBed.configureTestingModule({
       declarations: [BrowseBySwitcherComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: ThemeService, useValue: themeService },
         { provide: BROWSE_BY_COMPONENT_FACTORY, useValue: jasmine.createSpy('getComponentByBrowseByType').and.returnValue(null) }
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -68,7 +78,7 @@ describe('BrowseBySwitcherComponent', () => {
       });
 
       it(`should call getComponentByBrowseByType with type "${type.dataType}"`, () => {
-        expect((comp as any).getComponentByBrowseByType).toHaveBeenCalledWith(type.dataType);
+        expect((comp as any).getComponentByBrowseByType).toHaveBeenCalledWith(type.dataType, themeName);
       });
     });
   });

From 155db64c63363d7e69fd342a0aabf686697a4291 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 12 Apr 2022 09:36:18 +0200
Subject: [PATCH 003/103] 86526: Added themable AuthNavMenuComponent

---
 src/app/header/header.component.html          |  2 +-
 .../themed-auth-nav-menu.component.ts         | 25 +++++++++++++++++++
 src/app/shared/shared.module.ts               |  2 ++
 .../dspace/app/header/header.component.html   |  2 +-
 .../dspace/app/navbar/navbar.component.html   |  2 +-
 5 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts

diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index c7b979d266..e5d5f38971 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -8,7 +8,7 @@
       <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>
+        <ds-themed-auth-nav-menu></ds-themed-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
         <div class="pl-2">
           <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
diff --git a/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
new file mode 100644
index 0000000000..14ea45d236
--- /dev/null
+++ b/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { AuthNavMenuComponent } from './auth-nav-menu.component';
+
+/**
+ * Themed wrapper for {@link AuthNavMenuComponent}
+ */
+@Component({
+  selector: 'ds-themed-auth-nav-menu',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedAuthNavMenuComponent extends ThemedComponent<AuthNavMenuComponent> {
+  protected getComponentName(): string {
+    return 'AuthNavMenuComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/auth-nav-menu/auth-nav-menu.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./auth-nav-menu.component`);
+  }
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 9b993e551f..34ee541773 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -48,6 +48,7 @@ import { SearchResultGridElementComponent } from './object-grid/search-result-gr
 import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
 import { VarDirective } from './utils/var.directive';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
+import { ThemedAuthNavMenuComponent } from './auth-nav-menu/themed-auth-nav-menu.component';
 import { LogOutComponent } from './log-out/log-out.component';
 import { FormComponent } from './form/form.component';
 import { DsDynamicOneboxComponent } from './form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
@@ -292,6 +293,7 @@ const COMPONENTS = [
   // put shared components here
   AlertComponent,
   AuthNavMenuComponent,
+  ThemedAuthNavMenuComponent,
   UserMenuComponent,
   ChipsComponent,
   ComcolPageContentComponent,
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index cf691ea6c4..0fd4d42518 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -8,7 +8,7 @@
     <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-themed-auth-nav-menu></ds-themed-auth-nav-menu>
       <ds-impersonate-navbar></ds-impersonate-navbar>
       <div class="pl-2">
         <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 5af30db632..e66c0a6718 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -17,7 +17,7 @@
     </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-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
     <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
   </div>
 </nav>

From a9162eb9205c920f1d64857851117514a8c2beca Mon Sep 17 00:00:00 2001
From: Pratik Rajkotiya <luca.giamminonni@4science.com>
Date: Wed, 13 Apr 2022 18:20:16 +0530
Subject: [PATCH 004/103] [CST-5339] ORCID queue added.

---
 src/app/core/core.module.ts                   |  12 +-
 .../core/orcid/model/orcid-history.model.ts   |  89 +++++++
 .../model/orcid-history.resource-type.ts      |   9 +
 src/app/core/orcid/model/orcid-queue.model.ts |  68 +++++
 .../orcid/model/orcid-queue.resource-type.ts  |   9 +
 src/app/core/orcid/orcid-history.service.ts   |  95 +++++++
 src/app/core/orcid/orcid-queue.service.ts     | 124 +++++++++
 src/app/item-page/item-page.module.ts         |   4 +-
 .../orcid-page/orcid-page.component.html      |   1 +
 .../orcid-queue/orcid-queue.component.html    |  59 +++++
 .../orcid-queue/orcid-queue.component.scss    |   0
 .../orcid-queue/orcid-queue.component.ts      | 250 ++++++++++++++++++
 12 files changed, 717 insertions(+), 3 deletions(-)
 create mode 100644 src/app/core/orcid/model/orcid-history.model.ts
 create mode 100644 src/app/core/orcid/model/orcid-history.resource-type.ts
 create mode 100644 src/app/core/orcid/model/orcid-queue.model.ts
 create mode 100644 src/app/core/orcid/model/orcid-queue.resource-type.ts
 create mode 100644 src/app/core/orcid/orcid-history.service.ts
 create mode 100644 src/app/core/orcid/orcid-queue.service.ts
 create mode 100644 src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
 create mode 100644 src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.scss
 create mode 100644 src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts

diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 7e97c78b3b..3f2737f30d 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -165,6 +165,10 @@ import { SubmissionAccessesModel } from './config/models/config-submission-acces
 import { ResearcherProfileService } from './profile/researcher-profile.service';
 import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
 import { ResearcherProfile } from './profile/model/researcher-profile.model';
+import { OrcidQueueService } from './orcid/orcid-queue.service';
+import { OrcidHistoryService } from './orcid/orcid-history.service';
+import { OrcidQueue } from './orcid/model/orcid-queue.model';
+import { OrcidHistory } from './orcid/model/orcid-history.model';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -290,7 +294,9 @@ const PROVIDERS = [
   GroupDataService,
   FeedbackDataService,
   ResearcherProfileService,
-  ProfileClaimService
+  ProfileClaimService,
+  OrcidQueueService,
+  OrcidHistoryService,
 ];
 
 /**
@@ -351,7 +357,9 @@ export const models =
     Root,
     SearchConfig,
     SubmissionAccessesModel,
-    ResearcherProfile
+    ResearcherProfile,
+    OrcidQueue,
+    OrcidHistory,
   ];
 
 @NgModule({
diff --git a/src/app/core/orcid/model/orcid-history.model.ts b/src/app/core/orcid/model/orcid-history.model.ts
new file mode 100644
index 0000000000..207a0c4df9
--- /dev/null
+++ b/src/app/core/orcid/model/orcid-history.model.ts
@@ -0,0 +1,89 @@
+import { autoserialize, deserialize } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/object-cache.reducer';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ORCID_HISTORY } from './orcid-history.resource-type';
+
+/**
+ * Class the represents a Orcid History.
+ */
+@typedObject
+export class OrcidHistory extends CacheableObject {
+
+  static type = ORCID_HISTORY;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier of this Orcid History record
+   */
+  @autoserialize
+  id: number;
+
+  /**
+   * The name of the related entity
+   */
+  @autoserialize
+  entityName: string;
+
+  /**
+   * The identifier of the owner of this Orcid History record.
+   */
+  @autoserialize
+  ownerId: string;
+
+  /**
+   * The identifier of the entity related to this Orcid History record.
+   */
+  @autoserialize
+  entityId: string;
+
+  /**
+   * The type of the entity related to this Orcid History record.
+   */
+  @autoserialize
+  entityType: string;
+
+  /**
+   * The response status coming from ORCID api.
+   */
+  @autoserialize
+  status: number;
+
+  /**
+   * The putCode assigned by ORCID to the entity.
+   */
+  @autoserialize
+  putCode: string;
+
+  /**
+   * The last send attempt timestamp.
+   */
+  lastAttempt: string;
+
+  /**
+   * The success send attempt timestamp.
+   */
+  successAttempt: string;
+
+  /**
+   * The response coming from ORCID.
+   */
+  responseMessage: string;
+
+  /**
+   * The {@link HALLink}s for this Orcid History record
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+  };
+
+}
diff --git a/src/app/core/orcid/model/orcid-history.resource-type.ts b/src/app/core/orcid/model/orcid-history.resource-type.ts
new file mode 100644
index 0000000000..45da8cbf68
--- /dev/null
+++ b/src/app/core/orcid/model/orcid-history.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for OrcidHistory
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ORCID_HISTORY = new ResourceType('orcidhistory');
diff --git a/src/app/core/orcid/model/orcid-queue.model.ts b/src/app/core/orcid/model/orcid-queue.model.ts
new file mode 100644
index 0000000000..52ab8676ad
--- /dev/null
+++ b/src/app/core/orcid/model/orcid-queue.model.ts
@@ -0,0 +1,68 @@
+import { autoserialize, deserialize } from 'cerialize';
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/object-cache.reducer';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ORCID_QUEUE } from './orcid-queue.resource-type';
+
+/**
+ * Class the represents a Orcid Queue.
+ */
+@typedObject
+export class OrcidQueue extends CacheableObject {
+
+  static type = ORCID_QUEUE;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+  type: ResourceType;
+
+  /**
+   * The identifier of this Orcid Queue record
+   */
+  @autoserialize
+  id: number;
+
+  /**
+   * The record description.
+   */
+  @autoserialize
+  description: string;
+
+  /**
+   * The identifier of the owner of this Orcid Queue record.
+   */
+  @autoserialize
+  ownerId: string;
+
+  /**
+   * The identifier of the entity related to this Orcid Queue record.
+   */
+  @autoserialize
+  entityId: string;
+
+  /**
+   * The type of this Orcid Queue record.
+   */
+  @autoserialize
+  recordType: string;
+
+  /**
+   * The operation related to this Orcid Queue record.
+   */
+  @autoserialize
+  operation: string;
+
+  /**
+   * The {@link HALLink}s for this Orcid Queue record
+   */
+  @deserialize
+  _links: {
+    self: HALLink,
+  };
+
+}
diff --git a/src/app/core/orcid/model/orcid-queue.resource-type.ts b/src/app/core/orcid/model/orcid-queue.resource-type.ts
new file mode 100644
index 0000000000..a7f40d70ec
--- /dev/null
+++ b/src/app/core/orcid/model/orcid-queue.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for OrcidQueue
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ORCID_QUEUE = new ResourceType('orcidqueue');
diff --git a/src/app/core/orcid/orcid-history.service.ts b/src/app/core/orcid/orcid-history.service.ts
new file mode 100644
index 0000000000..03eb497956
--- /dev/null
+++ b/src/app/core/orcid/orcid-history.service.ts
@@ -0,0 +1,95 @@
+/* tslint:disable:max-classes-per-file */
+
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { CoreState } from '../core.reducers';
+import { DataService } from '../data/data.service';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { ItemDataService } from '../data/item-data.service';
+import { RemoteData } from '../data/remote-data';
+import { PostRequest, RestRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFinishedRemoteData, getResponseFromEntry, sendRequest } from '../shared/operators';
+import { OrcidHistory } from './model/orcid-history.model';
+import { ORCID_HISTORY } from './model/orcid-history.resource-type';
+import { OrcidQueue } from './model/orcid-queue.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+
+/**
+ * A private DataService implementation to delegate specific methods to.
+ */
+class OrcidHistoryServiceImpl extends DataService<OrcidHistory> {
+  public linkPath = 'orcidhistories';
+
+  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: DefaultChangeAnalyzer<OrcidHistory>) {
+    super();
+  }
+
+}
+
+/**
+ * A service that provides methods to make REST requests with Orcid History endpoint.
+ */
+@Injectable()
+@dataService(ORCID_HISTORY)
+export class OrcidHistoryService {
+
+  dataService: OrcidHistoryServiceImpl;
+
+  responseMsToLive: number = 10 * 1000;
+
+  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: DefaultChangeAnalyzer<OrcidHistory>,
+      protected itemService: ItemDataService ) {
+
+          this.dataService = new OrcidHistoryServiceImpl(requestService, rdbService, store, objectCache, halService,
+              notificationsService, http, comparator);
+
+  }
+
+  sendToORCID(orcidQueue: OrcidQueue): Observable<RemoteData<OrcidHistory>> {
+    const requestId = this.requestService.generateRequestId();
+    return this.getEndpoint().pipe(
+      map((endpointURL: string) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'text/uri-list');
+        options.headers = headers;
+        return new PostRequest(requestId, endpointURL, orcidQueue._links.self.href, options);
+      }),
+      sendRequest(this.requestService),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)  as Observable<RemoteData<OrcidHistory>>)
+    );
+  }
+
+  getEndpoint(): Observable<string> {
+    return this.halService.getEndpoint(this.dataService.linkPath);
+  }
+
+}
diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
new file mode 100644
index 0000000000..7cf43a9aa0
--- /dev/null
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -0,0 +1,124 @@
+/* tslint:disable:max-classes-per-file */
+
+import { DataService } from '../data/data.service';
+import { OrcidQueue } from './model/orcid-queue.model';
+import { RequestService } from '../data/request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { Injectable } from '@angular/core';
+import { dataService } from '../cache/builders/build-decorators';
+import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
+import { ItemDataService } from '../data/item-data.service';
+import { combineLatest, Observable } from 'rxjs';
+import { RemoteData } from '../data/remote-data';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { NoContent } from '../shared/NoContent.model';
+import { ConfigurationDataService } from '../data/configuration-data.service';
+import { map } from 'rxjs/operators';
+import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
+import { environment } from '../../../environments/environment';
+import { Router } from '@angular/router';
+
+/**
+ * A private DataService implementation to delegate specific methods to.
+ */
+class OrcidQueueServiceImpl extends DataService<OrcidQueue> {
+  public linkPath = 'orcidqueues';
+
+  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: DefaultChangeAnalyzer<OrcidQueue>) {
+    super();
+  }
+
+}
+
+/**
+ * A service that provides methods to make REST requests with Orcid Queue endpoint.
+ */
+@Injectable()
+@dataService(ORCID_QUEUE)
+export class OrcidQueueService {
+
+  dataService: OrcidQueueServiceImpl;
+
+  responseMsToLive: number = 10 * 1000;
+
+  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: DefaultChangeAnalyzer<OrcidQueue>,
+      protected configurationService: ConfigurationDataService,
+      protected router: Router,
+      protected itemService: ItemDataService ) {
+
+          this.dataService = new OrcidQueueServiceImpl(requestService, rdbService, store, objectCache, halService,
+              notificationsService, http, comparator);
+
+  }
+
+  /**
+   * @param itemId It represent a Id of owner
+   * @param paginationOptions
+   * @returns { OrcidQueue }
+   */
+  searchByOwnerId(itemId: string, paginationOptions: PaginationComponentOptions): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
+    return this.dataService.searchBy('findByOwner', {
+      searchParams: [new RequestParam('ownerId', itemId)],
+      elementsPerPage: paginationOptions.pageSize,
+      currentPage: paginationOptions.currentPage
+    },false,
+      true);
+  }
+
+  /**
+   * @param orcidQueueId represents a id of orcid queue
+   * @returns { NoContent }
+   */
+  deleteById(orcidQueueId: number): Observable<RemoteData<NoContent>> {
+    return this.dataService.delete(orcidQueueId + '');
+  }
+
+  /**
+   * This method will set linkPath to stale
+   */
+  clearFindByOwnerRequests() {
+    this.requestService.setStaleByHrefSubstring(this.dataService.linkPath + '/search/findByOwner');
+  }
+
+  /**
+   * @param profileId represent a uuid of that user
+   * @returns orcid authorized url of that user
+   */
+  getOrcidAuthorizeUrl(profileId: string): Observable<string> {
+    return combineLatest([
+      this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
+      this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
+      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
+    ).pipe(
+      map(([authorizeUrl, clientId, scopes]) => {
+        const redirectUri = environment.rest.baseUrl + '/api/cris/orcid/' + profileId + '/?url=' + encodeURIComponent(this.router.url);
+        return authorizeUrl.values[0] + '?client_id=' + clientId.values[0]   + '&redirect_uri=' + redirectUri + '&response_type=code&scope='
+        + scopes.values.join(' ');
+    }));
+  }
+}
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index 2c4b57b249..9c471a5aa7 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -38,6 +38,7 @@ import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 import { OrcidSettingComponent } from './orcid-page/orcid-sync/orcid-setting.component';
+import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
 
 
 const ENTRY_COMPONENTS = [
@@ -73,7 +74,8 @@ const DECLARATIONS = [
   VersionPageComponent,
   OrcidPageComponent,
   OrcidAuthComponent,
-  OrcidSettingComponent
+  OrcidSettingComponent,
+  OrcidQueueComponent
 ];
 
 @NgModule({
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 4e62a8d51c..33c1dd158d 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,2 +1,3 @@
 <ds-orcid-auth></ds-orcid-auth>
 <ds-orcid-setting></ds-orcid-setting>
+<ds-orcid-queue></ds-orcid-queue>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
new file mode 100644
index 0000000000..81e30bc013
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -0,0 +1,59 @@
+<div class="container custom-accordion mb-4">
+    <ngb-accordion activeIds="queue">
+      <ngb-panel title="{{'person.orcid.registry.queue' | translate}}" id="queue">
+        <ng-template ngbPanelContent>
+            <div class="container">
+                <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+
+                <div *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
+                    class="row alert alert-info">
+                    {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
+                </div>
+                <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
+                    [paginationOptions]="paginationOptions" [collectionSize]="(getList() | async)?.payload?.totalElements"
+                    [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
+
+                    <div class="table-responsive">
+                        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+                            <thead>
+                                <tr class="text-center align-middle">
+                                    <th>{{'person.page.orcid.sync-queue.description' | translate}}</th>
+                                    <th></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <tr *ngFor="let entry of (getList() | async)?.payload?.page">
+                                    <td class="text-center align-middle">
+                                        {{ entry.description }}
+                                    </td>
+                                    <td style="width: 20%" class="text-center">
+                                        <div class="btn-group edit-field">
+                                            <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
+                                                class="btn btn-outline-success my-1 col-md">
+                                                <i [ngClass]="getOperationClass(entry)"></i>
+                                            </button>
+                                            <button [ngbTooltip]="getIconTooltip(entry) | translate" container="body"
+                                                class="btn btn-outline-warning my-1 col-md">
+                                                <i [ngClass]="getIconClass(entry)"
+                                                aria-hidden="true"></i>
+                                            </button>
+                                            <button [ngbTooltip]="'person.page.orcid.sync-queue.send' | translate" container="body"
+                                                class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
+                                                <i class="fas fa-cogs"></i>
+                                            </button>
+                                            <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
+                                                class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
+                                                <i class="fas fa-times"></i>
+                                            </button>
+                                        </div>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </ds-pagination>
+            </div>
+        </ng-template>
+        </ngb-panel>
+    </ngb-accordion>  
+</div>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.scss b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
new file mode 100644
index 0000000000..01639a427c
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -0,0 +1,250 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
+import { switchMap, tap } from 'rxjs/operators';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
+import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { OrcidHistoryService } from '../../../core/orcid/orcid-history.service';
+import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { getFinishedRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+
+@Component({
+  selector: 'ds-orcid-queue',
+  templateUrl: './orcid-queue.component.html',
+  styleUrls: ['./orcid-queue.component.scss']
+})
+export class OrcidQueueComponent implements OnInit {
+  /**
+   * Pagination config used to display the list
+   */
+   public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'oqp',
+    pageSize: 5
+  });
+
+  /**
+   * A boolean representing if results are loading
+   */
+  public processing$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * A list of orcid queue records
+   */
+  private list$: BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>> = new BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>>({} as any);
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+  constructor(private orcidQueueService: OrcidQueueService,
+              protected translateService: TranslateService,
+              private paginationService: PaginationService,
+              private route: ActivatedRoute,
+              private notificationsService: NotificationsService,
+              private orcidHistoryService: OrcidHistoryService,
+              ) { }
+
+  ngOnInit(): void {
+    this.updateList();
+  }
+
+  updateList() {
+    this.subs.push(
+      this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions).pipe(
+        tap(() => this.processing$.next(true)),
+        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByOwnerId(this.route.snapshot.paramMap.get('id'), config)),
+        getFirstCompletedRemoteData()
+      ).subscribe((result: RemoteData<PaginatedList<OrcidQueue>>) => {
+        this.processing$.next(false);
+        this.list$.next(result);
+        this.orcidQueueService.clearFindByOwnerRequests();
+      })
+    );
+  }
+
+
+  /**
+   * Return the list of orcid queue records
+   */
+   getList(): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
+    return this.list$.asObservable();
+  }
+
+  getIconClass(orcidQueue: OrcidQueue): string {
+    if (!orcidQueue.recordType) {
+      return 'fa fa-user';
+    }
+    switch (orcidQueue.recordType.toLowerCase()) {
+      case 'publication':
+        return 'fa fa-book';
+      case 'funding':
+        return 'fa fa-wallet';
+      case 'education':
+        return 'fa fa-school';
+      case 'affiliation':
+        return 'fa fa-university';
+      case 'country':
+        return 'fas fa-globe-europe';
+      case 'external_ids':
+      case 'researcher_urls':
+        return 'fas fa-external-link-alt';
+      default:
+        return 'fa fa-user';
+    }
+  }
+
+  getIconTooltip(orcidQueue: OrcidQueue): string {
+    if (!orcidQueue.recordType) {
+      return '';
+    }
+
+    return 'person.page.orcid.sync-queue.tooltip.' + orcidQueue.recordType.toLowerCase();
+  }
+
+  getOperationBadgeClass(orcidQueue: OrcidQueue): string {
+
+    if (!orcidQueue.operation) {
+      return '';
+    }
+
+    switch (orcidQueue.operation.toLowerCase()) {
+      case 'insert':
+        return 'badge badge-pill badge-success';
+      case 'update':
+        return 'badge badge-pill badge-primary';
+      case 'delete':
+        return 'badge badge-pill badge-danger';
+      default:
+        return '';
+    }
+  }
+
+  getOperationTooltip(orcidQueue: OrcidQueue): string {
+    if (!orcidQueue.operation) {
+      return '';
+    }
+
+    return 'person.page.orcid.sync-queue.tooltip.' + orcidQueue.operation.toLowerCase();
+  }
+
+  getOperationClass(orcidQueue: OrcidQueue): string {
+
+    if (!orcidQueue.operation) {
+      return '';
+    }
+
+    switch (orcidQueue.operation.toLowerCase()) {
+      case 'insert':
+        return 'fas fa-plus';
+      case 'update':
+        return 'fas fa-edit';
+      case 'delete':
+        return 'fas fa-trash-alt';
+      default:
+        return '';
+    }
+  }
+
+  discardEntry(orcidQueue: OrcidQueue) {
+    this.processing$.next(true);
+    this.subs.push(this.orcidQueueService.deleteById(orcidQueue.id).pipe(
+      getFinishedRemoteData()
+    ).subscribe((remoteData) => {
+      this.processing$.next(false);
+      if (remoteData.isSuccess) {
+        this.notificationsService.success(this.translateService.get('person.page.orcid.sync-queue.discard.success'));
+        this.updateList();
+      } else {
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.discard.error'));
+      }
+    }));
+  }
+
+  send( orcidQueue: OrcidQueue ) {
+    this.processing$.next(true);
+    this.subs.push(this.orcidHistoryService.sendToORCID(orcidQueue).pipe(
+      getFinishedRemoteData()
+    ).subscribe((remoteData) => {
+      this.processing$.next(false);
+      if (remoteData.isSuccess) {
+        this.handleOrcidHistoryRecordCreation(remoteData.payload);
+      } else if (remoteData.statusCode === 422) {
+        this.handleValidationErrors(remoteData);
+      } else {
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.error'));
+      }
+    }));
+  }
+
+  handleOrcidHistoryRecordCreation(orcidHistory: OrcidHistory) {
+    switch (orcidHistory.status) {
+      case 200:
+      case 201:
+      case 204:
+        this.notificationsService.success(this.translateService.get('person.page.orcid.sync-queue.send.success'));
+        this.updateList();
+        break;
+      case 400:
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.bad-request-error'), null, { timeOut: -1 });
+        break;
+      case 401:
+        combineLatest([
+          this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.title'),
+          this.getUnauthorizedErrorContent()],
+        ).subscribe(([title, content]) => {
+          this.notificationsService.error(title, content, { timeOut: -1}, true);
+        });
+        break;
+      case 404:
+        this.notificationsService.warning(this.translateService.get('person.page.orcid.sync-queue.send.not-found-warning'));
+        break;
+      case 409:
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.conflict-error'), null, { timeOut: -1 });
+        break;
+      default:
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.error'), null, { timeOut: -1 });
+    }
+  }
+
+  handleValidationErrors(remoteData: RemoteData<OrcidHistory>) {
+    const translations = [this.translateService.get('person.page.orcid.sync-queue.send.validation-error')];
+    const errorMessage = remoteData.errorMessage;
+    if (errorMessage && errorMessage.indexOf('Error codes:') > 0) {
+      errorMessage.substring(errorMessage.indexOf(':') + 1).trim().split(',')
+        .forEach((error) => translations.push(this.translateService.get('person.page.orcid.sync-queue.send.validation-error.' + error)));
+    }
+    combineLatest(translations).subscribe((messages) => {
+      const title = messages.shift();
+      const content = '<ul>' + messages.map((message) => '<li>' + message + '</li>').join('') + '</ul>';
+      this.notificationsService.error(title, content, { timeOut: -1 }, true);
+    });
+  }
+
+  private getUnauthorizedErrorContent(): Observable<string> {
+    return this.orcidQueueService.getOrcidAuthorizeUrl(this.route.snapshot.paramMap.get('id')).pipe(
+      switchMap((authorizeUrl) => this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.content', { orcid : authorizeUrl}))
+    );
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.list$ = null;
+    this.subs.filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+  isProfileRecord(orcidQueue: OrcidQueue): boolean {
+    return orcidQueue.recordType !== 'Publication' && orcidQueue.recordType !== 'Project';
+  }
+
+}

From 7480a19a656fa954da162ff665b955bc86acecff Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 28 Apr 2022 12:18:14 +0200
Subject: [PATCH 005/103] 89720: Added ThemedItemMetadataComponent

---
 .../edit-item-template-page.component.html    |  2 +-
 .../edit-item-page/edit-item-page.module.ts   |  5 ++-
 .../themed-item-metadata.component.ts         | 34 +++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts

diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index f8c5c92e96..aa6b71f588 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -3,7 +3,7 @@
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
       <ng-container *ngIf="itemRD?.hasSucceeded">
         <h2 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: collection?.name } }}</h2>
-        <ds-item-metadata [updateService]="itemTemplateService" [item]="itemRD?.payload"></ds-item-metadata>
+        <ds-themed-item-metadata [updateService]="itemTemplateService" [item]="itemRD?.payload"></ds-themed-item-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
       <ds-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-loading>
diff --git a/src/app/item-page/edit-item-page/edit-item-page.module.ts b/src/app/item-page/edit-item-page/edit-item-page.module.ts
index 97901bd7c8..67cf31c6ed 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.module.ts
@@ -15,6 +15,7 @@ import { ItemPrivateComponent } from './item-private/item-private.component';
 import { ItemPublicComponent } from './item-public/item-public.component';
 import { ItemDeleteComponent } from './item-delete/item-delete.component';
 import { ItemMetadataComponent } from './item-metadata/item-metadata.component';
+import { ThemedItemMetadataComponent } from './item-metadata/themed-item-metadata.component';
 import { EditInPlaceFieldComponent } from './item-metadata/edit-in-place-field/edit-in-place-field.component';
 import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
 import { ItemEditBitstreamComponent } from './item-bitstreams/item-edit-bitstream/item-edit-bitstream.component';
@@ -62,6 +63,7 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
     ItemDeleteComponent,
     ItemStatusComponent,
     ItemMetadataComponent,
+    ThemedItemMetadataComponent,
     ItemRelationshipsComponent,
     ItemBitstreamsComponent,
     ItemVersionHistoryComponent,
@@ -83,7 +85,8 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
     ObjectValuesPipe
   ],
   exports: [
-    ItemMetadataComponent
+    EditInPlaceFieldComponent,
+    ThemedItemMetadataComponent,
   ]
 })
 export class EditItemPageModule {
diff --git a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
new file mode 100644
index 0000000000..53f0120015
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
@@ -0,0 +1,34 @@
+import { Component, Input } from '@angular/core';
+import { Item } from '../../../core/shared/item.model';
+import { UpdateDataService } from '../../../core/data/update-data.service';
+import { ItemMetadataComponent } from './item-metadata.component';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+
+@Component({
+  selector: 'ds-themed-item-metadata',
+  styleUrls: [],
+  templateUrl: './../../../shared/theme-support/themed.component.html',
+})
+/**
+ * Component for displaying an item's metadata edit page
+ */
+export class ThemedItemMetadataComponent extends ThemedComponent<ItemMetadataComponent> {
+
+  @Input() item: Item;
+
+  @Input() updateService: UpdateDataService<Item>;
+
+  protected inAndOutputNames: (keyof ItemMetadataComponent & keyof this)[] = ['item', 'updateService'];
+
+  protected getComponentName(): string {
+    return 'ItemMetadataComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/item-page/edit-item-page/item-metadata/item-metadata.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./item-metadata.component`);
+  }
+}

From 2f84d0294be4582fdc5c6db8c0fe059b42eeddfa Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 29 Apr 2022 10:27:26 +0200
Subject: [PATCH 006/103] 89720: Added ThemedEditItemTemplatePageComponent

---
 .../collection-page-routing.module.ts         |  4 +--
 .../collection-page/collection-page.module.ts |  2 ++
 ...hemed-edit-item-template-page.component.ts | 25 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts

diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
index 5879e523af..0574958037 100644
--- a/src/app/collection-page/collection-page-routing.module.ts
+++ b/src/app/collection-page/collection-page-routing.module.ts
@@ -6,7 +6,7 @@ import { CreateCollectionPageComponent } from './create-collection-page/create-c
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
+import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
 import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
 import { CollectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
@@ -52,7 +52,7 @@ import { ThemedCollectionPageComponent } from './themed-collection-page.componen
           },
           {
             path: ITEMTEMPLATE_PATH,
-            component: EditItemTemplatePageComponent,
+            component: ThemedEditItemTemplatePageComponent,
             canActivate: [AuthenticatedGuard],
             resolve: {
               item: ItemTemplatePageResolver,
diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index 3652823200..c35ebf9021 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -8,6 +8,7 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
+import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
 import { EditItemPageModule } from '../item-page/edit-item-page/edit-item-page.module';
 import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 import { SearchService } from '../core/shared/search/search.service';
@@ -32,6 +33,7 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
     CreateCollectionPageComponent,
     DeleteCollectionPageComponent,
     EditItemTemplatePageComponent,
+    ThemedEditItemTemplatePageComponent,
     CollectionItemMapperComponent
   ],
   providers: [
diff --git a/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
new file mode 100644
index 0000000000..b53f4e6c45
--- /dev/null
+++ b/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
+
+@Component({
+  selector: 'ds-themed-edit-item-template-page',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+/**
+ * Component for editing the item template of a collection
+ */
+export class ThemedEditItemTemplatePageComponent extends ThemedComponent<EditItemTemplatePageComponent> {
+  protected getComponentName(): string {
+    return 'EditItemTemplatePageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/collection-page/edit-item-template-page/edit-item-template-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-item-template-page.component');
+  }
+}

From b9b5b50999a3e3173a97709e403c4773839116a5 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 3 May 2022 08:56:37 +0200
Subject: [PATCH 007/103] 89741: Added ThemedExpandableNavbarSectionComponent

---
 ...med-expandable-navbar-section.component.ts | 29 +++++++++++++++++++
 src/app/navbar/navbar.module.ts               | 11 +++----
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts

diff --git a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
new file mode 100644
index 0000000000..744eeb5a02
--- /dev/null
+++ b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
+import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
+import { MenuID } from '../../shared/menu/initial-menus-state';
+
+/**
+ * Themed wrapper for ExpandableNavbarSectionComponent
+ */
+@Component({
+  /* tslint:disable:component-selector */
+  selector: 'li[ds-themed-expandable-navbar-section]',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+@rendersSectionForMenu(MenuID.PUBLIC, true)
+export class ThemedExpandableNavbarSectionComponent  extends ThemedComponent<ExpandableNavbarSectionComponent> {
+  protected getComponentName(): string {
+    return 'ExpandableNavbarSectionComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/navbar/expandable-navbar-section/expandable-navbar-section.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./expandable-navbar-section.component`);
+  }
+}
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index c84e732fd5..95641de41b 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -7,6 +7,7 @@ import { CoreModule } from '../core/core.module';
 import { NavbarEffects } from './navbar.effects';
 import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
+import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component';
 import { NavbarComponent } from './navbar.component';
 import { MenuModule } from '../shared/menu/menu.module';
 import { SharedModule } from '../shared/shared.module';
@@ -20,7 +21,7 @@ const effects = [
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   NavbarSectionComponent,
-  ExpandableNavbarSectionComponent,
+  ThemedExpandableNavbarSectionComponent,
 ];
 
 @NgModule({
@@ -36,19 +37,19 @@ const ENTRY_COMPONENTS = [
     NavbarComponent,
     ThemedNavbarComponent,
     NavbarSectionComponent,
-    ExpandableNavbarSectionComponent
+    ExpandableNavbarSectionComponent,
+    ThemedExpandableNavbarSectionComponent,
   ],
   providers: [
 
   ],
   entryComponents: [
-    NavbarSectionComponent,
-    ExpandableNavbarSectionComponent
+    ...ENTRY_COMPONENTS,
   ],
   exports: [
     ThemedNavbarComponent,
     NavbarSectionComponent,
-    ExpandableNavbarSectionComponent
+    ThemedExpandableNavbarSectionComponent,
   ]
 })
 

From 870a36180c4836108c23f790e5e49c04460a99b4 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Mon, 25 Apr 2022 17:26:12 +0200
Subject: [PATCH 008/103] 89984: Add ThemedLoadingComponent

---
 .../epeople-registry.component.html           |  2 +-
 .../eperson-form/eperson-form.component.html  |  4 +--
 .../groups-registry.component.html            |  2 +-
 .../edit-bitstream-page.component.html        |  4 +--
 .../browse-by-metadata-page.component.html    |  2 +-
 .../collection-page.component.html            |  8 ++---
 .../collection-source.component.html          |  2 +-
 .../edit-item-template-page.component.html    |  2 +-
 .../community-list.component.html             |  6 ++--
 .../community-page.component.html             |  2 +-
 ...ty-page-sub-collection-list.component.html |  2 +-
 ...ity-page-sub-community-list.component.html |  2 +-
 .../top-level-community-list.component.html   |  2 +-
 .../item-bitstreams.component.html            |  2 +-
 ...rag-and-drop-bitstream-list.component.html |  2 +-
 .../edit-relationship-list.component.html     |  2 +-
 .../item-relationships.component.html         |  2 +-
 .../full/full-item-page.component.html        |  2 +-
 .../media-viewer/media-viewer.component.html  |  4 +--
 .../media-viewer.component.spec.ts            |  2 +-
 .../file-section/file-section.component.html  |  2 +-
 .../file-section.component.spec.ts            |  2 +-
 .../item-page/simple/item-page.component.html |  2 +-
 .../simple/item-page.component.spec.ts        |  2 +-
 ...etadata-representation-list.component.html |  2 +-
 .../related-items.component.html              |  2 +-
 .../detail/process-detail.component.html      |  2 +-
 .../deny-request-copy.component.html          |  2 +-
 .../grant-deny-request-copy.component.html    |  2 +-
 .../grant-request-copy.component.html         |  2 +-
 src/app/root/root.component.html              |  4 +--
 .../user-menu/user-menu.component.html        |  2 +-
 .../shared/browse-by/browse-by.component.html |  2 +-
 .../browse-by/browse-by.component.spec.ts     |  2 +-
 .../collection-dropdown.component.html        |  4 +--
 .../comcol-role/comcol-role.component.html    |  2 +-
 .../dso-selector/dso-selector.component.html  |  2 +-
 .../entity-dropdown.component.html            |  4 +--
 ...sting-metadata-list-element.component.html |  2 +-
 ...sting-relation-list-element.component.html |  2 +-
 .../dynamic-relation-group.component.html     |  2 +-
 ...namic-lookup-relation-modal.component.html |  2 +-
 ...elation-external-source-tab.component.html |  4 +--
 ...tion-external-source-tab.component.spec.ts |  4 +--
 .../loading/themed-loading.component.ts       | 31 +++++++++++++++++++
 src/app/shared/log-in/log-in.component.html   |  2 +-
 .../object-detail.component.html              |  2 +-
 .../object-grid/object-grid.component.html    |  2 +-
 ...-search-result-list-element.component.html |  4 +--
 ...-search-result-list-element.component.html |  4 +--
 .../collection-select.component.html          |  2 +-
 .../item-select/item-select.component.html    |  2 +-
 .../search-results.component.html             |  2 +-
 src/app/shared/shared.module.ts               |  2 ++
 .../vocabulary-treeview.component.html        |  2 +-
 .../statistics-page.component.html            |  2 +-
 .../form/submission-form.component.html       |  2 +-
 ...-import-external-collection.component.html |  2 +-
 .../submission-import-external.component.html |  4 +--
 ...mission-section-cc-licenses.component.html |  4 +--
 .../sections/form/section-form.component.html |  2 +-
 src/app/thumbnail/thumbnail.component.html    |  4 +--
 src/app/thumbnail/thumbnail.component.spec.ts |  2 +-
 63 files changed, 112 insertions(+), 79 deletions(-)
 create mode 100644 src/app/shared/loading/themed-loading.component.ts

diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index 7ef02a76cf..2d87f21d26 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -45,7 +45,7 @@
           </div>
         </form>
 
-        <ds-loading *ngIf="searching$ | async"></ds-loading>
+        <ds-themed-loading *ngIf="searching$ | async"></ds-themed-loading>
         <ds-pagination
           *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(searching$ | async)"
           [paginationOptions]="config"
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index 41ae67423c..e9cc48aee3 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -36,12 +36,12 @@
   </button>
 </ds-form>
 
-<ds-loading [showMessage]="false" *ngIf="!formGroup"></ds-loading>
+<ds-themed-loading [showMessage]="false" *ngIf="!formGroup"></ds-themed-loading>
 
 <div *ngIf="epersonService.getActiveEPerson() | async">
   <h5>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h5>
 
-  <ds-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-loading>
+  <ds-themed-loading [showMessage]="false" *ngIf="!(groups | async)"></ds-themed-loading>
 
   <ds-pagination
     *ngIf="(groups | async)?.payload?.totalElements > 0"
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 e791b7f2a0..fa7b0ea672 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -33,7 +33,7 @@
         </div>
       </form>
 
-      <ds-loading *ngIf="loading$ | async"></ds-loading>
+      <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
       <ds-pagination
         *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
         [paginationOptions]="config"
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 4d3b948a58..6454198340 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
@@ -27,7 +27,7 @@
       </div>
     </div>
     <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
-                message="{{'loading.bitstream' | translate}}"></ds-loading>
+    <ds-themed-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
+                message="{{'loading.bitstream' | translate}}"></ds-themed-loading>
   </div>
 </ng-container>
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
index 2321da0204..c0741891eb 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -35,7 +35,7 @@
       (prev)="goPrev()"
       (next)="goNext()">
     </ds-browse-by>
-    <ds-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-loading>
+    <ds-themed-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
   </div>
   </section>
   <ng-container *ngVar="(parent$ | async) as parent">
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 9d598a3b69..4f5422e300 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -57,8 +57,8 @@
                 </div>
                 <ds-error *ngIf="itemRD?.hasFailed"
                           message="{{'error.recent-submissions' | translate}}"></ds-error>
-                <ds-loading *ngIf="!itemRD || itemRD.isLoading"
-                            message="{{'loading.recent-submissions' | translate}}"></ds-loading>
+                <ds-themed-loading *ngIf="!itemRD || itemRD.isLoading"
+                            message="{{'loading.recent-submissions' | translate}}"></ds-themed-loading>
                 <div *ngIf="!itemRD?.isLoading && itemRD?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
                         {{'collection.page.browse.recent.empty' | translate}}
                 </div>
@@ -75,7 +75,7 @@
     </div>
         <ds-error *ngIf="collectionRD?.hasFailed"
             message="{{'error.collection' | translate}}"></ds-error>
-        <ds-loading *ngIf="collectionRD?.isLoading"
-            message="{{'loading.collection' | translate}}"></ds-loading>
+        <ds-themed-loading *ngIf="collectionRD?.isLoading"
+            message="{{'loading.collection' | translate}}"></ds-themed-loading>
   </div>
 </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index b67ee9a1bd..847ccefdda 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -25,7 +25,7 @@
         <label class="form-check-label"
                for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
     </div>
-    <ds-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-loading>
+    <ds-themed-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-themed-loading>
     <h4 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h4>
 </div>
 <div class="row">
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index f8c5c92e96..37258cd057 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -6,7 +6,7 @@
         <ds-item-metadata [updateService]="itemTemplateService" [item]="itemRD?.payload"></ds-item-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       </ng-container>
-      <ds-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-loading>
+      <ds-themed-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-themed-loading>
       <ds-alert *ngIf="itemRD?.hasFailed" [type]="AlertTypeEnum.Error" [content]="'collection.edit.template.error' | translate"></ds-alert>
     </div>
   </div>
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index f441dfa36e..5d53633c4e 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,4 +1,4 @@
-<ds-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-loading"></ds-loading>
+<ds-themed-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-themed-loading>
 <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
@@ -12,7 +12,7 @@
            class="btn btn-outline-primary btn-sm" role="button">
            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
         </a>
-        <ds-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-loading"></ds-loading>
+        <ds-themed-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-themed-loading>
       </div>
     </div>
     <div class="text-muted" cdkTreeNodePadding>
@@ -57,7 +57,7 @@
         <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
               aria-hidden="true"></span>
       </button>
-      <ds-loading class="ds-loading"></ds-loading>
+      <ds-themed-loading class="ds-themed-loading"></ds-themed-loading>
     </div>
   </cdk-tree-node>
   <!-- This is the tree node template for leaf nodes (collections and (sub)coms without children) -->
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index cf7282eb4b..95755fdaf1 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -41,5 +41,5 @@
   </div>
 
   <ds-error *ngIf="communityRD?.hasFailed" message="{{'error.community' | translate}}"></ds-error>
-  <ds-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-themed-loading>
 </div>
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
index 9928ebd18a..69f16ee3ac 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
@@ -9,5 +9,5 @@
     </ds-viewable-collection>
   </div>
   <ds-error *ngIf="subCollectionsRD?.hasFailed" message="{{'error.sub-collections' | translate}}"></ds-error>
-  <ds-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-themed-loading>
 </ng-container>
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
index 2d14dce60a..be2788a9f4 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
@@ -9,5 +9,5 @@
     </ds-viewable-collection>
   </div>
   <ds-error *ngIf="subCommunitiesRD?.hasFailed" message="{{'error.sub-communities' | translate}}"></ds-error>
-  <ds-loading *ngIf="subCommunitiesRD?.isLoading" message="{{'loading.sub-communities' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="subCommunitiesRD?.isLoading" message="{{'loading.sub-communities' | translate}}"></ds-themed-loading>
 </ng-container>
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index dbea87a175..788db6ea4f 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -10,4 +10,4 @@
   </ds-viewable-collection>
 </div>
 <ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communites' | translate}}"></ds-error>
-<ds-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-loading></ng-container>
+<ds-themed-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-themed-loading></ng-container>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 315498378a..0d6a609e74 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -44,7 +44,7 @@
        class="alert alert-info w-100 d-inline-block mt-4" role="alert">
     {{'item.edit.bitstreams.empty' | translate}}
   </div>
-  <ds-loading *ngIf="!bundles" message="{{'loading.bitstreams' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="!bundles" message="{{'loading.bitstreams' | translate}}"></ds-themed-loading>
 
   <div class="button-row bottom">
     <div class="mt-4 float-right">
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
index f7904f6cc8..f54aa73597 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
@@ -29,5 +29,5 @@
       </ng-container>
     </div>
   </ng-container>
-  <ds-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-loading>
+  <ds-themed-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-themed-loading>
 </ds-pagination>
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 86ab93662e..7cdc903f24 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
@@ -31,5 +31,5 @@
           <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
         </ng-container>
     </ng-container>
-    <ds-loading *ngIf="loading$ | async"></ds-loading>
+    <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
 </ng-container>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 4a53445a6d..f19ab21871 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -32,7 +32,7 @@
             ></ds-edit-relationship-list>
           </div>
         </ng-container>
-        <ds-loading *ngIf="!relationshipTypes"></ds-loading>
+        <ds-themed-loading *ngIf="!relationshipTypes"></ds-themed-loading>
       </ng-container>
       <div class="button-row bottom">
         <div class="float-right">
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 d2655c4ad0..ea97a3957c 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -37,5 +37,5 @@
     </div>
   </div>
   <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-  <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-themed-loading>
 </div>
diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html
index b79b91629f..4259af5250 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.html
+++ b/src/app/item-page/media-viewer/media-viewer.component.html
@@ -1,9 +1,9 @@
 <ng-container *ngVar="mediaList$ | async as mediaList">
-  <ds-loading
+  <ds-themed-loading
     *ngIf="isLoading"
     message="{{ 'loading.default' | translate }}"
     [showMessage]="false"
-  ></ds-loading>
+  ></ds-themed-loading>
   <div class="media-viewer" *ngIf="!isLoading">
     <ng-container *ngIf="mediaList.length > 0">
       <ng-container *ngIf="videoOptions">
diff --git a/src/app/item-page/media-viewer/media-viewer.component.spec.ts b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
index cfd72bf416..39a35ebe61 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.spec.ts
@@ -110,7 +110,7 @@ describe('MediaViewerComponent', () => {
     });
 
     it('should display a loading component', () => {
-      const loading = fixture.debugElement.query(By.css('ds-loading'));
+      const loading = fixture.debugElement.query(By.css('ds-themed-loading'));
       expect(loading.nativeElement).toBeDefined();
     });
   });
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 3d093f83c9..5fa5e5096f 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -6,7 +6,7 @@
         <span>({{(file?.sizeBytes) | dsFileSize }})</span>
         <span *ngIf="!last" innerHTML="{{separator}}"></span>
       </ds-file-download-link>
-      <ds-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
+      <ds-themed-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-themed-loading>
       <div *ngIf="!isLastPage" class="mt-1" id="view-more">
         <a class="bitstream-view-more btn btn-outline-secondary btn-sm" [routerLink]="" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</a>
       </div>
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
index fdd6d14e7d..2d185aef9c 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.spec.ts
@@ -86,7 +86,7 @@ describe('FileSectionComponent', () => {
     });
 
     it('should display a loading component', () => {
-      const loading = fixture.debugElement.query(By.css('ds-loading'));
+      const loading = fixture.debugElement.query(By.css('ds-themed-loading'));
       expect(loading.nativeElement).toBeDefined();
     });
   });
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index 74b61fd976..d91f4b501d 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -9,5 +9,5 @@
     </div>
   </div>
   <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-  <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-themed-loading>
 </div>
diff --git a/src/app/item-page/simple/item-page.component.spec.ts b/src/app/item-page/simple/item-page.component.spec.ts
index ff5a1e38d5..0b0f1e1724 100644
--- a/src/app/item-page/simple/item-page.component.spec.ts
+++ b/src/app/item-page/simple/item-page.component.spec.ts
@@ -85,7 +85,7 @@ describe('ItemPageComponent', () => {
     });
 
     it('should display a loading component', () => {
-      const loading = fixture.debugElement.query(By.css('ds-loading'));
+      const loading = fixture.debugElement.query(By.css('ds-themed-loading'));
       expect(loading.nativeElement).toBeDefined();
     });
   });
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index d1281f450a..e1559cb129 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -4,7 +4,7 @@
       <ds-metadata-representation-loader *ngFor="let rep of representations"
                                          [mdRepresentation]="rep">
       </ds-metadata-representation-loader>
-      <ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
+      <ds-themed-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-themed-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
         <div *ngIf="(objects.length * incrementBy) < total" class="float-left">
           <a [routerLink]="" (click)="increase()">{{'item.page.related-items.view-more' |
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 11cedc4040..bfa4ce105b 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -4,7 +4,7 @@
       <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
                                            [object]="item" [viewMode]="viewMode">
       </ds-listable-object-component-loader>
-      <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
+      <ds-themed-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-themed-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
         <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
           <a [routerLink]="" (click)="increase()">{{'item.page.related-items.view-more' |
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index ddf6a0aadc..995e56e081 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -38,7 +38,7 @@
       <button *ngIf="!showOutputLogs && process?._links?.output?.href != undefined" id="showOutputButton" class="btn btn-primary" (click)="showProcessOutputLogs()">
         {{ 'process.detail.logs.button' | translate }}
       </button>
-      <ds-loading *ngIf="retrievingOutputLogs$ | async" class="ds-loading" message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
+      <ds-themed-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading" message="{{ 'process.detail.logs.loading' | translate }}"></ds-themed-loading>
       <pre class="font-weight-bold text-secondary bg-light p-3"
            *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
       <p id="no-output-logs-message" *ngIf="(!(retrievingOutputLogs$ | async) && showOutputLogs)
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
index b00bc079dd..c9e909ccf1 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
@@ -5,5 +5,5 @@
 
     <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-email-request-copy>
   </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  <ds-themed-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-themed-loading>
 </div>
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
index 37b275d8f8..4837e0dcda 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
@@ -26,5 +26,5 @@
       </p>
     </div>
   </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  <ds-themed-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-themed-loading>
 </div>
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
index d2c2cfc3c8..5cb4dbac36 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
@@ -13,5 +13,5 @@
       </form>
     </ds-email-request-copy>
   </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  <ds-themed-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-themed-loading>
 </div>
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 898074352c..d0465af69f 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -13,7 +13,7 @@
       <ds-themed-breadcrumbs></ds-themed-breadcrumbs>
 
       <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="shouldShowRouteLoader">
-        <ds-loading [showMessage]="false"></ds-loading>
+        <ds-themed-loading [showMessage]="false"></ds-themed-loading>
       </div>
       <div [class.d-none]="shouldShowRouteLoader">
         <router-outlet></router-outlet>
@@ -25,6 +25,6 @@
 </div>
 <ng-template #fullScreenLoader>
   <div class="ds-full-screen-loader">
-    <ds-loading [showMessage]="false"></ds-loading>
+    <ds-themed-loading [showMessage]="false"></ds-themed-loading>
   </div>
 </ng-template>
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index ac55a211e9..736d39d318 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,4 +1,4 @@
-<ds-loading *ngIf="(loading$ | async)"></ds-loading>
+<ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
 <div *ngIf="!(loading$ | async)">
   <span class="dropdown-item-text">{{(user$ | async)?.name}} ({{(user$ | async)?.email}})</span>
   <a class="dropdown-item" [routerLink]="[profileRoute]" routerLinkActive="active">{{'nav.profile' | translate}}</a>
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 6d1422293d..645a987abe 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -34,7 +34,7 @@
       </div>
     </div>
   </div>
-  <ds-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-themed-loading>
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
     {{'browse.empty' | translate}}
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index 896537b63a..e25058399c 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -114,7 +114,7 @@ describe('BrowseByComponent', () => {
   it('should display a loading message when objects is empty', () => {
     (comp as any).objects = undefined;
     fixture.detectChanges();
-    expect(fixture.debugElement.query(By.css('ds-loading'))).toBeDefined();
+    expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeDefined();
   });
 
   it('should display results when objects is not empty', () => {
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 87337d9084..db6c1fb41d 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -35,8 +35,8 @@
     </button>
   </ng-container>
   <button class="dropdown-item disabled" *ngIf="(isLoading | async)">
-    <ds-loading message="{{'loading.default' | translate}}">
-    </ds-loading>
+    <ds-themed-loading message="{{'loading.default' | translate}}">
+    </ds-themed-loading>
   </button>
 
 </div>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index b0a319b4ff..440785b89b 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -13,7 +13,7 @@
 
     <div class="d-flex flex-md-row justify-content-between flex-column">
       <div class="w-100 d-flex align-items-center">
-        <ds-loading *ngIf="!(groupRD$ | async)"></ds-loading>
+        <ds-themed-loading *ngIf="!(groupRD$ | async)"></ds-themed-loading>
         <div *ngIf="hasNoGroup$ | async">
           {{'comcol-role.edit.no-group' | translate}}
         </div>
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 4b46d3bc3f..d4283246d8 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
@@ -31,7 +31,7 @@
     </ng-container>
     <button *ngIf="loading"
             class="list-group-item list-group-item-action border-0 list-entry">
-      <ds-loading [showMessage]="false"></ds-loading>
+      <ds-themed-loading [showMessage]="false"></ds-themed-loading>
     </button>
   </div>
 </div>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index 59c242ef97..a4d539625f 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -21,8 +21,8 @@
       </ul>
     </button>
     <button class="dropdown-item disabled" *ngIf="(isLoadingList | async)" >
-      <ds-loading message="{{'loading.default' | translate}}">
-      </ds-loading>
+      <ds-themed-loading message="{{'loading.default' | translate}}">
+      </ds-themed-loading>
     </button>
 
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 07ea131a00..62d34a8625 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="d-flex">
     <span class="mr-auto text-contents">
         <ng-container *ngIf="!(metadataRepresentation$ | async)">
-            <ds-loading [showMessage]="false"></ds-loading>
+            <ds-themed-loading [showMessage]="false"></ds-themed-loading>
         </ng-container>
         <ng-container *ngIf="(metadataRepresentation$ | async)">
             <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation$ | async"></ds-metadata-representation-loader>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index 15087d2553..ff91b18e1c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -1,7 +1,7 @@
 <div class="d-flex">
     <span class="mr-auto text-contents">
         <ng-container *ngIf="!(relatedItem$ | async)">
-            <ds-loading [showMessage]="false"></ds-loading>
+            <ds-themed-loading [showMessage]="false"></ds-themed-loading>
         </ng-container>
         <ng-container *ngIf="(relatedItem$ | async)">
             <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 84bc0f4ffe..05f443aad5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -57,7 +57,7 @@
   </div>
 
   <div class="d-flex">
-    <ds-loading *ngIf="!chips" [showMessage]="false"></ds-loading>
+    <ds-themed-loading *ngIf="!chips" [showMessage]="false"></ds-themed-loading>
     <div *ngIf="chips && !chips.hasItems()">
       <input type="text"
              class="border-0 form-control-plaintext tag-input mt-1 mb-1 pl-2 text-muted"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index f95cd98c65..fa1d103b67 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -6,7 +6,7 @@
     </button>
 </div>
 <div class="modal-body">
-    <ds-loading *ngIf="!item || !collection"></ds-loading>
+    <ds-themed-loading *ngIf="!item || !collection"></ds-themed-loading>
     <ng-container *ngIf="item && collection">
         <ul ngbNav #nav="ngbNav" class="nav-tabs">
             <li ngbNavItem>
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 61be99cbf2..dac0e03444 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,8 +21,8 @@
                                 [importConfig]="importConfig"
                                 (importObject)="import($event)">
         </ds-viewable-collection>
-        <ds-loading *ngIf="!entriesRD || entriesRD?.isLoading"
-                    message="{{'loading.search-results' | translate}}"></ds-loading>
+        <ds-themed-loading *ngIf="!entriesRD || entriesRD?.isLoading"
+                    message="{{'loading.search-results' | translate}}"></ds-themed-loading>
         <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode != 400)"
                     message="{{'error.search-results' | translate}}"></ds-error>
         <div *ngIf="entriesRD?.payload?.page?.length == 0 || entriesRD?.statusCode == 400" id="empty-external-entry-list">
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 00b0527af6..705e679dfd 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
@@ -145,8 +145,8 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       expect(viewableCollection).toBeNull();
     });
 
-    it('should display a ds-loading component', () => {
-      const loading = fixture.debugElement.query(By.css('ds-loading'));
+    it('should display a ds-themed-loading component', () => {
+      const loading = fixture.debugElement.query(By.css('ds-themed-loading'));
       expect(loading).not.toBeNull();
     });
   });
diff --git a/src/app/shared/loading/themed-loading.component.ts b/src/app/shared/loading/themed-loading.component.ts
new file mode 100644
index 0000000000..2b6aa6212c
--- /dev/null
+++ b/src/app/shared/loading/themed-loading.component.ts
@@ -0,0 +1,31 @@
+import { Component, Input } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { LoadingComponent } from './loading.component';
+
+/**
+ * Themed wrapper for LoadingComponent
+ */
+@Component({
+  selector: 'ds-themed-loading',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedLoadingComponent extends ThemedComponent<LoadingComponent> {
+
+  @Input() message: string;
+  @Input() showMessage = true;
+
+  protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = ['message', 'showMessage'];
+
+  protected getComponentName(): string {
+    return 'LoadingComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/loading/loading.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./loading.component');
+  }
+}
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 8fb5a33954..98bfcb4f43 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,4 +1,4 @@
-<ds-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-loading>
+<ds-themed-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-themed-loading>
 <div *ngIf="!(loading | async) && !(isAuthenticated | async)" class="px-4 py-3 login-container">
   <ng-container *ngFor="let authMethod of (authMethods | async); let i = index">
     <div *ngIf="i === 1" class="text-center mt-2">
diff --git a/src/app/shared/object-detail/object-detail.component.html b/src/app/shared/object-detail/object-detail.component.html
index 7fef7d9689..3d086fc85e 100644
--- a/src/app/shared/object-detail/object-detail.component.html
+++ b/src/app/shared/object-detail/object-detail.component.html
@@ -18,5 +18,5 @@
       </div>
     </div>
   <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
 </ds-pagination>
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 0afd623d86..84745f9831 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -19,6 +19,6 @@
       </div>
     </div>
   <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
 </ds-pagination>
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
index 74fc5fd06d..f26de733b2 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
@@ -6,6 +6,6 @@
 
   <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
 </ng-container>
-<ds-loading
+<ds-themed-loading
   *ngIf="!(item$ | async)"
-  [showMessage]="false"></ds-loading>
+  [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
index 41d95b87af..2f0b04ef12 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
@@ -6,6 +6,6 @@
 
   <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
 </ng-container>
-<ds-loading
+<ds-themed-loading
   *ngIf="!(item$ | async)"
-  [showMessage]="false"></ds-loading>
+  [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index 27ebcd9643..8ed41c5226 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -28,7 +28,7 @@
     {{'collection.select.empty' | translate}}
   </div>
   <ds-error *ngIf="collectionsRD?.hasFailed" message="{{'error.collections' | translate}}"></ds-error>
-  <ds-loading *ngIf="!collectionsRD || collectionsRD?.isLoading" message="{{'loading.collections' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="!collectionsRD || collectionsRD?.isLoading" message="{{'loading.collections' | translate}}"></ds-themed-loading>
   <div *ngVar="(selectedIds$ | async) as selectedIds">
     <button class="btn collection-confirm float-right"
             [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index e53f2af99b..b7fce78289 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -36,7 +36,7 @@
     {{'item.select.empty' | translate}}
   </div>
   <ds-error *ngIf="itemsRD?.hasFailed" message="{{'error.items' | translate}}"></ds-error>
-  <ds-loading *ngIf="!itemsRD || itemsRD?.isLoading" message="{{'loading.items' | translate}}"></ds-loading>
+  <ds-themed-loading *ngIf="!itemsRD || itemsRD?.isLoading" message="{{'loading.items' | translate}}"></ds-themed-loading>
   <div *ngVar="(selectedIds$ | async) as selectedIds">
     <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
     <button class="btn item-confirm float-right"
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index c383a2fa1a..153f34b132 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -15,7 +15,7 @@
             >
     </ds-viewable-collection>
 </div>
-<ds-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-loading>
+<ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-themed-loading>
 <ds-error
         *ngIf="showError()"
         message="{{errorMessageLabel() | translate}}"></ds-error>
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 715ee66a99..f9391afdb4 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -177,6 +177,7 @@ import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
 import { DsSelectComponent } from './ds-select/ds-select.component';
 import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
+import { ThemedLoadingComponent } from './loading/themed-loading.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -234,6 +235,7 @@ const COMPONENTS = [
   FileSectionComponent,
   LangSwitchComponent,
   LoadingComponent,
+  ThemedLoadingComponent,
   LogInComponent,
   LogOutComponent,
   NumberPickerComponent,
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
index 3f57e6a4c3..39c62d6e53 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="treeview-container">
-      <ds-loading *ngIf="loading | async" [showMessage]="false"></ds-loading>
+      <ds-themed-loading *ngIf="loading | async" [showMessage]="false"></ds-themed-loading>
       <h4 *ngIf="!(loading | async) && dataSource.data.length === 0" class="text-center text-muted mt-4" >
         <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
       </h4>
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
index 5cf1e9c8b5..c6938c7582 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.html
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -11,7 +11,7 @@
   <ng-container *ngVar="reports$ | async as reports">
 
     <ng-container *ngIf="!reports">
-      <ds-loading></ds-loading>
+      <ds-themed-loading></ds-themed-loading>
     </ng-container>
 
     <ng-container *ngIf="reports">
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index c86d4e0195..a80fe35f4e 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -22,7 +22,7 @@
     </div>
 
     <div class="submission-form-content">
-        <ds-loading *ngIf="(isLoading() | async)" message="Loading..."></ds-loading>
+        <ds-themed-loading *ngIf="(isLoading() | async)" message="Loading..."></ds-themed-loading>
         <ng-container *ngFor="let object of (submissionSections | async)">
             <ds-submission-section-container [collectionId]="collectionId"
                                              [submissionId]="submissionId"
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
index 6fb6ab3382..29c99732c3 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <ds-loading *ngIf="isLoading()"></ds-loading>
+    <ds-themed-loading *ngIf="isLoading()"></ds-themed-loading>
     <ds-collection-dropdown [ngClass]="{'d-none': isLoading()}"
                             (selectionChange)="selectObject($event)"
                             (searchComplete)="searchComplete()"
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index 8c13a697a5..19499b4be8 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -22,8 +22,8 @@
                                 [importConfig]="importConfig"
                                 (importObject)="import($event)">
         </ds-viewable-collection>
-        <ds-loading *ngIf="(isLoading$ | async)"
-                    message="{{'loading.search-results' | translate}}"></ds-loading>
+        <ds-themed-loading *ngIf="(isLoading$ | async)"
+                    message="{{'loading.search-results' | translate}}"></ds-themed-loading>
         <div *ngIf="!(isLoading$ | async) && entriesRD?.payload?.page?.length === 0" id="empty-external-entry-list">
           <ds-alert [type]="'alert-info'">{{ 'search.results.empty' | translate }}</ds-alert>
         </div>
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 20743540a8..6b9d542abc 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -4,7 +4,7 @@
 
     <ng-container class="selection">
       <span *ngIf="!submissionCcLicenses">
-        <ds-loading></ds-loading>
+        <ds-themed-loading></ds-themed-loading>
       </span>
       <span *ngIf="getSelectedCcLicense()">
         {{ getSelectedCcLicense().name }}
@@ -121,7 +121,7 @@
 <ng-container *ngIf="getCcLicenseLink$()">
   <ng-container *ngVar="getCcLicenseLink$() | async as licenseLink">
     <div *ngIf="!licenseLink">
-      <ds-loading></ds-loading>
+      <ds-themed-loading></ds-themed-loading>
     </div>
     <div *ngIf="licenseLink"
          class="mt-2 p-4 bg-light text-dark">
diff --git a/src/app/submission/sections/form/section-form.component.html b/src/app/submission/sections/form/section-form.component.html
index cd7b45bb00..675b550b57 100644
--- a/src/app/submission/sections/form/section-form.component.html
+++ b/src/app/submission/sections/form/section-form.component.html
@@ -1,4 +1,4 @@
-<ds-loading *ngIf="isLoading" message="Loading..."></ds-loading>
+<ds-themed-loading *ngIf="isLoading" message="Loading..."></ds-themed-loading>
 <ds-form *ngIf="!isLoading && formModel" #formRef="formComponent"
          [formId]="formId"
          [formModel]="formModel"
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index bf70928392..aedfd95c5a 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,7 +1,7 @@
 <div class="thumbnail" [class.limit-width]="limitWidth">
-  <ds-loading *ngIf="isLoading; else showThumbnail" class="thumbnail-content" [showMessage]="false">
+  <ds-themed-loading *ngIf="isLoading; else showThumbnail" class="thumbnail-content" [showMessage]="false">
     text-content
-  </ds-loading>
+  </ds-themed-loading>
   <ng-template #showThumbnail>
     <img *ngIf="src !== null" class="thumbnail-content img-fluid"
          [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()">
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index eea585f9f8..a89a8b0a72 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -115,7 +115,7 @@ describe('ThumbnailComponent', () => {
         comp.thumbnail = thumbnail;
         comp.ngOnChanges();
         fixture.detectChanges();
-        expect(de.query(By.css('ds-loading'))).toBeTruthy();
+        expect(de.query(By.css('ds-themed-loading'))).toBeTruthy();
       });
     });
 

From d6be2e86517afd0e35b93a5c37bfa893f523a94f Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Mon, 25 Apr 2022 17:40:22 +0200
Subject: [PATCH 009/103] 89984: Add themable menu section

---
 .../admin-sidebar/admin-sidebar.component.ts     |  6 ++++--
 src/app/navbar/navbar.component.ts               |  6 ++++--
 src/app/shared/menu/menu-section.decorator.ts    | 16 ++++++++++++----
 src/app/shared/menu/menu.component.ts            |  7 +++++--
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index c81b2e6e93..55d5fd4374 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -22,6 +22,7 @@ import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Router, ActivatedRoute } from '@angular/router';
+import { ThemeService } from '../../shared/theme-support/theme.service';
 
 /**
  * Component representing the admin sidebar
@@ -70,9 +71,10 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
     private modalService: NgbModal,
     public authorizationService: AuthorizationDataService,
     private scriptDataService: ScriptDataService,
-    public route: ActivatedRoute
+    public route: ActivatedRoute,
+    protected themeService: ThemeService
   ) {
-    super(menuService, injector, authorizationService, route);
+    super(menuService, injector, authorizationService, route, themeService);
     this.inFocus$ = new BehaviorSubject(false);
   }
 
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 836f94781a..1d070b17c2 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -13,6 +13,7 @@ import { BrowseDefinition } from '../core/shared/browse-definition.model';
 import { RemoteData } from '../core/data/remote-data';
 import { ActivatedRoute } from '@angular/router';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { ThemeService } from '../shared/theme-support/theme.service';
 
 /**
  * Component representing the public navbar
@@ -35,9 +36,10 @@ export class NavbarComponent extends MenuComponent {
               public windowService: HostWindowService,
               public browseService: BrowseService,
               public authorizationService: AuthorizationDataService,
-              public route: ActivatedRoute
+              public route: ActivatedRoute,
+              protected themeService: ThemeService
   ) {
-    super(menuService, injector, authorizationService, route);
+    super(menuService, injector, authorizationService, route, themeService);
   }
 
   ngOnInit(): void {
diff --git a/src/app/shared/menu/menu-section.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index c27e870e13..94a0469a7e 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -1,4 +1,6 @@
+import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { MenuID } from './initial-menus-state';
+import { hasNoValue } from '../empty.util';
 
 const menuComponentMap = new Map();
 
@@ -8,7 +10,7 @@ const menuComponentMap = new Map();
  * @param {boolean} expandable True when the section should be expandable, false when if should not
  * @returns {(menuSectionWrapperComponent: GenericConstructor) => void}
  */
-export function rendersSectionForMenu(menuID: MenuID, expandable: boolean) {
+export function rendersSectionForMenu(menuID: MenuID, expandable: boolean, theme = DEFAULT_THEME) {
   return function decorator(menuSectionWrapperComponent: any) {
     if (!menuSectionWrapperComponent) {
       return;
@@ -16,7 +18,10 @@ export function rendersSectionForMenu(menuID: MenuID, expandable: boolean) {
     if (!menuComponentMap.get(menuID)) {
       menuComponentMap.set(menuID, new Map());
     }
-    menuComponentMap.get(menuID).set(expandable, menuSectionWrapperComponent);
+    if (!menuComponentMap.get(menuID).get(expandable)) {
+        menuComponentMap.get(menuID).set(expandable, new Map());
+    }
+    menuComponentMap.get(menuID).get(expandable).set(theme, menuSectionWrapperComponent);
   };
 }
 
@@ -26,6 +31,9 @@ export function rendersSectionForMenu(menuID: MenuID, expandable: boolean) {
  * @param {boolean} expandable True when the section should be expandable, false when if should not
  * @returns {GenericConstructor} The constructor of the matching Component
  */
-export function getComponentForMenu(menuID: MenuID, expandable: boolean) {
-  return menuComponentMap.get(menuID).get(expandable);
+export function getComponentForMenu(menuID: MenuID, expandable: boolean, theme: string) {
+  const comp = menuComponentMap.get(menuID).get(expandable).get(theme);
+  if (hasNoValue(comp)) {
+    return menuComponentMap.get(menuID).get(expandable).get(DEFAULT_THEME);
+  }
 }
diff --git a/src/app/shared/menu/menu.component.ts b/src/app/shared/menu/menu.component.ts
index e5e899805b..e520ddc93c 100644
--- a/src/app/shared/menu/menu.component.ts
+++ b/src/app/shared/menu/menu.component.ts
@@ -12,6 +12,7 @@ import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/
 import { ActivatedRoute } from '@angular/router';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ThemeService } from '../theme-support/theme.service';
 
 /**
  * A basic implementation of a MenuComponent
@@ -72,7 +73,9 @@ export class MenuComponent implements OnInit, OnDestroy {
 
   private activatedRouteLastChild: ActivatedRoute;
 
-  constructor(protected menuService: MenuService, protected injector: Injector, public authorizationService: AuthorizationDataService, public route: ActivatedRoute) {
+  constructor(protected menuService: MenuService, protected injector: Injector, public authorizationService: AuthorizationDataService,
+              public route: ActivatedRoute, protected themeService: ThemeService
+  ) {
   }
 
   /**
@@ -215,7 +218,7 @@ export class MenuComponent implements OnInit, OnDestroy {
   private getSectionComponent(section: MenuSection): Observable<GenericConstructor<MenuSectionComponent>> {
     return this.menuService.hasSubSections(this.menuID, section.id).pipe(
       map((expandable: boolean) => {
-        return getComponentForMenu(this.menuID, expandable);
+        return getComponentForMenu(this.menuID, expandable, this.themeService.getThemeName());
       }
       ),
     );

From c63a25b18e86c539aec7268247ecfc6f15c3e998 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 26 Apr 2022 14:42:53 +0200
Subject: [PATCH 010/103] 89984: Fix getComponentForMenu themed method

---
 src/app/shared/menu/menu-section.decorator.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/menu/menu-section.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index 94a0469a7e..9374ab3c0d 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { MenuID } from './initial-menus-state';
-import { hasNoValue } from '../empty.util';
+import { hasNoValue, hasValue } from '../empty.util';
 
 const menuComponentMap = new Map();
 
@@ -33,7 +33,9 @@ export function rendersSectionForMenu(menuID: MenuID, expandable: boolean, theme
  */
 export function getComponentForMenu(menuID: MenuID, expandable: boolean, theme: string) {
   const comp = menuComponentMap.get(menuID).get(expandable).get(theme);
-  if (hasNoValue(comp)) {
+  if (hasValue(comp)) {
+    return comp;
+  } else {
     return menuComponentMap.get(menuID).get(expandable).get(DEFAULT_THEME);
   }
 }

From d8b6e65f6f56768a221544f2362d13636dc28689 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 26 Apr 2022 16:40:38 +0200
Subject: [PATCH 011/103] Fix tests

---
 .../admin/admin-sidebar/admin-sidebar.component.spec.ts   | 3 +++
 .../import-external-page.component.spec.ts                | 5 +++++
 .../item-relationships.component.spec.ts                  | 3 +++
 src/app/navbar/navbar.component.spec.ts                   | 3 +++
 src/app/shared/browse-by/browse-by.component.spec.ts      | 8 +++-----
 src/app/shared/menu/menu.component.spec.ts                | 3 +++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
index 65026c1504..9a685d9cf6 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -20,6 +20,8 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import createSpy = jasmine.createSpy;
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { Item } from '../../core/shared/item.model';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 
 describe('AdminSidebarComponent', () => {
   let comp: AdminSidebarComponent;
@@ -60,6 +62,7 @@ describe('AdminSidebarComponent', () => {
       declarations: [AdminSidebarComponent],
       providers: [
         Injector,
+        { provide: ThemeService, useValue: getMockThemeService() },
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: AuthService, useClass: AuthServiceStub },
diff --git a/src/app/import-external-page/import-external-page.component.spec.ts b/src/app/import-external-page/import-external-page.component.spec.ts
index a19c22d71e..00bdd4be28 100644
--- a/src/app/import-external-page/import-external-page.component.spec.ts
+++ b/src/app/import-external-page/import-external-page.component.spec.ts
@@ -1,6 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ImportExternalPageComponent } from './import-external-page.component';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { getMockThemeService } from '../shared/mocks/theme-service.mock';
 
 describe('ImportExternalPageComponent', () => {
   let component: ImportExternalPageComponent;
@@ -9,6 +11,9 @@ describe('ImportExternalPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ ImportExternalPageComponent ],
+      providers:[
+        { provide: ThemeService, useValue: getMockThemeService() },
+      ],
       schemas: [NO_ERRORS_SCHEMA]
     })
     .compileComponents();
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
index 59cf9762a4..50fb57ab6b 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts
@@ -27,6 +27,8 @@ import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } f
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RelationshipTypeService } from '../../../core/data/relationship-type.service';
 import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
+import { ThemeService } from '../../../shared/theme-support/theme.service';
+import { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -211,6 +213,7 @@ describe('ItemRelationshipsComponent', () => {
       imports: [SharedModule, TranslateModule.forRoot()],
       declarations: [ItemRelationshipsComponent],
       providers: [
+        { provide: ThemeService, useValue: getMockThemeService() },
         { provide: ItemDataService, useValue: itemService },
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
         { provide: Router, useValue: router },
diff --git a/src/app/navbar/navbar.component.spec.ts b/src/app/navbar/navbar.component.spec.ts
index 659107080c..9a9d2210be 100644
--- a/src/app/navbar/navbar.component.spec.ts
+++ b/src/app/navbar/navbar.component.spec.ts
@@ -20,6 +20,8 @@ import { BrowseDefinition } from '../core/shared/browse-definition.model';
 import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-decorator';
 import { Item } from '../core/shared/item.model';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { getMockThemeService } from '../shared/mocks/theme-service.mock';
 
 let comp: NavbarComponent;
 let fixture: ComponentFixture<NavbarComponent>;
@@ -91,6 +93,7 @@ describe('NavbarComponent', () => {
       declarations: [NavbarComponent],
       providers: [
         Injector,
+        { provide: ThemeService, useValue: getMockThemeService() },
         { provide: MenuService, useValue: menuService },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
         { provide: ActivatedRoute, useValue: routeStub },
diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index e25058399c..b9617aa28e 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -31,6 +31,7 @@ import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { ITEM } from '../../core/shared/item.resource-type';
 import { ThemeService } from '../theme-support/theme.service';
 import SpyObj = jasmine.SpyObj;
+import { getMockThemeService } from '../mocks/theme-service.mock';
 
 @listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
 @Component({
@@ -73,13 +74,10 @@ describe('BrowseByComponent', () => {
   });
   const paginationService = new PaginationServiceStub(paginationConfig);
 
-  let themeService: SpyObj<ThemeService>;
+  let themeService;
 
   beforeEach(waitForAsync(() => {
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: 'dspace',
-      getThemeName$: observableOf('dspace'),
-    });
+    themeService = getMockThemeService('dspace');
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
diff --git a/src/app/shared/menu/menu.component.spec.ts b/src/app/shared/menu/menu.component.spec.ts
index b84fad2b33..5e649a479d 100644
--- a/src/app/shared/menu/menu.component.spec.ts
+++ b/src/app/shared/menu/menu.component.spec.ts
@@ -13,6 +13,8 @@ import { MenuID } from './initial-menus-state';
 import { Item } from '../../core/shared/item.model';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { ThemeService } from '../theme-support/theme.service';
+import { getMockThemeService } from '../mocks/theme-service.mock';
 
 describe('MenuComponent', () => {
   let comp: MenuComponent;
@@ -57,6 +59,7 @@ describe('MenuComponent', () => {
       declarations: [MenuComponent],
       providers: [
         Injector,
+        { provide: ThemeService, useValue: getMockThemeService() },
         { provide: MenuService, useClass: MenuServiceStub },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ActivatedRoute, useValue: routeStub },

From aac41a76cf488b3a04ed8c52bbd9d73f3363ba4d Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 26 Apr 2022 17:34:05 +0200
Subject: [PATCH 012/103] Potential test fix

---
 src/app/shared/browse-by/browse-by.component.spec.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/shared/browse-by/browse-by.component.spec.ts b/src/app/shared/browse-by/browse-by.component.spec.ts
index b9617aa28e..e961fd40a4 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -102,12 +102,9 @@ describe('BrowseByComponent', () => {
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
-  }));
-
-  beforeEach(() => {
     fixture = TestBed.createComponent(BrowseByComponent);
     comp = fixture.componentInstance;
-  });
+  }));
 
   it('should display a loading message when objects is empty', () => {
     (comp as any).objects = undefined;

From f2e4a005a235f1fe895e2c29f39d2e8138e49826 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 10 May 2022 17:31:43 +0200
Subject: [PATCH 013/103] 89676: themed custom search-results

---
 .../search-results/search-results.component.ts   | 16 ++++++++++++++++
 src/themes/custom/theme.module.ts                |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/custom/app/shared/search/search-results/search-results.component.ts

diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
new file mode 100644
index 0000000000..bdfeea15a5
--- /dev/null
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -0,0 +1,16 @@
+import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
+import { Component } from '@angular/core';
+import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade';
+
+@Component({
+  selector: 'ds-search-results',
+  // templateUrl: './search-results.component.html',
+  templateUrl: '../../../../../../app/shared/search/search-results/search-results.component.html',
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+export class SearchResultsComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index e2e97b9087..38f9db649e 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -84,6 +84,7 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -126,7 +127,8 @@ const DECLARATIONS = [
   NavbarComponent,
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
-  FeedbackComponent
+  FeedbackComponent,
+  SearchResultsComponent,
 ];
 
 @NgModule({

From 5c9510993ca7e3db6c34b6b811d5296f527ef3da Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 10 May 2022 20:59:04 +0200
Subject: [PATCH 014/103] 91202: Themed ExpandableNavbarSectionComponent

---
 .../expandable-navbar-section.component.html  |  0
 .../expandable-navbar-section.component.scss  |  0
 .../expandable-navbar-section.component.ts    | 23 +++++++++++++++++++
 src/themes/custom/theme.module.ts             |  6 ++++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
 create mode 100644 src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
 create mode 100644 src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts

diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
new file mode 100644
index 0000000000..283b9ca6f6
--- /dev/null
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import {
+  ExpandableNavbarSectionComponent as BaseComponent
+} from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
+import { slide } from '../../../../../app/shared/animations/slide';
+import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
+import { MenuID } from '../../../../../app/shared/menu/initial-menus-state';
+
+/**
+ * Represents an expandable section in the navbar
+ */
+@Component({
+  /* tslint:disable:component-selector */
+  selector: 'li[ds-expandable-navbar-section]',
+  // templateUrl: './expandable-navbar-section.component.html',
+  templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
+  // styleUrls: ['./expandable-navbar-section.component.scss'],
+  styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
+  animations: [slide]
+})
+@rendersSectionForMenu(MenuID.PUBLIC, true)
+export class ExpandableNavbarSectionComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index e2e97b9087..7206e6e714 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -84,6 +84,9 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import {
+  ExpandableNavbarSectionComponent
+} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -126,7 +129,8 @@ const DECLARATIONS = [
   NavbarComponent,
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
-  FeedbackComponent
+  FeedbackComponent,
+  ExpandableNavbarSectionComponent,
 ];
 
 @NgModule({

From 55005d3fa4419c3651fda4bfdf0e06e44907b5b1 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 11 May 2022 09:45:17 +0200
Subject: [PATCH 015/103] 86526: Themed AuthNavMenuComponent

---
 .../auth-nav-menu.component.html              |  0
 .../auth-nav-menu.component.scss              |  0
 .../auth-nav-menu/auth-nav-menu.component.ts  | 19 +++++++++++++++++++
 src/themes/custom/theme.module.ts             |  4 +++-
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.html
 create mode 100644 src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.scss
 create mode 100644 src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts

diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.scss b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
new file mode 100644
index 0000000000..af54aacd44
--- /dev/null
+++ b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+import {
+  AuthNavMenuComponent as BaseComponent,
+} from '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component';
+import { fadeInOut, fadeOut } from '../../../../../app/shared/animations/fade';
+
+/**
+ * Component representing the {@link AuthNavMenuComponent} of a page
+ */
+@Component({
+  selector: 'ds-auth-nav-menu',
+  // templateUrl: 'auth-nav-menu.component.html',
+  templateUrl: '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.html',
+  // styleUrls: ['auth-nav-menu.component.scss'],
+  styleUrls: ['../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.scss'],
+  animations: [fadeInOut, fadeOut]
+})
+export class AuthNavMenuComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index dac941546b..db42294675 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 { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component';
 
 const DECLARATIONS = [
   HomePageComponent,
@@ -119,7 +120,8 @@ const DECLARATIONS = [
   HeaderComponent,
   NavbarComponent,
   HeaderNavbarWrapperComponent,
-  BreadcrumbsComponent
+  BreadcrumbsComponent,
+  AuthNavMenuComponent,
 ];
 
 @NgModule({

From cbf0db5342156f0053b719cc0a4d4c7bd39d96bf Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 11 May 2022 11:30:25 +0200
Subject: [PATCH 016/103] Add themed loading component in custom theme and fix
 issues

---
 src/app/navbar/navbar.component.html                |  4 ++--
 src/app/shared/menu/menu-section.decorator.ts       |  2 +-
 src/app/shared/theme-support/themed.component.ts    |  1 +
 .../app/shared/loading/loading.component.html       |  0
 .../app/shared/loading/loading.component.scss       |  0
 .../custom/app/shared/loading/loading.component.ts  | 13 +++++++++++++
 src/themes/custom/theme.module.ts                   |  4 +++-
 7 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 src/themes/custom/app/shared/loading/loading.component.html
 create mode 100644 src/themes/custom/app/shared/loading/loading.component.scss
 create mode 100644 src/themes/custom/app/shared/loading/loading.component.ts

diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index fc5d1a2ef3..8531543361 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -6,10 +6,10 @@
             <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 *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
                     </ng-container>
                 </ul>
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/app/shared/menu/menu-section.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index 9374ab3c0d..18eedd1cf4 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { MenuID } from './initial-menus-state';
-import { hasNoValue, hasValue } from '../empty.util';
+import { hasValue } from '../empty.util';
 
 const menuComponentMap = new Map();
 
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
index 2ff0713f46..79ed914c5d 100644
--- a/src/app/shared/theme-support/themed.component.ts
+++ b/src/app/shared/theme-support/themed.component.ts
@@ -70,6 +70,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
 
     this.lazyLoadSub = this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
       switchMap((themedFile: any) => {
+        console.log(themedFile);
         if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) {
           // if the file is not null, and exports a component with the specified name,
           // return that component
diff --git a/src/themes/custom/app/shared/loading/loading.component.html b/src/themes/custom/app/shared/loading/loading.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/loading/loading.component.scss b/src/themes/custom/app/shared/loading/loading.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
new file mode 100644
index 0000000000..43249a4624
--- /dev/null
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
+
+@Component({
+  selector: 'ds-loading',
+  styleUrls: ['../../../../../app/shared/loading/loading.component.scss'],
+  // styleUrls: ['./loading.component.scss'],
+  templateUrl: '../../../../app/shared/loading/loading.component.html'
+  // templateUrl: './loading.component.html'
+})
+export class LoadingComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index e2e97b9087..67ad6028ce 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -84,6 +84,7 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import { LoadingComponent } from './app/shared/loading/loading.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -126,7 +127,8 @@ const DECLARATIONS = [
   NavbarComponent,
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
-  FeedbackComponent
+  FeedbackComponent,
+  LoadingComponent
 ];
 
 @NgModule({

From 166a163c24fd0e6b05aa6a49fc8474c10c9a1600 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 11 May 2022 12:34:44 +0200
Subject: [PATCH 017/103] Fix custom loading components template url

---
 src/themes/custom/app/shared/loading/loading.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
index 43249a4624..fb1a291dc0 100644
--- a/src/themes/custom/app/shared/loading/loading.component.ts
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -5,7 +5,7 @@ import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loa
   selector: 'ds-loading',
   styleUrls: ['../../../../../app/shared/loading/loading.component.scss'],
   // styleUrls: ['./loading.component.scss'],
-  templateUrl: '../../../../app/shared/loading/loading.component.html'
+  templateUrl: '../../../../../app/shared/loading/loading.component.html'
   // templateUrl: './loading.component.html'
 })
 export class LoadingComponent extends BaseComponent {

From 67ffa89c472bc7f86283fd8e0bcd735f481d4bc6 Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Wed, 11 May 2022 13:30:11 +0200
Subject: [PATCH 018/103] Remove console.log

---
 src/app/shared/theme-support/themed.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
index 79ed914c5d..2ff0713f46 100644
--- a/src/app/shared/theme-support/themed.component.ts
+++ b/src/app/shared/theme-support/themed.component.ts
@@ -70,7 +70,6 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
 
     this.lazyLoadSub = this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
       switchMap((themedFile: any) => {
-        console.log(themedFile);
         if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) {
           // if the file is not null, and exports a component with the specified name,
           // return that component

From 5b4ecb9fc23633aad3224a9002cb56d85fc028c8 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 11 May 2022 13:46:03 +0200
Subject: [PATCH 019/103] 89720: Themed ItemMetadataComponent

---
 .../item-metadata/item-metadata.component.html  |  0
 .../item-metadata/item-metadata.component.scss  |  0
 .../item-metadata/item-metadata.component.ts    | 17 +++++++++++++++++
 src/themes/custom/theme.module.ts               |  4 +++-
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
 create mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
 create mode 100644 src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts

diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
new file mode 100644
index 0000000000..d6d7c4b8fb
--- /dev/null
+++ b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+import {
+  ItemMetadataComponent as BaseComponent
+} from '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component';
+
+@Component({
+  selector: 'ds-item-metadata',
+  // styleUrls: ['./item-metadata.component.scss'],
+  styleUrls: ['../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.scss'],
+  // templateUrl: './item-metadata.component.html',
+  templateUrl: '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.html',
+})
+/**
+ * Component for displaying an item's metadata edit page
+ */
+export class ItemMetadataComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index e2e97b9087..ce259b5841 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -84,6 +84,7 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metadata/item-metadata.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -126,7 +127,8 @@ const DECLARATIONS = [
   NavbarComponent,
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
-  FeedbackComponent
+  FeedbackComponent,
+  ItemMetadataComponent,
 ];
 
 @NgModule({

From a89375f67babaad5db95d9e661c8a89210940806 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Wed, 11 May 2022 14:28:16 +0200
Subject: [PATCH 020/103] 89720: Themed EditItemTemplatePageComponent

---
 .../edit-item-template-page.component.html       |  0
 .../edit-item-template-page.component.scss       |  0
 .../edit-item-template-page.component.ts         | 16 ++++++++++++++++
 src/themes/custom/theme.module.ts                |  4 ++++
 4 files changed, 20 insertions(+)
 create mode 100644 src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
 create mode 100644 src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.scss
 create mode 100644 src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts

diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.scss b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
new file mode 100644
index 0000000000..ad9f515dcf
--- /dev/null
+++ b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import {
+  EditItemTemplatePageComponent as BaseComponent
+} from '../../../../../app/collection-page/edit-item-template-page/edit-item-template-page.component';
+
+@Component({
+  selector: 'ds-edit-item-template-page',
+  styleUrls: ['./edit-item-template-page.component.scss'],
+  // templateUrl: './edit-item-template-page.component.html',
+  templateUrl: '../../../../../app/collection-page/edit-item-template-page/edit-item-template-page.component.html',
+})
+/**
+ * Component for editing the item template of a collection
+ */
+export class EditItemTemplatePageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index ce259b5841..af3dee50c0 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -85,6 +85,9 @@ import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resou
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metadata/item-metadata.component';
+import {
+  EditItemTemplatePageComponent
+} from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -129,6 +132,7 @@ const DECLARATIONS = [
   BreadcrumbsComponent,
   FeedbackComponent,
   ItemMetadataComponent,
+  EditItemTemplatePageComponent,
 ];
 
 @NgModule({

From db375b8f4702acc19c14480d3f27a26ae023957c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 12 May 2022 12:05:17 +0200
Subject: [PATCH 021/103] 91131: Added parent constructor to
 ThemedLoadingComponent

---
 src/app/shared/loading/themed-loading.component.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/loading/themed-loading.component.ts b/src/app/shared/loading/themed-loading.component.ts
index 2b6aa6212c..0f887a025f 100644
--- a/src/app/shared/loading/themed-loading.component.ts
+++ b/src/app/shared/loading/themed-loading.component.ts
@@ -1,6 +1,7 @@
-import { Component, Input } from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { Component, Input, ComponentFactoryResolver, ChangeDetectorRef } from '@angular/core';
+import { ThemedComponent } from '../theme-support/themed.component';
 import { LoadingComponent } from './loading.component';
+import { ThemeService } from '../theme-support/theme.service';
 
 /**
  * Themed wrapper for LoadingComponent
@@ -17,6 +18,14 @@ export class ThemedLoadingComponent extends ThemedComponent<LoadingComponent> {
 
   protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = ['message', 'showMessage'];
 
+  constructor(
+    protected resolver: ComponentFactoryResolver,
+    protected cdr: ChangeDetectorRef,
+    protected themeService: ThemeService
+  ) {
+    super(resolver, cdr, themeService);
+  }
+
   protected getComponentName(): string {
     return 'LoadingComponent';
   }

From 5682c81217c5da5090ad6cbb4cb561cbca5cd84c Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 13 May 2022 13:45:49 +0200
Subject: [PATCH 022/103] 91272: Fixed import statements and position of
 expandable navbar button

---
 .../themed-expandable-navbar-section.component.ts             | 4 ++--
 src/app/navbar/navbar.component.html                          | 4 ++--
 .../expandable-navbar-section.component.ts                    | 4 ++--
 src/themes/dspace/app/navbar/navbar.component.html            | 4 ++--
 src/themes/dspace/styles/_global-styles.scss                  | 3 +--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
index 744eeb5a02..e33dca4104 100644
--- a/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/themed-expandable-navbar-section.component.ts
@@ -2,13 +2,13 @@ import { Component } from '@angular/core';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
-import { MenuID } from '../../shared/menu/initial-menus-state';
+import { MenuID } from '../../shared/menu/menu-id.model';
 
 /**
  * Themed wrapper for ExpandableNavbarSectionComponent
  */
 @Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-themed-expandable-navbar-section]',
   styleUrls: [],
   templateUrl: '../../shared/theme-support/themed.component.html',
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 63f308fb32..b41f2ea706 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -4,7 +4,7 @@
     <div class="container">
         <div class="reset-padding-md w-100">
             <div id="collapsingNav">
-                <ul class="navbar-nav mr-auto shadow-none">
+                <ul class="navbar-nav navbar-navigation 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>
@@ -12,4 +12,4 @@
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 283b9ca6f6..f7efd1fdca 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -4,13 +4,13 @@ import {
 } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
 import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
-import { MenuID } from '../../../../../app/shared/menu/initial-menus-state';
+import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
 
 /**
  * Represents an expandable section in the navbar
  */
 @Component({
-  /* tslint:disable:component-selector */
+  /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-expandable-navbar-section]',
   // templateUrl: './expandable-navbar-section.component.html',
   templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 218fc368ba..6b71728494 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -6,7 +6,7 @@
     </a>
 
     <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav me-auto mb-2 mb-lg-0 h-100">
+      <ul class="navbar-nav navbar-navigation 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>
@@ -17,4 +17,4 @@
     <ds-themed-auth-nav-menu class="navbar-collapsed"></ds-themed-auth-nav-menu>
     <ds-impersonate-navbar class="navbar-collapsed"></ds-impersonate-navbar>
   </div>
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index 8682e3dcdf..3271f15bf2 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -23,8 +23,7 @@
 }
 
 header {
-  li > .navbar-section,
-  li > .expandable-navbar-section {
+  .navbar-navigation > li {
     display: flex;
     flex-direction: column;
     justify-content: center;

From e197e496b51aad5d05e4e6684a84cf435a1e15d4 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 13 May 2022 17:19:42 +0200
Subject: [PATCH 023/103] 91272: Fixed accessibility violation

---
 .../admin-sidebar-section/admin-sidebar-section.component.ts   | 2 ++
 .../expandable-admin-sidebar-section.component.ts              | 2 ++
 .../expandable-navbar-section.component.ts                     | 3 +--
 src/app/navbar/navbar-section/navbar-section.component.ts      | 2 ++
 .../expandable-navbar-section.component.ts                     | 3 +--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index 47f693cb99..422431d2c5 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -14,6 +14,8 @@ import { Router } from '@angular/router';
 @Component({
   /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-admin-sidebar-section]',
+  // To theme this element remove the surrounding li[] in this component but leave it in the new
+  // ThemedAdminSidebarSectionComponent
   templateUrl: './admin-sidebar-section.component.html',
   styleUrls: ['./admin-sidebar-section.component.scss'],
 
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 7cd20b15d2..28cadcac5f 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -17,6 +17,8 @@ import { Router } from '@angular/router';
 @Component({
   /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-expandable-admin-sidebar-section]',
+  // To theme this element remove the surrounding li[] in this component but leave it in the new
+  // ThemedExpandableAdminSidebarSectionComponent
   templateUrl: './expandable-admin-sidebar-section.component.html',
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor]
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index a6d3a52cd2..5bc69bcbb4 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -11,8 +11,7 @@ import { MenuID } from '../../shared/menu/menu-id.model';
  * Represents an expandable section in the navbar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-expandable-navbar-section]',
+  selector: 'ds-expandable-navbar-section',
   templateUrl: './expandable-navbar-section.component.html',
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide]
diff --git a/src/app/navbar/navbar-section/navbar-section.component.ts b/src/app/navbar/navbar-section/navbar-section.component.ts
index 9f75a96f6e..20d5299584 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.ts
@@ -10,6 +10,8 @@ import { MenuID } from '../../shared/menu/menu-id.model';
 @Component({
   /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-navbar-section]',
+  // To theme this element remove the surrounding li[] in this component but leave it in the new
+  // ThemedNavbarSectionComponent
   templateUrl: './navbar-section.component.html',
   styleUrls: ['./navbar-section.component.scss']
 })
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index f7efd1fdca..3e11271bf0 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -10,8 +10,7 @@ import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
  * Represents an expandable section in the navbar
  */
 @Component({
-  /* eslint-disable @angular-eslint/component-selector */
-  selector: 'li[ds-expandable-navbar-section]',
+  selector: 'ds-expandable-navbar-section',
   // templateUrl: './expandable-navbar-section.component.html',
   templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
   // styleUrls: ['./expandable-navbar-section.component.scss'],

From 460efa42c732dc80979e8733793c439282141c1e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 13 May 2022 19:33:40 +0200
Subject: [PATCH 024/103] 91272: Fix merge request

---
 src/app/admin/admin-sidebar/admin-sidebar.component.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 5febf93deb..d4071b91ed 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -41,7 +41,6 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { MenuID } from '../../shared/menu/menu-id.model';
 import { MenuItemType } from '../../shared/menu/menu-item-type.model';
 import { ActivatedRoute } from '@angular/router';
-import { Router, ActivatedRoute } from '@angular/router';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 
 /**

From 743513cf848a7db3c5ec1fc97817a07fd6cdc134 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 13 May 2022 20:35:08 +0200
Subject: [PATCH 025/103] 89676: Added empty SearchResultsComponent files

---
 .../shared/search/search-results/search-results.component.html   | 0
 .../shared/search/search-results/search-results.component.scss   | 0
 .../app/shared/search/search-results/search-results.component.ts | 1 +
 3 files changed, 1 insertion(+)
 create mode 100644 src/themes/custom/app/shared/search/search-results/search-results.component.html
 create mode 100644 src/themes/custom/app/shared/search/search-results/search-results.component.scss

diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.html b/src/themes/custom/app/shared/search/search-results/search-results.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.scss b/src/themes/custom/app/shared/search/search-results/search-results.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index bdfeea15a5..5084d4d405 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -6,6 +6,7 @@ import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade'
   selector: 'ds-search-results',
   // templateUrl: './search-results.component.html',
   templateUrl: '../../../../../../app/shared/search/search-results/search-results.component.html',
+  // styleUrls: ['./search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut

From 3a483c393ddeeb94c90113bbd36320bf8abb3800 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 27 May 2022 16:32:23 +0200
Subject: [PATCH 026/103] 89721: Themed UntypedItemComponent

---
 .../untyped-item/untyped-item.component.html  |  0
 .../untyped-item/untyped-item.component.scss  |  0
 .../untyped-item/untyped-item.component.ts    | 25 +++++++++++++++++++
 src/themes/custom/entry-components.ts         |  4 ++-
 src/themes/custom/theme.module.ts             | 22 ++++++++++++----
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
 create mode 100644 src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
 create mode 100644 src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts

diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
new file mode 100644
index 0000000000..1d1676e92f
--- /dev/null
+++ b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -0,0 +1,25 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { Item } from '../../../../../../../app/core/shared/item.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+import {
+  UntypedItemComponent as BaseComponent
+} from '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component';
+
+/**
+ * Component that represents an untyped Item page
+ */
+@listableObjectComponent(Item, ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-untyped-item',
+  // styleUrls: ['./untyped-item.component.scss'],
+  styleUrls: ['../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.scss'],
+  // templateUrl: './untyped-item.component.html',
+  templateUrl: '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class UntypedItemComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/entry-components.ts b/src/themes/custom/entry-components.ts
index b518e4cc45..9a9c0624a4 100644
--- a/src/themes/custom/entry-components.ts
+++ b/src/themes/custom/entry-components.ts
@@ -1,5 +1,7 @@
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
+import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 
 export const ENTRY_COMPONENTS = [
-  PublicationComponent
+  PublicationComponent,
+  UntypedItemComponent,
 ];
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index e2e97b9087..c5d5e5a1c4 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -34,6 +34,7 @@ import { HomePageModule } from '../../app/home-page/home-page.module';
 import { RootComponent } from './app/root/root.component';
 import { AppModule } from '../../app/app.module';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
+import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 import { ItemPageModule } from '../../app/item-page/item-page.module';
 import { RouterModule } from '@angular/router';
 import { AccessControlModule } from '../../app/access-control/access-control.module';
@@ -47,8 +48,12 @@ import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component
 import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
 import { ForbiddenComponent } from './app/forbidden/forbidden.component';
 import { PrivacyComponent } from './app/info/privacy/privacy.component';
-import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
-import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
+import {
+  CollectionStatisticsPageComponent
+} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
+import {
+  CommunityStatisticsPageComponent
+} from './app/statistics-page/community-statistics-page/community-statistics-page.component';
 import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
 import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
 import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
@@ -67,11 +72,17 @@ import { ForgotPasswordFormComponent } from './app/forgot-password/forgot-passwo
 import { ProfilePageComponent } from './app/profile-page/profile-page.component';
 import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
 import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
-import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
+import {
+  SubmissionImportExternalComponent
+} from './app/submission/import-external/submission-import-external.component';
 import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
 import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
-import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
-import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+import {
+  WorkflowItemSendBackComponent
+} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
+import {
+  WorkflowItemDeleteComponent
+} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
 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';
@@ -91,6 +102,7 @@ const DECLARATIONS = [
   HomeNewsComponent,
   RootComponent,
   PublicationComponent,
+  UntypedItemComponent,
   BrowseBySwitcherComponent,
   CommunityListPageComponent,
   SearchPageComponent,

From 533e4c982f43f2859951479c1302b3343226941d Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Thu, 2 Jun 2022 10:22:46 +0200
Subject: [PATCH 027/103] 91272: Small fixes

---
 .../listable-object-component-loader.component.ts               | 2 ++
 .../app/info/end-user-agreement/end-user-agreement.component.ts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 8adbcbeec3..9c7ad5f659 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
@@ -128,6 +128,8 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
       'context',
       'viewMode',
       'value',
+      'hideBadges',
+      'contentChange',
     ];
 
   constructor(
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index e3e5ac8d19..50e196bfaf 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 
 @Component({
-  selector: 'ds-home-news',
+  selector: 'ds-end-user-agreement',
   // styleUrls: ['./end-user-agreement.component.scss'],
   styleUrls: ['../../../../../app/info/end-user-agreement/end-user-agreement.component.scss'],
   // templateUrl: './end-user-agreement.component.html'

From 2441db16e93a500f8ed4849537be918d86696086 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 27 May 2022 18:53:56 +0200
Subject: [PATCH 028/103] 89721: Themed JournalIssueComponent

---
 .../journal-issue.component.html              |  0
 .../journal-issue.component.scss              |  0
 .../journal-issue/journal-issue.component.ts  | 23 +++++++++++++++++++
 src/themes/custom/entry-components.ts         |  4 ++++
 src/themes/custom/theme.module.ts             |  6 ++++-
 5 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts

diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
new file mode 100644
index 0000000000..a9f23c25f6
--- /dev/null
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  JournalIssueComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('JournalIssue', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-journal-issue',
+  // styleUrls: ['./journal-issue.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss'],
+  // templateUrl: './journal-issue.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html',
+})
+/**
+ * The component for displaying metadata and relations of an item of the type Journal Issue
+ */
+export class JournalIssueComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/entry-components.ts b/src/themes/custom/entry-components.ts
index 9a9c0624a4..b5c4469718 100644
--- a/src/themes/custom/entry-components.ts
+++ b/src/themes/custom/entry-components.ts
@@ -1,7 +1,11 @@
+import {
+  JournalIssueComponent
+} from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 
 export const ENTRY_COMPONENTS = [
+  JournalIssueComponent,
   PublicationComponent,
   UntypedItemComponent,
 ];
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index c5d5e5a1c4..5fb1ce580b 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -95,6 +95,9 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import {
+  JournalIssueComponent
+} from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -138,7 +141,8 @@ const DECLARATIONS = [
   NavbarComponent,
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
-  FeedbackComponent
+  FeedbackComponent,
+  JournalIssueComponent,
 ];
 
 @NgModule({

From 2264067240e3d7302878e59fae02e27fc65d096e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 27 May 2022 19:12:03 +0200
Subject: [PATCH 029/103] 89721: Themed JournalVolumeComponent

---
 .../journal-volume.component.html             |  0
 .../journal-volume.component.scss             |  0
 .../journal-volume.component.ts               | 23 +++++++++++++++++++
 src/themes/custom/entry-components.ts         |  4 ++++
 src/themes/custom/theme.module.ts             |  4 ++++
 5 files changed, 31 insertions(+)
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts

diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
new file mode 100644
index 0000000000..1a190dc2e8
--- /dev/null
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  JournalVolumeComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('JournalVolume', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-journal-volume',
+  // styleUrls: ['./journal-volume.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.scss'],
+  // templateUrl: './journal-volume.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html',
+})
+/**
+ * The component for displaying metadata and relations of an item of the type Journal Volume
+ */
+export class JournalVolumeComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/entry-components.ts b/src/themes/custom/entry-components.ts
index b5c4469718..8f24a3b7e6 100644
--- a/src/themes/custom/entry-components.ts
+++ b/src/themes/custom/entry-components.ts
@@ -1,11 +1,15 @@
 import {
   JournalIssueComponent
 } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import {
+  JournalVolumeComponent
+} from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 
 export const ENTRY_COMPONENTS = [
   JournalIssueComponent,
+  JournalVolumeComponent,
   PublicationComponent,
   UntypedItemComponent,
 ];
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 5fb1ce580b..3193b200af 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -98,6 +98,9 @@ import { FeedbackComponent } from './app/info/feedback/feedback.component';
 import {
   JournalIssueComponent
 } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import {
+  JournalVolumeComponent
+} from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -143,6 +146,7 @@ const DECLARATIONS = [
   BreadcrumbsComponent,
   FeedbackComponent,
   JournalIssueComponent,
+  JournalVolumeComponent,
 ];
 
 @NgModule({

From bca332a23aed34b5e96ea6cfae8cfccd92173fc3 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 30 May 2022 10:12:04 +0200
Subject: [PATCH 030/103] 89721: Themed JournalComponent

---
 .../item-pages/journal/journal.component.html |  0
 .../item-pages/journal/journal.component.scss |  0
 .../item-pages/journal/journal.component.ts   | 23 +++++++++++++++++++
 src/themes/custom/entry-components.ts         |  2 ++
 src/themes/custom/theme.module.ts             |  6 ++++-
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
 create mode 100644 src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts

diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
new file mode 100644
index 0000000000..7b64c1a35d
--- /dev/null
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import {
+  listableObjectComponent
+} from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import {
+  JournalComponent as BaseComponent
+} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { Context } from '../../../../../../../app/core/shared/context.model';
+
+@listableObjectComponent('Journal', ViewMode.StandalonePage, Context.Any, 'custom')
+@Component({
+  selector: 'ds-journal',
+  // styleUrls: ['./journal.component.scss'],
+  styleUrls: ['../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component.scss'],
+  // templateUrl: './journal.component.html',
+  templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component.html',
+})
+/**
+ * The component for displaying metadata and relations of an item of the type Journal
+ */
+export class JournalComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/entry-components.ts b/src/themes/custom/entry-components.ts
index 8f24a3b7e6..ca4c40f523 100644
--- a/src/themes/custom/entry-components.ts
+++ b/src/themes/custom/entry-components.ts
@@ -1,3 +1,4 @@
+import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
 import {
   JournalIssueComponent
 } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
@@ -8,6 +9,7 @@ import { PublicationComponent } from './app/item-page/simple/item-types/publicat
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
 
 export const ENTRY_COMPONENTS = [
+  JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
   PublicationComponent,
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index 3193b200af..b42dfa80ac 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -95,12 +95,14 @@ import { SearchModule } from '../../app/shared/search/search.module';
 import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
 import { ComcolModule } from '../../app/shared/comcol/comcol.module';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
+import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
 import {
   JournalIssueComponent
 } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
 import {
   JournalVolumeComponent
 } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -145,6 +147,7 @@ const DECLARATIONS = [
   HeaderNavbarWrapperComponent,
   BreadcrumbsComponent,
   FeedbackComponent,
+  JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
 ];
@@ -196,7 +199,8 @@ const DECLARATIONS = [
     SearchModule,
     FormsModule,
     ResourcePoliciesModule,
-    ComcolModule
+    ComcolModule,
+    ItemSharedModule,
   ],
   declarations: DECLARATIONS
 })

From dc5d46993e33f31d5c35b52777fc544c1d372d84 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 27 May 2022 11:14:28 +0200
Subject: [PATCH 031/103] 89721: Themed AdminSidebarComponent

---
 .../admin-sidebar/admin-sidebar.component.html    |  0
 .../admin-sidebar/admin-sidebar.component.scss    |  0
 .../admin-sidebar/admin-sidebar.component.ts      | 15 +++++++++++++++
 src/themes/custom/theme.module.ts                 |  2 ++
 4 files changed, 17 insertions(+)
 create mode 100644 src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.html
 create mode 100644 src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.scss
 create mode 100644 src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts

diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.html b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.scss b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
new file mode 100644
index 0000000000..6485ad98e6
--- /dev/null
+++ b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -0,0 +1,15 @@
+import { Component } from '@angular/core';
+import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin/admin-sidebar/admin-sidebar.component';
+
+/**
+ * Component representing the admin sidebar
+ */
+@Component({
+  selector: 'ds-admin-sidebar',
+  // templateUrl: './admin-sidebar.component.html',
+  templateUrl: '../../../../../app/admin/admin-sidebar/admin-sidebar.component.html',
+  // styleUrls: ['./admin-sidebar.component.scss']
+  styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss']
+})
+export class AdminSidebarComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/theme.module.ts b/src/themes/custom/theme.module.ts
index b42dfa80ac..95203336dd 100644
--- a/src/themes/custom/theme.module.ts
+++ b/src/themes/custom/theme.module.ts
@@ -103,6 +103,7 @@ import {
   JournalVolumeComponent
 } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
 import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
@@ -150,6 +151,7 @@ const DECLARATIONS = [
   JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
+  AdminSidebarComponent,
 ];
 
 @NgModule({

From fc1e6b6b852da9fc635144caf84da08ddaaa5f8e Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Fri, 3 Jun 2022 11:47:46 +0200
Subject: [PATCH 032/103] Removed comments for how to theme li[Component]

---
 .../admin-sidebar-section/admin-sidebar-section.component.ts    | 2 --
 .../expandable-admin-sidebar-section.component.ts               | 2 --
 src/app/navbar/navbar-section/navbar-section.component.ts       | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
index 422431d2c5..47f693cb99 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component.ts
@@ -14,8 +14,6 @@ import { Router } from '@angular/router';
 @Component({
   /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-admin-sidebar-section]',
-  // To theme this element remove the surrounding li[] in this component but leave it in the new
-  // ThemedAdminSidebarSectionComponent
   templateUrl: './admin-sidebar-section.component.html',
   styleUrls: ['./admin-sidebar-section.component.scss'],
 
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 28cadcac5f..7cd20b15d2 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -17,8 +17,6 @@ import { Router } from '@angular/router';
 @Component({
   /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-expandable-admin-sidebar-section]',
-  // To theme this element remove the surrounding li[] in this component but leave it in the new
-  // ThemedExpandableAdminSidebarSectionComponent
   templateUrl: './expandable-admin-sidebar-section.component.html',
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor]
diff --git a/src/app/navbar/navbar-section/navbar-section.component.ts b/src/app/navbar/navbar-section/navbar-section.component.ts
index 20d5299584..9f75a96f6e 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.ts
@@ -10,8 +10,6 @@ import { MenuID } from '../../shared/menu/menu-id.model';
 @Component({
   /* eslint-disable @angular-eslint/component-selector */
   selector: 'li[ds-navbar-section]',
-  // To theme this element remove the surrounding li[] in this component but leave it in the new
-  // ThemedNavbarSectionComponent
   templateUrl: './navbar-section.component.html',
   styleUrls: ['./navbar-section.component.scss']
 })

From 5bf34b868cabce3d87d2bf64a704a1617b6b3e7b Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 10 Jun 2022 13:08:36 +0200
Subject: [PATCH 033/103] added missing keys workspace.search.results.head and
 workflow.search.results.head

---
 src/assets/i18n/de.json5 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 23ab3a29e5..526da437b0 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5358,10 +5358,14 @@
   "virtual-metadata.delete-relationship.modal-head": "Wählen Sie die Items aus, deren virtuelle Metadaten Sie als echte Metadaten speichern möchten.",
   
   
-  
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Deine Einreichungen",
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Workflow verwalten",
-  
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Workflow-Aufgaben",
   
   
   // "workflow-item.delete.notification.success.title": "Deleted",

From afe798942bf39f39ef055bd4246d6e4be6692b7f Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 10 Jun 2022 13:15:53 +0200
Subject: [PATCH 034/103] =?UTF-8?q?harmonized=20german=20translations=20("?=
 =?UTF-8?q?Ihre=20Ver=C3=B6ffentlichungen")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 526da437b0..42e0d083e7 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5359,7 +5359,7 @@
   
   
   // "workspace.search.results.head": "Your submissions",
-  "workspace.search.results.head": "Deine Einreichungen",
+  "workspace.search.results.head": "Ihre Veröffentlichungen",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Workflow verwalten",

From 68d162432b114425d3d96da1b238a986e3414d6d Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Fri, 10 Jun 2022 14:22:52 +0200
Subject: [PATCH 035/103] added two missing keys

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

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 42e0d083e7..effe6932fd 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5279,6 +5279,13 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Details anzeigen",
   
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Anzeige",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Wählen Sie diese Option, um die Metadaten des Items anzuzeigen.",
+  
+  
   
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vorschaubild",

From 02b124f7dd0f0dcf222e86c8c335d357f556b3d8 Mon Sep 17 00:00:00 2001
From: nikunj59 <nikunj.sharma@4science.com>
Date: Mon, 13 Jun 2022 17:38:07 +0530
Subject: [PATCH 036/103] CST-6056 changes for filter result not working while
 lookup from text input

---
 .../search-facet-option.component.html        |  4 +--
 .../search-facet-filter.component.ts          | 29 +++++++++----------
 .../search-hierarchy-filter.component.html    |  2 +-
 .../search-hierarchy-filter.component.ts      |  5 +++-
 .../search-text-filter.component.html         |  2 +-
 .../search-text-filter.component.ts           |  5 +++-
 6 files changed, 26 insertions(+), 21 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 e2e57e7370..3c15eff127 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
@@ -9,6 +9,6 @@
     </span>
   </label>
   <span class="float-right filter-value-count ml-auto">
-                        <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
-                    </span>
+    <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
+  </span>
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index 4f226add54..edcd88cd21 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -236,22 +236,21 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
   onSubmit(data: any) {
     if (data.match(new RegExp(`^.+,(equals|query|authority)$`))) {
       this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
-          if (isNotEmpty(data)) {
-            this.router.navigate(this.getSearchLinkParts(), {
-              queryParams:
-                {
-                  [this.filterConfig.paramName]: [
-                    ...selectedValues.map((facet) => this.getFacetValue(facet)),
-                    data
-                  ]
-                },
-              queryParamsHandling: 'merge'
-            });
-            this.filter = '';
-          }
-          this.filterSearchResults = observableOf([]);
+        if (isNotEmpty(data)) {
+          this.router.navigate(this.getSearchLinkParts(), {
+            queryParams:
+              {
+                [this.filterConfig.paramName]: [
+                  ...selectedValues.map((facet) => this.getFacetValue(facet)),
+                  data
+                ]
+              },
+            queryParamsHandling: 'merge'
+          });
+          this.filter = '';
         }
-      );
+        this.filterSearchResults = observableOf([]);
+      });
     }
   }
 
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 49ca6fe3fd..02f2bc6336 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
@@ -24,7 +24,7 @@
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
                           (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
+                          (clickSuggestion)="onSubmit($event)"
                           (findSuggestions)="findSuggestions($event)"
                           ngDefaultControl
     ></ds-filter-input-suggestions>
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index b3349a5dd9..a6e9fb4a00 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -3,6 +3,7 @@ import { FilterType } from '../../../models/filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { addOperatorToFilterValue } from '../../../search.utils';
+import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -22,6 +23,8 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
    * @param data The string from the input field
    */
   onSubmit(data: any) {
-    super.onSubmit(addOperatorToFilterValue(data, 'query'));
+    this.filterSearchResults.subscribe((filterSearchResults: InputSuggestion[]) => {
+      super.onSubmit(addOperatorToFilterValue(data, filterSearchResults.length ? 'equals' : 'query'));
+    });
   }
 }
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 fdf154bc04..44aed494e3 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
@@ -24,7 +24,7 @@
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
                           (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
+                          (clickSuggestion)="onSubmit($event)"
                           (findSuggestions)="findSuggestions($event)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index cfd81c3750..62c10e4c61 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -3,6 +3,7 @@ import { FilterType } from '../../../models/filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import { addOperatorToFilterValue, } from '../../../search.utils';
+import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 
 /**
  * This component renders a simple item page.
@@ -28,6 +29,8 @@ export class SearchTextFilterComponent extends SearchFacetFilterComponent implem
    * @param data The string from the input field
    */
   onSubmit(data: any) {
-    super.onSubmit(addOperatorToFilterValue(data, 'query'));
+    this.filterSearchResults.subscribe((filterSearchResults: InputSuggestion[]) => {
+      super.onSubmit(addOperatorToFilterValue(data, filterSearchResults.length ? 'equals' : 'query'));
+    });
   }
 }

From e04404bdd6d9ec197c2c5c406b999ddc1ded5b46 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 13 Jun 2022 17:05:41 +0200
Subject: [PATCH 037/103] [CST-5339] use ds-alert for info box

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

diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index 81e30bc013..854bac3669 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -5,10 +5,10 @@
             <div class="container">
                 <ds-loading *ngIf="(processing$ | async)"></ds-loading>
 
-                <div *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
-                    class="row alert alert-info">
+                <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
+                    [type]="'alert-info'">
                     {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
-                </div>
+                </ds-alert>
                 <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
                     [paginationOptions]="paginationOptions" [collectionSize]="(getList() | async)?.payload?.totalElements"
                     [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
@@ -55,5 +55,5 @@
             </div>
         </ng-template>
         </ngb-panel>
-    </ngb-accordion>  
+    </ngb-accordion>
 </div>

From f39283cae587c5b5de78053b56f4d58c1237dd9d Mon Sep 17 00:00:00 2001
From: nikunj59 <nikunj.sharma@4science.com>
Date: Tue, 14 Jun 2022 14:56:41 +0530
Subject: [PATCH 038/103] CST-6051 changes description tool tip and truncate
 text

---
 .../item-bitstreams/item-bitstreams.component.scss         | 4 ++++
 .../item-edit-bitstream/item-edit-bitstream.component.html | 7 ++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 46d172dadc..7de575b785 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -50,3 +50,7 @@
     cursor: grabbing;
   }
 }
+
+:host ::ng-deep .larger-tooltip .tooltip-inner {
+  max-width: 500px;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
index 5d1edb847f..0f0fad2199 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
@@ -9,9 +9,10 @@
   </div>
   <div class="{{columnSizes.columns[1].buildClasses()}} row-element d-flex align-items-center">
     <div class="w-100">
-      <span class="text-truncate">
-      {{ bitstream?.firstMetadataValue('dc.description') }}
-      </span>
+      <div class="text-truncate" [tooltipClass]="'larger-tooltip'" placement="bottom"
+           [ngbTooltip]="bitstream?.firstMetadataValue('dc.description')">
+        {{ bitstream?.firstMetadataValue('dc.description') }}
+      </div>
     </div>
   </div>
   <div class="{{columnSizes.columns[2].buildClasses()}} row-element d-flex align-items-center">

From 9850174fa2ed3a55620fd22777a217d296af3990 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 12:13:07 +0200
Subject: [PATCH 039/103] [CST-5339] ORCID registry queue table reformatted

---
 angular.json                                  |   3 +-
 .../orcid-queue/orcid-queue.component.html    | 107 +++++++++---------
 .../orcid-queue/orcid-queue.component.ts      |  19 +++-
 src/assets/i18n/en.json5                      |   8 +-
 4 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/angular.json b/angular.json
index 56e06bd86c..2ece0c5e7d 100644
--- a/angular.json
+++ b/angular.json
@@ -63,7 +63,8 @@
                 "bundleName": "dspace-theme"
               }
             ],
-            "scripts": []
+            "scripts": [],
+            "baseHref": "/"
           },
           "configurations": {
             "development": {
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index 854bac3669..d21575e31c 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -1,59 +1,60 @@
 <div class="container custom-accordion mb-4">
-    <ngb-accordion activeIds="queue">
-      <ngb-panel title="{{'person.orcid.registry.queue' | translate}}" id="queue">
-        <ng-template ngbPanelContent>
-            <div class="container">
-                <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+  <ngb-accordion activeIds="queue">
+    <ngb-panel title="{{'person.orcid.registry.queue' | translate}}" id="queue">
+      <ng-template ngbPanelContent>
+        <div class="container">
+          <ds-loading *ngIf="(processing$ | async)"></ds-loading>
 
-                <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
-                    [type]="'alert-info'">
-                    {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
-                </ds-alert>
-                <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
-                    [paginationOptions]="paginationOptions" [collectionSize]="(getList() | async)?.payload?.totalElements"
-                    [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
+          <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
+                    [type]="AlertTypeEnum.Info">
+            {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
+          </ds-alert>
+          <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
+                         [paginationOptions]="paginationOptions"
+                         [collectionSize]="(getList() | async)?.payload?.totalElements"
+                         [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
 
-                    <div class="table-responsive">
-                        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
-                            <thead>
-                                <tr class="text-center align-middle">
-                                    <th>{{'person.page.orcid.sync-queue.description' | translate}}</th>
-                                    <th></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr *ngFor="let entry of (getList() | async)?.payload?.page">
-                                    <td class="text-center align-middle">
-                                        {{ entry.description }}
-                                    </td>
-                                    <td style="width: 20%" class="text-center">
-                                        <div class="btn-group edit-field">
-                                            <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
-                                                class="btn btn-outline-success my-1 col-md">
-                                                <i [ngClass]="getOperationClass(entry)"></i>
-                                            </button>
-                                            <button [ngbTooltip]="getIconTooltip(entry) | translate" container="body"
-                                                class="btn btn-outline-warning my-1 col-md">
-                                                <i [ngClass]="getIconClass(entry)"
-                                                aria-hidden="true"></i>
-                                            </button>
-                                            <button [ngbTooltip]="'person.page.orcid.sync-queue.send' | translate" container="body"
-                                                class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
-                                                <i class="fas fa-cogs"></i>
-                                            </button>
-                                            <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
-                                                class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
-                                                <i class="fas fa-times"></i>
-                                            </button>
-                                        </div>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
+            <div class="table-responsive">
+              <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+                <thead>
+                <tr class="text-center align-middle">
+                  <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
+                  <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
+                  <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr *ngFor="let entry of (getList() | async)?.payload?.page">
+                  <td class="text-center align-middle">
+                    <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
+                       class="fa-2x" aria-hidden="true"></i>
+                  </td>
+                  <td class="text-center align-middle">
+                    {{ entry.description }}
+                  </td>
+                  <td style="width: 20%" class="text-center">
+                    <div class="btn-group edit-field">
+                      <!--<button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
+                              class="btn btn-outline-success my-1 col-md">
+                        <i [ngClass]="getOperationClass(entry)"></i>
+                      </button>-->
+                      <button [ngbTooltip]="'person.page.orcid.sync-queue.send' | translate" container="body"
+                              class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
+                        <i [ngClass]="getOperationClass(entry)"></i>
+                      </button>
+                      <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
+                              class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
+                        <i class="fas fa-unlink"></i>
+                      </button>
                     </div>
-                </ds-pagination>
+                  </td>
+                </tr>
+                </tbody>
+              </table>
             </div>
-        </ng-template>
-        </ngb-panel>
-    </ngb-accordion>
+          </ds-pagination>
+        </div>
+      </ng-template>
+    </ngb-panel>
+  </ngb-accordion>
 </div>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 01639a427c..a80ff851fb 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
@@ -14,13 +14,14 @@ import { getFinishedRemoteData, getFirstCompletedRemoteData } from '../../../cor
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { AlertType } from '../../../shared/alert/aletr-type';
 
 @Component({
   selector: 'ds-orcid-queue',
   templateUrl: './orcid-queue.component.html',
   styleUrls: ['./orcid-queue.component.scss']
 })
-export class OrcidQueueComponent implements OnInit {
+export class OrcidQueueComponent implements OnInit, OnDestroy {
   /**
    * Pagination config used to display the list
    */
@@ -39,6 +40,12 @@ export class OrcidQueueComponent implements OnInit {
    */
   private list$: BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>> = new BehaviorSubject<RemoteData<PaginatedList<OrcidQueue>>>({} as any);
 
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  AlertTypeEnum = AlertType;
+
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
@@ -84,13 +91,13 @@ export class OrcidQueueComponent implements OnInit {
     }
     switch (orcidQueue.recordType.toLowerCase()) {
       case 'publication':
-        return 'fa fa-book';
+        return 'fas fa-book';
       case 'funding':
-        return 'fa fa-wallet';
+        return 'fas fa-wallet';
       case 'education':
-        return 'fa fa-school';
+        return 'fas fa-school';
       case 'affiliation':
-        return 'fa fa-university';
+        return 'fas fa-university';
       case 'country':
         return 'fas fa-globe-europe';
       case 'external_ids':
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index bddc705cb8..d29c31aef8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4481,8 +4481,6 @@
 
   "researcherprofile.success.claim.title" : "Success",
 
-  "person.page.orcid": "ORCID",
-
   "person.page.orcid.create": "Create an ORCID ID",
 
   "person.page.orcid.granted-authorizations": "Granted authorizations",
@@ -4547,7 +4545,11 @@
 
   "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
 
-  "person.page.orcid.sync-queue.description" : "Description",
+  "person.page.orcid.sync-queue.table.header.type" : "Type",
+
+  "person.page.orcid.sync-queue.table.header.description" : "Description",
+
+  "person.page.orcid.sync-queue.table.header.action" : "Action",
 
   "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
 

From 383703a4d6c2ab102b391018b9c4faeaf5d30723 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 12:29:38 +0200
Subject: [PATCH 040/103] [CST-5339] Lint errors

---
 src/app/core/orcid/model/orcid-history.model.ts    |  2 +-
 src/app/core/orcid/model/orcid-queue.model.ts      |  2 +-
 src/app/core/orcid/orcid-history.service.ts        | 14 +++++---------
 .../orcid-queue/orcid-queue.component.ts           |  2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/app/core/orcid/model/orcid-history.model.ts b/src/app/core/orcid/model/orcid-history.model.ts
index 01b5d027e9..fd7f73b9fa 100644
--- a/src/app/core/orcid/model/orcid-history.model.ts
+++ b/src/app/core/orcid/model/orcid-history.model.ts
@@ -4,7 +4,7 @@ import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ORCID_HISTORY } from './orcid-history.resource-type';
-import {CacheableObject} from "../../cache/cacheable-object.model";
+import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Class the represents a Orcid History.
diff --git a/src/app/core/orcid/model/orcid-queue.model.ts b/src/app/core/orcid/model/orcid-queue.model.ts
index 7294a6b736..f967772208 100644
--- a/src/app/core/orcid/model/orcid-queue.model.ts
+++ b/src/app/core/orcid/model/orcid-queue.model.ts
@@ -4,7 +4,7 @@ import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ORCID_QUEUE } from './orcid-queue.resource-type';
-import {CacheableObject} from "../../cache/cacheable-object.model";
+import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Class the represents a Orcid Queue.
diff --git a/src/app/core/orcid/orcid-history.service.ts b/src/app/core/orcid/orcid-history.service.ts
index 9d86763466..6658c63c9f 100644
--- a/src/app/core/orcid/orcid-history.service.ts
+++ b/src/app/core/orcid/orcid-history.service.ts
@@ -1,17 +1,13 @@
-/* tslint:disable:max-classes-per-file */
-
+// eslint-disable-next-line max-classes-per-file
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
-import { isNotEmpty } from '../../shared/empty.util';
+import { map, switchMap } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RestResponse } from '../cache/response.models';
 import { DataService } from '../data/data.service';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ItemDataService } from '../data/item-data.service';
@@ -23,9 +19,9 @@ import { OrcidHistory } from './model/orcid-history.model';
 import { ORCID_HISTORY } from './model/orcid-history.resource-type';
 import { OrcidQueue } from './model/orcid-queue.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import {CoreState} from "../core-state.model";
-import {RestRequest} from "../data/rest-request.model";
-import {sendRequest} from "../shared/request.operators";
+import { CoreState } from '../core-state.model';
+import { RestRequest } from '../data/rest-request.model';
+import { sendRequest } from '../shared/request.operators';
 
 /**
  * A private DataService implementation to delegate specific methods to.
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index a80ff851fb..7a742471b7 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -230,7 +230,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     }
     combineLatest(translations).subscribe((messages) => {
       const title = messages.shift();
-      const content = '<ul>' + messages.map((message) => '<li>' + message + '</li>').join('') + '</ul>';
+      const content = '<ul>' + messages.map((message) => `<li>${message}</li>`).join('') + '</ul>';
       this.notificationsService.error(title, content, { timeOut: -1 }, true);
     });
   }

From d779521dc95caab1e79700c0f43bb23b8d96fe9c Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 12:31:20 +0200
Subject: [PATCH 041/103] [CST-5339] Lint errors

---
 src/app/core/orcid/orcid-queue.service.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
index 4803c78560..0da9ac227c 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -1,5 +1,4 @@
-/* tslint:disable:max-classes-per-file */
-
+// eslint-disable-next-line max-classes-per-file
 import { DataService } from '../data/data.service';
 import { OrcidQueue } from './model/orcid-queue.model';
 import { RequestService } from '../data/request.service';
@@ -25,7 +24,7 @@ import { map } from 'rxjs/operators';
 import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
 import { environment } from '../../../environments/environment';
 import { Router } from '@angular/router';
-import {CoreState} from "../core-state.model";
+import { CoreState } from '../core-state.model';
 
 /**
  * A private DataService implementation to delegate specific methods to.
@@ -95,7 +94,7 @@ export class OrcidQueueService {
    * @returns { NoContent }
    */
   deleteById(orcidQueueId: number): Observable<RemoteData<NoContent>> {
-    return this.dataService.delete(orcidQueueId + '');
+    return this.dataService.delete(orcidQueueId.toString());
   }
 
   /**

From 851855fc2a4d20744dad87aa6bded644488f7af8 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 17:44:57 +0200
Subject: [PATCH 042/103] [CST-5339] Tests (WIP)

---
 .../orcid-queue/orcid-queue.component.spec.ts | 89 +++++++++++++++++++
 .../orcid-queue/orcid-queue.component.ts      |  6 +-
 src/app/shared/testing/active-router.stub.ts  |  1 +
 3 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts

diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
new file mode 100644
index 0000000000..0c6895b74c
--- /dev/null
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -0,0 +1,89 @@
+import { OrcidQueueComponent } from './orcid-queue.component';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { OrcidHistoryService } from '../../../core/orcid/orcid-history.service';
+import { ActivatedRoute, Params } from '@angular/router';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+
+fdescribe('OrcidQueueComponent test suite', () => {
+  let comp: OrcidQueueComponent;
+  let fixture: ComponentFixture<OrcidQueueComponent>;
+  let orcidQueueService: OrcidQueueService;
+
+  const testOwnerId = 'test-owner-id';
+
+  const routeParams: Params = {'id': testOwnerId};
+
+  const activatedRouteStub = new ActivatedRouteStub(routeParams);
+
+  function orcidQueueElement(id: number) {
+    return Object.assign(new OrcidQueue(), {
+      'id': id,
+      'ownerId': testOwnerId,
+      'entityId': `test-entity-${id}`,
+      'description': `test description ${id}`,
+      'recordType': 'Publication',
+      'operation': 'INSERT',
+      'type': 'orcidqueue',
+    });
+  }
+
+  const orcidQueueElements = [orcidQueueElement(1), orcidQueueElement(2)];
+
+  const orcidQueueServiceMock = {
+    searchByOwnerId(id) {
+      return createSuccessfulRemoteDataObject$<PaginatedList<OrcidQueue>>(createPaginatedList<OrcidQueue>(orcidQueueElements));
+    },
+    clearFindByOwnerRequests() {
+      return null;
+    }
+  };
+
+  beforeEach(waitForAsync(() => {
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock
+          }
+        }),
+        RouterTestingModule.withRoutes([])
+      ],
+      declarations: [OrcidQueueComponent],
+      providers: [
+        { provide: OrcidQueueService, useValue: orcidQueueServiceMock },
+        { provide: OrcidHistoryService, useValue: {} },
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+
+    orcidQueueService = TestBed.inject(OrcidQueueService);
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(OrcidQueueComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+});
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 7a742471b7..0dd2f8517c 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -25,7 +25,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   /**
    * Pagination config used to display the list
    */
-   public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+  public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'oqp',
     pageSize: 5
   });
@@ -57,7 +57,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
               private orcidHistoryService: OrcidHistoryService,
-              ) { }
+  ) { }
 
   ngOnInit(): void {
     this.updateList();
@@ -81,7 +81,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   /**
    * Return the list of orcid queue records
    */
-   getList(): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
+  getList(): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
     return this.list$.asObservable();
   }
 
diff --git a/src/app/shared/testing/active-router.stub.ts b/src/app/shared/testing/active-router.stub.ts
index aa4bfce438..13cb81b42e 100644
--- a/src/app/shared/testing/active-router.stub.ts
+++ b/src/app/shared/testing/active-router.stub.ts
@@ -54,6 +54,7 @@ export class ActivatedRouteStub {
   get snapshot() {
     return {
       params: this.testParams,
+      paramMap: convertToParamMap(this.params),
       queryParamMap: convertToParamMap(this.testParams)
     };
   }

From adcef89c29e3b9becda7ae2167a894ba46d02794 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 18:21:06 +0200
Subject: [PATCH 043/103] [CST-5339] Tests (WIP)

---
 .../orcid-queue/orcid-queue.component.spec.ts | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index 0c6895b74c..f85feb853d 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
@@ -16,10 +16,13 @@ import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { By } from '@angular/platform-browser';
+
 
 fdescribe('OrcidQueueComponent test suite', () => {
-  let comp: OrcidQueueComponent;
+  let component: OrcidQueueComponent;
   let fixture: ComponentFixture<OrcidQueueComponent>;
+  let debugElement: DebugElement;
   let orcidQueueService: OrcidQueueService;
 
   const testOwnerId = 'test-owner-id';
@@ -76,14 +79,20 @@ fdescribe('OrcidQueueComponent test suite', () => {
     orcidQueueService = TestBed.inject(OrcidQueueService);
   }));
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(() => {
     fixture = TestBed.createComponent(OrcidQueueComponent);
-    comp = fixture.componentInstance;
+    component = fixture.componentInstance;
+    debugElement = fixture.debugElement;
     fixture.detectChanges();
-  }));
+  });
 
   it('should create', () => {
-    expect(comp).toBeTruthy();
+    expect(component).toBeTruthy();
+  });
+
+  it('should ...', () => {
+    const table = debugElement.queryAll(By.css('table'));
+    expect(table.length).toBe(1);
   });
 
 });

From 3adf846786f094acf8fee8caa3d11394b3701f07 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 18:56:18 +0200
Subject: [PATCH 044/103] [CST-5339] Pass item as input - Tests

---
 .../orcid-page/orcid-page.component.html      |   2 +-
 .../orcid-queue/orcid-queue.component.html    | 109 +++++++++---------
 .../orcid-queue/orcid-queue.component.spec.ts |  83 ++++++++++---
 .../orcid-queue/orcid-queue.component.ts      |  15 ++-
 4 files changed, 128 insertions(+), 81 deletions(-)

diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 3bb4a0737c..7fb1ae3a71 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -10,4 +10,4 @@
 
 <ds-orcid-auth *ngIf="(item | async)" [item]="(item | async)" (unlink)="updateItem()"></ds-orcid-auth>
 <ds-orcid-sync-setting *ngIf="(item | async) && isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-sync-setting>
-<ds-orcid-queue *ngIf="isLinkedToOrcid()"></ds-orcid-queue>
+<ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index d21575e31c..23e59b6f5d 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -1,60 +1,55 @@
-<div class="container custom-accordion mb-4">
-  <ngb-accordion activeIds="queue">
-    <ngb-panel title="{{'person.orcid.registry.queue' | translate}}" id="queue">
-      <ng-template ngbPanelContent>
-        <div class="container">
-          <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+<div>
+  <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+  <div class="container">
+    <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
 
-          <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
-                    [type]="AlertTypeEnum.Info">
-            {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
-          </ds-alert>
-          <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
-                         [paginationOptions]="paginationOptions"
-                         [collectionSize]="(getList() | async)?.payload?.totalElements"
-                         [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
+    <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
+              [type]="AlertTypeEnum.Info">
+      {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
+    </ds-alert>
+    <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
+                   [paginationOptions]="paginationOptions"
+                   [collectionSize]="(getList() | async)?.payload?.totalElements"
+                   [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
 
-            <div class="table-responsive">
-              <table id="groups" class="table table-sm table-striped table-hover table-bordered">
-                <thead>
-                <tr class="text-center align-middle">
-                  <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
-                  <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
-                  <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr *ngFor="let entry of (getList() | async)?.payload?.page">
-                  <td class="text-center align-middle">
-                    <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
-                       class="fa-2x" aria-hidden="true"></i>
-                  </td>
-                  <td class="text-center align-middle">
-                    {{ entry.description }}
-                  </td>
-                  <td style="width: 20%" class="text-center">
-                    <div class="btn-group edit-field">
-                      <!--<button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
-                              class="btn btn-outline-success my-1 col-md">
-                        <i [ngClass]="getOperationClass(entry)"></i>
-                      </button>-->
-                      <button [ngbTooltip]="'person.page.orcid.sync-queue.send' | translate" container="body"
-                              class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
-                        <i [ngClass]="getOperationClass(entry)"></i>
-                      </button>
-                      <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
-                              class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
-                        <i class="fas fa-unlink"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-                </tbody>
-              </table>
-            </div>
-          </ds-pagination>
-        </div>
-      </ng-template>
-    </ngb-panel>
-  </ngb-accordion>
+      <div class="table-responsive">
+        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+          <thead>
+          <tr class="text-center align-middle">
+            <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
+            <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
+            <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr *ngFor="let entry of (getList() | async)?.payload?.page" data-test="orcidQueueElementRow">
+            <td class="text-center align-middle">
+              <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
+                 class="fa-2x" aria-hidden="true"></i>
+            </td>
+            <td class="text-center align-middle">
+              {{ entry.description }}
+            </td>
+            <td style="width: 20%" class="text-center">
+              <div class="btn-group edit-field">
+                <!--<button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
+                        class="btn btn-outline-success my-1 col-md">
+                  <i [ngClass]="getOperationClass(entry)"></i>
+                </button>-->
+                <button [ngbTooltip]="'person.page.orcid.sync-queue.send' | translate" container="body"
+                        class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
+                  <i [ngClass]="getOperationClass(entry)"></i>
+                </button>
+                <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
+                        class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
+                  <i class="fas fa-unlink"></i>
+                </button>
+              </div>
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  </div>
 </div>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index f85feb853d..2c4dcf46c3 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -10,13 +10,12 @@ import { PaginationServiceStub } from '../../../shared/testing/pagination-servic
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { OrcidHistoryService } from '../../../core/orcid/orcid-history.service';
-import { ActivatedRoute, Params } from '@angular/router';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { By } from '@angular/platform-browser';
+import { Item } from '../../../core/shared/item.model';
 
 
 fdescribe('OrcidQueueComponent test suite', () => {
@@ -27,9 +26,63 @@ fdescribe('OrcidQueueComponent test suite', () => {
 
   const testOwnerId = 'test-owner-id';
 
-  const routeParams: Params = {'id': testOwnerId};
-
-  const activatedRouteStub = new ActivatedRouteStub(routeParams);
+  const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    metadata: {
+      'dc.title': [{
+        value: 'test person'
+      }],
+      'dspace.entity.type': [{
+        'value': 'Person'
+      }],
+      'dspace.object.owner': [{
+        'value': 'test person',
+        'language': null,
+        'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
+        'confidence': 600,
+        'place': 0
+      }],
+      'dspace.orcid.authenticated': [{
+        'value': '2022-06-10T15:15:12.952872',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }],
+      'dspace.orcid.scope': [{
+        'value': '/authenticate',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }, {
+        'value': '/read-limited',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 1
+      }, {
+        'value': '/activities/update',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 2
+      }, {
+        'value': '/person/update',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 3
+      }],
+      'person.identifier.orcid': [{
+        'value': 'orcid-id',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }]
+    }
+  });
 
   function orcidQueueElement(id: number) {
     return Object.assign(new OrcidQueue(), {
@@ -45,14 +98,8 @@ fdescribe('OrcidQueueComponent test suite', () => {
 
   const orcidQueueElements = [orcidQueueElement(1), orcidQueueElement(2)];
 
-  const orcidQueueServiceMock = {
-    searchByOwnerId(id) {
-      return createSuccessfulRemoteDataObject$<PaginatedList<OrcidQueue>>(createPaginatedList<OrcidQueue>(orcidQueueElements));
-    },
-    clearFindByOwnerRequests() {
-      return null;
-    }
-  };
+  const orcidQueueServiceSpy = jasmine.createSpyObj('orcidQueueService', ['searchByOwnerId', 'clearFindByOwnerRequests']);
+  orcidQueueServiceSpy.searchByOwnerId.and.returnValue(createSuccessfulRemoteDataObject$<PaginatedList<OrcidQueue>>(createPaginatedList<OrcidQueue>(orcidQueueElements)));
 
   beforeEach(waitForAsync(() => {
     void TestBed.configureTestingModule({
@@ -67,11 +114,10 @@ fdescribe('OrcidQueueComponent test suite', () => {
       ],
       declarations: [OrcidQueueComponent],
       providers: [
-        { provide: OrcidQueueService, useValue: orcidQueueServiceMock },
+        { provide: OrcidQueueService, useValue: orcidQueueServiceSpy },
         { provide: OrcidHistoryService, useValue: {} },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -82,6 +128,7 @@ fdescribe('OrcidQueueComponent test suite', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(OrcidQueueComponent);
     component = fixture.componentInstance;
+    component.item = mockItemLinkedToOrcid;
     debugElement = fixture.debugElement;
     fixture.detectChanges();
   });
@@ -90,9 +137,9 @@ fdescribe('OrcidQueueComponent test suite', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should ...', () => {
-    const table = debugElement.queryAll(By.css('table'));
-    expect(table.length).toBe(1);
+  it('should show the ORCID queue elements', () => {
+    const table = debugElement.queryAll(By.css('[data-test="orcidQueueElementRow"]'));
+    expect(table.length).toBe(2);
   });
 
 });
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 0dd2f8517c..7faa4f54cb 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -1,5 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
@@ -15,6 +14,7 @@ import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { AlertType } from '../../../shared/alert/aletr-type';
+import { Item } from '../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-orcid-queue',
@@ -22,6 +22,12 @@ import { AlertType } from '../../../shared/alert/aletr-type';
   styleUrls: ['./orcid-queue.component.scss']
 })
 export class OrcidQueueComponent implements OnInit, OnDestroy {
+
+  /**
+   * The item for which showing the orcid settings
+   */
+  @Input() item: Item;
+
   /**
    * Pagination config used to display the list
    */
@@ -54,7 +60,6 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   constructor(private orcidQueueService: OrcidQueueService,
               protected translateService: TranslateService,
               private paginationService: PaginationService,
-              private route: ActivatedRoute,
               private notificationsService: NotificationsService,
               private orcidHistoryService: OrcidHistoryService,
   ) { }
@@ -67,7 +72,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     this.subs.push(
       this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions).pipe(
         tap(() => this.processing$.next(true)),
-        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByOwnerId(this.route.snapshot.paramMap.get('id'), config)),
+        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByOwnerId(this.item.id, config)),
         getFirstCompletedRemoteData()
       ).subscribe((result: RemoteData<PaginatedList<OrcidQueue>>) => {
         this.processing$.next(false);
@@ -236,7 +241,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   }
 
   private getUnauthorizedErrorContent(): Observable<string> {
-    return this.orcidQueueService.getOrcidAuthorizeUrl(this.route.snapshot.paramMap.get('id')).pipe(
+    return this.orcidQueueService.getOrcidAuthorizeUrl(this.item.id).pipe(
       switchMap((authorizeUrl) => this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.content', { orcid : authorizeUrl}))
     );
   }

From 8eca0d93e45e970ded0773ae80cc92089dc4c5a1 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Tue, 14 Jun 2022 23:14:10 +0200
Subject: [PATCH 045/103] [CST-5339] fdescribe removed

---
 .../orcid-page/orcid-queue/orcid-queue.component.spec.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index 2c4dcf46c3..d460e541e6 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -18,7 +18,7 @@ import { By } from '@angular/platform-browser';
 import { Item } from '../../../core/shared/item.model';
 
 
-fdescribe('OrcidQueueComponent test suite', () => {
+describe('OrcidQueueComponent test suite', () => {
   let component: OrcidQueueComponent;
   let fixture: ComponentFixture<OrcidQueueComponent>;
   let debugElement: DebugElement;

From 3979c51e610b750f1ebbed070ccb7cc5e029eb49 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Tue, 14 Jun 2022 17:43:56 -0400
Subject: [PATCH 046/103] New french translations for some parameters.

Proposition for new translations of the following terms: Workspace, Workflow, Workflow task and MyDSpace.
---
 src/assets/i18n/fr.json5 | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 3b9d7498be..dac20bc90f 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -751,13 +751,13 @@
   "administrativeView.search.results.head": "Recherche Administrateur",
 
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  "admin.workflow.breadcrumbs": "Gestion des soumissions en Workflow",
+  "admin.workflow.breadcrumbs": "Gestion des soumissions en traitement",
 
   // "admin.workflow.title": "Administer Workflow",
-  "admin.workflow.title": "Gestion des soumissions en Workflow",
+  "admin.workflow.title": "Gestion des soumissions en traitement",
 
   // "admin.workflow.item.workflow": "Workflow",
-  "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "En traitement",
 
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Supprimer",
@@ -3622,7 +3622,7 @@
   "menu.section.workflow": "Workflow Administrateur",
 
   // "mydspace.breadcrumbs": "MyDSpace",
-  "mydspace.breadcrumbs": "Mon compte DSpace",
+  "mydspace.breadcrumbs": "Mes dépôts",
 
   // "mydspace.description": "",
   "mydspace.description": "",
@@ -3709,7 +3709,7 @@
   "mydspace.search-form.placeholder": "Rechercher dans mon compte DSpace...",
 
   // "mydspace.show.workflow": "Workflow tasks",
-  "mydspace.show.workflow": "Tâches du Workflow",
+  "mydspace.show.workflow": "Tableau de suivi",
 
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Vos dépôts",
@@ -3724,13 +3724,13 @@
   "mydspace.status.waiting-for-controller": "En attente d'assignation",
 
   // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.workflow": "En traitement",
 
   // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espace de travail",
+  "mydspace.status.workspace": "Dépôts en cours",
 
   // "mydspace.title": "MyDSpace",
-  "mydspace.title": "Mon compte DSpace",
+  "mydspace.title": "Mes dépôts",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Erreur à la création de l'espace de travail. Veuillez vérifier le contenu téléchargé avant de réessayer.",
@@ -3769,7 +3769,7 @@
   "nav.main.description": "Barre de navigation principale",
 
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "Mon compte DSpace",
+  "nav.mydspace": "Mes dépôts",
 
   // "nav.profile": "Profile",
   "nav.profile": "Profil",
@@ -4984,7 +4984,7 @@
   "submission.import-external.page.hint": "Entrer votre recherche ci-dessus pour rechercher des éléments du web à importer dans DSpace",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  "submission.import-external.back-to-my-dspace": "Retour à mon compte DSpace",
+  "submission.import-external.back-to-my-dspace": "Retour à Mes dépôts",
 
   // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "Recherche de la source externe",
@@ -5824,7 +5824,7 @@
   "workflowAdmin.search.results.head": "Workflow Administrateur",
 
   // "workflow.search.results.head": "Workflow tasks",
-  "workflow.search.results.head": "tâches du Workflow",
+  "workflow.search.results.head": "Tableau de suivi",
 
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Éditer l'Item du Workflow",

From d3ba1d2926abc022c41839c778b05e2a4fb9b93f Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Wed, 15 Jun 2022 12:42:02 +0200
Subject: [PATCH 047/103] [CST-5339] Rename ORCID service; add findById and
 findAllByHref

---
 src/app/core/core.module.ts                   |  4 +--
 ...rvice.ts => orcid-history-data.service.ts} | 36 ++++++++++++++++++-
 .../orcid-queue/orcid-queue.component.spec.ts |  4 +--
 .../orcid-queue/orcid-queue.component.ts      |  4 +--
 4 files changed, 41 insertions(+), 7 deletions(-)
 rename src/app/core/orcid/{orcid-history.service.ts => orcid-history-data.service.ts} (58%)

diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 4ec4ca8592..90e326a4df 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -174,7 +174,7 @@ import { ResearcherProfileService } from './profile/researcher-profile.service';
 import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
 import { ResearcherProfile } from './profile/model/researcher-profile.model';
 import { OrcidQueueService } from './orcid/orcid-queue.service';
-import { OrcidHistoryService } from './orcid/orcid-history.service';
+import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
 import { OrcidQueue } from './orcid/model/orcid-queue.model';
 import { OrcidHistory } from './orcid/model/orcid-history.model';
 
@@ -306,7 +306,7 @@ const PROVIDERS = [
   ResearcherProfileService,
   ProfileClaimService,
   OrcidQueueService,
-  OrcidHistoryService,
+  OrcidHistoryDataService,
 ];
 
 /**
diff --git a/src/app/core/orcid/orcid-history.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
similarity index 58%
rename from src/app/core/orcid/orcid-history.service.ts
rename to src/app/core/orcid/orcid-history-data.service.ts
index 6658c63c9f..cef3efbe78 100644
--- a/src/app/core/orcid/orcid-history.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -22,6 +22,9 @@ import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { CoreState } from '../core-state.model';
 import { RestRequest } from '../data/rest-request.model';
 import { sendRequest } from '../shared/request.operators';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
 
 /**
  * A private DataService implementation to delegate specific methods to.
@@ -48,7 +51,7 @@ class OrcidHistoryServiceImpl extends DataService<OrcidHistory> {
  */
 @Injectable()
 @dataService(ORCID_HISTORY)
-export class OrcidHistoryService {
+export class OrcidHistoryDataService {
 
   dataService: OrcidHistoryServiceImpl;
 
@@ -89,4 +92,35 @@ export class OrcidHistoryService {
     return this.halService.getEndpoint(this.dataService.linkPath);
   }
 
+  /**
+   * Returns an observable of {@link RemoteData} of an object, based on its ID, with a list of
+   * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
+   * @param id                          ID of object we want to retrieve
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+  findById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<OrcidHistory>[]): Observable<RemoteData<OrcidHistory>> {
+    return this.dataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Returns a list of observables of {@link RemoteData} of {@link OrcidHistory}s, based on an href, with a list of {@link FollowLinkConfig},
+   * to automatically resolve {@link HALLink}s of the {@link OrcidHistory}
+   * @param href                        The url of object we want to retrieve
+   * @param findListOptions             Find list options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should be automatically resolved
+   */
+  findAllByHref(href: string, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<OrcidHistory>[]): Observable<RemoteData<PaginatedList<OrcidHistory>>> {
+    return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
 }
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index d460e541e6..accd5e57a5 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -9,7 +9,7 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { OrcidHistoryService } from '../../../core/orcid/orcid-history.service';
+import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
@@ -115,7 +115,7 @@ describe('OrcidQueueComponent test suite', () => {
       declarations: [OrcidQueueComponent],
       providers: [
         { provide: OrcidQueueService, useValue: orcidQueueServiceSpy },
-        { provide: OrcidHistoryService, useValue: {} },
+        { provide: OrcidHistoryDataService, useValue: {} },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 7faa4f54cb..217e02bc1f 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -6,7 +6,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
-import { OrcidHistoryService } from '../../../core/orcid/orcid-history.service';
+import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { getFinishedRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
@@ -61,7 +61,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
               protected translateService: TranslateService,
               private paginationService: PaginationService,
               private notificationsService: NotificationsService,
-              private orcidHistoryService: OrcidHistoryService,
+              private orcidHistoryService: OrcidHistoryDataService,
   ) { }
 
   ngOnInit(): void {

From 9bcd92efae532ac1724a7ace99873e720dd227f4 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 15 Jun 2022 15:08:16 +0200
Subject: [PATCH 048/103] [CST-6056] optimize fix to issue with filter
 suggestion

---
 .../search-facet-filter.component.ts          | 53 +++++++++++--------
 .../search-hierarchy-filter.component.html    |  2 +-
 .../search-hierarchy-filter.component.ts      |  5 +-
 .../search-text-filter.component.html         |  2 +-
 .../search-text-filter.component.ts           |  5 +-
 src/app/shared/search/search.utils.spec.ts    |  4 +-
 src/app/shared/search/search.utils.ts         |  2 +-
 7 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index edcd88cd21..c754d80a79 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -29,7 +29,7 @@ import { InputSuggestion } from '../../../../input-suggestions/input-suggestions
 import { SearchOptions } from '../../../models/search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../../../utils/route.utils';
-import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
+import { addOperatorToFilterValue, getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 
 @Component({
@@ -234,32 +234,16 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    * @param data The string from the input field
    */
   onSubmit(data: any) {
-    if (data.match(new RegExp(`^.+,(equals|query|authority)$`))) {
-      this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
-        if (isNotEmpty(data)) {
-          this.router.navigate(this.getSearchLinkParts(), {
-            queryParams:
-              {
-                [this.filterConfig.paramName]: [
-                  ...selectedValues.map((facet) => this.getFacetValue(facet)),
-                  data
-                ]
-              },
-            queryParamsHandling: 'merge'
-          });
-          this.filter = '';
-        }
-        this.filterSearchResults = observableOf([]);
-      });
-    }
+    this.applyFilterValue(data);
   }
 
   /**
-   * On click, set the input's value to the clicked data
-   * @param data The value of the option that was clicked
+   * Submits a selected filter value to the filter
+   * Adds the "equals" operator to the received data before passing it on
+   * @param data The string selected from input suggestions
    */
   onClick(data: any) {
-    this.filter = data;
+    this.applyFilterValue(addOperatorToFilterValue(data, 'equals'));
   }
 
   /**
@@ -307,6 +291,31 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Build the filter query using the value given and apply to the search.
+   * @param data The string from the input field
+   */
+  protected applyFilterValue(data) {
+    if (data.match(new RegExp(`^.+,(equals|query|authority)$`))) {
+      this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
+        if (isNotEmpty(data)) {
+          this.router.navigate(this.getSearchLinkParts(), {
+            queryParams:
+              {
+                [this.filterConfig.paramName]: [
+                  ...selectedValues.map((facet) => this.getFacetValue(facet)),
+                  data
+                ]
+              },
+            queryParamsHandling: 'merge'
+          });
+          this.filter = '';
+        }
+        this.filterSearchResults = observableOf([]);
+      });
+    }
+  }
+
   /**
    * Retrieve facet value
    */
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 02f2bc6336..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
@@ -24,7 +24,7 @@
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
                           (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onSubmit($event)"
+                          (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
                           ngDefaultControl
     ></ds-filter-input-suggestions>
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index a6e9fb4a00..b3349a5dd9 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -3,7 +3,6 @@ import { FilterType } from '../../../models/filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { addOperatorToFilterValue } from '../../../search.utils';
-import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
@@ -23,8 +22,6 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
    * @param data The string from the input field
    */
   onSubmit(data: any) {
-    this.filterSearchResults.subscribe((filterSearchResults: InputSuggestion[]) => {
-      super.onSubmit(addOperatorToFilterValue(data, filterSearchResults.length ? 'equals' : 'query'));
-    });
+    super.onSubmit(addOperatorToFilterValue(data, 'query'));
   }
 }
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 44aed494e3..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
@@ -24,7 +24,7 @@
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
                           (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onSubmit($event)"
+                          (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index 62c10e4c61..cfd81c3750 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -3,7 +3,6 @@ import { FilterType } from '../../../models/filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import { addOperatorToFilterValue, } from '../../../search.utils';
-import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 
 /**
  * This component renders a simple item page.
@@ -29,8 +28,6 @@ export class SearchTextFilterComponent extends SearchFacetFilterComponent implem
    * @param data The string from the input field
    */
   onSubmit(data: any) {
-    this.filterSearchResults.subscribe((filterSearchResults: InputSuggestion[]) => {
-      super.onSubmit(addOperatorToFilterValue(data, filterSearchResults.length ? 'equals' : 'query'));
-    });
+    super.onSubmit(addOperatorToFilterValue(data, 'query'));
   }
 }
diff --git a/src/app/shared/search/search.utils.spec.ts b/src/app/shared/search/search.utils.spec.ts
index 75735093e8..70bf9a43a0 100644
--- a/src/app/shared/search/search.utils.spec.ts
+++ b/src/app/shared/search/search.utils.spec.ts
@@ -66,11 +66,11 @@ describe('Search Utils', () => {
 
   describe('addOperatorToFilterValue', () => {
     it('should add the operator to the value', () => {
-      expect(addOperatorToFilterValue('value', 'operator')).toEqual('value,operator');
+      expect(addOperatorToFilterValue('value', 'equals')).toEqual('value,equals');
     });
 
     it('shouldn\'t add the operator to the value if it already contains the operator', () => {
-      expect(addOperatorToFilterValue('value,operator', 'operator')).toEqual('value,operator');
+      expect(addOperatorToFilterValue('value,equals', 'equals')).toEqual('value,equals');
     });
   });
 
diff --git a/src/app/shared/search/search.utils.ts b/src/app/shared/search/search.utils.ts
index 4d688d48eb..cfb96a5285 100644
--- a/src/app/shared/search/search.utils.ts
+++ b/src/app/shared/search/search.utils.ts
@@ -49,7 +49,7 @@ export function stripOperatorFromFilterValue(value: string) {
  * @param operator
  */
 export function addOperatorToFilterValue(value: string, operator: string) {
-  if (!value.endsWith(`,${operator}`)) {
+  if (!value.match(new RegExp(`^.+,(equals|query|authority)$`))) {
     return `${value},${operator}`;
   }
   return value;

From 793169dd312121c06aab9f7d20b3de9d49447e86 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 15 Jun 2022 18:54:30 +0200
Subject: [PATCH 049/103] [CST-5339] Fix queue refresh after preferences are
 changed

---
 src/app/core/orcid/orcid-queue.service.ts     |  22 ++--
 .../orcid-page/orcid-page.component.ts        |  16 ++-
 .../orcid-queue/orcid-queue.component.html    |   8 +-
 .../orcid-queue/orcid-queue.component.ts      | 114 ++++++++++++------
 4 files changed, 103 insertions(+), 57 deletions(-)

diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
index 0da9ac227c..1d50c560ed 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -76,17 +76,23 @@ export class OrcidQueueService {
   }
 
   /**
-   * @param itemId It represent a Id of owner
-   * @param paginationOptions
+   * @param itemId                      It represent an Id of owner
+   * @param paginationOptions           The pagination options object
+   * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
+   *                                    no valid cached version. Defaults to true
+   * @param reRequestOnStale            Whether or not the request should automatically be re-
+   *                                    requested after the response becomes stale
    * @returns { OrcidQueue }
    */
-  searchByOwnerId(itemId: string, paginationOptions: PaginationComponentOptions): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
+  searchByOwnerId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
     return this.dataService.searchBy('findByOwner', {
-      searchParams: [new RequestParam('ownerId', itemId)],
-      elementsPerPage: paginationOptions.pageSize,
-      currentPage: paginationOptions.currentPage
-    },false,
-      true);
+        searchParams: [new RequestParam('ownerId', itemId)],
+        elementsPerPage: paginationOptions.pageSize,
+        currentPage: paginationOptions.currentPage
+      },
+      useCachedVersionIfAvailable,
+      reRequestOnStale
+    );
   }
 
   /**
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index 6c1de3d100..a4628eed93 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -109,6 +109,7 @@ export class OrcidPageComponent implements OnInit {
    * Retrieve the updated profile item
    */
   updateItem(): void {
+    this.clearRouteParams();
     this.itemService.findById(this.itemId, false).pipe(
       getFirstCompletedRemoteData()
     ).subscribe((itemRD: RemoteData<Item>) => {
@@ -135,11 +136,18 @@ export class OrcidPageComponent implements OnInit {
       } else {
         this.item.next(person);
         this.connectionStatus.next(false);
+        this.clearRouteParams();
       }
-
-      // update route removing the code from query params
-      const redirectUrl = this.router.url.split('?')[0];
-      this.router.navigate([redirectUrl]);
     });
   }
+
+  /**
+   * Update route removing the code from query params
+   * @private
+   */
+  private clearRouteParams(): void {
+    // update route removing the code from query params
+    const redirectUrl = this.router.url.split('?')[0];
+    this.router.navigate([redirectUrl]);
+  }
 }
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index 23e59b6f5d..fc8eb3c4cf 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -23,7 +23,7 @@
           </thead>
           <tbody>
           <tr *ngFor="let entry of (getList() | async)?.payload?.page" data-test="orcidQueueElementRow">
-            <td class="text-center align-middle">
+            <td style="width: 15%" class="text-center align-middle">
               <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
                  class="fa-2x" aria-hidden="true"></i>
             </td>
@@ -32,11 +32,7 @@
             </td>
             <td style="width: 20%" class="text-center">
               <div class="btn-group edit-field">
-                <!--<button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
-                        class="btn btn-outline-success my-1 col-md">
-                  <i [ngClass]="getOperationClass(entry)"></i>
-                </button>-->
-                <button [ngbTooltip]="'person.page.orcid.sync-queue.send' | translate" container="body"
+                <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
                         class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
                   <i [ngClass]="getOperationClass(entry)"></i>
                 </button>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 217e02bc1f..27f98598a7 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -1,7 +1,9 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
+
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { switchMap, tap } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, switchMap, tap } from 'rxjs/operators';
+
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
@@ -9,7 +11,7 @@ import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
 import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueueService } from '../../../core/orcid/orcid-queue.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { getFinishedRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
@@ -57,22 +59,35 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
    * @type {Array}
    */
   private subs: Subscription[] = [];
+
   constructor(private orcidQueueService: OrcidQueueService,
               protected translateService: TranslateService,
               private paginationService: PaginationService,
               private notificationsService: NotificationsService,
               private orcidHistoryService: OrcidHistoryDataService,
-  ) { }
+  ) {
+  }
 
   ngOnInit(): void {
     this.updateList();
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (!changes.item.isFirstChange() && changes.item.currentValue !== changes.item.previousValue) {
+      this.updateList();
+    }
+  }
+
+  /**
+   * Retrieve queue list
+   */
   updateList() {
     this.subs.push(
       this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions).pipe(
+        debounceTime(100),
+        distinctUntilChanged(),
         tap(() => this.processing$.next(true)),
-        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByOwnerId(this.item.id, config)),
+        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByOwnerId(this.item.id, config, false)),
         getFirstCompletedRemoteData()
       ).subscribe((result: RemoteData<PaginatedList<OrcidQueue>>) => {
         this.processing$.next(false);
@@ -82,7 +97,6 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     );
   }
 
-
   /**
    * Return the list of orcid queue records
    */
@@ -90,6 +104,11 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     return this.list$.asObservable();
   }
 
+  /**
+   * Return the icon class for the queue object type
+   *
+   * @param orcidQueue The OrcidQueue object
+   */
   getIconClass(orcidQueue: OrcidQueue): string {
     if (!orcidQueue.recordType) {
       return 'fa fa-user';
@@ -113,6 +132,11 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Return the icon tooltip message for the queue object type
+   *
+   * @param orcidQueue The OrcidQueue object
+   */
   getIconTooltip(orcidQueue: OrcidQueue): string {
     if (!orcidQueue.recordType) {
       return '';
@@ -121,24 +145,11 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     return 'person.page.orcid.sync-queue.tooltip.' + orcidQueue.recordType.toLowerCase();
   }
 
-  getOperationBadgeClass(orcidQueue: OrcidQueue): string {
-
-    if (!orcidQueue.operation) {
-      return '';
-    }
-
-    switch (orcidQueue.operation.toLowerCase()) {
-      case 'insert':
-        return 'badge badge-pill badge-success';
-      case 'update':
-        return 'badge badge-pill badge-primary';
-      case 'delete':
-        return 'badge badge-pill badge-danger';
-      default:
-        return '';
-    }
-  }
-
+  /**
+   * Return the icon tooltip message for the queue object operation
+   *
+   * @param orcidQueue The OrcidQueue object
+   */
   getOperationTooltip(orcidQueue: OrcidQueue): string {
     if (!orcidQueue.operation) {
       return '';
@@ -147,6 +158,11 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     return 'person.page.orcid.sync-queue.tooltip.' + orcidQueue.operation.toLowerCase();
   }
 
+  /**
+   * Return the icon class for the queue object operation
+   *
+   * @param orcidQueue The OrcidQueue object
+   */
   getOperationClass(orcidQueue: OrcidQueue): string {
 
     if (!orcidQueue.operation) {
@@ -165,10 +181,15 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Discard a queue entry from the synchronization
+   *
+   * @param orcidQueue The OrcidQueue object to discard
+   */
   discardEntry(orcidQueue: OrcidQueue) {
     this.processing$.next(true);
     this.subs.push(this.orcidQueueService.deleteById(orcidQueue.id).pipe(
-      getFinishedRemoteData()
+      getFirstCompletedRemoteData()
     ).subscribe((remoteData) => {
       this.processing$.next(false);
       if (remoteData.isSuccess) {
@@ -180,10 +201,15 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     }));
   }
 
-  send( orcidQueue: OrcidQueue ) {
+  /**
+   * Send a queue entry to orcid for the synchronization
+   *
+   * @param orcidQueue The OrcidQueue object to synchronize
+   */
+  send(orcidQueue: OrcidQueue) {
     this.processing$.next(true);
     this.subs.push(this.orcidHistoryService.sendToORCID(orcidQueue).pipe(
-      getFinishedRemoteData()
+      getFirstCompletedRemoteData()
     ).subscribe((remoteData) => {
       this.processing$.next(false);
       if (remoteData.isSuccess) {
@@ -196,7 +222,22 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     }));
   }
 
-  handleOrcidHistoryRecordCreation(orcidHistory: OrcidHistory) {
+
+  /**
+   * Return the error message for Unauthorized response
+   * @private
+   */
+  private getUnauthorizedErrorContent(): Observable<string> {
+    return this.orcidQueueService.getOrcidAuthorizeUrl(this.item.id).pipe(
+      switchMap((authorizeUrl) => this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.content', { orcid: authorizeUrl }))
+    );
+  }
+
+  /**
+   * Manage notification by response
+   * @private
+   */
+  private handleOrcidHistoryRecordCreation(orcidHistory: OrcidHistory) {
     switch (orcidHistory.status) {
       case 200:
       case 201:
@@ -212,7 +253,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
           this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.title'),
           this.getUnauthorizedErrorContent()],
         ).subscribe(([title, content]) => {
-          this.notificationsService.error(title, content, { timeOut: -1}, true);
+          this.notificationsService.error(title, content, { timeOut: -1 }, true);
         });
         break;
       case 404:
@@ -226,7 +267,11 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     }
   }
 
-  handleValidationErrors(remoteData: RemoteData<OrcidHistory>) {
+  /**
+   * Manage validation errors
+   * @private
+   */
+  private handleValidationErrors(remoteData: RemoteData<OrcidHistory>) {
     const translations = [this.translateService.get('person.page.orcid.sync-queue.send.validation-error')];
     const errorMessage = remoteData.errorMessage;
     if (errorMessage && errorMessage.indexOf('Error codes:') > 0) {
@@ -240,11 +285,6 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     });
   }
 
-  private getUnauthorizedErrorContent(): Observable<string> {
-    return this.orcidQueueService.getOrcidAuthorizeUrl(this.item.id).pipe(
-      switchMap((authorizeUrl) => this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.content', { orcid : authorizeUrl}))
-    );
-  }
 
   /**
    * Unsubscribe from all subscriptions
@@ -255,8 +295,4 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
       .forEach((subscription) => subscription.unsubscribe());
   }
 
-  isProfileRecord(orcidQueue: OrcidQueue): boolean {
-    return orcidQueue.recordType !== 'Publication' && orcidQueue.recordType !== 'Project';
-  }
-
 }

From 63356aa12746a3421ef89d4a74699e52ec801b56 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 16 Jun 2022 15:02:26 +0200
Subject: [PATCH 050/103] [CST-5339] Refactoring orcid services by adding
 OrcidAuthService

---
 src/app/core/orcid/orcid-auth.service.spec.ts | 329 ++++++++++++++++++
 src/app/core/orcid/orcid-auth.service.ts      | 147 ++++++++
 src/app/core/orcid/orcid-queue.service.ts     |  21 +-
 .../researcher-profile.service.spec.ts        | 161 +--------
 .../profile/researcher-profile.service.ts     | 139 +-------
 .../orcid-auth/orcid-auth.component.spec.ts   |  66 ++--
 .../orcid-auth/orcid-auth.component.ts        |  21 +-
 .../orcid-page/orcid-page.component.spec.ts   |  18 +-
 .../orcid-page/orcid-page.component.ts        |  10 +-
 .../orcid-queue/orcid-queue.component.spec.ts |   8 +-
 .../orcid-queue/orcid-queue.component.ts      |  22 +-
 11 files changed, 563 insertions(+), 379 deletions(-)
 create mode 100644 src/app/core/orcid/orcid-auth.service.spec.ts
 create mode 100644 src/app/core/orcid/orcid-auth.service.ts

diff --git a/src/app/core/orcid/orcid-auth.service.spec.ts b/src/app/core/orcid/orcid-auth.service.spec.ts
new file mode 100644
index 0000000000..27a33a85b1
--- /dev/null
+++ b/src/app/core/orcid/orcid-auth.service.spec.ts
@@ -0,0 +1,329 @@
+import { cold, getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { ResearcherProfile } from '../profile/model/researcher-profile.model';
+import { Item } from '../shared/item.model';
+import { AddOperation, RemoveOperation } from 'fast-json-patch';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { ConfigurationDataService } from '../data/configuration-data.service';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { OrcidAuthService } from './orcid-auth.service';
+import { ResearcherProfileService } from '../profile/researcher-profile.service';
+
+describe('OrcidAuthService', () => {
+  let scheduler: TestScheduler;
+  let service: OrcidAuthService;
+  let serviceAsAny: any;
+
+  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let configurationDataService: ConfigurationDataService;
+  let nativeWindowService: NativeWindowRefMock;
+  let routerStub: any;
+
+  const researcherProfileId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
+  const itemId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
+
+  const researcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
+    id: researcherProfileId,
+    visible: false,
+    type: 'profile',
+    _links: {
+      item: {
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+      },
+      self: {
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+      },
+    }
+  });
+
+  const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
+    id: researcherProfileId,
+    visible: true,
+    type: 'profile',
+    _links: {
+      item: {
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+      },
+      self: {
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+      },
+    }
+  });
+
+  const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
+    id: 'mockItemUnlinkedToOrcid',
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    metadata: {
+      'dc.title': [{
+        value: 'test person'
+      }],
+      'dspace.entity.type': [{
+        'value': 'Person'
+      }],
+      'dspace.object.owner': [{
+        'value': 'test person',
+        'language': null,
+        'authority': 'researcher-profile-id',
+        'confidence': 600,
+        'place': 0
+      }],
+    }
+  });
+
+  const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    metadata: {
+      'dc.title': [{
+        value: 'test person'
+      }],
+      'dspace.entity.type': [{
+        'value': 'Person'
+      }],
+      'dspace.object.owner': [{
+        'value': 'test person',
+        'language': null,
+        'authority': 'researcher-profile-id',
+        'confidence': 600,
+        'place': 0
+      }],
+      'dspace.orcid.authenticated': [{
+        'value': '2022-06-10T15:15:12.952872',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }],
+      'dspace.orcid.scope': [{
+        'value': '/authenticate',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }, {
+        'value': '/read-limited',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 1
+      }, {
+        'value': '/activities/update',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 2
+      }, {
+        'value': '/person/update',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 3
+      }],
+      'person.identifier.orcid': [{
+        'value': 'orcid-id',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0
+      }]
+    }
+  });
+
+  const disconnectionAllowAdmin = {
+    uuid: 'orcid.disconnection.allowed-users',
+    name: 'orcid.disconnection.allowed-users',
+    values: ['only_admin']
+  } as ConfigurationProperty;
+
+  const disconnectionAllowAdminOwner = {
+    uuid: 'orcid.disconnection.allowed-users',
+    name: 'orcid.disconnection.allowed-users',
+    values: ['admin_and_owner']
+  } as ConfigurationProperty;
+
+  const authorizeUrl = {
+    uuid: 'orcid.authorize-url',
+    name: 'orcid.authorize-url',
+    values: ['orcid.authorize-url']
+  } as ConfigurationProperty;
+  const appClientId = {
+    uuid: 'orcid.application-client-id',
+    name: 'orcid.application-client-id',
+    values: ['orcid.application-client-id']
+  } as ConfigurationProperty;
+  const orcidScope = {
+    uuid: 'orcid.scope',
+    name: 'orcid.scope',
+    values: ['/authenticate', '/read-limited']
+  } as ConfigurationProperty;
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+    routerStub = new RouterMock();
+    researcherProfileService = jasmine.createSpyObj('ResearcherProfileService', {
+      findById: jasmine.createSpy('findById'),
+      updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations')
+    });
+    configurationDataService = jasmine.createSpyObj('configurationDataService', {
+      findByPropertyName: jasmine.createSpy('findByPropertyName')
+    });
+    nativeWindowService = new NativeWindowRefMock();
+
+    service = new OrcidAuthService(
+      nativeWindowService,
+      configurationDataService,
+      researcherProfileService,
+      routerStub);
+
+    serviceAsAny = service;
+  });
+
+
+  describe('isLinkedToOrcid', () => {
+    it('should return true when item has metadata', () => {
+      const result = service.isLinkedToOrcid(mockItemLinkedToOrcid);
+      expect(result).toBeTrue();
+    });
+
+    it('should return true when item has no metadata', () => {
+      const result = service.isLinkedToOrcid(mockItemUnlinkedToOrcid);
+      expect(result).toBeFalse();
+    });
+  });
+
+  describe('onlyAdminCanDisconnectProfileFromOrcid', () => {
+    it('should return true when property is only_admin', () => {
+      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdmin));
+      const result = service.onlyAdminCanDisconnectProfileFromOrcid();
+      const expected = cold('(a|)', {
+        a: true
+      });
+      expect(result).toBeObservable(expected);
+    });
+
+    it('should return false on faild', () => {
+      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
+      const result = service.onlyAdminCanDisconnectProfileFromOrcid();
+      const expected = cold('(a|)', {
+        a: false
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('ownerCanDisconnectProfileFromOrcid', () => {
+    it('should return true when property is admin_and_owner', () => {
+      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdminOwner));
+      const result = service.ownerCanDisconnectProfileFromOrcid();
+      const expected = cold('(a|)', {
+        a: true
+      });
+      expect(result).toBeObservable(expected);
+    });
+
+    it('should return false on faild', () => {
+      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
+      const result = service.ownerCanDisconnectProfileFromOrcid();
+      const expected = cold('(a|)', {
+        a: false
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('linkOrcidByItem', () => {
+    beforeEach(() => {
+      scheduler = getTestScheduler();
+      researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      researcherProfileService.findById.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
+    });
+
+    it('should call updateByOrcidOperations method properly', () => {
+      const operations: AddOperation<string>[] = [{
+        path: '/orcid',
+        op: 'add',
+        value: 'test-code'
+      }];
+
+      scheduler.schedule(() => service.linkOrcidByItem(mockItemUnlinkedToOrcid, 'test-code').subscribe());
+      scheduler.flush();
+
+      expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(researcherProfile, operations);
+    });
+  });
+
+  describe('unlinkOrcidByItem', () => {
+    beforeEach(() => {
+      scheduler = getTestScheduler();
+      researcherProfileService.updateByOrcidOperations.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
+      researcherProfileService.findById.and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
+    });
+
+    it('should call updateByOrcidOperations method properly', () => {
+      const operations: RemoveOperation[] = [{
+        path: '/orcid',
+        op: 'remove'
+      }];
+
+      scheduler.schedule(() => service.unlinkOrcidByItem(mockItemLinkedToOrcid).subscribe());
+      scheduler.flush();
+
+      expect(researcherProfileService.updateByOrcidOperations).toHaveBeenCalledWith(researcherProfile, operations);
+    });
+  });
+
+  describe('getOrcidAuthorizeUrl', () => {
+    beforeEach(() => {
+      routerStub.setRoute('/entities/person/uuid/orcid');
+      (service as any).configurationService.findByPropertyName.and.returnValues(
+        createSuccessfulRemoteDataObject$(authorizeUrl),
+        createSuccessfulRemoteDataObject$(appClientId),
+        createSuccessfulRemoteDataObject$(orcidScope)
+      );
+    });
+
+    it('should build the url properly', () => {
+      const result = service.getOrcidAuthorizeUrl(mockItemUnlinkedToOrcid);
+      const redirectUri: string = new URLCombiner(nativeWindowService.nativeWindow.origin, encodeURIComponent(routerStub.url.split('?')[0])).toString();
+      const url = 'orcid.authorize-url?client_id=orcid.application-client-id&redirect_uri=' + redirectUri + '&response_type=code&scope=/authenticate /read-limited';
+
+      const expected = cold('(a|)', {
+        a: url
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getOrcidAuthorizationScopesByItem', () => {
+    it('should return list of scopes saved in the item', () => {
+      const orcidScopes = [
+        '/authenticate',
+        '/read-limited',
+        '/activities/update',
+        '/person/update'
+      ];
+      const result = service.getOrcidAuthorizationScopesByItem(mockItemLinkedToOrcid);
+      expect(result).toEqual(orcidScopes);
+    });
+  });
+
+  describe('getOrcidAuthorizationScopes', () => {
+    it('should return list of scopes by configuration', () => {
+      (service as any).configurationService.findByPropertyName.and.returnValue(
+        createSuccessfulRemoteDataObject$(orcidScope)
+      );
+      const orcidScopes = [
+        '/authenticate',
+        '/read-limited'
+      ];
+      const expected = cold('(a|)', {
+        a: orcidScopes
+      });
+      const result = service.getOrcidAuthorizationScopes();
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/core/orcid/orcid-auth.service.ts b/src/app/core/orcid/orcid-auth.service.ts
new file mode 100644
index 0000000000..7b85dccd9c
--- /dev/null
+++ b/src/app/core/orcid/orcid-auth.service.ts
@@ -0,0 +1,147 @@
+import { Inject, Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+
+import { combineLatest, Observable } from 'rxjs';
+import { map, switchMap } from 'rxjs/operators';
+import { AddOperation, RemoveOperation } from 'fast-json-patch';
+
+import { ResearcherProfileService } from '../profile/researcher-profile.service';
+import { Item } from '../shared/item.model';
+import { isNotEmpty } from '../../shared/empty.util';
+import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
+import { RemoteData } from '../data/remote-data';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { ConfigurationDataService } from '../data/configuration-data.service';
+import { ResearcherProfile } from '../profile/model/researcher-profile.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { NativeWindowRef, NativeWindowService } from '../services/window.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class OrcidAuthService {
+
+  constructor(
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    private configurationService: ConfigurationDataService,
+    private researcherProfileService: ResearcherProfileService,
+    private router: Router) {
+  }
+
+  /**
+   * Check if the given item is linked to an ORCID profile.
+   *
+   * @param item the item to check
+   * @returns the check result
+   */
+  public isLinkedToOrcid(item: Item): boolean {
+    return item.hasMetadata('dspace.orcid.authenticated');
+  }
+
+  /**
+   * Returns true if only the admin users can disconnect a researcher profile from ORCID.
+   *
+   * @returns the check result
+   */
+  public onlyAdminCanDisconnectProfileFromOrcid(): Observable<boolean> {
+    return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
+      map((propertyRD: RemoteData<ConfigurationProperty>) => {
+        return propertyRD.hasSucceeded && propertyRD.payload.values.map((value) => value.toLowerCase()).includes('only_admin');
+      })
+    );
+  }
+
+  /**
+   * Returns true if the profile's owner can disconnect that profile from ORCID.
+   *
+   * @returns the check result
+   */
+  public ownerCanDisconnectProfileFromOrcid(): Observable<boolean> {
+    return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
+      map((propertyRD: RemoteData<ConfigurationProperty>) => {
+        return propertyRD.hasSucceeded && propertyRD.payload.values.map( (value) => value.toLowerCase()).includes('admin_and_owner');
+      })
+    );
+  }
+
+  /**
+   * Perform a link operation to ORCID profile.
+   *
+   * @param person The person item related to the researcher profile
+   * @param code The auth-code received from orcid
+   */
+  public linkOrcidByItem(person: Item, code: string): Observable<RemoteData<ResearcherProfile>> {
+    const operations: AddOperation<string>[] = [{
+      path: '/orcid',
+      op: 'add',
+      value: code
+    }];
+
+    return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((profileRD) => this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations))
+    );
+  }
+
+  /**
+   * Perform unlink operation from ORCID profile.
+   *
+   * @param person The person item related to the researcher profile
+   */
+  public unlinkOrcidByItem(person: Item): Observable<RemoteData<ResearcherProfile>> {
+    const operations: RemoveOperation[] = [{
+      path:'/orcid',
+      op:'remove'
+    }];
+
+    return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((profileRD) => this.researcherProfileService.updateByOrcidOperations(profileRD.payload, operations))
+    );
+  }
+
+  /**
+   * Build and return the url to authenticate with orcid
+   *
+   * @param profile
+   */
+  public getOrcidAuthorizeUrl(profile: Item): Observable<string> {
+    return combineLatest([
+      this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
+      this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
+      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
+    ).pipe(
+      map(([authorizeUrl, clientId, scopes]) => {
+        const redirectUri = new URLCombiner(this._window.nativeWindow.origin, encodeURIComponent(this.router.url.split('?')[0]));
+        console.log(redirectUri.toString());
+        return authorizeUrl.values[0] + '?client_id=' + clientId.values[0]   + '&redirect_uri=' + redirectUri + '&response_type=code&scope='
+          + scopes.values.join(' ');
+      }));
+  }
+
+  /**
+   * Return all orcid authorization scopes saved in the given item
+   *
+   * @param item
+   */
+  public getOrcidAuthorizationScopesByItem(item: Item): string[] {
+    return isNotEmpty(item) ? item.allMetadataValues('dspace.orcid.scope') : [];
+  }
+
+  /**
+   * Return all orcid authorization scopes available by configuration
+   */
+  public getOrcidAuthorizationScopes(): Observable<string[]> {
+    return this.configurationService.findByPropertyName('orcid.scope').pipe(
+      getFirstCompletedRemoteData(),
+      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
+    );
+  }
+
+  private getOrcidDisconnectionAllowedUsersConfiguration(): Observable<RemoteData<ConfigurationProperty>> {
+    return this.configurationService.findByPropertyName('orcid.disconnection.allowed-users').pipe(
+      getFirstCompletedRemoteData()
+    );
+  }
+
+}
diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
index 1d50c560ed..6af8b8a4c7 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -13,16 +13,13 @@ import { Injectable } from '@angular/core';
 import { dataService } from '../cache/builders/build-decorators';
 import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
 import { ItemDataService } from '../data/item-data.service';
-import { combineLatest, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { RemoteData } from '../data/remote-data';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RequestParam } from '../cache/models/request-param.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { NoContent } from '../shared/NoContent.model';
 import { ConfigurationDataService } from '../data/configuration-data.service';
-import { map } from 'rxjs/operators';
-import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { environment } from '../../../environments/environment';
 import { Router } from '@angular/router';
 import { CoreState } from '../core-state.model';
 
@@ -110,20 +107,4 @@ export class OrcidQueueService {
     this.requestService.setStaleByHrefSubstring(this.dataService.linkPath + '/search/findByOwner');
   }
 
-  /**
-   * @param profileId represent a uuid of that user
-   * @returns orcid authorized url of that user
-   */
-  getOrcidAuthorizeUrl(profileId: string): Observable<string> {
-    return combineLatest([
-      this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
-      this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
-      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
-    ).pipe(
-      map(([authorizeUrl, clientId, scopes]) => {
-        const redirectUri = environment.rest.baseUrl + '/api/cris/orcid/' + profileId + '/?url=' + encodeURIComponent(this.router.url);
-        return authorizeUrl.values[0] + '?client_id=' + clientId.values[0]   + '&redirect_uri=' + redirectUri + '&response_type=code&scope='
-        + scopes.values.join(' ');
-    }));
-  }
 }
diff --git a/src/app/core/profile/researcher-profile.service.spec.ts b/src/app/core/profile/researcher-profile.service.spec.ts
index 11f6e1b13b..899867ec8e 100644
--- a/src/app/core/profile/researcher-profile.service.spec.ts
+++ b/src/app/core/profile/researcher-profile.service.spec.ts
@@ -12,7 +12,6 @@ import { RequestService } from '../data/request.service';
 import { PageInfo } from '../shared/page-info.model';
 import { buildPaginatedList } from '../data/paginated-list.model';
 import {
-  createFailedRemoteDataObject$,
   createNoContentRemoteDataObject$,
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$
@@ -23,15 +22,12 @@ import { ResearcherProfileService } from './researcher-profile.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { Item } from '../shared/item.model';
-import { AddOperation, RemoveOperation, ReplaceOperation } from 'fast-json-patch';
+import { ReplaceOperation } from 'fast-json-patch';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { PostRequest } from '../data/request.models';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { ConfigurationDataService } from '../data/configuration-data.service';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
-import { URLCombiner } from '../url-combiner/url-combiner';
 
 describe('ResearcherProfileService', () => {
   let scheduler: TestScheduler;
@@ -42,8 +38,6 @@ describe('ResearcherProfileService', () => {
   let objectCache: ObjectCacheService;
   let halService: HALEndpointService;
   let responseCacheEntry: RequestEntry;
-  let configurationDataService: ConfigurationDataService;
-  let nativeWindowService: NativeWindowRefMock;
   let routerStub: any;
 
   const researcherProfileId = 'beef9946-rt56-479e-8f11-b90cbe9f7241';
@@ -252,13 +246,8 @@ describe('ResearcherProfileService', () => {
     const itemService = jasmine.createSpyObj('ItemService', {
       findByHref: jasmine.createSpy('findByHref')
     });
-    configurationDataService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: jasmine.createSpy('findByPropertyName')
-    });
-    nativeWindowService = new NativeWindowRefMock();
 
     service = new ResearcherProfileService(
-      nativeWindowService,
       requestService,
       rdbService,
       objectCache,
@@ -267,8 +256,7 @@ describe('ResearcherProfileService', () => {
       http,
       routerStub,
       comparator,
-      itemService,
-      configurationDataService
+      itemService
     );
     serviceAsAny = service;
 
@@ -415,121 +403,6 @@ describe('ResearcherProfileService', () => {
     });
   });
 
-  describe('isLinkedToOrcid', () => {
-    it('should return true when item has metadata', () => {
-      const result = service.isLinkedToOrcid(mockItemLinkedToOrcid);
-      expect(result).toBeTrue();
-    });
-
-    it('should return true when item has no metadata', () => {
-      const result = service.isLinkedToOrcid(mockItemUnlinkedToOrcid);
-      expect(result).toBeFalse();
-    });
-  });
-
-  describe('onlyAdminCanDisconnectProfileFromOrcid', () => {
-    it('should return true when property is only_admin', () => {
-      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdmin));
-      const result = service.onlyAdminCanDisconnectProfileFromOrcid();
-      const expected = cold('(a|)', {
-        a: true
-      });
-      expect(result).toBeObservable(expected);
-    });
-
-    it('should return false on faild', () => {
-      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
-      const result = service.onlyAdminCanDisconnectProfileFromOrcid();
-      const expected = cold('(a|)', {
-        a: false
-      });
-      expect(result).toBeObservable(expected);
-    });
-  });
-
-  describe('ownerCanDisconnectProfileFromOrcid', () => {
-    it('should return true when property is admin_and_owner', () => {
-      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdminOwner));
-      const result = service.ownerCanDisconnectProfileFromOrcid();
-      const expected = cold('(a|)', {
-        a: true
-      });
-      expect(result).toBeObservable(expected);
-    });
-
-    it('should return false on faild', () => {
-      spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
-      const result = service.ownerCanDisconnectProfileFromOrcid();
-      const expected = cold('(a|)', {
-        a: false
-      });
-      expect(result).toBeObservable(expected);
-    });
-  });
-
-  describe('linkOrcidByItem', () => {
-    beforeEach(() => {
-      scheduler = getTestScheduler();
-      spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
-      spyOn((service as any), 'findById').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
-    });
-
-    it('should call patch method properly', () => {
-      const operations: AddOperation<string>[] = [{
-        path: '/orcid',
-        op: 'add',
-        value: 'test-code'
-      }];
-
-      scheduler.schedule(() => service.linkOrcidByItem(mockItemUnlinkedToOrcid, 'test-code').subscribe());
-      scheduler.flush();
-
-      expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, operations);
-    });
-  });
-
-  describe('unlinkOrcidByItem', () => {
-    beforeEach(() => {
-      scheduler = getTestScheduler();
-      spyOn((service as any).dataService, 'patch').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfilePatched));
-      spyOn((service as any), 'findById').and.returnValue(createSuccessfulRemoteDataObject$(researcherProfile));
-    });
-
-    it('should call patch method properly', () => {
-      const operations: RemoveOperation[] = [{
-        path: '/orcid',
-        op: 'remove'
-      }];
-
-      scheduler.schedule(() => service.unlinkOrcidByItem(mockItemLinkedToOrcid).subscribe());
-      scheduler.flush();
-
-      expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, operations);
-    });
-  });
-
-  describe('getOrcidAuthorizeUrl', () => {
-    beforeEach(() => {
-      routerStub.setRoute('/entities/person/uuid/orcid');
-      (service as any).configurationService.findByPropertyName.and.returnValues(
-        createSuccessfulRemoteDataObject$(authorizeUrl),
-        createSuccessfulRemoteDataObject$(appClientId),
-        createSuccessfulRemoteDataObject$(orcidScope)
-      );
-    });
-
-    it('should build the url properly', () => {
-      const result = service.getOrcidAuthorizeUrl(mockItemUnlinkedToOrcid);
-      const redirectUri: string = new URLCombiner(nativeWindowService.nativeWindow.origin, encodeURIComponent(routerStub.url.split('?')[0])).toString();
-      const url = 'orcid.authorize-url?client_id=orcid.application-client-id&redirect_uri=' + redirectUri + '&response_type=code&scope=/authenticate /read-limited';
-
-      const expected = cold('(a|)', {
-        a: url
-      });
-      expect(result).toBeObservable(expected);
-    });
-  });
-
   describe('updateByOrcidOperations', () => {
     beforeEach(() => {
       scheduler = getTestScheduler();
@@ -543,34 +416,4 @@ describe('ResearcherProfileService', () => {
       expect((service as any).dataService.patch).toHaveBeenCalledWith(researcherProfile, []);
     });
   });
-
-  describe('getOrcidAuthorizationScopesByItem', () => {
-    it('should return list of scopes saved in the item', () => {
-      const orcidScopes = [
-        '/authenticate',
-        '/read-limited',
-        '/activities/update',
-        '/person/update'
-      ];
-      const result = service.getOrcidAuthorizationScopesByItem(mockItemLinkedToOrcid);
-      expect(result).toEqual(orcidScopes);
-    });
-  });
-
-  describe('getOrcidAuthorizationScopes', () => {
-    it('should return list of scopes by configuration', () => {
-      (service as any).configurationService.findByPropertyName.and.returnValue(
-        createSuccessfulRemoteDataObject$(orcidScope)
-      );
-      const orcidScopes = [
-        '/authenticate',
-        '/read-limited'
-      ];
-      const expected = cold('(a|)', {
-        a: orcidScopes
-      });
-      const result = service.getOrcidAuthorizationScopes();
-      expect(result).toBeObservable(expected);
-    });
-  });
 });
diff --git a/src/app/core/profile/researcher-profile.service.ts b/src/app/core/profile/researcher-profile.service.ts
index 0ceb851e2c..882845d133 100644
--- a/src/app/core/profile/researcher-profile.service.ts
+++ b/src/app/core/profile/researcher-profile.service.ts
@@ -1,41 +1,33 @@
 /* eslint-disable max-classes-per-file */
 import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { Store } from '@ngrx/store';
-import { AddOperation, Operation, RemoveOperation, ReplaceOperation } from 'fast-json-patch';
-import { combineLatest, Observable } from 'rxjs';
-import { find, map, switchMap } from 'rxjs/operators';
+import { Operation, ReplaceOperation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import { find, map } from 'rxjs/operators';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { ConfigurationDataService } from '../data/configuration-data.service';
 import { DataService } from '../data/data.service';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { ItemDataService } from '../data/item-data.service';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
-import {
-  getAllCompletedRemoteData,
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
-} from '../shared/operators';
+import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../shared/operators';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { RESEARCHER_PROFILE } from './model/researcher-profile.resource-type';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { PostRequest } from '../data/request.models';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { hasValue, isEmpty } from '../../shared/empty.util';
 import { CoreState } from '../core-state.model';
 import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Item } from '../shared/item.model';
 import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * A private DataService implementation to delegate specific methods to.
@@ -69,7 +61,6 @@ export class ResearcherProfileService {
   protected responseMsToLive: number = 10 * 1000;
 
   constructor(
-    @Inject(NativeWindowService) protected _window: NativeWindowRef,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
@@ -78,8 +69,7 @@ export class ResearcherProfileService {
     protected http: HttpClient,
     protected router: Router,
     protected comparator: DefaultChangeAnalyzer<ResearcherProfile>,
-    protected itemService: ItemDataService,
-    protected configurationService: ConfigurationDataService) {
+    protected itemService: ItemDataService) {
 
     this.dataService = new ResearcherProfileServiceImpl(requestService, rdbService, null, objectCache, halService,
       notificationsService, http, comparator);
@@ -165,98 +155,6 @@ export class ResearcherProfileService {
     return this.dataService.patch(researcherProfile, [replaceOperation]);
   }
 
-  /**
-   * Check if the given item is linked to an ORCID profile.
-   *
-   * @param item the item to check
-   * @returns the check result
-   */
-  public isLinkedToOrcid(item: Item): boolean {
-    return item.hasMetadata('dspace.orcid.authenticated');
-  }
-
-  /**
-   * Returns true if only the admin users can disconnect a researcher profile from ORCID.
-   *
-   * @returns the check result
-   */
-  public onlyAdminCanDisconnectProfileFromOrcid(): Observable<boolean> {
-    return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
-      map((propertyRD: RemoteData<ConfigurationProperty>) => {
-        return propertyRD.hasSucceeded && propertyRD.payload.values.map((value) => value.toLowerCase()).includes('only_admin');
-      })
-    );
-  }
-
-  /**
-   * Returns true if the profile's owner can disconnect that profile from ORCID.
-   *
-   * @returns the check result
-   */
-  public ownerCanDisconnectProfileFromOrcid(): Observable<boolean> {
-    return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
-      map((propertyRD: RemoteData<ConfigurationProperty>) => {
-        return propertyRD.hasSucceeded && propertyRD.payload.values.map( (value) => value.toLowerCase()).includes('admin_and_owner');
-      })
-    );
-  }
-
-  /**
-   * Perform a link operation to ORCID profile.
-   *
-   * @param person The person item related to the researcher profile
-   * @param code The auth-code received from orcid
-   */
-  public linkOrcidByItem(person: Item, code: string): Observable<RemoteData<ResearcherProfile>> {
-    const operations: AddOperation<string>[] = [{
-      path: '/orcid',
-      op: 'add',
-      value: code
-    }];
-
-    return this.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((profileRD) => this.updateByOrcidOperations(profileRD.payload, operations))
-    );
-  }
-
-  /**
-   * Perform unlink operation from ORCID profile.
-   *
-   * @param person The person item related to the researcher profile
-   */
-  public unlinkOrcidByItem(person: Item): Observable<RemoteData<ResearcherProfile>> {
-    const operations: RemoveOperation[] = [{
-      path:'/orcid',
-      op:'remove'
-    }];
-
-    return this.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
-      getFirstCompletedRemoteData(),
-      switchMap((profileRD) => this.updateByOrcidOperations(profileRD.payload, operations))
-    );
-  }
-
-  /**
-   * Build and return the url to authenticate with orcid
-   *
-   * @param profile
-   */
-  public getOrcidAuthorizeUrl(profile: Item): Observable<string> {
-    return combineLatest([
-      this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
-      this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
-      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
-    ).pipe(
-      map(([authorizeUrl, clientId, scopes]) => {
-        console.log(this._window.nativeWindow.origin, this.router.url);
-        const redirectUri = new URLCombiner(this._window.nativeWindow.origin, encodeURIComponent(this.router.url.split('?')[0]));
-        console.log(redirectUri.toString());
-        return authorizeUrl.values[0] + '?client_id=' + clientId.values[0]   + '&redirect_uri=' + redirectUri + '&response_type=code&scope='
-          + scopes.values.join(' ');
-      }));
-  }
-
   /**
    * Creates a researcher profile starting from an external source URI
    * @param sourceUri URI of source item of researcher profile.
@@ -291,29 +189,6 @@ export class ResearcherProfileService {
     return this.dataService.patch(researcherProfile, operations);
   }
 
-  /**
-   * Return all orcid authorization scopes saved in the given item
-   *
-   * @param item
-   */
-  public getOrcidAuthorizationScopesByItem(item: Item): string[] {
-    return isNotEmpty(item) ? item.allMetadataValues('dspace.orcid.scope') : [];
-  }
 
-  /**
-   * Return all orcid authorization scopes available by configuration
-   */
-  public getOrcidAuthorizationScopes(): Observable<string[]> {
-    return this.configurationService.findByPropertyName('orcid.scope').pipe(
-      getFirstCompletedRemoteData(),
-      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
-    );
-  }
-
-  private getOrcidDisconnectionAllowedUsersConfiguration(): Observable<RemoteData<ConfigurationProperty>> {
-    return this.configurationService.findByPropertyName('orcid.disconnection.allowed-users').pipe(
-      getFirstCompletedRemoteData()
-    );
-  }
 
 }
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
index 6b5f2d8593..e96e5996fb 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
@@ -9,7 +9,7 @@ import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
@@ -25,7 +25,7 @@ describe('OrcidAuthComponent test suite', () => {
   let comp: OrcidAuthComponent;
   let fixture: ComponentFixture<OrcidAuthComponent>;
   let scheduler: TestScheduler;
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let orcidAuthService: jasmine.SpyObj<OrcidAuthService>;
   let nativeWindowRef;
   let notificationsService;
 
@@ -112,7 +112,7 @@ describe('OrcidAuthComponent test suite', () => {
   });
 
   beforeEach(waitForAsync(() => {
-    researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+    orcidAuthService = jasmine.createSpyObj('researcherProfileService', {
       getOrcidAuthorizationScopes: jasmine.createSpy('getOrcidAuthorizationScopes'),
       getOrcidAuthorizationScopesByItem: jasmine.createSpy('getOrcidAuthorizationScopesByItem'),
       getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl'),
@@ -137,7 +137,7 @@ describe('OrcidAuthComponent test suite', () => {
       providers: [
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: ResearcherProfileService, useValue: researcherProfileService }
+        { provide: OrcidAuthService, useValue: orcidAuthService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(OrcidAuthComponent, {
@@ -149,17 +149,17 @@ describe('OrcidAuthComponent test suite', () => {
     scheduler = getTestScheduler();
     fixture = TestBed.createComponent(OrcidAuthComponent);
     comp = fixture.componentInstance;
-    researcherProfileService.getOrcidAuthorizationScopes.and.returnValue(of(orcidScopes));
+    orcidAuthService.getOrcidAuthorizationScopes.and.returnValue(of(orcidScopes));
   }));
 
   describe('when orcid profile is not linked', () => {
     beforeEach(waitForAsync(() => {
       comp.item = mockItemUnlinkedToOrcid;
-      researcherProfileService.getOrcidAuthorizationScopesByItem.and.returnValue([]);
-      researcherProfileService.isLinkedToOrcid.and.returnValue(false);
-      researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
-      researcherProfileService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
-      researcherProfileService.getOrcidAuthorizeUrl.and.returnValue(of('oarcidUrl'));
+      orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([]);
+      orcidAuthService.isLinkedToOrcid.and.returnValue(false);
+      orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+      orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+      orcidAuthService.getOrcidAuthorizeUrl.and.returnValue(of('oarcidUrl'));
       fixture.detectChanges();
     }));
 
@@ -183,7 +183,7 @@ describe('OrcidAuthComponent test suite', () => {
   describe('when orcid profile is linked', () => {
     beforeEach(waitForAsync(() => {
       comp.item = mockItemLinkedToOrcid;
-      researcherProfileService.isLinkedToOrcid.and.returnValue(true);
+      orcidAuthService.isLinkedToOrcid.and.returnValue(true);
     }));
 
     describe('', () => {
@@ -191,16 +191,16 @@ describe('OrcidAuthComponent test suite', () => {
       beforeEach(waitForAsync(() => {
         comp.item = mockItemLinkedToOrcid;
         notificationsService = (comp as any).notificationsService;
-        researcherProfileService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
-        researcherProfileService.isLinkedToOrcid.and.returnValue(true);
-        researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
-        researcherProfileService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+        orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+        orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+        orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+        orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
       }));
 
       describe('and unlink is successfully', () => {
         beforeEach(waitForAsync(() => {
           comp.item = mockItemLinkedToOrcid;
-          researcherProfileService.unlinkOrcidByItem.and.returnValue(createSuccessfulRemoteDataObject$(new ResearcherProfile()));
+          orcidAuthService.unlinkOrcidByItem.and.returnValue(createSuccessfulRemoteDataObject$(new ResearcherProfile()));
           spyOn(comp.unlink, 'emit');
           fixture.detectChanges();
         }));
@@ -217,7 +217,7 @@ describe('OrcidAuthComponent test suite', () => {
       describe('and unlink is failed', () => {
         beforeEach(waitForAsync(() => {
           comp.item = mockItemLinkedToOrcid;
-          researcherProfileService.unlinkOrcidByItem.and.returnValue(createFailedRemoteDataObject$());
+          orcidAuthService.unlinkOrcidByItem.and.returnValue(createFailedRemoteDataObject$());
           fixture.detectChanges();
         }));
 
@@ -234,10 +234,10 @@ describe('OrcidAuthComponent test suite', () => {
 
       beforeEach(waitForAsync(() => {
         comp.item = mockItemLinkedToOrcid;
-        researcherProfileService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
-        researcherProfileService.isLinkedToOrcid.and.returnValue(true);
-        researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
-        researcherProfileService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+        orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+        orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+        orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+        orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
         fixture.detectChanges();
       }));
 
@@ -263,10 +263,10 @@ describe('OrcidAuthComponent test suite', () => {
 
       beforeEach(waitForAsync(() => {
         comp.item = mockItemLinkedToOrcid;
-        researcherProfileService.getOrcidAuthorizationScopesByItem.and.returnValue([...partialOrcidScopes]);
-        researcherProfileService.isLinkedToOrcid.and.returnValue(true);
-        researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
-        researcherProfileService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+        orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...partialOrcidScopes]);
+        orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+        orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+        orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
         fixture.detectChanges();
       }));
 
@@ -294,10 +294,10 @@ describe('OrcidAuthComponent test suite', () => {
 
       beforeEach(waitForAsync(() => {
         comp.item = mockItemLinkedToOrcid;
-        researcherProfileService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
-        researcherProfileService.isLinkedToOrcid.and.returnValue(true);
-        researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(true));
-        researcherProfileService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(false));
+        orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+        orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+        orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+        orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(false));
         fixture.detectChanges();
       }));
 
@@ -314,10 +314,10 @@ describe('OrcidAuthComponent test suite', () => {
 
       beforeEach(waitForAsync(() => {
         comp.item = mockItemLinkedToOrcid;
-        researcherProfileService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
-        researcherProfileService.isLinkedToOrcid.and.returnValue(true);
-        researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(true));
-        researcherProfileService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+        orcidAuthService.getOrcidAuthorizationScopesByItem.and.returnValue([...orcidScopes]);
+        orcidAuthService.isLinkedToOrcid.and.returnValue(true);
+        orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid.and.returnValue(of(true));
+        orcidAuthService.ownerCanDisconnectProfileFromOrcid.and.returnValue(of(true));
         fixture.detectChanges();
       }));
 
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index b052fdedd8..ea970e7d31 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -3,14 +3,13 @@ import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, Simp
 import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-
-import { ResearcherProfileService } from '../../../core/profile/researcher-profile.service';
 import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
 import { Item } from '../../../core/shared/item.model';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 @Component({
   selector: 'ds-orcid-auth',
@@ -65,7 +64,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   @Output() unlink: EventEmitter<void> = new EventEmitter<void>();
 
   constructor(
-    private researcherProfileService: ResearcherProfileService,
+    private orcidAuthService: OrcidAuthService,
     private translateService: TranslateService,
     private notificationsService: NotificationsService,
     @Inject(NativeWindowService) private _window: NativeWindowRef,
@@ -73,7 +72,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   }
 
   ngOnInit() {
-    this.researcherProfileService.getOrcidAuthorizationScopes().subscribe((scopes: string[]) => {
+    this.orcidAuthService.getOrcidAuthorizationScopes().subscribe((scopes: string[]) => {
       this.orcidAuthorizationScopes.next(scopes);
       this.initOrcidAuthSettings();
     });
@@ -160,7 +159,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
    * Link existing person profile with orcid
    */
   linkOrcid(): void {
-    this.researcherProfileService.getOrcidAuthorizeUrl(this.item).subscribe((authorizeUrl) => {
+    this.orcidAuthService.getOrcidAuthorizeUrl(this.item).subscribe((authorizeUrl) => {
       this._window.nativeWindow.location.href = authorizeUrl;
     });
   }
@@ -170,7 +169,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
    */
   unlinkOrcid(): void {
     this.unlinkProcessing.next(true);
-    this.researcherProfileService.unlinkOrcidByItem(this.item).pipe(
+    this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
       getFirstCompletedRemoteData()
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
@@ -193,19 +192,19 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
 
     this.setMissingOrcidAuthorizations();
 
-    this.researcherProfileService.onlyAdminCanDisconnectProfileFromOrcid().subscribe((result) => {
+    this.orcidAuthService.onlyAdminCanDisconnectProfileFromOrcid().subscribe((result) => {
       this.onlyAdminCanDisconnectProfileFromOrcid$.next(result);
     });
 
-    this.researcherProfileService.ownerCanDisconnectProfileFromOrcid().subscribe((result) => {
+    this.orcidAuthService.ownerCanDisconnectProfileFromOrcid().subscribe((result) => {
       this.ownerCanDisconnectProfileFromOrcid$.next(result);
     });
 
-    this.isOrcidLinked$.next(this.researcherProfileService.isLinkedToOrcid(this.item));
+    this.isOrcidLinked$.next(this.orcidAuthService.isLinkedToOrcid(this.item));
   }
 
   private setMissingOrcidAuthorizations(): void {
-    const profileScopes = this.researcherProfileService.getOrcidAuthorizationScopesByItem(this.item);
+    const profileScopes = this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item);
     const orcidScopes = this.orcidAuthorizationScopes.value;
     const missingScopes = orcidScopes.filter((scope) => !profileScopes.includes(scope));
 
@@ -213,7 +212,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   }
 
   private setOrcidAuthorizationsFromItem(): void {
-    this.profileAuthorizationScopes.next(this.researcherProfileService.getOrcidAuthorizationScopesByItem(this.item));
+    this.profileAuthorizationScopes.next(this.orcidAuthService.getOrcidAuthorizationScopesByItem(this.item));
   }
 
 }
diff --git a/src/app/item-page/orcid-page/orcid-page.component.spec.ts b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
index a4af5edf5c..1ed237943e 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
@@ -11,7 +11,6 @@ import { getTestScheduler } from 'jasmine-marbles';
 
 import { AuthService } from '../../core/auth/auth.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
 import { OrcidPageComponent } from './orcid-page.component';
 import {
   createFailedRemoteDataObject$,
@@ -23,6 +22,7 @@ import { createPaginatedList } from '../../shared/testing/utils.test';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
 
 describe('OrcidPageComponent test suite', () => {
   let comp: OrcidPageComponent;
@@ -32,7 +32,7 @@ describe('OrcidPageComponent test suite', () => {
   let routeStub: jasmine.SpyObj<ActivatedRouteStub>;
   let routeData: any;
   let itemDataService: jasmine.SpyObj<ItemDataService>;
-  let researcherProfileService: jasmine.SpyObj<ResearcherProfileService>;
+  let orcidAuthService: jasmine.SpyObj<OrcidAuthService>;
 
   const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
     id: 'test-id',
@@ -88,7 +88,7 @@ describe('OrcidPageComponent test suite', () => {
 
     routeStub = new ActivatedRouteStub({}, routeData);
 
-    researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+    orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
       isLinkedToOrcid: jasmine.createSpy('isLinkedToOrcid'),
       linkOrcidByItem: jasmine.createSpy('linkOrcidByItem'),
     });
@@ -110,7 +110,7 @@ describe('OrcidPageComponent test suite', () => {
       declarations: [OrcidPageComponent],
       providers: [
         { provide: ActivatedRoute, useValue: routeStub },
-        { provide: ResearcherProfileService, useValue: researcherProfileService },
+        { provide: OrcidAuthService, useValue: orcidAuthService },
         { provide: AuthService, useValue: authService },
         { provide: ItemDataService, useValue: itemDataService },
         { provide: PLATFORM_ID, useValue: 'browser' },
@@ -146,7 +146,7 @@ describe('OrcidPageComponent test suite', () => {
     it('should call isLinkedToOrcid', () => {
       comp.isLinkedToOrcid();
 
-      expect(researcherProfileService.isLinkedToOrcid).toHaveBeenCalledWith(comp.item.value);
+      expect(orcidAuthService.isLinkedToOrcid).toHaveBeenCalledWith(comp.item.value);
     });
 
     it('should update item', fakeAsync(() => {
@@ -168,13 +168,13 @@ describe('OrcidPageComponent test suite', () => {
 
     describe('and linking to orcid profile is successfully', () => {
       beforeEach(waitForAsync(() => {
-        researcherProfileService.linkOrcidByItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
+        orcidAuthService.linkOrcidByItem.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
         itemDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockItemLinkedToOrcid));
         fixture.detectChanges();
       }));
 
       it('should call linkOrcidByItem', () => {
-        expect(researcherProfileService.linkOrcidByItem).toHaveBeenCalledWith(mockItem, 'orcid-code');
+        expect(orcidAuthService.linkOrcidByItem).toHaveBeenCalledWith(mockItem, 'orcid-code');
         expect(comp.updateItem).toHaveBeenCalled();
       });
 
@@ -193,13 +193,13 @@ describe('OrcidPageComponent test suite', () => {
 
     describe('and linking to orcid profile is failed', () => {
       beforeEach(waitForAsync(() => {
-        researcherProfileService.linkOrcidByItem.and.returnValue(createFailedRemoteDataObject$());
+        orcidAuthService.linkOrcidByItem.and.returnValue(createFailedRemoteDataObject$());
         itemDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockItemLinkedToOrcid));
         fixture.detectChanges();
       }));
 
       it('should call linkOrcidByItem', () => {
-        expect(researcherProfileService.linkOrcidByItem).toHaveBeenCalledWith(mockItem, 'orcid-code');
+        expect(orcidAuthService.linkOrcidByItem).toHaveBeenCalledWith(mockItem, 'orcid-code');
         expect(comp.updateItem).not.toHaveBeenCalled();
       });
 
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index a4628eed93..f3dbb569d9 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -1,10 +1,11 @@
 import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
 import { ActivatedRoute, ParamMap, Router } from '@angular/router';
+import { isPlatformBrowser } from '@angular/common';
 
 import { BehaviorSubject, combineLatest } from 'rxjs';
 import { map, take } from 'rxjs/operators';
 
-import { ResearcherProfileService } from '../../core/profile/researcher-profile.service';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
 import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
@@ -14,7 +15,6 @@ import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { isNotEmpty } from '../../shared/empty.util';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { isPlatformBrowser } from '@angular/common';
 
 /**
  * A component that represents the orcid settings page
@@ -50,7 +50,7 @@ export class OrcidPageComponent implements OnInit {
     @Inject(PLATFORM_ID) private platformId: any,
     private authService: AuthService,
     private itemService: ItemDataService,
-    private researcherProfileService: ResearcherProfileService,
+    private orcidAuthService: OrcidAuthService,
     private route: ActivatedRoute,
     private router: Router
   ) {
@@ -95,7 +95,7 @@ export class OrcidPageComponent implements OnInit {
    * @returns the check result
    */
   isLinkedToOrcid(): boolean {
-    return this.researcherProfileService.isLinkedToOrcid(this.item.value);
+    return this.orcidAuthService.isLinkedToOrcid(this.item.value);
   }
 
   /**
@@ -126,7 +126,7 @@ export class OrcidPageComponent implements OnInit {
    * @param code The auth-code received from ORCID
    */
   private linkProfileToOrcid(person: Item, code: string) {
-    this.researcherProfileService.linkOrcidByItem(person, code).pipe(
+    this.orcidAuthService.linkOrcidByItem(person, code).pipe(
       getFirstCompletedRemoteData()
     ).subscribe((profileRD: RemoteData<ResearcherProfile>) => {
       this.processingConnection.next(false);
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index accd5e57a5..c39e48b8fe 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -16,13 +16,14 @@ import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { By } from '@angular/platform-browser';
 import { Item } from '../../../core/shared/item.model';
-
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 describe('OrcidQueueComponent test suite', () => {
   let component: OrcidQueueComponent;
   let fixture: ComponentFixture<OrcidQueueComponent>;
   let debugElement: DebugElement;
   let orcidQueueService: OrcidQueueService;
+  let orcidAuthService: jasmine.SpyObj<OrcidAuthService>;
 
   const testOwnerId = 'test-owner-id';
 
@@ -102,6 +103,10 @@ describe('OrcidQueueComponent test suite', () => {
   orcidQueueServiceSpy.searchByOwnerId.and.returnValue(createSuccessfulRemoteDataObject$<PaginatedList<OrcidQueue>>(createPaginatedList<OrcidQueue>(orcidQueueElements)));
 
   beforeEach(waitForAsync(() => {
+    orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
+      getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl')
+    });
+
     void TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
@@ -114,6 +119,7 @@ describe('OrcidQueueComponent test suite', () => {
       ],
       declarations: [OrcidQueueComponent],
       providers: [
+        { provide: OrcidAuthService, useValue: orcidAuthService },
         { provide: OrcidQueueService, useValue: orcidQueueServiceSpy },
         { provide: OrcidHistoryDataService, useValue: {} },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 27f98598a7..c068465829 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -17,6 +17,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { AlertType } from '../../../shared/alert/aletr-type';
 import { Item } from '../../../core/shared/item.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 @Component({
   selector: 'ds-orcid-queue',
@@ -60,7 +61,8 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
    */
   private subs: Subscription[] = [];
 
-  constructor(private orcidQueueService: OrcidQueueService,
+  constructor(private orcidAuthService: OrcidAuthService,
+              private orcidQueueService: OrcidQueueService,
               protected translateService: TranslateService,
               private paginationService: PaginationService,
               private notificationsService: NotificationsService,
@@ -228,8 +230,11 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
    * @private
    */
   private getUnauthorizedErrorContent(): Observable<string> {
-    return this.orcidQueueService.getOrcidAuthorizeUrl(this.item.id).pipe(
-      switchMap((authorizeUrl) => this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.content', { orcid: authorizeUrl }))
+    return this.orcidAuthService.getOrcidAuthorizeUrl(this.item).pipe(
+      switchMap((authorizeUrl) => this.translateService.get(
+        'person.page.orcid.sync-queue.send.unauthorized-error.content',
+        { orcid: authorizeUrl }
+      ))
     );
   }
 
@@ -246,24 +251,24 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
         this.updateList();
         break;
       case 400:
-        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.bad-request-error'), null, { timeOut: -1 });
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.bad-request-error'), null, { timeOut: 0 });
         break;
       case 401:
         combineLatest([
           this.translateService.get('person.page.orcid.sync-queue.send.unauthorized-error.title'),
           this.getUnauthorizedErrorContent()],
         ).subscribe(([title, content]) => {
-          this.notificationsService.error(title, content, { timeOut: -1 }, true);
+          this.notificationsService.error(title, content, { timeOut: 0 }, true);
         });
         break;
       case 404:
         this.notificationsService.warning(this.translateService.get('person.page.orcid.sync-queue.send.not-found-warning'));
         break;
       case 409:
-        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.conflict-error'), null, { timeOut: -1 });
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.conflict-error'), null, { timeOut: 0 });
         break;
       default:
-        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.error'), null, { timeOut: -1 });
+        this.notificationsService.error(this.translateService.get('person.page.orcid.sync-queue.send.error'), null, { timeOut: 0 });
     }
   }
 
@@ -281,11 +286,10 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     combineLatest(translations).subscribe((messages) => {
       const title = messages.shift();
       const content = '<ul>' + messages.map((message) => `<li>${message}</li>`).join('') + '</ul>';
-      this.notificationsService.error(title, content, { timeOut: -1 }, true);
+      this.notificationsService.error(title, content, { timeOut: 0 }, true);
     });
   }
 
-
   /**
    * Unsubscribe from all subscriptions
    */

From 5eb635585889e15172ab6e457443de1d8616328b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 16 Jun 2022 15:44:18 +0200
Subject: [PATCH 051/103] [CST-5339] Make action color as primary

---
 .../item-page/orcid-page/orcid-queue/orcid-queue.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index fc8eb3c4cf..9358bcf835 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -33,7 +33,7 @@
             <td style="width: 20%" class="text-center">
               <div class="btn-group edit-field">
                 <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
-                        class="btn btn-outline-success my-1 col-md" (click)="send(entry)">
+                        class="btn btn-outline-primary my-1 col-md" (click)="send(entry)">
                   <i [ngClass]="getOperationClass(entry)"></i>
                 </button>
                 <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"

From edcbdabd5245d883bf579b10ed426cdbaf632aed Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Thu, 16 Jun 2022 16:02:24 +0200
Subject: [PATCH 052/103] [CST-5339] Added invalid country label for orcid
 synchronization

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 4abc9d208d..b4ebd92393 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4637,6 +4637,8 @@
 
   "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
 
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid ISO 3611 country",
+
   "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
 
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
@@ -4645,7 +4647,7 @@
 
   "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid ISO 3611 country",
 
   "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
 

From b1683e1424c849f730a6cd7c6edda09447aeda64 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 16 Jun 2022 19:04:20 +0200
Subject: [PATCH 053/103] [CST-5339] revert unintentional commit

---
 angular.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/angular.json b/angular.json
index 2ece0c5e7d..56e06bd86c 100644
--- a/angular.json
+++ b/angular.json
@@ -63,8 +63,7 @@
                 "bundleName": "dspace-theme"
               }
             ],
-            "scripts": [],
-            "baseHref": "/"
+            "scripts": []
           },
           "configurations": {
             "development": {

From fe85a596ff8200187fcdc73f3cbd2249f476171b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 16 Jun 2022 19:06:30 +0200
Subject: [PATCH 054/103] [CST-5339] include OrcidAuthService in core.module

---
 src/app/core/core.module.ts              | 2 ++
 src/app/core/orcid/orcid-auth.service.ts | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 90e326a4df..b16930e819 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -177,6 +177,7 @@ import { OrcidQueueService } from './orcid/orcid-queue.service';
 import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
 import { OrcidQueue } from './orcid/model/orcid-queue.model';
 import { OrcidHistory } from './orcid/model/orcid-history.model';
+import { OrcidAuthService } from './orcid/orcid-auth.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -305,6 +306,7 @@ const PROVIDERS = [
   FeedbackDataService,
   ResearcherProfileService,
   ProfileClaimService,
+  OrcidAuthService,
   OrcidQueueService,
   OrcidHistoryDataService,
 ];
diff --git a/src/app/core/orcid/orcid-auth.service.ts b/src/app/core/orcid/orcid-auth.service.ts
index 7b85dccd9c..cf7bc2b259 100644
--- a/src/app/core/orcid/orcid-auth.service.ts
+++ b/src/app/core/orcid/orcid-auth.service.ts
@@ -16,9 +16,7 @@ import { ResearcherProfile } from '../profile/model/researcher-profile.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 
-@Injectable({
-  providedIn: 'root'
-})
+@Injectable()
 export class OrcidAuthService {
 
   constructor(

From ac677d52d7ab4fd14232b831e5a43c6264c41ef7 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Mon, 20 Jun 2022 15:27:32 +0200
Subject: [PATCH 055/103] [CST-5339] Various improvements

---
 src/app/core/orcid/model/orcid-history.model.ts      |  4 ++--
 src/app/core/orcid/model/orcid-queue.model.ts        |  4 ++--
 src/app/core/orcid/orcid-queue.service.ts            | 12 ++++++------
 .../orcid-queue/orcid-queue.component.spec.ts        |  8 ++++----
 .../orcid-page/orcid-queue/orcid-queue.component.ts  |  4 ++--
 src/assets/i18n/en.json5                             |  8 +++++---
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/app/core/orcid/model/orcid-history.model.ts b/src/app/core/orcid/model/orcid-history.model.ts
index fd7f73b9fa..ef8f30e0a3 100644
--- a/src/app/core/orcid/model/orcid-history.model.ts
+++ b/src/app/core/orcid/model/orcid-history.model.ts
@@ -34,10 +34,10 @@ export class OrcidHistory extends CacheableObject {
   entityName: string;
 
   /**
-   * The identifier of the owner of this Orcid History record.
+   * The identifier of the profileItem of this Orcid History record.
    */
   @autoserialize
-  ownerId: string;
+  profileItemId: string;
 
   /**
    * The identifier of the entity related to this Orcid History record.
diff --git a/src/app/core/orcid/model/orcid-queue.model.ts b/src/app/core/orcid/model/orcid-queue.model.ts
index f967772208..2a1c3f1d82 100644
--- a/src/app/core/orcid/model/orcid-queue.model.ts
+++ b/src/app/core/orcid/model/orcid-queue.model.ts
@@ -34,10 +34,10 @@ export class OrcidQueue extends CacheableObject {
   description: string;
 
   /**
-   * The identifier of the owner of this Orcid Queue record.
+   * The identifier of the profileItem of this Orcid Queue record.
    */
   @autoserialize
-  ownerId: string;
+  profileItemId: string;
 
   /**
    * The identifier of the entity related to this Orcid Queue record.
diff --git a/src/app/core/orcid/orcid-queue.service.ts b/src/app/core/orcid/orcid-queue.service.ts
index 6af8b8a4c7..30b9580b96 100644
--- a/src/app/core/orcid/orcid-queue.service.ts
+++ b/src/app/core/orcid/orcid-queue.service.ts
@@ -73,7 +73,7 @@ export class OrcidQueueService {
   }
 
   /**
-   * @param itemId                      It represent an Id of owner
+   * @param itemId                      It represent an Id of profileItem
    * @param paginationOptions           The pagination options object
    * @param useCachedVersionIfAvailable If this is true, the request will only be sent if there's
    *                                    no valid cached version. Defaults to true
@@ -81,9 +81,9 @@ export class OrcidQueueService {
    *                                    requested after the response becomes stale
    * @returns { OrcidQueue }
    */
-  searchByOwnerId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
-    return this.dataService.searchBy('findByOwner', {
-        searchParams: [new RequestParam('ownerId', itemId)],
+  searchByProfileItemId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
+    return this.dataService.searchBy('findByProfileItem', {
+        searchParams: [new RequestParam('profileItemId', itemId)],
         elementsPerPage: paginationOptions.pageSize,
         currentPage: paginationOptions.currentPage
       },
@@ -103,8 +103,8 @@ export class OrcidQueueService {
   /**
    * This method will set linkPath to stale
    */
-  clearFindByOwnerRequests() {
-    this.requestService.setStaleByHrefSubstring(this.dataService.linkPath + '/search/findByOwner');
+  clearFindByProfileItemRequests() {
+    this.requestService.setStaleByHrefSubstring(this.dataService.linkPath + '/search/findByProfileItem');
   }
 
 }
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index c39e48b8fe..9107ac34ff 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -25,7 +25,7 @@ describe('OrcidQueueComponent test suite', () => {
   let orcidQueueService: OrcidQueueService;
   let orcidAuthService: jasmine.SpyObj<OrcidAuthService>;
 
-  const testOwnerId = 'test-owner-id';
+  const testProfileItemId = 'test-owner-id';
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -88,7 +88,7 @@ describe('OrcidQueueComponent test suite', () => {
   function orcidQueueElement(id: number) {
     return Object.assign(new OrcidQueue(), {
       'id': id,
-      'ownerId': testOwnerId,
+      'profileItemId': testProfileItemId,
       'entityId': `test-entity-${id}`,
       'description': `test description ${id}`,
       'recordType': 'Publication',
@@ -99,8 +99,8 @@ describe('OrcidQueueComponent test suite', () => {
 
   const orcidQueueElements = [orcidQueueElement(1), orcidQueueElement(2)];
 
-  const orcidQueueServiceSpy = jasmine.createSpyObj('orcidQueueService', ['searchByOwnerId', 'clearFindByOwnerRequests']);
-  orcidQueueServiceSpy.searchByOwnerId.and.returnValue(createSuccessfulRemoteDataObject$<PaginatedList<OrcidQueue>>(createPaginatedList<OrcidQueue>(orcidQueueElements)));
+  const orcidQueueServiceSpy = jasmine.createSpyObj('orcidQueueService', ['searchByProfileItemId', 'clearFindByProfileItemRequests']);
+  orcidQueueServiceSpy.searchByProfileItemId.and.returnValue(createSuccessfulRemoteDataObject$<PaginatedList<OrcidQueue>>(createPaginatedList<OrcidQueue>(orcidQueueElements)));
 
   beforeEach(waitForAsync(() => {
     orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index c068465829..486ff670d5 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -89,12 +89,12 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
         debounceTime(100),
         distinctUntilChanged(),
         tap(() => this.processing$.next(true)),
-        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByOwnerId(this.item.id, config, false)),
+        switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByProfileItemId(this.item.id, config, false)),
         getFirstCompletedRemoteData()
       ).subscribe((result: RemoteData<PaginatedList<OrcidQueue>>) => {
         this.processing$.next(false);
         this.list$.next(result);
-        this.orcidQueueService.clearFindByOwnerRequests();
+        this.orcidQueueService.clearFindByProfileItemRequests();
       })
     );
   }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 71657d7a9c..5603ea27e8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4650,23 +4650,25 @@
 
   "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
 
-  "person.page.orcid.sync-queue.send.validation-error.type.required": "The type is required",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
 
   "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
 
   "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
 
-  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid ISO 3611 country",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
 
   "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
 
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
 
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
+
   "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
 
   "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "The address of the organization to be sent requires a city",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid ISO 3611 country",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
 
   "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
 

From 6abef910948da318fdf0d026cbec7f59466c4d5f Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 20 Jun 2022 18:21:55 +0200
Subject: [PATCH 056/103] [CST-6056] use authority operator for authority facet

---
 .../search-authority-filter.component.ts               | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index 6dcb47ce9f..fc76f62d95 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { FilterType } from '../../../models/filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
+import { addOperatorToFilterValue } from '../../../search.utils';
 
 @Component({
   selector: 'ds-search-authority-filter',
@@ -15,4 +16,13 @@ import { renderFacetFor } from '../search-filter-type-decorator';
  */
 @renderFacetFor(FilterType.authority)
 export class SearchAuthorityFilterComponent extends SearchFacetFilterComponent implements OnInit {
+
+  /**
+   * Submits a selected filter value to the filter
+   * Adds the "authority" operator to the received data before passing it on
+   * @param data The string selected from input suggestions
+   */
+  onClick(data: any) {
+    this.applyFilterValue(addOperatorToFilterValue(data, 'authority'));
+  }
 }

From ac41e7b3d60cc14486dea6af02559b5999e125db Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 20 Jun 2022 18:32:28 +0200
Subject: [PATCH 057/103] [CST-6056] use onClick method on clickSuggestion for
 authority filter

---
 .../search-authority-filter.component.html                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 44aed494e3..fdf154bc04 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
@@ -24,7 +24,7 @@
                           [name]="filterConfig.paramName"
                           [(ngModel)]="filter"
                           (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onSubmit($event)"
+                          (clickSuggestion)="onClick($event)"
                           (findSuggestions)="findSuggestions($event)"
                           ngDefaultControl></ds-filter-input-suggestions>
 </div>

From 555d98f7003f4e1ad85184ec99df3eacd0b360d8 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Mon, 20 Jun 2022 19:05:57 +0200
Subject: [PATCH 058/103] [CST-5339] Improved project synchronization

---
 .../item-page/orcid-page/orcid-queue/orcid-queue.component.ts   | 2 +-
 src/assets/i18n/en.json5                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
index 486ff670d5..99ba33ee82 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.ts
@@ -118,7 +118,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     switch (orcidQueue.recordType.toLowerCase()) {
       case 'publication':
         return 'fas fa-book';
-      case 'funding':
+      case 'project':
         return 'fas fa-wallet';
       case 'education':
         return 'fas fa-school';
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5603ea27e8..076d2e80c8 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4608,7 +4608,7 @@
 
   "person.page.orcid.sync-queue.tooltip.publication": "Publication",
 
-  "person.page.orcid.sync-queue.tooltip.funding": "Funding",
+  "person.page.orcid.sync-queue.tooltip.project": "Project",
 
   "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
 

From 7724db530b94a90e3e60e660afed7fbffbf50a65 Mon Sep 17 00:00:00 2001
From: Luca Giamminonni <luca.giamminonni@4science.it>
Date: Tue, 21 Jun 2022 11:32:09 +0200
Subject: [PATCH 059/103] [CST-5339] Added ORCID label

---
 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 076d2e80c8..3d5f15b4f2 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3735,6 +3735,8 @@
 
   "submission.import-external.source.wos": "Web Of Science",
 
+  "submission.import-external.source.orcidWorks": "ORCID",
+
   "submission.import-external.source.epo": "European Patent Office (EPO)",
 
   "submission.import-external.source.loading": "Loading ...",

From 20314d462009dba9a852be10ab59e3fdab5a7708 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 21 Jun 2022 13:37:42 +0200
Subject: [PATCH 060/103] [CST-6056] Fix issue with authority suggestion by
 adding the filter query in the input suggestion object

---
 .../filter-input-suggestions.component.html           |  2 +-
 .../filter-input-suggestions.component.spec.ts        |  2 +-
 .../filter-input-suggestions.component.ts             |  4 ++--
 .../input-suggestions/input-suggestions.model.ts      |  8 ++++++++
 .../search-authority-filter.component.ts              | 10 ----------
 .../search-facet-filter.component.ts                  | 11 ++++++-----
 6 files changed, 18 insertions(+), 19 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 3b150a46c9..726dc9ca0e 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
@@ -27,7 +27,7 @@
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
       <div *ngFor="let suggestionOption of suggestions">
-        <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+        <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
           <span [innerHTML]="suggestionOption.displayValue"></span>
         </a>
       </div>
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
index 3c55715b06..6a0324d2ac 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
@@ -51,7 +51,7 @@ describe('FilterInputSuggestionsComponent', () => {
       fixture.detectChanges();
     });
     it('should call onClickSuggestion() with the suggestion as a parameter', () => {
-      expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value);
+      expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex]);
     });
   });
 });
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index ed1a074cd1..ee47dc80c9 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -32,8 +32,8 @@ export class FilterInputSuggestionsComponent extends InputSuggestionsComponent {
     this.submitSuggestion.emit(data);
   }
 
-  onClickSuggestion(data) {
-    this.value = data;
+  onClickSuggestion(data: InputSuggestion) {
+    this.value = data.value;
     this.clickSuggestion.emit(data);
     this.close();
     this.blockReopen = true;
diff --git a/src/app/shared/input-suggestions/input-suggestions.model.ts b/src/app/shared/input-suggestions/input-suggestions.model.ts
index 840b9af8a0..018d01c7d7 100644
--- a/src/app/shared/input-suggestions/input-suggestions.model.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.model.ts
@@ -7,6 +7,14 @@ export interface InputSuggestion {
    */
   displayValue: string;
 
+  /**
+   * The search query that can be used with filter suggestion.
+   * It contains the value within the operator :
+   *  - value,equals
+   *  - value,authority
+   */
+  query?: string;
+
   /**
    * The actual value of the suggestion
    */
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index fc76f62d95..6dcb47ce9f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core';
 import { FilterType } from '../../../models/filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { addOperatorToFilterValue } from '../../../search.utils';
 
 @Component({
   selector: 'ds-search-authority-filter',
@@ -16,13 +15,4 @@ import { addOperatorToFilterValue } from '../../../search.utils';
  */
 @renderFacetFor(FilterType.authority)
 export class SearchAuthorityFilterComponent extends SearchFacetFilterComponent implements OnInit {
-
-  /**
-   * Submits a selected filter value to the filter
-   * Adds the "authority" operator to the received data before passing it on
-   * @param data The string selected from input suggestions
-   */
-  onClick(data: any) {
-    this.applyFilterValue(addOperatorToFilterValue(data, 'authority'));
-  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index c754d80a79..ada1bccd63 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -29,7 +29,7 @@ import { InputSuggestion } from '../../../../input-suggestions/input-suggestions
 import { SearchOptions } from '../../../models/search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { currentPath } from '../../../../utils/route.utils';
-import { addOperatorToFilterValue, getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
+import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
 
 @Component({
@@ -239,11 +239,11 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
 
   /**
    * Submits a selected filter value to the filter
-   * Adds the "equals" operator to the received data before passing it on
-   * @param data The string selected from input suggestions
+   * Take the query from the InputSuggestion object
+   * @param data The input suggestion selected
    */
-  onClick(data: any) {
-    this.applyFilterValue(addOperatorToFilterValue(data, 'equals'));
+  onClick(data: InputSuggestion) {
+    this.applyFilterValue(data.query);
   }
 
   /**
@@ -279,6 +279,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
                   return rd.payload.page.map((facet) => {
                     return {
                       displayValue: this.getDisplayValue(facet, data),
+                      query: this.getFacetValue(facet),
                       value: stripOperatorFromFilterValue(this.getFacetValue(facet))
                     };
                   });

From f942eced3a723e43511e1d871bcf9865f4f78024 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 3 Jun 2022 11:13:00 -0500
Subject: [PATCH 061/103] Ensure a valid sort is specified

---
 .../item-collection-mapper.component.ts                | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index a71fe5b385..f5a9461b5b 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -28,6 +28,7 @@ import { SearchConfigurationService } from '../../../core/shared/search/search-c
 import { SearchService } from '../../../core/shared/search/search.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getItemPageRoute } from '../../item-page-routing-paths';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 
 @Component({
   selector: 'ds-item-collection-mapper',
@@ -73,6 +74,12 @@ export class ItemCollectionMapperComponent implements OnInit {
    */
   mappedCollectionsRD$: Observable<RemoteData<PaginatedList<Collection>>>;
 
+  /**
+   * Sort on title ASC by default
+   * @type {SortOptions}
+   */
+   defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
+
   /**
    * Firing this observable (shouldUpdate$.next(true)) forces the two lists to reload themselves
    * Usually fired after the lists their cache is cleared (to force a new request to the REST API)
@@ -149,7 +156,8 @@ export class ItemCollectionMapperComponent implements OnInit {
       switchMap(([itemCollectionsRD, owningCollectionRD, searchOptions]) => {
         return this.searchService.search(Object.assign(new PaginatedSearchOptions(searchOptions), {
           query: this.buildQuery([...itemCollectionsRD.payload.page, owningCollectionRD.payload], searchOptions.query),
-          dsoTypes: [DSpaceObjectType.COLLECTION]
+          dsoTypes: [DSpaceObjectType.COLLECTION],
+          sort: this.defaultSortOptions
         }), 10000).pipe(
           toDSpaceObjectListRD(),
           startWith(undefined)

From f3e4fb9901439021aabd5ccd55f61a5d9e39cbb9 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 21 Jun 2022 16:07:37 -0500
Subject: [PATCH 062/103] Fix defaults in Pagination Service

---
 .../pagination/pagination.service.spec.ts     | 23 +++++++++++++++++--
 src/app/core/pagination/pagination.service.ts |  6 ++++-
 .../item-collection-mapper.component.ts       | 10 +-------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index 94b6b48d59..66349e8a9e 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -12,7 +12,7 @@ describe('PaginationService', () => {
   let routeService;
 
   const defaultPagination = new PaginationComponentOptions();
-  const defaultSort = new SortOptions('id', SortDirection.DESC);
+  const defaultSort = new SortOptions('dc.title', SortDirection.ASC);
   const defaultFindListOptions = new FindListOptions();
 
   beforeEach(() => {
@@ -39,7 +39,6 @@ describe('PaginationService', () => {
     service = new PaginationService(routeService, router);
   });
 
-
   describe('getCurrentPagination', () => {
     it('should retrieve the current pagination info from the routerService', () => {
       service.getCurrentPagination('test-id', defaultPagination).subscribe((currentPagination) => {
@@ -56,6 +55,26 @@ describe('PaginationService', () => {
         expect(currentSort).toEqual(Object.assign(new SortOptions('score', SortDirection.ASC )));
       });
     });
+    it('should return default sort when no sort specified', () => {
+      // This is same as routeService (defined above), but returns no sort field or direction
+      routeService = {
+        getQueryParameterValue: (param) => {
+          let value;
+          if (param.endsWith('.page')) {
+            value = 5;
+          }
+          if (param.endsWith('.rpp')) {
+            value = 10;
+          }
+          return observableOf(value);
+        }
+      };
+      service = new PaginationService(routeService, router);
+
+      service.getCurrentSort('test-id', defaultSort).subscribe((currentSort) => {
+        expect(currentSort).toEqual(defaultSort);
+      });
+    });
   });
   describe('getFindListOptions', () => {
     it('should retrieve the current findListOptions info from the routerService', () => {
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index a6f8052c4b..40e13d654f 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -24,7 +24,11 @@ import { isNumeric } from '../../shared/numeric.util';
  */
 export class PaginationService {
 
-  private defaultSortOptions = new SortOptions('id', SortDirection.ASC);
+  /**
+   * Sort on title ASC by default
+   * @type {SortOptions}
+   */
+  private defaultSortOptions = new SortOptions('dc.title', SortDirection.ASC);
 
   private clearParams = {};
 
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index f5a9461b5b..a71fe5b385 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -28,7 +28,6 @@ import { SearchConfigurationService } from '../../../core/shared/search/search-c
 import { SearchService } from '../../../core/shared/search/search.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getItemPageRoute } from '../../item-page-routing-paths';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 
 @Component({
   selector: 'ds-item-collection-mapper',
@@ -74,12 +73,6 @@ export class ItemCollectionMapperComponent implements OnInit {
    */
   mappedCollectionsRD$: Observable<RemoteData<PaginatedList<Collection>>>;
 
-  /**
-   * Sort on title ASC by default
-   * @type {SortOptions}
-   */
-   defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
-
   /**
    * Firing this observable (shouldUpdate$.next(true)) forces the two lists to reload themselves
    * Usually fired after the lists their cache is cleared (to force a new request to the REST API)
@@ -156,8 +149,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       switchMap(([itemCollectionsRD, owningCollectionRD, searchOptions]) => {
         return this.searchService.search(Object.assign(new PaginatedSearchOptions(searchOptions), {
           query: this.buildQuery([...itemCollectionsRD.payload.page, owningCollectionRD.payload], searchOptions.query),
-          dsoTypes: [DSpaceObjectType.COLLECTION],
-          sort: this.defaultSortOptions
+          dsoTypes: [DSpaceObjectType.COLLECTION]
         }), 10000).pipe(
           toDSpaceObjectListRD(),
           startWith(undefined)

From 5d130156e8633ef8b661871bcd526703c82fd71b Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 22 Jun 2022 15:43:23 +0200
Subject: [PATCH 063/103] [CST-6174] Fix issue with bitstream access condition
 edit form when maxStartDate/maxEndDate are missing

---
 .../section-upload-file-edit.component.ts     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

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 3a43e718a0..293835c848 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
@@ -15,7 +15,9 @@ import {
   OR_OPERATOR
 } from '@ng-dynamic-forms/core';
 
-import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
+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,
@@ -43,10 +45,16 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { filter, mergeMap, take } from 'rxjs/operators';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
-import { WorkspaceitemSectionUploadObject } from '../../../../../core/submission/models/workspaceitem-section-upload.model';
+import {
+  WorkspaceitemSectionUploadObject
+} from '../../../../../core/submission/models/workspaceitem-section-upload.model';
 import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
-import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import {
+  SubmissionJsonPatchOperationsService
+} from '../../../../../core/submission/submission-json-patch-operations.service';
+import {
+  JsonPatchOperationPathCombiner
+} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SectionUploadService } from '../../section-upload.service';
 import { Subscription } from 'rxjs';
 
@@ -251,7 +259,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
       endDateControl?.setValue(null);
 
       if (showGroups) {
-        if (accessCondition.hasStartDate) {
+        if (accessCondition.hasStartDate && accessCondition.maxStartDate) {
           const startDateModel = this.formBuilderService.findById(
             'startDate',
             (model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel;
@@ -263,7 +271,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
             day: min.getUTCDate()
           };
         }
-        if (accessCondition.hasEndDate) {
+        if (accessCondition.hasEndDate && accessCondition.maxEndDate) {
           const endDateModel = this.formBuilderService.findById(
             'endDate',
             (model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel;
@@ -274,6 +282,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
             month: max.getUTCMonth() + 1,
             day: max.getUTCDate()
           };
+
         }
       }
     }

From 8c14822eefe119b093e4034fd6b51d35ae2899eb Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Wed, 22 Jun 2022 15:46:30 +0200
Subject: [PATCH 064/103] [CST-6174] Fix issue with item access condition which
 doesn't consider the maxStartDate/maxEndDate

---
 .../accesses/section-accesses.component.ts    | 67 +++++++++++++------
 1 file changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index 40863e7ef9..c59f9af2d0 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -41,7 +41,9 @@ import {
   FORM_ACCESS_CONDITION_TYPE_LAYOUT
 } from './section-accesses.model';
 import { hasValue, isNotEmpty, isNotNull } from '../../../shared/empty.util';
-import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
+import {
+  WorkspaceitemSectionAccessesObject
+} from '../../../core/submission/models/workspaceitem-section-accesses.model';
 import { SubmissionAccessesConfigService } from '../../../core/config/submission-accesses-config.service';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { FormComponent } from '../../../shared/form/form.component';
@@ -50,8 +52,12 @@ import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder
 import { SectionFormOperationsService } from '../form/section-form-operations.service';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import {
+  SubmissionJsonPatchOperationsService
+} from '../../../core/submission/submission-json-patch-operations.service';
 import { dateToISOFormat } from '../../../shared/date.util';
+import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
+import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
 
 /**
  * This component represents a section for managing item's access conditions.
@@ -322,40 +328,61 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
     }
     accessConditionTypeModelConfig.options = accessConditionTypeOptions;
 
-    // Dynamically assign of relation in config. For startdate, endDate, groups.
-    const hasStart = [];
-    const hasEnd = [];
-    const hasGroups = [];
+    // Dynamically assign of relation in config. For startDate and endDate.
+    const startDateCondition: DynamicFormControlCondition[] = [];
+    const endDateCondition: DynamicFormControlCondition[] = [];
+    let maxStartDate: DynamicDateControlValue;
+    let maxEndDate: DynamicDateControlValue;
     this.availableAccessConditionOptions.forEach((condition) => {
-      const showStart: boolean = condition.hasStartDate === true;
-      const showEnd: boolean = condition.hasEndDate === true;
-      const showGroups: boolean = showStart || showEnd;
-      if (showStart) {
-        hasStart.push({ id: 'name', value: condition.name });
+
+      if (condition.hasStartDate) {
+        startDateCondition.push({ id: 'name', value: condition.name });
+        if (condition.maxStartDate) {
+          const min = new Date(condition.maxStartDate);
+          maxStartDate = {
+            year: min.getUTCFullYear(),
+            month: min.getUTCMonth() + 1,
+            day: min.getUTCDate()
+          };
+        }
       }
-      if (showEnd) {
-        hasEnd.push({ id: 'name', value: condition.name });
-      }
-      if (showGroups) {
-        hasGroups.push({ id: 'name', value: condition.name });
+      if (condition.hasEndDate) {
+        endDateCondition.push({ id: 'name', value: condition.name });
+        if (condition.maxEndDate) {
+          const max = new Date(condition.maxEndDate);
+          maxEndDate = {
+            year: max.getUTCFullYear(),
+            month: max.getUTCMonth() + 1,
+            day: max.getUTCDate()
+          };
+        }
       }
     });
-    const confStart = { relations: [{ match: MATCH_ENABLED, operator: OR_OPERATOR, when: hasStart }] };
-    const confEnd = { relations: [{ match: MATCH_ENABLED, operator: OR_OPERATOR, when: hasEnd }] };
+    const confStart = { relations: [{ match: MATCH_ENABLED, operator: OR_OPERATOR, when: startDateCondition }] };
+    const confEnd = { relations: [{ match: MATCH_ENABLED, operator: OR_OPERATOR, when: endDateCondition }] };
+    const hasStartDate = startDateCondition.length > 0;
+    const hasEndDate = endDateCondition.length > 0;
 
     accessConditionsArrayConfig.groupFactory = () => {
       const type = new DynamicSelectModel(accessConditionTypeModelConfig, FORM_ACCESS_CONDITION_TYPE_LAYOUT);
       const startDateConfig = Object.assign({}, FORM_ACCESS_CONDITION_START_DATE_CONFIG, confStart);
+      if (maxStartDate) {
+        startDateConfig.max = maxStartDate;
+      }
+
       const endDateConfig = Object.assign({}, FORM_ACCESS_CONDITION_END_DATE_CONFIG, confEnd);
+      if (maxEndDate) {
+        endDateConfig.max = maxEndDate;
+      }
 
       const startDate = new DynamicDatePickerModel(startDateConfig, FORM_ACCESS_CONDITION_START_DATE_LAYOUT);
       const endDate = new DynamicDatePickerModel(endDateConfig, FORM_ACCESS_CONDITION_END_DATE_LAYOUT);
       const accessConditionGroupConfig = Object.assign({}, ACCESS_CONDITION_GROUP_CONFIG);
       accessConditionGroupConfig.group = [type];
-      if (hasStart.length > 0) {
+      if (hasStartDate) {
         accessConditionGroupConfig.group.push(startDate);
       }
-      if (hasEnd.length > 0) {
+      if (hasEndDate) {
         accessConditionGroupConfig.group.push(endDate);
       }
       return [new DynamicFormGroupModel(accessConditionGroupConfig, ACCESS_CONDITION_GROUP_LAYOUT)];

From f2f8f0929ce6a95e8420a29d31161cac808e6b7a Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Wed, 22 Jun 2022 16:05:03 +0200
Subject: [PATCH 065/103] Add the default baseHref value to angular.json

---
 angular.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/angular.json b/angular.json
index 56e06bd86c..2ece0c5e7d 100644
--- a/angular.json
+++ b/angular.json
@@ -63,7 +63,8 @@
                 "bundleName": "dspace-theme"
               }
             ],
-            "scripts": []
+            "scripts": [],
+            "baseHref": "/"
           },
           "configurations": {
             "development": {

From f37f32b4abf3e4430bd8165f3f79551ff0446c03 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 10 May 2022 11:24:52 -0500
Subject: [PATCH 066/103] Drop Node 12 which is EOL. CI Build on 14 and 16

---
 .github/workflows/build.yml | 6 +++---
 README.md                   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eeddb37441..04d426d091 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [12.x, 14.x]
+        node-version: [14.x, 16.x]
       # Do NOT exit immediately if one matrix job fails
       fail-fast: false
     # These are the actual CI steps to perform per job
@@ -82,11 +82,11 @@ jobs:
         run: yarn run test:headless
 
       # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286
-      # Upload coverage reports to Codecov (for Node v12 only)
+      # Upload coverage reports to Codecov (for one version of Node only)
       # https://github.com/codecov/codecov-action
       - name: Upload coverage to Codecov.io
         uses: codecov/codecov-action@v2
-        if: matrix.node-version == '12.x'
+        if: matrix.node-version == '16.x'
 
       # Using docker-compose start backend using CI configuration
       # and load assetstore from a cached copy
diff --git a/README.md b/README.md
index 0e26d9e492..cef95a45fa 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v12.x`, `v14.x` or `v16.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v14.x` or `v16.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
 
 ```bash
 # clone the repo
@@ -90,7 +90,7 @@ Requirements
 ------------
 
 -	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v12.x`, `v14.x` or `v16.x` and yarn == `v1.x`
+-	Ensure you're running node `v14.x` or `v16.x` and yarn == `v1.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 

From 5e15eb07f7fb5effa65712d3cafa8dfd043a939e Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 10:40:33 +0200
Subject: [PATCH 067/103] fixed typo in community.create.sub-head

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index effe6932fd..4e61a9727b 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1375,7 +1375,7 @@
   "community.create.notifications.success": "Bereich erfolgreich angelegt",
   
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-  "community.create.sub-head": "Teilbeirech im Bereich {{ parent }} anlegen",
+  "community.create.sub-head": "Teilbereich im Bereich {{ parent }} anlegen",
   
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Bereich: {{community}} pflegen",

From 395b2762b538fc9439bc4f27b08c10e64cff6a82 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 10:47:32 +0200
Subject: [PATCH 068/103] added submission.edit.breadcrumbs

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

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 4e61a9727b..f79d6f9883 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -4615,6 +4615,8 @@
   "statistics.table.header.views": "Aufrufe",
   
   
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Einreichung bearbeiten",
   
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Einreichung bearbeiten",

From 146bbd80423c132c4c92ea92b589df64fe0cde48 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 10:49:26 +0200
Subject: [PATCH 069/103] translation harmonization

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index f79d6f9883..dce700c795 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1562,7 +1562,7 @@
   "community.form.errors.title.required": "Bitte geben Sie einen Namen für den Bereich ein.",
   
   // "community.form.rights": "Copyright text (HTML)",
-  "community.form.rights": "Copyrighterklärung (HTML)",
+  "community.form.rights": "Copyright Text (HTML)",
   
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Neuigkeiten (HTML)",

From f9c6f5f5b674665eb2650129ebe35edd311df97b Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 11:36:21 +0200
Subject: [PATCH 070/103] added translation keys submission.general.info.*

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

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index dce700c795..30c0a48bde 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -4642,6 +4642,12 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Verwerfen",
   
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Gespeichert",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Ungespeicherte Änderungen",
+  
   // "submission.general.save": "Save",
   "submission.general.save": "Speichern",
   

From 1168616f80a594d65df2ebc69f9de46d1207f2e6 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 11:43:57 +0200
Subject: [PATCH 071/103] fixed typo in german translation

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 30c0a48bde..b67fdb604c 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1755,7 +1755,7 @@
   "dso-selector.create.community.sub-level": "Einen neuen Bereich anlegen in",
   
   // "dso-selector.create.community.top-level": "Create a new top-level community",
-  "dso-selector.create.community.top-level": "Einen neuen Bereich auf oberster Ebene anlgen",
+  "dso-selector.create.community.top-level": "Einen neuen Bereich auf oberster Ebene anlegen",
   
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Neues Item",

From 2a20b0c989e2c09750a2457480bf202c2a05e36e Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 23 Jun 2022 12:04:33 +0200
Subject: [PATCH 072/103] [CST-6174] Add test to check maxStartDate and
 maxEndDate

---
 .../section-accesses.component.spec.ts        | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/app/submission/sections/accesses/section-accesses.component.spec.ts b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
index 5509cab4bb..65123db533 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -16,11 +16,15 @@ import { SectionAccessesService } from './section-accesses.service';
 import { SectionFormOperationsService } from '../form/section-form-operations.service';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import {
+  SubmissionJsonPatchOperationsService
+} from '../../../core/submission/submission-json-patch-operations.service';
 import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock';
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
+import {
+  SubmissionJsonPatchOperationsServiceStub
+} from '../../../shared/testing/submission-json-patch-operations-service.stub';
 import { BrowserModule } from '@angular/platform-browser';
 
 import { of as observableOf } from 'rxjs';
@@ -42,8 +46,6 @@ describe('SubmissionSectionAccessesComponent', () => {
   let fixture: ComponentFixture<SubmissionSectionAccessesComponent>;
 
   const sectionsServiceStub = new SectionsServiceStub();
-  // const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
-
   const builderService: FormBuilderService = getMockFormBuilderService();
   const submissionAccessesConfigService = getSubmissionAccessesConfigService();
   const sectionAccessesService = getSectionAccessesService();
@@ -55,6 +57,7 @@ describe('SubmissionSectionAccessesComponent', () => {
   });
 
   let formService: any;
+  let formbuilderService: any;
 
   const storeStub = jasmine.createSpyObj('store', ['dispatch']);
 
@@ -86,7 +89,6 @@ describe('SubmissionSectionAccessesComponent', () => {
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
           { provide: SectionsService, useValue: sectionsServiceStub },
-          { provide: FormBuilderService, useValue: builderService },
           { provide: SubmissionAccessesConfigService, useValue: submissionAccessesConfigService },
           { provide: SectionAccessesService, useValue: sectionAccessesService },
           { provide: SectionFormOperationsService, useValue: sectionFormOperationsService },
@@ -97,6 +99,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
+          FormBuilderService
         ]
       })
         .compileComponents();
@@ -106,6 +109,7 @@ describe('SubmissionSectionAccessesComponent', () => {
       fixture = TestBed.createComponent(SubmissionSectionAccessesComponent);
       component = fixture.componentInstance;
       formService = TestBed.inject(FormService);
+      formbuilderService = TestBed.inject(FormBuilderService);
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(observableOf(true));
       formService.getFormData.and.returnValue(observableOf(mockAccessesFormData));
@@ -133,11 +137,22 @@ describe('SubmissionSectionAccessesComponent', () => {
     it('formModel type array should have formgroup with 1 input and 2 datepickers', () => {
       const formModel: any = component.formModel[1];
       const formGroup = formModel.groupFactory()[0].group;
+
       expect(formGroup[0] instanceof DynamicSelectModel).toBeTrue();
       expect(formGroup[1] instanceof DynamicDatePickerModel).toBeTrue();
       expect(formGroup[2] instanceof DynamicDatePickerModel).toBeTrue();
     });
 
+    it('should have set maxStartDate and maxEndDate properly', () => {
+      const maxStartDate = {year: 2024, month: 12, day: 20};
+      const maxEndDate = {year: 2022, month: 6, day: 20};
+
+      const startDateModel = formbuilderService.findById('startDate', component.formModel);
+      expect(startDateModel.max).toEqual(maxStartDate);
+      const endDateModel = formbuilderService.findById('endDate', component.formModel);
+      expect(endDateModel.max).toEqual(maxEndDate);
+    });
+
     it('when checkbox changed it should call operationsBuilder replace function', () => {
       component.onChange(checkboxChangeEvent);
       fixture.detectChanges();

From 0aa14bcddd460478f212c7428086314aa39c35ef Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Thu, 23 Jun 2022 12:24:16 +0200
Subject: [PATCH 073/103] [CST-6174] Set maxStartDate/maxEndDate when building
 form models

---
 ...section-upload-file-edit.component.spec.ts | 38 +++++---
 .../section-upload-file-edit.component.ts     | 95 +++++++++----------
 src/app/submission/submission.module.ts       |  3 +-
 3 files changed, 71 insertions(+), 65 deletions(-)

diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index aa03d37eb2..d008bf61f1 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -1,10 +1,9 @@
 import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, inject, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
 import { TranslateModule } from '@ngx-translate/core';
 import {
-  DynamicFormArrayGroupModel,
   DynamicFormArrayModel,
   DynamicFormControlEvent,
   DynamicFormGroupModel,
@@ -17,13 +16,13 @@ import { SubmissionService } from '../../../../submission.service';
 import { SubmissionSectionUploadFileEditComponent } from './section-upload-file-edit.component';
 import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
 import {
+  mockFileFormData,
   mockSubmissionCollectionId,
   mockSubmissionId,
+  mockSubmissionObject,
   mockUploadConfigResponse,
   mockUploadConfigResponseMetadata,
   mockUploadFiles,
-  mockFileFormData,
-  mockSubmissionObject,
 } from '../../../../../shared/mocks/submission.mock';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FormComponent } from '../../../../../shared/form/form.component';
@@ -32,12 +31,20 @@ import { getMockFormService } from '../../../../../shared/mocks/form-service.moc
 import { createTestComponent } from '../../../../../shared/testing/utils.test';
 import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
+import {
+  SubmissionJsonPatchOperationsServiceStub
+} from '../../../../../shared/testing/submission-json-patch-operations-service.stub';
+import {
+  SubmissionJsonPatchOperationsService
+} from '../../../../../core/submission/submission-json-patch-operations.service';
 import { SectionUploadService } from '../../section-upload.service';
 import { getMockSectionUploadService } from '../../../../../shared/mocks/section-upload.service.mock';
-import { FormFieldMetadataValueObject } from '../../../../../shared/form/builder/models/form-field-metadata-value.model';
-import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import {
+  FormFieldMetadataValueObject
+} from '../../../../../shared/form/builder/models/form-field-metadata-value.model';
+import {
+  JsonPatchOperationPathCombiner
+} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 import { of } from 'rxjs';
 
@@ -171,6 +178,8 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     it('should init form model properly', () => {
       comp.fileData = fileData;
       comp.formId = 'testFileForm';
+      const maxStartDate = {year: 2022, month: 1, day: 12};
+      const maxEndDate = {year: 2019, month: 7, day: 12};
 
       comp.ngOnInit();
 
@@ -179,6 +188,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
       expect(comp.formModel[0] instanceof DynamicFormGroupModel).toBeTruthy();
       expect(comp.formModel[1] instanceof DynamicFormArrayModel).toBeTruthy();
       expect((comp.formModel[1] as DynamicFormArrayModel).groups.length).toBe(2);
+      const startDateModel = formbuilderService.findById('startDate', comp.formModel);
+      expect(startDateModel.max).toEqual(maxStartDate);
+      const endDateModel = formbuilderService.findById('endDate', comp.formModel);
+      expect(endDateModel.max).toEqual(maxEndDate);
     });
 
     it('should call setOptions method onChange', () => {
@@ -208,20 +221,19 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
       const formGroup = formbuilderService.createFormGroup(comp.formModel);
       const control = formbuilderService.getFormControlById('name', formGroup, comp.formModel, 0);
 
-      spyOn(formbuilderService, 'findById').and.callThrough();
+      spyOn(control.parent, 'markAsDirty').and.callThrough();
 
       control.value = 'openaccess';
       comp.setOptions(model, control);
-      expect(formbuilderService.findById).not.toHaveBeenCalledWith('endDate', (model.parent as DynamicFormArrayGroupModel).group);
-      expect(formbuilderService.findById).not.toHaveBeenCalledWith('startDate', (model.parent as DynamicFormArrayGroupModel).group);
+      expect(control.parent.markAsDirty).toHaveBeenCalled();
 
       control.value = 'lease';
       comp.setOptions(model, control);
-      expect(formbuilderService.findById).toHaveBeenCalledWith('endDate', (model.parent as DynamicFormArrayGroupModel).group);
+      expect(control.parent.markAsDirty).toHaveBeenCalled();
 
       control.value = 'embargo';
       comp.setOptions(model, control);
-      expect(formbuilderService.findById).toHaveBeenCalledWith('startDate', (model.parent as DynamicFormArrayGroupModel).group);
+      expect(control.parent.markAsDirty).toHaveBeenCalled();
     });
 
     it('should retrieve Value From Field properly', () => {
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 293835c848..195d291530 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
@@ -3,9 +3,7 @@ import { FormControl } from '@angular/forms';
 
 import {
   DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER,
-  DynamicDateControlModel,
   DynamicDatePickerModel,
-  DynamicFormArrayGroupModel,
   DynamicFormArrayModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
@@ -57,6 +55,8 @@ import {
 } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SectionUploadService } from '../../section-upload.service';
 import { Subscription } from 'rxjs';
+import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
+import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
 
 /**
  * This component represents the edit form for bitstream
@@ -245,8 +245,6 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
     this.availableAccessConditionOptions.filter((element) => element.name === control.value)
       .forEach((element) => accessCondition = element );
     if (isNotEmpty(accessCondition)) {
-      const showGroups: boolean = accessCondition.hasStartDate === true || accessCondition.hasEndDate === true;
-
       const startDateControl: FormControl = control.parent.get('startDate') as FormControl;
       const endDateControl: FormControl = control.parent.get('endDate') as FormControl;
 
@@ -257,34 +255,6 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
       startDateControl?.setValue(null);
       control.parent.markAsDirty();
       endDateControl?.setValue(null);
-
-      if (showGroups) {
-        if (accessCondition.hasStartDate && accessCondition.maxStartDate) {
-          const startDateModel = this.formBuilderService.findById(
-            'startDate',
-            (model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel;
-
-          const min = new Date(accessCondition.maxStartDate);
-          startDateModel.max = {
-            year: min.getUTCFullYear(),
-            month: min.getUTCMonth() + 1,
-            day: min.getUTCDate()
-          };
-        }
-        if (accessCondition.hasEndDate && accessCondition.maxEndDate) {
-          const endDateModel = this.formBuilderService.findById(
-            'endDate',
-            (model.parent as DynamicFormArrayGroupModel).group) as DynamicDateControlModel;
-
-          const max = new Date(accessCondition.maxEndDate);
-          endDateModel.max = {
-            year: max.getUTCFullYear(),
-            month: max.getUTCMonth() + 1,
-            day: max.getUTCDate()
-          };
-
-        }
-      }
     }
   }
 
@@ -344,38 +314,63 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
       }
       accessConditionTypeModelConfig.options = accessConditionTypeOptions;
 
-      // Dynamically assign of relation in config. For startdate, endDate, groups.
-      const hasStart = [];
-      const hasEnd = [];
-      const hasGroups = [];
+      // Dynamically assign of relation in config. For startDate and endDate.
+      const startDateCondition: DynamicFormControlCondition[] = [];
+      const endDateCondition: DynamicFormControlCondition[] = [];
+      let maxStartDate: DynamicDateControlValue;
+      let maxEndDate: DynamicDateControlValue;
       this.availableAccessConditionOptions.forEach((condition) => {
-        const showStart: boolean = condition.hasStartDate === true;
-        const showEnd: boolean = condition.hasEndDate === true;
-        const showGroups: boolean = showStart || showEnd;
-        if (showStart) {
-          hasStart.push({id: 'name', value: condition.name});
+
+        if (condition.hasStartDate) {
+          startDateCondition.push({ id: 'name', value: condition.name });
+          if (condition.maxStartDate) {
+            const min = new Date(condition.maxStartDate);
+            maxStartDate = {
+              year: min.getUTCFullYear(),
+              month: min.getUTCMonth() + 1,
+              day: min.getUTCDate()
+            };
+          }
         }
-        if (showEnd) {
-          hasEnd.push({id: 'name', value: condition.name});
-        }
-        if (showGroups) {
-          hasGroups.push({id: 'name', value: condition.name});
+        if (condition.hasEndDate) {
+          endDateCondition.push({ id: 'name', value: condition.name });
+          if (condition.maxEndDate) {
+            const max = new Date(condition.maxEndDate);
+            maxEndDate = {
+              year: max.getUTCFullYear(),
+              month: max.getUTCMonth() + 1,
+              day: max.getUTCDate()
+            };
+          }
         }
       });
-      const confStart = {relations: [{match: MATCH_ENABLED, operator: OR_OPERATOR, when: hasStart}]};
-      const confEnd = {relations: [{match: MATCH_ENABLED, operator: OR_OPERATOR, when: hasEnd}]};
+      const confStart = { relations: [{ match: MATCH_ENABLED, operator: OR_OPERATOR, when: startDateCondition }] };
+      const confEnd = { relations: [{ match: MATCH_ENABLED, operator: OR_OPERATOR, when: endDateCondition }] };
+      const hasStartDate = startDateCondition.length > 0;
+      const hasEndDate = endDateCondition.length > 0;
 
       accessConditionsArrayConfig.groupFactory = () => {
         const type = new DynamicSelectModel(accessConditionTypeModelConfig, BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT);
         const startDateConfig = Object.assign({}, BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG, confStart);
+        if (maxStartDate) {
+          startDateConfig.max = maxStartDate;
+        }
+
         const endDateConfig = Object.assign({}, BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG, confEnd);
+        if (maxEndDate) {
+          endDateConfig.max = maxEndDate;
+        }
 
         const startDate = new DynamicDatePickerModel(startDateConfig, BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT);
         const endDate = new DynamicDatePickerModel(endDateConfig, BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT);
         const accessConditionGroupConfig = Object.assign({}, BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG);
         accessConditionGroupConfig.group = [type];
-        if (hasStart.length > 0) { accessConditionGroupConfig.group.push(startDate); }
-        if (hasEnd.length > 0) { accessConditionGroupConfig.group.push(endDate); }
+        if (hasStartDate) {
+          accessConditionGroupConfig.group.push(startDate);
+        }
+        if (hasEndDate) {
+          accessConditionGroupConfig.group.push(endDate);
+        }
         return [new DynamicFormGroupModel(accessConditionGroupConfig, BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT)];
       };
 
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index eb6bde35ad..97ffb7ffcd 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -50,7 +50,7 @@ import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.com
 import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
 import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
 import { FormModule } from '../shared/form/form.module';
-import { NgbCollapseModule, NgbModalModule, NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
 import { SubmissionAccessesConfigService } from '../core/config/submission-accesses-config.service';
 import { SectionAccessesService } from './sections/accesses/section-accesses.service';
@@ -71,7 +71,6 @@ const ENTRY_COMPONENTS = [
   SubmissionSectionLicenseComponent,
   SubmissionSectionCcLicensesComponent,
   SubmissionSectionAccessesComponent,
-  SubmissionSectionUploadFileEditComponent,
   SubmissionSectionSherpaPoliciesComponent,
 ];
 

From f2b1d11fb22fa6f81df28be412abc2e5d79d2892 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 14:15:41 +0200
Subject: [PATCH 074/103] added translation key communityList.breadcrumbs

---
 src/assets/i18n/de.json5 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index b67fdb604c..2c1c6c35b6 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1356,9 +1356,12 @@
 
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Logo löschen",
+  
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Bereichsliste",
 
-  // "communityList.tabTitle": "DSpace - Community List",
-  "communityList.tabTitle": "DSpace - Bereichsliste",
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Bereichsliste",
   
   // "communityList.title": "List of Communities",
   "communityList.title": "Liste der Bereiche",

From 78f4096ab4663c2642aeace7ee7cb3b781b99185 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 14:25:50 +0200
Subject: [PATCH 075/103] removed prefix "DSpace Angular ::" in various
 translation keys; use repository.title.* instead

---
 src/assets/i18n/de.json5 | 76 +++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 2c1c6c35b6..ec2e1d39bd 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -193,8 +193,8 @@
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Unterstützungsgrad",
   
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Referenzliste der Dateiformate",
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Referenzliste der Dateiformate",
   
   
   
@@ -234,8 +234,8 @@
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Namensraum",
   
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Metadatenreferenzliste",
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Metadatenreferenzliste",
   
   
   
@@ -311,8 +311,8 @@
   // "admin.registries.schema.return": "Return",
   "admin.registries.schema.return": "Zurück",
   
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Referenzliste der Metadatenschemata",
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Referenzliste der Metadatenschemata",
   
   
   
@@ -328,8 +328,8 @@
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "Von Person ausloggen",
   
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  "admin.access-control.epeople.title": "DSpace Angular :: Personen",
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Personen",
   
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Personen",
@@ -444,14 +444,14 @@
   
   
   
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace Angular :: Gruppen",
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Gruppen",
   
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Gruppe bearbeiten",
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Gruppe bearbeiten",
   
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Neue Gruppe",
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Neue Gruppe",
   
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Gruppen",
@@ -2144,8 +2144,8 @@
   // "home.search-form.placeholder": "Search the repository ...",
   "home.search-form.placeholder": "Durchsuche Repositorium",
   
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Startseite",
+  // "home.title": "Home",
+  "home.title": "Startseite",
   
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Hauptbereiche in DSpace",
@@ -2806,8 +2806,8 @@
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Item-Suchergebnisse",
   
-  // "item.search.title": "DSpace Angular :: Item Search",
-  "item.search.title": "DSpace Angular :: Item-Suche",
+  // "item.search.title": "Item Search",
+  "item.search.title": "Item-Suche",
   
   
   
@@ -3003,8 +3003,8 @@
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Suchergebnisse für Zeitschriften",
   
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Zeitschriftensuche",
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Zeitschriftensuche",
   
   
   
@@ -3632,8 +3632,8 @@
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Ergebnisse der Personensuche",
   
-  // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace Angular :: Personensuche",
+  // "person.search.title": "Person Search",
+  "person.search.title": "Personensuche",
   
   
   
@@ -3925,8 +3925,8 @@
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Suchergebnisse Publikationen",
   
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  "publication.search.title": "DSpace Angular :: Publikationssuche",
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Publikationssuche",
   
   
   // "register-email.title": "New user registration",
@@ -4084,9 +4084,27 @@
   
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Beteiligte",
-  
-  
-  
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Beteiligte (Organisationseinheit)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Beteiligte (Person)",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Förderer",
+
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Repository Logo",
+
+  // "repository.title.prefix": "DSpace Angular :: ",
+  "repository.title.prefix": "DSpace Angular :: ",
+
+  // "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title.prefixDSpace": "DSpace Angular ::",
+
+
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Hinzufügen",
   
@@ -4248,8 +4266,8 @@
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Zeige",
   
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace Angular :: Suche",
+  // "search.title": "Search",
+  "search.title": "Suche",
   
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Suche",

From 5a7ba93e50834f73f18fb88605f6a9cac2904af6 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 14:46:40 +0200
Subject: [PATCH 076/103] added browse.title.page

---
 src/assets/i18n/de.json5 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index ec2e1d39bd..88c99468ea 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1008,9 +1008,12 @@
   
   // "browse.startsWith.type_text": "Or enter first few letters:",
   "browse.startsWith.type_text": "Oder geben Sie die ersten Buchstaben ein:",
-  
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Auflistung von {{ collection }} nach {{ field }} {{ value }}",
+    
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Auflistung {{ collection }} nach {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Auflistung {{ collection }} nach {{ field }} {{ value }}",
   
   
   // "chips.remove": "Remove chip",

From cfca5c8ca1bb18ecb4f6f1c8b1bd2d5b96ac90a8 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 16:56:43 +0200
Subject: [PATCH 077/103] fixed admin.registries.schema.fields.table.delete

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 88c99468ea..f117475fe4 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -252,7 +252,7 @@
   "admin.registries.schema.fields.no-items": "Es gibt keine Metadatenfelder in diesem Schema.",
   
   // "admin.registries.schema.fields.table.delete": "Delete selected",
-  "admin.registries.schema.fields.table.delete": "Ausgewähltes löschen",
+  "admin.registries.schema.fields.table.delete": "Auswahl löschen",
   
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Feld",

From 79c97c94a23eb3c7d06d958dc4ebb2d43a1cf81d Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 23 Jun 2022 17:05:32 +0200
Subject: [PATCH 078/103] fixed submission.workflow.generic.delete-help

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index f117475fe4..c3a874535c 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -5231,7 +5231,7 @@
   "submission.workflow.generic.delete": "Löschen",
   
   // "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": "Wenn Sie dieses Item möchten, wählen Sie bitte \"Löschen\". Sie werden danach um Bestätigung gebeten.",
+  "submission.workflow.generic.delete-help": "Wenn Sie dieses Item verwerfen möchten, wählen Sie bitte \"Löschen\". Sie werden danach um Bestätigung gebeten.",
   
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Bearbeiten",

From 377ac3ab849bef612b6a60f3830d88a1dfec1a02 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 23 Jun 2022 14:54:12 -0500
Subject: [PATCH 079/103] Add spacing before handle on comcol pages

---
 .../comcol/comcol-page-handle/comcol-page-handle.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index b3ca75bf94..552854a0c0 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,4 @@
 <div *ngIf="content" class="content-with-optional-title mb-2">
     <h2 class="d-inline-block h6" *ngIf="title">{{ title | translate }}</h2>
-    <div  class="d-inline-block "><a href="{{getHandle()}}">{{getHandle()}}</a></div>
+    <div class="d-inline-block px-2"><a href="{{getHandle()}}">{{getHandle()}}</a></div>
 </div>

From b55e4327a88c993535219f6c6793a6888a015c8f Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@gmail.com>
Date: Fri, 24 Jun 2022 16:03:54 +0200
Subject: [PATCH 080/103] fix issue where curation tasks wouldn't work for
 collections and communities because the handle was in the wrong format

---
 .../curation-form.component.spec.ts           | 26 ++++++++--
 .../curation-form/curation-form.component.ts  | 15 ++++--
 src/app/shared/handle.service.spec.ts         | 47 +++++++++++++++++++
 src/app/shared/handle.service.ts              | 41 ++++++++++++++++
 src/assets/i18n/en.json5                      |  2 +
 5 files changed, 122 insertions(+), 9 deletions(-)
 create mode 100644 src/app/shared/handle.service.spec.ts
 create mode 100644 src/app/shared/handle.service.ts

diff --git a/src/app/curation-form/curation-form.component.spec.ts b/src/app/curation-form/curation-form.component.spec.ts
index 4ff013f77c..dc70b925e8 100644
--- a/src/app/curation-form/curation-form.component.spec.ts
+++ b/src/app/curation-form/curation-form.component.spec.ts
@@ -15,6 +15,7 @@ import { By } from '@angular/platform-browser';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+import { HandleService } from '../shared/handle.service';
 
 describe('CurationFormComponent', () => {
   let comp: CurationFormComponent;
@@ -23,6 +24,7 @@ describe('CurationFormComponent', () => {
   let scriptDataService: ScriptDataService;
   let processDataService: ProcessDataService;
   let configurationDataService: ConfigurationDataService;
+  let handleService: HandleService;
   let notificationsService;
   let router;
 
@@ -51,6 +53,10 @@ describe('CurationFormComponent', () => {
       }))
     });
 
+    handleService = {
+      normalizeHandle: (a) => a
+    } as any;
+
     notificationsService = new NotificationsServiceStub();
     router = new RouterStub();
 
@@ -58,11 +64,12 @@ describe('CurationFormComponent', () => {
       imports: [TranslateModule.forRoot(), FormsModule, ReactiveFormsModule],
       declarations: [CurationFormComponent],
       providers: [
-        {provide: ScriptDataService, useValue: scriptDataService},
-        {provide: ProcessDataService, useValue: processDataService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: Router, useValue: router},
-        {provide: ConfigurationDataService, useValue: configurationDataService},
+        { provide: ScriptDataService, useValue: scriptDataService },
+        { provide: ProcessDataService, useValue: processDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: HandleService, useValue: handleService },
+        { provide: Router, useValue: router},
+        { provide: ConfigurationDataService, useValue: configurationDataService },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents();
@@ -143,4 +150,13 @@ describe('CurationFormComponent', () => {
       {name: '-i', value: 'all'},
     ], []);
   });
+
+  it(`should show an error notification and return when an invalid dsoHandle is provided`, () => {
+    comp.dsoHandle = 'test-handle';
+    spyOn(handleService, 'normalizeHandle').and.returnValue(null);
+    comp.submit();
+
+    expect(notificationsService.error).toHaveBeenCalled();
+    expect(scriptDataService.invoke).not.toHaveBeenCalled();
+  });
 });
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
index 31501e70d7..422c955037 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -5,7 +5,7 @@ import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { find, map } from 'rxjs/operators';
 import { NotificationsService } from '../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isEmpty, isNotEmpty } from '../shared/empty.util';
+import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../shared/empty.util';
 import { RemoteData } from '../core/data/remote-data';
 import { Router } from '@angular/router';
 import { ProcessDataService } from '../core/data/processes/process-data.service';
@@ -14,9 +14,9 @@ import { ConfigurationDataService } from '../core/data/configuration-data.servic
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { Observable } from 'rxjs';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+import { HandleService } from '../shared/handle.service';
 
 export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
-
 /**
  * Component responsible for rendering the Curation Task form
  */
@@ -39,6 +39,7 @@ export class CurationFormComponent implements OnInit {
     private processDataService: ProcessDataService,
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
+    private handleService: HandleService,
     private router: Router
   ) {
   }
@@ -76,13 +77,19 @@ export class CurationFormComponent implements OnInit {
     const taskName = this.form.get('task').value;
     let handle;
     if (this.hasHandleValue()) {
-      handle = this.dsoHandle;
+      handle = this.handleService.normalizeHandle(this.dsoHandle);
+      if (isEmpty(handle)) {
+        this.notificationsService.error(this.translateService.get('curation.form.submit.error.head'),
+          this.translateService.get('curation.form.submit.error.invalid-handle'));
+        return;
+      }
     } else {
-      handle = this.form.get('handle').value;
+      handle = this.handleService.normalizeHandle(this.form.get('handle').value);
       if (isEmpty(handle)) {
         handle = 'all';
       }
     }
+
     this.scriptDataService.invoke('curate', [
       { name: '-t', value: taskName },
       { name: '-i', value: handle },
diff --git a/src/app/shared/handle.service.spec.ts b/src/app/shared/handle.service.spec.ts
new file mode 100644
index 0000000000..b326eb0416
--- /dev/null
+++ b/src/app/shared/handle.service.spec.ts
@@ -0,0 +1,47 @@
+import { HandleService } from './handle.service';
+
+describe('HandleService', () => {
+  let service: HandleService;
+
+  beforeEach(() => {
+    service = new HandleService();
+  });
+
+  describe(`normalizeHandle`, () => {
+    it(`should simply return an already normalized handle`, () => {
+      let input, output;
+
+      input = '123456789/123456';
+      output = service.normalizeHandle(input);
+      expect(output).toEqual(input);
+
+      input = '12.3456.789/123456';
+      output = service.normalizeHandle(input);
+      expect(output).toEqual(input);
+    });
+
+    it(`should normalize a handle url`, () => {
+      let input, output;
+
+      input = 'https://hdl.handle.net/handle/123456789/123456';
+      output = service.normalizeHandle(input);
+      expect(output).toEqual('123456789/123456');
+
+      input = 'https://rest.api/server/handle/123456789/123456';
+      output = service.normalizeHandle(input);
+      expect(output).toEqual('123456789/123456');
+    });
+
+    it(`should return null if the input doesn't contain a handle`, () => {
+      let input, output;
+
+      input = 'https://hdl.handle.net/handle/123456789';
+      output = service.normalizeHandle(input);
+      expect(output).toBeNull();
+
+      input = 'something completely different';
+      output = service.normalizeHandle(input);
+      expect(output).toBeNull();
+    });
+  });
+});
diff --git a/src/app/shared/handle.service.ts b/src/app/shared/handle.service.ts
new file mode 100644
index 0000000000..da0f17f7de
--- /dev/null
+++ b/src/app/shared/handle.service.ts
@@ -0,0 +1,41 @@
+import { Injectable } from '@angular/core';
+import { isNotEmpty, isEmpty } from './empty.util';
+
+const PREFIX_REGEX = /handle\/([^\/]+\/[^\/]+)$/;
+const NO_PREFIX_REGEX = /^([^\/]+\/[^\/]+)$/;
+
+@Injectable({
+  providedIn: 'root'
+})
+export class HandleService {
+
+
+  /**
+   * Turns a handle string into the default 123456789/12345 format
+   *
+   * @param handle the input handle
+   *
+   * normalizeHandle('123456789/123456')                                 // '123456789/123456'
+   * normalizeHandle('12.3456.789/123456')                               // '12.3456.789/123456'
+   * normalizeHandle('https://hdl.handle.net/handle/123456789/123456')   // '123456789/123456'
+   * normalizeHandle('https://rest.api/server/handle/123456789/123456')  // '123456789/123456'
+   * normalizeHandle('https://rest.api/server/handle/123456789')         // null
+   */
+  normalizeHandle(handle: string): string {
+    let matches: string[];
+    if (isNotEmpty(handle)) {
+      matches = handle.match(PREFIX_REGEX);
+    }
+
+    if (isEmpty(matches) || matches.length < 2) {
+      matches = handle.match(NO_PREFIX_REGEX);
+    }
+
+    if (isEmpty(matches) || matches.length < 2) {
+      return null;
+    } else {
+      return matches[1];
+    }
+  }
+
+}
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 3d5f15b4f2..5d7be2a681 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1291,6 +1291,8 @@
 
   "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
 
+  "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+
   "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)",

From 5ee4c6b61b6cf57703df6a0c6c92f9d116ac1cb9 Mon Sep 17 00:00:00 2001
From: Toni Prieto <antonio.juan.prieto@upc.edu>
Date: Tue, 7 Jun 2022 21:49:56 +0200
Subject: [PATCH 081/103] Make label and error messages for license-step
 accept-checkbox translatable

---
 .../sections/license/section-license.component.ts          | 6 ++++++
 .../submission/sections/license/section-license.model.ts   | 6 +++---
 src/assets/i18n/en.json5                                   | 6 ++++++
 src/assets/i18n/es.json5                                   | 7 +++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index 8f675dc0cd..e9a0cf1566 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -29,6 +29,7 @@ import { renderSectionFor } from '../sections-decorator';
 import { SectionsType } from '../sections-type';
 import { SectionsService } from '../sections.service';
 import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model';
+import { TranslateService } from '@ngx-translate/core';
 
 /**
  * This component represents a section that contains the submission license form.
@@ -99,6 +100,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
    * @param {JsonPatchOperationsBuilder} operationsBuilder
    * @param {SectionsService} sectionService
    * @param {SubmissionService} submissionService
+   * @param {TranslateService} translateService
    * @param {string} injectedCollectionId
    * @param {SectionDataObject} injectedSectionData
    * @param {string} injectedSubmissionId
@@ -111,6 +113,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
               protected operationsBuilder: JsonPatchOperationsBuilder,
               protected sectionService: SectionsService,
               protected submissionService: SubmissionService,
+              protected translateService: TranslateService,
               @Inject('collectionIdProvider') public injectedCollectionId: string,
               @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
               @Inject('submissionIdProvider') public injectedSubmissionId: string) {
@@ -126,6 +129,9 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
     this.formModel = this.formBuilderService.fromJSON(SECTION_LICENSE_FORM_MODEL);
     const model = this.formBuilderService.findById('granted', this.formModel);
 
+    // Translate checkbox label
+    model.label = this.translateService.instant(model.label);
+
     // Retrieve license accepted status
     (model as DynamicCheckboxModel).value = (this.sectionData.data as WorkspaceitemSectionLicenseObject).granted;
 
diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts
index 8107b73674..0f21ef98a4 100644
--- a/src/app/submission/sections/license/section-license.model.ts
+++ b/src/app/submission/sections/license/section-license.model.ts
@@ -13,15 +13,15 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
 export const SECTION_LICENSE_FORM_MODEL = [
   {
     id: 'granted',
-    label: 'I confirm the license above',
+    label: 'submission.sections.license.granted-label',
     required: true,
     value: false,
     validators: {
       required: null
     },
     errorMessages: {
-      required: 'You must accept the license',
-      notgranted: 'You must accept the license'
+      required: 'submission.sections.license.required',
+      notgranted: 'submission.sections.license.notgranted'
     },
     type: 'CHECKBOX',
   }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5d7be2a681..24591d6960 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4234,6 +4234,12 @@
 
   "submission.sections.accesses.form.until-placeholder": "Until",
 
+  "submission.sections.license.granted-label": "I confirm the license above",
+
+  "submission.sections.license.required": "You must accept the license",
+
+  "submission.sections.license.notgranted":  "You must accept the license",
+
 
   "submission.sections.sherpa.publication.information": "Publication information",
 
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index 09217494d1..5d40c501f1 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -5314,7 +5314,14 @@
 	// "submission.sections.upload.upload-successful": "Upload successful",
 	"submission.sections.upload.upload-successful": "Subida exitosa",
 
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confirmo la licencia",
 
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Debe aceptar la licencia",
+
+  // "submission.sections.license.notgranted":  "You must accept the license",
+  "submission.sections.license.notgranted":  "Debe aceptar la licencia",
 
 	// "submission.submit.breadcrumbs": "New submission",
 	"submission.submit.breadcrumbs": "Nuevo envío",

From 4de5ab0f563a2090d28f03852b0322b6043b6305 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 27 Jun 2022 13:47:19 +0200
Subject: [PATCH 082/103] 92701: Disable user agreement feature

---
 ...-user-agreement-current-user.guard.spec.ts | 20 +++++++++
 .../end-user-agreement-current-user.guard.ts  |  7 ++-
 src/app/info/info-routing.module.ts           | 44 ++++++++++++-------
 src/config/global-config.interface.ts         |  2 +
 src/config/info-config.interface.ts           |  6 +++
 src/environments/environment.common.ts        |  4 ++
 src/environments/mock-environment.ts          |  4 ++
 7 files changed, 70 insertions(+), 17 deletions(-)
 create mode 100644 src/config/info-config.interface.ts

diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
index 75b8f6089e..b280ef798c 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
@@ -2,6 +2,7 @@ import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-u
 import { EndUserAgreementService } from './end-user-agreement.service';
 import { Router, UrlTree } from '@angular/router';
 import { of as observableOf } from 'rxjs';
+import { environment } from '../../../environments/mock-environment';
 
 describe('EndUserAgreementGuard', () => {
   let guard: EndUserAgreementCurrentUserGuard;
@@ -44,5 +45,24 @@ describe('EndUserAgreementGuard', () => {
         });
       });
     });
+
+    describe('when the end user agreement is disabled', () => {
+      it('should return true', (done) => {
+        environment.info.enableEndUserAgreement = false;
+        guard.canActivate(undefined, Object.assign({ url: 'redirect' })).subscribe((result) => {
+          console.log(result);
+          expect(result).toEqual(true);
+          done();
+        });
+      });
+
+      it('should not resolve to the end user agreement page', (done) => {
+        environment.info.enableEndUserAgreement = false;
+        guard.canActivate(undefined, Object.assign({ url: 'redirect' })).subscribe((result) => {
+          expect(router.navigateByUrl).not.toHaveBeenCalled();
+          done();
+        });
+      });
+    });
   });
 });
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
index 2c04186f34..a79e12cc32 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
 import { EndUserAgreementService } from './end-user-agreement.service';
 import { Router } from '@angular/router';
+import { environment } from '../../../environments/environment';
 
 /**
  * A guard redirecting logged in users to the end agreement page when they haven't accepted the latest user agreement
@@ -19,6 +20,10 @@ export class EndUserAgreementCurrentUserGuard extends AbstractEndUserAgreementGu
    * True when the currently logged in user has accepted the agreements or when the user is not currently authenticated
    */
   hasAccepted(): Observable<boolean> {
+    if (!environment.info.enableEndUserAgreement) {
+      return observableOf(true);
+    }
+
     return this.endUserAgreementService.hasCurrentUserAcceptedAgreement(true);
   }
 
diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts
index f76fb47ff0..e15ae521b2 100644
--- a/src/app/info/info-routing.module.ts
+++ b/src/app/info/info-routing.module.ts
@@ -4,25 +4,37 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
 import { PRIVACY_PATH, END_USER_AGREEMENT_PATH } from './info-routing-paths';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
 import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
+import { environment } from '../../environments/environment';
+
+
+const imports = [];
+
+  if (environment.info.enableEndUserAgreement) {
+    imports.push(
+      RouterModule.forChild([
+        {
+          path: END_USER_AGREEMENT_PATH,
+          component: ThemedEndUserAgreementComponent,
+          resolve: { breadcrumb: I18nBreadcrumbResolver },
+          data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' }
+        }
+      ]));
+  }
+  if (environment.info.enablePrivacyStatement) {
+    imports.push(
+      RouterModule.forChild([
+        {
+          path: PRIVACY_PATH,
+          component: ThemedPrivacyComponent,
+          resolve: { breadcrumb: I18nBreadcrumbResolver },
+          data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }
+        }
+      ]));
+  }
 
 @NgModule({
   imports: [
-    RouterModule.forChild([
-      {
-        path: END_USER_AGREEMENT_PATH,
-        component: ThemedEndUserAgreementComponent,
-        resolve: { breadcrumb: I18nBreadcrumbResolver },
-        data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' }
-      }
-    ]),
-    RouterModule.forChild([
-      {
-        path: PRIVACY_PATH,
-        component: ThemedPrivacyComponent,
-        resolve: { breadcrumb: I18nBreadcrumbResolver },
-        data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }
-      }
-    ])
+    ...imports
   ]
 })
 /**
diff --git a/src/config/global-config.interface.ts b/src/config/global-config.interface.ts
index d46822eb61..8218682d8a 100644
--- a/src/config/global-config.interface.ts
+++ b/src/config/global-config.interface.ts
@@ -13,6 +13,7 @@ import { ThemeConfig } from './theme.model';
 import { AuthConfig } from './auth-config.interfaces';
 import { UIServerConfig } from './ui-server-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
+import { InfoConfig } from './info-config.interface';
 
 export interface GlobalConfig extends Config {
   ui: UIServerConfig;
@@ -32,4 +33,5 @@ export interface GlobalConfig extends Config {
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
   mediaViewer: MediaViewerConfig;
+  info: InfoConfig;
 }
diff --git a/src/config/info-config.interface.ts b/src/config/info-config.interface.ts
new file mode 100644
index 0000000000..b1831962b5
--- /dev/null
+++ b/src/config/info-config.interface.ts
@@ -0,0 +1,6 @@
+import { Config } from './config.interface';
+
+export interface InfoConfig extends Config {
+  enableEndUserAgreement: boolean;
+  enablePrivacyStatement: boolean;
+}
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 9091773041..2570759151 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -285,4 +285,8 @@ export const environment: GlobalConfig = {
     image: false,
     video: false,
   },
+  info: {
+    enableEndUserAgreement: false,
+    enablePrivacyStatement: false
+  },
 };
diff --git a/src/environments/mock-environment.ts b/src/environments/mock-environment.ts
index 824c8c8a83..a5fa44b115 100644
--- a/src/environments/mock-environment.ts
+++ b/src/environments/mock-environment.ts
@@ -235,4 +235,8 @@ export const environment: Partial<GlobalConfig> = {
     image: true,
     video: true
   },
+  info: {
+    enableEndUserAgreement: true,
+    enablePrivacyStatement: true,
+  }
 };

From 1b5c801d0665f0c9fa39c3b63e45dfa01d4e59d2 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Mon, 27 Jun 2022 16:24:16 +0200
Subject: [PATCH 083/103] 92701: Disable user agreement feature

---
 config/config.example.yml                                  | 7 +++++++
 config/config.yml                                          | 4 ++++
 .../end-user-agreement-current-user.guard.spec.ts          | 2 +-
 src/config/default-app-config.ts                           | 7 ++++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 898b47784f..723568c020 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -246,3 +246,10 @@ bundle:
 mediaViewer:
   image: false
   video: false
+
+# Whether the end user agreement is required before users use the repository.
+# If enabled, the user will be required to accept the agreement before they can use the repository.
+# And whether the privacy statement should exist or not.
+info:
+  enableEndUserAgreement: true
+  enablePrivacyStatement: true
diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..2b5ac3b52e 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -3,3 +3,7 @@ rest:
   host: api7.dspace.org
   port: 443
   nameSpace: /server
+
+info:
+  enableEndUserAgreement: true
+  enablePrivacyStatement: true
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
index b280ef798c..40728ab601 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
@@ -2,7 +2,7 @@ import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-u
 import { EndUserAgreementService } from './end-user-agreement.service';
 import { Router, UrlTree } from '@angular/router';
 import { of as observableOf } from 'rxjs';
-import { environment } from '../../../environments/mock-environment';
+import { environment } from '../../../environments/environment.test';
 
 describe('EndUserAgreementGuard', () => {
   let guard: EndUserAgreementCurrentUserGuard;
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 886f1598fd..4108444443 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -16,6 +16,7 @@ import { ThemeConfig } from './theme.model';
 import { UIServerConfig } from './ui-server-config.interface';
 import { BundleConfig } from './bundle-config.interface';
 import { ActuatorsConfig } from './actuators.config';
+import { InfoConfig } from './info-config.interface';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -324,8 +325,8 @@ export class DefaultAppConfig implements AppConfig {
     image: false,
     video: false
   };
-  info: {
-    enableEndUserAgreement: false,
-    enablePrivacyStatement: false
+  info: InfoConfig = {
+    enableEndUserAgreement: true,
+    enablePrivacyStatement: true
   };
 }

From 7b4716c439baba46133a0f428a0a722112ee4e47 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 28 Jun 2022 10:55:12 +0200
Subject: [PATCH 084/103] Filter Webpack warnings

---
 webpack/webpack.common.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 219ee1bcbb..9228d41141 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -95,4 +95,7 @@ export const commonExports = {
       },
     ],
   },
+  ignoreWarnings: [
+    /src\/themes\/[^/]+\/.*theme.module.ts is part of the TypeScript compilation but it's unused/,
+  ]
 };

From 222a12bbba92e652017d3879df2092564ad1e415 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Tue, 28 Jun 2022 11:19:04 +0200
Subject: [PATCH 085/103] Make RegisterEmailComponent themeable

---
 .../themed-register-email.component.ts        | 25 +++++++++++++++++++
 .../register-page-routing.module.ts           |  4 +--
 src/app/register-page/register-page.module.ts |  2 ++
 3 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 src/app/register-page/register-email/themed-register-email.component.ts

diff --git a/src/app/register-page/register-email/themed-register-email.component.ts b/src/app/register-page/register-email/themed-register-email.component.ts
new file mode 100644
index 0000000000..6da6899d99
--- /dev/null
+++ b/src/app/register-page/register-email/themed-register-email.component.ts
@@ -0,0 +1,25 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { RegisterEmailComponent } from './register-email.component';
+
+/**
+ * Themed wrapper for RegisterEmailComponent
+ */
+@Component({
+  selector: 'ds-themed-register-email',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedRegisterEmailComponent extends ThemedComponent<RegisterEmailComponent> {
+  protected getComponentName(): string {
+    return 'RegisterEmailComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/register-page/register-email/register-email.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./register-email.component');
+  }
+}
diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts
index cd448d55ac..31a7681851 100644
--- a/src/app/register-page/register-page-routing.module.ts
+++ b/src/app/register-page/register-page-routing.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { RegisterEmailComponent } from './register-email/register-email.component';
+import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
 import { ItemPageResolver } from '../item-page/item-page.resolver';
 import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
@@ -11,7 +11,7 @@ import { RegistrationGuard } from './registration.guard';
     RouterModule.forChild([
       {
         path: '',
-        component: RegisterEmailComponent,
+        component: ThemedRegisterEmailComponent,
         data: {title: 'register-email.title'},
       },
       {
diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts
index b13dbb6afb..6afb8154ea 100644
--- a/src/app/register-page/register-page.module.ts
+++ b/src/app/register-page/register-page.module.ts
@@ -7,6 +7,7 @@ import { CreateProfileComponent } from './create-profile/create-profile.componen
 import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
 import { ProfilePageModule } from '../profile-page/profile-page.module';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
+import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
 
 @NgModule({
   imports: [
@@ -18,6 +19,7 @@ import { ThemedCreateProfileComponent } from './create-profile/themed-create-pro
   ],
   declarations: [
     RegisterEmailComponent,
+    ThemedRegisterEmailComponent,
     CreateProfileComponent,
     ThemedCreateProfileComponent
   ],

From fd356d4ca78bc3cbb8a5952c67ea0cf7566b1fae Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 28 Jun 2022 09:48:35 -0500
Subject: [PATCH 086/103] Copying updates from DSpace/DSpace#8382

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

diff --git a/docker/README.md b/docker/README.md
index d6fe0e6646..1a9fee0a81 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,7 +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.
+:warning: **THESE IMAGES ARE NOT PRODUCTION READY**  The below Docker Compose images/resources were built for development/testing only.  Therefore, they may not be fully secured or up-to-date, and should not be used in production.
+
+If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
 ***
 
 ## 'Dockerfile' in root directory 

From 977dbb38ef6cb0aa56cc326306b2ddce1edb869e Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 30 Jun 2022 13:35:28 -0400
Subject: [PATCH 087/103] Update fr.json5

---
 src/assets/i18n/fr.json5 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index dac20bc90f..beb37b0271 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -899,6 +899,9 @@
 
   // "bitstream-request-a-copy.header": "Request a copy of the file",
   "bitstream-request-a-copy.header": "Demander une copie du fichier",
+  
+  //  "bitstream-request-a-copy.legal.warning": "You are about to request a document whose distribution is restricted for legal reasons. Its use is exclusively reserved for personal, private study or research purposes.",
+   "bitstream-request-a-copy.legal.warning": "Vous êtes sur le point de demander un document dont la diffusion est restreinte pour des raisons légales. Son utilisation est exclusivement réservée à des fins personnelles, d’étude privée ou de recherche.",
 
   // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
   "bitstream-request-a-copy.intro": "Entrer les informations suivantes pour demander une copie de l'élément suivant : ",
@@ -943,7 +946,7 @@
   "bitstream-request-a-copy.submit": "Demander une copie",
 
   // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
-  "bitstream-request-a-copy.submit.success": "La demande d'Item a été soumise avec succès.",
+  "bitstream-request-a-copy.submit.success": "Votre demande de copie a été envoyée avec succès.",
 
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "Un problème est survenu lors de la soumission de la demande d'Item",
@@ -1795,7 +1798,7 @@
   "curation.form.handle.hint": "Aide : Saisir [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)",
 
   // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
-  "deny-request-copy.email.message": "Cher {{ recipientName }},\NEn réponse à votre demande, j'ai le regret de vous informer qu'il n'est pas possible de vous envoyer une copie du ou des fichiers que vous avez demandés, concernant le document : \"{{ itemUrl }}\" ({{ itemName }}), dont je suis l'auteur(e).\n\nCordialement,\n{{ authorName }} <{{ auteurEmail }}>",
+  "deny-request-copy.email.message": "Bonjour {{ recipientName }},\nEn réponse à votre demande, j'ai le regret de vous informer qu'il nous est impossible de vous envoyer une copie du document que vous avez demandé: ({{ itemName }})  \"{{ itemUrl }}\".\n\nCordialement,\n{{ authorName }} <{{ auteurEmail }}>",
 
   // "deny-request-copy.email.subject": "Request copy of document",
   "deny-request-copy.email.subject": "Demander une copie du document",

From 72832e5e12afbc3336278d061e846de7a170248a Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Thu, 30 Jun 2022 13:40:40 -0400
Subject: [PATCH 088/103] New parameter for request a copy

Addition of a new language parameter to be used in the request a copy page to warm the user that he/she is about to ask for a restricted document and its use is for private use only.
---
 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 5d7be2a681..914c4bbaa3 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -640,6 +640,8 @@
   "bitstream-request-a-copy.alert.canDownload2": "here",
 
   "bitstream-request-a-copy.header": "Request a copy of the file",
+  
+  "bitstream-request-a-copy.legal.warning": "You are about to request a document whose distribution is restricted for legal reasons. Its use is exclusively reserved for personal, private study or research purposes.",
 
   "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
 

From df00137c551d1bb0f329aed11144175f06431836 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Fri, 1 Jul 2022 11:55:10 -0500
Subject: [PATCH 089/103] Cleanup descriptions in comments of example config

---
 config/config.example.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/config.example.yml b/config/config.example.yml
index 898b47784f..3f88b32324 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -2,7 +2,8 @@
 debug: false
 
 # Angular Universal server settings
-# NOTE: these must be 'synced' with the 'dspace.ui.url' setting in your backend's local.cfg.
+# NOTE: these settings define where Node.js will start your UI application. Therefore, these
+# "ui" settings usually specify a localhost port/URL which is later proxied to a public URL (using Apache or similar)
 ui:
   ssl: false
   host: localhost
@@ -15,7 +16,8 @@ ui:
     max: 500 # limit each IP to 500 requests per windowMs
 
 # The REST API server settings
-# NOTE: these must be 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
+# NOTE: these settings define which (publicly available) REST API to use. They are usually
+# 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
 rest:
   ssl: true
   host: api7.dspace.org

From 7ab5354ab86b7644f1eebb58ded5395932c31d6d Mon Sep 17 00:00:00 2001
From: ivdl <Ianvdl@users.noreply.github.com>
Date: Fri, 1 Jul 2022 22:23:49 +0200
Subject: [PATCH 090/103] Rewrite English wording for the "Forgot password"
 page

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

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5d7be2a681..7085e7759d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1462,7 +1462,7 @@
 
   "forgot-email.form.header": "Forgot Password",
 
-  "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": "Enter the email address associated with the account.",
 
   "forgot-email.form.email": "Email Address *",
 
@@ -1470,17 +1470,17 @@
 
   "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
 
-  "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
 
-  "forgot-email.form.submit": "Save",
+  "forgot-email.form.submit": "Reset password",
 
-  "forgot-email.form.success.head": "Verification email sent",
+  "forgot-email.form.success.head": "Password reset email sent",
 
   "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
 
-  "forgot-email.form.error.head": "Error when trying to register email",
+  "forgot-email.form.error.head": "Error when trying to reset password",
 
-  "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
 
 
 

From 4a4578474a96093cd9569ce6ce83ecb366bc7390 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 4 Jul 2022 12:20:50 -0400
Subject: [PATCH 091/103] Update of fr.json5 after review comments

Following conversation with @mhvezina (https://github.com/DSpace/dspace-angular/pull/1689#issuecomment-1167372663), I removed all initially suggested french translation of "MyDSpace".
---
 src/assets/i18n/fr.json5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index beb37b0271..501c6008c2 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -3625,7 +3625,7 @@
   "menu.section.workflow": "Workflow Administrateur",
 
   // "mydspace.breadcrumbs": "MyDSpace",
-  "mydspace.breadcrumbs": "Mes dépôts",
+  "mydspace.breadcrumbs": "Mon compte DSpace",
 
   // "mydspace.description": "",
   "mydspace.description": "",
@@ -3733,7 +3733,7 @@
   "mydspace.status.workspace": "Dépôts en cours",
 
   // "mydspace.title": "MyDSpace",
-  "mydspace.title": "Mes dépôts",
+  "mydspace.title": "Mon compte DSpace",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Erreur à la création de l'espace de travail. Veuillez vérifier le contenu téléchargé avant de réessayer.",
@@ -3772,7 +3772,7 @@
   "nav.main.description": "Barre de navigation principale",
 
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "Mes dépôts",
+  "nav.mydspace": "Mon compte DSpace",
 
   // "nav.profile": "Profile",
   "nav.profile": "Profil",
@@ -4987,7 +4987,7 @@
   "submission.import-external.page.hint": "Entrer votre recherche ci-dessus pour rechercher des éléments du web à importer dans DSpace",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
-  "submission.import-external.back-to-my-dspace": "Retour à Mes dépôts",
+  "submission.import-external.back-to-my-dspace": "Retour à mon compte DSpace",
 
   // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "Recherche de la source externe",

From e0e9450f93ce4253a226481165fa01e533f62612 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 4 Jul 2022 13:30:55 -0400
Subject: [PATCH 092/103] Removing parameter in fr.json5

Remove parameter bitstream-request-a-copy.legal.warning suggested in previous commit (977dbb38ef6cb0aa56cc326306b2ddce1edb869e) as development to include it on the request a copy page has not been made.
---
 src/assets/i18n/fr.json5 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index 501c6008c2..5cfb7ff099 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -900,10 +900,7 @@
   // "bitstream-request-a-copy.header": "Request a copy of the file",
   "bitstream-request-a-copy.header": "Demander une copie du fichier",
   
-  //  "bitstream-request-a-copy.legal.warning": "You are about to request a document whose distribution is restricted for legal reasons. Its use is exclusively reserved for personal, private study or research purposes.",
-   "bitstream-request-a-copy.legal.warning": "Vous êtes sur le point de demander un document dont la diffusion est restreinte pour des raisons légales. Son utilisation est exclusivement réservée à des fins personnelles, d’étude privée ou de recherche.",
-
-  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+   // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
   "bitstream-request-a-copy.intro": "Entrer les informations suivantes pour demander une copie de l'élément suivant : ",
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",

From 02f309756d4b3e34908fe041778fbbcbae49d980 Mon Sep 17 00:00:00 2001
From: Pierre Lasou <pierre.lasou@bibl.ulaval.ca>
Date: Mon, 4 Jul 2022 13:33:24 -0400
Subject: [PATCH 093/103] Remove parameter from en.json5

Remove parameter "bitstream-request-a-copy.legal.warning" suggested in previous commit (72832e5e12afbc3336278d061e846de7a170248a) as development to include it on the request a copy page has not been made.
---
 src/assets/i18n/en.json5 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 914c4bbaa3..8c45b3507c 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -641,8 +641,6 @@
 
   "bitstream-request-a-copy.header": "Request a copy of the file",
   
-  "bitstream-request-a-copy.legal.warning": "You are about to request a document whose distribution is restricted for legal reasons. Its use is exclusively reserved for personal, private study or research purposes.",
-
   "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
 
   "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",

From 5013890b3516cca4a12797aa8a510ee832322c0c Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 11 Jul 2022 18:25:05 +0200
Subject: [PATCH 094/103] 93011: Add test for invalidateByHref cache state
 tracking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This test is expected to fail and is be fixed in the next commit.

Currently, invalidateByHref calls keep tracking the cache and may cause objects to be invalidated a second time as soon as the cache is updated.

Practical example:
  1. DELETE request
      → object is invalidated
  2. POST request related to the same object
      → UUID of pending request is added to the object's cache entry
      → gets picked up by the previous invalidateByHref call
      → the request is set to stale even before it's completed
---
 src/app/core/data/data.service.spec.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index 64efd58418..dc661e12d7 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -894,6 +894,26 @@ describe('DataService', () => {
         expectObservable(done$).toBe('------(t|)', BOOLEAN);
       });
     });
+
+    it('should only fire for the current state of the object (instead of tracking it)', () => {
+      testScheduler.run(({ cold, flush }) => {
+        getByHrefSpy.and.returnValue(cold('a---b---c---', {
+          a: { requestUUIDs: ['request1'] },  // this is the state at the moment we're invalidating the cache
+          b: { requestUUIDs: ['request2'] },  // we shouldn't keep tracking the state
+          c: { requestUUIDs: ['request3'] },  // because we may invalidate when we shouldn't
+        }));
+
+        service.invalidateByHref('some-href');
+        flush();
+
+        // requests from the first state are marked as stale
+        expect(requestService.setStaleByUUID).toHaveBeenCalledWith('request1');
+
+        // request from subsequent states are ignored
+        expect(requestService.setStaleByUUID).not.toHaveBeenCalledWith('request2');
+        expect(requestService.setStaleByUUID).not.toHaveBeenCalledWith('request3');
+      });
+    });
   });
 
   describe('delete', () => {

From 517aee0e8cd0a8f2c8d891dfe215804818b00d38 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Mon, 11 Jul 2022 18:25:41 +0200
Subject: [PATCH 095/103] 93011: Make sure invalidateByHref doesn't track cache
 state

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

diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index 1cd9731a65..6176694d9d 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -595,6 +595,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
     const done$ = new AsyncSubject<boolean>();
 
     this.objectCache.getByHref(href).pipe(
+      take(1),
       switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
         mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
         toArray(),

From e9372395f4e84946653fcc56ea3489120c4a10f5 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Fri, 15 Jul 2022 11:41:38 +0200
Subject: [PATCH 096/103] make collections on item page into an input

---
 .../field-components/collections/collections.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index 23aff80160..34b1385f46 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -30,7 +30,7 @@ export class CollectionsComponent implements OnInit {
 
   label = 'item.page.collections';
 
-  separator = '<br/>';
+  @Input() separator = '<br/>';
 
   /**
    * Amount of mapped collections that should be fetched at once.

From 577a92bc6b93e51362e14e33719e5db163cf3183 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Jul 2022 02:25:52 +0000
Subject: [PATCH 097/103] Bump terser from 4.8.0 to 4.8.1

Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

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 f9352e8f05..f870fd85e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12239,9 +12239,9 @@ terser@5.11.0:
     source-map-support "~0.5.20"
 
 terser@^4.6.12, terser@^4.6.3:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"

From 7b48e7c91fadac933d55cbf18025f9a48081ac95 Mon Sep 17 00:00:00 2001
From: Sascha Szott <szott@gmx.de>
Date: Thu, 21 Jul 2022 12:02:07 +0200
Subject: [PATCH 098/103] fixed typo

---
 src/assets/i18n/de.json5 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index c3a874535c..c699ee2575 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1896,7 +1896,7 @@
   "error.validation.groupExists": "Diese Gruppe existiert schon.",
 
   // "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": "Um die Veröffentlichung abzuschließen, müssen Sie die Lizenzbedingungen akzeptieren. Wenn Sie zur Zeit dazu nicht in der Lage sind, können Sie Ihre Arbeit sichern und später dazu zurückgkehren, um zuzustimmen oder die Einreichung zu löschen.",
+  "error.validation.license.notgranted": "Um die Veröffentlichung abzuschließen, müssen Sie die Lizenzbedingungen akzeptieren. Wenn Sie zur Zeit dazu nicht in der Lage sind, können Sie Ihre Arbeit sichern und später dazu zurückkehren, um zuzustimmen oder die Einreichung zu löschen.",
   
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Die Eingabe muss dem folgenden Muster entsprechen: {{ pattern }}.",

From c7a88f99d62674595eaec14ae21bb3c00afc9eaa Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre.vryghem@student.ucll.be>
Date: Tue, 26 Jul 2022 00:34:19 +0200
Subject: [PATCH 099/103] Center expandable navbar section in header

---
 src/themes/dspace/app/navbar/navbar.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 6b71728494..512ef45265 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -6,7 +6,7 @@
     </a>
 
     <div id="collapsingNav" class="w-100 h-100">
-      <ul class="navbar-nav navbar-navigation me-auto mb-2 mb-lg-0 h-100">
+      <ul class="navbar-nav navbar-navigation me-auto mb-2 mb-lg-0 h-100 d-flex align-items-center">
         <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>

From 3d5f7bb0614c2c4cbb605a3feb447a6b3b905b47 Mon Sep 17 00:00:00 2001
From: Ying Jin <yj4@rice.edu>
Date: Sun, 31 Jul 2022 17:25:53 -0500
Subject: [PATCH 100/103] fix missing space between author names MyDspace our
 submissions #1730

---
 .../item-list-preview/item-list-preview.component.html           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index 6d4c704b60..78181dc65a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -19,6 +19,7 @@
               <span *ngIf="item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0">{{'mydspace.results.no-authors' | translate}}</span>
               <span *ngFor="let author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                 <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                <span *ngIf="!last">; </span>
               </span>
           </span>
 

From f2e977c402a299735d3c646db3d8e7264a163973 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Wed, 3 Aug 2022 15:15:45 +0200
Subject: [PATCH 101/103] 92701: Redirect / dead link fixes

---
 config/config.yml                                           | 4 ++--
 .../end-user-agreement/abstract-end-user-agreement.guard.ts | 6 +++++-
 src/app/footer/footer.component.html                        | 4 ++--
 src/app/footer/footer.component.ts                          | 3 +++
 src/app/shared/cookies/browser-klaro.service.ts             | 4 ++++
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/config/config.yml b/config/config.yml
index 2b5ac3b52e..8b1966b100 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -5,5 +5,5 @@ rest:
   nameSpace: /server
 
 info:
-  enableEndUserAgreement: true
-  enablePrivacyStatement: true
+  enableEndUserAgreement: false
+  enablePrivacyStatement: false
diff --git a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
index b9f134f946..076df8ebc9 100644
--- a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
+++ b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
@@ -1,6 +1,7 @@
 import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';
+import { environment } from '../../../environments/environment';
 
 /**
  * An abstract guard for redirecting users to the user agreement page if a certain condition is met
@@ -18,6 +19,9 @@ export abstract class AbstractEndUserAgreementGuard implements CanActivate {
    * when they're finished accepting the agreement
    */
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
+    if (!environment.info.enableEndUserAgreement) {
+      return observableOf(true);
+    }
     return this.hasAccepted().pipe(
       returnEndUserAgreementUrlTreeOnFalse(this.router, state.url)
     );
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 2c1a34ccae..88236d381e 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -67,11 +67,11 @@
           <a class="text-white" href="javascript:void(0);"
              (click)="showCookieSettings()">{{ 'footer.link.cookies' | translate}}</a>
         </li>
-        <li>
+        <li *ngIf="showPrivacyPolicy">
           <a class="text-white"
              routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
         </li>
-        <li>
+        <li *ngIf="showEndUserAgreement">
           <a class="text-white"
              routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index c43a0ae85d..c4195c8eb3 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,6 +1,7 @@
 import { Component, Optional } from '@angular/core';
 import { hasValue } from '../shared/empty.util';
 import { KlaroService } from '../shared/cookies/klaro.service';
+import { environment } from '../../environments/environment';
 
 @Component({
   selector: 'ds-footer',
@@ -14,6 +15,8 @@ export class FooterComponent {
    * A boolean representing if to show or not the top footer container
    */
   showTopFooter = false;
+  showPrivacyPolicy = environment.info.enablePrivacyStatement;
+  showEndUserAgreement = environment.info.enableEndUserAgreement;
 
   constructor(@Optional() private cookies: KlaroService) {
   }
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index 4e6370f179..e65b7c8b86 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -91,6 +91,10 @@ export class BrowserKlaroService extends KlaroService {
         Klaro.setup(this.klaroConfig);
       });
 
+    if (!environment.info.enablePrivacyStatement) {
+      delete this.klaroConfig.privacyPolicy;
+    }
+
   }
 
   /**

From 4dcf6a345a0ddb749234c301978f7a9beb754480 Mon Sep 17 00:00:00 2001
From: Jens Vannerum <jens.vannerum@atmire.com>
Date: Fri, 5 Aug 2022 13:12:52 +0200
Subject: [PATCH 102/103] 92701: Fix privacy string for klaro and add
 documentation

---
 config/config.yml                               |  4 ----
 src/app/shared/cookies/browser-klaro.service.ts | 10 +++++-----
 src/assets/i18n/en.json5                        |  2 ++
 src/config/default-app-config.ts                |  8 ++++++++
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/config.yml b/config/config.yml
index 8b1966b100..b5eecd112f 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -3,7 +3,3 @@ rest:
   host: api7.dspace.org
   port: 443
   nameSpace: /server
-
-info:
-  enableEndUserAgreement: false
-  enablePrivacyStatement: false
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index e65b7c8b86..638d465864 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -63,6 +63,11 @@ export class BrowserKlaroService extends KlaroService {
    *  - Add and translate klaro configuration messages
    */
   initialize() {
+    if (!environment.info.enablePrivacyStatement) {
+      delete this.klaroConfig.privacyPolicy;
+      this.klaroConfig.translations.en.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
+    }
+
     this.translateService.setDefaultLang(environment.defaultLanguage);
 
     const user$: Observable<EPerson> = this.getUser$();
@@ -90,11 +95,6 @@ export class BrowserKlaroService extends KlaroService {
         this.translateConfiguration();
         Klaro.setup(this.klaroConfig);
       });
-
-    if (!environment.info.enablePrivacyStatement) {
-      delete this.klaroConfig.privacyPolicy;
-    }
-
   }
 
   /**
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5d7be2a681..bf2d37fbf9 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1225,6 +1225,8 @@
 
   "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.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
+
   "cookies.consent.content-notice.learnMore": "Customize",
 
   "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 4108444443..11761af49a 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -325,6 +325,14 @@ export class DefaultAppConfig implements AppConfig {
     image: false,
     video: false
   };
+  // Whether the end-user-agreement and privacy policy feature should be enabled or not.
+  // Disabling the end user agreement feature will result in:
+  // - Users no longer being forced to accept the end-user-agreement before they can access the repository
+  // - A 404 page if you manually try to navigate to the end-user-agreement page at info/end-user-agreement
+  // - All end-user-agreement related links and pages will be removed from the UI (e.g. in the footer)
+  // Disabling the privacy policy feature will result in:
+  // - A 404 page if you manually try to navigate to the privacy policy page at info/privacy
+  // - All mentions of the privacy policy being removed from the UI (e.g. in the footer)
   info: InfoConfig = {
     enableEndUserAgreement: true,
     enablePrivacyStatement: true

From ed0204ab9caaadc3c82cb8c204f67277bb38840b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 15:56:19 +0000
Subject: [PATCH 103/103] Bump moment from 2.29.2 to 2.29.4

Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.2...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index dbb4cca8a5..32832460a2 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "mirador": "^3.3.0",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.11.0",
-    "moment": "^2.29.2",
+    "moment": "^2.29.4",
     "morgan": "^1.10.0",
     "ng-mocks": "^13.1.1",
     "ng2-file-upload": "1.4.0",
diff --git a/yarn.lock b/yarn.lock
index f870fd85e0..1996ace1b1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8741,10 +8741,10 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.29.2:
-  version "2.29.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
-  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
+moment@^2.29.4:
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 morgan@^1.10.0:
   version "1.10.0"