From 6df1ee64f27a844aa4a80118d8fb6000fb298406 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Mon, 2 Aug 2021 09:18:21 +0200
Subject: [PATCH 01/10] [DSC-184] Fix issue with mydpsace page that hangs
 forever on error response

---
 src/app/my-dspace-page/my-dspace-page.component.html |  4 ++--
 src/app/my-dspace-page/my-dspace-page.component.ts   | 11 +++++------
 src/app/shared/error/error.component.html            |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index 4aadb16255..5a15abcc08 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -4,7 +4,7 @@
       <ds-search-sidebar *ngIf="!(isXsOrSm$ | async)" class="col-3 sidebar-md-sticky"
                          id="search-sidebar"
                          [configurationList]="(configurationList$ | async)"
-                         [resultCount]="(resultsRD$ | async)?.payload.totalElements"
+                         [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
                          [viewModeList]="viewModeList"
                          [searchOptions]="(searchOptions$ | async)"
                          [sortOptions]="(sortOptions$ | async)"
@@ -27,7 +27,7 @@
                   <ds-search-sidebar *ngIf="(isXsOrSm$ | async)" class="col-12"
                                      id="search-sidebar-sm"
                                      [configurationList]="(configurationList$ | async)"
-                                     [resultCount]="(resultsRD$ | async)?.payload.totalElements"
+                                     [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
                                      (toggleSidebar)="closeSidebar()"
                                      [ngClass]="{'active': !(isSidebarCollapsed() | async)}"
                                      [searchOptions]="(searchOptions$ | async)"
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index 90163abc5e..89a4023be8 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -19,7 +19,7 @@ import { PaginatedSearchOptions } from '../shared/search/paginated-search-option
 import { SearchService } from '../core/shared/search/search.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue } from '../shared/empty.util';
-import { getFirstSucceededRemoteData } from '../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
 import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { RoleType } from '../core/roles/role-types';
@@ -30,7 +30,7 @@ import { MyDSpaceRequest } from '../core/data/request.models';
 import { SearchResult } from '../shared/search/search-result.model';
 import { Context } from '../core/shared/context.model';
 import { SortOptions } from '../core/cache/models/sort-options.model';
-import { RouteService } from '../core/services/route.service';
+import { SearchObjects } from '../shared/search/search-objects.model';
 
 export const MYDSPACE_ROUTE = '/mydspace';
 export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
@@ -111,8 +111,7 @@ export class MyDSpacePageComponent implements OnInit {
   constructor(private service: SearchService,
               private sidebarService: SidebarService,
               private windowService: HostWindowService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: MyDSpaceConfigurationService,
-              private routeService: RouteService) {
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: MyDSpaceConfigurationService) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
     this.service.setServiceOptions(MyDSpaceResponseParsingService, MyDSpaceRequest);
   }
@@ -134,8 +133,8 @@ export class MyDSpacePageComponent implements OnInit {
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.sub = this.searchOptions$.pipe(
       tap(() => this.resultsRD$.next(null)),
-      switchMap((options: PaginatedSearchOptions) => this.service.search(options).pipe(getFirstSucceededRemoteData())))
-      .subscribe((results) => {
+      switchMap((options: PaginatedSearchOptions) => this.service.search(options).pipe(getFirstCompletedRemoteData())))
+      .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         this.resultsRD$.next(results);
       });
 
diff --git a/src/app/shared/error/error.component.html b/src/app/shared/error/error.component.html
index d41760e258..dd75cb4b1b 100644
--- a/src/app/shared/error/error.component.html
+++ b/src/app/shared/error/error.component.html
@@ -1,3 +1,3 @@
-<div>
-  <label>{{ message }}</label>
-</div>
+<ds-alert [type]="'alert-danger'" [dismissible]="false">
+  {{ message }}
+</ds-alert>

From 7a567a47b9ff7851c645b69b4a0d6627aa80fb5f Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Fri, 26 Nov 2021 11:20:35 +0100
Subject: [PATCH 02/10] [CST-4882] Show error message if the search query fails
 - Handle error 422 (invalid query) separately

---
 .../my-dspace-results/my-dspace-results.component.html    | 2 +-
 .../my-dspace-results/my-dspace-results.component.ts      | 8 ++++++++
 src/app/shared/error/error.component.html                 | 5 +++--
 src/app/shared/error/error.component.spec.ts              | 2 +-
 src/app/shared/error/error.component.ts                   | 7 +++++++
 src/assets/i18n/en.json5                                  | 2 ++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
index 2710285f0d..ad06f97c88 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
@@ -10,5 +10,5 @@
   </ds-viewable-collection>
 </div>
 <ds-loading *ngIf="isLoading()" message="{{'loading.mydspace-results' | translate}}"></ds-loading>
-<ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
+<ds-error *ngIf="showError(searchResults)" message="{{errorMessageLabel(searchResults) | translate}}"></ds-error>
 <h3 *ngIf="searchResults?.payload?.page.length == 0" class="text-center text-muted" ><span>{{'mydspace.results.no-results' | translate}}</span></h3>
diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index 32b6d9c9f7..96395adea2 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -58,4 +58,12 @@ export class MyDSpaceResultsComponent {
   isLoading() {
     return !this.searchResults || isEmpty(this.searchResults) || this.searchResults.isLoading;
   }
+
+  showError(searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>): boolean {
+    return searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode !== 400);
+  }
+
+  errorMessageLabel(searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>): string {
+    return (searchResults?.statusCode  === 422) ? 'error.invalid-search-query' : 'error.search-results';
+  }
 }
diff --git a/src/app/shared/error/error.component.html b/src/app/shared/error/error.component.html
index dd75cb4b1b..157c47f2cd 100644
--- a/src/app/shared/error/error.component.html
+++ b/src/app/shared/error/error.component.html
@@ -1,3 +1,4 @@
-<ds-alert [type]="'alert-danger'" [dismissible]="false">
-  {{ message }}
+<ds-alert [type]="AlertTypeEnum.Error" [dismissible]="false">
+  <!-- Using [innerHTML] instead of {{message}} allows to render HTML code -->
+  <span [innerHTML]="message"></span>
 </ds-alert>
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
index d3e3e80c07..f8483ac7aa 100644
--- a/src/app/shared/error/error.component.spec.ts
+++ b/src/app/shared/error/error.component.spec.ts
@@ -36,7 +36,7 @@ describe('ErrorComponent (inline template)', () => {
     comp = fixture.componentInstance; // ErrorComponent test instance
 
     // query for the message <label> by CSS element selector
-    de = fixture.debugElement.query(By.css('label'));
+    de = fixture.debugElement.query(By.css('ds-alert'));
     el = de.nativeElement;
   });
 
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index bcb30c5fdc..9a6b0660bb 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -3,6 +3,7 @@ import { Component, Input } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { Subscription } from 'rxjs';
+import { AlertType } from '../alert/aletr-type';
 
 @Component({
   selector: 'ds-error',
@@ -13,6 +14,12 @@ export class ErrorComponent {
 
   @Input() message = 'Error...';
 
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
   private subscription: Subscription;
 
   constructor(private translate: TranslateService) {
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 0cc3a0402d..8edc01b278 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1331,6 +1331,8 @@
 
   "error.search-results": "Error fetching search results",
 
+  "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
+
   "error.sub-collections": "Error fetching sub-collections",
 
   "error.sub-communities": "Error fetching sub-communities",

From b64b7c2607630512d301e182afaf1f7d291148f9 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Thu, 9 Dec 2021 12:17:20 +0100
Subject: [PATCH 03/10] [CST-4882] Error fixed - Tests improved

---
 .../my-dspace-results.component.html               |  2 +-
 .../my-dspace-results.component.spec.ts            | 14 ++++++++++++--
 .../my-dspace-results.component.ts                 |  8 ++++----
 .../search-filter/search-filter.component.ts       |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
index ad06f97c88..67b13cc49c 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.html
@@ -10,5 +10,5 @@
   </ds-viewable-collection>
 </div>
 <ds-loading *ngIf="isLoading()" message="{{'loading.mydspace-results' | translate}}"></ds-loading>
-<ds-error *ngIf="showError(searchResults)" message="{{errorMessageLabel(searchResults) | translate}}"></ds-error>
+<ds-error *ngIf="showError()" message="{{errorMessageLabel() | translate}}"></ds-error>
 <h3 *ngIf="searchResults?.payload?.page.length == 0" class="text-center text-muted" ><span>{{'mydspace.results.no-results' | translate}}</span></h3>
diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
index 29a2e593de..5b069f4ddb 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.spec.ts
@@ -40,9 +40,19 @@ describe('MyDSpaceResultsComponent', () => {
     expect(fixture.debugElement.query(By.css('a'))).toBeNull();
   });
 
-  it('should display error message if error is != 400', () => {
-    (comp as any).searchResults = { hasFailed: true, error: { statusCode: 500 } };
+  it('should display error message if error is 500', () => {
+    (comp as any).searchResults = { hasFailed: true, statusCode: 500 };
     fixture.detectChanges();
+    expect(comp.showError()).toBeTrue();
+    expect(comp.errorMessageLabel()).toBe('error.search-results');
+    expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
+  });
+
+  it('should display error message if error is 422', () => {
+    (comp as any).searchResults = { hasFailed: true, statusCode: 422 };
+    fixture.detectChanges();
+    expect(comp.showError()).toBeTrue();
+    expect(comp.errorMessageLabel()).toBe('error.invalid-search-query');
     expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
   });
 
diff --git a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index 96395adea2..77f27e9d42 100644
--- a/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -59,11 +59,11 @@ export class MyDSpaceResultsComponent {
     return !this.searchResults || isEmpty(this.searchResults) || this.searchResults.isLoading;
   }
 
-  showError(searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>): boolean {
-    return searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode !== 400);
+  showError(): boolean {
+    return this.searchResults?.hasFailed && (!this.searchResults?.errorMessage || this.searchResults?.statusCode !== 400);
   }
 
-  errorMessageLabel(searchResults: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>): string {
-    return (searchResults?.statusCode  === 422) ? 'error.invalid-search-query' : 'error.search-results';
+  errorMessageLabel(): string {
+    return (this.searchResults?.statusCode  === 422) ? 'error.invalid-search-query' : 'error.search-results';
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index a1b66eb332..8bc7502159 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -169,7 +169,7 @@ export class SearchFilterComponent implements OnInit {
                 return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
                   filter((RD) => !RD.isLoading),
                   map((valuesRD) => {
-                    return valuesRD.payload.totalElements > 0;
+                    return valuesRD.payload?.totalElements > 0;
                   }),);
               }
             ));

From 64231683b3db55c70c23f59ee4b9fd36f19b440a Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Fri, 10 Dec 2021 18:28:30 +0100
Subject: [PATCH 04/10] [CST-4882] Error 422 is now handled in home page too

---
 src/app/search-page/search.component.ts                | 10 +++++-----
 .../search-results/search-results.component.html       |  6 +++---
 .../search/search-results/search-results.component.ts  |  8 ++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/app/search-page/search.component.ts b/src/app/search-page/search.component.ts
index 8be21af552..2972175bdf 100644
--- a/src/app/search-page/search.component.ts
+++ b/src/app/search-page/search.component.ts
@@ -8,7 +8,7 @@ import { pushInOut } from '../shared/animations/push';
 import { HostWindowService } from '../shared/host-window.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue, isEmpty } from '../shared/empty.util';
-import { getFirstSucceededRemoteData } from '../core/shared/operators';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { RouteService } from '../core/services/route.service';
 import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
@@ -126,12 +126,12 @@ export class SearchComponent implements OnInit {
     this.searchOptions$ = this.getSearchOptions();
     this.sub = this.searchOptions$.pipe(
       switchMap((options) => this.service.search(
-          options, undefined, true, true, followLink<Item>('thumbnail', { isOptional: true })
-        ).pipe(getFirstSucceededRemoteData(), startWith(undefined))
+          options, undefined, false, true, followLink<Item>('thumbnail', { isOptional: true })
+        ).pipe(getFirstCompletedRemoteData(), startWith(undefined))
       )
     ).subscribe((results) => {
-        this.resultsRD$.next(results);
-      });
+      this.resultsRD$.next(results);
+    });
 
     if (isEmpty(this.configuration$)) {
       this.configuration$ = this.searchConfigService.getCurrentConfiguration('default');
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 4e6bca094e..23850f50dd 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -16,11 +16,11 @@
     </ds-viewable-collection>
 </div>
 <ds-loading
-        *ngIf="hasNoValue(searchResults) || hasNoValue(searchResults.payload) || searchResults.isLoading"
+        *ngIf="!showError() && (hasNoValue(searchResults) || hasNoValue(searchResults.payload) || searchResults.isLoading)"
         message="{{'loading.search-results' | translate}}"></ds-loading>
 <ds-error
-        *ngIf="searchResults?.hasFailed && (!searchResults?.errorMessage || searchResults?.statusCode != 400)"
-        message="{{'error.search-results' | translate}}"></ds-error>
+        *ngIf="showError()"
+        message="{{errorMessageLabel() | translate}}"></ds-error>
 <div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index de87f6b187..9e466fd620 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -78,6 +78,14 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
+  showError(): boolean {
+    return this.searchResults?.hasFailed && (!this.searchResults?.errorMessage || this.searchResults?.statusCode !== 400);
+  }
+
+  errorMessageLabel(): string {
+    return (this.searchResults?.statusCode  === 422) ? 'error.invalid-search-query' : 'error.search-results';
+  }
+
   /**
    * Method to change the given string by surrounding it by quotes if not already present.
    */

From 4c27a117476bdc8c488187ee47ce6231d86c5c15 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Sat, 11 Dec 2021 01:59:38 +0100
Subject: [PATCH 05/10] [CST-4882] Tests improved

---
 .../search-results/search-results.component.spec.ts  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index f52cdfa1b0..4cc4f84f65 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -45,9 +45,19 @@ describe('SearchResultsComponent', () => {
     expect(fixture.debugElement.query(By.css('a'))).toBeNull();
   });
 
-  it('should display error message if error is != 400', () => {
+  it('should display error message if error is 500', () => {
     (comp as any).searchResults = createFailedRemoteDataObject('Error', 500);
     fixture.detectChanges();
+    expect(comp.showError()).toBeTrue();
+    expect(comp.errorMessageLabel()).toBe('error.search-results');
+    expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
+  });
+
+  it('should display error message if error is 422', () => {
+    (comp as any).searchResults = createFailedRemoteDataObject('Error', 422);
+    fixture.detectChanges();
+    expect(comp.showError()).toBeTrue();
+    expect(comp.errorMessageLabel()).toBe('error.invalid-search-query');
     expect(fixture.debugElement.query(By.css('ds-error'))).not.toBeNull();
   });
 

From 13cfd7168612fd0e78841e9891a6fbecf3799be4 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Mon, 13 Dec 2021 16:41:34 -0600
Subject: [PATCH 06/10] Update Docker to use latest Solr 8

---
 docker/docker-compose-ci.yml   | 2 +-
 docker/docker-compose-rest.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index d2d02f0a55..18fa152c9d 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -64,7 +64,7 @@ services:
   dspacesolr:
     container_name: dspacesolr
     # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.8
+    image: solr:8.11-slim
     # Needs main 'dspace' container to start first to guarantee access to solr_configs
     depends_on:
     - dspace
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 370ccbbdf1..3534682afc 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -62,7 +62,7 @@ services:
   dspacesolr:
     container_name: dspacesolr
     # Uses official Solr image at https://hub.docker.com/_/solr/
-    image: solr:8.8
+    image: solr:8.11-slim
     # Needs main 'dspace' container to start first to guarantee access to solr_configs
     depends_on:
     - dspace

From 34b73cc4f7dc9f223f93e92a6bf4ed29cfd3dddb Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 14 Dec 2021 11:55:33 +0100
Subject: [PATCH 07/10] [DSC-370] Fix SSR issue with submission after migrate
 to angular 11

---
 src/app/submission/submission.module.ts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 13cf2016dd..2c04c47290 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -65,6 +65,14 @@ const DECLARATIONS = [
   SubmissionImportExternalCollectionComponent
 ];
 
+const ENTRY_COMPONENTS = [
+  SubmissionSectionUploadComponent,
+  SubmissionSectionformComponent,
+  SubmissionSectionLicenseComponent,
+  SubmissionSectionCcLicensesComponent,
+  SubmissionSectionDetectDuplicateComponent
+];
+
 @NgModule({
   imports: [
     CommonModule,
@@ -88,4 +96,14 @@ const DECLARATIONS = [
  * This module handles all components that are necessary for the submission process
  */
 export class SubmissionModule {
+  /**
+   * NOTE: this method allows to resolve issue with components that using a custom decorator
+   * which are not loaded during CSR otherwise
+   */
+  static withEntryComponents() {
+    return {
+      ngModule: SubmissionModule,
+      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+    };
+  }
 }

From 662f846caad37a32bc91dc67e15a3d151b644635 Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 14 Dec 2021 15:37:44 +0100
Subject: [PATCH 08/10] [CST-5033] fix issue with cherry-pick

---
 src/app/submission/submission.module.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index 2c04c47290..fccd41fd14 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -69,8 +69,7 @@ const ENTRY_COMPONENTS = [
   SubmissionSectionUploadComponent,
   SubmissionSectionformComponent,
   SubmissionSectionLicenseComponent,
-  SubmissionSectionCcLicensesComponent,
-  SubmissionSectionDetectDuplicateComponent
+  SubmissionSectionCcLicensesComponent
 ];
 
 @NgModule({

From a952438247018e495d356c5161dc7bbb6bf443dc Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.it>
Date: Tue, 14 Dec 2021 15:44:43 +0100
Subject: [PATCH 09/10] [CST-5033] fix comments

---
 src/app/admin/admin-search-page/admin-search.module.ts        | 2 +-
 src/app/admin/admin-workflow-page/admin-workflow.module.ts    | 2 +-
 src/app/admin/admin.module.ts                                 | 2 +-
 src/app/browse-by/browse-by.module.ts                         | 2 +-
 .../entity-groups/journal-entities/journal-entities.module.ts | 2 +-
 .../research-entities/research-entities.module.ts             | 2 +-
 src/app/item-page/item-page.module.ts                         | 4 ++--
 src/app/my-dspace-page/my-dspace-search.module.ts             | 2 +-
 src/app/navbar/navbar.module.ts                               | 2 +-
 src/app/shared/shared.module.ts                               | 2 +-
 src/app/submission/submission.module.ts                       | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/app/admin/admin-search-page/admin-search.module.ts b/src/app/admin/admin-search-page/admin-search.module.ts
index 0b3b7df9bb..ecf8d8a2d2 100644
--- a/src/app/admin/admin-search-page/admin-search.module.ts
+++ b/src/app/admin/admin-search-page/admin-search.module.ts
@@ -36,7 +36,7 @@ const ENTRY_COMPONENTS = [
 export class AdminSearchModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
index 4715ae16f4..02e5e01023 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow.module.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
@@ -28,7 +28,7 @@ const ENTRY_COMPONENTS = [
 export class AdminWorkflowModuleModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index 25cdd67dcf..6c756dd851 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -34,7 +34,7 @@ const ENTRY_COMPONENTS = [
 export class AdminModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index 2d3618aae6..cd44e52b81 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -31,7 +31,7 @@ const ENTRY_COMPONENTS = [
 export class BrowseByModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index e23a729d6a..dc88490eac 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -54,7 +54,7 @@ const ENTRY_COMPONENTS = [
 export class JournalEntitiesModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index 2e91a6f1e7..c9d6c2d5b6 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -74,7 +74,7 @@ const COMPONENTS = [
 export class ResearchEntitiesModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index 2e3e248692..80cb1f61a2 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -33,7 +33,7 @@ import { NgxGalleryModule } from '@kolkov/ngx-gallery';
 import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component';
 import { VersionPageComponent } from './version-page/version-page/version-page.component';
 import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component';
-import { ThemedFileSectionComponent} from './simple/field-components/file-section/themed-file-section.component';
+import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
 
 
 const ENTRY_COMPONENTS = [
@@ -91,7 +91,7 @@ const DECLARATIONS = [
 export class ItemPageModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
index a97f2207e7..67a4f0818e 100644
--- a/src/app/my-dspace-page/my-dspace-search.module.ts
+++ b/src/app/my-dspace-page/my-dspace-search.module.ts
@@ -50,7 +50,7 @@ const ENTRY_COMPONENTS = [
 export class MyDspaceSearchModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index 6591cd3453..c84e732fd5 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -58,7 +58,7 @@ const ENTRY_COMPONENTS = [
 export class NavbarModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index abc42cb08a..2b64260f46 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -623,7 +623,7 @@ const DIRECTIVES = [
 export class SharedModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index fccd41fd14..e8c96284c0 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -97,7 +97,7 @@ const ENTRY_COMPONENTS = [
 export class SubmissionModule {
   /**
    * NOTE: this method allows to resolve issue with components that using a custom decorator
-   * which are not loaded during CSR otherwise
+   * which are not loaded during SSR otherwise
    */
   static withEntryComponents() {
     return {

From f672e12433dd3118331ab5ed197a3b281c61d8e0 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Tue, 14 Dec 2021 09:40:00 -0600
Subject: [PATCH 10/10] Remove unnecessary relativeLinkResolution: 'legacy'

---
 src/app/app-routing.module.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 26d9a5dc0d..04d2c55bdd 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -203,7 +203,6 @@ import { GroupAdministratorGuard } from './core/data/feature-authorization/featu
       ]}
     ],{
     onSameUrlNavigation: 'reload',
-    relativeLinkResolution: 'legacy'
 })
   ],
   exports: [RouterModule],